make error message prefix consistent

[slock.git] / slock.c

diff --git a/slock.c b/slock.c
index 83d426a..62a9841 100644 (file)
--- a/slock.c
+++ b/slock.c
@@ -99,9 +99,9 @@ getpw(void)
        errno = 0;
        if (!(pw = getpwuid(getuid()))) {
                if (errno)
        errno = 0;
        if (!(pw = getpwuid(getuid()))) {
                if (errno)

-                       die("getpwuid: %s\n", strerror(errno));
+                       die("slock: getpwuid: %s\n", strerror(errno));

                else
                else

-                       die("cannot retrieve password entry\n");
+                       die("slock: cannot retrieve password entry\n");

        }
        rval = pw->pw_passwd;
 
        }
        rval = pw->pw_passwd;
 


@@ -109,7 +109,7 @@ getpw(void)
        if (rval[0] == 'x' && rval[1] == '\0') {
                struct spwd *sp;
                if (!(sp = getspnam(getenv("USER"))))
        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
                rval = sp->sp_pwdp;
        }
 #endif


@@ -117,7 +117,7 @@ getpw(void)
        /* drop privileges */
        if (geteuid() == 0 &&
            ((getegid() != pw->pw_gid && setgid(pw->pw_gid) < 0) || setuid(pw->pw_uid) < 0))
        /* 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
        return rval;
 }
 #endif


@@ -274,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 */
        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 |
                if (ptgrab != GrabSuccess) {
                        ptgrab = XGrabPointer(dpy, lock->root, False,
                                 ButtonPressMask | ButtonReleaseMask |