diff options
| author | Bernhard Reutner-Fischer <rep.dot.nop@gmail.com> | 2006-05-31 10:19:51 +0000 |
|---|---|---|
| committer | Bernhard Reutner-Fischer <rep.dot.nop@gmail.com> | 2006-05-31 10:19:51 +0000 |
| commit | c418d482baf414ef3f08a95ab99da7091f358b89 (patch) | |
| tree | 4bcf7032041b501464f38ff9715f98453bebcbaf /sysklogd | |
| parent | 507cd755a44628ced60acfa568b402cdf2f5547b (diff) | |
| download | busybox-w32-c418d482baf414ef3f08a95ab99da7091f358b89.tar.gz busybox-w32-c418d482baf414ef3f08a95ab99da7091f358b89.tar.bz2 busybox-w32-c418d482baf414ef3f08a95ab99da7091f358b89.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().
Diffstat (limited to 'sysklogd')
| -rw-r--r-- | sysklogd/klogd.c | 6 | ||||
| -rw-r--r-- | sysklogd/syslogd.c | 6 |
2 files changed, 6 insertions, 6 deletions
diff --git a/sysklogd/klogd.c b/sysklogd/klogd.c index 95a35c25e..cd152a570 100644 --- a/sysklogd/klogd.c +++ b/sysklogd/klogd.c | |||
| @@ -118,11 +118,11 @@ int klogd_main(int argc, char **argv) | |||
| 118 | } | 118 | } |
| 119 | 119 | ||
| 120 | if (!(opt & OPT_FOREGROUND)) { | 120 | if (!(opt & OPT_FOREGROUND)) { |
| 121 | #if defined(__uClinux__) | 121 | #ifdef BB_NOMMU |
| 122 | vfork_daemon_rexec(0, 1, argc, argv, "-n"); | 122 | vfork_daemon_rexec(0, 1, argc, argv, "-n"); |
| 123 | #else /* __uClinux__ */ | 123 | #else |
| 124 | bb_xdaemon(0, 1); | 124 | bb_xdaemon(0, 1); |
| 125 | #endif /* __uClinux__ */ | 125 | #endif |
| 126 | } | 126 | } |
| 127 | doKlogd(console_log_level); | 127 | doKlogd(console_log_level); |
| 128 | 128 | ||
diff --git a/sysklogd/syslogd.c b/sysklogd/syslogd.c index deaee49c2..2e2681b67 100644 --- a/sysklogd/syslogd.c +++ b/sysklogd/syslogd.c | |||
| @@ -670,11 +670,11 @@ int syslogd_main(int argc, char **argv) | |||
| 670 | umask(0); | 670 | umask(0); |
| 671 | 671 | ||
| 672 | if (doFork == TRUE) { | 672 | if (doFork == TRUE) { |
| 673 | #if defined(__uClinux__) | 673 | #ifdef BB_NOMMU |
| 674 | vfork_daemon_rexec(0, 1, argc, argv, "-n"); | 674 | vfork_daemon_rexec(0, 1, argc, argv, "-n"); |
| 675 | #else /* __uClinux__ */ | 675 | #else |
| 676 | bb_xdaemon(0, 1); | 676 | bb_xdaemon(0, 1); |
| 677 | #endif /* __uClinux__ */ | 677 | #endif |
| 678 | } | 678 | } |
| 679 | doSyslogd(); | 679 | doSyslogd(); |
| 680 | 680 | ||
