From: Marek Polacek <mmpolacek@gmail.com>
Date: Sun, 17 Oct 2010 09:01:22 +0000 (+0200)
Subject: ctrlaltdel: use err() instead of fprintf() and exit()
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0c3e5202406ce5ad9ee5ce018ce383607fd84c8c;p=util-linux

ctrlaltdel: use err() instead of fprintf() and exit()

[kzak@redhat.com: - remove unnecessary program name from err(),
                  - use program_invocation_short_name]

Signed-off-by: Marek Polacek <mmpolacek@gmail.com>
Signed-off-by: Karel Zak <kzak@redhat.com>
---

diff --git a/sys-utils/ctrlaltdel.c b/sys-utils/ctrlaltdel.c
index beabc605..cfab79a3 100644
--- a/sys-utils/ctrlaltdel.c
+++ b/sys-utils/ctrlaltdel.c
@@ -1,48 +1,37 @@
 /*
  * ctrlaltdel.c - Set the function of the Ctrl-Alt-Del combination
  * Created 4-Jul-92 by Peter Orbaek <poe@daimi.aau.dk>
- * ftp://ftp.daimi.aau.dk/pub/linux/poe/
  * 1999-02-22 Arkadiusz Mi¶kiewicz <misiek@pld.ORG.PL>
  * - added Native Language Support
- *
  */
 
+#include <err.h>
 #include <stdio.h>
-#include <unistd.h>
 #include <stdlib.h>
 #include <string.h>
+#include <errno.h>
 #include "linux_reboot.h"
 #include "nls.h"
 
-int
-main(int argc, char *argv[]) {
-
+int main(int argc, char *argv[])
+{
 	setlocale(LC_ALL, "");
 	bindtextdomain(PACKAGE, LOCALEDIR);
 	textdomain(PACKAGE);
-	
-
-	if(geteuid()) {
-		fprintf(stderr,
-		    _("You must be root to set the Ctrl-Alt-Del behaviour.\n"));
-		exit(1);
-	}
 
-	if(argc == 2 && !strcmp("hard", argv[1])) {
-		if(my_reboot(LINUX_REBOOT_CMD_CAD_ON) < 0) {
-			perror("ctrlaltdel: reboot");
-			exit(1);
-		}
-	} else if(argc == 2 && !strcmp("soft", argv[1])) {
-		if(my_reboot(LINUX_REBOOT_CMD_CAD_OFF) < 0) {
-			perror("ctrlaltdel: reboot");
-			exit(1);
-		}
-	} else {
-		fprintf(stderr, _("Usage: ctrlaltdel hard|soft\n"));
-		exit(1);
-	}
-	exit(0);
-}
+	if (geteuid())
+		errx(EXIT_FAILURE,
+		     _("You must be root to set the Ctrl-Alt-Del behaviour"));
 
+	if (argc == 2 && !strcmp("hard", argv[1])) {
+		if (my_reboot(LINUX_REBOOT_CMD_CAD_ON) < 0)
+			err(EXIT_FAILURE, "reboot");
+	} else if (argc == 2 && !strcmp("soft", argv[1])) {
+		if (my_reboot(LINUX_REBOOT_CMD_CAD_OFF) < 0)
+			err(EXIT_FAILURE, "reboot");
+	} else
+		errx(EXIT_FAILURE, _("Usage: %s hard|soft"),
+				program_invocation_short_name);
 
+	return EXIT_SUCCESS;
+}