emo/busybox
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Allow the .Z prefix if compress support enabled

Browse Source
This commit is contained in:
Glenn L McGrath
2002-11-01 22:11:53 +00:00
parent b2f67b4068
commit 9ef0944456
1 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
archival/gunzip.c
View File

@ -143,6 +143,11 @@ extern int gunzip_main(int argc, char **argv)
new_path = xstrdup(old_path); new_path = xstrdup(old_path);
extension = strrchr(new_path, '.'); extension = strrchr(new_path, '.');
#ifdef CONFIG_FEATURE_UNCOMPRESS
if (extension && (strcmp(extension, ".Z") == 0)) {
*extension = '\0';
} else
#endif
if (extension && (strcmp(extension, ".gz") == 0)) { if (extension && (strcmp(extension, ".gz") == 0)) {
*extension = '\0'; *extension = '\0';
} else if (extension && (strcmp(extension, ".tgz") == 0)) { } else if (extension && (strcmp(extension, ".tgz") == 0)) {
@ -169,22 +174,21 @@ extern int gunzip_main(int argc, char **argv)
magic2 = xread_char(src_fd); magic2 = xread_char(src_fd);
#ifdef CONFIG_FEATURE_UNCOMPRESS #ifdef CONFIG_FEATURE_UNCOMPRESS
if (magic2 == 0x9d) { if (magic2 == 0x9d) {
printf("uncompress\n"); status = uncompress(src_fd, dst_fd);
return(uncompress(src_fd, dst_fd));
} else } else
#endif #endif
if (magic2 == 0x8b) { if (magic2 == 0x8b) {
check_header_gzip(src_fd); check_header_gzip(src_fd);
status = inflate(src_fd, dst_fd); status = inflate(src_fd, dst_fd);
if (status != 0) { if (status != 0) {
error_msg("Error inflating"); error_msg_and_die("Error inflating");
} }
check_trailer_gzip(src_fd); check_trailer_gzip(src_fd);
} else { } else {
error_msg_and_die("Invalid magic\n"); error_msg_and_die("Invalid magic");
} }
} else { } else {
error_msg_and_die("Invalid magic\n"); error_msg_and_die("Invalid magic");
} }
if ((status != EXIT_SUCCESS) && (new_path)) { if ((status != EXIT_SUCCESS) && (new_path)) {