diff options
author | Denis Vlasenko <vda.linux@googlemail.com> | 2008-08-05 13:10:34 +0000 |
---|---|---|
committer | Denis Vlasenko <vda.linux@googlemail.com> | 2008-08-05 13:10:34 +0000 |
commit | e9ad84dfd4c7eb2936374f02989dacf7026a7276 (patch) | |
tree | 37412d21c0a2ccec7c162e0fb42833058f5934e3 /archival/rpm.c | |
parent | 9b44613202a6f2f080ec23746d0680dcef88628d (diff) | |
download | busybox-w32-e9ad84dfd4c7eb2936374f02989dacf7026a7276.tar.gz busybox-w32-e9ad84dfd4c7eb2936374f02989dacf7026a7276.tar.bz2 busybox-w32-e9ad84dfd4c7eb2936374f02989dacf7026a7276.zip |
*: refactor handling of archived files. "tar f file.tar.lzma" now works too.
function old new delta
unpack_Z_stream - 1229 +1229
open_zipped - 176 +176
unpack_bz2_stream_prime - 60 +60
tar_main 642 677 +35
find_main 406 418 +12
sv_main 1222 1233 +11
decode_format_string 829 837 +8
cmp_main 641 649 +8
popstring 134 140 +6
filter_accept_list_reassign 120 125 +5
parse_and_put_prompt 800 804 +4
passwd_main 1053 1049 -4
make_new_name_gunzip 119 114 -5
rpm_main 1688 1670 -18
prepare 302 283 -19
xmalloc_open_zipped_read_close 135 61 -74
uncompress 1229 - -1229
------------------------------------------------------------------------------
(add/remove: 3/1 grow/shrink: 8/5 up/down: 1554/-1349) Total: 205 bytes
Diffstat (limited to 'archival/rpm.c')
-rw-r--r-- | archival/rpm.c | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/archival/rpm.c b/archival/rpm.c index e6dd3d853..e1f3c8930 100644 --- a/archival/rpm.c +++ b/archival/rpm.c | |||
@@ -206,27 +206,27 @@ static void extract_cpio_gz(int fd) | |||
206 | archive_handle->src_fd = fd; | 206 | archive_handle->src_fd = fd; |
207 | /*archive_handle->offset = 0; - init_handle() did it */ | 207 | /*archive_handle->offset = 0; - init_handle() did it */ |
208 | 208 | ||
209 | // TODO: open_zipped does the same | ||
210 | |||
209 | xread(archive_handle->src_fd, &magic, 2); | 211 | xread(archive_handle->src_fd, &magic, 2); |
210 | #if BB_MMU | 212 | #if BB_MMU |
211 | xformer = unpack_gz_stream; | 213 | xformer = unpack_gz_stream; |
212 | #else | 214 | #else |
213 | xformer_prog = "gunzip"; | 215 | xformer_prog = "gunzip"; |
214 | #endif | 216 | #endif |
215 | if ((magic[0] != 0x1f) || (magic[1] != 0x8b)) { | 217 | if (magic[0] != 0x1f || magic[1] != 0x8b) { |
216 | if (ENABLE_FEATURE_RPM_BZ2 | 218 | if (!ENABLE_FEATURE_SEAMLESS_BZ2 |
217 | && (magic[0] == 0x42) && (magic[1] == 0x5a)) { | 219 | || magic[0] != 'B' || magic[1] != 'Z' |
220 | ) { | ||
221 | bb_error_msg_and_die("no gzip" | ||
222 | USE_FEATURE_SEAMLESS_BZ2("/bzip2") | ||
223 | " magic"); | ||
224 | } | ||
218 | #if BB_MMU | 225 | #if BB_MMU |
219 | xformer = unpack_bz2_stream; | 226 | xformer = unpack_bz2_stream; |
220 | #else | 227 | #else |
221 | xformer_prog = "bunzip2"; | 228 | xformer_prog = "bunzip2"; |
222 | #endif | 229 | #endif |
223 | /* We can do better, need modifying unpack_bz2_stream to not require | ||
224 | * first 2 bytes. Not very hard to do... I mean, TODO :) */ | ||
225 | xlseek(archive_handle->src_fd, -2, SEEK_CUR); | ||
226 | } else | ||
227 | bb_error_msg_and_die("no gzip" | ||
228 | USE_FEATURE_RPM_BZ2("/bzip") | ||
229 | " magic"); | ||
230 | } else { | 230 | } else { |
231 | #if !BB_MMU | 231 | #if !BB_MMU |
232 | /* NOMMU version of open_transformer execs an external unzipper that should | 232 | /* NOMMU version of open_transformer execs an external unzipper that should |