#include <getopt.h>
#include <stdlib.h>
#include <stdarg.h>
+#include <glob.h>
#include <string.h>
#include <errno.h>
#include <sys/stat.h>
UNMOUNT,
};
-static const char *path_basename(const char *path)
-{
- const char *p = path;
- while (*p)
- p++;
- p--;
-
- /* Trailing slashes. */
- while ((p != path - 1) && *p == '/')
- p--;
-
- while ((p != path - 1) && *p != '/')
- p--;
-
- return p + 1;
-}
-
+static void usage(int cmd_type);
+static void usage_all();
static const char *usage_strings[] = {
[APPEND] =
[APPLY] =
" imagex apply WIMFILE [IMAGE_NUM | IMAGE_NAME | all]\n"
" (DIRECTORY | NTFS_VOLUME) [--check] [--hardlink]\n"
-" [--symlink] [--verbose]\n",
+" [--symlink] [--verbose] [--ref=\"GLOB\"]\n",
[CAPTURE] =
" imagex capture (DIRECTORY | NTFS_VOLUME) WIMFILE [IMAGE_NAME]\n"
" [DESCRIPTION] [--boot] [--check] [--compress=TYPE]\n"
" imagex export SRC_WIMFILE (SRC_IMAGE_NUM | SRC_IMAGE_NAME | all ) \n"
" DEST_WIMFILE [DEST_IMAGE_NAME]\n"
" [DEST_IMAGE_DESCRIPTION] [--boot] [--check]\n"
-" [--compress=TYPE]\n",
+" [--compress=TYPE] [--ref=\"GLOB\"]\n",
[INFO] =
" imagex info WIMFILE [IMAGE_NUM | IMAGE_NAME] [NEW_NAME]\n"
" [NEW_DESC] [--boot] [--check] [--header] [--lookup-table]\n"
" imagex join [--check] WIMFILE SPLIT_WIM...\n",
[MOUNT] =
" imagex mount WIMFILE (IMAGE_NUM | IMAGE_NAME) DIRECTORY\n"
-" [--check] [--debug] [--streams-interface=INTERFACE]\n",
+" [--check] [--debug] [--streams-interface=INTERFACE]\n"
+" [--ref=\"GLOB\"]\n",
[MOUNTRW] =
" imagex mountrw WIMFILE [IMAGE_NUM | IMAGE_NAME] DIRECTORY\n"
" [--check] [--debug] [--streams-interface=INTERFACE]\n",
{"hardlink", no_argument, NULL, 'h'},
{"symlink", no_argument, NULL, 's'},
{"verbose", no_argument, NULL, 'v'},
+ {"ref", required_argument, NULL, 'r'},
{NULL, 0, NULL, 0},
};
static const struct option capture_options[] = {
{"boot", no_argument, NULL, 'b'},
{"check", no_argument, NULL, 'c'},
{"compress", required_argument, NULL, 'x'},
+ {"ref", required_argument, NULL, 'r'},
{NULL, 0, NULL, 0},
};
{"check", no_argument, NULL, 'c'},
{"debug", no_argument, NULL, 'd'},
{"streams-interface", required_argument, NULL, 's'},
+ {"ref", required_argument, NULL, 'r'},
{NULL, 0, NULL, 0},
};
};
+
/* Print formatted error message to stderr. */
static void imagex_error(const char *format, ...)
{
va_end(va);
}
-
-static inline void version()
+static const char *path_basename(const char *path)
{
- static const char *s =
- "imagex (" PACKAGE ") " PACKAGE_VERSION "\n"
- "Copyright (C) 2012 Eric Biggers\n"
- "License GPLv3+; GNU GPL version 3 or later <http://gnu.org/licenses/gpl.html>.\n"
- "This is free software: you are free to change and redistribute it.\n"
- "There is NO WARRANTY, to the extent permitted by law.\n"
- "\n"
- "Report bugs to "PACKAGE_BUGREPORT".\n";
- fputs(s, stdout);
-}
+ const char *p = path;
+ while (*p)
+ p++;
+ p--;
-static inline void usage(int cmd)
-{
- puts("IMAGEX: Usage:");
- fputs(usage_strings[cmd], stdout);
-}
+ /* Trailing slashes. */
+ while ((p != path - 1) && *p == '/')
+ p--;
-static void usage_all()
-{
- puts("IMAGEX: Usage:");
- for (int i = 0; i < ARRAY_LEN(usage_strings); i++)
- fputs(usage_strings[i], stdout);
- static const char *extra =
-" imagex --help\n"
-" imagex --version\n"
-"\n"
-" The compression TYPE may be \"maximum\", \"fast\", or \"none\".\n"
- ;
- fputs(extra, stdout);
+ while ((p != path - 1) && *p != '/')
+ p--;
+
+ return p + 1;
}
+
static int verify_image_exists(int image)
{
if (image == WIM_NO_IMAGE) {
return NULL;
}
+static int open_swms_from_glob(const char *swm_glob,
+ const char *first_part,
+ int open_flags,
+ WIMStruct ***additional_swms_ret,
+ unsigned *num_additional_swms_ret)
+{
+ unsigned num_additional_swms = 0;
+ WIMStruct **additional_swms = NULL;
+ glob_t globbuf;
+ int ret;
+
+ ret = glob(swm_glob, GLOB_ERR | GLOB_NOSORT, NULL, &globbuf);
+ if (ret != 0) {
+ if (ret == GLOB_NOMATCH) {
+ imagex_error("Found no files for glob \"%s\"",
+ swm_glob);
+ } else {
+ imagex_error_with_errno("Failed to process glob "
+ "\"%s\"", swm_glob);
+ }
+ ret = -1;
+ goto out;
+ }
+ num_additional_swms = globbuf.gl_pathc;
+ additional_swms = calloc(num_additional_swms, sizeof(additional_swms[0]));
+ if (!additional_swms) {
+ imagex_error("Out of memory");
+ ret = -1;
+ goto out_globfree;
+ }
+ size_t offset = 0;
+ for (size_t i = 0; i < num_additional_swms; i++) {
+ if (strcmp(globbuf.gl_pathv[i], first_part) == 0) {
+ offset++;
+ continue;
+ }
+ ret = wimlib_open_wim(globbuf.gl_pathv[i],
+ open_flags | WIMLIB_OPEN_FLAG_SPLIT_OK,
+ &additional_swms[i - offset]);
+ if (ret != 0)
+ goto out_close_swms;
+ }
+ *additional_swms_ret = additional_swms;
+ *num_additional_swms_ret = num_additional_swms - offset;
+ ret = 0;
+ goto out_globfree;
+out_close_swms:
+ for (unsigned i = 0; i < num_additional_swms; i++)
+ wimlib_free(additional_swms[i]);
+ free(additional_swms);
+out_globfree:
+ globfree(&globbuf);
+out:
+ return ret;
+}
+
static int imagex_append(int argc, const char **argv)
{
int c;
goto out_write;
}
} else {
- if (errno != -ENOENT)
+ if (errno != ENOENT)
imagex_error_with_errno("Failed to stat `%s'", dir);
}
#endif
static int imagex_apply(int argc, const char **argv)
{
int c;
- int open_flags = WIMLIB_OPEN_FLAG_SHOW_PROGRESS;
+ int open_flags = WIMLIB_OPEN_FLAG_SHOW_PROGRESS |
+ WIMLIB_OPEN_FLAG_SPLIT_OK;
int image;
int num_images;
WIMStruct *w;
const char *image_num_or_name;
int extract_flags = 0;
+ const char *swm_glob = NULL;
+ WIMStruct **additional_swms = NULL;
+ unsigned num_additional_swms = 0;
+
for_opt(c, apply_options) {
switch (c) {
case 'c':
case 'v':
extract_flags |= WIMLIB_EXTRACT_FLAG_VERBOSE;
break;
+ case 'r':
+ swm_glob = optarg;
+ break;
default:
usage(APPLY);
return -1;
ret = wimlib_open_wim(wimfile, open_flags, &w);
if (ret != 0)
- goto out;
+ return ret;
image = wimlib_resolve_image(w, image_num_or_name);
ret = verify_image_exists(image);
goto out;
}
+ if (swm_glob) {
+ ret = open_swms_from_glob(swm_glob, wimfile, open_flags,
+ &additional_swms,
+ &num_additional_swms);
+ if (ret != 0)
+ goto out;
+ }
+
#ifdef WITH_NTFS_3G
struct stat stbuf;
image, wimfile, ntfs_device);
ret = wimlib_apply_image_to_ntfs_volume(w, image,
ntfs_device,
- extract_flags);
+ extract_flags,
+ additional_swms,
+ num_additional_swms);
goto out;
}
} else {
- if (errno != -ENOENT)
+ if (errno != ENOENT)
imagex_error_with_errno("Failed to stat `%s'", dir);
}
#endif
- ret = wimlib_extract_image(w, image, dir, extract_flags);
+ ret = wimlib_extract_image(w, image, dir, extract_flags,
+ additional_swms, num_additional_swms);
out:
wimlib_free(w);
+ if (additional_swms)
+ for (size_t i = 0; i < num_additional_swms; i++)
+ wimlib_free(additional_swms[i]);
return ret;
}
goto out_write;
}
} else {
- if (errno != -ENOENT)
+ if (errno != ENOENT)
imagex_error_with_errno("Failed to stat `%s'", dir);
}
#endif
int image;
struct stat stbuf;
bool wim_is_new;
+ const char *swm_glob = NULL;
+ WIMStruct **additional_swms = NULL;
+ unsigned num_additional_swms = 0;
for_opt(c, export_options) {
switch (c) {
return -1;
compression_type_specified = true;
break;
+ case 'r':
+ swm_glob = optarg;
+ break;
default:
usage(EXPORT);
return -1;
dest_wimfile = argv[2];
dest_name = (argc >= 4) ? argv[3] : NULL;
dest_desc = (argc >= 5) ? argv[4] : NULL;
- ret = wimlib_open_wim(src_wimfile, open_flags, &src_w);
+ ret = wimlib_open_wim(src_wimfile,
+ open_flags | WIMLIB_OPEN_FLAG_SPLIT_OK, &src_w);
if (ret != 0)
return ret;
if (!S_ISREG(stbuf.st_mode) && !S_ISLNK(stbuf.st_mode)) {
imagex_error("`%s' is not a regular file",
dest_wimfile);
- goto done;
+ goto out;
}
ret = wimlib_open_wim(dest_wimfile, open_flags, &dest_w);
if (ret != 0)
- goto done;
+ goto out;
if (compression_type_specified && compression_type !=
wimlib_get_compression_type(dest_w)) {
"not the same as that used in the "
"destination WIM");
ret = -1;
- goto done;
+ goto out;
}
compression_type = wimlib_get_compression_type(dest_w);
} else {
if (errno == ENOENT) {
ret = wimlib_create_new_wim(compression_type, &dest_w);
if (ret != 0)
- goto done;
+ goto out;
} else {
imagex_error_with_errno("Cannot stat file `%s'",
dest_wimfile);
- goto done;
+ goto out;
}
}
image = wimlib_resolve_image(src_w, src_image_num_or_name);
ret = verify_image_exists(image);
if (ret != 0)
- goto done;
+ goto out;
+
+ if (swm_glob) {
+ ret = open_swms_from_glob(swm_glob, src_wimfile, open_flags,
+ &additional_swms,
+ &num_additional_swms);
+ if (ret != 0)
+ goto out;
+ }
ret = wimlib_export_image(src_w, image, dest_w, dest_name, dest_desc,
- export_flags);
+ export_flags, additional_swms,
+ num_additional_swms);
if (ret != 0)
- goto done;
+ goto out;
if (wim_is_new)
write_flags);
else
ret = wimlib_overwrite(dest_w, write_flags);
-done:
+out:
wimlib_free(src_w);
wimlib_free(dest_w);
+ if (additional_swms)
+ for (unsigned i = 0; i < num_additional_swms; i++)
+ wimlib_free(additional_swms[i]);
return ret;
}
{
int c;
int mount_flags = 0;
- int open_flags = WIMLIB_OPEN_FLAG_SHOW_PROGRESS;
+ int open_flags = WIMLIB_OPEN_FLAG_SHOW_PROGRESS |
+ WIMLIB_OPEN_FLAG_SPLIT_OK;
const char *wimfile;
const char *dir;
WIMStruct *w;
int image;
int num_images;
int ret;
+ const char *swm_glob = NULL;
+ WIMStruct **additional_swms = NULL;
+ unsigned num_additional_swms = 0;
if (strcmp(argv[0], "mountrw") == 0)
mount_flags |= WIMLIB_MOUNT_FLAG_READWRITE;
goto mount_usage;
}
break;
+ case 'r':
+ swm_glob = optarg;
+ break;
default:
goto mount_usage;
}
if (ret != 0)
return ret;
+ if (swm_glob) {
+ ret = open_swms_from_glob(swm_glob, wimfile, open_flags,
+ &additional_swms,
+ &num_additional_swms);
+ if (ret != 0)
+ goto out;
+ }
+
if (argc == 2) {
image = 1;
num_images = wimlib_get_num_images(w);
usage((mount_flags & WIMLIB_MOUNT_FLAG_READWRITE)
? MOUNTRW : MOUNT);
ret = WIMLIB_ERR_INVALID_IMAGE;
- goto done;
+ goto out;
}
dir = argv[1];
} else {
ret = verify_image_exists_and_is_single(image);
if (ret != 0)
- goto done;
+ goto out;
- ret = wimlib_mount(w, image, dir, mount_flags);
+ ret = wimlib_mount(w, image, dir, mount_flags, additional_swms,
+ num_additional_swms);
if (ret != 0) {
imagex_error("Failed to mount image %d from `%s' on `%s'",
image, wimfile, dir);
}
-done:
+out:
wimlib_free(w);
+ if (additional_swms)
+ for (unsigned i = 0; i < num_additional_swms; i++)
+ wimlib_free(additional_swms[i]);
return ret;
mount_usage:
usage((mount_flags & WIMLIB_MOUNT_FLAG_READWRITE)
int cmd;
};
+
+#define for_imagex_command(p) for (p = &imagex_commands[0]; \
+ p != &imagex_commands[ARRAY_LEN(imagex_commands)]; p++)
+
static struct imagex_command imagex_commands[] = {
{"append", imagex_append, APPEND},
{"apply", imagex_apply, APPLY},
{"unmount", imagex_unmount, UNMOUNT},
};
-#define for_imagex_command(p) for (p = &imagex_commands[0]; \
- p != &imagex_commands[ARRAY_LEN(imagex_commands)]; p++)
+static void version()
+{
+ static const char *s =
+ "imagex (" PACKAGE ") " PACKAGE_VERSION "\n"
+ "Copyright (C) 2012 Eric Biggers\n"
+ "License GPLv3+; GNU GPL version 3 or later <http://gnu.org/licenses/gpl.html>.\n"
+ "This is free software: you are free to change and redistribute it.\n"
+ "There is NO WARRANTY, to the extent permitted by law.\n"
+ "\n"
+ "Report bugs to "PACKAGE_BUGREPORT".\n";
+ fputs(s, stdout);
+}
+
static void help_or_version(int argc, const char **argv)
{
}
+static void usage(int cmd_type)
+{
+ struct imagex_command *cmd;
+ puts("IMAGEX: Usage:");
+ fputs(usage_strings[cmd_type], stdout);
+ for_imagex_command(cmd)
+ if (cmd->cmd == cmd_type)
+ printf("\nTry `man imagex-%s' for more details.\n",
+ cmd->name);
+}
+
+static void usage_all()
+{
+ puts("IMAGEX: Usage:");
+ for (int i = 0; i < ARRAY_LEN(usage_strings); i++)
+ fputs(usage_strings[i], stdout);
+ static const char *extra =
+" imagex --help\n"
+" imagex --version\n"
+"\n"
+" The compression TYPE may be \"maximum\", \"fast\", or \"none\".\n"
+"\n"
+" Try `man imagex' for more information.\n"
+ ;
+ fputs(extra, stdout);
+}
+
+
int main(int argc, const char **argv)
{
struct imagex_command *cmd;
git://wimlib.net / wimlib / blobdiff