commiting:
0000073: Add option to inetd applet to run in foreground
this option was already there for uclinux -- this just exposes
it in the normal case as well.
diff --git a/include/usage.h b/include/usage.h
index dad6078..5d7c365 100644
--- a/include/usage.h
+++ b/include/usage.h
@@ -1193,10 +1193,11 @@
"\t-f\tforce de/configuration"
#define inetd_trivial_usage \
- "[-q len] [conf]"
+ "[-f] [-q len] [conf]"
#define inetd_full_usage \
"Listens for network connections and launches programs\n\n" \
"Option:\n" \
+ "\t-f\tRun as a foreground progress\n" \
"\t-q\tSets the size of the socket listen queue to\n" \
"\t\tthe specified value. Default is 128"
diff --git a/networking/inetd.c b/networking/inetd.c
index c540a85..0604b14 100644
--- a/networking/inetd.c
+++ b/networking/inetd.c
@@ -758,17 +758,14 @@
LastArg = environ[-1] + strlen(environ[-1]);
#endif
-#if defined(__uClinux__)
opt = bb_getopt_ulflags(argc, argv, "q:f", &sq);
if (!(opt & 2)) {
daemon(0, 0);
+#if defined(__uClinux__)
/* reexec for vfork() do continue parent */
vfork_daemon_rexec(argc, argv, "-f");
- }
-#else
- opt = bb_getopt_ulflags(argc, argv, "q:", &sq);
- daemon(0, 0);
#endif /* uClinux */
+ }
if(opt & 1) {
global_queuelen = atoi(sq);