X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=init%2Fhalt.c;h=d5c22a8ac5f72572b5d7e2f13505cdea9f0e16cd;hb=794687947fe9eb15b2512a0d9645d827348c5f6f;hp=38ca38222570aba64bd5dd440571b3b492ddd99f;hpb=0a7c8ef6e220b5f8fff4f2cb0af630255a2a6a58;p=oweals%2Fbusybox.git

diff --git a/init/halt.c b/init/halt.c
index 38ca38222..d5c22a8ac 100644
--- a/init/halt.c
+++ b/init/halt.c
@@ -4,41 +4,56 @@
  *
  * Copyright 2006 by Rob Landley <rob@landley.net>
  *
- * Licensed under GPLv2 or later, see file LICENSE in this tarball for details.
+ * Licensed under GPL version 2, see file LICENSE in this tarball for details.
  */
 
-#include <signal.h>
-#include <sys/reboot.h>
 #include "busybox.h"
+#include <sys/reboot.h>
 
-#include <unistd.h>
-
+int halt_main(int argc, char *argv[]);
 int halt_main(int argc, char *argv[])
 {
-	static const int magic[] = {RB_HALT_SYSTEM, RB_POWER_OFF, RB_AUTOBOOT};
-	static const int signals[] = {SIGUSR1, SIGUSR2, SIGTERM};
+	static const int magic[] = {
+#ifdef RB_HALT_SYSTEM
+RB_HALT_SYSTEM,
+#elif defined RB_HALT
+RB_HALT,
+#endif
+#ifdef RB_POWER_OFF
+RB_POWER_OFF,
+#elif defined RB_POWERDOWN
+RB_POWERDOWN,
+#endif
+RB_AUTOBOOT
+	};
+	static const int signals[] = { SIGUSR1, SIGUSR2, SIGTERM };
 
-	char *delay = "hpr";
+	char *delay;
 	int which, flags, rc = 1;
 
 	/* Figure out which applet we're running */
-	for(which=0;delay[which]!=*bb_applet_name;which++);
+	for (which = 0; "hpr"[which] != *applet_name; which++);
 
 	/* Parse and handle arguments */
-	flags = bb_getopt_ulflags(argc, argv, "d:nf", &delay);
-	if (flags&1) sleep(atoi(delay));
-	if (!(flags&2)) sync();
-	
+	flags = getopt32(argc, argv, "d:nf", &delay);
+	if (flags & 1) sleep(xatou(delay));
+	if (!(flags & 2)) sync();
+
 	/* Perform action. */
 	if (ENABLE_INIT && !(flags & 4)) {
 		if (ENABLE_FEATURE_INITRD) {
-			long *pidlist=find_pid_by_name("linuxrc");
-			if (*pidlist>0) rc = kill(*pidlist,signals[which]);
-			if (ENABLE_FEATURE_CLEAN_UP) free(pidlist);
+			pid_t *pidlist = find_pid_by_name("linuxrc");
+			if (pidlist[0] > 0)
+				rc = kill(pidlist[0], signals[which]);
+			if (ENABLE_FEATURE_CLEAN_UP)
+				free(pidlist);
 		}
-		if (rc) rc = kill(1,signals[which]);
-	} else rc = reboot(magic[which]);
+		if (rc)
+			rc = kill(1, signals[which]);
+	} else
+		rc = reboot(magic[which]);
 
-	if (rc) bb_error_msg("No.");
+	if (rc)
+		bb_error_msg("no");
 	return rc;
 }