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 dad6078cd5a041d6df6df2d8cab81c104e1d9e5e..5d7c365511327d63dbe015bc7f2c865b36129f17 100644 (file)
--- 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 c540a8578dedfd4635409f7c28addf20029cf85c..0604b14bfd3cca85a87b41d3aa18a5dbdf5c377d 100644 (file)
--- a/networking/inetd.c
+++ b/networking/inetd.c
@@ -758,17 +758,14 @@ extern int inetd_main(int argc, char *argv[])
        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);