diff options
| author | Karel Zak | 2015-10-27 11:56:51 +0100 |
|---|---|---|
| committer | Karel Zak | 2015-10-27 11:56:51 +0100 |
| commit | 741d478eeba5af51d862d650010f8b3de4ce6d3f (patch) | |
| tree | 313ce3944d47295325695b44deefe0819e78b81d /sys-utils/ctrlaltdel.c | |
| parent | ctrlaltdel: display setting when ran without arguments (diff) | |
| download | kernel-qcow2-util-linux-741d478eeba5af51d862d650010f8b3de4ce6d3f.tar.gz kernel-qcow2-util-linux-741d478eeba5af51d862d650010f8b3de4ce6d3f.tar.xz kernel-qcow2-util-linux-741d478eeba5af51d862d650010f8b3de4ce6d3f.zip | |
ctrlaltdel: use path.h to read /proc
Signed-off-by: Karel Zak <kzak@redhat.com>
Diffstat (limited to 'sys-utils/ctrlaltdel.c')
| -rw-r--r-- | sys-utils/ctrlaltdel.c | 13 |
1 files changed, 3 insertions, 10 deletions
diff --git a/sys-utils/ctrlaltdel.c b/sys-utils/ctrlaltdel.c index ffdad6a8a..438892585 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; |