aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--archival/gunzip.c4
-rw-r--r--archival/tar.c2
-rw-r--r--gunzip.c4
-rw-r--r--tar.c2
4 files changed, 4 insertions, 8 deletions
diff --git a/archival/gunzip.c b/archival/gunzip.c
index 9d81031d7..0af6adbf7 100644
--- a/archival/gunzip.c
+++ b/archival/gunzip.c
@@ -125,13 +125,14 @@ unsigned short mask_bits[] = {
125//static int error_number = 0; 125//static int error_number = 0;
126/* ======================================================================== 126/* ========================================================================
127 * Signal and error handler. 127 * Signal and error handler.
128 */ 128
129static void abort_gzip() 129static void abort_gzip()
130{ 130{
131 error_msg("gzip aborted\n"); 131 error_msg("gzip aborted\n");
132// exit(ERROR); 132// exit(ERROR);
133 return; 133 return;
134} 134}
135*/
135 136
136static void make_crc_table() 137static void make_crc_table()
137{ 138{
@@ -432,7 +433,6 @@ static int inflate_codes(huft_t *tl, huft_t *td, int bl, int bd)
432 if (e == 16) { /* then it's a literal */ 433 if (e == 16) { /* then it's a literal */
433 window[w++] = (unsigned char) t->v.n; 434 window[w++] = (unsigned char) t->v.n;
434 if (w == WSIZE) { 435 if (w == WSIZE) {
435// flush_output(w);
436 outcnt=(w), 436 outcnt=(w),
437 flush_window(); 437 flush_window();
438 w = 0; 438 w = 0;
diff --git a/archival/tar.c b/archival/tar.c
index ef611531a..9be63ced8 100644
--- a/archival/tar.c
+++ b/archival/tar.c
@@ -284,11 +284,9 @@ extern int tar_main(int argc, char **argv)
284 /* unzip tarFd in a seperate process */ 284 /* unzip tarFd in a seperate process */
285 if (unzipFlag == TRUE) { 285 if (unzipFlag == TRUE) {
286 comp_file = fdopen(tarFd, "r"); 286 comp_file = fdopen(tarFd, "r");
287 printf("1\n");
288 if ((tarFd = gz_open(comp_file, &pid)) == EXIT_FAILURE) { 287 if ((tarFd = gz_open(comp_file, &pid)) == EXIT_FAILURE) {
289 error_msg_and_die("Couldnt unzip file"); 288 error_msg_and_die("Couldnt unzip file");
290 } 289 }
291 printf("2\n");
292 } 290 }
293#endif 291#endif
294 status = readTarFile(tarFd, extractFlag, listFlag, tostdoutFlag, 292 status = readTarFile(tarFd, extractFlag, listFlag, tostdoutFlag,
diff --git a/gunzip.c b/gunzip.c
index 9d81031d7..0af6adbf7 100644
--- a/gunzip.c
+++ b/gunzip.c
@@ -125,13 +125,14 @@ unsigned short mask_bits[] = {
125//static int error_number = 0; 125//static int error_number = 0;
126/* ======================================================================== 126/* ========================================================================
127 * Signal and error handler. 127 * Signal and error handler.
128 */ 128
129static void abort_gzip() 129static void abort_gzip()
130{ 130{
131 error_msg("gzip aborted\n"); 131 error_msg("gzip aborted\n");
132// exit(ERROR); 132// exit(ERROR);
133 return; 133 return;
134} 134}
135*/
135 136
136static void make_crc_table() 137static void make_crc_table()
137{ 138{
@@ -432,7 +433,6 @@ static int inflate_codes(huft_t *tl, huft_t *td, int bl, int bd)
432 if (e == 16) { /* then it's a literal */ 433 if (e == 16) { /* then it's a literal */
433 window[w++] = (unsigned char) t->v.n; 434 window[w++] = (unsigned char) t->v.n;
434 if (w == WSIZE) { 435 if (w == WSIZE) {
435// flush_output(w);
436 outcnt=(w), 436 outcnt=(w),
437 flush_window(); 437 flush_window();
438 w = 0; 438 w = 0;
diff --git a/tar.c b/tar.c
index ef611531a..9be63ced8 100644
--- a/tar.c
+++ b/tar.c
@@ -284,11 +284,9 @@ extern int tar_main(int argc, char **argv)
284 /* unzip tarFd in a seperate process */ 284 /* unzip tarFd in a seperate process */
285 if (unzipFlag == TRUE) { 285 if (unzipFlag == TRUE) {
286 comp_file = fdopen(tarFd, "r"); 286 comp_file = fdopen(tarFd, "r");
287 printf("1\n");
288 if ((tarFd = gz_open(comp_file, &pid)) == EXIT_FAILURE) { 287 if ((tarFd = gz_open(comp_file, &pid)) == EXIT_FAILURE) {
289 error_msg_and_die("Couldnt unzip file"); 288 error_msg_and_die("Couldnt unzip file");
290 } 289 }
291 printf("2\n");
292 } 290 }
293#endif 291#endif
294 status = readTarFile(tarFd, extractFlag, listFlag, tostdoutFlag, 292 status = readTarFile(tarFd, extractFlag, listFlag, tostdoutFlag,