[BusyBox-cvs] busybox/miscutils devfsd.c, 1.5, 1.6 Config.in, 1.11, 1.12

[Erik Andersen]

Update of /var/cvs/busybox/miscutils
In directory nail:/tmp/cvs-serv21028/miscutils

Modified Files:
	devfsd.c Config.in 
Log Message:
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




Index: Config.in
===================================================================
RCS file: /var/cvs/busybox/miscutils/Config.in,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- Config.in	30 Nov 2003 23:46:03 -0000	1.11
+++ Config.in	19 Dec 2003 11:07:58 -0000	1.12
@@ -46,27 +46,34 @@
 	help
 	  Provides compatibility with old device names on a devfs systems.
 	  You should set it to true if you have devfs enabled.
+	  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!!!!!!!!
 
 config CONFIG_DEVFSD_MODLOAD
-	bool "Adds support for MODLOAD action"
+	bool "Adds support for MODLOAD keyword in devsfd.conf"
 	default n
 	depends on CONFIG_DEVFSD
 	help
 	  This actually doesn't work with busybox  modutils but needs the real modutils.
 
-config CONFIG_DEVFSD_VERBOSE
-	bool "Increases logging to stderr and syslog"
+config CONFIG_DEVFSD_FG_NP
+	bool "Enables the -fg and -np options"
 	default n
 	depends on CONFIG_DEVFSD
 	help
-	  Increases logging to stderr and syslog.
+		-fg	Run the daemon in the foreground.
+		-np	Exit  after  parsing  the configuration file. Do not poll for events.
 
-config CONFIG_DEVFSD_DEBUG
-	bool "Adds function names to program output"
+config CONFIG_DEVFSD_VERBOSE
+	bool "Increases logging (and size)"
 	default n
 	depends on CONFIG_DEVFSD
 	help
-	  Adds function names to program output.
+	  Increases logging to stderr or syslog.
 
 config CONFIG_LAST
 	bool "last"

Index: devfsd.c
===================================================================
RCS file: /var/cvs/busybox/miscutils/devfsd.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- devfsd.c	30 Nov 2003 23:46:04 -0000	1.5
+++ devfsd.c	19 Dec 2003 11:07:58 -0000	1.6
@@ -93,7 +93,7 @@
 #define DEVFSDIOC_GET_PROTO_REV         _IOR(DEVFSD_IOCTL_BASE, 0, int)
 #define DEVFSDIOC_SET_EVENT_MASK        _IOW(DEVFSD_IOCTL_BASE, 2, int)
 #define DEVFSDIOC_RELEASE_EVENT_QUEUE   _IOW(DEVFSD_IOCTL_BASE, 3, int)
-#define DEVFSDIOC_SET_DEBUG_MASK        _IOW(DEVFSD_IOCTL_BASE, 4, int)
+#define DEVFSDIOC_SET_CONFIG_DEBUG_MASK _IOW(DEVFSD_IOCTL_BASE, 4, int)
 #define DEVFSD_NOTIFY_REGISTERED    0
 #define DEVFSD_NOTIFY_UNREGISTERED  1
 #define DEVFSD_NOTIFY_ASYNC_OPEN    2
@@ -102,8 +102,9 @@
 #define DEVFSD_NOTIFY_CHANGE        5
 #define DEVFSD_NOTIFY_CREATE        6
[...1371 lines suppressed...]
 					return (FALSE);
 				}
@@ -1897,7 +2014,7 @@
 	const char *env, *ptr;
 	char tmp[STRING_LENGTH];
 
-#ifdef CONFIG_DEVFSD_DEBUG
+#ifdef CONFIG_DEBUG
 	msg_logger( NO_DIE, LOG_INFO, "expand_variable()\n");
 #endif
 
@@ -2049,7 +2166,7 @@
 {
 	const char *value;
 
-#ifdef CONFIG_DEVFSD_DEBUG
+#ifdef CONFIG_DEBUG
 		msg_logger( NO_DIE, LOG_INFO, "get_variable_v2()\n");
 #endif