X-Git-Url: https://git.danieliu.xyz/?a=blobdiff_plain;f=slock.c;h=4531f95a5cd67cc3e767794e6144fdcb08663c92;hb=a6dc051e3744ce5b14c54d2d246d3e8258207e76;hp=df2d3c6beb2fa2af394bab7202aa0bc5493436b7;hpb=9dfe0ce531023bf63c0e518b07ee97cf0cac742a;p=slock.git

diff --git a/slock.c b/slock.c
index df2d3c6..4531f95 100644
--- a/slock.c
+++ b/slock.c
@@ -60,28 +60,20 @@ 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)
+	if (fd < 0 && errno == ENOENT) {
 		return;
-
-	/* 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");
+	}
+	if (fd < 0 || write(fd, "-1000\n", (sizeof("-1000\n") - 1)) !=
+	    (sizeof("-1000\n") - 1) || close(fd) != 0) {
+		die("can't tame the oom-killer. is suid or sgid set?\n");
+	}
 }
 #endif
 
@@ -280,27 +272,15 @@ lockscreen(Display *dpy, int screen)
 	return NULL;
 }
 
-static void
-usage(void)
-{
-	fprintf(stderr, "usage: slock [-v|POST_LOCK_CMD]\n");
-	exit(1);
-}
-
 int
-main(int argc, char **argv) {
+main(int argc, char **argv)
+{
 #ifndef HAVE_BSD_AUTH
 	const char *pws;
 #endif
 	Display *dpy;
 	int screen;
 
-	if ((argc == 2) && !strcmp("-v", argv[1]))
-		die("slock-%s, © 2006-2015 slock engineers\n", VERSION);
-
-	if ((argc == 2) && !strcmp("-h", argv[1]))
-		usage();
-
 #ifdef __linux__
 	dontkillme();
 #endif