diff options
author | Denis Vlasenko <vda.linux@googlemail.com> | 2008-08-05 17:10:34 +0400 |
---|---|---|
committer | Denis Vlasenko <vda.linux@googlemail.com> | 2008-08-05 17:10:34 +0400 |
commit | e9ad84dfd4c7eb2936374f02989dacf7026a7276 (patch) | |
tree | 37412d21c0a2ccec7c162e0fb42833058f5934e3 /archival/libunarchive/filter_accept_list_reassign.c | |
parent | 9b44613202a6f2f080ec23746d0680dcef88628d (diff) |
*: 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/libunarchive/filter_accept_list_reassign.c')
-rw-r--r-- | archival/libunarchive/filter_accept_list_reassign.c | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/archival/libunarchive/filter_accept_list_reassign.c b/archival/libunarchive/filter_accept_list_reassign.c index 4dbc2d13e..f1de4e803 100644 --- a/archival/libunarchive/filter_accept_list_reassign.c +++ b/archival/libunarchive/filter_accept_list_reassign.c @@ -23,22 +23,25 @@ char FAST_FUNC filter_accept_list_reassign(archive_handle_t *archive_handle) /* Find extension */ name_ptr = strrchr(archive_handle->file_header->name, '.'); + if (!name_ptr) + return EXIT_FAILURE; + name_ptr++; /* Modify the subarchive handler based on the extension */ - if (ENABLE_FEATURE_DEB_TAR_GZ - && strcmp(name_ptr, ".gz") == 0 + if (ENABLE_FEATURE_SEAMLESS_GZ + && strcmp(name_ptr, "gz") == 0 ) { archive_handle->action_data_subarchive = get_header_tar_gz; return EXIT_SUCCESS; } - if (ENABLE_FEATURE_DEB_TAR_BZ2 - && strcmp(name_ptr, ".bz2") == 0 + if (ENABLE_FEATURE_SEAMLESS_BZ2 + && strcmp(name_ptr, "bz2") == 0 ) { archive_handle->action_data_subarchive = get_header_tar_bz2; return EXIT_SUCCESS; } - if (ENABLE_FEATURE_DEB_TAR_LZMA - && strcmp(name_ptr, ".lzma") == 0 + if (ENABLE_FEATURE_SEAMLESS_LZMA + && strcmp(name_ptr, "lzma") == 0 ) { archive_handle->action_data_subarchive = get_header_tar_lzma; return EXIT_SUCCESS; |