From: Denys Vlasenko <vda.linux@googlemail.com>
Date: Mon, 22 Dec 2014 18:37:05 +0000 (+0100)
Subject: randomconfig fixes
X-Git-Tag: 1_23_0~2
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=11775edbfc27d2ad1cd0dff3f7af385f67719866;p=oweals%2Fbusybox.git

randomconfig fixes

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

diff --git a/archival/tar.c b/archival/tar.c
index e116bd287..aa03ba990 100644
--- a/archival/tar.c
+++ b/archival/tar.c
@@ -745,11 +745,9 @@ static NOINLINE int writeTarFile(int tar_fd, int verboseFlag,
 #endif
 	return errorFlag;
 }
-#else
-int writeTarFile(int tar_fd, int verboseFlag,
-	int recurseFlags, const llist_t *include,
-	const llist_t *exclude, const char *gzip);
-#endif /* FEATURE_TAR_CREATE */
+#else /* !FEATURE_TAR_CREATE */
+# define writeTarFile(...) 0
+#endif
 
 #if ENABLE_FEATURE_TAR_FROM
 static llist_t *append_file_list_to_list(llist_t *list)
diff --git a/libbb/Kbuild.src b/libbb/Kbuild.src
index f204816c5..7fb687227 100644
--- a/libbb/Kbuild.src
+++ b/libbb/Kbuild.src
@@ -142,6 +142,7 @@ lib-$(CONFIG_ADDUSER) += update_passwd.o
 lib-$(CONFIG_DELGROUP) += update_passwd.o
 lib-$(CONFIG_DELUSER) += update_passwd.o
 
+lib-$(CONFIG_FTPD) += correct_password.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
diff --git a/testsuite/find.tests b/testsuite/find.tests
index f041106c3..78dfa1230 100755
--- a/testsuite/find.tests
+++ b/testsuite/find.tests
@@ -10,11 +10,12 @@
 mkdir -p find.tempdir
 touch find.tempdir/testfile
 
+optional FEATURE_FIND_TYPE
 testing "find -type f" \
 	"cd find.tempdir && find -type f 2>&1" \
 	"./testfile\n" \
 	"" ""
-
+SKIP=
 optional FEATURE_FIND_EXEC
 testing "find -exec exitcode 1" \
 	"cd find.tempdir && find testfile -exec true {} \; 2>&1; echo \$?" \
diff --git a/testsuite/mdev.tests b/testsuite/mdev.tests
index 48d3dcc2c..59873011a 100755
--- a/testsuite/mdev.tests
+++ b/testsuite/mdev.tests
@@ -168,7 +168,7 @@ SKIP=
 # continuing to use directory structure from prev test
 rm -rf mdev.testdir/dev/*
 echo "sda 0:0 644 @echo @echo TEST" >mdev.testdir/etc/mdev.conf
-optional STATIC FEATURE_MDEV_CONF FEATURE_MDEV_EXEC FEATURE_LS_RECURSIVE FEATURE_LS_TIMESTAMPS FEATURE_LS_USERNAME FEATURE_SH_IS_ASH
+optional STATIC FEATURE_MDEV_CONF FEATURE_MDEV_EXEC FEATURE_LS_RECURSIVE FEATURE_LS_TIMESTAMPS FEATURE_LS_USERNAME FEATURE_SH_IS_ASH ASH_BUILTIN_ECHO
 testing "mdev command" \
 	"env - PATH=$PATH ACTION=add DEVPATH=/block/sda chroot mdev.testdir /mdev 2>&1;
 	ls -lnR mdev.testdir/dev | $FILTER_LS" \