diff options
author | Herbert Xu <herbert@gondor.apana.org.au> | 2018-03-25 15:55:40 +0800 |
---|---|---|
committer | Ben Hutchings <ben@decadent.org.uk> | 2020-03-28 21:42:54 +0000 |
commit | 8f2448fc5da9bdcdbfabb501a8af0912cc2f181d (patch) | |
tree | 21191713850a11584e694a66a4c777033c62c636 | |
parent | 2e20c3194ef01b36e2975764fa23aae89d802138 (diff) | |
download | klibc-8f2448fc5da9bdcdbfabb501a8af0912cc2f181d.tar.gz |
[klibc] dash: builtin: Move echo space/nl handling into print_escape_str
[ dash commit 325a460c7942aa79bb97303e129980db8afd177c ]
Currently echocmd uses print_escape_str to do everything apart
from printing the spaces/newlines separating its arguments. This
patch moves the actual printing into print_escape_str as well
using the format parameter.
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
-rw-r--r-- | usr/dash/bltin/printf.c | 23 |
1 files changed, 13 insertions, 10 deletions
diff --git a/usr/dash/bltin/printf.c b/usr/dash/bltin/printf.c index fe055fd26c9e3..5fa0f5dbaf0b3 100644 --- a/usr/dash/bltin/printf.c +++ b/usr/dash/bltin/printf.c @@ -105,6 +105,8 @@ static int print_escape_str(const char *f, int *param, int *array, char *s) len = q - p; total = len - 1; + q[-1] = (!!((f[1] - 's') | done) - 1) & f[2]; + total += !!q[-1]; if (f[1] == 's') goto easy; @@ -461,21 +463,22 @@ check_conversion(const char *s, const char *ep) int echocmd(int argc, char **argv) { + const char *lastfmt = snlfmt; int nonl; - nonl = *++argv ? equal(*argv, "-n") : 0; - argv += nonl; + if (*++argv && equal(*argv, "-n")) { + argv++; + lastfmt = "%s"; + } do { - int c; + const char *fmt = "%s "; + char *s = *argv; - if (likely(*argv)) - nonl += print_escape_str("%s", NULL, NULL, *argv++); - if (likely((nonl + !*argv) > 1)) - break; + if (!s || !*++argv) + fmt = lastfmt; - c = *argv ? ' ' : '\n'; - out1c(c); - } while (*argv); + nonl = print_escape_str(fmt, NULL, NULL, s ?: nullstr); + } while (!nonl && *argv); return 0; } |