code style fix

[slock.git] / slock.c

diff --git a/slock.c b/slock.c
index 6be8f22..d2c3729 100644 (file)
--- a/slock.c
+++ b/slock.c
@@ -94,20 +94,18 @@ getpw(void)
        struct passwd *pw;
 
        errno = 0;
        struct passwd *pw;
 
        errno = 0;

-       pw = getpwuid(getuid());
-       if (!pw) {
+       if (!(pw = getpwuid(getuid()))) {

                if (errno)
                        die("slock: getpwuid: %s\n", strerror(errno));
                else
                        die("slock: cannot retrieve password entry\n");
        }
                if (errno)
                        die("slock: getpwuid: %s\n", strerror(errno));
                else
                        die("slock: cannot retrieve password entry\n");
        }

-       rval =  pw->pw_passwd;
+       rval = pw->pw_passwd;

 
 #if HAVE_SHADOW_H
        if (rval[0] == 'x' && rval[1] == '\0') {
                struct spwd *sp;
 
 #if HAVE_SHADOW_H
        if (rval[0] == 'x' && rval[1] == '\0') {
                struct spwd *sp;

-               sp = getspnam(getenv("USER"));
-               if (!sp)
+               if (!(sp = getspnam(getenv("USER"))))

                        die("slock: cannot retrieve shadow entry (make sure to suid or sgid slock)\n");
                rval = sp->sp_pwdp;
        }
                        die("slock: cannot retrieve shadow entry (make sure to suid or sgid slock)\n");
                rval = sp->sp_pwdp;
        }


@@ -180,7 +178,7 @@ readpw(Display *dpy, const char *pws)
                                        --len;
                                break;
                        default:
                                        --len;
                                break;
                        default:

-                               if (num && !iscntrl((int) buf[0]) && (len + num < sizeof(passwd))) {
+                               if (num && !iscntrl((int)buf[0]) && (len + num < sizeof(passwd))) {

                                        memcpy(passwd + len, buf, num);
                                        len += num;
                                }
                                        memcpy(passwd + len, buf, num);
                                        len += num;
                                }


@@ -232,15 +230,10 @@ lockscreen(Display *dpy, int screen)
        XSetWindowAttributes wa;
        Cursor invisible;
 
        XSetWindowAttributes wa;
        Cursor invisible;
 

-       if (dpy == NULL || screen < 0)
-               return NULL;
-
-       lock = malloc(sizeof(Lock));
-       if (lock == NULL)
+       if (dpy == NULL || screen < 0 || !(lock = malloc(sizeof(Lock))))

                return NULL;
 
        lock->screen = screen;
                return NULL;
 
        lock->screen = screen;

-

        lock->root = RootWindow(dpy, lock->screen);
 
        for (i = 0; i < NUMCOLS; i++) {
        lock->root = RootWindow(dpy, lock->screen);
 
        for (i = 0; i < NUMCOLS; i++) {


@@ -266,7 +259,7 @@ lockscreen(Display *dpy, int screen)
                        break;
                usleep(1000);
        }
                        break;
                usleep(1000);
        }

-       if (running && (len > 0)) {
+       if (running && len) {

                for (len = 1000; len; len--) {
                        if (XGrabKeyboard(dpy, lock->root, True, GrabModeAsync, GrabModeAsync, CurrentTime) == GrabSuccess)
                                break;
                for (len = 1000; len; len--) {
                        if (XGrabKeyboard(dpy, lock->root, True, GrabModeAsync, GrabModeAsync, CurrentTime) == GrabSuccess)
                                break;


@@ -278,8 +271,7 @@ lockscreen(Display *dpy, int screen)
        if (!running) {
                unlockscreen(dpy, lock);
                lock = NULL;
        if (!running) {
                unlockscreen(dpy, lock);
                lock = NULL;

-       }
-       else {
+       } else {

                XSelectInput(dpy, lock->root, SubstructureNotifyMask);
        }
 
                XSelectInput(dpy, lock->root, SubstructureNotifyMask);
        }
 


@@ -289,7 +281,7 @@ lockscreen(Display *dpy, int screen)
 static void
 usage(void)
 {
 static void
 usage(void)
 {

-       fprintf(stderr, "usage: slock [-v]\n");
+       fprintf(stderr, "usage: slock [-v|POST_LOCK_CMD]\n");

        exit(1);
 }
 
        exit(1);
 }
 


@@ -303,7 +295,8 @@ main(int argc, char **argv) {
 
        if ((argc == 2) && !strcmp("-v", argv[1]))
                die("slock-%s, © 2006-2015 slock engineers\n", VERSION);
 
        if ((argc == 2) && !strcmp("-v", argv[1]))
                die("slock-%s, © 2006-2015 slock engineers\n", VERSION);

-       else if (argc != 1)
+
+       if ((argc == 2) && !strcmp("-h", argv[1]))

                usage();
 
 #ifdef __linux__
                usage();
 
 #ifdef __linux__


@@ -322,12 +315,11 @@ main(int argc, char **argv) {
        rr = XRRQueryExtension(dpy, &rrevbase, &rrerrbase);
        /* Get the number of screens in display "dpy" and blank them all. */
        nscreens = ScreenCount(dpy);
        rr = XRRQueryExtension(dpy, &rrevbase, &rrerrbase);
        /* Get the number of screens in display "dpy" and blank them all. */
        nscreens = ScreenCount(dpy);

-       locks = malloc(sizeof(Lock *) * nscreens);
-       if (locks == NULL)
+       if (!(locks = malloc(sizeof(Lock*) * nscreens)))

                die("slock: malloc: %s\n", strerror(errno));
        int nlocks = 0;
        for (screen = 0; screen < nscreens; screen++) {
                die("slock: malloc: %s\n", strerror(errno));
        int nlocks = 0;
        for (screen = 0; screen < nscreens; screen++) {

-               if ( (locks[screen] = lockscreen(dpy, screen)) != NULL)
+               if ((locks[screen] = lockscreen(dpy, screen)) != NULL)

                        nlocks++;
        }
        XSync(dpy, False);
                        nlocks++;
        }
        XSync(dpy, False);


@@ -339,6 +331,13 @@ main(int argc, char **argv) {
                return 1;
        }
 
                return 1;
        }
 

+       if (argc >= 2 && fork() == 0) {
+               if (dpy)
+                       close(ConnectionNumber(dpy));
+               execvp(argv[1], argv+1);
+               die("slock: execvp %s failed: %s\n", argv[1], strerror(errno));
+       }
+

        /* Everything is now blank. Now wait for the correct password. */
 #ifdef HAVE_BSD_AUTH
        readpw(dpy);
        /* Everything is now blank. Now wait for the correct password. */
 #ifdef HAVE_BSD_AUTH
        readpw(dpy);