diff options
| author | Herbert Xu <herbert@gondor.apana.org.au> | 2014-10-27 16:12:49 +0800 |
|---|---|---|
| committer | Ben Hutchings <ben@decadent.org.uk> | 2020-03-28 21:42:54 +0000 |
| commit | 298ca1e50131be8fae13c629aca17507928271d3 (patch) | |
| tree | 05b11e6556e40d9c623a4b7cffb23402cae45405 | |
| parent | e9dff9389660fcfca586051edc7aba890f74882e (diff) | |
| download | klibc-298ca1e50131be8fae13c629aca17507928271d3.tar.gz | |
[klibc] dash: [BUILTIN] Optimise handling of backslash octals in printf
[ dash commit a68498993413cd15f9b852ca32afd368e1792b51 ]
This patch removes the duplicate octal handling for %b by reusing
the existing code in conv_escape.
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 | 30 |
1 files changed, 8 insertions, 22 deletions
diff --git a/usr/dash/bltin/printf.c b/usr/dash/bltin/printf.c index 72f89883f8ff8..0e150d366cfe4 100644 --- a/usr/dash/bltin/printf.c +++ b/usr/dash/bltin/printf.c @@ -276,8 +276,8 @@ conv_escape_str(char *str, char **sp) if (ch != '\\') continue; - ch = *str++; - if (ch == 'c') { + c = *str++; + if (c == 'c') { /* \c as in SYSV echo - abort all processing.... */ c = ch = 0x100; continue; @@ -288,24 +288,11 @@ conv_escape_str(char *str, char **sp) * They start with a \0, and are followed by 0, 1, 2, * or 3 octal digits. */ - if (ch == '0') { - unsigned char i; - i = 3; - c = 0; - do { - unsigned k = octtobin(*str); - if (k > 7) - break; - str++; - c <<= 3; - c += k; - } while (--i); - continue; - } + if (c == '0' && isodigit(*str)) + str++; /* Finally test for sequences valid in the format string */ str = conv_escape(str - 1, &c); - ch = c; } while (STPUTC(c, cp), (char)ch); *sp = cp; @@ -326,12 +313,11 @@ conv_escape(char *str, int *conv_ch) switch (ch) { default: - case 0: - value = '\\'; - goto out; + if (!isodigit(*str)) { + value = '\\'; + goto out; + } - case '0': case '1': case '2': case '3': - case '4': case '5': case '6': case '7': ch = 3; value = 0; do { |