diff options
author | Rob Landley <rob@landley.net> | 2006-08-03 19:41:12 +0400 |
---|---|---|
committer | Rob Landley <rob@landley.net> | 2006-08-03 19:41:12 +0400 |
commit | d921b2ecc0d294ad4bf8c7458fc52a60c28727d2 (patch) | |
tree | e4a2769349867c441cf2983d83097bb66701a733 /miscutils/watchdog.c | |
parent | 6dce0b6fa79f2d4bb7e9d90e1fbc0f6beb25f855 (diff) |
Remove bb_ prefixes from xfuncs.c (and a few other places), consolidate
things like xasprintf() into xfuncs.c, remove xprint_file_by_name() (it only
had one user), clean up lots of #includes... General cleanup pass. What I've
been doing for the last couple days.
And it conflicts! I've removed httpd.c from this checkin due to somebody else
touching that file. It builds for me. I have to catch a bus. (Now you know
why I'm looking forward to Mercurial.)
Diffstat (limited to 'miscutils/watchdog.c')
-rw-r--r-- | miscutils/watchdog.c | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/miscutils/watchdog.c b/miscutils/watchdog.c index ddd349d9b..ebbab2df3 100644 --- a/miscutils/watchdog.c +++ b/miscutils/watchdog.c @@ -9,11 +9,6 @@ */ #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 @@ -47,13 +42,13 @@ int watchdog_main(int argc, char **argv) if (!(opts & OPT_FOREGROUND)) vfork_daemon_rexec(0, 1, argc, argv, "-F"); #else - bb_xdaemon(0, 1); + 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) { /* |