[BusyBox-cvs] svn commit: trunk/busybox: include networking

pgf at busybox.net pgf at busybox.net
Mon Aug 1 19:39:48 UTC 2005


Author: pgf
Date: 2005-08-01 13:39:47 -0600 (Mon, 01 Aug 2005)
New Revision: 11010

Log:
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.


Modified:
   trunk/busybox/include/usage.h
   trunk/busybox/networking/inetd.c


Changeset:
Modified: trunk/busybox/include/usage.h
===================================================================
--- trunk/busybox/include/usage.h	2005-08-01 19:33:30 UTC (rev 11009)
+++ trunk/busybox/include/usage.h	2005-08-01 19:39:47 UTC (rev 11010)
@@ -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"
 

Modified: trunk/busybox/networking/inetd.c
===================================================================
--- trunk/busybox/networking/inetd.c	2005-08-01 19:33:30 UTC (rev 11009)
+++ trunk/busybox/networking/inetd.c	2005-08-01 19:39:47 UTC (rev 11010)
@@ -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);




More information about the busybox-cvs mailing list