slock with DPMS and other tweaks
0
fork

Configure Feed

Select the types of activity you want to include in your feed.

code style fix

+9 -18
+9 -18
slock.c
··· 94 94 struct passwd *pw; 95 95 96 96 errno = 0; 97 - pw = getpwuid(getuid()); 98 - if (!pw) { 97 + if (!(pw = getpwuid(getuid()))) { 99 98 if (errno) 100 99 die("slock: getpwuid: %s\n", strerror(errno)); 101 100 else 102 101 die("slock: cannot retrieve password entry\n"); 103 102 } 104 - rval = pw->pw_passwd; 103 + rval = pw->pw_passwd; 105 104 106 105 #if HAVE_SHADOW_H 107 106 if (rval[0] == 'x' && rval[1] == '\0') { 108 107 struct spwd *sp; 109 - sp = getspnam(getenv("USER")); 110 - if (!sp) 108 + if (!(sp = getspnam(getenv("USER")))) 111 109 die("slock: cannot retrieve shadow entry (make sure to suid or sgid slock)\n"); 112 110 rval = sp->sp_pwdp; 113 111 } ··· 180 178 --len; 181 179 break; 182 180 default: 183 - if (num && !iscntrl((int) buf[0]) && (len + num < sizeof(passwd))) { 181 + if (num && !iscntrl((int)buf[0]) && (len + num < sizeof(passwd))) { 184 182 memcpy(passwd + len, buf, num); 185 183 len += num; 186 184 } ··· 232 230 XSetWindowAttributes wa; 233 231 Cursor invisible; 234 232 235 - if (dpy == NULL || screen < 0) 236 - return NULL; 237 - 238 - lock = malloc(sizeof(Lock)); 239 - if (lock == NULL) 233 + if (dpy == NULL || screen < 0 || !(lock = malloc(sizeof(Lock)))) 240 234 return NULL; 241 235 242 236 lock->screen = screen; 243 - 244 237 lock->root = RootWindow(dpy, lock->screen); 245 238 246 239 for (i = 0; i < NUMCOLS; i++) { ··· 266 259 break; 267 260 usleep(1000); 268 261 } 269 - if (running && (len > 0)) { 262 + if (running && len) { 270 263 for (len = 1000; len; len--) { 271 264 if (XGrabKeyboard(dpy, lock->root, True, GrabModeAsync, GrabModeAsync, CurrentTime) == GrabSuccess) 272 265 break; ··· 278 271 if (!running) { 279 272 unlockscreen(dpy, lock); 280 273 lock = NULL; 281 - } 282 - else { 274 + } else { 283 275 XSelectInput(dpy, lock->root, SubstructureNotifyMask); 284 276 } 285 277 ··· 323 315 rr = XRRQueryExtension(dpy, &rrevbase, &rrerrbase); 324 316 /* Get the number of screens in display "dpy" and blank them all. */ 325 317 nscreens = ScreenCount(dpy); 326 - locks = malloc(sizeof(Lock *) * nscreens); 327 - if (locks == NULL) 318 + if (!(locks = malloc(sizeof(Lock*) * nscreens))) 328 319 die("slock: malloc: %s\n", strerror(errno)); 329 320 int nlocks = 0; 330 321 for (screen = 0; screen < nscreens; screen++) { 331 - if ( (locks[screen] = lockscreen(dpy, screen)) != NULL) 322 + if ((locks[screen] = lockscreen(dpy, screen)) != NULL) 332 323 nlocks++; 333 324 } 334 325 XSync(dpy, False);