X-Git-Url: https://wimlib.net/git/?p=wimlib;a=blobdiff_plain;f=programs%2Fimagex.c;h=59335996c57b7bf9a9d3950d7ef61dc073be59e6;hp=58c969ebcaf722252f9b7979a021c430077f224a;hb=f11131e8a6b03d6b076dcefdfbdaa3ba9fd17a39;hpb=640fa284ff84f55b73dc06b25bd5b32e3e38a8b8 diff --git a/programs/imagex.c b/programs/imagex.c index 58c969eb..59335996 100644 --- a/programs/imagex.c +++ b/programs/imagex.c @@ -23,8 +23,8 @@ */ #include "config.h" -#include "wimlib_tchar.h" #include "wimlib.h" +#include "wimlib_tchar.h" #include #include @@ -68,6 +68,7 @@ enum imagex_op_type { DELETE, DIR, EXPORT, + EXTRACT, INFO, JOIN, MOUNT, @@ -80,6 +81,8 @@ enum imagex_op_type { static void usage(int cmd_type); static void usage_all(); +static bool imagex_be_quiet = false; + static const tchar *usage_strings[] = { [APPEND] = @@ -89,13 +92,14 @@ IMAGEX_PROGNAME" append (DIRECTORY | NTFS_VOLUME) WIMFILE [IMAGE_NAME]\n" " [--verbose] [--dereference] [--config=FILE]\n" " [--threads=NUM_THREADS] [--rebuild] [--unix-data]\n" " [--source-list] [--no-acls] [--strict-acls]\n" +" [--rpfix] [--norpfix]\n" ), [APPLY] = T( IMAGEX_PROGNAME" apply WIMFILE [IMAGE_NUM | IMAGE_NAME | all]\n" " (DIRECTORY | NTFS_VOLUME) [--check] [--hardlink]\n" " [--symlink] [--verbose] [--ref=\"GLOB\"] [--unix-data]\n" -" [--no-acls] [--strict-acls]\n" +" [--no-acls] [--strict-acls] [--rpfix] [--norpfix]\n" ), [CAPTURE] = T( @@ -104,6 +108,7 @@ IMAGEX_PROGNAME" capture (DIRECTORY | NTFS_VOLUME) WIMFILE [IMAGE_NAME]\n" " [--flags EDITION_ID] [--verbose] [--dereference]\n" " [--config=FILE] [--threads=NUM_THREADS] [--unix-data]\n" " [--source-list] [--no-acls] [--strict-acls]\n" +" [--rpfix] [--norpfix]\n" ), [DELETE] = T( @@ -120,6 +125,12 @@ IMAGEX_PROGNAME" export SRC_WIMFILE (SRC_IMAGE_NUM | SRC_IMAGE_NAME | all ) \n" " [--boot] [--check] [--compress=TYPE] [--ref=\"GLOB\"]\n" " [--threads=NUM_THREADS] [--rebuild]\n" ), +[EXTRACT] = +T( +IMAGEX_PROGNAME" extract WIMFILE (IMAGE_NUM | IMAGE_NAME) [PATH...]\n" +" [--check] [--ref=\"GLOB\"] [--verbose] [--unix-data]\n" +" [--no-acls] [--strict-acls] [--to-stdout] [--dest-dir=DIR]\n" +), [INFO] = T( IMAGEX_PROGNAME" info WIMFILE [IMAGE_NUM | IMAGE_NAME] [NEW_NAME]\n" @@ -145,6 +156,7 @@ IMAGEX_PROGNAME" mountrw WIMFILE [IMAGE_NUM | IMAGE_NAME] DIRECTORY\n" [OPTIMIZE] = T( IMAGEX_PROGNAME" optimize WIMFILE [--check] [--recompress]\n" +" [--threads=NUM_THREADS]\n" ), [SPLIT] = T( @@ -165,16 +177,19 @@ enum { IMAGEX_CONFIG_OPTION, IMAGEX_DEBUG_OPTION, IMAGEX_DEREFERENCE_OPTION, + IMAGEX_DEST_DIR_OPTION, IMAGEX_EXTRACT_XML_OPTION, IMAGEX_FLAGS_OPTION, IMAGEX_HARDLINK_OPTION, IMAGEX_HEADER_OPTION, IMAGEX_LOOKUP_TABLE_OPTION, IMAGEX_METADATA_OPTION, + IMAGEX_NORPFIX_OPTION, IMAGEX_NO_ACLS_OPTION, IMAGEX_REBULID_OPTION, IMAGEX_RECOMPRESS_OPTION, IMAGEX_REF_OPTION, + IMAGEX_RPFIX_OPTION, IMAGEX_SOFT_OPTION, IMAGEX_SOURCE_LIST_OPTION, IMAGEX_STAGING_DIR_OPTION, @@ -182,6 +197,7 @@ enum { IMAGEX_STRICT_ACLS_OPTION, IMAGEX_SYMLINK_OPTION, IMAGEX_THREADS_OPTION, + IMAGEX_TO_STDOUT_OPTION, IMAGEX_UNIX_DATA_OPTION, IMAGEX_VERBOSE_OPTION, IMAGEX_XML_OPTION, @@ -197,6 +213,8 @@ static const struct option apply_options[] = { {T("noacls"), no_argument, NULL, IMAGEX_NO_ACLS_OPTION}, {T("no-acls"), no_argument, NULL, IMAGEX_NO_ACLS_OPTION}, {T("strict-acls"), no_argument, NULL, IMAGEX_STRICT_ACLS_OPTION}, + {T("rpfix"), no_argument, NULL, IMAGEX_RPFIX_OPTION}, + {T("norpfix"), no_argument, NULL, IMAGEX_NORPFIX_OPTION}, {NULL, 0, NULL, 0}, }; static const struct option capture_or_append_options[] = { @@ -214,6 +232,8 @@ static const struct option capture_or_append_options[] = { {T("noacls"), no_argument, NULL, IMAGEX_NO_ACLS_OPTION}, {T("no-acls"), no_argument, NULL, IMAGEX_NO_ACLS_OPTION}, {T("strict-acls"), no_argument, NULL, IMAGEX_STRICT_ACLS_OPTION}, + {T("rpfix"), no_argument, NULL, IMAGEX_RPFIX_OPTION}, + {T("norpfix"), no_argument, NULL, IMAGEX_NORPFIX_OPTION}, {NULL, 0, NULL, 0}, }; static const struct option delete_options[] = { @@ -232,6 +252,19 @@ static const struct option export_options[] = { {NULL, 0, NULL, 0}, }; +static const struct option extract_options[] = { + {T("check"), no_argument, NULL, IMAGEX_CHECK_OPTION}, + {T("verbose"), no_argument, NULL, IMAGEX_VERBOSE_OPTION}, + {T("ref"), required_argument, NULL, IMAGEX_REF_OPTION}, + {T("unix-data"), no_argument, NULL, IMAGEX_UNIX_DATA_OPTION}, + {T("noacls"), no_argument, NULL, IMAGEX_NO_ACLS_OPTION}, + {T("no-acls"), no_argument, NULL, IMAGEX_NO_ACLS_OPTION}, + {T("strict-acls"), no_argument, NULL, IMAGEX_STRICT_ACLS_OPTION}, + {T("dest-dir"), required_argument, NULL, IMAGEX_DEST_DIR_OPTION}, + {T("to-stdout"), no_argument, NULL, IMAGEX_TO_STDOUT_OPTION}, + {NULL, 0, NULL, 0}, +}; + static const struct option info_options[] = { {T("boot"), no_argument, NULL, IMAGEX_BOOT_OPTION}, {T("check"), no_argument, NULL, IMAGEX_CHECK_OPTION}, @@ -262,6 +295,7 @@ static const struct option mount_options[] = { static const struct option optimize_options[] = { {T("check"), no_argument, NULL, IMAGEX_CHECK_OPTION}, {T("recompress"), no_argument, NULL, IMAGEX_RECOMPRESS_OPTION}, + {T("threads"), required_argument, NULL, IMAGEX_THREADS_OPTION}, {NULL, 0, NULL, 0}, }; @@ -369,16 +403,28 @@ file_get_size(const tchar *filename) return (off_t)-1; } -static const tchar *default_capture_config = -T( -"[ExclusionList]\n" -"\\$ntfs.log\n" -"\\hiberfil.sys\n" -"\\pagefile.sys\n" -"\\System Volume Information\n" -"\\RECYCLER\n" -"\\Windows\\CSC\n" -); +tchar pat_ntfs_log[] = T("/$ntfs.log"); +tchar pat_hiberfil_sys[] = T("/hiberfil.sys"); +tchar pat_pagefile_sys[] = T("/pagefile.sys"); +tchar pat_system_volume_information[] = T("/System Volume Information"); +tchar pat_recycler[] = T("/RECYCLER"); +tchar pat_windows_csc[] = T("/Windows/CSC"); + +tchar *default_pats[] = { + pat_ntfs_log, + pat_hiberfil_sys, + pat_pagefile_sys, + pat_system_volume_information, + pat_recycler, + pat_windows_csc, +}; + +static struct wimlib_capture_config default_capture_config = { + .exclusion_pats = { + .num_pats = sizeof(default_pats) / sizeof(*default_pats), + .pats = default_pats, + }, +}; enum { PARSE_FILENAME_SUCCESS = 0, @@ -499,6 +545,34 @@ is_comment_line(const tchar *line, size_t len) } } +static ssize_t +text_file_count_lines(tchar **contents_p, size_t *nchars_p) +{ + ssize_t nlines = 0; + tchar *contents = *contents_p; + size_t nchars = *nchars_p; + size_t i; + + for (i = 0; i < nchars; i++) + if (contents[i] == T('\n')) + nlines++; + + /* Handle last line not terminated by a newline */ + if (nchars != 0 && contents[nchars - 1] != T('\n')) { + contents = realloc(contents, (nchars + 1) * sizeof(tchar)); + if (!contents) { + imagex_error(T("Out of memory!")); + return -1; + } + contents[nchars] = T('\n'); + *contents_p = contents; + nchars++; + nlines++; + } + *nchars_p = nchars; + return nlines; +} + /* Parses a file in the source list format. (See the man page for * 'wimlib-imagex capture' for details on this format and the meaning.) * @@ -520,37 +594,24 @@ static struct wimlib_capture_source * parse_source_list(tchar **source_list_contents_p, size_t source_list_nchars, size_t *nsources_ret) { - size_t nlines; + ssize_t nlines; tchar *p; struct wimlib_capture_source *sources; size_t i, j; - tchar *source_list_contents = *source_list_contents_p; - - nlines = 0; - for (i = 0; i < source_list_nchars; i++) - if (source_list_contents[i] == T('\n')) - nlines++; - /* Handle last line not terminated by a newline */ - if (source_list_nchars != 0 && - source_list_contents[source_list_nchars - 1] != T('\n')) - { - source_list_contents = realloc(source_list_contents, - (source_list_nchars + 1) * sizeof(tchar)); - if (!source_list_contents) - goto oom; - source_list_contents[source_list_nchars] = T('\n'); - *source_list_contents_p = source_list_contents; - source_list_nchars++; - nlines++; - } + nlines = text_file_count_lines(source_list_contents_p, + &source_list_nchars); + if (nlines < 0) + return NULL; /* Always allocate at least 1 slot, just in case the implementation of * calloc() returns NULL if 0 bytes are requested. */ sources = calloc(nlines ?: 1, sizeof(*sources)); - if (!sources) - goto oom; - p = source_list_contents; + if (!sources) { + imagex_error(T("out of memory")); + return NULL; + } + p = *source_list_contents_p; j = 0; for (i = 0; i < nlines; i++) { /* XXX: Could use rawmemchr() here instead, but it may not be @@ -569,9 +630,144 @@ parse_source_list(tchar **source_list_contents_p, size_t source_list_nchars, } *nsources_ret = j; return sources; -oom: - imagex_error(T("out of memory")); - return NULL; +} + + +enum capture_config_section { + CAPTURE_CONFIG_NO_SECTION, + CAPTURE_CONFIG_EXCLUSION_SECTION, + CAPTURE_CONFIG_EXCLUSION_EXCEPTION_SECTION, + CAPTURE_CONFIG_IGNORE_SECTION, +}; + +enum { + CAPTURE_CONFIG_INVALID_SECTION, + CAPTURE_CONFIG_CHANGED_SECTION, + CAPTURE_CONFIG_SAME_SECTION, +}; + +static int +check_config_section(tchar *line, size_t len, + enum capture_config_section *cur_section) +{ + while (istspace(*line)) + line++; + + if (*line != T('[')) + return CAPTURE_CONFIG_SAME_SECTION; + + line++; + tchar *endbrace = tstrrchr(line, T(']')); + if (!endbrace) + return CAPTURE_CONFIG_SAME_SECTION; + + if (!tmemcmp(line, T("ExclusionList"), endbrace - line)) { + *cur_section = CAPTURE_CONFIG_EXCLUSION_SECTION; + } else if (!tmemcmp(line, T("ExclusionException"), endbrace - line)) { + *cur_section = CAPTURE_CONFIG_EXCLUSION_EXCEPTION_SECTION; + } else if (!tmemcmp(line, T("CompressionExclusionList"), endbrace - line)) { + *cur_section = CAPTURE_CONFIG_IGNORE_SECTION; + tfputs(T("WARNING: Ignoring [CompressionExclusionList] section " + "of capture config file\n"), + stderr); + } else if (!tmemcmp(line, T("AlignmentList"), endbrace - line)) { + *cur_section = CAPTURE_CONFIG_IGNORE_SECTION; + tfputs(T("WARNING: Ignoring [AlignmentList] section " + "of capture config file\n"), + stderr); + } else { + imagex_error(T("Invalid capture config file section \"%"TS"\""), + line - 1); + return CAPTURE_CONFIG_INVALID_SECTION; + } + return CAPTURE_CONFIG_CHANGED_SECTION; +} + + +static bool +pattern_list_add_pattern(struct wimlib_pattern_list *pat_list, + tchar *pat) +{ + if (pat_list->num_pats == pat_list->num_allocated_pats) { + tchar **pats; + size_t num_allocated_pats = pat_list->num_pats + 8; + + pats = realloc(pat_list->pats, + num_allocated_pats * sizeof(pat_list->pats[0])); + if (!pats) { + imagex_error(T("Out of memory!")); + return false; + } + pat_list->pats = pats; + pat_list->num_allocated_pats = num_allocated_pats; + } + pat_list->pats[pat_list->num_pats++] = pat; + return true; +} + +static bool +parse_capture_config_line(tchar *line, size_t len, + enum capture_config_section *cur_section, + struct wimlib_capture_config *config) +{ + tchar *filename; + int ret; + + ret = check_config_section(line, len, cur_section); + if (ret == CAPTURE_CONFIG_INVALID_SECTION) + return false; + if (ret == CAPTURE_CONFIG_CHANGED_SECTION) + return true; + + switch (*cur_section) { + case CAPTURE_CONFIG_NO_SECTION: + imagex_error(T("Line \"%"TS"\" is not in a section " + "(such as [ExclusionList]"), line); + return false; + case CAPTURE_CONFIG_EXCLUSION_SECTION: + if (parse_filename(&line, &len, &filename) != PARSE_FILENAME_SUCCESS) + return false; + return pattern_list_add_pattern(&config->exclusion_pats, + filename); + case CAPTURE_CONFIG_EXCLUSION_EXCEPTION_SECTION: + if (parse_filename(&line, &len, &filename) != PARSE_FILENAME_SUCCESS) + return false; + return pattern_list_add_pattern(&config->exclusion_exception_pats, + filename); + case CAPTURE_CONFIG_IGNORE_SECTION: + return true; + } + return false; +} + +static int +parse_capture_config(tchar **contents_p, size_t nchars, + struct wimlib_capture_config *config) +{ + ssize_t nlines; + tchar *p; + size_t i; + enum capture_config_section cur_section; + + memset(config, 0, sizeof(*config)); + + nlines = text_file_count_lines(contents_p, &nchars); + if (nlines < 0) + return -1; + + cur_section = CAPTURE_CONFIG_NO_SECTION; + p = *contents_p; + for (i = 0; i < nlines; i++) { + tchar *endp = tmemchr(p, T('\n'), nchars); + size_t len = endp - p + 1; + *endp = T('\0'); + if (!is_comment_line(p, len)) + if (!parse_capture_config_line(p, len, &cur_section, config)) + return -1; + p = endp + 1; + + } + return 0; } /* Reads the contents of a file into memory. */ @@ -758,6 +954,8 @@ imagex_progress_func(enum wimlib_progress_msg msg, const union wimlib_progress_info *info) { unsigned percent_done; + if (imagex_be_quiet) + return 0; switch (msg) { case WIMLIB_PROGRESS_MSG_WRITE_STREAMS: percent_done = TO_PERCENT(info->write_streams.completed_bytes, @@ -819,7 +1017,7 @@ imagex_progress_func(enum wimlib_progress_msg msg, tputchar(T('\n')); break; case WIMLIB_PROGRESS_MSG_EXTRACT_IMAGE_BEGIN: - tprintf(T("Applying image %d (%"TS") from \"%"TS"\" " + tprintf(T("Applying image %d (\"%"TS"\") from \"%"TS"\" " "to %"TS" \"%"TS"\"\n"), info->extract.image, info->extract.image_name, @@ -828,6 +1026,15 @@ imagex_progress_func(enum wimlib_progress_msg msg, T("NTFS volume") : T("directory")), info->extract.target); break; + case WIMLIB_PROGRESS_MSG_EXTRACT_TREE_BEGIN: + tprintf(T("Extracting \"%"TS"\" from image %d (\"%"TS"\") " + "in \"%"TS"\" to \"%"TS"\"\n"), + info->extract.extract_root_wim_source_path, + info->extract.image, + info->extract.image_name, + info->extract.wimfile_name, + info->extract.target); + break; /*case WIMLIB_PROGRESS_MSG_EXTRACT_DIR_STRUCTURE_BEGIN:*/ /*tprintf(T("Applying directory structure to %"TS"\n"),*/ /*info->extract.target);*/ @@ -847,7 +1054,8 @@ imagex_progress_func(enum wimlib_progress_msg msg, tprintf(T("%"TS"\n"), info->extract.cur_path); break; case WIMLIB_PROGRESS_MSG_APPLY_TIMESTAMPS: - tprintf(T("Setting timestamps on all extracted files...\n")); + if (info->extract.extract_root_wim_source_path[0] == T('\0')) + tprintf(T("Setting timestamps on all extracted files...\n")); break; case WIMLIB_PROGRESS_MSG_EXTRACT_IMAGE_END: if (info->extract.extract_flags & WIMLIB_EXTRACT_FLAG_NTFS) { @@ -1014,6 +1222,12 @@ imagex_apply(int argc, tchar **argv) case IMAGEX_STRICT_ACLS_OPTION: extract_flags |= WIMLIB_EXTRACT_FLAG_STRICT_ACLS; break; + case IMAGEX_NORPFIX_OPTION: + extract_flags |= WIMLIB_EXTRACT_FLAG_NORPFIX; + break; + case IMAGEX_RPFIX_OPTION: + extract_flags |= WIMLIB_EXTRACT_FLAG_RPFIX; + break; default: usage(APPLY); return -1; @@ -1106,14 +1320,14 @@ imagex_capture_or_append(int argc, tchar **argv) { int c; int open_flags = 0; - int add_image_flags = 0; + int add_image_flags = WIMLIB_ADD_IMAGE_FLAG_EXCLUDE_VERBOSE; int write_flags = 0; int compression_type = WIMLIB_COMPRESSION_TYPE_XPRESS; const tchar *wimfile; const tchar *name; const tchar *desc; const tchar *flags_element = NULL; - WIMStruct *w = NULL; + WIMStruct *w; int ret; int cur_image; int cmd = tstrcmp(argv[0], T("append")) ? CAPTURE : APPEND; @@ -1124,13 +1338,13 @@ imagex_capture_or_append(int argc, tchar **argv) tchar *source_copy; const tchar *config_file = NULL; - tchar *config_str = NULL; - size_t config_len; + tchar *config_str; + struct wimlib_capture_config *config = NULL; bool source_list = false; size_t source_list_nchars; - tchar *source_list_contents = NULL; - bool capture_sources_malloced = false; + tchar *source_list_contents; + bool capture_sources_malloced; struct wimlib_capture_source *capture_sources; size_t num_sources; @@ -1180,6 +1394,12 @@ imagex_capture_or_append(int argc, tchar **argv) case IMAGEX_STRICT_ACLS_OPTION: add_image_flags |= WIMLIB_ADD_IMAGE_FLAG_STRICT_ACLS; break; + case IMAGEX_RPFIX_OPTION: + add_image_flags |= WIMLIB_ADD_IMAGE_FLAG_RPFIX; + break; + case IMAGEX_NORPFIX_OPTION: + add_image_flags |= WIMLIB_ADD_IMAGE_FLAG_NORPFIX; + break; default: usage(cmd); return -1; @@ -1225,7 +1445,7 @@ imagex_capture_or_append(int argc, tchar **argv) &num_sources); if (!capture_sources) { ret = -1; - goto out; + goto out_free_source_list_contents; } capture_sources_malloced = true; } else { @@ -1236,14 +1456,25 @@ imagex_capture_or_append(int argc, tchar **argv) capture_sources[0].wim_target_path = NULL; capture_sources[0].reserved = 0; num_sources = 1; + capture_sources_malloced = false; + source_list_contents = NULL; } if (config_file) { + size_t config_len; + config_str = file_get_text_contents(config_file, &config_len); if (!config_str) { ret = -1; - goto out; + goto out_free_capture_sources; } + + config = alloca(sizeof(*config)); + ret = parse_capture_config(&config_str, config_len, config); + if (ret) + goto out_free_config; + } else { + config = &default_capture_config; } if (cmd == APPEND) @@ -1251,8 +1482,8 @@ imagex_capture_or_append(int argc, tchar **argv) imagex_progress_func); else ret = wimlib_create_new_wim(compression_type, &w); - if (ret != 0) - goto out; + if (ret) + goto out_free_config; if (!source_list) { struct stat stbuf; @@ -1268,7 +1499,7 @@ imagex_capture_or_append(int argc, tchar **argv) imagex_error_with_errno(T("Failed to stat " "\"%"TS"\""), source); ret = -1; - goto out; + goto out_wimlib_free; } } } @@ -1276,12 +1507,11 @@ imagex_capture_or_append(int argc, tchar **argv) win32_acquire_capture_privileges(); #endif - ret = wimlib_add_image_multisource(w, capture_sources, - num_sources, name, - (config_str ? config_str : - default_capture_config), - (config_str ? config_len : - tstrlen(default_capture_config)), + ret = wimlib_add_image_multisource(w, + capture_sources, + num_sources, + name, + config, add_image_flags, imagex_progress_func); if (ret != 0) @@ -1313,12 +1543,19 @@ out_release_privs: #ifdef __WIN32__ win32_release_capture_privileges(); #endif -out: +out_wimlib_free: wimlib_free(w); - free(config_str); - free(source_list_contents); +out_free_config: + if (config != NULL && config != &default_capture_config) { + free(config->exclusion_pats.pats); + free(config->exclusion_exception_pats.pats); + free(config_str); + } +out_free_capture_sources: if (capture_sources_malloced) free(capture_sources); +out_free_source_list_contents: + free(source_list_contents); return ret; } @@ -1614,6 +1851,190 @@ out: return ret; } +static bool +is_root_wim_path(const tchar *path) +{ + const tchar *p; + for (p = path; *p; p++) + if (*p != T('\\') && *p != T('/')) + return false; + return true; +} + +static void +free_extract_commands(struct wimlib_extract_command *cmds, size_t num_cmds, + const tchar *dest_dir) +{ + for (size_t i = 0; i < num_cmds; i++) + if (cmds[i].fs_dest_path != dest_dir) + free(cmds[i].fs_dest_path); + free(cmds); +} + +static struct wimlib_extract_command * +prepare_extract_commands(tchar **argv, int argc, int extract_flags, + tchar *dest_dir, size_t *num_cmds_ret) +{ + struct wimlib_extract_command *cmds; + size_t num_cmds; + tchar *emptystr = T(""); + + if (argc == 0) { + argc = 1; + argv = &emptystr; + } + num_cmds = argc; + cmds = calloc(num_cmds, sizeof(cmds[0])); + if (!cmds) { + imagex_error(T("Out of memory!")); + return NULL; + } + + for (size_t i = 0; i < num_cmds; i++) { + cmds[i].extract_flags = extract_flags; + cmds[i].wim_source_path = argv[i]; + if (is_root_wim_path(argv[i])) { + cmds[i].fs_dest_path = dest_dir; + } else { + size_t len = tstrlen(dest_dir) + 1 + tstrlen(argv[i]); + cmds[i].fs_dest_path = malloc((len + 1) * sizeof(tchar)); + if (!cmds[i].fs_dest_path) { + free_extract_commands(cmds, num_cmds, dest_dir); + return NULL; + } + tsprintf(cmds[i].fs_dest_path, T("%"TS"/%"TS), dest_dir, + tbasename(argv[i])); + } + } + *num_cmds_ret = num_cmds; + return cmds; +} + +/* Extract files or directories from a WIM image */ +static int +imagex_extract(int argc, tchar **argv) +{ + int c; + int open_flags = WIMLIB_OPEN_FLAG_SPLIT_OK; + int image; + WIMStruct *wim; + int ret; + const tchar *wimfile; + const tchar *image_num_or_name; + tchar *dest_dir = T("."); + int extract_flags = WIMLIB_EXTRACT_FLAG_SEQUENTIAL | WIMLIB_EXTRACT_FLAG_NORPFIX; + + const tchar *swm_glob = NULL; + WIMStruct **additional_swms = NULL; + unsigned num_additional_swms = 0; + + struct wimlib_extract_command *cmds; + size_t num_cmds; + + for_opt(c, extract_options) { + switch (c) { + case IMAGEX_CHECK_OPTION: + open_flags |= WIMLIB_OPEN_FLAG_CHECK_INTEGRITY; + break; + case IMAGEX_VERBOSE_OPTION: + extract_flags |= WIMLIB_EXTRACT_FLAG_VERBOSE; + break; + case IMAGEX_REF_OPTION: + swm_glob = optarg; + break; + case IMAGEX_UNIX_DATA_OPTION: + extract_flags |= WIMLIB_EXTRACT_FLAG_UNIX_DATA; + break; + case IMAGEX_NO_ACLS_OPTION: + extract_flags |= WIMLIB_EXTRACT_FLAG_NO_ACLS; + break; + case IMAGEX_STRICT_ACLS_OPTION: + extract_flags |= WIMLIB_EXTRACT_FLAG_STRICT_ACLS; + break; + case IMAGEX_DEST_DIR_OPTION: + dest_dir = optarg; + break; + case IMAGEX_TO_STDOUT_OPTION: + extract_flags |= WIMLIB_EXTRACT_FLAG_TO_STDOUT; + imagex_be_quiet = true; + break; + default: + usage(EXTRACT); + ret = -1; + goto out; + } + } + argc -= optind; + argv += optind; + + if (argc < 2) { + usage(EXTRACT); + ret = -1; + goto out; + } + wimfile = argv[0]; + image_num_or_name = argv[1]; + + argc -= 2; + argv += 2; + + cmds = prepare_extract_commands(argv, argc, extract_flags, dest_dir, + &num_cmds); + if (!cmds) { + ret = -1; + goto out; + } + + ret = wimlib_open_wim(wimfile, open_flags, &wim, imagex_progress_func); + if (ret) + goto out_free_cmds; + + image = wimlib_resolve_image(wim, image_num_or_name); + ret = verify_image_exists_and_is_single(image, + image_num_or_name, + wimfile); + if (ret) + goto out_wimlib_free; + + if (swm_glob) { + ret = open_swms_from_glob(swm_glob, wimfile, open_flags, + &additional_swms, + &num_additional_swms); + if (ret) + goto out_wimlib_free; + } + +#ifdef __WIN32__ + win32_acquire_restore_privileges(); +#endif + + ret = wimlib_extract_files(wim, image, 0, cmds, num_cmds, + additional_swms, num_additional_swms, + imagex_progress_func); + if (ret == 0) { + if (!imagex_be_quiet) + tprintf(T("Done extracting files.\n")); + } else if (ret == WIMLIB_ERR_PATH_DOES_NOT_EXIST) { + tfprintf(stderr, T("Note: You can use `"IMAGEX_PROGNAME" dir' to see what " + "files and directories\n" + " are in the WIM image.\n")); + } +#ifdef __WIN32__ + win32_release_restore_privileges(); +#endif + if (additional_swms) { + for (unsigned i = 0; i < num_additional_swms; i++) + wimlib_free(additional_swms[i]); + free(additional_swms); + } +out_wimlib_free: + wimlib_free(wim); +out_free_cmds: + free_extract_commands(cmds, num_cmds, dest_dir); +out: + 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 @@ -1876,7 +2297,7 @@ imagex_info(int argc, tchar **argv) ret = file_writable(wimfile); if (ret != 0) - return ret; + goto out; if (check) write_flags = WIMLIB_WRITE_FLAG_CHECK_INTEGRITY; @@ -2075,6 +2496,7 @@ imagex_optimize(int argc, tchar **argv) const tchar *wimfile; off_t old_size; off_t new_size; + unsigned num_threads = 0; for_opt(c, optimize_options) { switch (c) { @@ -2085,6 +2507,11 @@ imagex_optimize(int argc, tchar **argv) case IMAGEX_RECOMPRESS_OPTION: write_flags |= WIMLIB_WRITE_FLAG_RECOMPRESS; break; + case IMAGEX_THREADS_OPTION: + num_threads = parse_num_threads(optarg); + if (num_threads == UINT_MAX) + return -1; + break; default: usage(OPTIMIZE); return -1; @@ -2112,7 +2539,8 @@ imagex_optimize(int argc, tchar **argv) else tprintf(T("%"PRIu64" KiB\n"), old_size >> 10); - ret = wimlib_overwrite(w, write_flags, 0, imagex_progress_func); + ret = wimlib_overwrite(w, write_flags, num_threads, + imagex_progress_func); if (ret == 0) { new_size = file_get_size(argv[0]); @@ -2235,6 +2663,7 @@ static const struct imagex_command imagex_commands[] = { {T("delete"), imagex_delete, DELETE}, {T("dir"), imagex_dir, DIR}, {T("export"), imagex_export, EXPORT}, + {T("extract"), imagex_extract, EXTRACT}, {T("info"), imagex_info, INFO}, {T("join"), imagex_join, JOIN}, {T("mount"), imagex_mount_rw_or_ro, MOUNT}, @@ -2338,11 +2767,16 @@ main(int argc, char **argv) { const struct imagex_command *cmd; int ret; + int init_flags = 0; #ifndef __WIN32__ - setlocale(LC_ALL, ""); - { - char *codeset = nl_langinfo(CODESET); + if (getenv("WIMLIB_IMAGEX_USE_UTF8")) { + init_flags |= WIMLIB_INIT_FLAG_ASSUME_UTF8; + } else { + char *codeset; + + setlocale(LC_ALL, ""); + codeset = nl_langinfo(CODESET); if (!strstr(codeset, "UTF-8") && !strstr(codeset, "UTF8") && !strstr(codeset, "utf-8") && @@ -2350,7 +2784,10 @@ main(int argc, char **argv) { fputs( "WARNING: Running "IMAGEX_PROGNAME" in a UTF-8 locale is recommended!\n" -" (Maybe try: `export LANG=en_US.UTF-8'?\n", stderr); +" Maybe try: `export LANG=en_US.UTF-8'?\n" +" Alternatively, set the environmental variable WIMLIB_IMAGEX_USE_UTF8\n" +" to any value to force wimlib to use UTF-8.\n", + stderr); } } @@ -2373,7 +2810,7 @@ main(int argc, char **argv) wimlib_set_print_errors(true); /* Do any initializations that the library needs */ - ret = wimlib_global_init(); + ret = wimlib_global_init(init_flags); if (ret) goto out_check_status;