diff options
author | Denys Vlasenko <vda.linux@googlemail.com> | 2015-10-07 22:42:45 +0200 |
---|---|---|
committer | Denys Vlasenko <vda.linux@googlemail.com> | 2015-10-07 22:42:45 +0200 |
commit | d60752f8c9be5689a249ad518deb38061d4bc45e (patch) | |
tree | 06df5c7e22be59561cbbcd22eb63ff95344fe321 /shell | |
parent | 8c0708a329618b20089eb9cedbe06522dd25d9be (diff) | |
download | busybox-w32-d60752f8c9be5689a249ad518deb38061d4bc45e.tar.gz busybox-w32-d60752f8c9be5689a249ad518deb38061d4bc45e.tar.bz2 busybox-w32-d60752f8c9be5689a249ad518deb38061d4bc45e.zip |
build system: -fno-builtin-printf
Benefits are: drops reference to out-of-line putchar(), fixes a few cases
of failed string merge.
function old new delta
i2cdump_main 1488 1502 +14
sha256_process_block64 423 433 +10
sendmail_main 1183 1185 +2
list_table 1114 1116 +2
i2cdetect_main 1235 1237 +2
fdisk_main 2852 2854 +2
builtin_type 119 121 +2
unicode_conv_to_printable2 325 324 -1
scan_recursive 380 378 -2
mkfs_minix_main 2687 2684 -3
buffer_fill_and_print 178 169 -9
putchar 152 - -152
------------------------------------------------------------------------------
(add/remove: 0/2 grow/shrink: 7/4 up/down: 34/-167) Total: -133 bytes
text data bss dec hex filename
937788 932 17676 956396 e97ec busybox_old
937564 932 17676 956172 e970c busybox_unstripped
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
Diffstat (limited to 'shell')
-rw-r--r-- | shell/ash.c | 2 | ||||
-rw-r--r-- | shell/hush.c | 2 | ||||
-rw-r--r-- | shell/shell_common.c | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/shell/ash.c b/shell/ash.c index b835415b5..7d20b8860 100644 --- a/shell/ash.c +++ b/shell/ash.c | |||
@@ -9681,7 +9681,7 @@ preadfd(void) | |||
9681 | } | 9681 | } |
9682 | # if ENABLE_ASH_IDLE_TIMEOUT | 9682 | # if ENABLE_ASH_IDLE_TIMEOUT |
9683 | else if (errno == EAGAIN && timeout > 0) { | 9683 | else if (errno == EAGAIN && timeout > 0) { |
9684 | printf("\007timed out waiting for input: auto-logout\n"); | 9684 | puts("\007timed out waiting for input: auto-logout"); |
9685 | exitshell(); | 9685 | exitshell(); |
9686 | } | 9686 | } |
9687 | # endif | 9687 | # endif |
diff --git a/shell/hush.c b/shell/hush.c index bccd9c1e9..f085ed3eb 100644 --- a/shell/hush.c +++ b/shell/hush.c | |||
@@ -6794,7 +6794,7 @@ static int checkjobs(struct pipe *fg_pipe) | |||
6794 | int sig = WTERMSIG(status); | 6794 | int sig = WTERMSIG(status); |
6795 | if (i == fg_pipe->num_cmds-1) | 6795 | if (i == fg_pipe->num_cmds-1) |
6796 | /* TODO: use strsignal() instead for bash compat? but that's bloat... */ | 6796 | /* TODO: use strsignal() instead for bash compat? but that's bloat... */ |
6797 | printf("%s\n", sig == SIGINT || sig == SIGPIPE ? "" : get_signame(sig)); | 6797 | puts(sig == SIGINT || sig == SIGPIPE ? "" : get_signame(sig)); |
6798 | /* TODO: if (WCOREDUMP(status)) + " (core dumped)"; */ | 6798 | /* TODO: if (WCOREDUMP(status)) + " (core dumped)"; */ |
6799 | /* TODO: MIPS has 128 sigs (1..128), what if sig==128 here? | 6799 | /* TODO: MIPS has 128 sigs (1..128), what if sig==128 here? |
6800 | * Maybe we need to use sig | 128? */ | 6800 | * Maybe we need to use sig | 128? */ |
diff --git a/shell/shell_common.c b/shell/shell_common.c index 2b6f7dc92..8c9607c8c 100644 --- a/shell/shell_common.c +++ b/shell/shell_common.c | |||
@@ -380,7 +380,7 @@ static void printlim(unsigned opts, const struct rlimit *limit, | |||
380 | val = limit->rlim_cur; | 380 | val = limit->rlim_cur; |
381 | 381 | ||
382 | if (val == RLIM_INFINITY) | 382 | if (val == RLIM_INFINITY) |
383 | printf("unlimited\n"); | 383 | puts("unlimited"); |
384 | else { | 384 | else { |
385 | val >>= l->factor_shift; | 385 | val >>= l->factor_shift; |
386 | printf("%llu\n", (long long) val); | 386 | printf("%llu\n", (long long) val); |