diff options
| author | Russ Dill | 2003-12-15 21:57:44 +0000 |
|---|---|---|
| committer | Russ Dill | 2003-12-15 21:57:44 +0000 |
| commit | a1fece2c70898a1180f0506df6695e3077510731 (patch) | |
| tree | d18739994a984c3d35edb73c936f015e0dbde631 /sysklogd | |
| parent | d4f7a5edadb7529e407a5367fbb8af4c866e2598 (diff) | |
| download | busybox-a1fece2c70898a1180f0506df6695e3077510731.zip busybox-a1fece2c70898a1180f0506df6695e3077510731.tar.gz | |
Get vfork_daemon_rexec working under uclinux
Diffstat (limited to 'sysklogd')
| -rw-r--r-- | sysklogd/klogd.c | 7 | ||||
| -rw-r--r-- | sysklogd/syslogd.c | 9 |
2 files changed, 9 insertions, 7 deletions
diff --git a/sysklogd/klogd.c b/sysklogd/klogd.c index c132e06..df3a668 100644 --- a/sysklogd/klogd.c +++ b/sysklogd/klogd.c @@ -147,11 +147,12 @@ extern int klogd_main(int argc, char **argv) } if (doFork) { +#if defined(__uClinux__) + vfork_daemon_rexec(0, 1, argc, argv, "-n"); +#else /* __uClinux__ */ if (daemon(0, 1) < 0) bb_perror_msg_and_die("daemon"); -#if defined(__uClinux__) - vfork_daemon_rexec(argc, argv, "-n"); -#endif +#endif /* __uClinux__ */ } doKlogd(console_log_level); diff --git a/sysklogd/syslogd.c b/sysklogd/syslogd.c index 74b242c..622500e 100644 --- a/sysklogd/syslogd.c +++ b/sysklogd/syslogd.c @@ -681,11 +681,12 @@ extern int syslogd_main(int argc, char **argv) umask(0); if (doFork == TRUE) { - if(daemon(0, 1) < 0) - bb_perror_msg_and_die("daemon"); #if defined(__uClinux__) - vfork_daemon_rexec(argc, argv, "-n"); -#endif + vfork_daemon_rexec(0, 1, argc, argv, "-n"); +#else /* __uClinux__ */ + if(daemon(0, 1) < 0) + bb_perror_msg_and_die("daemon"); +#endif /* __uClinux__ */ } doSyslogd(); |