mkntfs, ntfs-3g in imagex

[wimlib] / src / extract.c

diff --git a/src/extract.c b/src/extract.c
index 701d1294deb95db4d8d27e753f4b4f2078c2d45c..911d1d985bfa31040538cb206e6e2a64409ff857 100644 (file)
--- a/src/extract.c
+++ b/src/extract.c
@@ -24,23 +24,28 @@
  * along with wimlib; if not, see http://www.gnu.org/licenses/.
  */
 
-#include "wimlib_internal.h"
+
+#include <dirent.h>
+#include <errno.h>
+#include <fcntl.h>
+#include <string.h>
+#include <sys/stat.h>
+#include <sys/time.h>
+#include <unistd.h>
+
+#include "config.h"
 #include "dentry.h"
 #include "lookup_table.h"
 #include "timestamp.h"
+#include "wimlib_internal.h"
 #include "xml.h"
-#include <sys/stat.h>
-#include <fcntl.h>
-#include <unistd.h>
-#include <dirent.h>
-#include <string.h>
-#include <errno.h>
 
 #ifdef WITH_NTFS_3G
 #include <ntfs-3g/volume.h>
 #include <ntfs-3g/security.h>
 #endif
 
+
 /* Internal */
 #define WIMLIB_EXTRACT_FLAG_MULTI_IMAGE 0x80000000
 
@@ -256,20 +261,29 @@ static int extract_symlink(const struct dentry *dentry, const char *output_path,
  */
 static int extract_directory(const char *output_path)
 {
-       /* Compute the output path directory to the directory. */
-       if (mkdir(output_path, S_IRWXU | S_IRGRP | S_IXGRP | S_IROTH | S_IXOTH) != 0) 
-       {
-               switch (errno) {
-               case EEXIST: /* Already existing directory is OK */
-               case EACCES: /* We may have permissions to extract files inside
-                                the directory, but not for the directory
-                                itself. */
+       int ret;
+       struct stat stbuf;
+       ret = stat(output_path, &stbuf);
+       if (ret == 0) {
+               if (S_ISDIR(stbuf.st_mode)) {
+                       WARNING("`%s' already exists", output_path);
                        return 0;
-               default:
-                       ERROR_WITH_ERRNO("Cannot create directory `%s'",
-                                        output_path);
+               } else {
+                       ERROR("`%s' is not a directory", output_path);
                        return WIMLIB_ERR_MKDIR;
                }
+       } else {
+               if (errno != ENOENT) {
+                       ERROR_WITH_ERRNO("Failed to stat `%s'", output_path);
+                       return WIMLIB_ERR_STAT;
+               }
+       }
+       /* Compute the output path directory to the directory. */
+       if (mkdir(output_path, S_IRWXU | S_IRGRP | S_IXGRP |
+                              S_IROTH | S_IXOTH) != 0) {
+               ERROR_WITH_ERRNO("Cannot create directory `%s'",
+                                output_path);
+               return WIMLIB_ERR_MKDIR;
        }
        return 0;
 }
@@ -315,6 +329,19 @@ static int extract_dentry(struct dentry *dentry, void *arg)
        if (ret != 0)
                return ret;
 
+       return 0;
+}
+
+static int apply_dentry_timestamps(struct dentry *dentry, void *arg)
+{
+       struct extract_args *args = arg;
+       size_t len = strlen(args->output_dir);
+       char output_path[len + dentry->full_path_utf8_len + 1];
+
+       memcpy(output_path, args->output_dir, len);
+       memcpy(output_path + len, dentry->full_path_utf8, dentry->full_path_utf8_len);
+       output_path[len + dentry->full_path_utf8_len] = '\0';
+
        struct timeval tv[2];
        wim_timestamp_to_timeval(dentry->last_access_time, &tv[0]);
        wim_timestamp_to_timeval(dentry->last_write_time, &tv[1]);
@@ -345,7 +372,12 @@ static int extract_single_image(WIMStruct *w, int image,
        #endif
        };
 
-       return for_dentry_in_tree(wim_root_dentry(w), extract_dentry, &args);
+       ret = for_dentry_in_tree(wim_root_dentry(w), extract_dentry, &args);
+       if (ret != 0)
+               return ret;
+       return for_dentry_in_tree_depth(wim_root_dentry(w),
+                                       apply_dentry_timestamps, &args);
+
 }
 
 
@@ -401,21 +433,24 @@ WIMLIBAPI int wimlib_extract_image(WIMStruct *w, int image,
                return WIMLIB_ERR_INVALID_PARAM;
 
        if ((flags & WIMLIB_EXTRACT_FLAG_NTFS)) {
+               if (flags & (WIMLIB_EXTRACT_FLAG_SYMLINK | WIMLIB_EXTRACT_FLAG_HARDLINK))
+                       return WIMLIB_ERR_INVALID_PARAM;
        #ifdef WITH_NTFS_3G
                unsigned long mnt_flags;
                int ret = ntfs_check_if_mounted(output_dir, &mnt_flags);
                if (ret != 0) {
-                       ERROR_WITH_ERRNO("NTFS-3g: Cannot determine if `%s' "
-                                        "is mounted", output_dir);
+                       ERROR_WITH_ERRNO("NTFS-3g: Cannot determine if a NTFS "
+                                        "filesystem is mounted on `%s'",
+                                        output_dir);
                        return WIMLIB_ERR_NTFS_3G;
                }
                if (!(mnt_flags & NTFS_MF_MOUNTED)) {
-                       ERROR("NTFS-3g: Filesystem on `%s' is not mounted ",
+                       ERROR("NTFS-3g: No NTFS filesystem is mounted on `%s'",
                              output_dir);
                        return WIMLIB_ERR_NTFS_3G;
                }
                if (mnt_flags & NTFS_MF_READONLY) {
-                       ERROR("NTFS-3g: Filesystem on `%s' is mounted "
+                       ERROR("NTFS-3g: NTFS filesystem on `%s' is mounted "
                              "read-only", output_dir);
                        return WIMLIB_ERR_NTFS_3G;
                }