svn commit: trunk/busybox: libbb miscutils

landley at busybox.net landley at busybox.net
Wed Jul 12 21:31:18 UTC 2006


Author: landley
Date: 2006-07-12 14:31:16 -0700 (Wed, 12 Jul 2006)
New Revision: 15689

Log:
More minor tweaks.


Modified:
   trunk/busybox/Makefile
   trunk/busybox/libbb/xgetlarg.c
   trunk/busybox/libbb/xgetularg.c
   trunk/busybox/miscutils/Config.in


Changeset:
Modified: trunk/busybox/Makefile
===================================================================
--- trunk/busybox/Makefile	2006-07-12 20:04:00 UTC (rev 15688)
+++ trunk/busybox/Makefile	2006-07-12 21:31:16 UTC (rev 15689)
@@ -483,6 +483,7 @@
 	rm -f scripts/bb_mkdep scripts/usage
 	rm -r -f include/config include/config.h $(DEP_INCLUDES)
 	find . -name .depend'*' -print0 | xargs -0 rm -f
+	find . -name '*.rej' -print0 | xargs -0 rm -f
 	rm -f .hdepend
 	rm -f .config .config.old .config.cmd
 

Modified: trunk/busybox/libbb/xgetlarg.c
===================================================================
--- trunk/busybox/libbb/xgetlarg.c	2006-07-12 20:04:00 UTC (rev 15688)
+++ trunk/busybox/libbb/xgetlarg.c	2006-07-12 21:31:16 UTC (rev 15689)
@@ -20,15 +20,9 @@
 	char *endptr;
 	int errno_save = errno;
 
-	assert(arg!=NULL);
+	if (ENABLE_DEBUG && arg==NULL)
+		bb_error_msg_and_die("Null in xgetlarg.");
 
-	/* Don't allow leading whitespace.
-	 * Wrap isspace in () to make sure we call the
-	 * function rather than the macro. */
-	if ((isspace)(*arg)) {
-		bb_show_usage();
-	}
-
 	errno = 0;
 	result = strtol(arg, &endptr, base);
 	if (errno != 0 || *endptr!='\0' || endptr==arg || result < lower || result > upper)

Modified: trunk/busybox/libbb/xgetularg.c
===================================================================
--- trunk/busybox/libbb/xgetularg.c	2006-07-12 20:04:00 UTC (rev 15688)
+++ trunk/busybox/libbb/xgetularg.c	2006-07-12 21:31:16 UTC (rev 15689)
@@ -89,9 +89,7 @@
 
 	if ((*p == '-') && (p[1] != '+')) {
 		++p;
-#if LONG_MAX == (-(LONG_MIN + 1))
 		++u;	/* two's complement */
-#endif
 	}
 
 	r = bb_xgetularg_bnd_sfx(p, base, 0, u, suffixes);

Modified: trunk/busybox/miscutils/Config.in
===================================================================
--- trunk/busybox/miscutils/Config.in	2006-07-12 20:04:00 UTC (rev 15688)
+++ trunk/busybox/miscutils/Config.in	2006-07-12 21:31:16 UTC (rev 15689)
@@ -67,7 +67,7 @@
 	bool "devfsd (obsolete)"
 	default n
 	help
-	  This is deprecated, and will be going away in a future release.
+	  This is deprecated, and will be removed at the end of 2008.
 
 	  Provides compatibility with old device names on a devfs systems.
 	  You should set it to true if you have devfs enabled.
@@ -105,13 +105,12 @@
 	bool "  Use devfs names for all devices (obsolete)"
 	default n
 	help
+	  This is obsolete and will be going away at the end of 2008..
+
 	  This tells busybox to look for names like /dev/loop/0 instead of
 	  /dev/loop0.  If your /dev directory has normal names instead of
 	  devfs names, you don't want this.
 
-	  This is obsolete and will be going away someday.  Consider it
-	  deprecated.
-
 config CONFIG_EJECT
 	bool "eject"
 	default n




More information about the busybox-cvs mailing list