clarify colors in config.def.h

[slock.git] / slock.c

diff --git a/slock.c b/slock.c
index 47d2e21..d2f0886 100644 (file)
--- a/slock.c
+++ b/slock.c
@@ -31,8 +31,6 @@ enum {
        NUMCOLS
 };
 
        NUMCOLS
 };
 

-#include "config.h"
-

 struct lock {
        int screen;
        Window root, win;
 struct lock {
        int screen;
        Window root, win;


@@ -46,6 +44,8 @@ struct xrandr {
        int errbase;
 };
 
        int errbase;
 };
 

+#include "config.h"
+

 static void
 die(const char *errstr, ...)
 {
 static void
 die(const char *errstr, ...)
 {


@@ -100,7 +100,7 @@ gethash(void)
        hash = pw->pw_passwd;
 
 #if HAVE_SHADOW_H
        hash = pw->pw_passwd;
 
 #if HAVE_SHADOW_H

-       if (hash[0] == 'x' && hash[1] == '\0') {
+       if (!strcmp(hash, "x")) {

                struct spwd *sp;
                if (!(sp = getspnam(pw->pw_name)))
                        die("slock: getspnam: cannot retrieve shadow entry. "
                struct spwd *sp;
                if (!(sp = getspnam(pw->pw_name)))
                        die("slock: getspnam: cannot retrieve shadow entry. "


@@ -108,7 +108,7 @@ gethash(void)
                hash = sp->sp_pwdp;
        }
 #else
                hash = sp->sp_pwdp;
        }
 #else

-       if (hash[0] == '*' && hash[1] == '\0') {
+       if (!strcmp(hash, "*")) {

 #ifdef __OpenBSD__
                if (!(pw = getpwuid_shadow(getuid())))
                        die("slock: getpwnam_shadow: cannot retrieve shadow entry. "
 #ifdef __OpenBSD__
                if (!(pw = getpwuid_shadow(getuid())))
                        die("slock: getpwnam_shadow: cannot retrieve shadow entry. "


@@ -130,15 +130,15 @@ readpw(Display *dpy, struct xrandr *rr, struct lock **locks, int nscreens,
 {
        XRRScreenChangeNotifyEvent *rre;
        char buf[32], passwd[256], *inputhash;
 {
        XRRScreenChangeNotifyEvent *rre;
        char buf[32], passwd[256], *inputhash;

-       int num, screen, running, failure;
+       int num, screen, running, failure, oldc;

        unsigned int len, color;
        KeySym ksym;
        XEvent ev;
        unsigned int len, color;
        KeySym ksym;
        XEvent ev;

-       static int oldc = INIT;

 
        len = 0;
        running = 1;
        failure = 0;
 
        len = 0;
        running = 1;
        failure = 0;

+       oldc = INIT;

 
        while (running && !XNextEvent(dpy, &ev)) {
                if (ev.type == KeyPress) {
 
        while (running && !XNextEvent(dpy, &ev)) {
                if (ev.type == KeyPress) {


@@ -166,7 +166,7 @@ readpw(Display *dpy, struct xrandr *rr, struct lock **locks, int nscreens,
                                        running = !!strcmp(inputhash, hash);
                                if (running) {
                                        XBell(dpy, 100);
                                        running = !!strcmp(inputhash, hash);
                                if (running) {
                                        XBell(dpy, 100);

-                                       failure = True;
+                                       failure = 1;

                                }
                                explicit_bzero(&passwd, sizeof(passwd));
                                len = 0;
                                }
                                explicit_bzero(&passwd, sizeof(passwd));
                                len = 0;