Merge busybox into merge

Fix merge conflict in coreutils/timeout.c.

3 files changed, 30 insertions, 0 deletions

diff --git a/testsuite/cryptpw.tests b/testsuite/cryptpw.tests
index 8ec476c9f..0dd91fe15 100755
--- a/testsuite/cryptpw.tests
+++ b/testsuite/cryptpw.tests
@@ -7,6 +7,20 @@
 
 # testing "description" "command" "result" "infile" "stdin"
 
+#optional USE_BB_CRYPT
+testing "cryptpw des 12" \
+        "cryptpw -m des QWErty '123456789012345678901234567890'" \
+        '12MnB3PqfVbMA\n' "" ""
+
+testing "cryptpw des 55" \
+        "cryptpw -m des QWErty 55" \
+        '55tgFLtkT1Y72\n' "" ""
+
+testing "cryptpw des zz" \
+        "cryptpw -m des QWErty zz" \
+        'zzIZaaXWOkxVk\n' "" ""
+#SKIP=
+
 optional USE_BB_CRYPT_SHA
 testing "cryptpw sha256" \
         "cryptpw -m sha256 QWErty '123456789012345678901234567890'" \
diff --git a/testsuite/printf.tests b/testsuite/printf.tests
index 050edef71..728bbf4bf 100755
--- a/testsuite/printf.tests
+++ b/testsuite/printf.tests
@@ -143,4 +143,14 @@ testing "printf aborts on %r" \
         "printf: %r: invalid format\n""1\n" \
         "" ""
 
+testing "printf treats leading 0 as flag" \
+        "${bb}printf '%0*d\n' 2 1 2>&1; echo \$?" \
+        "01\n""0\n" \
+        "" ""
+
+testing "printf handles multiple flags" \
+        "${bb}printf '%0 d\n' 2 2>&1; echo \$?" \
+        " 2\n""0\n" \
+        "" ""
+
 exit $FAILCOUNT
diff --git a/testsuite/sed.tests b/testsuite/sed.tests
index 67ff87e93..2b78c9b12 100755
--- a/testsuite/sed.tests
+++ b/testsuite/sed.tests
@@ -399,6 +399,12 @@ testing "sed uses previous regexp" \
         "" \
         "q\nw\ne\nr\n"
 
+testing "sed ^ OR not^" \
+        "sed -e 's/^a\|b//g'" \
+        "ca\n" \
+        "" \
+        "abca\n"
+
 # testing "description" "commands" "result" "infile" "stdin"
 
 exit $FAILCOUNT