Changeset 3621 in MondoRescue for branches/3.3/mindi-busybox/archival/libarchive/data_extract_all.c

Timestamp:

Dec 20, 2016, 4:07:32 PM (7 years ago)

Author:

Bruno Cornec

Message:

New 3?3 banch for incorporation of latest busybox 1.25. Changing minor version to handle potential incompatibilities.

Location:

branches/3.3

Files:

• . (copied) (copied from branches/3.2 )
• mindi-busybox/archival/libarchive/data_extract_all.c (modified) (14 diffs)

branches/3.3/mindi-busybox/archival/libarchive/data_extract_all.c

@@ -12 +12 @@
     int dst_fd;
     int res;
+    char *hard_link;
+#if ENABLE_FEATURE_TAR_LONG_OPTIONS
+    char *dst_name;
+#else
+# define dst_name (file_header->name)
+#endif
 
 #if ENABLE_FEATURE_TAR_SELINUX
@@ -24 +30 @@
 #endif
 
+    /* Hard links are encoded as regular files of size 0
+     * with a nonempty link field */
+    hard_link = NULL;
+    if (S_ISREG(file_header->mode) && file_header->size == 0)
+        hard_link = file_header->link_target;
+
+#if ENABLE_FEATURE_TAR_LONG_OPTIONS
+    dst_name = file_header->name;
+    if (archive_handle->tar__strip_components) {
+        unsigned n = archive_handle->tar__strip_components;
+        do {
+            dst_name = strchr(dst_name, '/');
+            if (!dst_name || dst_name[1] == '\0') {
+                data_skip(archive_handle);
+                goto ret;
+            }
+            dst_name++;
+            /*
+             * Link target is shortened only for hardlinks:
+             * softlinks restored unchanged.
+             */
+            if (hard_link) {
+// GNU tar 1.26 does not check that we reached end of link name:
+// if "dir/hardlink" is hardlinked to "file",
+// tar xvf a.tar --strip-components=1 says:
+//  tar: hardlink: Cannot hard link to '': No such file or directory
+// and continues processing. We silently skip such entries.
+                hard_link = strchr(hard_link, '/');
+                if (!hard_link || hard_link[1] == '\0') {
+                    data_skip(archive_handle);
+                    goto ret;
+                }
+                hard_link++;
+            }
+        } while (--n != 0);
+    }
+#endif
+
     if (archive_handle->ah_flags & ARCHIVE_CREATE_LEADING_DIRS) {
-        char *slash = strrchr(file_header->name, '/');
+        char *slash = strrchr(dst_name, '/');
         if (slash) {
             *slash = '\0';
-            bb_make_directory(file_header->name, -1, FILEUTILS_RECUR);
+            bb_make_directory(dst_name, -1, FILEUTILS_RECUR);
             *slash = '/';
         }
@@ -36 +80 @@
         /* Remove the entry if it exists */
         if (!S_ISDIR(file_header->mode)) {
-            /* Is it hardlink?
-             * We encode hard links as regular files of size 0 with a symlink */
-            if (S_ISREG(file_header->mode)
-             && file_header->link_target
-             && file_header->size == 0
-            ) {
+            if (hard_link) {
                 /* Ugly special case:
                  * tar cf t.tar hardlink1 hardlink2 hardlink1
@@ -49 +88 @@
                  * hardlink1 -> hardlink1 <== !!!
                  */
-                if (strcmp(file_header->link_target, file_header->name) == 0)
+                if (strcmp(hard_link, dst_name) == 0)
                     goto ret;
             }
             /* Proceed with deleting */
-            if (unlink(file_header->name) == -1
+            if (unlink(dst_name) == -1
              && errno != ENOENT
             ) {
                 bb_perror_msg_and_die("can't remove old file %s",
-                        file_header->name);
+                        dst_name);
             }
         }
@@ -64 +103 @@
         /* Remove the existing entry if its older than the extracted entry */
         struct stat existing_sb;
-        if (lstat(file_header->name, &existing_sb) == -1) {
+        if (lstat(dst_name, &existing_sb) == -1) {
             if (errno != ENOENT) {
                 bb_perror_msg_and_die("can't stat old file");
@@ -74 +113 @@
             ) {
                 bb_error_msg("%s not created: newer or "
-                    "same age file exists", file_header->name);
+                    "same age file exists", dst_name);
             }
             data_skip(archive_handle);
             goto ret;
         }
-        else if ((unlink(file_header->name) == -1) && (errno != EISDIR)) {
+        else if ((unlink(dst_name) == -1) && (errno != EISDIR)) {
             bb_perror_msg_and_die("can't remove old file %s",
-                    file_header->name);
-        }
-    }
-
-    /* Handle hard links separately
-     * We encode hard links as regular files of size 0 with a symlink */
-    if (S_ISREG(file_header->mode)
-     && file_header->link_target
-     && file_header->size == 0
-    ) {
-        /* hard link */
-        res = link(file_header->link_target, file_header->name);
-        if ((res == -1) && !(archive_handle->ah_flags & ARCHIVE_EXTRACT_QUIET)) {
+                    dst_name);
+        }
+    }
+
+    /* Handle hard links separately */
+    if (hard_link) {
+        res = link(hard_link, dst_name);
+        if (res != 0 && !(archive_handle->ah_flags & ARCHIVE_EXTRACT_QUIET)) {
             bb_perror_msg("can't create %slink "
                     "from %s to %s", "hard",
-                    file_header->name,
-                    file_header->link_target);
+                    dst_name,
+                    hard_link);
         }
         /* Hardlinks have no separate mode/ownership, skip chown/chmod */
@@ -107 +141 @@
     case S_IFREG: {
         /* Regular file */
+        char *dst_nameN;
         int flags = O_WRONLY | O_CREAT | O_EXCL;
         if (archive_handle->ah_flags & ARCHIVE_O_TRUNC)
             flags = O_WRONLY | O_CREAT | O_TRUNC;
-        dst_fd = xopen3(file_header->name,
+        dst_nameN = dst_name;
+#ifdef ARCHIVE_REPLACE_VIA_RENAME
+        if (archive_handle->ah_flags & ARCHIVE_REPLACE_VIA_RENAME)
+            /* rpm-style temp file name */
+            dst_nameN = xasprintf("%s;%x", dst_name, (int)getpid());
+#endif
+        dst_fd = xopen3(dst_nameN,
             flags,
             file_header->mode
@@ -116 +157 @@
         bb_copyfd_exact_size(archive_handle->src_fd, dst_fd, file_header->size);
         close(dst_fd);
+#ifdef ARCHIVE_REPLACE_VIA_RENAME
+        if (archive_handle->ah_flags & ARCHIVE_REPLACE_VIA_RENAME) {
+            xrename(dst_nameN, dst_name);
+            free(dst_nameN);
+        }
+#endif
         break;
     }
     case S_IFDIR:
-        res = mkdir(file_header->name, file_header->mode);
+        res = mkdir(dst_name, file_header->mode);
         if ((res == -1)
          && (errno != EISDIR) /* btw, Linux doesn't return this */
@@ -125 +172 @@
          && !(archive_handle->ah_flags & ARCHIVE_EXTRACT_QUIET)
         ) {
-            bb_perror_msg("can't make dir %s", file_header->name);
+            bb_perror_msg("can't make dir %s", dst_name);
         }
         break;
@@ -131 +178 @@
         /* Symlink */
 //TODO: what if file_header->link_target == NULL (say, corrupted tarball?)
-        res = symlink(file_header->link_target, file_header->name);
-        if ((res == -1)
+        res = symlink(file_header->link_target, dst_name);
+        if (res != 0
          && !(archive_handle->ah_flags & ARCHIVE_EXTRACT_QUIET)
         ) {
             bb_perror_msg("can't create %slink "
                 "from %s to %s", "sym",
-                file_header->name,
+                dst_name,
                 file_header->link_target);
         }
@@ -145 +192 @@
     case S_IFCHR:
     case S_IFIFO:
-        res = mknod(file_header->name, file_header->mode, file_header->device);
+        res = mknod(dst_name, file_header->mode, file_header->device);
         if ((res == -1)
          && !(archive_handle->ah_flags & ARCHIVE_EXTRACT_QUIET)
         ) {
-            bb_perror_msg("can't create node %s", file_header->name);
+            bb_perror_msg("can't create node %s", dst_name);
         }
         break;
@@ -174 +221 @@
 #endif
             /* GNU tar 1.15.1 uses chown, not lchown */
-            chown(file_header->name, uid, gid);
+            chown(dst_name, uid, gid);
         }
         /* uclibc has no lchmod, glibc is even stranger -
@@ -180 +227 @@
          * so we use chmod... */
         if (!(archive_handle->ah_flags & ARCHIVE_DONT_RESTORE_PERM)) {
-            chmod(file_header->name, file_header->mode);
+            chmod(dst_name, file_header->mode);
         }
         if (archive_handle->ah_flags & ARCHIVE_RESTORE_DATE) {
@@ -187 +234 @@
             t[1].tv_sec = t[0].tv_sec = file_header->mtime;
             t[1].tv_usec = t[0].tv_usec = 0;
-            utimes(file_header->name, t);
+            utimes(dst_name, t);
         }
     }