diff options
| author | Rob Landley <rob@landley.net> | 2020-10-22 19:48:15 -0500 |
|---|---|---|
| committer | Rob Landley <rob@landley.net> | 2020-10-22 19:48:15 -0500 |
| commit | 660e6a384d8c7b32a8486a0aeb31f75939a99b75 (patch) | |
| tree | 7607378be349e3ac4a7df9099c9a0075520f16e1 /toys | |
| parent | 0030729a09896602b55571afb8be7fa9b29b730c (diff) | |
| download | toybox-660e6a384d8c7b32a8486a0aeb31f75939a99b75.tar.gz | |
Add nommu-able xvdaemon() and use it to remove some TOYBOX_FORK dependencies
Diffstat (limited to 'toys')
| -rw-r--r-- | toys/net/sntp.c | 5 | ||||
| -rw-r--r-- | toys/other/watchdog.c | 3 |
2 files changed, 3 insertions, 5 deletions
diff --git a/toys/net/sntp.c b/toys/net/sntp.c index dae19485..161cab46 100644 --- a/toys/net/sntp.c +++ b/toys/net/sntp.c @@ -11,7 +11,6 @@ USE_SNTP(NEWTOY(sntp, ">1M :m :Sp:t#<0=1>16asdDqr#<4>17=10[!as]", TOYFLAG_USR|TO config SNTP bool "sntp" default y - depends on TOYBOX_FORK help usage: sntp [-saSdDq] [-r SHIFT] [-mM[ADDRESS]] [-p PORT] [SERVER] @@ -79,6 +78,8 @@ void sntp_main(void) union socksaddr sa; int fd, tries = 0; + if (FLAG(d)) xvdaemon(); + if (FLAG(M)) toys.optflags |= FLAG_S; if (!(FLAG(S)||FLAG(m)) && !*toys.optargs) error_exit("Need -SMm or SERVER address"); @@ -88,8 +89,6 @@ void sntp_main(void) ai = xgetaddrinfo(*toys.optargs, TT.p, AF_UNSPEC, SOCK_DGRAM, IPPROTO_UDP, AI_PASSIVE*!*toys.optargs); - if (FLAG(d) && daemon(0, 0)) perror_exit("daemonize"); - // Act as server if necessary if (FLAG(S)||FLAG(m)) { fd = xbindany(ai); diff --git a/toys/other/watchdog.c b/toys/other/watchdog.c index a2e4fa01..232d82c0 100644 --- a/toys/other/watchdog.c +++ b/toys/other/watchdog.c @@ -9,7 +9,6 @@ USE_WATCHDOG(NEWTOY(watchdog, "<1>1Ft#=4<1T#=60<1", TOYFLAG_NEEDROOT|TOYFLAG_BIN config WATCHDOG bool "watchdog" default y - depends on TOYBOX_FORK help usage: watchdog [-F] [-t UPDATE] [-T DEADLINE] DEV @@ -38,7 +37,7 @@ void safe_shutdown(int ignored) { void watchdog_main(void) { - if (!FLAG(F) && daemon(1, 1)) perror_exit("failed to daemonize"); + if (!FLAG(F)) xvdaemon(); xsignal(SIGTERM, safe_shutdown); xsignal(SIGINT, safe_shutdown); xioctl(TT.fd = xopen(*toys.optargs, O_WRONLY), WDIOC_SETTIMEOUT, &TT.T); |