#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); \
#define for_opt(c, opts) while ((c = getopt_long_only(argc, (char**)argv, "", \
opts, NULL)) != -1)
+
enum imagex_op_type {
APPEND,
APPLY,
static const char *usage_strings[] = {
[APPEND] =
" imagex append DIRECTORY WIMFILE [\"IMAGE_NAME\"] [\"DESCRIPTION\"] [--boot]\n"
-" [--check] [--flags EDITIONID]\n",
+" [--check] [--flags EDITIONID] [--dereference]\n",
[APPLY] =
" imagex apply WIMFILE [IMAGE_NUM | IMAGE_NAME | all] DIRECTORY [--check]\n"
" [--hardlink] [--symlink] [--verbose]\n",
[CAPTURE] =
" imagex capture DIRECTORY WIMFILE [\"IMAGE_NAME\"] [\"DESCRIPTION\"]\n"
" l [--boot] [--check] [--compress[=TYPE]]\n"
-" [--flags \"EditionID\"] [--verbose]\n",
+" [--flags \"EditionID\"] [--verbose] [--dereference]\n",
[DELETE] =
" imagex delete WIMFILE (IMAGE_NUM | IMAGE_NAME | all) [--check]\n",
[DIR] =
{"boot", no_argument, NULL, 'b'},
{"check", no_argument, NULL, 'c'},
{"flags", required_argument, NULL, 'f'},
+ {"dereference", no_argument, NULL, 'L'},
{NULL, 0, NULL, 0},
};
static const struct option apply_options[] = {
{"hardlink", no_argument, NULL, 'h'},
{"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[] = {
{"compress", optional_argument, NULL, 'x'},
{"flags", required_argument, NULL, 'f'},
{"verbose", no_argument, NULL,'v'},
- {"ntfs", no_argument, NULL, 'N'},
+ {"dereference", no_argument, NULL, 'L'},
{NULL, 0, NULL, 0},
};
static const struct option delete_options[] = {
case 'f':
flags_element = optarg;
break;
+ case 'L':
+ add_image_flags |= WIMLIB_ADD_IMAGE_FLAG_DEREFERENCE;
+ break;
default:
usage(APPEND);
return -1;
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) {
switch (c) {
case 'c':
case 'v':
extract_flags |= WIMLIB_EXTRACT_FLAG_VERBOSE;
break;
- case 'N':
- extract_flags |= WIMLIB_EXTRACT_FLAG_NTFS;
+ case 'm':
+ mkntfs_args = optarg;
break;
default:
usage(APPLY);
dir = argv[2];
}
+#ifdef WITH_NTFS_3G
+ char tmpdir[strlen(dir) + 50];
+ tmpdir[0] = '\0';
+#endif
+
ret = wimlib_open_wim(wimfile, open_flags, &w);
if (ret != 0)
- return ret;
+ goto out;
image = wimlib_resolve_image(w, image_num_or_name);
ret = verify_image_exists(image);
if (ret != 0)
- goto done;
+ goto out;
num_images = wimlib_get_num_images(w);
if (argc == 2 && num_images != 1) {
"(or all)", wimfile, num_images);
usage(APPLY);
ret = -1;
- goto done;
+ goto out;
+ }
+
+#ifdef WITH_NTFS_3G
+ /* Check to see if a block device file or regular file was specified.
+ * If so, try to create a NTFS filesystem on it, mount it on a temporary
+ * directory, and replace @dir with the name of the temporary directory
+ * so that we extract the files to the NTFS filesystem. */
+ 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;
+ } else if (ret > 0) {
+ imagex_error("`ntfs-3g' exited with failure status");
+ ret = -1;
+ goto out;
+ }
+ printf("Applying image %d of `%s' to NTFS filesystem on `%s'\n",
+ image, wimfile, dev);
}
+#endif
+
ret = wimlib_extract_image(w, image, dir, extract_flags);
-done:
+out:
wimlib_free(w);
+#ifdef WITH_NTFS_3G
+ 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;
}
case 'N':
add_image_flags |= WIMLIB_ADD_IMAGE_FLAG_NTFS;
break;
+ case 'L':
+ add_image_flags |= WIMLIB_ADD_IMAGE_FLAG_DEREFERENCE;
+ break;
default:
usage(CAPTURE);
return -1;
imagex_error("Cannot specify a compression type that is "
"not the same as that used in the "
"destination WIM");
+ ret = -1;
goto done;
}
compression_type = wimlib_get_compression_type(dest_w);
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;
}
git://wimlib.net / wimlib / blobdiff