hush: initial stab at brace expansion support

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

diff --git a/miscutils/watchdog.c b/miscutils/watchdog.c
index 9bcd4b8740e10962b0eefb8803fd7d43aa5522a3..8e961f0c19a9e31dfcc05ada4d7c62abc6956cdc 100644 (file)
--- a/miscutils/watchdog.c
+++ b/miscutils/watchdog.c
@@ -10,6 +10,7 @@
  */
 
 #include "libbb.h"
+#include "linux/types.h" /* for __u32 */
 #include "linux/watchdog.h"
 
 #define OPT_FOREGROUND  (1 << 0)
@@ -32,7 +33,7 @@ int watchdog_main(int argc, char **argv)
        static const struct suffix_mult suffixes[] = {
                { "ms", 1 },
                { "", 1000 },
-               { }
+               { "", 0 }
        };
 
        unsigned opts;
@@ -44,6 +45,15 @@ int watchdog_main(int argc, char **argv)
        opt_complementary = "=1"; /* must have exactly 1 argument */
        opts = getopt32(argv, "Ft:T:", &st_arg, &ht_arg);
 
+       /* We need to daemonize *before* opening the watchdog as many drivers
+        * will only allow one process at a time to do so.  Since daemonizing
+        * is not perfect (child may run before parent finishes exiting), we
+        * can't rely on parent exiting before us (let alone *cleanly* releasing
+        * the watchdog fd -- something else that may not even be allowed).
+        */
+       if (!(opts & OPT_FOREGROUND))
+               bb_daemonize_or_rexec(DAEMON_CHDIR_ROOT, argv);
+
        if (opts & OPT_HTIMER)
                htimer_duration = xatou_sfx(ht_arg, suffixes);
        stimer_duration = htimer_duration / 2;
@@ -55,21 +65,30 @@ int watchdog_main(int argc, char **argv)
        /* Use known fd # - avoid needing global 'int fd' */
        xmove_fd(xopen(argv[argc - 1], O_WRONLY), 3);
 
+       /* WDIOC_SETTIMEOUT takes seconds, not milliseconds */
+       htimer_duration = htimer_duration / 1000;
+#ifndef WDIOC_SETTIMEOUT
+# error WDIOC_SETTIMEOUT is not defined, cannot compile watchdog applet
+#else
+# if defined WDIOC_SETOPTIONS && defined WDIOS_ENABLECARD
+       {
+               static const int enable = WDIOS_ENABLECARD;
+               ioctl_or_warn(3, WDIOC_SETOPTIONS, (void*) &enable);
+       }
+# endif
        ioctl_or_warn(3, WDIOC_SETTIMEOUT, &htimer_duration);
+#endif
+
 #if 0
        ioctl_or_warn(3, WDIOC_GETTIMEOUT, &htimer_duration);
-       printf("watchdog: SW timer is %dms, HW timer is %dms\n",
+       printf("watchdog: SW timer is %dms, HW timer is %ds\n",
                stimer_duration, htimer_duration * 1000);
 #endif
 
-       if (!(opts & OPT_FOREGROUND)) {
-               bb_daemonize_or_rexec(DAEMON_CHDIR_ROOT, argv);
-       }
-
        while (1) {
                /*
-                * Make sure we clear the counter before sleeping, as the counter value
-                * is undefined at this point -- PFM
+                * Make sure we clear the counter before sleeping,
+                * as the counter value is undefined at this point -- PFM
                 */
                write(3, "", 1); /* write zero byte */
                usleep(stimer_duration * 1000L);