Merge pull request #3107 from stoeckmann/dynamic

Turn static state variables dynamic

(cherry picked from commit e48b9c4cf45c7dc053d781b6260b42437c42c5c8)

diff --git a/libarchive/archive_read_support_format_tar.c b/libarchive/archive_read_support_format_tar.c
index dadc8370842d99971d9755c805dd3490ac799057..c3035585ca64d331d4d0e797214ce28c3a9f98f6 100644 (file)
--- a/libarchive/archive_read_support_format_tar.c
+++ b/libarchive/archive_read_support_format_tar.c
@@ -153,6 +153,8 @@ struct tar {
        int                      compat_2x;
        int                      process_mac_extensions;
        int                      read_concatenated_archives;
+       int                      default_inode;
+       int                      default_dev;
 };
 
 /* Track which size fields were present in the headers */
@@ -552,10 +554,6 @@ archive_read_format_tar_read_header(struct archive_read *a,
         * probably not worthwhile just to support the relatively
         * obscure tar->cpio conversion case.
         */
-       /* TODO: Move this into `struct tar` to avoid conflicts
-        * when reading multiple archives */
-       static int default_inode;
-       static int default_dev;
        struct tar *tar;
        const char *p;
        const wchar_t *wp;
@@ -563,16 +561,17 @@ archive_read_format_tar_read_header(struct archive_read *a,
        size_t l;
        int64_t unconsumed = 0;
 
+       tar = (struct tar *)(a->format->data);
+
        /* Assign default device/inode values. */
-       archive_entry_set_dev(entry, 1 + default_dev); /* Don't use zero. */
-       archive_entry_set_ino(entry, ++default_inode); /* Don't use zero. */
+       archive_entry_set_dev(entry, 1 + tar->default_dev); /* Don't use zero. */
+       archive_entry_set_ino(entry, ++tar->default_inode); /* Don't use zero. */
        /* Limit generated st_ino number to 16 bits. */
-       if (default_inode >= 0xffff) {
-               ++default_dev;
-               default_inode = 0;
+       if (tar->default_inode >= 0xffff) {
+               ++tar->default_dev;
+               tar->default_inode = 0;
        }
 
-       tar = (struct tar *)(a->format->data);
        tar->entry_offset = 0;
        gnu_clear_sparse_list(tar);
        tar->size_fields = 0; /* We don't have any size info yet */

diff --git a/libarchive/archive_write_disk_posix.c b/libarchive/archive_write_disk_posix.c
index 7b90fc25fa54691966d6121b2a9e4c581aba49d8..4e4e7d935024f3db046d4d5b0d13b06872c7c45d 100644 (file)
--- a/libarchive/archive_write_disk_posix.c
+++ b/libarchive/archive_write_disk_posix.c
@@ -308,6 +308,10 @@ struct archive_write_disk {
        int                      stream_valid;
        int                      decmpfs_compression_level;
 #endif
+#if !(ARCHIVE_XATTR_LINUX || ARCHIVE_XATTR_DARWIN || ARCHIVE_XATTR_AIX ||\
+    ARCHIVE_XATTR_FREEBSD)
+       int                      warning_done;
+#endif
 };
 
 /*
@@ -4693,12 +4697,10 @@ set_xattrs(struct archive_write_disk *a)
 static int
 set_xattrs(struct archive_write_disk *a)
 {
-       static int warning_done = 0;
-
        /* If there aren't any extended attributes, then it's okay not
         * to extract them, otherwise, issue a single warning. */
-       if (archive_entry_xattr_count(a->entry) != 0 && !warning_done) {
-               warning_done = 1;
+       if (archive_entry_xattr_count(a->entry) != 0 && !a->warning_done) {
+               a->warning_done = 1;
                archive_set_error(&a->archive, ARCHIVE_ERRNO_FILE_FORMAT,
                    "Cannot restore extended attributes on this system");
                return (ARCHIVE_WARN);