From d591a360d39f9bca3479b913fe4c5773965d18cf Mon Sep 17 00:00:00 2001 From: Bernhard Reutner-Fischer Date: Sun, 20 Aug 2006 17:35:13 +0000 Subject: - 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 --- archival/gzip.c | 14 +++++--------- archival/rpm.c | 43 ++++++++++++++++++------------------------- 2 files changed, 23 insertions(+), 34 deletions(-) (limited to 'archival') diff --git a/archival/gzip.c b/archival/gzip.c index 0962a00..37fefbf 100644 --- a/archival/gzip.c +++ b/archival/gzip.c @@ -263,15 +263,14 @@ DECLARE(ush, tab_prefix, 1L << BITS); static int foreground; /* set if program run in foreground */ static int method = DEFLATED; /* compression method */ static int exit_code = OK; /* program exit code */ -static int part_nb; /* number of parts in .gz file */ static long time_stamp; /* original time stamp (modification time) */ -static long ifile_size; /* input file size, -1 for devices (debug only) */ static char z_suffix[MAX_SUFFIX + 1]; /* default suffix (can be set with --suffix) */ -static int z_len; /* strlen(z_suffix) */ static int ifd; /* input file descriptor */ static int ofd; /* output file descriptor */ +#ifdef DEBUG static unsigned insize; /* valid bytes in inbuf */ +#endif static unsigned outcnt; /* bytes in output buffer */ static uint32_t *crc_32_tab; @@ -302,7 +301,9 @@ static void abort_gzip(int ATTRIBUTE_UNUSED ignored) static void clear_bufs(void) { outcnt = 0; +#ifdef DEBUG insize = 0; +#endif bytes_in = 0L; } @@ -1177,7 +1178,6 @@ int gzip_main(int argc, char **argv) #endif strncpy(z_suffix, Z_SUFFIX, sizeof(z_suffix) - 1); - z_len = strlen(z_suffix); /* Allocate all global buffers (for DYN_ALLOC option) */ ALLOC(uch, inbuf, INBUFSIZ + INBUF_EXTRA); @@ -1188,13 +1188,11 @@ int gzip_main(int argc, char **argv) /* Initialise the CRC32 table */ crc_32_tab = crc32_filltable(0); - + clear_bufs(); - part_nb = 0; if (optind == argc) { time_stamp = 0; - ifile_size = -1L; zip(STDIN_FILENO, STDOUT_FILENO); } else { int i; @@ -1205,7 +1203,6 @@ int gzip_main(int argc, char **argv) clear_bufs(); if (strcmp(argv[i], "-") == 0) { time_stamp = 0; - ifile_size = -1L; inFileNum = STDIN_FILENO; outFileNum = STDOUT_FILENO; } else { @@ -1213,7 +1210,6 @@ int gzip_main(int argc, char **argv) if (fstat(inFileNum, &statBuf) < 0) bb_perror_msg_and_die("%s", argv[i]); time_stamp = statBuf.st_ctime; - ifile_size = statBuf.st_size; if (!tostdout) { path = xmalloc(strlen(argv[i]) + 4); diff --git a/archival/rpm.c b/archival/rpm.c index 7b27c02..d399e0e 100644 --- a/archival/rpm.c +++ b/archival/rpm.c @@ -70,17 +70,15 @@ static void *map; static rpm_index **mytags; static int tagcount; -void extract_cpio_gz(int fd); -rpm_index **rpm_gettags(int fd, int *num_tags); -int bsearch_rpmtag(const void *key, const void *item); -char *rpm_getstring(int tag, int itemindex); -int rpm_getint(int tag, int itemindex); -int rpm_getcount(int tag); -void exec_script(int progtag, int datatag, char *prefix); -void fileaction_dobackup(char *filename, int fileref); -void fileaction_setowngrp(char *filename, int fileref); -void fileaction_list(char *filename, int itemno); -void loop_through_files(int filetag, void (*fileaction)(char *filename, int fileref)); +static void extract_cpio_gz(int fd); +static rpm_index **rpm_gettags(int fd, int *num_tags); +static int bsearch_rpmtag(const void *key, const void *item); +static char *rpm_getstring(int tag, int itemindex); +static int rpm_getint(int tag, int itemindex); +static int rpm_getcount(int tag); +static void fileaction_dobackup(char *filename, int fileref); +static void fileaction_setowngrp(char *filename, int fileref); +static void loop_through_files(int filetag, void (*fileaction)(char *filename, int fileref)); int rpm_main(int argc, char **argv) { @@ -169,7 +167,7 @@ int rpm_main(int argc, char **argv) return 0; } -void extract_cpio_gz(int fd) { +static void extract_cpio_gz(int fd) { archive_handle_t *archive_handle; unsigned char magic[2]; @@ -196,7 +194,7 @@ void extract_cpio_gz(int fd) { } -rpm_index **rpm_gettags(int fd, int *num_tags) +static rpm_index **rpm_gettags(int fd, int *num_tags) { rpm_index **tags = xzalloc(200 * sizeof(struct rpmtag *)); /* We should never need mode than 200, and realloc later */ int pass, tagindex = 0; @@ -235,14 +233,14 @@ rpm_index **rpm_gettags(int fd, int *num_tags) return tags; /* All done, leave the file at the start of the gzipped cpio archive */ } -int bsearch_rpmtag(const void *key, const void *item) +static int bsearch_rpmtag(const void *key, const void *item) { int *tag = (int *)key; rpm_index **tmp = (rpm_index **) item; return (*tag - tmp[0]->tag); } -int rpm_getcount(int tag) +static int rpm_getcount(int tag) { rpm_index **found; found = bsearch(&tag, mytags, tagcount, sizeof(struct rpmtag *), bsearch_rpmtag); @@ -250,7 +248,7 @@ int rpm_getcount(int tag) else return found[0]->count; } -char *rpm_getstring(int tag, int itemindex) +static char *rpm_getstring(int tag, int itemindex) { rpm_index **found; found = bsearch(&tag, mytags, tagcount, sizeof(struct rpmtag *), bsearch_rpmtag); @@ -263,7 +261,7 @@ char *rpm_getstring(int tag, int itemindex) } else return NULL; } -int rpm_getint(int tag, int itemindex) +static int rpm_getint(int tag, int itemindex) { rpm_index **found; int n, *tmpint; @@ -284,7 +282,7 @@ int rpm_getint(int tag, int itemindex) } else return -1; } -void fileaction_dobackup(char *filename, int fileref) +static void fileaction_dobackup(char *filename, int fileref) { struct stat oldfile; int stat_res; @@ -301,7 +299,7 @@ void fileaction_dobackup(char *filename, int fileref) } } -void fileaction_setowngrp(char *filename, int fileref) +static void fileaction_setowngrp(char *filename, int fileref) { int uid, gid; uid = bb_xgetpwnam(rpm_getstring(RPMTAG_FILEUSERNAME, fileref)); @@ -309,12 +307,7 @@ void fileaction_setowngrp(char *filename, int fileref) chown (filename, uid, gid); } -void fileaction_list(char *filename, int ATTRIBUTE_UNUSED fileref) -{ - printf("%s\n", filename); -} - -void loop_through_files(int filetag, void (*fileaction)(char *filename, int fileref)) +static void loop_through_files(int filetag, void (*fileaction)(char *filename, int fileref)) { int count = 0; while (rpm_getstring(filetag, count)) { -- cgit v1.1