aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--tests/printf.test2
-rw-r--r--toys/posix/printf.c12
2 files changed, 7 insertions, 7 deletions
diff --git a/tests/printf.test b/tests/printf.test
index 5cbefb59..20d5982d 100644
--- a/tests/printf.test
+++ b/tests/printf.test
@@ -57,3 +57,5 @@ testing "printf '%u %u' -1 -2" "$PRINTF '%u %u' -1 -2" \
testing "printf '%x %X' 78 79" "$PRINTF '%x %X' 78 79" "4e 4F" "" ""
testing "printf '%g %G' 78 79" "$PRINTF '%g %G' 78 79" "78 79" "" ""
testing "printf '%s %s' 78 79" "$PRINTF '%s %s' 78 79" "78 79" "" ""
+
+testing "printf %.s acts like %.0s" "$PRINTF %.s_ 1 2 3 4 5" "_____" "" ""
diff --git a/toys/posix/printf.c b/toys/posix/printf.c
index 4c9de286..30ae931d 100644
--- a/toys/posix/printf.c
+++ b/toys/posix/printf.c
@@ -91,19 +91,17 @@ void printf_main(void)
// Handle %escape
else {
char c, *end = 0, *aa, *to = toybuf;
- int wp[] = {0,-1}, i;
+ int wp[] = {0,-1}, i = 0;
// Parse width.precision between % and type indicator.
*to++ = '%';
while (strchr("-+# '0", *f) && (to-toybuf)<10) *to++ = *f++;
- for (i=0; i<2; i++) {
+ for (;;) {
if (eat(&f, '*')) {
if (*arg) wp[i] = atolx(*arg++);
- } else while (*f >= '0' && *f <= '9') {
- if (wp[i]<0) wp[i] = 0;
- wp[i] = (wp[i]*10)+(*f++)-'0';
- }
- if (!eat(&f, '.')) break;
+ } else while (*f >= '0' && *f <= '9') wp[i] = (wp[i]*10)+(*f++)-'0';
+ if (i++ || !eat(&f, '.')) break;
+ wp[1] = 0;
}
c = *f++;
seen = sprintf(to, "*.*%c", c);;