As we no longer use function pointers for read in common archiving code

[oweals/busybox.git] / archival / libunarchive / data_extract_all.c

diff --git a/archival/libunarchive/data_extract_all.c b/archival/libunarchive/data_extract_all.c
index 9c4510e6b1ebff4131bf652feecfed8ec4ebfab9..bf3be5b354799d1c83dad7af1ec26f6f98dad19a 100644 (file)
--- a/archival/libunarchive/data_extract_all.c
+++ b/archival/libunarchive/data_extract_all.c
@@ -34,60 +34,84 @@ extern void data_extract_all(archive_handle_t *archive_handle)
        int res;
 
        if (archive_handle->flags & ARCHIVE_CREATE_LEADING_DIRS) {
-               char *name = xstrdup(file_header->name);
-               make_directory (dirname(name), 0777, FILEUTILS_RECUR);
+               char *name = bb_xstrdup(file_header->name);
+               bb_make_directory (dirname(name), 0777, FILEUTILS_RECUR);
                free(name);
        }                  
 
-       /* Create the filesystem entry */
-       switch(file_header->mode & S_IFMT) {
-               case S_IFREG: {
-#ifdef CONFIG_CPIO
-                       if (file_header->link_name && file_header->size == 0) {
-                               /* hard link */
-                               res = link(file_header->link_name, file_header->name);
-                               if ((res == -1) && !(archive_handle->flags & ARCHIVE_EXTRACT_QUIET)) {
-                                       perror_msg("Couldnt create hard link");
-                               }
-                       } else
-#endif
-                       {
-                               /* Regular file */
-                               dst_fd = xopen(file_header->name, O_WRONLY | O_CREAT);
-                               archive_copy_file(archive_handle, dst_fd);
-                               close(dst_fd);
-                       }
-                       break;
+       /* Check if the file already exists */
+       if (archive_handle->flags & ARCHIVE_EXTRACT_UNCONDITIONAL) {
+               /* Remove the existing entry if it exists */
+               if (((file_header->mode & S_IFMT) != S_IFDIR) && (unlink(file_header->name) == -1) && (errno != ENOENT)) {
+                       bb_perror_msg_and_die("Couldnt remove old file");
                }
-               case S_IFDIR:
-                       unlink(file_header->name);
-                       res = mkdir(file_header->name, file_header->mode);
-                       if ((res == -1) && !(archive_handle->flags & ARCHIVE_EXTRACT_QUIET)) {
-                               perror_msg("extract_archive: %s", file_header->name);
-                       }
-                       break;
-               case S_IFLNK:
-                       /* Symlink */
-                       unlink(file_header->name);
-                       res = symlink(file_header->link_name, file_header->name);
-                       if ((res == -1) && !(archive_handle->flags & ARCHIVE_EXTRACT_QUIET)) {
-                               perror_msg("Cannot create symlink from %s to '%s'", file_header->name, file_header->link_name);
+       }
+       else if (archive_handle->flags & ARCHIVE_EXTRACT_NEWER) {
+               /* Remove the existing entry if its older than the extracted entry */
+               struct stat statbuf;
+               if (lstat(file_header->name, &statbuf) == -1) {
+                       if (errno != ENOENT) {
+                               bb_perror_msg_and_die("Couldnt stat old file");
                        }
-                       break;
-               case S_IFSOCK:
-               case S_IFBLK:
-               case S_IFCHR:
-               case S_IFIFO:
-                       unlink(file_header->name);
-                       res = mknod(file_header->name, file_header->mode, file_header->device);
-                       if ((res == -1) && !(archive_handle->flags & ARCHIVE_EXTRACT_QUIET)) {
-                               perror_msg("Cannot create node %s", file_header->name);
+               }
+               else if (statbuf.st_mtime <= file_header->mtime) {
+                       if (!(archive_handle->flags & ARCHIVE_EXTRACT_QUIET)) {
+                               bb_error_msg("%s not created: newer or same age file exists", file_header->name);
                        }
-                       break;
+                       data_skip(archive_handle);
+                       return;
+               }
+               else if ((unlink(file_header->name) == -1) && (errno != EISDIR)) {
+                       bb_perror_msg_and_die("Couldnt remove old file %s", file_header->name);
+               }
+       }
+
+       /* Handle hard links seperately */
+       if (!S_ISLNK(file_header->mode) && (file_header->link_name) && (file_header->size == 0)) {
+               /* hard link */
+               res = link(file_header->link_name, file_header->name);
+               if ((res == -1) && !(archive_handle->flags & ARCHIVE_EXTRACT_QUIET)) {
+                       bb_perror_msg("Couldnt create hard link");
+               }
+       } else {
+               /* Create the filesystem entry */
+               switch(file_header->mode & S_IFMT) {
+                       case S_IFREG: {
+                               /* Regular file */
+                               dst_fd = bb_xopen(file_header->name, O_WRONLY | O_CREAT | O_EXCL);
+                               bb_copyfd_size(archive_handle->src_fd, dst_fd, file_header->size);
+                               close(dst_fd);
+                               break;
+                               }
+                       case S_IFDIR:
+                               res = mkdir(file_header->name, file_header->mode);
+                               if ((errno != EISDIR) && (res == -1) && !(archive_handle->flags & ARCHIVE_EXTRACT_QUIET)) {
+                                       bb_perror_msg("extract_archive: %s", file_header->name);
+                               }
+                               break;
+                       case S_IFLNK:
+                               /* Symlink */
+                               res = symlink(file_header->link_name, file_header->name);
+                               if ((res == -1) && !(archive_handle->flags & ARCHIVE_EXTRACT_QUIET)) {
+                                       bb_perror_msg("Cannot create symlink from %s to '%s'", file_header->name, file_header->link_name);
+                               }
+                               break;
+                       case S_IFSOCK:
+                       case S_IFBLK:
+                       case S_IFCHR:
+                       case S_IFIFO:
+                               res = mknod(file_header->name, file_header->mode, file_header->device);
+                               if ((res == -1) && !(archive_handle->flags & ARCHIVE_EXTRACT_QUIET)) {
+                                       bb_perror_msg("Cannot create node %s", file_header->name);
+                               }
+                               break;
+                       default:
+                               bb_error_msg_and_die("Unrecognised file type");
+               }
        }
 
-       chmod(file_header->name, file_header->mode);
        chown(file_header->name, file_header->uid, file_header->gid);
+       chmod(file_header->name, file_header->mode);
 
        if (archive_handle->flags & ARCHIVE_PRESERVE_DATE) {
                struct utimbuf t;