fix failures found by randomconfig builds

Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>

diff --git a/libbb/Kbuild.src b/libbb/Kbuild.src
index c5d86c09285f4bb74444a21c8ea22c221ed8305c..a6468f17176a39cff0364ee3d9b2f837ff895ca0 100644 (file)
--- a/libbb/Kbuild.src
+++ b/libbb/Kbuild.src
@@ -144,7 +144,7 @@ lib-$(CONFIG_DELUSER) += update_passwd.o
 lib-$(CONFIG_PASSWD) += pw_encrypt.o update_passwd.o obscure.o
 lib-$(CONFIG_CHPASSWD) += pw_encrypt.o update_passwd.o
 lib-$(CONFIG_CRYPTPW) += pw_encrypt.o
-lib-$(CONFIG_SULOGIN) += pw_encrypt.o
+lib-$(CONFIG_SULOGIN) += pw_encrypt.o correct_password.o
 lib-$(CONFIG_VLOCK) += pw_encrypt.o correct_password.o
 lib-$(CONFIG_SU) += pw_encrypt.o correct_password.o
 lib-$(CONFIG_LOGIN) += pw_encrypt.o correct_password.o

diff --git a/libbb/correct_password.c b/libbb/correct_password.c
index 5727c65fbd7824af37e03d9c2ca4733b3b54ae1f..acadf391434c4b06b52e32f24057e50bba2512e4 100644 (file)
--- a/libbb/correct_password.c
+++ b/libbb/correct_password.c
@@ -30,15 +30,6 @@
 
 #include "libbb.h"
 
-void FAST_FUNC nuke_str(char *str)
-{
-        if (str) {
-               while (*str)
-                       *str++ = 0;
-               /* or: memset(str, 0, strlen(str)); - not as small as above */
-       }
-}
-
 /* Ask the user for a password.
  * Return 1 without asking if PW has an empty password.
  * Return -1 on EOF, error while reading input, or timeout.

diff --git a/libbb/in_ether.c b/libbb/in_ether.c
index dadadbafef66fe46b721b57666de177de3321c76..1de383bde00489b3935b72499fe3c1b0974827fc 100644 (file)
--- a/libbb/in_ether.c
+++ b/libbb/in_ether.c
@@ -3,6 +3,7 @@
  * Utility routines.
  */
 
+//kbuild:lib-$(CONFIG_ARP) += in_ether.o
 //kbuild:lib-$(CONFIG_IFCONFIG) += in_ether.o
 //kbuild:lib-$(CONFIG_IFENSLAVE) += in_ether.o
 

diff --git a/libbb/nuke_str.c b/libbb/nuke_str.c
new file mode 100644 (file)
index 0000000..56b808b
--- /dev/null
+++ b/libbb/nuke_str.c
@@ -0,0 +1,21 @@
+/* vi: set sw=4 ts=4: */
+/*
+ * Utility routines.
+ *
+ * Copyright (C) 2008 Denys Vlasenko
+ *
+ * Licensed under GPLv2, see file LICENSE in this source tree.
+ */
+
+//kbuild:lib-y += nuke_str.o
+
+#include "libbb.h"
+
+void FAST_FUNC nuke_str(char *str)
+{
+        if (str) {
+               while (*str)
+                       *str++ = 0;
+               /* or: memset(str, 0, strlen(str)); - not as small as above */
+       }
+}

diff --git a/scripts/randomtest b/scripts/randomtest
index a102593d32e790c1e788d1ab322d3ca152d3033d..d2b26bc76f73f2b8e1d015dbea6dc7ea808e0e28 100755 (executable)
--- a/scripts/randomtest
+++ b/scripts/randomtest
@@ -65,6 +65,7 @@ if test x"$LIBC" = x"uclibc"; then
        | grep -v CONFIG_BUILD_LIBBUSYBOX \
        | grep -v CONFIG_PIE \
        \
+       | grep -v CONFIG_FEATURE_TOUCH_NODEREF \
        | grep -v CONFIG_FEATURE_2_4_MODULES \
        >.config.new
        mv .config.new .config
@@ -72,6 +73,7 @@ if test x"$LIBC" = x"uclibc"; then
        echo '# CONFIG_BUILD_LIBBUSYBOX is not set' >>.config
        echo '# CONFIG_PIE is not set' >>.config
        echo '# CONFIG_FEATURE_2_4_MODULES is not set' >>.config
+       echo '# CONFIG_FEATURE_TOUCH_NODEREF is not set' >>.config
 fi
 
 # If STATIC, remove some things.

diff --git a/testsuite/awk.tests b/testsuite/awk.tests
index 50b2a8328f5eee417e7f378148c048653e8a4c12..132afc6a94c27c37615effbffd7cc49ab775b8a2 100755 (executable)
--- a/testsuite/awk.tests
+++ b/testsuite/awk.tests
@@ -269,10 +269,12 @@ testing "awk FS assignment" "awk '{FS=\":\"; print \$1}'" \
        "" \
        "a:b c:d\ne:f g:h"
 
+optional FEATURE_AWK_LIBM
 testing "awk large integer" \
        "awk 'BEGIN{n=(2^31)-1; print n, int(n), n%1, ++n, int(n), n%1}'" \
        "2147483647 2147483647 0 2147483648 2147483648 0\n" \
        "" ""
+SKIP=
 
 testing "awk length(array)" \
        "awk 'BEGIN{ A[1]=2; A[\"qwe\"]=\"asd\"; print length(A)}'" \
@@ -285,11 +287,13 @@ testing "awk -f and ARGC" \
        "do re mi\n" \
        '{print $2; print ARGC;}' \
 
+optional FEATURE_AWK_GNU_EXTENSIONS
 testing "awk -e and ARGC" \
        "awk -e '{print \$2; print ARGC;}' input" \
        "re\n2\n" \
        "do re mi\n" \
-       "" \
+       ""
+SKIP=
 
 # testing "description" "command" "result" "infile" "stdin"
 

diff --git a/testsuite/tar.tests b/testsuite/tar.tests
index 93ba5f0043479edded144b336a48fd129c362e26..9ea89f15f832c314f205e4d4bc4cc2fa17f3bb58 100755 (executable)
--- a/testsuite/tar.tests
+++ b/testsuite/tar.tests
@@ -25,10 +25,12 @@ tar: short read
 SKIP=
 
 optional FEATURE_SEAMLESS_GZ
+# In NOMMU case, "invalid magic" message comes from gunzip child process.
+# Otherwise, it comes from tar.
+# Need to fix output up to avoid false positive.
 testing "Empty file is not a tarball.tar.gz" '\
-tar xvzf - 2>&1; echo $?
+{ tar xvzf - 2>&1; echo $?; } | grep -Fv "invalid magic"
 ' "\
-tar: invalid magic
 tar: short read
 1
 " \