X-Git-Url: https://wimlib.net/git/?p=wimlib;a=blobdiff_plain;f=programs%2Fimagex.c;h=0b9af0053ec0bb8d67c407fa109d95b40eeaf570;hp=f83bbb0b1ded60aad5ba178557a264868df66b8f;hb=86e0ea554928890970618ff353bec09bf33708a8;hpb=200bd141bea66770dd9845a95f2403d59956b931
diff --git a/programs/imagex.c b/programs/imagex.c
index f83bbb0b..0b9af005 100644
--- a/programs/imagex.c
+++ b/programs/imagex.c
@@ -6,7 +6,7 @@
*/
/*
- * Copyright (C) 2012 Eric Biggers
+ * Copyright (C) 2012, 2013 Eric Biggers
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@ -22,19 +22,28 @@
* along with this program. If not, see .
*/
-#include "wimlib.h"
#include "config.h"
+
+#include "wimlib.h"
+
+#include
+#include
#include
-#include
+#include
+#include
+#include
+#include
#include
+#include
#include
-#include
#include
+#include
-#define ARRAY_LEN(array) (sizeof(array) / sizeof(array[0]))
+#ifdef HAVE_ALLOCA_H
+#include
+#endif
-#define swap(a, b) ({ typeof(a) __a = (a); typeof(b) __b = (b); \
- a = __b; b = __a; })
+#define ARRAY_LEN(array) (sizeof(array) / sizeof(array[0]))
#define for_opt(c, opts) while ((c = getopt_long_only(argc, (char**)argv, "", \
opts, NULL)) != -1)
@@ -50,63 +59,60 @@ enum imagex_op_type {
JOIN,
MOUNT,
MOUNTRW,
+ OPTIMIZE,
SPLIT,
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] =
-" imagex append DIRECTORY WIMFILE [\"IMAGE_NAME\"] [\"DESCRIPTION\"] [--boot]\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] [--dereference]\n",
-[DELETE] =
-" imagex delete WIMFILE (IMAGE_NUM | IMAGE_NAME | all) [--check]\n",
-[DIR] =
-" imagex dir WIMFILE (IMAGE_NUM | IMAGE_NAME | \"all\")\n",
-[EXPORT] =
-" imagex export SRC_WIMFILE (SRC_IMAGE_NUM | SRC_IMAGE_NAME | all ) \n"
-" DEST_WIMFILE [\"DEST_IMAGE_NAME\"] [\"DEST_IMAGE_DESCRIPTION\"]\n"
-" [--boot] [--check] [--compress[=TYPE]]\n",
-[INFO] =
-" imagex info WIMFILE [IMAGE_NUM | IMAGE_NAME] [NEW_NAME]\n"
-" [NEW_DESC] [--boot] [--check] [--header] [--lookup-table]\n"
-" [--xml] [--extract-xml FILE] [--metadata]\n",
-[JOIN] =
-" imagex join [--check] WIMFILE SPLIT_WIM...\n",
-[MOUNT] =
-" imagex mount WIMFILE (IMAGE_NUM | IMAGE_NAME) DIRECTORY\n"
-" [--check] [--debug] [--stream-interface=INTERFACE]\n",
-[MOUNTRW] =
-" imagex mountrw WIMFILE [IMAGE_NUM | IMAGE_NAME] DIRECTORY\n"
-" [--check] [--debug] [--stream-interface=INTERFACE]\n",
-[SPLIT] =
-" imagex split WIMFILE SPLIT_WIMFILE PART_SIZE [--check]\n",
-[UNMOUNT] =
-" imagex unmount DIRECTORY [--commit] [--check]\n",
+[APPEND] =
+"imagex append (DIRECTORY | NTFS_VOLUME) WIMFILE [IMAGE_NAME]\n"
+" [DESCRIPTION] [--boot] [--check] [--flags EDITION_ID]\n"
+" [--verbose] [--dereference] [--config=FILE]\n"
+" [--threads=NUM_THREADS] [--rebuild] [--unix-data]\n"
+" [--source-list]\n",
+[APPLY] =
+"imagex apply WIMFILE [IMAGE_NUM | IMAGE_NAME | all]\n"
+" (DIRECTORY | NTFS_VOLUME) [--check] [--hardlink]\n"
+" [--symlink] [--verbose] [--ref=\"GLOB\"] [--unix-data]\n",
+[CAPTURE] =
+"imagex capture (DIRECTORY | NTFS_VOLUME) WIMFILE [IMAGE_NAME]\n"
+" [DESCRIPTION] [--boot] [--check] [--compress=TYPE]\n"
+" [--flags EDITION_ID] [--verbose] [--dereference]\n"
+" [--config=FILE] [--threads=NUM_THREADS] [--unix-data]\n"
+" [--source-list]\n",
+[DELETE] =
+"imagex delete WIMFILE (IMAGE_NUM | IMAGE_NAME | all) [--check] [--soft]\n",
+[DIR] =
+"imagex dir WIMFILE (IMAGE_NUM | IMAGE_NAME | all)\n",
+[EXPORT] =
+"imagex export SRC_WIMFILE (SRC_IMAGE_NUM | SRC_IMAGE_NAME | all ) \n"
+" DEST_WIMFILE [DEST_IMAGE_NAME] [DEST_IMAGE_DESCRIPTION]\n"
+" [--boot] [--check] [--compress=TYPE] [--ref=\"GLOB\"]\n"
+" [--threads=NUM_THREADS] [--rebuild]\n",
+[INFO] =
+"imagex info WIMFILE [IMAGE_NUM | IMAGE_NAME] [NEW_NAME]\n"
+" [NEW_DESC] [--boot] [--check] [--header] [--lookup-table]\n"
+" [--xml] [--extract-xml FILE] [--metadata]\n",
+[JOIN] =
+"imagex join [--check] WIMFILE SPLIT_WIM...\n",
+[MOUNT] =
+"imagex mount WIMFILE (IMAGE_NUM | IMAGE_NAME) DIRECTORY\n"
+" [--check] [--debug] [--streams-interface=INTERFACE]\n"
+" [--ref=\"GLOB\"] [--unix-data] [--allow-other]\n",
+[MOUNTRW] =
+"imagex mountrw WIMFILE [IMAGE_NUM | IMAGE_NAME] DIRECTORY\n"
+" [--check] [--debug] [--streams-interface=INTERFACE]\n"
+" [--staging-dir=DIR] [--unix-data] [--allow-other]\n",
+[OPTIMIZE] =
+"imagex optimize WIMFILE [--check] [--recompress] [--compress=TYPE]\n",
+[SPLIT] =
+"imagex split WIMFILE SPLIT_WIMFILE PART_SIZE_MB [--check]\n",
+[UNMOUNT] =
+"imagex unmount DIRECTORY [--commit] [--check] [--rebuild]\n",
};
static const struct option common_options[] = {
@@ -115,51 +121,53 @@ static const struct option common_options[] = {
{NULL, 0, NULL, 0},
};
-static const struct option append_options[] = {
- {"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[] = {
- {"check", no_argument, NULL, 'c'},
- {"hardlink", no_argument, NULL, 'h'},
- {"symlink", no_argument, NULL, 's'},
- {"verbose", no_argument, NULL, 'v'},
- {"ntfs", no_argument, NULL, 'N'},
+ {"check", no_argument, NULL, 'c'},
+ {"hardlink", no_argument, NULL, 'h'},
+ {"symlink", no_argument, NULL, 's'},
+ {"verbose", no_argument, NULL, 'v'},
+ {"ref", required_argument, NULL, 'r'},
+ {"unix-data", no_argument, NULL, 'U'},
{NULL, 0, NULL, 0},
};
-static const struct option capture_options[] = {
- {"boot", no_argument, NULL, 'b'},
- {"check", no_argument, NULL, 'c'},
- {"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'},
+static const struct option capture_or_append_options[] = {
+ {"boot", no_argument, NULL, 'b'},
+ {"check", no_argument, NULL, 'c'},
+ {"compress", required_argument, NULL, 'x'},
+ {"config", required_argument, NULL, 'C'},
+ {"dereference", no_argument, NULL, 'L'},
+ {"flags", required_argument, NULL, 'f'},
+ {"verbose", no_argument, NULL, 'v'},
+ {"threads", required_argument, NULL, 't'},
+ {"rebuild", no_argument, NULL, 'R'},
+ {"unix-data", no_argument, NULL, 'U'},
+ {"source-list", no_argument, NULL, 'S'},
{NULL, 0, NULL, 0},
};
static const struct option delete_options[] = {
{"check", no_argument, NULL, 'c'},
+ {"soft", no_argument, NULL, 's'},
{NULL, 0, NULL, 0},
};
static const struct option export_options[] = {
- {"boot", no_argument, NULL, 'b'},
- {"check", no_argument , NULL, 'c'},
- {"compress", optional_argument, NULL, 'x'},
+ {"boot", no_argument, NULL, 'b'},
+ {"check", no_argument, NULL, 'c'},
+ {"compress", required_argument, NULL, 'x'},
+ {"ref", required_argument, NULL, 'r'},
+ {"threads", required_argument, NULL, 't'},
+ {"rebuild", no_argument, NULL, 'R'},
{NULL, 0, NULL, 0},
};
static const struct option info_options[] = {
{"boot", no_argument, NULL, 'b'},
{"check", no_argument, NULL, 'c'},
+ {"extract-xml", required_argument, NULL, 'X'},
{"header", no_argument, NULL, 'h'},
{"lookup-table", no_argument, NULL, 'l'},
- {"xml", no_argument, NULL, 'x'},
- {"extract-xml", required_argument, NULL, 'X'},
{"metadata", no_argument, NULL, 'm'},
+ {"xml", no_argument, NULL, 'x'},
{NULL, 0, NULL, 0},
};
@@ -169,9 +177,19 @@ static const struct option join_options[] = {
};
static const struct option mount_options[] = {
- {"check", no_argument, NULL, 'c'},
- {"debug", no_argument, NULL, 'd'},
- {"stream-interface", required_argument, NULL, 's'},
+ {"check", no_argument, NULL, 'c'},
+ {"debug", no_argument, NULL, 'd'},
+ {"streams-interface", required_argument, NULL, 's'},
+ {"ref", required_argument, NULL, 'r'},
+ {"staging-dir", required_argument, NULL, 'D'},
+ {"unix-data", no_argument, NULL, 'U'},
+ {"allow-other", no_argument, NULL, 'A'},
+ {NULL, 0, NULL, 0},
+};
+
+static const struct option optimize_options[] = {
+ {"check", no_argument, NULL, 'c'},
+ {"recompress", no_argument, NULL, 'r'},
{NULL, 0, NULL, 0},
};
@@ -181,12 +199,14 @@ static const struct option split_options[] = {
};
static const struct option unmount_options[] = {
- {"commit", no_argument, NULL, 'c'},
- {"check", no_argument, NULL, 'C'},
+ {"commit", no_argument, NULL, 'c'},
+ {"check", no_argument, NULL, 'C'},
+ {"rebuild", no_argument, NULL, 'R'},
{NULL, 0, NULL, 0},
};
+
/* Print formatted error message to stderr. */
static void imagex_error(const char *format, ...)
{
@@ -210,62 +230,35 @@ static void imagex_error_with_errno(const char *format, ...)
va_end(va);
}
-
-static inline 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 .\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 inline void usage(int cmd)
+static int verify_image_exists(int image, const char *image_name,
+ const char *wim_name)
{
- puts("IMAGEX: Usage:");
- fputs(usage_strings[cmd], stdout);
-}
-
-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);
-}
-
-static int verify_image_exists(int image)
-{
- if (image == WIM_NO_IMAGE) {
- imagex_error("Not a valid image");
- return WIMLIB_ERR_INVALID_IMAGE;
+ if (image == WIMLIB_NO_IMAGE) {
+ imagex_error("\"%s\" is not a valid image in `%s'!\n"
+ " Please specify a 1-based imagex index or "
+ "image name.\n"
+ " You may use `imagex info' to list the images "
+ "contained in a WIM.",
+ image_name, wim_name);
+ return -1;
}
return 0;
}
static int verify_image_is_single(int image)
{
- if (image == WIM_ALL_IMAGES) {
- imagex_error("Cannot specify all images for this action");
- return WIMLIB_ERR_INVALID_IMAGE;
+ if (image == WIMLIB_ALL_IMAGES) {
+ imagex_error("Cannot specify all images for this action!");
+ return -1;
}
return 0;
}
-static int verify_image_exists_and_is_single(int image)
+static int verify_image_exists_and_is_single(int image, const char *image_name,
+ const char *wim_name)
{
int ret;
- ret = verify_image_exists(image);
+ ret = verify_image_exists(image, image_name, wim_name);
if (ret == 0)
ret = verify_image_is_single(image);
return ret;
@@ -273,93 +266,486 @@ static int verify_image_exists_and_is_single(int image)
static int get_compression_type(const char *optarg)
{
- if (!optarg)
- return WIM_COMPRESSION_TYPE_LZX;
if (strcasecmp(optarg, "maximum") == 0 || strcasecmp(optarg, "lzx") == 0)
- return WIM_COMPRESSION_TYPE_LZX;
+ return WIMLIB_COMPRESSION_TYPE_LZX;
else if (strcasecmp(optarg, "fast") == 0 || strcasecmp(optarg, "xpress") == 0)
- return WIM_COMPRESSION_TYPE_XPRESS;
+ return WIMLIB_COMPRESSION_TYPE_XPRESS;
else if (strcasecmp(optarg, "none") == 0)
- return WIM_COMPRESSION_TYPE_NONE;
+ return WIMLIB_COMPRESSION_TYPE_NONE;
else {
imagex_error("Invalid compression type `%s'! Must be "
"\"maximum\", \"fast\", or \"none\".", optarg);
- return WIM_COMPRESSION_TYPE_INVALID;
+ return WIMLIB_COMPRESSION_TYPE_INVALID;
}
}
-static int imagex_append(int argc, const char **argv)
+static off_t file_get_size(const char *filename)
{
- int c;
- const char *flags_element = NULL;
- int open_flags = WIMLIB_OPEN_FLAG_SHOW_PROGRESS;
- int add_image_flags = 0;
- int write_flags = WIMLIB_WRITE_FLAG_SHOW_PROGRESS;
- const char *dir;
- const char *wimfile;
- const char *name;
- const char *desc;
- WIMStruct *w;
- int ret;
+ struct stat st;
+ if (stat(filename, &st) == 0)
+ return st.st_size;
+ else
+ return (off_t)-1;
+}
- for_opt(c, append_options) {
- switch (c) {
- case 'b':
- add_image_flags |= WIMLIB_ADD_IMAGE_FLAG_BOOT;
- break;
- case 'c':
- open_flags |= WIMLIB_OPEN_FLAG_CHECK_INTEGRITY;
- write_flags |= WIMLIB_WRITE_FLAG_CHECK_INTEGRITY;
- break;
- case 'f':
- flags_element = optarg;
+static const char *default_capture_config =
+"[ExclusionList]\n"
+"\\$ntfs.log\n"
+"\\hiberfil.sys\n"
+"\\pagefile.sys\n"
+"\\System Volume Information\n"
+"\\RECYCLER\n"
+"\\Windows\\CSC\n"
+"\n"
+"[CompressionExclusionList]\n"
+"*.mp3\n"
+"*.zip\n"
+"*.cab\n"
+"\\WINDOWS\\inf\\*.pnf\n";
+
+static char *stdin_get_contents(size_t *len_ret)
+{
+ char *buf = NULL;
+ size_t newlen = 1024;
+ size_t pos = 0;
+ size_t inc = 1024;
+ for (;;) {
+ char *p = realloc(buf, newlen);
+ size_t bytes_read, bytes_to_read;
+ if (!p) {
+ imagex_error("out of memory while reading stdin");
break;
- case 'L':
- add_image_flags |= WIMLIB_ADD_IMAGE_FLAG_DEREFERENCE;
+ }
+ buf = p;
+ bytes_to_read = newlen - pos;
+ bytes_read = fread(&buf[pos], 1, bytes_to_read, stdin);
+ pos += bytes_read;
+ if (bytes_read != bytes_to_read) {
+ if (feof(stdin)) {
+ *len_ret = pos;
+ return buf;
+ } else {
+ imagex_error_with_errno("error reading stdin");
+ break;
+ }
+ }
+ newlen += inc;
+ inc *= 3;
+ inc /= 2;
+ }
+ free(buf);
+ return NULL;
+}
+
+enum {
+ PARSE_FILENAME_SUCCESS = 0,
+ PARSE_FILENAME_FAILURE = 1,
+ PARSE_FILENAME_NONE = 2,
+};
+
+static int parse_filename(char **fn_ret, char **line_p, size_t *len_p)
+{
+ size_t len = *len_p;
+ char *line = *line_p;
+ char *fn;
+ int ret;
+ char quote_char;
+
+ /* Skip leading whitespace */
+ for (;;) {
+ if (len == 0)
+ return PARSE_FILENAME_NONE;
+ if (!isspace(*line) && *line != '\0')
break;
- default:
- usage(APPEND);
- return -1;
+ line++;
+ len--;
+ }
+ quote_char = *line;
+ if (quote_char == '"' || quote_char == '\'') {
+ /* Quoted filename */
+ line++;
+ len--;
+ fn = line;
+ line = memchr(line, quote_char, len);
+ if (line) {
+ *line = '\0';
+ len -= line - fn;
+ ret = PARSE_FILENAME_SUCCESS;
+ } else {
+ imagex_error("Missing closing quote: %s", fn - 1);
+ return PARSE_FILENAME_FAILURE;
+ }
+ } else {
+ /* Unquoted filename. Go until whitespace. Line is terminated
+ * by '\0', so no need to check 'len'. */
+ fn = line;
+ do {
+ line++;
+ len--;
+ } while (!isspace(*line) && *line != '\0');
+ *line = '\0';
+ ret = PARSE_FILENAME_SUCCESS;
+ }
+ *len_p = len;
+ *line_p = line;
+ *fn_ret = fn;
+ return ret;
+}
+
+static bool
+parse_source_list_line(char *line, size_t len,
+ struct wimlib_capture_source *source)
+{
+ int ret;
+ ret = parse_filename(&source->fs_source_path, &line, &len);
+ if (ret != PARSE_FILENAME_SUCCESS)
+ return false;
+ ret = parse_filename(&source->wim_target_path, &line, &len);
+ if (ret == PARSE_FILENAME_NONE)
+ source->wim_target_path = source->fs_source_path;
+ return ret != PARSE_FILENAME_FAILURE;
+}
+
+static bool is_comment_line(const char *line, size_t len)
+{
+ for (;;) {
+ if (*line == '#')
+ return true;
+ if (!isspace(*line) && *line != '\0')
+ return false;
+ ++line;
+ --len;
+ if (len == 0)
+ return true;
+ }
+}
+
+static struct wimlib_capture_source *
+parse_source_list(char *source_list_contents, size_t source_list_nbytes,
+ size_t *nsources_ret)
+{
+ size_t nlines;
+ char *p;
+ struct wimlib_capture_source *sources;
+ size_t i, j;
+
+ nlines = 0;
+ for (i = 0; i < source_list_nbytes; i++)
+ if (source_list_contents[i] == '\n')
+ nlines++;
+ sources = calloc(nlines, sizeof(*sources));
+ if (!sources) {
+ imagex_error("out of memory");
+ return NULL;
+ }
+ p = source_list_contents;
+ j = 0;
+ for (i = 0; i < nlines; i++) {
+ char *endp = strchr(p, '\n');
+ size_t len = endp - p + 1;
+ *endp = '\0';
+ if (!is_comment_line(p, len)) {
+ if (!parse_source_list_line(p, len, &sources[j++])) {
+ free(sources);
+ return NULL;
+ }
}
+ p = endp + 1;
+
}
- argc -= optind;
- argv += optind;
- if (argc < 2 || argc > 4) {
- usage(APPEND);
- return -1;
+ *nsources_ret = j;
+ return sources;
+}
+
+static char *file_get_contents(const char *filename, size_t *len_ret)
+{
+ struct stat stbuf;
+ char *buf = NULL;
+ size_t len;
+ FILE *fp;
+
+ if (stat(filename, &stbuf) != 0) {
+ imagex_error_with_errno("Failed to stat the file `%s'", filename);
+ goto out;
}
- dir = argv[0];
- wimfile = argv[1];
- name = (argc >= 3) ? argv[2] : path_basename(dir);
- desc = (argc >= 4) ? argv[3] : NULL;
+ len = stbuf.st_size;
- ret = wimlib_open_wim(wimfile, open_flags, &w);
- if (ret != 0)
- return ret;
+ fp = fopen(filename, "rb");
+ if (!fp) {
+ imagex_error_with_errno("Failed to open the file `%s'", filename);
+ goto out;
+ }
- ret = wimlib_add_image(w, dir, name, desc,
- flags_element, add_image_flags);
+ buf = malloc(len);
+ if (!buf) {
+ imagex_error("Failed to allocate buffer of %zu bytes to hold "
+ "contents of file `%s'", len, filename);
+ goto out_fclose;
+ }
+ if (fread(buf, 1, len, fp) != len) {
+ imagex_error_with_errno("Failed to read %lu bytes from the "
+ "file `%s'", len, filename);
+ goto out_free_buf;
+ }
+ *len_ret = len;
+ goto out_fclose;
+out_free_buf:
+ free(buf);
+ buf = NULL;
+out_fclose:
+ fclose(fp);
+out:
+ return buf;
+}
+
+static int file_writable(const char *path)
+{
+ int ret;
+ ret = access(path, W_OK);
if (ret != 0)
- goto done;
- ret = wimlib_overwrite(w, write_flags);
-done:
- wimlib_free(w);
+ imagex_error_with_errno("Can't modify `%s'", path);
return ret;
}
+#define TO_PERCENT(numerator, denominator) \
+ (((denominator) == 0) ? 0 : ((numerator) * 100 / (denominator)))
+
+static const char *get_data_type(int ctype)
+{
+ switch (ctype) {
+ case WIMLIB_COMPRESSION_TYPE_NONE:
+ return "uncompressed";
+ case WIMLIB_COMPRESSION_TYPE_LZX:
+ return "LZX-compressed";
+ case WIMLIB_COMPRESSION_TYPE_XPRESS:
+ return "XPRESS-compressed";
+ }
+ return NULL;
+}
+
+static int imagex_progress_func(enum wimlib_progress_msg msg,
+ const union wimlib_progress_info *info)
+{
+ unsigned percent_done;
+ switch (msg) {
+ case WIMLIB_PROGRESS_MSG_WRITE_STREAMS:
+ percent_done = TO_PERCENT(info->write_streams.completed_bytes,
+ info->write_streams.total_bytes);
+ if (info->write_streams.completed_streams == 0) {
+ const char *data_type;
+
+ data_type = get_data_type(info->write_streams.compression_type);
+ printf("Writing %s data using %u thread%s\n",
+ data_type, info->write_streams.num_threads,
+ (info->write_streams.num_threads == 1) ? "" : "s");
+ }
+ printf("\r%"PRIu64" MiB of %"PRIu64" MiB (uncompressed) "
+ "written (%u%% done)",
+ info->write_streams.completed_bytes >> 20,
+ info->write_streams.total_bytes >> 20,
+ percent_done);
+ if (info->write_streams.completed_bytes >= info->write_streams.total_bytes)
+ putchar('\n');
+ break;
+ case WIMLIB_PROGRESS_MSG_SCAN_BEGIN:
+ printf("Scanning `%s'", info->scan.source);
+ if (*info->scan.wim_target_path) {
+ printf(" (loading as WIM path: `/%s')...\n",
+ info->scan.wim_target_path);
+ } else {
+ printf(" (loading as root of WIM image)...\n");
+ }
+ break;
+ case WIMLIB_PROGRESS_MSG_SCAN_DENTRY:
+ if (info->scan.excluded)
+ printf("Excluding `%s' from capture\n", info->scan.cur_path);
+ else
+ printf("Scanning `%s'\n", info->scan.cur_path);
+ break;
+ /*case WIMLIB_PROGRESS_MSG_SCAN_END:*/
+ /*break;*/
+ case WIMLIB_PROGRESS_MSG_VERIFY_INTEGRITY:
+ percent_done = TO_PERCENT(info->integrity.completed_bytes,
+ info->integrity.total_bytes);
+ printf("\rVerifying integrity of `%s': %"PRIu64" MiB "
+ "of %"PRIu64" MiB (%u%%) done",
+ info->integrity.filename,
+ info->integrity.completed_bytes >> 20,
+ info->integrity.total_bytes >> 20,
+ percent_done);
+ if (info->integrity.completed_bytes == info->integrity.total_bytes)
+ putchar('\n');
+ break;
+ case WIMLIB_PROGRESS_MSG_CALC_INTEGRITY:
+ percent_done = TO_PERCENT(info->integrity.completed_bytes,
+ info->integrity.total_bytes);
+ printf("\rCalculating integrity table for WIM: %"PRIu64" MiB "
+ "of %"PRIu64" MiB (%u%%) done",
+ info->integrity.completed_bytes >> 20,
+ info->integrity.total_bytes >> 20,
+ percent_done);
+ if (info->integrity.completed_bytes == info->integrity.total_bytes)
+ putchar('\n');
+ break;
+ case WIMLIB_PROGRESS_MSG_EXTRACT_IMAGE_BEGIN:
+ printf("Applying image %d (%s) from `%s' to %s `%s'\n",
+ info->extract.image,
+ info->extract.image_name,
+ info->extract.wimfile_name,
+ ((info->extract.extract_flags & WIMLIB_EXTRACT_FLAG_NTFS) ?
+ "NTFS volume" : "directory"),
+ info->extract.target);
+ break;
+ /*case WIMLIB_PROGRESS_MSG_EXTRACT_DIR_STRUCTURE_BEGIN:*/
+ /*printf("Applying directory structure to %s\n",*/
+ /*info->extract.target);*/
+ /*break;*/
+ case WIMLIB_PROGRESS_MSG_EXTRACT_STREAMS:
+ percent_done = TO_PERCENT(info->extract.completed_bytes,
+ info->extract.total_bytes);
+ printf("\rExtracting files: "
+ "%"PRIu64" MiB of %"PRIu64" MiB (%u%%) done",
+ info->extract.completed_bytes >> 20,
+ info->extract.total_bytes >> 20,
+ percent_done);
+ if (info->extract.completed_bytes >= info->extract.total_bytes)
+ putchar('\n');
+ break;
+ case WIMLIB_PROGRESS_MSG_EXTRACT_DENTRY:
+ puts(info->extract.cur_path);
+ break;
+ case WIMLIB_PROGRESS_MSG_APPLY_TIMESTAMPS:
+ printf("Setting timestamps on all extracted files...\n");
+ break;
+ case WIMLIB_PROGRESS_MSG_EXTRACT_IMAGE_END:
+ if (info->extract.extract_flags & WIMLIB_EXTRACT_FLAG_NTFS) {
+ printf("Unmounting NTFS volume `%s'...\n",
+ info->extract.target);
+ }
+ break;
+ case WIMLIB_PROGRESS_MSG_JOIN_STREAMS:
+ percent_done = TO_PERCENT(info->join.completed_bytes,
+ info->join.total_bytes);
+ printf("Writing resources from part %u of %u: "
+ "%"PRIu64 " MiB of %"PRIu64" MiB (%u%%) written\n",
+ (info->join.completed_parts == info->join.total_parts) ?
+ info->join.completed_parts : info->join.completed_parts + 1,
+ info->join.total_parts,
+ info->join.completed_bytes >> 20,
+ info->join.total_bytes >> 20,
+ percent_done);
+ break;
+ case WIMLIB_PROGRESS_MSG_SPLIT_BEGIN_PART:
+ percent_done = TO_PERCENT(info->split.completed_bytes,
+ info->split.total_bytes);
+ printf("Writing `%s': %"PRIu64" MiB of %"PRIu64" MiB (%u%%) written\n",
+ info->split.part_name,
+ info->split.completed_bytes >> 20,
+ info->split.total_bytes >> 20,
+ percent_done);
+ break;
+ case WIMLIB_PROGRESS_MSG_SPLIT_END_PART:
+ if (info->split.completed_bytes == info->split.total_bytes) {
+ printf("Finished writing %u split WIM parts\n",
+ info->split.cur_part_number);
+ }
+ break;
+ default:
+ break;
+ }
+ fflush(stdout);
+ return 0;
+}
+
+
+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;
+ }
+ unsigned offset = 0;
+ for (unsigned 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],
+ imagex_progress_func);
+ 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 unsigned parse_num_threads(const char *optarg)
+{
+ char *tmp;
+ unsigned nthreads = strtoul(optarg, &tmp, 10);
+ if (nthreads == UINT_MAX || *tmp || tmp == optarg) {
+ imagex_error("Number of threads must be a non-negative integer!");
+ return UINT_MAX;
+ } else {
+ return nthreads;
+ }
+}
+
+
/* Extract one image, or all images, from a WIM file into a directory. */
-static int imagex_apply(int argc, const char **argv)
+static int imagex_apply(int argc, char **argv)
{
int c;
- int open_flags = WIMLIB_OPEN_FLAG_SHOW_PROGRESS;
+ int open_flags = WIMLIB_OPEN_FLAG_SPLIT_OK;
int image;
int num_images;
WIMStruct *w;
int ret;
const char *wimfile;
- const char *dir;
+ const char *target;
const char *image_num_or_name;
- int extract_flags = 0;
+ int extract_flags = WIMLIB_EXTRACT_FLAG_SEQUENTIAL;
+
+ const char *swm_glob = NULL;
+ WIMStruct **additional_swms = NULL;
+ unsigned num_additional_swms = 0;
for_opt(c, apply_options) {
switch (c) {
@@ -375,8 +761,11 @@ static int imagex_apply(int argc, const char **argv)
case 'v':
extract_flags |= WIMLIB_EXTRACT_FLAG_VERBOSE;
break;
- case 'N':
- extract_flags |= WIMLIB_EXTRACT_FLAG_NTFS;
+ case 'r':
+ swm_glob = optarg;
+ break;
+ case 'U':
+ extract_flags |= WIMLIB_EXTRACT_FLAG_UNIX_DATA;
break;
default:
usage(APPLY);
@@ -392,21 +781,21 @@ static int imagex_apply(int argc, const char **argv)
wimfile = argv[0];
if (argc == 2) {
- image_num_or_name = "1";
- dir = argv[1];
+ image_num_or_name = "1";
+ target = argv[1];
} else {
image_num_or_name = argv[1];
- dir = argv[2];
+ target = argv[2];
}
- ret = wimlib_open_wim(wimfile, open_flags, &w);
+ ret = wimlib_open_wim(wimfile, open_flags, &w, imagex_progress_func);
if (ret != 0)
return ret;
image = wimlib_resolve_image(w, image_num_or_name);
- ret = verify_image_exists(image);
+ ret = verify_image_exists(image, image_num_or_name, wimfile);
if (ret != 0)
- goto done;
+ goto out;
num_images = wimlib_get_num_images(w);
if (argc == 2 && num_images != 1) {
@@ -414,97 +803,250 @@ static int imagex_apply(int argc, const char **argv)
"(or all)", wimfile, num_images);
usage(APPLY);
ret = -1;
- goto done;
+ 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;
+ }
+
+ struct stat stbuf;
+
+ ret = stat(target, &stbuf);
+ if (ret == 0) {
+ if (S_ISBLK(stbuf.st_mode) || S_ISREG(stbuf.st_mode))
+ extract_flags |= WIMLIB_EXTRACT_FLAG_NTFS;
+ } else {
+ if (errno != ENOENT) {
+ imagex_error_with_errno("Failed to stat `%s'", target);
+ ret = -1;
+ goto out;
+ }
}
- ret = wimlib_extract_image(w, image, dir, extract_flags);
-done:
+
+ ret = wimlib_extract_image(w, image, target, extract_flags,
+ additional_swms, num_additional_swms,
+ imagex_progress_func);
+ if (ret == 0)
+ printf("Done applying WIM image.\n");
+out:
wimlib_free(w);
+ if (additional_swms) {
+ for (unsigned i = 0; i < num_additional_swms; i++)
+ wimlib_free(additional_swms[i]);
+ free(additional_swms);
+ }
return ret;
}
-
-/* Create a WIM file from a directory. */
-static int imagex_capture(int argc, const char **argv)
+static int imagex_capture_or_append(int argc, char **argv)
{
int c;
+ int open_flags = 0;
int add_image_flags = 0;
- int write_flags = WIMLIB_WRITE_FLAG_SHOW_PROGRESS;
- int compression_type = WIM_COMPRESSION_TYPE_NONE;
- const char *flags_element = NULL;
- const char *dir;
+ int write_flags = 0;
+ int compression_type = WIMLIB_COMPRESSION_TYPE_XPRESS;
const char *wimfile;
const char *name;
const char *desc;
- WIMStruct *w;
+ const char *flags_element = NULL;
+ WIMStruct *w = NULL;
int ret;
-
- for_opt(c, capture_options) {
+ int cur_image;
+ int cmd = strcmp(argv[0], "append") ? CAPTURE : APPEND;
+ unsigned num_threads = 0;
+
+ char *source;
+ size_t source_name_len;
+ char *source_copy;
+
+ const char *config_file = NULL;
+ char *config_str = NULL;
+ size_t config_len = 0;
+
+ bool source_list = false;
+ size_t source_list_nbytes;
+ char *source_list_contents = NULL;
+ bool capture_sources_malloced = false;
+ struct wimlib_capture_source *capture_sources;
+ size_t num_sources;
+
+ for_opt(c, capture_or_append_options) {
switch (c) {
case 'b':
add_image_flags |= WIMLIB_ADD_IMAGE_FLAG_BOOT;
break;
case 'c':
+ open_flags |= WIMLIB_OPEN_FLAG_CHECK_INTEGRITY;
write_flags |= WIMLIB_WRITE_FLAG_CHECK_INTEGRITY;
break;
+ case 'C':
+ config_file = optarg;
+ break;
case 'x':
compression_type = get_compression_type(optarg);
- if (compression_type == WIM_COMPRESSION_TYPE_INVALID)
+ if (compression_type == WIMLIB_COMPRESSION_TYPE_INVALID)
return -1;
break;
case 'f':
flags_element = optarg;
break;
+ case 'L':
+ add_image_flags |= WIMLIB_ADD_IMAGE_FLAG_DEREFERENCE;
+ break;
case 'v':
add_image_flags |= WIMLIB_ADD_IMAGE_FLAG_VERBOSE;
break;
- case 'N':
- add_image_flags |= WIMLIB_ADD_IMAGE_FLAG_NTFS;
+ case 't':
+ num_threads = parse_num_threads(optarg);
+ if (num_threads == UINT_MAX)
+ return -1;
break;
- case 'L':
- add_image_flags |= WIMLIB_ADD_IMAGE_FLAG_DEREFERENCE;
+ case 'R':
+ write_flags |= WIMLIB_WRITE_FLAG_REBUILD;
+ break;
+ case 'U':
+ add_image_flags |= WIMLIB_ADD_IMAGE_FLAG_UNIX_DATA;
+ break;
+ case 'S':
+ source_list = true;
break;
default:
- usage(CAPTURE);
+ usage(cmd);
return -1;
}
}
-
argc -= optind;
argv += optind;
+
if (argc < 2 || argc > 4) {
- usage(CAPTURE);
+ usage(cmd);
return -1;
}
- dir = argv[0];
+
+ source = argv[0];
wimfile = argv[1];
- name = (argc >= 3) ? argv[2] : dir;
- desc = (argc >= 4) ? argv[3] : NULL;
- ret = wimlib_create_new_wim(compression_type, &w);
- if (ret != 0)
- return ret;
+ if (argc >= 3) {
+ name = argv[2];
+ } else {
+ source_name_len = strlen(source);
+ source_copy = alloca(source_name_len + 1);
+ name = basename(strcpy(source_copy, source));
+ }
+ desc = (argc >= 4) ? argv[3] : NULL;
- ret = wimlib_add_image(w, dir, name, desc, flags_element,
- add_image_flags);
- if (ret != 0) {
- imagex_error("Failed to add the image `%s'", dir);
- goto done;
+ if (source_list) {
+ if (source[0] == '-' && source[1] == '\0') {
+ source_list_contents = stdin_get_contents(&source_list_nbytes);
+ } else {
+ source_list_contents = file_get_contents(source,
+ &source_list_nbytes);
+ }
+ if (!source_list_contents)
+ return -1;
+
+ capture_sources = parse_source_list(source_list_contents,
+ source_list_nbytes,
+ &num_sources);
+ if (!capture_sources) {
+ ret = -1;
+ goto out;
+ }
+ capture_sources_malloced = true;
+ } else {
+ capture_sources = alloca(sizeof(struct wimlib_capture_source));
+ capture_sources[0].fs_source_path = source;
+ capture_sources[0].wim_target_path = NULL;
+ capture_sources[0].reserved = 0;
+ num_sources = 1;
}
- ret = wimlib_write(w, wimfile, WIM_ALL_IMAGES, write_flags);
+ if (config_file) {
+ config_str = file_get_contents(config_file, &config_len);
+ if (!config_str) {
+ ret = -1;
+ goto out;
+ }
+ }
+
+ if (cmd == APPEND)
+ ret = wimlib_open_wim(wimfile, open_flags, &w,
+ imagex_progress_func);
+ else
+ ret = wimlib_create_new_wim(compression_type, &w);
+ if (ret != 0)
+ goto out;
+
+ if (!source_list) {
+ struct stat stbuf;
+ ret = stat(source, &stbuf);
+ if (ret == 0) {
+ if (S_ISBLK(stbuf.st_mode) || S_ISREG(stbuf.st_mode)) {
+ printf("Capturing WIM image from NTFS filesystem on `%s'\n",
+ source);
+ add_image_flags |= WIMLIB_ADD_IMAGE_FLAG_NTFS;
+ }
+ } else {
+ if (errno != ENOENT) {
+ imagex_error_with_errno("Failed to stat `%s'", source);
+ ret = -1;
+ goto out;
+ }
+ }
+ }
+
+ ret = wimlib_add_image_multisource(w, capture_sources,
+ num_sources, name,
+ (config_str ? config_str :
+ default_capture_config),
+ (config_str ? config_len :
+ strlen(default_capture_config)),
+ add_image_flags,
+ imagex_progress_func);
+ if (ret != 0)
+ goto out;
+ cur_image = wimlib_get_num_images(w);
+ if (desc) {
+ ret = wimlib_set_image_descripton(w, cur_image, desc);
+ if (ret != 0)
+ goto out;
+ }
+ if (flags_element) {
+ ret = wimlib_set_image_flags(w, cur_image, flags_element);
+ if (ret != 0)
+ goto out;
+ }
+ if (cmd == APPEND) {
+ ret = wimlib_overwrite(w, write_flags, num_threads,
+ imagex_progress_func);
+ } else {
+ ret = wimlib_write(w, wimfile, WIMLIB_ALL_IMAGES, write_flags,
+ num_threads, imagex_progress_func);
+ }
+ if (ret == WIMLIB_ERR_REOPEN)
+ ret = 0;
if (ret != 0)
imagex_error("Failed to write the WIM file `%s'", wimfile);
-done:
+out:
wimlib_free(w);
+ free(config_str);
+ free(source_list_contents);
+ if (capture_sources_malloced)
+ free(capture_sources);
return ret;
}
/* Remove image(s) from a WIM. */
-static int imagex_delete(int argc, const char **argv)
+static int imagex_delete(int argc, char **argv)
{
int c;
- int open_flags = WIMLIB_OPEN_FLAG_SHOW_PROGRESS;
- int write_flags = WIMLIB_WRITE_FLAG_SHOW_PROGRESS;
+ int open_flags = 0;
+ int write_flags = 0;
const char *wimfile;
const char *image_num_or_name;
WIMStruct *w;
@@ -517,6 +1059,9 @@ static int imagex_delete(int argc, const char **argv)
open_flags |= WIMLIB_OPEN_FLAG_CHECK_INTEGRITY;
write_flags |= WIMLIB_WRITE_FLAG_CHECK_INTEGRITY;
break;
+ case 's':
+ write_flags |= WIMLIB_WRITE_FLAG_SOFT_DELETE;
+ break;
default:
usage(DELETE);
return -1;
@@ -536,41 +1081,47 @@ static int imagex_delete(int argc, const char **argv)
wimfile = argv[0];
image_num_or_name = argv[1];
- ret = wimlib_open_wim(wimfile, open_flags, &w);
+ ret = file_writable(wimfile);
+ if (ret != 0)
+ return ret;
+
+ ret = wimlib_open_wim(wimfile, open_flags, &w,
+ imagex_progress_func);
if (ret != 0)
return ret;
image = wimlib_resolve_image(w, image_num_or_name);
- ret = verify_image_exists(image);
+ ret = verify_image_exists(image, image_num_or_name, wimfile);
if (ret != 0)
- goto done;
+ goto out;
ret = wimlib_delete_image(w, image);
if (ret != 0) {
imagex_error("Failed to delete image from `%s'", wimfile);
- goto done;
+ goto out;
}
- ret = wimlib_overwrite(w, write_flags);
+ ret = wimlib_overwrite(w, write_flags, 0, imagex_progress_func);
+ if (ret == WIMLIB_ERR_REOPEN)
+ ret = 0;
if (ret != 0) {
imagex_error("Failed to write the file `%s' with image "
"deleted", wimfile);
}
-done:
+out:
wimlib_free(w);
return ret;
}
/* Print the files contained in an image(s) in a WIM file. */
-static int imagex_dir(int argc, const char **argv)
+static int imagex_dir(int argc, char **argv)
{
const char *wimfile;
WIMStruct *w;
int image;
int ret;
int num_images;
- int part_number;
if (argc < 2) {
imagex_error("Must specify a WIM file");
@@ -584,24 +1135,16 @@ static int imagex_dir(int argc, const char **argv)
}
wimfile = argv[1];
- ret = wimlib_open_wim(wimfile, WIMLIB_OPEN_FLAG_SPLIT_OK, &w);
+ ret = wimlib_open_wim(wimfile, WIMLIB_OPEN_FLAG_SPLIT_OK, &w,
+ imagex_progress_func);
if (ret != 0)
return ret;
- part_number = wimlib_get_part_number(w, NULL);
- if (part_number != 1) {
- imagex_error("`%s' is part %d of a split WIM! Specify the "
- "first part to see the files",
- wimfile, part_number);
- ret = WIMLIB_ERR_SPLIT_UNSUPPORTED;
- goto done;
- }
-
if (argc == 3) {
image = wimlib_resolve_image(w, argv[2]);
- ret = verify_image_exists(image);
+ ret = verify_image_exists(image, argv[2], wimfile);
if (ret != 0)
- goto done;
+ goto out;
} else {
/* Image was not specified. If the WIM only contains one image,
* choose that one; otherwise, print an error. */
@@ -611,26 +1154,26 @@ static int imagex_dir(int argc, const char **argv)
"select one.", wimfile, num_images);
usage(DIR);
ret = -1;
- goto done;
+ goto out;
}
image = 1;
}
ret = wimlib_print_files(w, image);
-done:
+out:
wimlib_free(w);
return ret;
}
/* Exports one, or all, images from a WIM file to a new WIM file or an existing
* WIM file. */
-static int imagex_export(int argc, const char **argv)
+static int imagex_export(int argc, char **argv)
{
int c;
- int open_flags = WIMLIB_OPEN_FLAG_SHOW_PROGRESS;
+ int open_flags = 0;
int export_flags = 0;
- int write_flags = WIMLIB_WRITE_FLAG_SHOW_PROGRESS;
- int compression_type = WIM_COMPRESSION_TYPE_NONE;
+ int write_flags = 0;
+ int compression_type = WIMLIB_COMPRESSION_TYPE_NONE;
bool compression_type_specified = false;
const char *src_wimfile;
const char *src_image_num_or_name;
@@ -643,6 +1186,10 @@ static int imagex_export(int argc, const char **argv)
int image;
struct stat stbuf;
bool wim_is_new;
+ const char *swm_glob = NULL;
+ WIMStruct **additional_swms = NULL;
+ unsigned num_additional_swms = 0;
+ unsigned num_threads = 0;
for_opt(c, export_options) {
switch (c) {
@@ -655,10 +1202,21 @@ static int imagex_export(int argc, const char **argv)
break;
case 'x':
compression_type = get_compression_type(optarg);
- if (compression_type == WIM_COMPRESSION_TYPE_INVALID)
+ if (compression_type == WIMLIB_COMPRESSION_TYPE_INVALID)
return -1;
compression_type_specified = true;
break;
+ case 'r':
+ swm_glob = optarg;
+ break;
+ case 't':
+ num_threads = parse_num_threads(optarg);
+ if (num_threads == UINT_MAX)
+ return -1;
+ break;
+ case 'R':
+ write_flags |= WIMLIB_WRITE_FLAG_REBUILD;
+ break;
default:
usage(EXPORT);
return -1;
@@ -675,73 +1233,105 @@ static int imagex_export(int argc, const char **argv)
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,
+ imagex_progress_func);
if (ret != 0)
return ret;
- /* Determine if the destination is an existing file or not.
+ /* Determine if the destination is an existing file or not.
* If so, we try to append the exported image(s) to it; otherwise, we
* create a new WIM containing the exported image(s). */
if (stat(dest_wimfile, &stbuf) == 0) {
+ int dest_ctype;
+
wim_is_new = false;
/* Destination file exists. */
- if (!S_ISREG(stbuf.st_mode)) {
+ if (!S_ISREG(stbuf.st_mode) && !S_ISLNK(stbuf.st_mode)) {
imagex_error("`%s' is not a regular file",
dest_wimfile);
- goto done;
+ ret = -1;
+ goto out;
}
- ret = wimlib_open_wim(dest_wimfile, open_flags, &dest_w);
+ ret = wimlib_open_wim(dest_wimfile, open_flags, &dest_w,
+ imagex_progress_func);
+ if (ret != 0)
+ goto out;
+
+ ret = file_writable(dest_wimfile);
if (ret != 0)
- goto done;
+ goto out;
- if (compression_type_specified && compression_type !=
- wimlib_get_compression_type(dest_w)) {
+ dest_ctype = wimlib_get_compression_type(dest_w);
+ if (compression_type_specified
+ && compression_type != dest_ctype)
+ {
imagex_error("Cannot specify a compression type that is "
"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 {
wim_is_new = true;
/* dest_wimfile is not an existing file, so create a new WIM. */
+ if (!compression_type_specified)
+ compression_type = wimlib_get_compression_type(src_w);
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;
+ ret = -1;
+ goto out;
}
}
image = wimlib_resolve_image(src_w, src_image_num_or_name);
- ret = verify_image_exists(image);
+ ret = verify_image_exists(image, src_image_num_or_name, src_wimfile);
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);
+ ret = wimlib_export_image(src_w, image, dest_w, dest_name, dest_desc,
+ export_flags, additional_swms,
+ num_additional_swms, imagex_progress_func);
if (ret != 0)
- goto done;
+ goto out;
if (wim_is_new)
- ret = wimlib_write(dest_w, dest_wimfile, WIM_ALL_IMAGES,
- write_flags);
+ ret = wimlib_write(dest_w, dest_wimfile, WIMLIB_ALL_IMAGES,
+ write_flags, num_threads,
+ imagex_progress_func);
else
- ret = wimlib_overwrite(dest_w, write_flags);
-done:
+ ret = wimlib_overwrite(dest_w, write_flags, num_threads,
+ imagex_progress_func);
+out:
+ if (ret == WIMLIB_ERR_REOPEN)
+ ret = 0;
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]);
+ free(additional_swms);
+ }
return ret;
}
/* Prints information about a WIM file; also can mark an image as bootable,
* change the name of an image, or change the description of an image. */
-static int imagex_info(int argc, const char **argv)
+static int imagex_info(int argc, char **argv)
{
int c;
bool boot = false;
@@ -760,10 +1350,10 @@ static int imagex_info(int argc, const char **argv)
FILE *fp;
int image;
int ret;
- int open_flags = WIMLIB_OPEN_FLAG_SHOW_PROGRESS |
- WIMLIB_OPEN_FLAG_SPLIT_OK;
+ int open_flags = WIMLIB_OPEN_FLAG_SPLIT_OK;
int part_number;
int total_parts;
+ int num_images;
for_opt(c, info_options) {
switch (c) {
@@ -812,52 +1402,57 @@ static int imagex_info(int argc, const char **argv)
new_name = argv[2];
if (argc > 3) {
new_desc = argv[3];
- }
+ }
}
}
if (check)
open_flags |= WIMLIB_OPEN_FLAG_CHECK_INTEGRITY;
- ret = wimlib_open_wim(wimfile, open_flags, &w);
+ ret = wimlib_open_wim(wimfile, open_flags, &w,
+ imagex_progress_func);
if (ret != 0)
return ret;
part_number = wimlib_get_part_number(w, &total_parts);
- /*if (total_parts > 1 && part_number > 1) {*/
- /*printf("Warning: this is part %d of a %d-part split WIM.\n"*/
- /*" Select the first part if you want to see information\n"*/
- /*" about images in the WIM.\n", */
- /*part_number, total_parts);*/
- /*}*/
-
image = wimlib_resolve_image(w, image_num_or_name);
- if (image == WIM_NO_IMAGE && strcmp(image_num_or_name, "0") != 0) {
- imagex_error("The image `%s' does not exist",
- image_num_or_name);
+ if (image == WIMLIB_NO_IMAGE && strcmp(image_num_or_name, "0") != 0) {
+ imagex_error("The image `%s' does not exist",
+ image_num_or_name);
if (boot)
imagex_error("If you would like to set the boot "
"index to 0, specify image \"0\" with "
"the --boot flag.");
ret = WIMLIB_ERR_INVALID_IMAGE;
- goto done;
+ goto out;
}
- if (image == WIM_ALL_IMAGES && wimlib_get_num_images(w) > 1) {
+ num_images = wimlib_get_num_images(w);
+
+ if (num_images == 0) {
+ if (boot) {
+ imagex_error("--boot is meaningless on a WIM with no "
+ "images");
+ ret = WIMLIB_ERR_INVALID_IMAGE;
+ goto out;
+ }
+ }
+
+ if (image == WIMLIB_ALL_IMAGES && num_images > 1) {
if (boot) {
imagex_error("Cannot specify the --boot flag "
"without specifying a specific "
"image in a multi-image WIM");
ret = WIMLIB_ERR_INVALID_IMAGE;
- goto done;
+ goto out;
}
if (new_name) {
imagex_error("Cannot specify the NEW_NAME "
"without specifying a specific "
"image in a multi-image WIM");
ret = WIMLIB_ERR_INVALID_IMAGE;
- goto done;
+ goto out;
}
}
@@ -865,14 +1460,16 @@ static int imagex_info(int argc, const char **argv)
* recreate the WIM file. */
if (!new_name && !boot) {
- if (image == WIM_NO_IMAGE) {
+ /* Read-only operations */
+
+ if (image == WIMLIB_NO_IMAGE) {
imagex_error("`%s' is not a valid image",
image_num_or_name);
ret = WIMLIB_ERR_INVALID_IMAGE;
- goto done;
+ goto out;
}
- if (image == WIM_ALL_IMAGES && short_header)
+ if (image == WIMLIB_ALL_IMAGES && short_header)
wimlib_print_wim_information(w);
if (header)
@@ -890,7 +1487,7 @@ static int imagex_info(int argc, const char **argv)
if (xml) {
ret = wimlib_extract_xml_data(w, stdout);
if (ret != 0)
- goto done;
+ goto out;
}
if (xml_out_file) {
@@ -900,45 +1497,44 @@ static int imagex_info(int argc, const char **argv)
"file `%s' for "
"writing ",
xml_out_file);
- goto done;
+ ret = -1;
+ goto out;
}
ret = wimlib_extract_xml_data(w, fp);
if (fclose(fp) != 0) {
imagex_error("Failed to close the file `%s'",
xml_out_file);
- goto done;
+ ret = -1;
}
if (ret != 0)
- goto done;
+ goto out;
}
if (short_header)
wimlib_print_available_images(w, image);
if (metadata) {
- if (total_parts != 1 && part_number != 1) {
- imagex_error("Select part 1 of this %d-part WIM "
- "to see the image metadata",
- total_parts);
- return WIMLIB_ERR_SPLIT_UNSUPPORTED;
- }
ret = wimlib_print_metadata(w, image);
if (ret != 0)
- goto done;
+ goto out;
}
} else {
+
+ /* Modification operations */
if (total_parts != 1) {
imagex_error("Modifying a split WIM is not supported.");
- return -1;
+ ret = -1;
+ goto out;
}
- if (image == WIM_ALL_IMAGES)
+ if (image == WIMLIB_ALL_IMAGES)
image = 1;
- if (image == WIM_NO_IMAGE && new_name) {
+ if (image == WIMLIB_NO_IMAGE && new_name) {
imagex_error("Cannot specify new_name (`%s') when "
"using image 0", new_name);
- return -1;
+ ret = -1;
+ goto out;
}
if (boot) {
@@ -953,7 +1549,7 @@ static int imagex_info(int argc, const char **argv)
}
}
if (new_name) {
- if (strcmp(wimlib_get_image_name(w, image),
+ if (strcmp(wimlib_get_image_name(w, image),
new_name) == 0) {
printf("Image %d is already named \"%s\".\n",
image, new_name);
@@ -963,7 +1559,7 @@ static int imagex_info(int argc, const char **argv)
"\"%s\".\n", image, new_name);
ret = wimlib_set_image_name(w, image, new_name);
if (ret != 0)
- goto done;
+ goto out;
}
}
if (new_desc) {
@@ -976,44 +1572,57 @@ static int imagex_info(int argc, const char **argv)
} else {
printf("Changing the description of image %d "
"to \"%s\".\n", image, new_desc);
- ret = wimlib_set_image_descripton(w, image,
+ ret = wimlib_set_image_descripton(w, image,
new_desc);
if (ret != 0)
- goto done;
+ goto out;
}
}
- /* Only call wimlib_overwrite_xml_and_header() if something
- * actually needs to be changed. */
- if (boot || new_name || new_desc ||
- check != wimlib_has_integrity_table(w)) {
+ /* Only call wimlib_overwrite() if something actually needs to
+ * be changed. */
+ if (boot || new_name || new_desc ||
+ (check && !wimlib_has_integrity_table(w)))
+ {
+ int write_flags;
+
+ ret = file_writable(wimfile);
+ if (ret != 0)
+ return ret;
+
+ if (check)
+ write_flags = WIMLIB_WRITE_FLAG_CHECK_INTEGRITY;
+ else
+ write_flags = 0;
- ret = wimlib_overwrite_xml_and_header(w, check ?
- WIMLIB_WRITE_FLAG_CHECK_INTEGRITY |
- WIMLIB_WRITE_FLAG_SHOW_PROGRESS : 0);
+ ret = wimlib_overwrite(w, write_flags, 1,
+ imagex_progress_func);
+ if (ret == WIMLIB_ERR_REOPEN)
+ ret = 0;
} else {
printf("The file `%s' was not modified because nothing "
- "needed to be done.\n", wimfile);
+ "needed to be done.\n", wimfile);
ret = 0;
}
}
-
-done:
+out:
wimlib_free(w);
return ret;
}
/* Join split WIMs into one part WIM */
-static int imagex_join(int argc, const char **argv)
+static int imagex_join(int argc, char **argv)
{
int c;
- int flags = WIMLIB_OPEN_FLAG_SPLIT_OK | WIMLIB_OPEN_FLAG_SHOW_PROGRESS;
+ int swm_open_flags = WIMLIB_OPEN_FLAG_SPLIT_OK;
+ int wim_write_flags = 0;
const char *output_path;
for_opt(c, join_options) {
switch (c) {
case 'c':
- flags |= WIMLIB_OPEN_FLAG_CHECK_INTEGRITY;
+ swm_open_flags |= WIMLIB_OPEN_FLAG_CHECK_INTEGRITY;
+ wim_write_flags |= WIMLIB_WRITE_FLAG_CHECK_INTEGRITY;
break;
default:
goto err;
@@ -1023,34 +1632,44 @@ static int imagex_join(int argc, const char **argv)
argv += optind;
if (argc < 2) {
- imagex_error("Must specify at least one split WIM (.swm) parts "
+ imagex_error("Must specify one or more split WIM (.swm) parts "
"to join");
goto err;
}
output_path = argv[0];
- return wimlib_join(++argv, --argc, output_path, flags);
+ return wimlib_join((const char **)++argv, --argc, output_path,
+ swm_open_flags, wim_write_flags,
+ imagex_progress_func);
err:
usage(JOIN);
return -1;
}
/* Mounts an image using a FUSE mount. */
-static int imagex_mount_rw_or_ro(int argc, const char **argv)
+static int imagex_mount_rw_or_ro(int argc, char **argv)
{
int c;
int mount_flags = 0;
- int open_flags = WIMLIB_OPEN_FLAG_SHOW_PROGRESS;
+ int open_flags = 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;
+ const char *staging_dir = NULL;
if (strcmp(argv[0], "mountrw") == 0)
mount_flags |= WIMLIB_MOUNT_FLAG_READWRITE;
+
for_opt(c, mount_options) {
switch (c) {
+ case 'A':
+ mount_flags |= WIMLIB_MOUNT_FLAG_ALLOW_OTHER;
+ break;
case 'c':
open_flags |= WIMLIB_OPEN_FLAG_CHECK_INTEGRITY;
break;
@@ -1069,6 +1688,15 @@ static int imagex_mount_rw_or_ro(int argc, const char **argv)
goto mount_usage;
}
break;
+ case 'r':
+ swm_glob = optarg;
+ break;
+ case 'D':
+ staging_dir = optarg;
+ break;
+ case 'U':
+ mount_flags |= WIMLIB_MOUNT_FLAG_UNIX_DATA;
+ break;
default:
goto mount_usage;
}
@@ -1080,57 +1708,152 @@ static int imagex_mount_rw_or_ro(int argc, const char **argv)
wimfile = argv[0];
- ret = wimlib_open_wim(wimfile, open_flags, &w);
+ ret = wimlib_open_wim(wimfile, open_flags, &w,
+ imagex_progress_func);
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);
if (num_images != 1) {
imagex_error("The file `%s' contains %d images; Please "
- "select one", wimfile, num_images);
- usage((mount_flags & WIMLIB_MOUNT_FLAG_READWRITE)
+ "select one.", wimfile, num_images);
+ usage((mount_flags & WIMLIB_MOUNT_FLAG_READWRITE)
? MOUNTRW : MOUNT);
- ret = WIMLIB_ERR_INVALID_IMAGE;
- goto done;
+ ret = -1;
+ goto out;
}
dir = argv[1];
} else {
image = wimlib_resolve_image(w, argv[1]);
dir = argv[2];
+ ret = verify_image_exists_and_is_single(image, argv[1], wimfile);
+ if (ret != 0)
+ goto out;
}
- ret = verify_image_exists_and_is_single(image);
- if (ret != 0)
- goto done;
+ if (mount_flags & WIMLIB_MOUNT_FLAG_READWRITE) {
+ ret = file_writable(wimfile);
+ if (ret != 0)
+ goto out;
+ }
- ret = wimlib_mount(w, image, dir, mount_flags);
+ ret = wimlib_mount_image(w, image, dir, mount_flags, additional_swms,
+ num_additional_swms, staging_dir);
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]);
+ free(additional_swms);
+ }
return ret;
mount_usage:
- usage((mount_flags & WIMLIB_MOUNT_FLAG_READWRITE)
+ usage((mount_flags & WIMLIB_MOUNT_FLAG_READWRITE)
? MOUNTRW : MOUNT);
return -1;
}
+static int imagex_optimize(int argc, char **argv)
+{
+ int c;
+ int open_flags = 0;
+ int write_flags = WIMLIB_WRITE_FLAG_REBUILD;
+ int ret;
+ WIMStruct *w;
+ const char *wimfile;
+ off_t old_size;
+ off_t new_size;
+
+ for_opt(c, optimize_options) {
+ switch (c) {
+ case 'c':
+ open_flags |= WIMLIB_OPEN_FLAG_CHECK_INTEGRITY;
+ write_flags |= WIMLIB_WRITE_FLAG_CHECK_INTEGRITY;
+ break;
+ case 'r':
+ write_flags |= WIMLIB_WRITE_FLAG_RECOMPRESS;
+ break;
+ default:
+ usage(OPTIMIZE);
+ return -1;
+ }
+ }
+ argc -= optind;
+ argv += optind;
+
+ if (argc != 1) {
+ usage(OPTIMIZE);
+ return -1;
+ }
+
+ wimfile = argv[0];
+
+ ret = wimlib_open_wim(wimfile, open_flags, &w,
+ imagex_progress_func);
+ if (ret != 0)
+ return ret;
+
+ old_size = file_get_size(argv[0]);
+ printf("`%s' original size: ", wimfile);
+ if (old_size == -1)
+ puts("Unknown");
+ else
+ printf("%"PRIu64" KiB\n", old_size >> 10);
+
+ ret = wimlib_overwrite(w, write_flags, 0, imagex_progress_func);
+
+ if (ret == 0) {
+ new_size = file_get_size(argv[0]);
+ printf("`%s' optimized size: ", wimfile);
+ if (new_size == -1)
+ puts("Unknown");
+ else
+ printf("%"PRIu64" KiB\n", new_size >> 10);
+
+ fputs("Space saved: ", stdout);
+ if (new_size != -1 && old_size != -1) {
+ printf("%lld KiB\n",
+ ((long long)old_size - (long long)new_size) >> 10);
+ } else {
+ puts("Unknown");
+ }
+ }
+
+ wimlib_free(w);
+ return ret;
+}
+
/* Split a WIM into a spanned set */
-static int imagex_split(int argc, const char **argv)
+static int imagex_split(int argc, char **argv)
{
int c;
- int flags = WIMLIB_OPEN_FLAG_SHOW_PROGRESS;
+ int open_flags = WIMLIB_OPEN_FLAG_SPLIT_OK;
+ int write_flags = 0;
unsigned long part_size;
+ char *tmp;
+ int ret;
+ WIMStruct *w;
for_opt(c, split_options) {
switch (c) {
case 'c':
- flags |= WIMLIB_OPEN_FLAG_CHECK_INTEGRITY;
+ open_flags |= WIMLIB_OPEN_FLAG_CHECK_INTEGRITY;
+ write_flags |= WIMLIB_WRITE_FLAG_CHECK_INTEGRITY;
break;
default:
usage(SPLIT);
@@ -1144,12 +1867,22 @@ static int imagex_split(int argc, const char **argv)
usage(SPLIT);
return -1;
}
- part_size = strtoul(argv[2], NULL, 10) * (1 << 20);
- return wimlib_split(argv[0], argv[1], part_size, flags);
+ part_size = strtod(argv[2], &tmp) * (1 << 20);
+ if (tmp == argv[2] || *tmp) {
+ imagex_error("Invalid part size \"%s\"", argv[2]);
+ imagex_error("The part size must be an integer or floating-point number of megabytes.");
+ return -1;
+ }
+ ret = wimlib_open_wim(argv[0], open_flags, &w, imagex_progress_func);
+ if (ret != 0)
+ return ret;
+ ret = wimlib_split(w, argv[1], part_size, write_flags, imagex_progress_func);
+ wimlib_free(w);
+ return ret;
}
/* Unmounts an image. */
-static int imagex_unmount(int argc, const char **argv)
+static int imagex_unmount(int argc, char **argv)
{
int c;
int unmount_flags = 0;
@@ -1163,6 +1896,9 @@ static int imagex_unmount(int argc, const char **argv)
case 'C':
unmount_flags |= WIMLIB_UNMOUNT_FLAG_CHECK_INTEGRITY;
break;
+ case 'R':
+ unmount_flags |= WIMLIB_UNMOUNT_FLAG_REBUILD;
+ break;
default:
usage(UNMOUNT);
return -1;
@@ -1175,7 +1911,8 @@ static int imagex_unmount(int argc, const char **argv)
return -1;
}
- ret = wimlib_unmount(argv[0], unmount_flags);
+ ret = wimlib_unmount_image(argv[0], unmount_flags,
+ imagex_progress_func);
if (ret != 0)
imagex_error("Failed to unmount `%s'", argv[0]);
return ret;
@@ -1183,33 +1920,49 @@ static int imagex_unmount(int argc, const char **argv)
struct imagex_command {
const char *name;
- int (*func)(int , const char **);
+ int (*func)(int , char **);
int cmd;
};
-static struct imagex_command imagex_commands[] = {
- {"append", imagex_append, APPEND},
- {"apply", imagex_apply, APPLY},
- {"capture", imagex_capture, CAPTURE},
- {"delete", imagex_delete, DELETE},
- {"dir", imagex_dir, DIR},
- {"export", imagex_export, EXPORT},
- {"info", imagex_info, INFO},
- {"join", imagex_join, JOIN},
- {"mount", imagex_mount_rw_or_ro, MOUNT},
- {"mountrw", imagex_mount_rw_or_ro, MOUNTRW},
- {"split", imagex_split, SPLIT},
- {"unmount", imagex_unmount, UNMOUNT},
-};
#define for_imagex_command(p) for (p = &imagex_commands[0]; \
p != &imagex_commands[ARRAY_LEN(imagex_commands)]; p++)
-static void help_or_version(int argc, const char **argv)
+static const struct imagex_command imagex_commands[] = {
+ {"append", imagex_capture_or_append, APPEND},
+ {"apply", imagex_apply, APPLY},
+ {"capture", imagex_capture_or_append, CAPTURE},
+ {"delete", imagex_delete, DELETE},
+ {"dir", imagex_dir, DIR},
+ {"export", imagex_export, EXPORT},
+ {"info", imagex_info, INFO},
+ {"join", imagex_join, JOIN},
+ {"mount", imagex_mount_rw_or_ro, MOUNT},
+ {"mountrw", imagex_mount_rw_or_ro, MOUNTRW},
+ {"optimize",imagex_optimize, OPTIMIZE},
+ {"split", imagex_split, SPLIT},
+ {"unmount", imagex_unmount, UNMOUNT},
+};
+
+static void version()
+{
+ static const char *s =
+ "imagex (" PACKAGE ") " PACKAGE_VERSION "\n"
+ "Copyright (C) 2012, 2013 Eric Biggers\n"
+ "License GPLv3+; GNU GPL version 3 or later .\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, char **argv)
{
int i;
const char *p;
- struct imagex_command *cmd;
+ const struct imagex_command *cmd;
for (i = 1; i < argc; i++) {
p = argv[i];
@@ -1219,7 +1972,7 @@ static void help_or_version(int argc, const char **argv)
continue;
if (*p == '-')
p++;
- if (strcmp(p, "help") == 0 || (*p == '?' && *(p + 1) == '\0')) {
+ if (strcmp(p, "help") == 0) {
for_imagex_command(cmd) {
if (strcmp(cmd->name, argv[1]) == 0) {
usage(cmd->cmd);
@@ -1237,9 +1990,37 @@ static void help_or_version(int argc, const char **argv)
}
-int main(int argc, const char **argv)
+static void usage(int cmd_type)
+{
+ const struct imagex_command *cmd;
+ printf("Usage: %s", usage_strings[cmd_type]);
+ 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++)
+ printf(" %s", usage_strings[i]);
+ 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, char **argv)
{
- struct imagex_command *cmd;
+ const struct imagex_command *cmd;
int ret;
if (argc < 2) {
@@ -1253,27 +2034,28 @@ int main(int argc, const char **argv)
argv++;
wimlib_set_print_errors(true);
+ ret = wimlib_global_init();
+ if (ret)
+ goto out;
for_imagex_command(cmd) {
if (strcmp(cmd->name, *argv) == 0) {
ret = cmd->func(argc, argv);
- if (ret > 0) {
- imagex_error("Exiting with error code %d:\n"
- " %s.", ret,
- wimlib_get_error_string(ret));
- }
- return ret;
+ goto out;
}
}
imagex_error("Unrecognized command: `%s'", argv[0]);
usage_all();
return 1;
+out:
+ if (ret > 0) {
+ imagex_error("Exiting with error code %d:\n"
+ " %s.", ret,
+ wimlib_get_error_string(ret));
+ if (ret == WIMLIB_ERR_NTFS_3G && errno != 0)
+ imagex_error_with_errno("errno");
+ }
+ wimlib_global_cleanup();
+ return ret;
}
-/*#ifndef WITH_NTFS_3G*/
- /*ERROR("wimlib was not compiled with support for NTFS-3g, so we cannot extract");*/
- /*ERROR("a WIM to a NTFS filesystem while preserving NTFS-specific metadata.");*/
- /*ERROR("Please apply the WIM to a directory rather than a block device, ");*/
- /*ERROR("and without the NTFS flag; or compile in support for NTFS-3g.");*/
- /*return WIMLIB_ERR_UNSUPPORTED;*/
-/*#endif*/