[hackers] [slock] prepared release || Anselm R Garbe

changeset: 37:4b1e4e2ec02f
tag: tip
user: Anselm R Garbe <garbeam_AT_gmail.com>
date: Tue Jul 29 19:14:53 2008 +0100
files: config.mk slock.c
description:
prepared release

diff -r d1a979baf4f0 -r 4b1e4e2ec02f config.mk
--- a/config.mk Tue Jul 29 19:08:18 2008 +0100
+++ b/config.mk Tue Jul 29 19:14:53 2008 +0100
@@ -14,17 +14,15 @@
 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 -r d1a979baf4f0 -r 4b1e4e2ec02f slock.c
--- a/slock.c Tue Jul 29 19:08:18 2008 +0100
+++ b/slock.c Tue Jul 29 19:14:53 2008 +0100
@@ -22,7 +22,7 @@
 #include <bsd_auth.h>
 #endif
 
-void
+static void
 die(const char *errstr, ...) {
         va_list ap;
 
@@ -33,7 +33,7 @@
 }
 
 #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 @@
                 if(ev.type == KeyPress) {
                         buf[0] = 0;
                         num = XLookupString(&ev.xkey, buf, sizeof buf, &ksym, 0);
- 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(ksym)
                                         || IsPrivateKeypadKey(ksym))
Received on Tue Jul 29 2008 - 18:14:57 UTC