svn commit: [26096] trunk/busybox: libbb shell util-linux

[vda at busybox.net]

Author: vda
Date: 2009-04-14 08:06:59 +0000 (Tue, 14 Apr 2009)
New Revision: 26096

Log:
randomconfig fixes



Modified:
   trunk/busybox/libbb/update_passwd.c
   trunk/busybox/shell/hush.c
   trunk/busybox/util-linux/mdev.c


Changeset:
Modified: trunk/busybox/libbb/update_passwd.c
===================================================================
--- trunk/busybox/libbb/update_passwd.c	2009-04-14 05:21:22 UTC (rev 26095)
+++ trunk/busybox/libbb/update_passwd.c	2009-04-14 08:06:59 UTC (rev 26096)
@@ -224,8 +224,10 @@
 	}
 
 	if (changed_lines == 0) {
-		if (ENABLE_FEATURE_DEL_USER_FROM_GROUP && member)
+#if ENABLE_FEATURE_DEL_USER_FROM_GROUP
+		if (member)
 			bb_error_msg("can't find %s in %s", member, filename);
+#endif
 		if ((ENABLE_ADDUSER || ENABLE_ADDGROUP)
 		 && applet_name[0] == 'a' && !member
 		) {

Modified: trunk/busybox/shell/hush.c
===================================================================
--- trunk/busybox/shell/hush.c	2009-04-14 05:21:22 UTC (rev 26095)
+++ trunk/busybox/shell/hush.c	2009-04-14 08:06:59 UTC (rev 26096)
@@ -4069,11 +4069,15 @@
 	 * RES_NONE case is for "for a in; do ..." (empty IN set)
 	 * and other cases to work. */
 	if (not_null
-#if HAS_KEYWORDS
+#if ENABLE_HUSH_IF
 	 || ctx->ctx_res_w == RES_FI
+#endif
+#if ENABLE_HUSH_LOOPS
 	 || ctx->ctx_res_w == RES_DONE
 	 || ctx->ctx_res_w == RES_FOR
 	 || ctx->ctx_res_w == RES_IN
+#endif
+#if ENABLE_HUSH_CASE
 	 || ctx->ctx_res_w == RES_ESAC
 #endif
 	) {

Modified: trunk/busybox/util-linux/mdev.c
===================================================================
--- trunk/busybox/util-linux/mdev.c	2009-04-14 05:21:22 UTC (rev 26095)
+++ trunk/busybox/util-linux/mdev.c	2009-04-14 08:06:59 UTC (rev 26096)
@@ -98,10 +98,11 @@
 	if (strstr(path, "/block/"))
 		type = S_IFBLK;
 
-#if ENABLE_FEATURE_MDEV_CONF
+#if !ENABLE_FEATURE_MDEV_CONF
+	mode = 0660;
+#else
+	/* If we have config file, look up user settings */
 	parser = config_open2("/etc/mdev.conf", fopen_for_read);
-
-	/* If we have config file, look up user settings */
 	while (1) {
 		regmatch_t off[1 + 9*ENABLE_FEATURE_MDEV_RENAME_REGEXP];
 		int keep_matching;