pointless whitespace/comment fixes, no code changes

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

diff --git a/miscutils/watchdog.c b/miscutils/watchdog.c
index ebbab2df3cf2cc15087f506254fc7bd4ae963d2d..f85138e119e2483bd4f5a7f0f8ca3dd5e4737bd9 100644 (file)
--- a/miscutils/watchdog.c
+++ b/miscutils/watchdog.c
@@ -3,63 +3,83 @@
  * Mini watchdog implementation for busybox
  *
  * Copyright (C) 2003  Paul Mundt <lethal@linux-sh.org>
- * Copyright (C) 2006  Bernhard Fischer <busybox@busybox.net>
+ * Copyright (C) 2006  Bernhard Reutner-Fischer <busybox@busybox.net>
+ * Copyright (C) 2008  Darius Augulis <augulis.darius@gmail.com>
  *
  * Licensed under the GPL v2 or later, see the file LICENSE in this tarball.
  */
 
-#include "busybox.h"
+#include "libbb.h"
+#include "linux/types.h" /* for __u32 */
+#include "linux/watchdog.h"
 
-#define OPT_FOREGROUND 0x01
-#define OPT_TIMER      0x02
+#define OPT_FOREGROUND  (1 << 0)
+#define OPT_STIMER      (1 << 1)
+#define OPT_HTIMER      (1 << 2)
 
-/* Watchdog file descriptor */
-static int fd;
-
-static void watchdog_shutdown(int ATTRIBUTE_UNUSED unused)
+static void watchdog_shutdown(int sig UNUSED_PARAM)
 {
-       write(fd, "V", 1);      /* Magic, see watchdog-api.txt in kernel */
-       close(fd);
-       exit(0);
+       static const char V = 'V';
+
+       write(3, &V, 1);        /* Magic, see watchdog-api.txt in kernel */
+       if (ENABLE_FEATURE_CLEAN_UP)
+               close(3);
+       exit(EXIT_SUCCESS);
 }
 
+int watchdog_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
 int watchdog_main(int argc, char **argv)
 {
-       unsigned long opts;
-       unsigned long timer_duration = 30; /* Userspace timer duration, in seconds */
-       char *t_arg;
+       static const struct suffix_mult suffixes[] = {
+               { "ms", 1 },
+               { "", 1000 },
+               { }
+       };
+
+       unsigned opts;
+       unsigned stimer_duration; /* how often to restart */
+       unsigned htimer_duration = 60000; /* reboots after N ms if not restarted */
+       char *st_arg;
+       char *ht_arg;
 
-       opts = bb_getopt_ulflags(argc, argv, "Ft:", &t_arg);
+       opt_complementary = "=1"; /* must have exactly 1 argument */
+       opts = getopt32(argv, "Ft:T:", &st_arg, &ht_arg);
 
-       if (opts & OPT_TIMER)
-               timer_duration = bb_xgetlarg(t_arg, 10, 0, INT_MAX);
+       if (opts & OPT_HTIMER)
+               htimer_duration = xatou_sfx(ht_arg, suffixes);
+       stimer_duration = htimer_duration / 2;
+       if (opts & OPT_STIMER)
+               stimer_duration = xatou_sfx(st_arg, suffixes);
 
-       /* We're only interested in the watchdog device .. */
-       if (optind < argc - 1 || argc == 1)
-               bb_show_usage();
+       bb_signals(BB_FATAL_SIGS, watchdog_shutdown);
 
-#ifdef BB_NOMMU
-       if (!(opts & OPT_FOREGROUND))
-               vfork_daemon_rexec(0, 1, argc, argv, "-F");
+       /* 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
-       xdaemon(0, 1);
+       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",
+               stimer_duration, htimer_duration * 1000);
 #endif
 
-       signal(SIGHUP, watchdog_shutdown);
-       signal(SIGINT, watchdog_shutdown);
-
-       fd = xopen(argv[argc - 1], O_WRONLY);
+       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(fd, "\0", 1);
-               sleep(timer_duration);
+               write(3, "", 1); /* write zero byte */
+               usleep(stimer_duration * 1000L);
        }
-
-       watchdog_shutdown(0);
-
-       return EXIT_SUCCESS;
+       return EXIT_SUCCESS; /* - not reached, but gcc 4.2.1 is too dumb! */
 }