[hackers] [slock] Move screen unlocking inside cleanup() || Quentin Rameau

From: <git_AT_suckless.org>
Date: Fri, 2 Sep 2016 11:49:05 +0200 (CEST)

commit 39fb855aa100c5a5a8b7f3b6cc1fbb2135fe7dde
Author: Quentin Rameau <quinq_AT_fifth.space>
AuthorDate: Thu Sep 1 13:47:05 2016 +0200
Commit: Markus Teich <markus.teich_AT_stusta.mhn.de>
CommitDate: Fri Sep 2 10:50:32 2016 +0200

    Move screen unlocking inside cleanup()

diff --git a/slock.c b/slock.c
index 97c7489..0682279 100644
--- a/slock.c
+++ b/slock.c
_AT_@ -234,6 +234,11 @@ unlockscreen(Display *dpy, Lock *lock)
 static void
 cleanup(Display *dpy)
 {
+ int s;
+
+ for (s = 0; s < nscreens; ++s)
+ unlockscreen(dpy, locks[s]);
+
         free(locks);
         XCloseDisplay(dpy);
 }
_AT_@ -305,8 +310,6 @@ lockscreen(Display *dpy, int screen)
                 fprintf(stderr, "slock: unable to grab mouse pointer for screen %d\n", screen);
         if (kbgrab != GrabSuccess)
                 fprintf(stderr, "slock: unable to grab keyboard for screen %d\n", screen);
- running = 0;
- unlockscreen(dpy, lock);
         return NULL;
 }
 
_AT_@ -359,19 +362,21 @@ main(int argc, char **argv) {
 
         /* get number of screens in display "dpy" and blank them */
         nscreens = ScreenCount(dpy);
- if (!(locks = malloc(sizeof(Lock *) * nscreens))) {
+ if (!(locks = calloc(nscreens, sizeof(Lock *)))) {
                 XCloseDisplay(dpy);
                 die("slock: out of memory\n");
         }
         for (nlocks = 0, s = 0; s < nscreens; s++) {
                 if ((locks[s] = lockscreen(dpy, s)) != NULL)
                         nlocks++;
+ else
+ break;
         }
         XSync(dpy, 0);
 
- /* did we actually manage to lock anything? */
- if (nlocks == 0) {
- /* nothing to protect */
+ /* did we manage to lock everything? */
+ if (nlocks != nscreens) {
+ running = 0;
                 cleanup(dpy);
                 return 1;
         }
_AT_@ -400,9 +405,6 @@ main(int argc, char **argv) {
 #endif
 
         /* password ok, unlock everything and quit */
- for (s = 0; s < nscreens; s++)
- unlockscreen(dpy, locks[s]);
-
         cleanup(dpy);
 
         return 0;
Received on Fri Sep 02 2016 - 11:49:05 CEST