diff options
author | Denis Vlasenko <vda.linux@googlemail.com> | 2008-06-28 05:04:09 +0000 |
---|---|---|
committer | Denis Vlasenko <vda.linux@googlemail.com> | 2008-06-28 05:04:09 +0000 |
commit | a60936da062fc569328cd643c460dcf215ed9966 (patch) | |
tree | f67e12d028c68c40d6ece445420cd5ab4046ff61 /archival/rpm.c | |
parent | 9579d87be4ab9b02195749c15a2112e2a4466ab4 (diff) | |
download | busybox-w32-a60936da062fc569328cd643c460dcf215ed9966.tar.gz busybox-w32-a60936da062fc569328cd643c460dcf215ed9966.tar.bz2 busybox-w32-a60936da062fc569328cd643c460dcf215ed9966.zip |
libunarchive: stop using static data in archivers - archive_handle_t
can trivially provide space for that.
rpm: code shrink
tar: simplify autodetection of bz2/.gz
function old new delta
static.not_first 1 - -1
static.end 1 - -1
bb_makedev 51 49 -2
static.saved_hardlinks_created 4 - -4
static.saved_hardlinks 4 - -4
longname 4 - -4
linkname 4 - -4
hash_file 251 247 -4
get_header_tar 1528 1521 -7
rpm_main 1711 1697 -14
get_header_cpio 965 944 -21
------------------------------------------------------------------------------
(add/remove: 0/6 grow/shrink: 0/5 up/down: 0/-66) Total: -66 bytes
text data bss dec hex filename
804926 611 6868 812405 c6575 busybox_old
804878 611 6852 812341 c6535 busybox_unstripped
Diffstat (limited to 'archival/rpm.c')
-rw-r--r-- | archival/rpm.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/archival/rpm.c b/archival/rpm.c index 3d03dbcce..c4bcd605d 100644 --- a/archival/rpm.c +++ b/archival/rpm.c | |||
@@ -202,10 +202,9 @@ static void extract_cpio_gz(int fd) | |||
202 | archive_handle->seek = seek_by_read; | 202 | archive_handle->seek = seek_by_read; |
203 | //archive_handle->action_header = header_list; | 203 | //archive_handle->action_header = header_list; |
204 | archive_handle->action_data = data_extract_all; | 204 | archive_handle->action_data = data_extract_all; |
205 | archive_handle->flags |= ARCHIVE_PRESERVE_DATE; | 205 | archive_handle->ah_flags = ARCHIVE_PRESERVE_DATE | ARCHIVE_CREATE_LEADING_DIRS; |
206 | archive_handle->flags |= ARCHIVE_CREATE_LEADING_DIRS; | ||
207 | archive_handle->src_fd = fd; | 206 | archive_handle->src_fd = fd; |
208 | archive_handle->offset = 0; | 207 | /*archive_handle->offset = 0; - init_handle() did it */ |
209 | 208 | ||
210 | xread(archive_handle->src_fd, &magic, 2); | 209 | xread(archive_handle->src_fd, &magic, 2); |
211 | #if BB_MMU | 210 | #if BB_MMU |