aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDenys Vlasenko <vda.linux@googlemail.com>2014-12-22 19:37:05 +0100
committerDenys Vlasenko <vda.linux@googlemail.com>2014-12-22 19:37:05 +0100
commit11775edbfc27d2ad1cd0dff3f7af385f67719866 (patch)
treefd0c34716d0c4f2fe204be19e077b1f2ba603518
parenta6588fa10230e7b87990482773a445701abbaae8 (diff)
downloadbusybox-w32-11775edbfc27d2ad1cd0dff3f7af385f67719866.tar.gz
busybox-w32-11775edbfc27d2ad1cd0dff3f7af385f67719866.tar.bz2
busybox-w32-11775edbfc27d2ad1cd0dff3f7af385f67719866.zip
randomconfig fixes
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
-rw-r--r--archival/tar.c8
-rw-r--r--libbb/Kbuild.src1
-rwxr-xr-xtestsuite/find.tests3
-rwxr-xr-xtestsuite/mdev.tests2
4 files changed, 7 insertions, 7 deletions
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,
745#endif 745#endif
746 return errorFlag; 746 return errorFlag;
747} 747}
748#else 748#else /* !FEATURE_TAR_CREATE */
749int writeTarFile(int tar_fd, int verboseFlag, 749# define writeTarFile(...) 0
750 int recurseFlags, const llist_t *include, 750#endif
751 const llist_t *exclude, const char *gzip);
752#endif /* FEATURE_TAR_CREATE */
753 751
754#if ENABLE_FEATURE_TAR_FROM 752#if ENABLE_FEATURE_TAR_FROM
755static llist_t *append_file_list_to_list(llist_t *list) 753static 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
142lib-$(CONFIG_DELGROUP) += update_passwd.o 142lib-$(CONFIG_DELGROUP) += update_passwd.o
143lib-$(CONFIG_DELUSER) += update_passwd.o 143lib-$(CONFIG_DELUSER) += update_passwd.o
144 144
145lib-$(CONFIG_FTPD) += correct_password.o
145lib-$(CONFIG_PASSWD) += pw_encrypt.o update_passwd.o obscure.o 146lib-$(CONFIG_PASSWD) += pw_encrypt.o update_passwd.o obscure.o
146lib-$(CONFIG_CHPASSWD) += pw_encrypt.o update_passwd.o 147lib-$(CONFIG_CHPASSWD) += pw_encrypt.o update_passwd.o
147lib-$(CONFIG_CRYPTPW) += pw_encrypt.o 148lib-$(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 @@
10mkdir -p find.tempdir 10mkdir -p find.tempdir
11touch find.tempdir/testfile 11touch find.tempdir/testfile
12 12
13optional FEATURE_FIND_TYPE
13testing "find -type f" \ 14testing "find -type f" \
14 "cd find.tempdir && find -type f 2>&1" \ 15 "cd find.tempdir && find -type f 2>&1" \
15 "./testfile\n" \ 16 "./testfile\n" \
16 "" "" 17 "" ""
17 18SKIP=
18optional FEATURE_FIND_EXEC 19optional FEATURE_FIND_EXEC
19testing "find -exec exitcode 1" \ 20testing "find -exec exitcode 1" \
20 "cd find.tempdir && find testfile -exec true {} \; 2>&1; echo \$?" \ 21 "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=
168# continuing to use directory structure from prev test 168# continuing to use directory structure from prev test
169rm -rf mdev.testdir/dev/* 169rm -rf mdev.testdir/dev/*
170echo "sda 0:0 644 @echo @echo TEST" >mdev.testdir/etc/mdev.conf 170echo "sda 0:0 644 @echo @echo TEST" >mdev.testdir/etc/mdev.conf
171optional STATIC FEATURE_MDEV_CONF FEATURE_MDEV_EXEC FEATURE_LS_RECURSIVE FEATURE_LS_TIMESTAMPS FEATURE_LS_USERNAME FEATURE_SH_IS_ASH 171optional STATIC FEATURE_MDEV_CONF FEATURE_MDEV_EXEC FEATURE_LS_RECURSIVE FEATURE_LS_TIMESTAMPS FEATURE_LS_USERNAME FEATURE_SH_IS_ASH ASH_BUILTIN_ECHO
172testing "mdev command" \ 172testing "mdev command" \
173 "env - PATH=$PATH ACTION=add DEVPATH=/block/sda chroot mdev.testdir /mdev 2>&1; 173 "env - PATH=$PATH ACTION=add DEVPATH=/block/sda chroot mdev.testdir /mdev 2>&1;
174 ls -lnR mdev.testdir/dev | $FILTER_LS" \ 174 ls -lnR mdev.testdir/dev | $FILTER_LS" \