aboutsummaryrefslogtreecommitdiff
path: root/archival/gzip.c
diff options
context:
space:
mode:
authorBernhard Reutner-Fischer <rep.dot.nop@gmail.com>2006-08-20 17:35:13 +0000
committerBernhard Reutner-Fischer <rep.dot.nop@gmail.com>2006-08-20 17:35:13 +0000
commitd591a360d39f9bca3479b913fe4c5773965d18cf (patch)
tree994b43e608bc4640dff7d1bd333938229b874d82 /archival/gzip.c
parent13068a4fdbe558daea85820fec663db3536aacff (diff)
downloadbusybox-w32-d591a360d39f9bca3479b913fe4c5773965d18cf.tar.gz
busybox-w32-d591a360d39f9bca3479b913fe4c5773965d18cf.tar.bz2
busybox-w32-d591a360d39f9bca3479b913fe4c5773965d18cf.zip
- 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 'archival/gzip.c')
-rw-r--r--archival/gzip.c14
1 files changed, 5 insertions, 9 deletions
diff --git a/archival/gzip.c b/archival/gzip.c
index 0962a00a7..37fefbf6a 100644
--- a/archival/gzip.c
+++ b/archival/gzip.c
@@ -263,15 +263,14 @@ DECLARE(ush, tab_prefix, 1L << BITS);
263static int foreground; /* set if program run in foreground */ 263static int foreground; /* set if program run in foreground */
264static int method = DEFLATED; /* compression method */ 264static int method = DEFLATED; /* compression method */
265static int exit_code = OK; /* program exit code */ 265static int exit_code = OK; /* program exit code */
266static int part_nb; /* number of parts in .gz file */
267static long time_stamp; /* original time stamp (modification time) */ 266static long time_stamp; /* original time stamp (modification time) */
268static long ifile_size; /* input file size, -1 for devices (debug only) */
269static char z_suffix[MAX_SUFFIX + 1]; /* default suffix (can be set with --suffix) */ 267static char z_suffix[MAX_SUFFIX + 1]; /* default suffix (can be set with --suffix) */
270static int z_len; /* strlen(z_suffix) */
271 268
272static int ifd; /* input file descriptor */ 269static int ifd; /* input file descriptor */
273static int ofd; /* output file descriptor */ 270static int ofd; /* output file descriptor */
271#ifdef DEBUG
274static unsigned insize; /* valid bytes in inbuf */ 272static unsigned insize; /* valid bytes in inbuf */
273#endif
275static unsigned outcnt; /* bytes in output buffer */ 274static unsigned outcnt; /* bytes in output buffer */
276 275
277static uint32_t *crc_32_tab; 276static uint32_t *crc_32_tab;
@@ -302,7 +301,9 @@ static void abort_gzip(int ATTRIBUTE_UNUSED ignored)
302static void clear_bufs(void) 301static void clear_bufs(void)
303{ 302{
304 outcnt = 0; 303 outcnt = 0;
304#ifdef DEBUG
305 insize = 0; 305 insize = 0;
306#endif
306 bytes_in = 0L; 307 bytes_in = 0L;
307} 308}
308 309
@@ -1177,7 +1178,6 @@ int gzip_main(int argc, char **argv)
1177#endif 1178#endif
1178 1179
1179 strncpy(z_suffix, Z_SUFFIX, sizeof(z_suffix) - 1); 1180 strncpy(z_suffix, Z_SUFFIX, sizeof(z_suffix) - 1);
1180 z_len = strlen(z_suffix);
1181 1181
1182 /* Allocate all global buffers (for DYN_ALLOC option) */ 1182 /* Allocate all global buffers (for DYN_ALLOC option) */
1183 ALLOC(uch, inbuf, INBUFSIZ + INBUF_EXTRA); 1183 ALLOC(uch, inbuf, INBUFSIZ + INBUF_EXTRA);
@@ -1188,13 +1188,11 @@ int gzip_main(int argc, char **argv)
1188 1188
1189 /* Initialise the CRC32 table */ 1189 /* Initialise the CRC32 table */
1190 crc_32_tab = crc32_filltable(0); 1190 crc_32_tab = crc32_filltable(0);
1191 1191
1192 clear_bufs(); 1192 clear_bufs();
1193 part_nb = 0;
1194 1193
1195 if (optind == argc) { 1194 if (optind == argc) {
1196 time_stamp = 0; 1195 time_stamp = 0;
1197 ifile_size = -1L;
1198 zip(STDIN_FILENO, STDOUT_FILENO); 1196 zip(STDIN_FILENO, STDOUT_FILENO);
1199 } else { 1197 } else {
1200 int i; 1198 int i;
@@ -1205,7 +1203,6 @@ int gzip_main(int argc, char **argv)
1205 clear_bufs(); 1203 clear_bufs();
1206 if (strcmp(argv[i], "-") == 0) { 1204 if (strcmp(argv[i], "-") == 0) {
1207 time_stamp = 0; 1205 time_stamp = 0;
1208 ifile_size = -1L;
1209 inFileNum = STDIN_FILENO; 1206 inFileNum = STDIN_FILENO;
1210 outFileNum = STDOUT_FILENO; 1207 outFileNum = STDOUT_FILENO;
1211 } else { 1208 } else {
@@ -1213,7 +1210,6 @@ int gzip_main(int argc, char **argv)
1213 if (fstat(inFileNum, &statBuf) < 0) 1210 if (fstat(inFileNum, &statBuf) < 0)
1214 bb_perror_msg_and_die("%s", argv[i]); 1211 bb_perror_msg_and_die("%s", argv[i]);
1215 time_stamp = statBuf.st_ctime; 1212 time_stamp = statBuf.st_ctime;
1216 ifile_size = statBuf.st_size;
1217 1213
1218 if (!tostdout) { 1214 if (!tostdout) {
1219 path = xmalloc(strlen(argv[i]) + 4); 1215 path = xmalloc(strlen(argv[i]) + 4);
generated by cgit v1.2.3-55-g6feb (git 2.39.1) at 2025-03-17 21:32:44 +0000