aboutsummaryrefslogtreecommitdiff
path: root/archival/tar.c
diff options
context:
space:
mode:
authorDenis Vlasenko <vda.linux@googlemail.com>2008-06-28 05:04:09 +0000
committerDenis Vlasenko <vda.linux@googlemail.com>2008-06-28 05:04:09 +0000
commita60936da062fc569328cd643c460dcf215ed9966 (patch)
treef67e12d028c68c40d6ece445420cd5ab4046ff61 /archival/tar.c
parent9579d87be4ab9b02195749c15a2112e2a4466ab4 (diff)
downloadbusybox-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/tar.c')
-rw-r--r--archival/tar.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/archival/tar.c b/archival/tar.c
index 2a140184c..526edb69d 100644
--- a/archival/tar.c
+++ b/archival/tar.c
@@ -814,9 +814,9 @@ int tar_main(int argc ATTRIBUTE_UNUSED, char **argv)
814 814
815 /* Initialise default values */ 815 /* Initialise default values */
816 tar_handle = init_handle(); 816 tar_handle = init_handle();
817 tar_handle->flags = ARCHIVE_CREATE_LEADING_DIRS 817 tar_handle->ah_flags = ARCHIVE_CREATE_LEADING_DIRS
818 | ARCHIVE_PRESERVE_DATE 818 | ARCHIVE_PRESERVE_DATE
819 | ARCHIVE_EXTRACT_UNCONDITIONAL; 819 | ARCHIVE_EXTRACT_UNCONDITIONAL;
820 820
821 /* Prepend '-' to the first argument if required */ 821 /* Prepend '-' to the first argument if required */
822 opt_complementary = "--:" // first arg is options 822 opt_complementary = "--:" // first arg is options
@@ -862,13 +862,13 @@ int tar_main(int argc ATTRIBUTE_UNUSED, char **argv)
862 tar_handle->action_data = data_extract_to_stdout; 862 tar_handle->action_data = data_extract_to_stdout;
863 863
864 if (opt & OPT_KEEP_OLD) 864 if (opt & OPT_KEEP_OLD)
865 tar_handle->flags &= ~ARCHIVE_EXTRACT_UNCONDITIONAL; 865 tar_handle->ah_flags &= ~ARCHIVE_EXTRACT_UNCONDITIONAL;
866 866
867 if (opt & OPT_NOPRESERVE_OWN) 867 if (opt & OPT_NOPRESERVE_OWN)
868 tar_handle->flags |= ARCHIVE_NOPRESERVE_OWN; 868 tar_handle->ah_flags |= ARCHIVE_NOPRESERVE_OWN;
869 869
870 if (opt & OPT_NOPRESERVE_PERM) 870 if (opt & OPT_NOPRESERVE_PERM)
871 tar_handle->flags |= ARCHIVE_NOPRESERVE_PERM; 871 tar_handle->ah_flags |= ARCHIVE_NOPRESERVE_PERM;
872 872
873 if (opt & OPT_GZIP) 873 if (opt & OPT_GZIP)
874 get_header_ptr = get_header_tar_gz; 874 get_header_ptr = get_header_tar_gz;