mkntfs, ntfs-3g in imagex

diff --git a/programs/imagex.c b/programs/imagex.c
index f83bbb0b1ded60aad5ba178557a264868df66b8f..7bb553700541015cf42dca2efbc22385b085a889 100644 (file)
--- a/programs/imagex.c
+++ b/programs/imagex.c
@@ -31,6 +31,11 @@
 #include <errno.h>
 #include <sys/stat.h>
 
+#ifdef WITH_NTFS_3G
+#include <unistd.h>
+#include <sys/wait.h>
+#endif
+
 #define ARRAY_LEN(array) (sizeof(array) / sizeof(array[0]))
 
 #define swap(a, b) ({ typeof(a) __a = (a); typeof(b) __b = (b); \
@@ -39,6 +44,7 @@
 #define for_opt(c, opts) while ((c = getopt_long_only(argc, (char**)argv, "", \
                                opts, NULL)) != -1)
 
+
 enum imagex_op_type {
        APPEND,
        APPLY,
@@ -128,6 +134,7 @@ static const struct option apply_options[] = {
        {"symlink",  no_argument,       NULL, 's'},
        {"verbose",  no_argument,       NULL, 'v'},
        {"ntfs",     no_argument,       NULL, 'N'},
+       {"mkntfs-args", required_argument, NULL, 'm'},
        {NULL, 0, NULL, 0},
 };
 static const struct option capture_options[] = {
@@ -359,6 +366,7 @@ static int imagex_apply(int argc, const char **argv)
        const char *wimfile;
        const char *dir;
        const char *image_num_or_name;
+       const char *mkntfs_args = "";
        int extract_flags = 0;
 
        for_opt(c, apply_options) {
@@ -378,6 +386,9 @@ static int imagex_apply(int argc, const char **argv)
                case 'N':
                        extract_flags |= WIMLIB_EXTRACT_FLAG_NTFS;
                        break;
+               case 'm':
+                       mkntfs_args = optarg;
+                       break;
                default:
                        usage(APPLY);
                        return -1;
@@ -399,9 +410,68 @@ static int imagex_apply(int argc, const char **argv)
                dir = argv[2];
        }
 
+#ifdef WITH_NTFS_3G
+       char tmpdir[strlen(dir) + 50];
+       tmpdir[0] = '\0';
+
+       /* Check to see if a block device file was specified.  If so, 
+        * create a NTFS filesystem on it. */
+       struct stat stbuf;
+
+       ret = stat(dir, &stbuf);
+       if (ret != 0)
+               imagex_error_with_errno("Failed to stat `%s'", dir);
+       if (S_ISBLK(stbuf.st_mode) || S_ISREG(stbuf.st_mode)) {
+               extract_flags |= WIMLIB_EXTRACT_FLAG_NTFS;
+
+               const char *dev = dir;
+               printf("Making NTFS filesystem on `%s'\n", dev);
+
+               char mkntfs_cmdline[sizeof("mkntfs ") + strlen(mkntfs_args) +
+                                   sizeof(" ") + strlen(dev)];
+               sprintf(mkntfs_cmdline, "mkntfs %s %s", mkntfs_args, dev);
+               puts(mkntfs_cmdline);
+               ret = system(mkntfs_cmdline);
+               if (ret == -1) {
+                       imagex_error_with_errno("Failed to execute the "
+                                               "`mkntfs' program");
+                       return -1;
+               } else if (ret > 0) {
+                       imagex_error("`mkntfs' exited with failure status");
+                       imagex_error("Note: You can pass additional arguments "
+                                    "to `mkntfs' using the --mkntfs-args "
+                                    "argument");
+                       return -1;
+               }
+               sprintf(tmpdir, "/tmp/imagex-%d-ntfsmount-%s-XXXXXX",
+                               getpid(), dev);
+               dir = mkdtemp(tmpdir);
+               if (!dir) {
+                       imagex_error_with_errno("Failed to create "
+                                               "temporary directory "
+                                               "`%s'", tmpdir);
+               }
+               char ntfs_3g_cmdline[sizeof("ntfs-3g ") + strlen(dev) +
+                                    sizeof(" ") + strlen(dir)];
+               sprintf(ntfs_3g_cmdline, "ntfs-3g %s %s", dev, dir);
+               puts(ntfs_3g_cmdline);
+               ret = system(ntfs_3g_cmdline);
+               if (ret == -1) {
+                       imagex_error_with_errno("Failed to execute the "
+                                               "`ntfs-3g' program");
+                       ret = -1;
+                       goto out_rm_tmpdir;
+               } else if (ret > 0) {
+                       imagex_error("`ntfs-3g' exited with failure status");
+                       ret = -1;
+                       goto out_rm_tmpdir;
+               }
+       }
+#endif
+
        ret = wimlib_open_wim(wimfile, open_flags, &w);
        if (ret != 0)
-               return ret;
+               goto done;
 
        image = wimlib_resolve_image(w, image_num_or_name);
        ret = verify_image_exists(image);
@@ -419,6 +489,41 @@ static int imagex_apply(int argc, const char **argv)
        ret = wimlib_extract_image(w, image, dir, extract_flags);
 done:
        wimlib_free(w);
+#ifdef WITH_NTFS_3G
+out_rm_tmpdir:
+       if (tmpdir[0] != '\0') {
+               /* Unmount and remove the NTFS-3g mounted directory */
+
+               int pid = fork();
+               int status;
+               if (pid == -1) {
+                       imagex_error_with_errno("Failed to fork()");
+                       return -1;
+               }
+               if (pid == 0) {
+                       execlp("fusermount", "fusermount", "-u", dir, NULL);
+                       imagex_error_with_errno("Failed to execute `fusermount'");
+                       return -1;
+               }
+
+               if (waitpid(pid, &status, 0) == -1) {
+                       imagex_error_with_errno("Failed to wait for "
+                                               "fusermount process to "
+                                               "terminate");
+                       return -1;
+               }
+
+               if (status != 0) {
+                       imagex_error("fusermount exited with status %d",
+                                    status);
+                       return -1;
+               }
+               if (rmdir(tmpdir) != 0) {
+                       imagex_error_with_errno("Failed to remove temporary "
+                                               "directory `%s'", tmpdir);
+               }
+       }
+#endif
        return ret;
 }
 
@@ -1261,6 +1366,8 @@ int main(int argc, const char **argv)
                                imagex_error("Exiting with error code %d:\n"
                                             "       %s.", ret,
                                             wimlib_get_error_string(ret));
+                               if (ret == WIMLIB_ERR_NTFS_3G)
+                                       imagex_error_with_errno("errno");
                        }
                        return ret;
                }

diff --git a/src/extract.c b/src/extract.c
index 49e45da1423aa9c5d8679880137373a0101cd9be..911d1d985bfa31040538cb206e6e2a64409ff857 100644 (file)
--- a/src/extract.c
+++ b/src/extract.c
@@ -261,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;
 }
@@ -424,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;
                }