diff options
| author | Bernhard Reutner-Fischer | 2006-08-20 17:35:13 +0000 |
|---|---|---|
| committer | Bernhard Reutner-Fischer | 2006-08-20 17:35:13 +0000 |
| commit | d591a360d39f9bca3479b913fe4c5773965d18cf (patch) | |
| tree | 994b43e608bc4640dff7d1bd333938229b874d82 /coreutils | |
| parent | 13068a4fdbe558daea85820fec663db3536aacff (diff) | |
| download | busybox-d591a360d39f9bca3479b913fe4c5773965d18cf.zip busybox-d591a360d39f9bca3479b913fe4c5773965d18cf.tar.gz | |
- merge -r15463:15564 from busybox_scratch branch through these changesets:
------------------------------------------------------------------------
r15465 | aldot | 2006-06-21 20:48:06 +0200 (Wed, 21 Jun 2006) | 3 lines
- use CONFIG_BUSYBOX_EXEC_PATH as before it one was broken by a recent revert.
- use xchdir() since all is invain if it fails there anyways, supposedly
------------------------------------------------------------------------
r15466 | aldot | 2006-06-21 20:55:16 +0200 (Wed, 21 Jun 2006) | 2 lines
- adjust docs to take CONFIG_BUSYBOX_EXEC_PATH into account.
------------------------------------------------------------------------
r15467 | aldot | 2006-06-21 21:31:24 +0200 (Wed, 21 Jun 2006) | 18 lines
- partial fallout of my TREE_USED touchup against gcc-4.2: rip unused vars, save
s 144 bytes
text data bss dec hex filename
862434 10156 645924 1518514 172bb2 busybox.old
862322 10156 645892 1518370 172b22 busybox
function old new delta
z_len 4 - -4
textend 4 - -4
part_nb 4 - -4
insize 4 - -4
ifile_size 4 - -4
do_link 4 - -4
new_text 70 60 -10
ipaddr_list_link 33 23 -10
gzip_main 898 822 -76
------------------------------------------------------------------------------
(add/remove: 0/6 grow/shrink: 0/3 up/down: 0/-120) Total: -120 bytes
------------------------------------------------------------------------
r15468 | aldot | 2006-06-21 21:43:05 +0200 (Wed, 21 Jun 2006) | 19 lines
- remove useless global exports
function old new delta
rpm_main 940 1601 +661
rpm_getstring 107 112 +5
rpm_getint 148 153 +5
loop_through_files 103 106 +3
fileaction_dobackup 115 113 -2
fileaction_list 5 - -5
rpm_getcount 42 - -42
extract_cpio_gz 161 - -161
rpm_gettags 504 - -504
------------------------------------------------------------------------------
(add/remove: 0/4 grow/shrink: 4/1 up/down: 674/-714) Total: -40 bytes
text data bss dec hex filename
862322 10156 645892 1518370 172b22 busybox.old
862290 10156 645892 1518338 172b02 busybox
------------------------------------------------------------------------
r15555 | aldot | 2006-06-30 14:10:11 +0200 (Fri, 30 Jun 2006) | 22 lines
- shrink syslog a little bit, move a big buffer (for 'line') off the bss, fold s
emaphore stuff into single caller manually.
stats:
function old new delta
logMessage 395 427 +32
message 1245 1257 +12
opts - 4 +4
small 1 - -1
local_logging 4 - -4
doRemoteLog 4 - -4
circular_logging 4 - -4
syslogd_main 1299 1285 -14
static.res 36 16 -20
.rodata 186650 186586 -64
static.line 1025 - -1025
------------------------------------------------------------------------------
(add/remove: 1/5 grow/shrink: 2/3 up/down: 48/-1136) Total: -1088 bytes
cow@s37:~/src/busybox_scratch$ size sysklogd/syslogd.o{.orig,}
text data bss dec hex filename
3723 348 5242 9313 2461 sysklogd/syslogd.o.orig
3697 348 4188 8233 2029 sysklogd/syslogd.o
==============================================================================
Overall bloatcheck for the changeset mentioned above:
function old new delta
rpm_main 953 1608 +655
logMessage 395 427 +32
message 1245 1257 +12
opts - 4 +4
rpm_getstring 107 110 +3
rpm_getint 148 151 +3
loop_through_files 103 104 +1
small 1 - -1
fileaction_dobackup 115 113 -2
z_len 4 - -4
textend 4 - -4
part_nb 4 - -4
local_logging 4 - -4
insize 4 - -4
ifile_size 4 - -4
do_link 4 - -4
doRemoteLog 4 - -4
circular_logging 4 - -4
fileaction_list 5 - -5
new_text 70 60 -10
ipaddr_list_link 33 23 -10
clear_bufs 31 21 -10
syslogd_main 1287 1273 -14
builtin_help 190 176 -14
static.res 36 16 -20
builtin_source 229 199 -30
rpm_getcount 42 - -42
gzip_main 842 786 -56
.rodata 227176 227112 -64
lash_main 609 527 -82
busy_loop 3883 3739 -144
extract_cpio_gz 155 - -155
rpm_gettags 501 - -501
static.line 1025 - -1025
------------------------------------------------------------------------------
(add/remove: 1/15 grow/shrink: 6/12 up/down: 710/-2221) Total: -1511 bytes
Diffstat (limited to 'coreutils')
| -rw-r--r-- | coreutils/env.c | 11 | ||||
| -rw-r--r-- | coreutils/uudecode.c | 3 |
2 files changed, 4 insertions, 10 deletions
diff --git a/coreutils/env.c b/coreutils/env.c index eb1f0b2..4cdbeae 100644 --- a/coreutils/env.c +++ b/coreutils/env.c @@ -29,14 +29,9 @@ * - use bb_default_error_retval */ - -#include <stdio.h> -#include <string.h> -#include <stdlib.h> +#include "busybox.h" #include <errno.h> -#include <unistd.h> #include <getopt.h> /* struct option */ -#include "busybox.h" #if ENABLE_FEATURE_ENV_LONG_OPTIONS static const struct option env_long_options[] = { @@ -50,7 +45,7 @@ int env_main(int argc, char** argv) { static char *cleanenv[1] = { NULL }; - char **ep, *p; + char **ep; unsigned long opt; llist_t *unset_env = NULL; extern char **environ; @@ -77,7 +72,7 @@ int env_main(int argc, char** argv) } } - while (*argv && ((p = strchr(*argv, '=')) != NULL)) { + while (*argv && (strchr(*argv, '=') != NULL)) { if (putenv(*argv) < 0) { bb_perror_msg_and_die("putenv"); } diff --git a/coreutils/uudecode.c b/coreutils/uudecode.c index 6050c0a..2ec4306 100644 --- a/coreutils/uudecode.c +++ b/coreutils/uudecode.c @@ -129,9 +129,8 @@ int uudecode_main(int argc, char **argv) FILE *src_stream; char *outname = NULL; char *line; - int opt; - opt = bb_getopt_ulflags(argc, argv, "o:", &outname); + bb_getopt_ulflags(argc, argv, "o:", &outname); if (optind == argc) { src_stream = stdin; |