prepared release - slock - simple X display locker utility | |
git clone git://git.suckless.org/slock | |
Log | |
Files | |
Refs | |
README | |
LICENSE | |
--- | |
commit 75dd7792456d9eb4a4c3142b81fbda5ca39a3a51 | |
parent 1460b14f450d65c68bf519538de5b5df1a7bc01c | |
Author: Anselm R Garbe <[email protected]> | |
Date: Tue, 29 Jul 2008 19:14:53 +0100 | |
prepared release | |
Diffstat: | |
M config.mk | 10 ++++------ | |
M slock.c | 7 ++++--- | |
2 files changed, 8 insertions(+), 9 deletions(-) | |
--- | |
diff --git a/config.mk b/config.mk | |
@@ -14,17 +14,15 @@ INCS = -I. -I/usr/include -I${X11INC} | |
LIBS = -L/usr/lib -lc -lcrypt -L${X11LIB} -lX11 -lXext | |
# flags | |
-CFLAGS = -Os ${INCS} -DVERSION=\"${VERSION}\" -DHAVE_SHADOW_H | |
-LDFLAGS = ${LIBS} | |
-#CFLAGS = -g -Wall -O2 ${INCS} -DVERSION=\"${VERSION}\" -DHAVE_SHADOW_H | |
-#LDFLAGS = -g ${LIBS} | |
+CPPFLAGS = -DVERSION=\"${VERSION}\" -DHAVE_SHADOW_H | |
+CFLAGS = -std=c99 -pedantic -Wall -Os ${INCS} ${CPPFLAGS} | |
+LDFLAGS = -s ${LIBS} | |
-# On *BSD remove -DHAVE_SHADOW_H from CFLAGS and add -DHAVE_BSD_AUTH | |
+# On *BSD remove -DHAVE_SHADOW_H from CPPFLAGS and add -DHAVE_BSD_AUTH | |
# On OpenBSD and Darwin remove -lcrypt from LIBS | |
# compiler and linker | |
CC = cc | |
-LD = ${CC} | |
# Install mode. On BSD systems MODE=2755 and GROUP=auth | |
# On others MODE=4755 and GROUP=root | |
diff --git a/slock.c b/slock.c | |
@@ -22,7 +22,7 @@ | |
#include <bsd_auth.h> | |
#endif | |
-void | |
+static void | |
die(const char *errstr, ...) { | |
va_list ap; | |
@@ -33,7 +33,7 @@ die(const char *errstr, ...) { | |
} | |
#ifndef HAVE_BSD_AUTH | |
-const char * | |
+static const char * | |
get_password() { /* only run as root */ | |
const char *rval; | |
struct passwd *pw; | |
@@ -132,11 +132,12 @@ main(int argc, char **argv) { | |
if(ev.type == KeyPress) { | |
buf[0] = 0; | |
num = XLookupString(&ev.xkey, buf, sizeof buf, &ksym, … | |
- if(IsKeypadKey(ksym)) | |
+ if(IsKeypadKey(ksym)) { | |
if(ksym == XK_KP_Enter) | |
ksym = XK_Return; | |
else if(ksym >= XK_KP_0 && ksym <= XK_KP_9) | |
ksym = (ksym - XK_KP_0) + XK_0; | |
+ } | |
if(IsFunctionKey(ksym) || IsKeypadKey(ksym) | |
|| IsMiscFunctionKey(ksym) || IsPFKey(… | |
|| IsPrivateKeypadKey(ksym)) |