add option to run command after screen is locked

[slock.git] / slock.c

diff --git a/slock.c b/slock.c
index d6053af..ddf1074 100644 (file)
--- a/slock.c
+++ b/slock.c
@@ -60,16 +60,27 @@ die(const char *errstr, ...)
 
 #ifdef __linux__
 #include <fcntl.h>
+#include <linux/oom.h>
 
 static void
 dontkillme(void)
 {
        int fd;
+       int length;
+       char value[64];
 
        fd = open("/proc/self/oom_score_adj", O_WRONLY);
        if (fd < 0 && errno == ENOENT)
                return;
-       if (fd < 0 || write(fd, "-1000\n", 6) != 6 || close(fd) != 0)
+
+       /* convert OOM_SCORE_ADJ_MIN to string for writing */
+       length = snprintf(value, sizeof(value), "%d\n", OOM_SCORE_ADJ_MIN);
+
+       /* bail on truncation */
+       if (length >= sizeof(value))
+               die("buffer too small\n");
+
+       if (fd < 0 || write(fd, value, length) != length || close(fd) != 0)
                die("cannot disable the out-of-memory killer for this process\n");
 }
 #endif
@@ -176,7 +187,7 @@ readpw(Display *dpy, const char *pws)
                                break;
                        }
                        color = len ? INPUT : (failure || failonclear ? FAILED : INIT);
-                       if (oldc != color) {
+                       if (running && oldc != color) {
                                for (screen = 0; screen < nscreens; screen++) {
                                        XSetWindowBackground(dpy, locks[screen]->win, locks[screen]->colors[color]);
                                        XClearWindow(dpy, locks[screen]->win);
@@ -278,7 +289,7 @@ lockscreen(Display *dpy, int screen)
 static void
 usage(void)
 {
-       fprintf(stderr, "usage: slock [-v]\n");
+       fprintf(stderr, "usage: slock [-v|POST_LOCK_CMD]\n");
        exit(1);
 }
 
@@ -292,7 +303,8 @@ main(int argc, char **argv) {
 
        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__
@@ -328,6 +340,13 @@ main(int argc, char **argv) {
                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);