OSDN Git Service
(root)
/
android-x86
/
external-busybox.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Vodz, last patch 104
[android-x86/external-busybox.git]
/
sysklogd
/
syslogd.c
diff --git
a/sysklogd/syslogd.c
b/sysklogd/syslogd.c
index
c554536
..
ca6aee3
100644
(file)
--- a/
sysklogd/syslogd.c
+++ b/
sysklogd/syslogd.c
@@
-574,9
+574,7
@@
extern int syslogd_main(int argc, char **argv)
{
int opt;
{
int opt;
-#if ! defined(__uClinux__)
int doFork = TRUE;
int doFork = TRUE;
-#endif
char *p;
char *p;
@@
-586,11
+584,9
@@
extern int syslogd_main(int argc, char **argv)
case 'm':
MarkInterval = atoi(optarg) * 60;
break;
case 'm':
MarkInterval = atoi(optarg) * 60;
break;
-#if ! defined(__uClinux__)
case 'n':
doFork = FALSE;
break;
case 'n':
doFork = FALSE;
break;
-#endif
case 'O':
logFilePath = bb_xstrdup(optarg);
break;
case 'O':
logFilePath = bb_xstrdup(optarg);
break;
@@
-634,7
+630,7
@@
extern int syslogd_main(int argc, char **argv)
if ((doFork == TRUE) && (daemon(0, 1) < 0)) {
bb_perror_msg_and_die("daemon");
if ((doFork == TRUE) && (daemon(0, 1) < 0)) {
bb_perror_msg_and_die("daemon");
-#if
!
defined(__uClinux__)
+#if defined(__uClinux__)
vfork_daemon_rexec(argc, argv, "-n");
#endif
}
vfork_daemon_rexec(argc, argv, "-n");
#endif
}