aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--tests/printf.test5
-rw-r--r--toys/pending/printf.c6
2 files changed, 8 insertions, 3 deletions
diff --git a/tests/printf.test b/tests/printf.test
index 7b4b821d..5cbefb59 100644
--- a/tests/printf.test
+++ b/tests/printf.test
@@ -37,7 +37,10 @@ testing "printf %s width precision" \
testing "printf extra args" "$PRINTF 'abc%s!%ddef\n' X 42 ARG 36" \
"abcX!42def\nabcARG!36def\n" "" ""
-testing "printf '%3c'" "printf '%3c' x" " x" "" ""
+testing "printf '%3c'" "$PRINTF '%3c' x" " x" "" ""
+testing "printf '%-3c'" "$PRINTF '%-3c' x" "x " "" ""
+testing "printf '%+d'" "$PRINTF '%+d' 5" "+5" "" ""
+
testing "printf '%5d%4d' 1 21 321 4321 54321" \
"$PRINTF '%5d%4d' 1 21 321 4321 54321" " 1 21 321432154321 0" "" ""
diff --git a/toys/pending/printf.c b/toys/pending/printf.c
index 81fcd22a..c9afc9b2 100644
--- a/toys/pending/printf.c
+++ b/toys/pending/printf.c
@@ -4,6 +4,8 @@
* Copyright 2014 Kyungwan Han <asura321@gmail.com>
*
* See http://pubs.opengroup.org/onlinepubs/9699919799/utilities/printf.html
+ *
+ * todo: *m$ ala printf("%1$d:%2$.*3$d:%4$.*3$d\n", hour, min, precision, sec);
USE_PRINTF(NEWTOY(printf, "<1", TOYFLAG_USR|TOYFLAG_BIN))
@@ -93,7 +95,7 @@ void printf_main(void)
// Parse width.precision between % and type indicator.
*to++ = '%';
- while (strchr("-+# '0", *f) && (to-toybuf)<10) *to = *f++;
+ while (strchr("-+# '0", *f) && (to-toybuf)<10) *to++ = *f++;
for (i=0; i<2; i++) {
if (eat(&f, '*')) {
if (*arg) wp[i] = atolx(*arg++);
@@ -118,10 +120,10 @@ void printf_main(void)
else if (strchr("diouxX", c)) {
long ll;
- sprintf(to, "*.*ll%c", c);
if (*aa == '\'' || *aa == '"') ll = aa[1];
else ll = strtoll(aa, &end, 0);
+ sprintf(to, "*.*ll%c", c);
printf(toybuf, wp[0], wp[1], ll);
} else if (strchr("feEgG", c)) {
long double ld = strtold(aa, &end);