diff options
author | Denis Vlasenko <vda.linux@googlemail.com> | 2007-03-07 22:02:23 +0000 |
---|---|---|
committer | Denis Vlasenko <vda.linux@googlemail.com> | 2007-03-07 22:02:23 +0000 |
commit | ab9eef21a57c23567505e8fbceb8e5ea76306ce1 (patch) | |
tree | 800845b64d0e9a204743656c4d267cc6c9917cde /archival/gunzip.c | |
parent | 8e858e2700651a0e973169b579622cd3dcd0defd (diff) | |
download | busybox-w32-ab9eef21a57c23567505e8fbceb8e5ea76306ce1.tar.gz busybox-w32-ab9eef21a57c23567505e8fbceb8e5ea76306ce1.tar.bz2 busybox-w32-ab9eef21a57c23567505e8fbceb8e5ea76306ce1.zip |
bunzip2/gunzip/uncompress/unlzma: merge into common code -
fix few corner cases, reduce size by 450 bytes. Update testsuite.
Diffstat (limited to 'archival/gunzip.c')
-rw-r--r-- | archival/gunzip.c | 163 |
1 files changed, 0 insertions, 163 deletions
diff --git a/archival/gunzip.c b/archival/gunzip.c deleted file mode 100644 index 3d99fe506..000000000 --- a/archival/gunzip.c +++ /dev/null | |||
@@ -1,163 +0,0 @@ | |||
1 | /* vi: set sw=4 ts=4: */ | ||
2 | /* | ||
3 | * Gzip implementation for busybox | ||
4 | * | ||
5 | * Based on GNU gzip v1.2.4 Copyright (C) 1992-1993 Jean-loup Gailly. | ||
6 | * | ||
7 | * Originally adjusted for busybox by Sven Rudolph <sr1@inf.tu-dresden.de> | ||
8 | * based on gzip sources | ||
9 | * | ||
10 | * Adjusted further by Erik Andersen <andersen@codepoet.org> to support files as | ||
11 | * well as stdin/stdout, and to generally behave itself wrt command line | ||
12 | * handling. | ||
13 | * | ||
14 | * General cleanup to better adhere to the style guide and make use of standard | ||
15 | * busybox functions by Glenn McGrath <bug1@iinet.net.au> | ||
16 | * | ||
17 | * Licensed under GPLv2 or later, see file LICENSE in this tarball for details. | ||
18 | * | ||
19 | * gzip (GNU zip) -- compress files with zip algorithm and 'compress' interface | ||
20 | * Copyright (C) 1992-1993 Jean-loup Gailly | ||
21 | * The unzip code was written and put in the public domain by Mark Adler. | ||
22 | * Portions of the lzw code are derived from the public domain 'compress' | ||
23 | * written by Spencer Thomas, Joe Orost, James Woods, Jim McKie, Steve Davies, | ||
24 | * Ken Turkowski, Dave Mack and Peter Jannesen. | ||
25 | * | ||
26 | * See the license_msg below and the file COPYING for the software license. | ||
27 | * See the file algorithm.doc for the compression algorithms and file formats. | ||
28 | */ | ||
29 | |||
30 | #include "busybox.h" | ||
31 | #include "unarchive.h" | ||
32 | |||
33 | #define GUNZIP_OPT_STDOUT 1 | ||
34 | #define GUNZIP_OPT_FORCE 2 | ||
35 | #define GUNZIP_OPT_TEST 4 | ||
36 | #define GUNZIP_OPT_DECOMPRESS 8 | ||
37 | #define GUNZIP_OPT_VERBOSE 0x10 | ||
38 | |||
39 | int gunzip_main(int argc, char **argv); | ||
40 | int gunzip_main(int argc, char **argv) | ||
41 | { | ||
42 | USE_DESKTOP(long long) int status; | ||
43 | int exitcode = 0; | ||
44 | unsigned opt; | ||
45 | |||
46 | opt = getopt32(argc, argv, "cftdv"); | ||
47 | /* if called as zcat */ | ||
48 | if (strcmp(applet_name, "zcat") == 0) { | ||
49 | opt |= GUNZIP_OPT_STDOUT; | ||
50 | } | ||
51 | |||
52 | do { | ||
53 | struct stat stat_buf; | ||
54 | char *old_path = argv[optind]; | ||
55 | char *delete_path = NULL; | ||
56 | char *new_path = NULL; | ||
57 | int src_fd; | ||
58 | int dst_fd; | ||
59 | |||
60 | optind++; | ||
61 | |||
62 | if (old_path == NULL || LONE_DASH(old_path)) { | ||
63 | src_fd = STDIN_FILENO; | ||
64 | opt |= GUNZIP_OPT_STDOUT; | ||
65 | USE_DESKTOP(opt &= ~GUNZIP_OPT_VERBOSE;) | ||
66 | optind = argc; /* we don't handle "gunzip - a.gz b.gz" */ | ||
67 | } else { | ||
68 | src_fd = xopen(old_path, O_RDONLY); | ||
69 | /* Get the time stamp on the input file. */ | ||
70 | fstat(src_fd, &stat_buf); | ||
71 | } | ||
72 | |||
73 | /* Check that the input is sane. */ | ||
74 | if (isatty(src_fd) && !(opt & GUNZIP_OPT_FORCE)) { | ||
75 | bb_error_msg_and_die | ||
76 | ("compressed data not read from terminal, use -f to force it"); | ||
77 | } | ||
78 | |||
79 | /* Set output filename and number */ | ||
80 | if (opt & GUNZIP_OPT_TEST) { | ||
81 | dst_fd = xopen(bb_dev_null, O_WRONLY); /* why does test use filenum 2 ? */ | ||
82 | } else if (opt & GUNZIP_OPT_STDOUT) { | ||
83 | dst_fd = STDOUT_FILENO; | ||
84 | } else { | ||
85 | char *extension; | ||
86 | |||
87 | new_path = xstrdup(old_path); | ||
88 | |||
89 | extension = strrchr(new_path, '.'); | ||
90 | #ifdef CONFIG_FEATURE_GUNZIP_UNCOMPRESS | ||
91 | if (extension && (strcmp(extension, ".Z") == 0)) { | ||
92 | *extension = '\0'; | ||
93 | } else | ||
94 | #endif | ||
95 | if (extension && (strcmp(extension, ".gz") == 0)) { | ||
96 | *extension = '\0'; | ||
97 | } else if (extension && (strcmp(extension, ".tgz") == 0)) { | ||
98 | extension[2] = 'a'; | ||
99 | extension[3] = 'r'; | ||
100 | } else { | ||
101 | // FIXME: should we die or just skip to next? | ||
102 | bb_error_msg_and_die("invalid extension"); | ||
103 | } | ||
104 | |||
105 | /* Open output file (with correct permissions) */ | ||
106 | dst_fd = xopen3(new_path, O_WRONLY | O_CREAT | O_TRUNC, | ||
107 | stat_buf.st_mode); | ||
108 | |||
109 | /* If unzip succeeds remove the old file */ | ||
110 | delete_path = old_path; | ||
111 | } | ||
112 | |||
113 | status = -1; | ||
114 | /* do the decompression, and cleanup */ | ||
115 | if (xread_char(src_fd) == 0x1f) { | ||
116 | unsigned char magic2; | ||
117 | |||
118 | magic2 = xread_char(src_fd); | ||
119 | if (ENABLE_FEATURE_GUNZIP_UNCOMPRESS && magic2 == 0x9d) { | ||
120 | status = uncompress(src_fd, dst_fd); | ||
121 | } else if (magic2 == 0x8b) { | ||
122 | check_header_gzip(src_fd); // FIXME: xfunc? _or_die? | ||
123 | status = inflate_gunzip(src_fd, dst_fd); | ||
124 | } else { | ||
125 | bb_error_msg("invalid magic"); | ||
126 | exitcode = 1; | ||
127 | } | ||
128 | if (status < 0) { | ||
129 | bb_error_msg("error inflating"); | ||
130 | exitcode = 1; | ||
131 | } | ||
132 | else if (ENABLE_DESKTOP && (opt & GUNZIP_OPT_VERBOSE)) { | ||
133 | fprintf(stderr, "%s: %u%% - replaced with %s\n", | ||
134 | old_path, (unsigned)(stat_buf.st_size*100 / (status+1)), new_path); | ||
135 | } | ||
136 | } else { | ||
137 | bb_error_msg("invalid magic"); | ||
138 | exitcode = 1; | ||
139 | } | ||
140 | if (status < 0 && new_path) { | ||
141 | /* Unzip failed, remove new path instead of old path */ | ||
142 | delete_path = new_path; | ||
143 | } | ||
144 | |||
145 | if (dst_fd != STDOUT_FILENO) { | ||
146 | close(dst_fd); | ||
147 | } | ||
148 | if (src_fd != STDIN_FILENO) { | ||
149 | close(src_fd); | ||
150 | } | ||
151 | |||
152 | /* delete_path will be NULL if in test mode or from stdin */ | ||
153 | if (delete_path && (unlink(delete_path) == -1)) { | ||
154 | bb_error_msg("cannot remove %s", delete_path); | ||
155 | exitcode = 1; | ||
156 | } | ||
157 | |||
158 | free(new_path); | ||
159 | |||
160 | } while (optind < argc); | ||
161 | |||
162 | return exitcode; | ||
163 | } | ||