aboutsummaryrefslogtreecommitdiff
path: root/archival/gzip.c
diff options
context:
space:
mode:
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);