Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.busybox.net/busybox.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Thau <danthau@bedrocklinux.org>2021-09-02 14:41:08 +0300
committerDenys Vlasenko <vda.linux@googlemail.com>2021-09-05 04:42:51 +0300
commit7d06d6e18651cb183a3723fa21ef62935ea08647 (patch)
tree29a36fb92c34c697ca6e0c21d5cdc4edf26484d3 /testsuite
parentf4ba69d47698c5357c32e21eb9122a5031b9b080 (diff)
awk: fix printf %%
A refactor of the awk printf code in e2e3802987266c98df0efdf40ad5da4b07df0113 appears to have broken the printf interpretation of two percent signs, which normally outputs only one percent sign. The patch below brings busybox awk printf behavior back into alignment with the pre-e2e380 behavior, the busybox printf util, and other common (awk and non-awk) printf implementations. function old new delta awk_printf 626 672 +46 Signed-off-by: Daniel Thau <danthau at bedrocklinux.org> Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
Diffstat (limited to 'testsuite')
-rwxr-xr-xtestsuite/awk.tests6
-rwxr-xr-xtestsuite/printf.tests5
2 files changed, 11 insertions, 0 deletions
diff --git a/testsuite/awk.tests b/testsuite/awk.tests
index dc2ae2e11..bcaafe8fd 100755
--- a/testsuite/awk.tests
+++ b/testsuite/awk.tests
@@ -463,4 +463,10 @@ testing "awk \"cmd\" | getline" \
"HELLO\n" \
'' ''
+# printf %% should print one % (had a bug where it didn't)
+testing 'awk printf %% prints one %' \
+ "awk 'BEGIN { printf \"%%\n\" }'" \
+ "%\n" \
+ '' ''
+
exit $FAILCOUNT
diff --git a/testsuite/printf.tests b/testsuite/printf.tests
index 34a65926e..050edef71 100755
--- a/testsuite/printf.tests
+++ b/testsuite/printf.tests
@@ -79,6 +79,11 @@ testing "printf understands %Ld" \
"-5\n""0\n" \
"" ""
+testing "printf understands %%" \
+ "${bb}printf '%%\n' 2>&1; echo \$?" \
+ "%\n""0\n" \
+ "" ""
+
testing "printf handles positive numbers for %d" \
"${bb}printf '%d\n' 3 +3 ' 3' ' +3' 2>&1; echo \$?" \
"3\n"\