diff options
author | Rob Landley <rob@landley.net> | 2006-07-06 20:30:19 +0000 |
---|---|---|
committer | Rob Landley <rob@landley.net> | 2006-07-06 20:30:19 +0000 |
commit | ff6e21c2ce9d20330cd3a2cf4c7446749a06d364 (patch) | |
tree | 96a13b88d8b5666ebaa0a01b15187dee404dc7f5 | |
parent | 9ebd1bd46838586e9ebfd4dd190494e6226458d9 (diff) | |
download | busybox-w32-ff6e21c2ce9d20330cd3a2cf4c7446749a06d364.tar.gz busybox-w32-ff6e21c2ce9d20330cd3a2cf4c7446749a06d364.tar.bz2 busybox-w32-ff6e21c2ce9d20330cd3a2cf4c7446749a06d364.zip |
Fix tar so it can extract git-generated tarballs, based on a suggestion
from Erik Frederiksen.
-rw-r--r-- | archival/libunarchive/get_header_tar.c | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/archival/libunarchive/get_header_tar.c b/archival/libunarchive/get_header_tar.c index 3302d9392..1cbde9543 100644 --- a/archival/libunarchive/get_header_tar.c +++ b/archival/libunarchive/get_header_tar.c | |||
@@ -137,10 +137,6 @@ char get_header_tar(archive_handle_t *archive_handle) | |||
137 | case '1': | 137 | case '1': |
138 | file_header->mode |= S_IFREG; | 138 | file_header->mode |= S_IFREG; |
139 | break; | 139 | break; |
140 | case 'x': | ||
141 | case 'g': | ||
142 | bb_error_msg_and_die("pax is not tar"); | ||
143 | break; | ||
144 | case '7': | 140 | case '7': |
145 | /* Reserved for high performance files, treat as normal file */ | 141 | /* Reserved for high performance files, treat as normal file */ |
146 | case 0: | 142 | case 0: |
@@ -188,8 +184,11 @@ char get_header_tar(archive_handle_t *archive_handle) | |||
188 | case 'N': /* Old GNU for names > 100 characters */ | 184 | case 'N': /* Old GNU for names > 100 characters */ |
189 | case 'S': /* Sparse file */ | 185 | case 'S': /* Sparse file */ |
190 | case 'V': /* Volume header */ | 186 | case 'V': /* Volume header */ |
191 | bb_error_msg("Ignoring GNU extension type %c", tar.formated.typeflag); | ||
192 | #endif | 187 | #endif |
188 | case 'g': /* pax global header */ | ||
189 | case 'x': /* pax extended header */ | ||
190 | bb_error_msg("Ignoring extension type %c", tar.formated.typeflag); | ||
191 | break; | ||
193 | default: | 192 | default: |
194 | bb_error_msg("Unknown typeflag: 0x%x", tar.formated.typeflag); | 193 | bb_error_msg("Unknown typeflag: 0x%x", tar.formated.typeflag); |
195 | } | 194 | } |