accidentally applied wrong (old) patch, fixing up...

[oweals/busybox.git] / miscutils / watchdog.c

diff --git a/miscutils/watchdog.c b/miscutils/watchdog.c
index 58a6065536f1d5c5b4da7ae28e38269eaaa69719..e342c13f3fc10d58f99f5a019a5fab7f9962e14c 100644 (file)
--- a/miscutils/watchdog.c
+++ b/miscutils/watchdog.c
@@ -3,49 +3,52 @@
  * Mini watchdog implementation for busybox
  *
  * Copyright (C) 2003  Paul Mundt <lethal@linux-sh.org>
+ * Copyright (C) 2006  Bernhard Fischer <busybox@busybox.net>
  *
  * Licensed under the GPL v2 or later, see the file LICENSE in this tarball.
  */
 
-#include <stdio.h>
-#include <fcntl.h>
-#include <unistd.h>
-#include <stdlib.h>
-#include <signal.h>
 #include "busybox.h"
 
-/* Userspace timer duration, in seconds */
-static unsigned int timer_duration = 30;
+#define OPT_FOREGROUND 0x01
+#define OPT_TIMER      0x02
 
 /* Watchdog file descriptor */
 static int fd;
 
 static void watchdog_shutdown(int ATTRIBUTE_UNUSED unused)
 {
-       write(fd, "V", 1);      /* Magic */
+       write(fd, "V", 1);      /* Magic, see watchdog-api.txt in kernel */
        close(fd);
        exit(0);
 }
 
 int watchdog_main(int argc, char **argv)
 {
-
+       unsigned opts;
+       unsigned timer_duration = 30; /* Userspace timer duration, in seconds */
        char *t_arg;
-       unsigned long flags;
-       flags = bb_getopt_ulflags(argc, argv, "t:", &t_arg);
-       if (flags & 1)
-               timer_duration = bb_xgetlarg(t_arg, 10, 0, INT_MAX);
+
+       opts = getopt32(argc, argv, "Ft:", &t_arg);
+
+       if (opts & OPT_TIMER)
+               timer_duration = xatou(t_arg);
 
        /* We're only interested in the watchdog device .. */
        if (optind < argc - 1 || argc == 1)
                bb_show_usage();
 
-       bb_xdaemon(0, 1);
+#ifdef BB_NOMMU
+       if (!(opts & OPT_FOREGROUND))
+               vfork_daemon_rexec(0, 1, argc, argv, "-F");
+#else
+       xdaemon(0, 1);
+#endif
 
        signal(SIGHUP, watchdog_shutdown);
        signal(SIGINT, watchdog_shutdown);
 
-       fd = bb_xopen(argv[argc - 1], O_WRONLY);
+       fd = xopen(argv[argc - 1], O_WRONLY);
 
        while (1) {
                /*