diff options
author | aldot <aldot@69ca8d6d-28ef-0310-b511-8ec308f3f277> | 2006-05-31 10:19:51 +0000 |
---|---|---|
committer | aldot <aldot@69ca8d6d-28ef-0310-b511-8ec308f3f277> | 2006-05-31 10:19:51 +0000 |
commit | 673686ee89d45c75d6aa0e9d7797ad979a28ed5b (patch) | |
tree | 4bcf7032041b501464f38ff9715f98453bebcbaf /networking | |
parent | d3ff731ada83714a84a18bdf36a0025f5ea94a84 (diff) | |
download | busybox-w32-673686ee89d45c75d6aa0e9d7797ad979a28ed5b.tar.gz busybox-w32-673686ee89d45c75d6aa0e9d7797ad979a28ed5b.tar.bz2 busybox-w32-673686ee89d45c75d6aa0e9d7797ad979a28ed5b.zip |
- s/defined(__uClinux__)/BB_NOMMU/
This needs a second pass to:
+ add bb_daemon(unsigned char no_chdir, unsigned char no_close, const char*flag)
+ eventually globally export argc and argv, so we don't need to pass it to
bb_daemon().
git-svn-id: svn://busybox.net/trunk/busybox@15244 69ca8d6d-28ef-0310-b511-8ec308f3f277
Diffstat (limited to 'networking')
-rw-r--r-- | networking/dnsd.c | 8 | ||||
-rw-r--r-- | networking/inetd.c | 6 |
2 files changed, 7 insertions, 7 deletions
diff --git a/networking/dnsd.c b/networking/dnsd.c index 58a8fc1d2..f8bd07e10 100644 --- a/networking/dnsd.c +++ b/networking/dnsd.c | |||
@@ -92,7 +92,7 @@ static void convname(char *a, uint8_t *q) | |||
92 | } | 92 | } |
93 | 93 | ||
94 | /* | 94 | /* |
95 | * Insert length of substrings insetad of dots | 95 | * Insert length of substrings instead of dots |
96 | */ | 96 | */ |
97 | static void undot(uint8_t * rip) | 97 | static void undot(uint8_t * rip) |
98 | { | 98 | { |
@@ -393,12 +393,12 @@ int dnsd_main(int argc, char **argv) | |||
393 | } | 393 | } |
394 | 394 | ||
395 | if(is_daemon()) | 395 | if(is_daemon()) |
396 | #if defined(__uClinux__) | 396 | #ifdef BB_NOMMU |
397 | /* reexec for vfork() do continue parent */ | 397 | /* reexec for vfork() do continue parent */ |
398 | vfork_daemon_rexec(1, 0, argc, argv, "-d"); | 398 | vfork_daemon_rexec(1, 0, argc, argv, "-d"); |
399 | #else /* uClinux */ | 399 | #else |
400 | bb_xdaemon(1, 0); | 400 | bb_xdaemon(1, 0); |
401 | #endif /* uClinuvx */ | 401 | #endif |
402 | 402 | ||
403 | dnsentryinit(is_verbose()); | 403 | dnsentryinit(is_verbose()); |
404 | 404 | ||
diff --git a/networking/inetd.c b/networking/inetd.c index 3ecd32292..b9ff4de4d 100644 --- a/networking/inetd.c +++ b/networking/inetd.c | |||
@@ -1309,12 +1309,12 @@ inetd_main (int argc, char *argv[]) | |||
1309 | bb_error_msg_and_die ("non-root must specify a config file"); | 1309 | bb_error_msg_and_die ("non-root must specify a config file"); |
1310 | 1310 | ||
1311 | if (!(opt & 2)) { | 1311 | if (!(opt & 2)) { |
1312 | #if defined(__uClinux__) | 1312 | #ifdef BB_NOMMU |
1313 | /* reexec for vfork() do continue parent */ | 1313 | /* reexec for vfork() do continue parent */ |
1314 | vfork_daemon_rexec (0, 0, argc, argv, "-f"); | 1314 | vfork_daemon_rexec (0, 0, argc, argv, "-f"); |
1315 | #else | 1315 | #else |
1316 | daemon (0, 0); /* bb_xdaemon? */ | 1316 | bb_xdaemon (0, 0); |
1317 | #endif /* uClinux */ | 1317 | #endif |
1318 | } else { | 1318 | } else { |
1319 | setsid (); | 1319 | setsid (); |
1320 | } | 1320 | } |