Tito writes:

Hi to all,
here is a new patch for bb's devfsd. The news are:

1) Size reduction for the basic setup with no options compiled in from :
     text        data     bss     dec       hex   filename
    10591     392      543    11526   2d06 devfsd.o
    rw-r--r--    1 root     root        18536 Dec 18 21:52 devfsd.o

    to:

    text        data     bss     dec        hex  filename
    9303      392      543    10238    27fe devfsd.o
    rw-r--r--    1 root     root        16528 Dec 18 22:02 devfsd.o

   With this setup you should not expect much output from devfsd
    ( just at start or with -v) and if some error occurs it only exits 1.
   To have more output enable:  " Increases logging (and size)" (+1568 b).

2) The option "Adds function names to program output" was removed from config menu
    and now to enable debug output you can use bb's standard option:
    "Build BusyBox with Debugging symbols".
    Be careful as with this option enabled a lot of data are outputted to /dev/log and/or to stderr.

3) A new option: "Enables the -fg and -np option" was added to config menu  (+128 b).

BTW: option "Adds support for MODLOAD keyword in devsfd.conf"  adds 268 b.

4) The following keywords in devsfd.conf are supported:
   "CLEAR_CONFIG", "INCLUDE", "OPTIONAL_INCLUDE", "RESTORE",
   "PERMISSIONS", "EXECUTE", "COPY", "IGNORE",  "MKOLDCOMPAT",
   "MKNEWCOMPAT","RMOLDCOMPAT", "RMNEWCOMPAT".

   But only if they are written UPPERCASE!!!!!!!!

5)Help text in usage.h was modified.

6)Something that I have forgotten..........

I've tested this for the last week on my box and it seems to work as expected.

Thanks in advance and please apply.

Ciao,

Tito


git-svn-id: svn://busybox.net/trunk/busybox@8125 69ca8d6d-28ef-0310-b511-8ec308f3f277

1 files changed, 13 insertions, 5 deletions

diff --git a/include/usage.h b/include/usage.h
index 21fb2afe6..6db0385fb 100644
--- a/include/usage.h
+++ b/include/usage.h
@@ -338,17 +338,25 @@
 #define deluser_full_usage \
          "Deletes user USER from the system"
 
+#ifdef CONFIG_DEVFSD_FG_NP
+  #define USAGE_DEVFSD_FG_NP(a) a
+#else
+  #define USAGE_DEVFSD_FG_NP(a)
+#endif
+
 #define devfsd_trivial_usage \
-        "mntpnt [-v] [-fg] [-np]"
+        "mntpnt [-v]"\
+        USAGE_DEVFSD_FG_NP("[-fg][-np]" )
 #define devfsd_full_usage \
         "Optional daemon for managing devfs (the Linux Device Filesystem).\n" \
         "\nOptions:\n" \
         "\tmntpnt\tThe mount point where devfs is mounted.\n\n" \
         "\t-v\tPrint the protocol version numbers for devfsd\n" \
-        "\t\tand the kernel-side protocol version and exits.\n" \
-        "\t-fg\tRun the daemon in the foreground.\n\n" \
-        "\t-np\tExit  after  parsing  the configuration file and processing syn-\n" \
-        "\t\tthetic REGISTER events. Do not poll for events." 
+        "\t\tand the kernel-side protocol version and exits." \
+        USAGE_DEVFSD_FG_NP( "\n\n\t-fg\tRun the daemon in the foreground.\n\n" \
+        "\t-np\tExit  after  parsing  the configuration file\n" \
+        "\t\tand processing synthetic REGISTER events.\n" \
+        "\t\tDo not poll for events.")
 
 #ifdef CONFIG_FEATURE_HUMAN_READABLE
   #define USAGE_HUMAN_READABLE(a) a