X-Git-Url: https://git.danieliu.xyz/?a=blobdiff_plain;f=slock.c;h=9ec2f717ec00865389303c9893408e3e0d2a5ff4;hb=137f0076c2986306109d637599b885bdaf92cd58;hp=8ed59ca07a9719aeefa89d06c79af89da83a88e0;hpb=d8bec0f6fdc8a246d78cb488a0068954b46fcb29;p=slock.git

diff --git a/slock.c b/slock.c
index 8ed59ca..9ec2f71 100644
--- a/slock.c
+++ b/slock.c
@@ -65,19 +65,27 @@ die(const char *errstr, ...)
 
 #ifdef __linux__
 #include <fcntl.h>
+#include <linux/oom.h>
 
 static void
 dontkillme(void)
 {
-	int fd;
+	FILE *f;
+	const char oomfile[] = "/proc/self/oom_score_adj";
 
-	fd = open("/proc/self/oom_score_adj", O_WRONLY);
-	if (fd < 0 && errno == ENOENT) {
-		return;
+	if (!(f = fopen(oomfile, "w"))) {
+		if (errno == ENOENT)
+			return;
+		die("slock: fopen %s: %s\n", oomfile, strerror(errno));
 	}
-	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");
+	fprintf(f, "%d", OOM_SCORE_ADJ_MIN);
+	if (fclose(f)) {
+		if (errno == EACCES)
+			die("slock: unable to disable OOM killer. "
+			    "suid or sgid set?\n");
+		else
+			die("slock: fclose %s: %s\n", oomfile,
+			    strerror(errno));
 	}
 }
 #endif
@@ -282,7 +290,7 @@ lockscreen(Display *dpy, int screen)
 static void
 usage(void)
 {
-	die("usage: slock [-v | cmd [arg ...]]\n");
+	die("usage: slock [-v] [cmd [arg ...]]\n");
 }
 
 int