svn commit: [26083] trunk/busybox: include util-linux

[vda at busybox.net]

Author: vda
Date: 2009-04-13 13:33:02 +0000 (Mon, 13 Apr 2009)
New Revision: 26083

Log:
mdev: make usage text more useful

function                                             old     new   delta
packed_usage                                       26235   26291     +56



Modified:
   trunk/busybox/include/usage.h
   trunk/busybox/util-linux/mdev.c


Changeset:
Modified: trunk/busybox/include/usage.h
===================================================================
--- trunk/busybox/include/usage.h	2009-04-13 03:33:46 UTC (rev 26082)
+++ trunk/busybox/include/usage.h	2009-04-13 13:33:02 UTC (rev 26083)
@@ -2556,8 +2556,14 @@
 #define mdev_full_usage "\n\n" \
        "	-s	Scan /sys and populate /dev during system boot\n" \
        "\n" \
-       "Called with no options (via hotplug) it uses environment variables\n" \
-       "to determine which device to add/remove."
+       "It can be run by kernel as a hotplug helper. To activate it:\n" \
+       " echo /bin/mdev >/proc/sys/kernel/hotplug\n" \
+	USE_FEATURE_MDEV_CONF( \
+       "It uses /etc/mdev.conf with lines\n" \
+       "DEVNAME UID:GID PERM" \
+			USE_FEATURE_MDEV_RENAME(" [>|=PATH]") \
+			USE_FEATURE_MDEV_EXEC(" [@|$|*COMMAND]") \
+	) \
 
 #define mdev_notes_usage "" \
 	USE_FEATURE_MDEV_CONFIG( \

Modified: trunk/busybox/util-linux/mdev.c
===================================================================
--- trunk/busybox/util-linux/mdev.c	2009-04-13 03:33:46 UTC (rev 26082)
+++ trunk/busybox/util-linux/mdev.c	2009-04-13 13:33:02 UTC (rev 26083)
@@ -62,13 +62,13 @@
 	struct bb_uidgid_t ugid = { 0, 0 };
 	parser_t *parser;
 	char *tokens[5];
-#endif
-#if ENABLE_FEATURE_MDEV_EXEC
+# if ENABLE_FEATURE_MDEV_EXEC
 	char *command = NULL;
-#endif
-#if ENABLE_FEATURE_MDEV_RENAME
+# endif
+# if ENABLE_FEATURE_MDEV_RENAME
 	char *alias = NULL;
 	char aliaslink = aliaslink; /* for compiler */
+# endif
 #endif
 	char *dev_maj_min = path + strlen(path);
 
@@ -168,21 +168,21 @@
 
 		val = tokens[3];
 		/* 4th field (opt): >alias */
-#if ENABLE_FEATURE_MDEV_RENAME
+# if ENABLE_FEATURE_MDEV_RENAME
 		if (!val)
 			break;
 		aliaslink = *val;
 		if (aliaslink == '>' || aliaslink == '=') {
 			char *s;
-#if ENABLE_FEATURE_MDEV_RENAME_REGEXP
+#  if ENABLE_FEATURE_MDEV_RENAME_REGEXP
 			char *p;
 			unsigned i, n;
-#endif
+#  endif
 			char *a = val;
 			s = strchrnul(val, ' ');
 			val = (s[0] && s[1]) ? s+1 : NULL;
 			s[0] = '\0';
-#if ENABLE_FEATURE_MDEV_RENAME_REGEXP
+#  if ENABLE_FEATURE_MDEV_RENAME_REGEXP
 			/* substitute %1..9 with off[1..9], if any */
 			n = 0;
 			s = a;
@@ -206,13 +206,13 @@
 				p++;
 				s++;
 			}
-#else
+#  else
 			alias = xstrdup(a + 1);
-#endif
+#  endif
 		}
-#endif /* ENABLE_FEATURE_MDEV_RENAME */
+# endif /* ENABLE_FEATURE_MDEV_RENAME */
 
-#if ENABLE_FEATURE_MDEV_EXEC
+# if ENABLE_FEATURE_MDEV_EXEC
 		/* The rest (opt): command to run */
 		if (!val)
 			break;
@@ -233,7 +233,7 @@
 				command = xstrdup(val + 1);
 			}
 		}
-#endif
+# endif
 		/* end of field parsing */
 		break; /* we found matching line, stop */
 	} /* end of "while line is read from /etc/mdev.conf" */
@@ -255,7 +255,7 @@
 #if ENABLE_FEATURE_MDEV_CONF
 		chown(device_name, ugid.uid, ugid.gid);
 
-#if ENABLE_FEATURE_MDEV_RENAME
+# if ENABLE_FEATURE_MDEV_RENAME
 		if (alias) {
 			alias = build_alias(alias, device_name);
 
@@ -266,8 +266,8 @@
 
 			free(alias);
 		}
+# endif
 #endif
-#endif
 	}
 
 #if ENABLE_FEATURE_MDEV_EXEC
@@ -406,7 +406,7 @@
 
 	xchdir("/dev");
 
-	if (argv[1] && !strcmp(argv[1], "-s")) {
+	if (argv[1] && strcmp(argv[1], "-s") == 0) {
 		/* Scan:
 		 * mdev -s
 		 */
@@ -501,5 +501,5 @@
 	if (ENABLE_FEATURE_CLEAN_UP)
 		RELEASE_CONFIG_BUFFER(temp);
 
-	return 0;
+	return EXIT_SUCCESS;
 }