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

1 files changed, 5 insertions, 5 deletions

diff --git a/archival/cpio.c b/archival/cpio.c
index 0147d0e96..a10bfa85f 100644
--- a/archival/cpio.c
+++ b/archival/cpio.c
@@ -204,7 +204,7 @@ int cpio_main(int argc ATTRIBUTE_UNUSED, char **argv)
         archive_handle = init_handle();
         archive_handle->src_fd = STDIN_FILENO;
         archive_handle->seek = seek_by_read;
-        archive_handle->flags = ARCHIVE_EXTRACT_NEWER;
+        archive_handle->ah_flags = ARCHIVE_EXTRACT_NEWER;
 
 #if ENABLE_FEATURE_CPIO_O
         opt = getopt32(argv, "ituvF:dmoH:", &cpio_filename, &cpio_fmt);
@@ -241,8 +241,8 @@ int cpio_main(int argc ATTRIBUTE_UNUSED, char **argv)
                 archive_handle->action_data = data_extract_all;
         }
         if (opt & CPIO_OPT_UNCONDITIONAL) {
-                archive_handle->flags |= ARCHIVE_EXTRACT_UNCONDITIONAL;
-                archive_handle->flags &= ~ARCHIVE_EXTRACT_NEWER;
+                archive_handle->ah_flags |= ARCHIVE_EXTRACT_UNCONDITIONAL;
+                archive_handle->ah_flags &= ~ARCHIVE_EXTRACT_NEWER;
         }
         if (opt & CPIO_OPT_VERBOSE) {
                 if (archive_handle->action_header == header_list) {
@@ -256,10 +256,10 @@ int cpio_main(int argc ATTRIBUTE_UNUSED, char **argv)
                 archive_handle->seek = seek_by_jump;
         }
         if (opt & CPIO_OPT_CREATE_LEADING_DIR) {
-                archive_handle->flags |= ARCHIVE_CREATE_LEADING_DIRS;
+                archive_handle->ah_flags |= ARCHIVE_CREATE_LEADING_DIRS;
         }
         if (opt & CPIO_OPT_PRESERVE_MTIME) {
-                archive_handle->flags |= ARCHIVE_PRESERVE_DATE;
+                archive_handle->ah_flags |= ARCHIVE_PRESERVE_DATE;
         }
 
         while (*argv) {