aboutsummaryrefslogtreecommitdiff
path: root/archival/libarchive
diff options
context:
space:
mode:
authorDenys Vlasenko <vda.linux@googlemail.com>2012-06-22 16:27:21 +0200
committerDenys Vlasenko <vda.linux@googlemail.com>2012-06-22 16:27:21 +0200
commit440a509849391f2dc8ec720a136577ede3306fa8 (patch)
treed52caed6f400212530c8a2b1eab6c4829a530aac /archival/libarchive
parentd52c9510fd3a9407044166360fe8b752fd841efc (diff)
downloadbusybox-w32-440a509849391f2dc8ec720a136577ede3306fa8.tar.gz
busybox-w32-440a509849391f2dc8ec720a136577ede3306fa8.tar.bz2
busybox-w32-440a509849391f2dc8ec720a136577ede3306fa8.zip
dpkg: fix creation of .list files (were empty since b768aeb). Closes 5324
While at it, fix filename order and free the list of names. function old new delta llist_rev - 21 +21 get_header_tar 1733 1741 +8 unpack_package 587 585 -2 ------------------------------------------------------------------------------ (add/remove: 1/0 grow/shrink: 1/1 up/down: 29/-2) Total: 27 bytes Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
Diffstat (limited to 'archival/libarchive')
-rw-r--r--archival/libarchive/get_header_tar.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/archival/libarchive/get_header_tar.c b/archival/libarchive/get_header_tar.c
index b168653d8..bc09756ba 100644
--- a/archival/libarchive/get_header_tar.c
+++ b/archival/libarchive/get_header_tar.c
@@ -452,9 +452,11 @@ char FAST_FUNC get_header_tar(archive_handle_t *archive_handle)
452 if (cp) 452 if (cp)
453 *cp = '\0'; 453 *cp = '\0';
454 archive_handle->action_data(archive_handle); 454 archive_handle->action_data(archive_handle);
455 if (archive_handle->accept || archive_handle->reject) 455 if (archive_handle->accept || archive_handle->reject
456 || (archive_handle->ah_flags & ARCHIVE_REMEMBER_NAMES)
457 ) {
456 llist_add_to(&archive_handle->passed, file_header->name); 458 llist_add_to(&archive_handle->passed, file_header->name);
457 else /* Caller isn't interested in list of unpacked files */ 459 } else /* Caller isn't interested in list of unpacked files */
458 free(file_header->name); 460 free(file_header->name);
459 } else { 461 } else {
460 data_skip(archive_handle); 462 data_skip(archive_handle);