Now that we have xopen3(), it's just plain unclean to have xopen() with

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

diff --git a/miscutils/watchdog.c b/miscutils/watchdog.c
index 55fee8a40cce6d121ed69f02cf6195539f8cd7df..ebbab2df3cf2cc15087f506254fc7bd4ae963d2d 100644 (file)
--- a/miscutils/watchdog.c
+++ b/miscutils/watchdog.c
@@ -9,40 +9,46 @@
  */
 
 #include "busybox.h"
-#include <stdio.h>
-#include <fcntl.h>
-#include <unistd.h>
-#include <stdlib.h>
-#include <signal.h>
+
+#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 long opts;
        unsigned long timer_duration = 30; /* Userspace timer duration, in seconds */
        char *t_arg;
 
-       if (bb_getopt_ulflags(argc, argv, "t:", &t_arg))
+       opts = bb_getopt_ulflags(argc, argv, "Ft:", &t_arg);
+
+       if (opts & OPT_TIMER)
                timer_duration = bb_xgetlarg(t_arg, 10, 0, INT_MAX);
 
        /* 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) {
                /*