More minor tweaks.

diff --git a/Makefile b/Makefile
index 3d3a24be3ce75203d60e6aeebcc3487a9c5c9c51..a705bac32b9e4dd6b8a352141797218acd476482 100644 (file)
--- 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 cadb83e085abdf440f48b70e3bfeb94fedf3d5f9..5b1e7b9d5890f2fdcbd2656d8ff2ad93b2c1dbaf 100644 (file)
--- 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 6110746a53c9774d1b590810fe808a0da32c99a2..21b0d12f7d219cbeaa9f39021a8307f2e7bb1dc0 100644 (file)
--- 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 51faae987b9b9bfd239e5d9da9a014184b586ded..4296b54eae2af2afab58666ab3c39b48e12c9140 100644 (file)
--- 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