make error message prefix consistent

[slock.git] / slock.c

diff --git a/slock.c b/slock.c
index 0682279..62a9841 100644 (file)
--- a/slock.c
+++ b/slock.c
@@ -46,8 +46,6 @@ typedef struct {
 
 static Lock **locks;
 static int nscreens;
-static Bool running = True;
-static Bool failure = False;
 static Bool rr;
 static int rrevbase;
 static int rrerrbase;
@@ -101,9 +99,9 @@ getpw(void)
        errno = 0;
        if (!(pw = getpwuid(getuid()))) {
                if (errno)
-                       die("getpwuid: %s\n", strerror(errno));
+                       die("slock: getpwuid: %s\n", strerror(errno));
                else
-                       die("cannot retrieve password entry\n");
+                       die("slock: cannot retrieve password entry\n");
        }
        rval = pw->pw_passwd;
 
@@ -111,7 +109,7 @@ getpw(void)
        if (rval[0] == 'x' && rval[1] == '\0') {
                struct spwd *sp;
                if (!(sp = getspnam(getenv("USER"))))
-                       die("cannot retrieve shadow entry (make sure to suid or sgid slock)\n");
+                       die("slock: cannot retrieve shadow entry (make sure to suid or sgid slock)\n");
                rval = sp->sp_pwdp;
        }
 #endif
@@ -119,7 +117,7 @@ getpw(void)
        /* drop privileges */
        if (geteuid() == 0 &&
            ((getegid() != pw->pw_gid && setgid(pw->pw_gid) < 0) || setuid(pw->pw_uid) < 0))
-               die("cannot drop privileges\n");
+               die("slock: cannot drop privileges\n");
        return rval;
 }
 #endif
@@ -132,14 +130,15 @@ readpw(Display *dpy, const char *pws)
 #endif
 {
        char buf[32], passwd[256], *encrypted;
-       int num, screen;
+       int num, screen, running, failure;
        unsigned int len, color;
        KeySym ksym;
        XEvent ev;
        static int oldc = INIT;
 
        len = 0;
-       running = True;
+       running = 1;
+       failure = 0;
 
        /* As "slock" stands for "Simple X display locker", the DPMS settings
         * had been removed and you can set it with "xset" or some other
@@ -253,7 +252,7 @@ lockscreen(Display *dpy, int screen)
        XSetWindowAttributes wa;
        Cursor invisible;
 
-       if (!running || dpy == NULL || screen < 0 || !(lock = malloc(sizeof(Lock))))
+       if (dpy == NULL || screen < 0 || !(lock = malloc(sizeof(Lock))))
                return NULL;
 
        lock->screen = screen;
@@ -275,7 +274,7 @@ lockscreen(Display *dpy, int screen)
        XDefineCursor(dpy, lock->win, invisible);
 
        /* Try to grab mouse pointer *and* keyboard for 600ms, else fail the lock */
-       for (i = 6, ptgrab = kbgrab = -1; i; --i) {
+       for (i = 0, ptgrab = kbgrab = -1; i < 6; i++) {
                if (ptgrab != GrabSuccess) {
                        ptgrab = XGrabPointer(dpy, lock->root, False,
                                 ButtonPressMask | ButtonReleaseMask |
@@ -376,7 +375,6 @@ main(int argc, char **argv) {
 
        /* did we manage to lock everything? */
        if (nlocks != nscreens) {
-               running = 0;
                cleanup(dpy);
                return 1;
        }