Changeset 1765 in MondoRescue for branches/2.2.5/mindi-busybox/miscutils/watchdog.c

Timestamp:

Nov 4, 2007, 3:16:40 AM (16 years ago)

Author:

Bruno Cornec

Message:

Update to busybox 1.7.2

File:

• branches/2.2.5/mindi-busybox/miscutils/watchdog.c (modified) (2 diffs)

branches/2.2.5/mindi-busybox/miscutils/watchdog.c

@@ -9 +9 @@
  */
 
-#include "busybox.h"
-#include <stdio.h>
-#include <fcntl.h>
-#include <unistd.h>
-#include <stdlib.h>
-#include <signal.h>
+#include "libbb.h"
 
 #define OPT_FOREGROUND 0x01
 #define OPT_TIMER      0x02
 
-/* Watchdog file descriptor */
-static int fd;
-
-static void watchdog_shutdown(int ATTRIBUTE_UNUSED unused)
+static void watchdog_shutdown(int ATTRIBUTE_UNUSED sig) ATTRIBUTE_NORETURN;
+static void watchdog_shutdown(int ATTRIBUTE_UNUSED sig)
 {
-    write(fd, "V", 1);  /* Magic, see watchdog-api.txt in kernel */
-    close(fd);
+    write(3, "V", 1);   /* Magic, see watchdog-api.txt in kernel */
+    if (ENABLE_FEATURE_CLEAN_UP)
+        close(3);
     exit(0);
 }
 
+int watchdog_main(int argc, char **argv);
 int watchdog_main(int argc, char **argv)
 {
-    unsigned long opts;
-    unsigned long timer_duration = 30; /* Userspace timer duration, in seconds */
+    unsigned opts;
+    unsigned timer_duration = 30; /* Userspace timer duration, in seconds */
     char *t_arg;
 
-    opts = bb_getopt_ulflags(argc, argv, "Ft:", &t_arg);
+    opt_complementary = "=1"; /* must have 1 argument */
+    opts = getopt32(argv, "Ft:", &t_arg);
 
     if (opts & OPT_TIMER)
-        timer_duration = bb_xgetlarg(t_arg, 10, 0, INT_MAX);
+        timer_duration = xatou(t_arg);
 
-    /* We're only interested in the watchdog device .. */
-    if (optind < argc - 1 || argc == 1)
-        bb_show_usage();
-
-#ifdef BB_NOMMU
-    if (!(opts & OPT_FOREGROUND))
-        vfork_daemon_rexec(0, 1, argc, argv, "-F");
-#else
-    bb_xdaemon(0, 1);
-#endif
+    if (!(opts & OPT_FOREGROUND)) {
+        bb_daemonize_or_rexec(DAEMON_CHDIR_ROOT, argv);
+    }
 
     signal(SIGHUP, watchdog_shutdown);
     signal(SIGINT, watchdog_shutdown);
 
-    fd = bb_xopen(argv[argc - 1], O_WRONLY);
+    /* Use known fd # - avoid needing global 'int fd' */
+    xmove_fd(xopen(argv[argc - 1], O_WRONLY), 3);
 
     while (1) {
@@ -61 +51 @@
          * is undefined at this point -- PFM
          */
-        write(fd, "\0", 1);
+        write(3, "", 1);
         sleep(timer_duration);
     }
 
     watchdog_shutdown(0);
-
-    return EXIT_SUCCESS;
+    /* return EXIT_SUCCESS; */
 }