svn commit: trunk/busybox: shell util-linux

vda at busybox.net vda at busybox.net
Fri Dec 21 22:18:17 UTC 2007


Author: vda
Date: 2007-12-21 14:18:16 -0800 (Fri, 21 Dec 2007)
New Revision: 20662

Log:
fix buglets found by randomconfig



Modified:
   trunk/busybox/shell/ash.c
   trunk/busybox/util-linux/mdev.c


Changeset:
Modified: trunk/busybox/shell/ash.c
===================================================================
--- trunk/busybox/shell/ash.c	2007-12-21 21:34:37 UTC (rev 20661)
+++ trunk/busybox/shell/ash.c	2007-12-21 22:18:16 UTC (rev 20662)
@@ -12900,7 +12900,9 @@
 	INIT_G_misc();
 	INIT_G_memstack();
 	INIT_G_var();
+#if ENABLE_ASH_ALIAS
 	INIT_G_alias();
+#endif
 	INIT_G_cmdtable();
 
 #if PROFILE

Modified: trunk/busybox/util-linux/mdev.c
===================================================================
--- trunk/busybox/util-linux/mdev.c	2007-12-21 21:34:37 UTC (rev 20661)
+++ trunk/busybox/util-linux/mdev.c	2007-12-21 22:18:16 UTC (rev 20662)
@@ -52,7 +52,7 @@
 	if (ENABLE_FEATURE_MDEV_CONF) {
 		FILE *fp;
 		char *line, *vline;
-		size_t lineno = 0;
+		unsigned lineno = 0;
 
 		/* If we have a config file, look up the user settings */
 		fp = fopen_or_warn("/etc/mdev.conf", "r");
@@ -149,7 +149,7 @@
 
 			/* Did everything parse happily? */
 			if (field <= 2)
-				bb_error_msg_and_die("bad line %i", lineno);
+				bb_error_msg_and_die("bad line %u", lineno);
 
  next_line:
 			free(line);




More information about the busybox-cvs mailing list