diff options
author | Denys Vlasenko <vda.linux@googlemail.com> | 2010-10-23 21:06:06 +0200 |
---|---|---|
committer | Denys Vlasenko <vda.linux@googlemail.com> | 2010-10-23 21:06:06 +0200 |
commit | 53600591311a129717abd2e3bcaa302622a6ce67 (patch) | |
tree | 4b0d08ed429d4b73a9739339e74d84a8a72fe25e /coreutils | |
parent | 6a0d7490ea6ad97aeafb9da04acab13bd3c38e4d (diff) | |
download | busybox-w32-53600591311a129717abd2e3bcaa302622a6ce67.tar.gz busybox-w32-53600591311a129717abd2e3bcaa302622a6ce67.tar.bz2 busybox-w32-53600591311a129717abd2e3bcaa302622a6ce67.zip |
libbb: introduce and use strcpy_and_process_escape_sequences
function old new delta
strcpy_and_process_escape_sequences - 50 +50
bb_process_escape_sequence 148 138 -10
printf_main 789 776 -13
getty_main 1897 1831 -66
------------------------------------------------------------------------------
(add/remove: 1/0 grow/shrink: 0/3 up/down: 50/-89) Total: -39 bytes
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
Diffstat (limited to 'coreutils')
-rw-r--r-- | coreutils/printf.c | 18 |
1 files changed, 8 insertions, 10 deletions
diff --git a/coreutils/printf.c b/coreutils/printf.c index 2cc238439..c8395fa89 100644 --- a/coreutils/printf.c +++ b/coreutils/printf.c | |||
@@ -122,16 +122,14 @@ static double my_xstrtod(const char *arg) | |||
122 | return result; | 122 | return result; |
123 | } | 123 | } |
124 | 124 | ||
125 | static void print_esc_string(char *str) | 125 | static void print_esc_string(const char *str) |
126 | { | 126 | { |
127 | while (*str) { | 127 | char c; |
128 | if (*str == '\\') { | 128 | while ((c = *str) != '\0') { |
129 | str++; | 129 | str++; |
130 | bb_putchar(bb_process_escape_sequence((const char **)&str)); | 130 | if (c == '\\') |
131 | } else { | 131 | c = bb_process_escape_sequence(&str); |
132 | bb_putchar(*str); | 132 | putchar(c); |
133 | str++; | ||
134 | } | ||
135 | } | 133 | } |
136 | } | 134 | } |
137 | 135 | ||
@@ -344,7 +342,7 @@ static char **print_formatted(char *f, char **argv, int *conv_err) | |||
344 | f--; | 342 | f--; |
345 | break; | 343 | break; |
346 | default: | 344 | default: |
347 | bb_putchar(*f); | 345 | putchar(*f); |
348 | } | 346 | } |
349 | } | 347 | } |
350 | 348 | ||