More minor tweaks.

4 files changed, 6 insertions, 14 deletions

diff --git a/Makefile b/Makefile
index 3d3a24be3..a705bac32 100644
--- a/Makefile
+++ b/Makefile
@@ -483,6 +483,7 @@ distclean: clean
         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
 
diff --git a/libbb/xgetlarg.c b/libbb/xgetlarg.c
index cadb83e08..5b1e7b9d5 100644
--- a/libbb/xgetlarg.c
+++ b/libbb/xgetlarg.c
@@ -20,14 +20,8 @@ long bb_xgetlarg(const char *arg, int base, long lower, long upper)
         char *endptr;
         int errno_save = errno;
 
-        assert(arg!=NULL);
-
-        /* 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();
-        }
+        if (ENABLE_DEBUG && arg==NULL)
+                bb_error_msg_and_die("Null in xgetlarg.");
 
         errno = 0;
         result = strtol(arg, &endptr, base);
diff --git a/libbb/xgetularg.c b/libbb/xgetularg.c
index 6110746a5..21b0d12f7 100644
--- a/libbb/xgetularg.c
+++ b/libbb/xgetularg.c
@@ -89,9 +89,7 @@ long bb_xgetlarg_bnd_sfx(const char *arg, int base,
 
         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);
diff --git a/miscutils/Config.in b/miscutils/Config.in
index 51faae987..4296b54ea 100644
--- a/miscutils/Config.in
+++ b/miscutils/Config.in
@@ -67,7 +67,7 @@ config CONFIG_DEVFSD
         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 @@ config CONFIG_FEATURE_DEVFS
         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