diff options
| author | Matt Kraai <kraai@debian.org> | 2000-10-23 18:03:46 +0000 |
|---|---|---|
| committer | Matt Kraai <kraai@debian.org> | 2000-10-23 18:03:46 +0000 |
| commit | 207061ac0d400f663dc411c132d7fc07dca7d496 (patch) | |
| tree | 4d50f76923e65e6247dc399f20b37c5c1bc79487 /archival | |
| parent | 2be4797a06849cf5c9c4f97e1489d70b7fc8be36 (diff) | |
| download | busybox-w32-207061ac0d400f663dc411c132d7fc07dca7d496.tar.gz busybox-w32-207061ac0d400f663dc411c132d7fc07dca7d496.tar.bz2 busybox-w32-207061ac0d400f663dc411c132d7fc07dca7d496.zip | |
Fix error messages.
Diffstat (limited to 'archival')
| -rw-r--r-- | archival/gunzip.c | 8 | ||||
| -rw-r--r-- | archival/gzip.c | 8 |
2 files changed, 8 insertions, 8 deletions
diff --git a/archival/gunzip.c b/archival/gunzip.c index 7a360a6ea..0c9d40670 100644 --- a/archival/gunzip.c +++ b/archival/gunzip.c | |||
| @@ -1120,11 +1120,11 @@ int in, out; /* input and output file descriptors */ | |||
| 1120 | if (res == 3) { | 1120 | if (res == 3) { |
| 1121 | errorMsg(memory_exhausted); | 1121 | errorMsg(memory_exhausted); |
| 1122 | } else if (res != 0) { | 1122 | } else if (res != 0) { |
| 1123 | errorMsg("invalid compressed data--format violated"); | 1123 | errorMsg("invalid compressed data--format violated\n"); |
| 1124 | } | 1124 | } |
| 1125 | 1125 | ||
| 1126 | } else { | 1126 | } else { |
| 1127 | errorMsg("internal error, invalid method"); | 1127 | errorMsg("internal error, invalid method\n"); |
| 1128 | } | 1128 | } |
| 1129 | 1129 | ||
| 1130 | /* Get the crc and original length */ | 1130 | /* Get the crc and original length */ |
| @@ -1153,10 +1153,10 @@ int in, out; /* input and output file descriptors */ | |||
| 1153 | 1153 | ||
| 1154 | /* Validate decompression */ | 1154 | /* Validate decompression */ |
| 1155 | if (orig_crc != updcrc(outbuf, 0)) { | 1155 | if (orig_crc != updcrc(outbuf, 0)) { |
| 1156 | errorMsg("invalid compressed data--crc error"); | 1156 | errorMsg("invalid compressed data--crc error\n"); |
| 1157 | } | 1157 | } |
| 1158 | if (orig_len != (ulg) bytes_out) { | 1158 | if (orig_len != (ulg) bytes_out) { |
| 1159 | errorMsg("invalid compressed data--length error"); | 1159 | errorMsg("invalid compressed data--length error\n"); |
| 1160 | } | 1160 | } |
| 1161 | 1161 | ||
| 1162 | /* Check if there are more entries in a pkzip file */ | 1162 | /* Check if there are more entries in a pkzip file */ |
diff --git a/archival/gzip.c b/archival/gzip.c index e518ffd16..6b25e47df 100644 --- a/archival/gzip.c +++ b/archival/gzip.c | |||
| @@ -1381,7 +1381,7 @@ int length; | |||
| 1381 | (char *) window + start, length) != EQUAL) { | 1381 | (char *) window + start, length) != EQUAL) { |
| 1382 | fprintf(stderr, | 1382 | fprintf(stderr, |
| 1383 | " start %d, match %d, length %d\n", start, match, length); | 1383 | " start %d, match %d, length %d\n", start, match, length); |
| 1384 | errorMsg("invalid match"); | 1384 | errorMsg("invalid match\n"); |
| 1385 | } | 1385 | } |
| 1386 | if (verbose > 1) { | 1386 | if (verbose > 1) { |
| 1387 | fprintf(stderr, "\\[%d,%d]", start - match, length); | 1387 | fprintf(stderr, "\\[%d,%d]", start - match, length); |
| @@ -2911,7 +2911,7 @@ int eof; /* true if this is the last block for a file */ | |||
| 2911 | #endif | 2911 | #endif |
| 2912 | /* Since LIT_BUFSIZE <= 2*WSIZE, the input data must be there: */ | 2912 | /* Since LIT_BUFSIZE <= 2*WSIZE, the input data must be there: */ |
| 2913 | if (buf == (char *) 0) | 2913 | if (buf == (char *) 0) |
| 2914 | errorMsg("block vanished"); | 2914 | errorMsg("block vanished\n"); |
| 2915 | 2915 | ||
| 2916 | copy_block(buf, (unsigned) stored_len, 0); /* without header */ | 2916 | copy_block(buf, (unsigned) stored_len, 0); /* without header */ |
| 2917 | compressed_len = stored_len << 3; | 2917 | compressed_len = stored_len << 3; |
| @@ -3094,7 +3094,7 @@ local void set_file_type() | |||
| 3094 | bin_freq += dyn_ltree[n++].Freq; | 3094 | bin_freq += dyn_ltree[n++].Freq; |
| 3095 | *file_type = bin_freq > (ascii_freq >> 2) ? BINARY : ASCII; | 3095 | *file_type = bin_freq > (ascii_freq >> 2) ? BINARY : ASCII; |
| 3096 | if (*file_type == BINARY && translate_eol) { | 3096 | if (*file_type == BINARY && translate_eol) { |
| 3097 | errorMsg("-l used on binary file"); | 3097 | errorMsg("-l used on binary file\n"); |
| 3098 | } | 3098 | } |
| 3099 | } | 3099 | } |
| 3100 | 3100 | ||
| @@ -3256,7 +3256,7 @@ char *env; /* name of environment variable */ | |||
| 3256 | 3256 | ||
| 3257 | /* Copy the program name first */ | 3257 | /* Copy the program name first */ |
| 3258 | if (oargc-- < 0) | 3258 | if (oargc-- < 0) |
| 3259 | errorMsg("argc<=0"); | 3259 | errorMsg("argc<=0\n"); |
| 3260 | *(nargv++) = *(oargv++); | 3260 | *(nargv++) = *(oargv++); |
| 3261 | 3261 | ||
| 3262 | /* Then copy the environment args */ | 3262 | /* Then copy the environment args */ |