From: Karel Zak <kzak@redhat.com>
Date: Tue, 27 Oct 2015 10:56:51 +0000 (+0100)
Subject: ctrlaltdel: use path.h to read /proc
X-Git-Tag: v2.28-rc1~297
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=741d478eeba5af51d862d650010f8b3de4ce6d3f;p=thirdparty%2Futil-linux.git

ctrlaltdel: use path.h to read /proc

Signed-off-by: Karel Zak <kzak@redhat.com>
---

diff --git a/sys-utils/Makemodule.am b/sys-utils/Makemodule.am
index 3d28ff1f6f..8f65eb735f 100644
--- a/sys-utils/Makemodule.am
+++ b/sys-utils/Makemodule.am
@@ -95,6 +95,7 @@ if BUILD_CTRLALTDEL
 sbin_PROGRAMS += ctrlaltdel
 dist_man_MANS += sys-utils/ctrlaltdel.8
 ctrlaltdel_SOURCES = sys-utils/ctrlaltdel.c
+ctrlaltdel_LDADD = $(LDADD) libcommon.la
 endif
 
 if BUILD_FSFREEZE
diff --git a/sys-utils/ctrlaltdel.c b/sys-utils/ctrlaltdel.c
index ffdad6a8a7..438892585d 100644
--- a/sys-utils/ctrlaltdel.c
+++ b/sys-utils/ctrlaltdel.c
@@ -15,6 +15,7 @@
 #include "c.h"
 #include "closestream.h"
 #include "pathnames.h"
+#include "path.h"
 
 static void __attribute__ ((__noreturn__)) usage(FILE * out)
 {
@@ -33,16 +34,8 @@ static void __attribute__ ((__noreturn__)) usage(FILE * out)
 
 static int get_cad(void)
 {
-	FILE *fp;
-	int val;
+	uint64_t val = path_read_u64(_PATH_PROC_CTRL_ALT_DEL);
 
-	if (!(fp = fopen(_PATH_PROC_CTRL_ALT_DEL, "r"))) {
-		warn("%s", _PATH_PROC_CTRL_ALT_DEL);
-		return EXIT_FAILURE;
-	}
-	if (fscanf(fp, "%d", &val) != 1)
-		val = -1;
-	fclose(fp);
 	switch (val) {
 	case 0:
 		fputs("soft\n", stdout);
@@ -52,7 +45,7 @@ static int get_cad(void)
 		break;
 	default:
 		printf("%s hard\n", _("implicit"));
-		warnx(_("unexpected value in %s: %d"), _PATH_PROC_CTRL_ALT_DEL, val);
+		warnx(_("unexpected value in %s: %ju"), _PATH_PROC_CTRL_ALT_DEL, val);
 		return EXIT_FAILURE;
 	}
 	return EXIT_SUCCESS;