X-Git-Url: https://wimlib.net/git/?p=wimlib;a=blobdiff_plain;f=programs%2Fimagex.c;h=06ddeddd4060730ad083fcff690629d413583ffe;hp=788ba90483fc2cbf8ec627622a15b7382f874e98;hb=84aa21bf2722d14eff30fac2ec4904ed2ed6de52;hpb=3f10159fec6c397ed4d182a25a1aa5b3147101cf diff --git a/programs/imagex.c b/programs/imagex.c index 788ba904..06ddeddd 100644 --- a/programs/imagex.c +++ b/programs/imagex.c @@ -49,7 +49,6 @@ #ifdef __WIN32__ # include "imagex-win32.h" # define tbasename win32_wbasename -# define tglob win32_wglob # define OS_PREFERRED_PATH_SEPARATOR L'\\' # define OS_PREFERRED_PATH_SEPARATOR_STRING L"\\" #else /* __WIN32__ */ @@ -57,7 +56,6 @@ # include # include # define tbasename basename -# define tglob glob # define OS_PREFERRED_PATH_SEPARATOR '/' # define OS_PREFERRED_PATH_SEPARATOR_STRING "/" static inline void set_fd_to_binary_mode(int fd) @@ -80,7 +78,6 @@ static inline void set_fd_to_binary_mode(int fd) #define for_opt(c, opts) while ((c = getopt_long_only(argc, (tchar**)argv, T(""), \ opts, NULL)) != -1) - enum { CMD_NONE = -1, CMD_APPEND = 0, @@ -110,6 +107,9 @@ static void usage_all(FILE *fp); static void recommend_man_page(int cmd, FILE *fp); static const tchar *get_cmd_string(int cmd, bool nospace); +static int imagex_progress_func(enum wimlib_progress_msg msg, + const union wimlib_progress_info *info); + static bool imagex_be_quiet = false; static FILE *imagex_info_file; @@ -123,8 +123,10 @@ enum { IMAGEX_COMMAND_OPTION, IMAGEX_COMMIT_OPTION, IMAGEX_COMPRESS_OPTION, + IMAGEX_COMPRESS_SLOW_OPTION, IMAGEX_CONFIG_OPTION, IMAGEX_DEBUG_OPTION, + IMAGEX_DELTA_FROM_OPTION, IMAGEX_DEREFERENCE_OPTION, IMAGEX_DEST_DIR_OPTION, IMAGEX_EXTRACT_XML_OPTION, @@ -146,6 +148,7 @@ enum { IMAGEX_RECOMPRESS_OPTION, IMAGEX_RECURSIVE_OPTION, IMAGEX_REF_OPTION, + IMAGEX_RESUME_OPTION, IMAGEX_RPFIX_OPTION, IMAGEX_SOFT_OPTION, IMAGEX_SOURCE_LIST_OPTION, @@ -156,6 +159,7 @@ enum { IMAGEX_THREADS_OPTION, IMAGEX_TO_STDOUT_OPTION, IMAGEX_UNIX_DATA_OPTION, + IMAGEX_UPDATE_OF_OPTION, IMAGEX_VERBOSE_OPTION, IMAGEX_XML_OPTION, }; @@ -173,6 +177,9 @@ static const struct option apply_options[] = { {T("rpfix"), no_argument, NULL, IMAGEX_RPFIX_OPTION}, {T("norpfix"), no_argument, NULL, IMAGEX_NORPFIX_OPTION}, {T("include-invalid-names"), no_argument, NULL, IMAGEX_INCLUDE_INVALID_NAMES_OPTION}, + + /* --resume is undocumented for now as it needs improvement. */ + {T("resume"), no_argument, NULL, IMAGEX_RESUME_OPTION}, {NULL, 0, NULL, 0}, }; @@ -182,6 +189,7 @@ static const struct option capture_or_append_options[] = { {T("no-check"), no_argument, NULL, IMAGEX_NOCHECK_OPTION}, {T("nocheck"), no_argument, NULL, IMAGEX_NOCHECK_OPTION}, {T("compress"), required_argument, NULL, IMAGEX_COMPRESS_OPTION}, + {T("compress-slow"), no_argument, NULL, IMAGEX_COMPRESS_SLOW_OPTION}, {T("config"), required_argument, NULL, IMAGEX_CONFIG_OPTION}, {T("dereference"), no_argument, NULL, IMAGEX_DEREFERENCE_OPTION}, {T("flags"), required_argument, NULL, IMAGEX_FLAGS_OPTION}, @@ -197,6 +205,8 @@ static const struct option capture_or_append_options[] = { {T("norpfix"), no_argument, NULL, IMAGEX_NORPFIX_OPTION}, {T("pipable"), no_argument, NULL, IMAGEX_PIPABLE_OPTION}, {T("not-pipable"), no_argument, NULL, IMAGEX_NOT_PIPABLE_OPTION}, + {T("update-of"), required_argument, NULL, IMAGEX_UPDATE_OF_OPTION}, + {T("delta-from"), required_argument, NULL, IMAGEX_DELTA_FROM_OPTION}, {NULL, 0, NULL, 0}, }; @@ -272,7 +282,10 @@ static const struct option optimize_options[] = { {T("check"), no_argument, NULL, IMAGEX_CHECK_OPTION}, {T("nocheck"), no_argument, NULL, IMAGEX_NOCHECK_OPTION}, {T("no-check"), no_argument, NULL, IMAGEX_NOCHECK_OPTION}, + {T("compress"), required_argument, NULL, IMAGEX_COMPRESS_OPTION}, {T("recompress"), no_argument, NULL, IMAGEX_RECOMPRESS_OPTION}, + {T("compress-slow"), no_argument, NULL, IMAGEX_COMPRESS_SLOW_OPTION}, + {T("recompress-slow"), no_argument, NULL, IMAGEX_COMPRESS_SLOW_OPTION}, {T("threads"), required_argument, NULL, IMAGEX_THREADS_OPTION}, {T("pipable"), no_argument, NULL, IMAGEX_PIPABLE_OPTION}, {T("not-pipable"), no_argument, NULL, IMAGEX_NOT_PIPABLE_OPTION}, @@ -358,11 +371,13 @@ verify_image_exists(int image, const tchar *image_name, const tchar *wim_name) if (image == WIMLIB_NO_IMAGE) { imagex_error(T("\"%"TS"\" is not a valid image in \"%"TS"\"!\n" " Please specify a 1-based image index or " - "image name.\n" - " You may use `%"TS"' to list the images " - "contained in a WIM."), - image_name, wim_name, get_cmd_string(CMD_INFO, false)); - return -1; + "image name. To list the images\n" + " contained in the WIM archive, run\n" + "\n" + " %"TS" \"%"TS"\"\n"), + image_name, wim_name, + get_cmd_string(CMD_INFO, false), wim_name); + return WIMLIB_ERR_INVALID_IMAGE; } return 0; } @@ -372,7 +387,7 @@ verify_image_is_single(int image) { if (image == WIMLIB_ALL_IMAGES) { imagex_error(T("Cannot specify all images for this action!")); - return -1; + return WIMLIB_ERR_INVALID_IMAGE; } return 0; } @@ -405,6 +420,103 @@ get_compression_type(const tchar *optarg) } } +static int +set_compress_slow(void) +{ + int ret; + static const struct wimlib_lzx_params slow_params = { + .size_of_this = sizeof(struct wimlib_lzx_params), + .algorithm = WIMLIB_LZX_ALGORITHM_SLOW, + .alg_params = { + .slow = { + .use_len2_matches = 1, + .num_fast_bytes = 96, + .num_optim_passes = 4, + .max_search_depth = 100, + .max_matches_per_pos = 10, + .main_nostat_cost = 15, + .len_nostat_cost = 15, + .aligned_nostat_cost = 7, + }, + }, + }; + ret = wimlib_lzx_set_default_params(&slow_params); + if (ret) + imagex_error(T("Couldn't set slow compression parameters.!")); + return ret; +} + +struct string_set { + const tchar **strings; + unsigned num_strings; + unsigned num_alloc_strings; +}; + +#define STRING_SET_INITIALIZER \ + { .strings = NULL, .num_strings = 0, .num_alloc_strings = 0, } + +#define STRING_SET(_strings) \ + struct string_set _strings = STRING_SET_INITIALIZER + +static int +string_set_append(struct string_set *set, const tchar *glob) +{ + unsigned num_alloc_strings = set->num_alloc_strings; + + if (set->num_strings == num_alloc_strings) { + const tchar **new_strings; + + num_alloc_strings += 4; + new_strings = realloc(set->strings, + sizeof(set->strings[0]) * num_alloc_strings); + if (!new_strings) { + imagex_error(T("Out of memory!")); + return -1; + } + set->strings = new_strings; + set->num_alloc_strings = num_alloc_strings; + } + set->strings[set->num_strings++] = glob; + return 0; +} + +static void +string_set_destroy(struct string_set *set) +{ + free(set->strings); +} + +static int +wim_reference_globs(WIMStruct *wim, struct string_set *set, int open_flags) +{ + return wimlib_reference_resource_files(wim, set->strings, + set->num_strings, + WIMLIB_REF_FLAG_GLOB_ENABLE, + open_flags, + imagex_progress_func); +} + +static void +do_resource_not_found_warning(const tchar *wimfile, + const struct wimlib_wim_info *info, + const struct string_set *refglobs) +{ + if (info->total_parts > 1) { + if (refglobs->num_strings == 0) { + imagex_error(T("\"%"TS"\" is part of a split WIM. " + "Use --ref to specify the other parts."), + wimfile); + } else { + imagex_error(T("Perhaps the '--ref' argument did not " + "specify all other parts of the split " + "WIM?")); + } + } else { + imagex_error(T("If this is a delta WIM, use the --ref argument " + "to specify the WIM(s) on which it is based.")); + } +} + /* Returns the size of a file given its name, or -1 if the file does not exist * or its size cannot be determined. */ static off_t @@ -417,29 +529,6 @@ file_get_size(const tchar *filename) return (off_t)-1; } -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[0]), - .pats = default_pats, - }, -}; - enum { PARSE_STRING_SUCCESS = 0, PARSE_STRING_FAILURE = 1, @@ -881,8 +970,8 @@ translate_text_to_tstr(char *text, size_t num_bytes, size_t *num_tchars_ret) size_t num_wchars; if (num_bytes >= 2 && - ((text[0] == 0xff && text[1] == 0xfe) || - (text[0] <= 0x7f && text[1] == 0x00))) + (((unsigned char)text[0] == 0xff && (unsigned char)text[1] == 0xfe) || + ((unsigned char)text[0] <= 0x7f && (unsigned char)text[1] == 0x00))) { /* File begins with 0xfeff, the BOM for UTF-16LE, or it begins * with something that looks like an ASCII character encoded as @@ -985,6 +1074,7 @@ imagex_progress_func(enum wimlib_progress_msg msg, unit_shift = get_unit(info->write_streams.total_bytes, &unit_name); percent_done = TO_PERCENT(info->write_streams.completed_bytes, info->write_streams.total_bytes); + if (info->write_streams.completed_streams == 0) { const tchar *data_type; @@ -993,13 +1083,28 @@ imagex_progress_func(enum wimlib_progress_msg msg, data_type, info->write_streams.num_threads, (info->write_streams.num_threads == 1) ? T("") : T("s")); } - imagex_printf(T("\r%"PRIu64" %"TS" of %"PRIu64" %"TS" (uncompressed) " - "written (%u%% done)"), - info->write_streams.completed_bytes >> unit_shift, - unit_name, - info->write_streams.total_bytes >> unit_shift, - unit_name, - percent_done); + if (info->write_streams.total_parts <= 1) { + imagex_printf(T("\r%"PRIu64" %"TS" of %"PRIu64" %"TS" (uncompressed) " + "written (%u%% done)"), + info->write_streams.completed_bytes >> unit_shift, + unit_name, + info->write_streams.total_bytes >> unit_shift, + unit_name, + percent_done); + } else { + imagex_printf(T("\rWriting resources from part %u of %u: " + "%"PRIu64 " %"TS" of %"PRIu64" %"TS" (%u%%) written"), + (info->write_streams.completed_parts == + info->write_streams.total_parts) ? + info->write_streams.completed_parts : + info->write_streams.completed_parts + 1, + info->write_streams.total_parts, + info->write_streams.completed_bytes >> unit_shift, + unit_name, + info->write_streams.total_bytes >> unit_shift, + unit_name, + percent_done); + } if (info->write_streams.completed_bytes >= info->write_streams.total_bytes) imagex_printf(T("\n")); break; @@ -1014,13 +1119,19 @@ imagex_progress_func(enum wimlib_progress_msg msg, } break; case WIMLIB_PROGRESS_MSG_SCAN_DENTRY: - if (info->scan.excluded) - imagex_printf(T("Excluding \"%"TS"\" from capture\n"), info->scan.cur_path); - else + switch (info->scan.status) { + case WIMLIB_SCAN_DENTRY_OK: imagex_printf(T("Scanning \"%"TS"\"\n"), info->scan.cur_path); + break; + case WIMLIB_SCAN_DENTRY_EXCLUDED: + imagex_printf(T("Excluding \"%"TS"\" from capture\n"), info->scan.cur_path); + break; + case WIMLIB_SCAN_DENTRY_UNSUPPORTED: + imagex_printf(T("WARNING: Excluding unsupported file or directory\n" + " \"%"TS"\" from capture\n"), info->scan.cur_path); + break; + } break; - /*case WIMLIB_PROGRESS_MSG_SCAN_END:*/ - /*break;*/ case WIMLIB_PROGRESS_MSG_VERIFY_INTEGRITY: unit_shift = get_unit(info->integrity.total_bytes, &unit_name); percent_done = TO_PERCENT(info->integrity.completed_bytes, @@ -1070,10 +1181,6 @@ imagex_progress_func(enum wimlib_progress_msg msg, info->extract.wimfile_name, info->extract.target); break; - /*case WIMLIB_PROGRESS_MSG_EXTRACT_DIR_STRUCTURE_BEGIN:*/ - /*imagex_printf(T("Applying directory structure to %"TS"\n"),*/ - /*info->extract.target);*/ - /*break;*/ case WIMLIB_PROGRESS_MSG_EXTRACT_STREAMS: percent_done = TO_PERCENT(info->extract.completed_bytes, info->extract.total_bytes); @@ -1088,6 +1195,13 @@ imagex_progress_func(enum wimlib_progress_msg msg, if (info->extract.completed_bytes >= info->extract.total_bytes) imagex_printf(T("\n")); break; + case WIMLIB_PROGRESS_MSG_EXTRACT_SPWM_PART_BEGIN: + if (info->extract.total_parts != 1) { + imagex_printf(T("\nReading split pipable WIM part %u of %u\n"), + info->extract.part_number, + info->extract.total_parts); + } + break; case WIMLIB_PROGRESS_MSG_APPLY_TIMESTAMPS: if (info->extract.extract_root_wim_source_path[0] == T('\0')) imagex_printf(T("Setting timestamps on all extracted files...\n")); @@ -1098,21 +1212,6 @@ imagex_progress_func(enum wimlib_progress_msg msg, info->extract.target); } break; - case WIMLIB_PROGRESS_MSG_JOIN_STREAMS: - percent_done = TO_PERCENT(info->join.completed_bytes, - info->join.total_bytes); - unit_shift = get_unit(info->join.total_bytes, &unit_name); - imagex_printf(T("Writing resources from part %u of %u: " - "%"PRIu64 " %"TS" of %"PRIu64" %"TS" (%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 >> unit_shift, - unit_name, - info->join.total_bytes >> unit_shift, - unit_name, - percent_done); - break; case WIMLIB_PROGRESS_MSG_SPLIT_BEGIN_PART: percent_done = TO_PERCENT(info->split.completed_bytes, info->split.total_bytes); @@ -1130,7 +1229,7 @@ imagex_progress_func(enum wimlib_progress_msg msg, break; case WIMLIB_PROGRESS_MSG_SPLIT_END_PART: if (info->split.completed_bytes == info->split.total_bytes) { - imagex_printf(T("Finished writing part %u of %u WIM parts\n"), + imagex_printf(T("Finished writing split WIM part %u of %u\n"), info->split.cur_part_number, info->split.total_parts); } @@ -1140,7 +1239,7 @@ imagex_progress_func(enum wimlib_progress_msg msg, case WIMLIB_UPDATE_OP_DELETE: imagex_printf(T("Deleted WIM path " "\""WIMLIB_WIM_PATH_SEPARATOR_STRING "%"TS"\"\n"), - info->update.command->delete.wim_path); + info->update.command->delete_.wim_path); break; case WIMLIB_UPDATE_OP_RENAME: imagex_printf(T("Renamed WIM path " @@ -1161,70 +1260,6 @@ imagex_progress_func(enum wimlib_progress_msg msg, return 0; } -/* Open all the split WIM parts that correspond to a file glob. - * - * @first_part specifies the first part of the split WIM and it may be either - * included or omitted from the glob. */ -static int -open_swms_from_glob(const tchar *swm_glob, - const tchar *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; - - /* Warning: glob() is replaced in Windows native builds */ - ret = tglob(swm_glob, GLOB_ERR | GLOB_NOSORT, NULL, &globbuf); - if (ret) { - if (ret == GLOB_NOMATCH) { - imagex_error(T("Found no files for glob \"%"TS"\""), - swm_glob); - } else { - imagex_error_with_errno(T("Failed to process glob \"%"TS"\""), - 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(T("Out of memory")); - ret = -1; - goto out_globfree; - } - unsigned offset = 0; - for (unsigned i = 0; i < num_additional_swms; i++) { - if (tstrcmp(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) - 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 tchar *optarg) { @@ -1259,23 +1294,23 @@ update_command_add_option(int op, const tchar *option, switch (op) { case WIMLIB_UPDATE_OP_ADD: if (!tstrcmp(option, T("--verbose"))) - cmd->add.add_flags |= WIMLIB_ADD_IMAGE_FLAG_VERBOSE; + cmd->add.add_flags |= WIMLIB_ADD_FLAG_VERBOSE; else if (!tstrcmp(option, T("--unix-data"))) - cmd->add.add_flags |= WIMLIB_ADD_IMAGE_FLAG_UNIX_DATA; + cmd->add.add_flags |= WIMLIB_ADD_FLAG_UNIX_DATA; else if (!tstrcmp(option, T("--no-acls")) || !tstrcmp(option, T("--noacls"))) - cmd->add.add_flags |= WIMLIB_ADD_IMAGE_FLAG_NO_ACLS; + cmd->add.add_flags |= WIMLIB_ADD_FLAG_NO_ACLS; else if (!tstrcmp(option, T("--strict-acls"))) - cmd->add.add_flags |= WIMLIB_ADD_IMAGE_FLAG_STRICT_ACLS; + cmd->add.add_flags |= WIMLIB_ADD_FLAG_STRICT_ACLS; else if (!tstrcmp(option, T("--dereference"))) - cmd->add.add_flags |= WIMLIB_ADD_IMAGE_FLAG_DEREFERENCE; + cmd->add.add_flags |= WIMLIB_ADD_FLAG_DEREFERENCE; else recognized = false; break; case WIMLIB_UPDATE_OP_DELETE: if (!tstrcmp(option, T("--force"))) - cmd->delete.delete_flags |= WIMLIB_DELETE_FLAG_FORCE; + cmd->delete_.delete_flags |= WIMLIB_DELETE_FLAG_FORCE; else if (!tstrcmp(option, T("--recursive"))) - cmd->delete.delete_flags |= WIMLIB_DELETE_FLAG_RECURSIVE; + cmd->delete_.delete_flags |= WIMLIB_DELETE_FLAG_RECURSIVE; else recognized = false; break; @@ -1306,7 +1341,7 @@ update_command_add_nonoption(int op, const tchar *nonoption, cmd->add.wim_target_path = (tchar*)nonoption; break; case WIMLIB_UPDATE_OP_DELETE: - cmd->delete.wim_path = (tchar*)nonoption; + cmd->delete_.wim_path = (tchar*)nonoption; break; case WIMLIB_UPDATE_OP_RENAME: if (num_nonoptions == 0) @@ -1452,18 +1487,17 @@ static int imagex_apply(int argc, tchar **argv, int cmd) { int c; - int open_flags = WIMLIB_OPEN_FLAG_SPLIT_OK; - int image; + int open_flags = 0; + int image = WIMLIB_NO_IMAGE; WIMStruct *wim; + struct wimlib_wim_info info; int ret; const tchar *wimfile; const tchar *target; - const tchar *image_num_or_name; + const tchar *image_num_or_name = NULL; int extract_flags = WIMLIB_EXTRACT_FLAG_SEQUENTIAL; - const tchar *swm_glob = NULL; - WIMStruct **additional_swms; - unsigned num_additional_swms; + STRING_SET(refglobs); for_opt(c, apply_options) { switch (c) { @@ -1480,7 +1514,9 @@ imagex_apply(int argc, tchar **argv, int cmd) extract_flags |= WIMLIB_EXTRACT_FLAG_VERBOSE; break; case IMAGEX_REF_OPTION: - swm_glob = optarg; + ret = string_set_append(&refglobs, optarg); + if (ret) + goto out_free_refglobs; break; case IMAGEX_UNIX_DATA_OPTION: extract_flags |= WIMLIB_EXTRACT_FLAG_UNIX_DATA; @@ -1501,6 +1537,9 @@ imagex_apply(int argc, tchar **argv, int cmd) extract_flags |= WIMLIB_EXTRACT_FLAG_REPLACE_INVALID_FILENAMES; extract_flags |= WIMLIB_EXTRACT_FLAG_ALL_CASE_CONFLICTS; break; + case IMAGEX_RESUME_OPTION: + extract_flags |= WIMLIB_EXTRACT_FLAG_RESUME; + break; default: goto out_usage; } @@ -1522,13 +1561,13 @@ imagex_apply(int argc, tchar **argv, int cmd) target = argv[2]; } wim = NULL; - num_additional_swms = 0; - additional_swms = NULL; } else { ret = wimlib_open_wim(wimfile, open_flags, &wim, imagex_progress_func); if (ret) - goto out; + goto out_free_refglobs; + + wimlib_get_wim_info(wim, &info); if (argc >= 3) { /* Image explicitly specified. */ @@ -1541,9 +1580,7 @@ imagex_apply(int argc, tchar **argv, int cmd) } else { /* No image specified; default to image 1, but only if the WIM * contains exactly one image. */ - struct wimlib_wim_info info; - wimlib_get_wim_info(wim, &info); if (info.image_count != 1) { imagex_error(T("\"%"TS"\" contains %d images; " "Please select one (or all)."), @@ -1554,17 +1591,17 @@ imagex_apply(int argc, tchar **argv, int cmd) image = 1; target = argv[1]; } + } - if (swm_glob) { - ret = open_swms_from_glob(swm_glob, wimfile, open_flags, - &additional_swms, - &num_additional_swms); - if (ret) - goto out_wimlib_free; - } else { - additional_swms = NULL; - num_additional_swms = 0; + if (refglobs.num_strings) { + if (wim == NULL) { + imagex_error(T("Can't specify --ref when applying from stdin!")); + ret = -1; + goto out_wimlib_free; } + ret = wim_reference_globs(wim, &refglobs, open_flags); + if (ret) + goto out_wimlib_free; } #ifndef __WIN32__ @@ -1578,7 +1615,7 @@ imagex_apply(int argc, tchar **argv, int cmd) imagex_error_with_errno(T("Failed to stat \"%"TS"\""), target); ret = -1; - goto out_free_swms; + goto out_wimlib_free; } } else { if (S_ISBLK(stbuf.st_mode) || S_ISREG(stbuf.st_mode)) @@ -1587,12 +1624,8 @@ imagex_apply(int argc, tchar **argv, int cmd) } #endif -#ifdef __WIN32__ - win32_acquire_restore_privileges(); -#endif if (wim) { ret = wimlib_extract_image(wim, image, target, extract_flags, - additional_swms, num_additional_swms, imagex_progress_func); } else { set_fd_to_binary_mode(STDIN_FILENO); @@ -1601,24 +1634,28 @@ imagex_apply(int argc, tchar **argv, int cmd) target, extract_flags, imagex_progress_func); } - if (ret == 0) + if (ret == 0) { imagex_printf(T("Done applying WIM image.\n")); -#ifdef __WIN32__ - win32_release_restore_privileges(); -#endif -out_free_swms: - for (unsigned i = 0; i < num_additional_swms; i++) - wimlib_free(additional_swms[i]); - free(additional_swms); + } else if (ret == WIMLIB_ERR_RESOURCE_NOT_FOUND) { + if (wim) { + do_resource_not_found_warning(wimfile, &info, &refglobs); + } else { + imagex_error(T( "If you are applying an image " + "from a split pipable WIM,\n" + " make sure you have " + "concatenated together all parts.")); + } + } out_wimlib_free: wimlib_free(wim); -out: +out_free_refglobs: + string_set_destroy(&refglobs); return ret; out_usage: usage(CMD_APPLY, stderr); ret = -1; - goto out; + goto out_free_refglobs; } /* Create a WIM image from a directory tree, NTFS volume, or multiple files or @@ -1630,15 +1667,25 @@ imagex_capture_or_append(int argc, tchar **argv, int cmd) { int c; int open_flags = WIMLIB_OPEN_FLAG_WRITE_ACCESS; - int add_image_flags = WIMLIB_ADD_IMAGE_FLAG_EXCLUDE_VERBOSE; + int add_image_flags = WIMLIB_ADD_IMAGE_FLAG_EXCLUDE_VERBOSE | + WIMLIB_ADD_IMAGE_FLAG_WINCONFIG; int write_flags = 0; - int compression_type = WIMLIB_COMPRESSION_TYPE_LZX; + int compression_type = WIMLIB_COMPRESSION_TYPE_INVALID; const tchar *wimfile; int wim_fd; const tchar *name; const tchar *desc; const tchar *flags_element = NULL; + WIMStruct *wim; + STRING_SET(base_wimfiles); + WIMStruct **base_wims; + + WIMStruct *template_wim; + const tchar *template_wimfile = NULL; + const tchar *template_image_name_or_num = NULL; + int template_image = WIMLIB_NO_IMAGE; + int ret; unsigned num_threads = 0; @@ -1650,7 +1697,7 @@ imagex_capture_or_append(int argc, tchar **argv, int cmd) struct wimlib_capture_config *config; bool source_list = false; - size_t source_list_nchars; + size_t source_list_nchars = 0; tchar *source_list_contents; bool capture_sources_malloced; struct wimlib_capture_source *capture_sources; @@ -1671,12 +1718,19 @@ imagex_capture_or_append(int argc, tchar **argv, int cmd) break; case IMAGEX_CONFIG_OPTION: config_file = optarg; + add_image_flags &= ~WIMLIB_ADD_IMAGE_FLAG_WINCONFIG; break; case IMAGEX_COMPRESS_OPTION: compression_type = get_compression_type(optarg); if (compression_type == WIMLIB_COMPRESSION_TYPE_INVALID) goto out_err; break; + case IMAGEX_COMPRESS_SLOW_OPTION: + ret = set_compress_slow(); + if (ret) + goto out_err; + compression_type = WIMLIB_COMPRESSION_TYPE_LZX; + break; case IMAGEX_FLAGS_OPTION: flags_element = optarg; break; @@ -1718,6 +1772,36 @@ imagex_capture_or_append(int argc, tchar **argv, int cmd) case IMAGEX_NOT_PIPABLE_OPTION: write_flags |= WIMLIB_WRITE_FLAG_NOT_PIPABLE; break; + case IMAGEX_UPDATE_OF_OPTION: + if (template_image_name_or_num) { + imagex_error(T("'--update-of' can only be " + "specified one time!")); + goto out_err; + } else { + tchar *colon; + colon = tstrrchr(optarg, T(':')); + + if (colon) { + template_wimfile = optarg; + *colon = T('\0'); + template_image_name_or_num = colon + 1; + } else { + template_wimfile = NULL; + template_image_name_or_num = optarg; + } + } + break; + case IMAGEX_DELTA_FROM_OPTION: + if (cmd != CMD_CAPTURE) { + imagex_error(T("'--delta-from' is only " + "valid for capture!")); + goto out_usage; + } + ret = string_set_append(&base_wimfiles, optarg); + if (ret) + goto out_free_base_wimfiles; + write_flags |= WIMLIB_WRITE_FLAG_SKIP_EXTERNAL_WIMS; + break; default: goto out_usage; } @@ -1731,7 +1815,20 @@ imagex_capture_or_append(int argc, tchar **argv, int cmd) source = argv[0]; wimfile = argv[1]; + /* Set default compression type. */ + if (compression_type == WIMLIB_COMPRESSION_TYPE_INVALID) { + struct wimlib_lzx_params params; + memset(¶ms, 0, sizeof(params)); + params.size_of_this = sizeof(params); + params.algorithm = WIMLIB_LZX_ALGORITHM_FAST; + params.use_defaults = 1; + + wimlib_lzx_set_default_params(¶ms); + compression_type = WIMLIB_COMPRESSION_TYPE_LZX; + } + if (!tstrcmp(wimfile, T("-"))) { + /* Writing captured WIM to standard output. */ #if 0 if (!(write_flags & WIMLIB_WRITE_FLAG_PIPABLE)) { imagex_error("Can't write a non-pipable WIM to " @@ -1751,6 +1848,36 @@ imagex_capture_or_append(int argc, tchar **argv, int cmd) wim_fd = STDOUT_FILENO; wimfile = NULL; imagex_info_file = stderr; + set_fd_to_binary_mode(wim_fd); + } + + /* If template image was specified using --update-of=IMAGE rather + * than --update-of=WIMFILE:IMAGE, set the default WIMFILE. */ + if (template_image_name_or_num && !template_wimfile) { + if (base_wimfiles.num_strings == 1) { + /* Capturing delta WIM based on single WIM: default to + * base WIM. */ + template_wimfile = base_wimfiles.strings[0]; + } else if (cmd == CMD_APPEND) { + /* Appending to WIM: default to WIM being appended to. + */ + template_wimfile = wimfile; + } else { + /* Capturing a normal (non-delta) WIM, so the WIM file + * *must* be explicitly specified. */ + if (base_wimfiles.num_strings > 1) { + imagex_error(T("For capture of delta WIM " + "based on multiple existing " + "WIMs,\n" + " '--update-of' must " + "specify WIMFILE:IMAGE!")); + } else { + imagex_error(T("For capture of non-delta WIM, " + "'--update-of' must specify " + "WIMFILE:IMAGE!")); + } + goto out_usage; + } } if (argc >= 3) { @@ -1794,8 +1921,7 @@ imagex_capture_or_append(int argc, tchar **argv, int cmd) } capture_sources_malloced = true; } else { - /* Set up capture source in non-source-list mode (could be - * either "normal" mode or "NTFS mode"--- see the man page). */ + /* Set up capture source in non-source-list mode. */ capture_sources = alloca(sizeof(struct wimlib_capture_source)); capture_sources[0].fs_source_path = source; capture_sources[0].wim_target_path = NULL; @@ -1806,6 +1932,7 @@ imagex_capture_or_append(int argc, tchar **argv, int cmd) } if (config_file) { + /* Read and parse capture configuration file. */ size_t config_len; config_str = file_get_text_contents(config_file, &config_len); @@ -1819,9 +1946,13 @@ imagex_capture_or_append(int argc, tchar **argv, int cmd) if (ret) goto out_free_config; } else { - config = &default_capture_config; + /* No capture configuration file specified; use default + * configuration for capturing Windows operating systems. */ + config = NULL; + add_image_flags |= WIMLIB_ADD_FLAG_WINCONFIG; } + /* Open the existing WIM, or create a new one. */ if (cmd == CMD_APPEND) ret = wimlib_open_wim(wimfile, open_flags, &wim, imagex_progress_func); @@ -1831,6 +1962,8 @@ imagex_capture_or_append(int argc, tchar **argv, int cmd) goto out_free_config; #ifndef __WIN32__ + /* Detect if source is regular file or block device and set NTFS volume + * capture mode. */ if (!source_list) { struct stat stbuf; @@ -1845,16 +1978,16 @@ imagex_capture_or_append(int argc, tchar **argv, int cmd) imagex_error_with_errno(T("Failed to stat " "\"%"TS"\""), source); ret = -1; - goto out_wimlib_free; + goto out_free_wim; } } } #endif + /* If the user did not specify an image name, and the basename of the + * source already exists as an image name in the WIM file, append a + * suffix to make it unique. */ if (cmd == CMD_APPEND && name_defaulted) { - /* If the user did not specify an image name, and the basename - * of the source already exists as an image name in the WIM - * file, append a suffix to make it unique. */ unsigned long conflict_idx; tchar *name_end = tstrchr(name, T('\0')); for (conflict_idx = 1; @@ -1864,9 +1997,86 @@ imagex_capture_or_append(int argc, tchar **argv, int cmd) tsprintf(name_end, T(" (%lu)"), conflict_idx); } } -#ifdef __WIN32__ - win32_acquire_capture_privileges(); -#endif + + /* If capturing a delta WIM, reference resources from the base WIMs + * before adding the new image. */ + if (base_wimfiles.num_strings) { + base_wims = calloc(base_wimfiles.num_strings, + sizeof(base_wims[0])); + if (base_wims == NULL) { + imagex_error(T("Out of memory!")); + ret = -1; + goto out_free_wim; + } + + for (size_t i = 0; i < base_wimfiles.num_strings; i++) { + ret = wimlib_open_wim(base_wimfiles.strings[i], + open_flags, &base_wims[i], + imagex_progress_func); + if (ret) + goto out_free_base_wims; + + } + + ret = wimlib_reference_resources(wim, base_wims, + base_wimfiles.num_strings, 0); + if (ret) + goto out_free_base_wims; + + if (base_wimfiles.num_strings == 1) { + imagex_printf(T("Capturing delta WIM based on \"%"TS"\"\n"), + base_wimfiles.strings[0]); + } else { + imagex_printf(T("Capturing delta WIM based on %u WIMs\n"), + base_wimfiles.num_strings); + } + + } else { + base_wims = NULL; + } + + /* If capturing or appending as an update of an existing (template) image, + * open the WIM if needed and parse the image index. */ + if (template_image_name_or_num) { + + + if (base_wimfiles.num_strings == 1 && + template_wimfile == base_wimfiles.strings[0]) { + template_wim = base_wims[0]; + } else if (template_wimfile == wimfile) { + template_wim = wim; + } else { + ret = wimlib_open_wim(template_wimfile, open_flags, + &template_wim, imagex_progress_func); + if (ret) + goto out_free_base_wims; + } + + template_image = wimlib_resolve_image(template_wim, + template_image_name_or_num); + + if (template_image_name_or_num[0] == T('-')) { + tchar *tmp; + unsigned long n; + struct wimlib_wim_info info; + + wimlib_get_wim_info(template_wim, &info); + n = tstrtoul(template_image_name_or_num + 1, &tmp, 10); + if (n >= 1 && n <= info.image_count && + *tmp == T('\0') && + tmp != template_image_name_or_num + 1) + { + template_image = info.image_count - (n - 1); + } + } + ret = verify_image_exists_and_is_single(template_image, + template_image_name_or_num, + template_wimfile); + if (ret) + goto out_free_template_wim; + } else { + template_wim = NULL; + } ret = wimlib_add_image_multisource(wim, capture_sources, @@ -1876,12 +2086,13 @@ imagex_capture_or_append(int argc, tchar **argv, int cmd) add_image_flags, imagex_progress_func); if (ret) - goto out_release_privs; + goto out_free_template_wim; - if (desc || flags_element) { - /* User provided or element. Get the - * index of the image we just added, then use it to call the - * appropriate functions. */ + if (desc || flags_element || template_image_name_or_num) { + /* User provided or element, or an image + * on which the added one is to be based has been specified with + * --update-of. Get the index of the image we just + * added, then use it to call the appropriate functions. */ struct wimlib_wim_info info; wimlib_get_wim_info(wim, &info); @@ -1891,14 +2102,28 @@ imagex_capture_or_append(int argc, tchar **argv, int cmd) info.image_count, desc); if (ret) - goto out_release_privs; + goto out_free_template_wim; } if (flags_element) { ret = wimlib_set_image_flags(wim, info.image_count, flags_element); if (ret) - goto out_release_privs; + goto out_free_template_wim; + } + + /* Reference template image if the user provided one. */ + if (template_image_name_or_num) { + imagex_printf(T("Using image %d " + "from \"%"TS"\" as template\n"), + template_image, template_wimfile); + ret = wimlib_reference_template_image(wim, + info.image_count, + template_wim, + template_image, + 0, NULL); + if (ret) + goto out_free_template_wim; } } @@ -1916,14 +2141,19 @@ imagex_capture_or_append(int argc, tchar **argv, int cmd) write_flags, num_threads, imagex_progress_func); } -out_release_privs: -#ifdef __WIN32__ - win32_release_capture_privileges(); -#endif -out_wimlib_free: +out_free_template_wim: + /* template_wim may alias base_wims[0] or wim. */ + if ((base_wimfiles.num_strings != 1 || template_wim != base_wims[0]) && + template_wim != wim) + wimlib_free(template_wim); +out_free_base_wims: + for (size_t i = 0; i < base_wimfiles.num_strings; i++) + wimlib_free(base_wims[i]); + free(base_wims); +out_free_wim: wimlib_free(wim); out_free_config: - if (config != &default_capture_config) { + if (config) { free(config->exclusion_pats.pats); free(config->exclusion_exception_pats.pats); free(config_str); @@ -1933,14 +2163,15 @@ out_free_capture_sources: free(capture_sources); out_free_source_list_contents: free(source_list_contents); -out: +out_free_base_wimfiles: + string_set_destroy(&base_wimfiles); return ret; out_usage: usage(cmd, stderr); out_err: ret = -1; - goto out; + goto out_free_base_wimfiles; } /* Remove image(s) from a WIM. */ @@ -2056,8 +2287,7 @@ imagex_dir(int argc, tchar **argv, int cmd) } wimfile = argv[0]; - ret = wimlib_open_wim(wimfile, WIMLIB_OPEN_FLAG_SPLIT_OK, &wim, - imagex_progress_func); + ret = wimlib_open_wim(wimfile, 0, &wim, imagex_progress_func); if (ret) goto out; @@ -2114,14 +2344,13 @@ imagex_export(int argc, tchar **argv, int cmd) const tchar *dest_name; const tchar *dest_desc; WIMStruct *src_wim; + struct wimlib_wim_info src_info; WIMStruct *dest_wim; int ret; int image; struct stat stbuf; bool wim_is_new; - const tchar *swm_glob = NULL; - WIMStruct **additional_swms; - unsigned num_additional_swms; + STRING_SET(refglobs); unsigned num_threads = 0; for_opt(c, export_options) { @@ -2142,7 +2371,9 @@ imagex_export(int argc, tchar **argv, int cmd) goto out_err; break; case IMAGEX_REF_OPTION: - swm_glob = optarg; + ret = string_set_append(&refglobs, optarg); + if (ret) + goto out_free_refglobs; break; case IMAGEX_THREADS_OPTION: num_threads = parse_num_threads(optarg); @@ -2171,11 +2402,12 @@ imagex_export(int argc, tchar **argv, int cmd) 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 | WIMLIB_OPEN_FLAG_SPLIT_OK, &src_wim, + ret = wimlib_open_wim(src_wimfile, open_flags, &src_wim, imagex_progress_func); if (ret) - goto out; + goto out_free_refglobs; + + wimlib_get_wim_info(src_wim, &src_info); /* 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 @@ -2198,6 +2430,7 @@ imagex_export(int argc, tchar **argv, int cmd) dest_wimfile = NULL; dest_wim_fd = STDOUT_FILENO; imagex_info_file = stderr; + set_fd_to_binary_mode(dest_wim_fd); } errno = ENOENT; if (dest_wimfile != NULL && tstat(dest_wimfile, &stbuf) == 0) { @@ -2210,7 +2443,8 @@ imagex_export(int argc, tchar **argv, int cmd) ret = -1; goto out_free_src_wim; } - ret = wimlib_open_wim(dest_wimfile, open_flags | WIMLIB_OPEN_FLAG_WRITE_ACCESS, + ret = wimlib_open_wim(dest_wimfile, + open_flags | WIMLIB_OPEN_FLAG_WRITE_ACCESS, &dest_wim, imagex_progress_func); if (ret) goto out_free_src_wim; @@ -2247,9 +2481,6 @@ imagex_export(int argc, tchar **argv, int cmd) /* The user did not specify a compression type; default * to that of the source WIM. */ - struct wimlib_wim_info src_info; - - wimlib_get_wim_info(src_wim, &src_info); compression_type = src_info.compression_type; } ret = wimlib_create_new_wim(compression_type, &dest_wim); @@ -2262,22 +2493,30 @@ imagex_export(int argc, tchar **argv, int cmd) if (ret) goto out_free_dest_wim; - if (swm_glob) { - ret = open_swms_from_glob(swm_glob, src_wimfile, open_flags, - &additional_swms, - &num_additional_swms); + if (refglobs.num_strings) { + ret = wim_reference_globs(src_wim, &refglobs, open_flags); if (ret) goto out_free_dest_wim; - } else { - additional_swms = NULL; - num_additional_swms = 0; + } + + if ((export_flags & WIMLIB_EXPORT_FLAG_BOOT) && + image == WIMLIB_ALL_IMAGES && src_info.boot_index == 0) + { + imagex_error(T("--boot specified for all-images export, but source WIM " + "has no bootable image.")); + ret = -1; + goto out_free_dest_wim; } ret = wimlib_export_image(src_wim, image, dest_wim, dest_name, - dest_desc, export_flags, additional_swms, - num_additional_swms, imagex_progress_func); - if (ret) - goto out_free_swms; + dest_desc, export_flags, imagex_progress_func); + if (ret) { + if (ret == WIMLIB_ERR_RESOURCE_NOT_FOUND) { + do_resource_not_found_warning(src_wimfile, + &src_info, &refglobs); + } + goto out_free_dest_wim; + } if (!wim_is_new) ret = wimlib_overwrite(dest_wim, write_flags, num_threads, @@ -2290,24 +2529,19 @@ imagex_export(int argc, tchar **argv, int cmd) ret = wimlib_write_to_fd(dest_wim, dest_wim_fd, WIMLIB_ALL_IMAGES, write_flags, num_threads, imagex_progress_func); - if (ret) - imagex_error(T("Export failed.")); -out_free_swms: - for (unsigned i = 0; i < num_additional_swms; i++) - wimlib_free(additional_swms[i]); - free(additional_swms); out_free_dest_wim: wimlib_free(dest_wim); out_free_src_wim: wimlib_free(src_wim); -out: +out_free_refglobs: + string_set_destroy(&refglobs); return ret; out_usage: usage(CMD_EXPORT, stderr); out_err: ret = -1; - goto out; + goto out_free_refglobs; } static bool @@ -2376,7 +2610,7 @@ static int imagex_extract(int argc, tchar **argv, int cmd) { int c; - int open_flags = WIMLIB_OPEN_FLAG_SPLIT_OK; + int open_flags = 0; int image; WIMStruct *wim; int ret; @@ -2385,9 +2619,7 @@ imagex_extract(int argc, tchar **argv, int cmd) tchar *dest_dir = T("."); int extract_flags = WIMLIB_EXTRACT_FLAG_SEQUENTIAL | WIMLIB_EXTRACT_FLAG_NORPFIX; - const tchar *swm_glob = NULL; - WIMStruct **additional_swms; - unsigned num_additional_swms; + STRING_SET(refglobs); struct wimlib_extract_command *cmds; size_t num_cmds; @@ -2401,7 +2633,9 @@ imagex_extract(int argc, tchar **argv, int cmd) extract_flags |= WIMLIB_EXTRACT_FLAG_VERBOSE; break; case IMAGEX_REF_OPTION: - swm_glob = optarg; + ret = string_set_append(&refglobs, optarg); + if (ret) + goto out_free_refglobs; break; case IMAGEX_UNIX_DATA_OPTION: extract_flags |= WIMLIB_EXTRACT_FLAG_UNIX_DATA; @@ -2456,23 +2690,13 @@ imagex_extract(int argc, tchar **argv, int cmd) 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 (refglobs.num_strings) { + ret = wim_reference_globs(wim, &refglobs, open_flags); if (ret) goto out_wimlib_free; - } else { - additional_swms = NULL; - num_additional_swms = 0; } -#ifdef __WIN32__ - win32_acquire_restore_privileges(); -#endif - ret = wimlib_extract_files(wim, image, cmds, num_cmds, 0, - additional_swms, num_additional_swms, imagex_progress_func); if (ret == 0) { if (!imagex_be_quiet) @@ -2482,25 +2706,25 @@ imagex_extract(int argc, tchar **argv, int cmd) "files and directories\n" " are in the WIM image.\n"), get_cmd_string(CMD_INFO, false)); + } else if (ret == WIMLIB_ERR_RESOURCE_NOT_FOUND) { + struct wimlib_wim_info info; + + wimlib_get_wim_info(wim, &info); + do_resource_not_found_warning(wimfile, &info, &refglobs); } -#ifdef __WIN32__ - win32_release_restore_privileges(); -#endif - 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: +out_free_refglobs: + string_set_destroy(&refglobs); return ret; out_usage: usage(CMD_EXTRACT, stderr); out_err: ret = -1; - goto out; + goto out_free_refglobs; } static void print_byte_field(const uint8_t field[], size_t len) @@ -2597,7 +2821,7 @@ imagex_info(int argc, tchar **argv, int cmd) WIMStruct *wim; int image; int ret; - int open_flags = WIMLIB_OPEN_FLAG_SPLIT_OK; + int open_flags = 0; struct wimlib_wim_info info; for_opt(c, info_options) { @@ -2663,8 +2887,7 @@ imagex_info(int argc, tchar **argv, int cmd) image = wimlib_resolve_image(wim, image_num_or_name); ret = WIMLIB_ERR_INVALID_IMAGE; if (image == WIMLIB_NO_IMAGE && tstrcmp(image_num_or_name, T("0"))) { - imagex_error(T("The image \"%"TS"\" does not exist in \"%"TS"\""), - image_num_or_name, wimfile); + verify_image_exists(image, image_num_or_name, wimfile); if (boot) { imagex_error(T("If you would like to set the boot " "index to 0, specify image \"0\" with " @@ -2856,7 +3079,7 @@ static int imagex_join(int argc, tchar **argv, int cmd) { int c; - int swm_open_flags = WIMLIB_OPEN_FLAG_SPLIT_OK; + int swm_open_flags = 0; int wim_write_flags = 0; const tchar *output_path; int ret; @@ -2903,16 +3126,16 @@ imagex_mount_rw_or_ro(int argc, tchar **argv, int cmd) { int c; int mount_flags = 0; - int open_flags = WIMLIB_OPEN_FLAG_SPLIT_OK; - const tchar *swm_glob = NULL; + int open_flags = 0; const tchar *staging_dir = NULL; const tchar *wimfile; const tchar *dir; WIMStruct *wim; + struct wimlib_wim_info info; int image; int ret; - WIMStruct **additional_swms; - unsigned num_additional_swms; + + STRING_SET(refglobs); if (cmd == CMD_MOUNTRW) { mount_flags |= WIMLIB_MOUNT_FLAG_READWRITE; @@ -2944,7 +3167,9 @@ imagex_mount_rw_or_ro(int argc, tchar **argv, int cmd) } break; case IMAGEX_REF_OPTION: - swm_glob = optarg; + ret = string_set_append(&refglobs, optarg); + if (ret) + goto out_free_refglobs; break; case IMAGEX_STAGING_DIR_OPTION: staging_dir = optarg; @@ -2965,7 +3190,9 @@ imagex_mount_rw_or_ro(int argc, tchar **argv, int cmd) ret = wimlib_open_wim(wimfile, open_flags, &wim, imagex_progress_func); if (ret) - goto out; + goto out_free_refglobs; + + wimlib_get_wim_info(wim, &info); if (argc >= 3) { /* Image explicitly specified. */ @@ -2977,9 +3204,7 @@ imagex_mount_rw_or_ro(int argc, tchar **argv, int cmd) } else { /* No image specified; default to image 1, but only if the WIM * contains exactly one image. */ - struct wimlib_wim_info info; - wimlib_get_wim_info(wim, &info); if (info.image_count != 1) { imagex_error(T("\"%"TS"\" contains %d images; Please " "select one."), wimfile, info.image_count); @@ -2990,36 +3215,28 @@ imagex_mount_rw_or_ro(int argc, tchar **argv, int cmd) dir = argv[1]; } - if (swm_glob) { - ret = open_swms_from_glob(swm_glob, wimfile, open_flags, - &additional_swms, - &num_additional_swms); + if (refglobs.num_strings) { + ret = wim_reference_globs(wim, &refglobs, open_flags); if (ret) goto out_free_wim; - } else { - additional_swms = NULL; - num_additional_swms = 0; } - ret = wimlib_mount_image(wim, image, dir, mount_flags, additional_swms, - num_additional_swms, staging_dir); + ret = wimlib_mount_image(wim, image, dir, mount_flags, staging_dir); if (ret) { imagex_error(T("Failed to mount image %d from \"%"TS"\" " "on \"%"TS"\""), image, wimfile, dir); } - for (unsigned i = 0; i < num_additional_swms; i++) - wimlib_free(additional_swms[i]); - free(additional_swms); out_free_wim: wimlib_free(wim); -out: +out_free_refglobs: + string_set_destroy(&refglobs); return ret; out_usage: usage(cmd, stderr); ret = -1; - goto out; + goto out_free_refglobs; } #endif /* WIM_MOUNTING_SUPPORTED */ @@ -3030,6 +3247,7 @@ imagex_optimize(int argc, tchar **argv, int cmd) int c; int open_flags = WIMLIB_OPEN_FLAG_WRITE_ACCESS; int write_flags = WIMLIB_WRITE_FLAG_REBUILD; + int compression_type = WIMLIB_COMPRESSION_TYPE_INVALID; int ret; WIMStruct *wim; const tchar *wimfile; @@ -3046,9 +3264,22 @@ imagex_optimize(int argc, tchar **argv, int cmd) case IMAGEX_NOCHECK_OPTION: write_flags |= WIMLIB_WRITE_FLAG_NO_CHECK_INTEGRITY; break; + case IMAGEX_COMPRESS_OPTION: + write_flags |= WIMLIB_WRITE_FLAG_RECOMPRESS; + compression_type = get_compression_type(optarg); + if (compression_type == WIMLIB_COMPRESSION_TYPE_INVALID) + goto out_err; + break; case IMAGEX_RECOMPRESS_OPTION: write_flags |= WIMLIB_WRITE_FLAG_RECOMPRESS; break; + case IMAGEX_COMPRESS_SLOW_OPTION: + write_flags |= WIMLIB_WRITE_FLAG_RECOMPRESS; + compression_type = WIMLIB_COMPRESSION_TYPE_LZX; + ret = set_compress_slow(); + if (ret) + goto out_err; + break; case IMAGEX_THREADS_OPTION: num_threads = parse_num_threads(optarg); if (num_threads == UINT_MAX) @@ -3076,6 +3307,12 @@ imagex_optimize(int argc, tchar **argv, int cmd) if (ret) goto out; + if (compression_type != WIMLIB_COMPRESSION_TYPE_INVALID) { + ret = wimlib_set_output_compression_type(wim, compression_type); + if (ret) + goto out_wimlib_free; + } + old_size = file_get_size(wimfile); tprintf(T("\"%"TS"\" original size: "), wimfile); if (old_size == -1) @@ -3227,7 +3464,7 @@ imagex_update(int argc, tchar **argv, int cmd) int open_flags = WIMLIB_OPEN_FLAG_WRITE_ACCESS; int write_flags = 0; int update_flags = WIMLIB_UPDATE_FLAG_SEND_PROGRESS; - int default_add_flags = WIMLIB_ADD_IMAGE_FLAG_EXCLUDE_VERBOSE; + int default_add_flags = WIMLIB_ADD_FLAG_EXCLUDE_VERBOSE; int default_delete_flags = 0; unsigned num_threads = 0; int c; @@ -3280,24 +3517,25 @@ imagex_update(int argc, tchar **argv, int cmd) /* Global add option */ case IMAGEX_CONFIG_OPTION: + default_add_flags &= ~WIMLIB_ADD_FLAG_WINCONFIG; config_file = optarg; break; /* Default add options */ case IMAGEX_VERBOSE_OPTION: - default_add_flags |= WIMLIB_ADD_IMAGE_FLAG_VERBOSE; + default_add_flags |= WIMLIB_ADD_FLAG_VERBOSE; break; case IMAGEX_DEREFERENCE_OPTION: - default_add_flags |= WIMLIB_ADD_IMAGE_FLAG_DEREFERENCE; + default_add_flags |= WIMLIB_ADD_FLAG_DEREFERENCE; break; case IMAGEX_UNIX_DATA_OPTION: - default_add_flags |= WIMLIB_ADD_IMAGE_FLAG_UNIX_DATA; + default_add_flags |= WIMLIB_ADD_FLAG_UNIX_DATA; break; case IMAGEX_NO_ACLS_OPTION: - default_add_flags |= WIMLIB_ADD_IMAGE_FLAG_NO_ACLS; + default_add_flags |= WIMLIB_ADD_FLAG_NO_ACLS; break; case IMAGEX_STRICT_ACLS_OPTION: - default_add_flags |= WIMLIB_ADD_IMAGE_FLAG_STRICT_ACLS; + default_add_flags |= WIMLIB_ADD_FLAG_STRICT_ACLS; break; default: goto out_usage; @@ -3351,7 +3589,8 @@ imagex_update(int argc, tchar **argv, int cmd) if (ret) goto out_free_config; } else { - config = &default_capture_config; + config = NULL; + default_add_flags |= WIMLIB_ADD_FLAG_WINCONFIG; } /* Read update commands from standard input, or the command string if @@ -3381,46 +3620,35 @@ imagex_update(int argc, tchar **argv, int cmd) } /* Set default flags and capture config on the update commands */ - bool have_add_command = false; for (size_t i = 0; i < num_cmds; i++) { switch (cmds[i].op) { case WIMLIB_UPDATE_OP_ADD: cmds[i].add.add_flags |= default_add_flags; cmds[i].add.config = config; - have_add_command = true; break; case WIMLIB_UPDATE_OP_DELETE: - cmds[i].delete.delete_flags |= default_delete_flags; + cmds[i].delete_.delete_flags |= default_delete_flags; break; default: break; } } -#ifdef __WIN32__ - if (have_add_command) - win32_acquire_capture_privileges(); -#endif - /* Execute the update commands */ ret = wimlib_update_image(wim, image, cmds, num_cmds, update_flags, imagex_progress_func); if (ret) - goto out_release_privs; + goto out_free_cmds; /* Overwrite the updated WIM */ ret = wimlib_overwrite(wim, write_flags, num_threads, imagex_progress_func); -out_release_privs: -#ifdef __WIN32__ - if (have_add_command) - win32_release_capture_privileges(); -#endif +out_free_cmds: free(cmds); out_free_cmd_file_contents: free(cmd_file_contents); out_free_config: - if (config != &default_capture_config) { + if (config) { free(config->exclusion_pats.pats); free(config->exclusion_exception_pats.pats); free(config_str); @@ -3471,12 +3699,12 @@ static const tchar *usage_strings[] = { [CMD_APPEND] = T( " %"TS" (DIRECTORY | NTFS_VOLUME) WIMFILE\n" -" [IMAGE_NAME [IMAGE_DESCRIPTION]] [--boot] [--check]\n" -" [--nocheck] [--flags EDITION_ID] [--verbose]\n" +" [IMAGE_NAME [IMAGE_DESCRIPTION]] [--boot]\n" +" [--check] [--nocheck] [--flags EDITION_ID] [--verbose]\n" " [--dereference] [--config=FILE] [--threads=NUM_THREADS]\n" -" [--rebuild] [--unix-data] [--source-list] [--no-acls]\n" -" [--strict-acls] [--rpfix] [--norpfix] [--pipable]\n" -" [--not-pipable]\n" +" [--source-list] [--no-acls] [--strict-acls] [--rpfix]\n" +" [--norpfix] [--unix-data] [--pipable]\n" +" [--update-of=[WIMFILE:]IMAGE]\n" ), [CMD_APPLY] = T( @@ -3489,12 +3717,13 @@ T( [CMD_CAPTURE] = T( " %"TS" (DIRECTORY | NTFS_VOLUME) WIMFILE\n" -" [IMAGE_NAME [IMAGE_DESCRIPTION]] [--boot] [--check]\n" -" [--nocheck] [--compress=TYPE] [--flags EDITION_ID]\n" -" [--verbose] [--dereference] [--config=FILE]\n" -" [--threads=NUM_THREADS] [--unix-data] [--source-list]\n" +" [IMAGE_NAME [IMAGE_DESCRIPTION]] [--boot]\n" +" [--check] [--nocheck] [--compress=TYPE]\n" +" [--flags EDITION_ID] [--verbose] [--dereference]\n" +" [--config=FILE] [--threads=NUM_THREADS] [--source-list]\n" " [--no-acls] [--strict-acls] [--rpfix] [--norpfix]\n" -" [--pipable] [--not-pipable]\n" +" [--unix-data] [--pipable] [--update-of=[WIMFILE:]IMAGE]\n" +" [--delta-from=WIMFILE]\n" ), [CMD_DELETE] = T( @@ -3548,6 +3777,7 @@ T( [CMD_OPTIMIZE] = T( " %"TS" WIMFILE [--check] [--nocheck] [--recompress]\n" +" [--recompress-slow] [--compress=TYPE]\n" " [--threads=NUM_THREADS] [--pipable] [--not-pipable]\n" ), [CMD_SPLIT] = @@ -3569,32 +3799,33 @@ T( }; static const tchar *invocation_name; -static bool using_cmd_from_invocation_name = false; +static int invocation_cmd = CMD_NONE; static const tchar *get_cmd_string(int cmd, bool nospace) { - - if (using_cmd_from_invocation_name || cmd == CMD_NONE) { - return invocation_name; + static tchar buf[50]; + if (cmd == CMD_NONE) { + tsprintf(buf, T("%"TS), T(IMAGEX_PROGNAME)); + } else if (invocation_cmd != CMD_NONE) { + tsprintf(buf, T("wim%"TS), imagex_commands[cmd].name); } else { const tchar *format; - static tchar buf[50]; if (nospace) format = T("%"TS"-%"TS""); else format = T("%"TS" %"TS""); tsprintf(buf, format, invocation_name, imagex_commands[cmd].name); - return buf; } + return buf; } static void version(void) { - static const tchar *format = + static const tchar *s = T( -"%"TS" (" PACKAGE ") " PACKAGE_VERSION "\n" +IMAGEX_PROGNAME " (" 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" @@ -3602,7 +3833,7 @@ version(void) "\n" "Report bugs to "PACKAGE_BUGREPORT".\n" ); - tprintf(format, invocation_name); + tfputs(s, stdout); } @@ -3727,7 +3958,7 @@ main(int argc, char **argv) if (!tstrcmp(invocation_name + 3, imagex_commands[i].name)) { - using_cmd_from_invocation_name = true; + invocation_cmd = i; cmd = i; break; } @@ -3767,8 +3998,8 @@ main(int argc, char **argv) exit(2); } - /* Enable warning and error messages in the library to be more - * user-friendly. */ + /* Enable warning and error messages in wimlib be more user-friendly. + * */ wimlib_set_print_errors(true); /* Initialize wimlib. */