X-Git-Url: https://wimlib.net/git/?p=wimlib;a=blobdiff_plain;f=programs%2Fimagex.c;h=a9e6fa63bac0718cb0f0a764f5f5dd96ffd95b80;hp=370681a551daf0a27f806944d60f70dd061d6230;hb=5eaadbe09039fd336b265423682a6ce322c45c6e;hpb=c52da37557b77351f702a865909582b29ed02d1c diff --git a/programs/imagex.c b/programs/imagex.c index 370681a5..a9e6fa63 100644 --- a/programs/imagex.c +++ b/programs/imagex.c @@ -120,9 +120,11 @@ enum { IMAGEX_ALLOW_OTHER_OPTION, IMAGEX_BOOT_OPTION, IMAGEX_CHECK_OPTION, + IMAGEX_CHUNK_SIZE_OPTION, IMAGEX_COMMAND_OPTION, IMAGEX_COMMIT_OPTION, IMAGEX_COMPRESS_OPTION, + IMAGEX_COMPRESS_SLOW_OPTION, IMAGEX_CONFIG_OPTION, IMAGEX_DEBUG_OPTION, IMAGEX_DELTA_FROM_OPTION, @@ -140,7 +142,9 @@ enum { IMAGEX_NORPFIX_OPTION, IMAGEX_NOCHECK_OPTION, IMAGEX_NO_ACLS_OPTION, + IMAGEX_NO_PACK_STREAMS_OPTION, IMAGEX_NOT_PIPABLE_OPTION, + IMAGEX_PACK_STREAMS_OPTION, IMAGEX_PATH_OPTION, IMAGEX_PIPABLE_OPTION, IMAGEX_REBUILD_OPTION, @@ -188,6 +192,9 @@ 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("chunk-size"), required_argument, NULL, IMAGEX_CHUNK_SIZE_OPTION}, + {T("pack-streams"), no_argument, NULL, IMAGEX_PACK_STREAMS_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}, @@ -280,7 +287,13 @@ 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("chunk-size"), required_argument, NULL, IMAGEX_CHUNK_SIZE_OPTION}, + {T("pack-streams"),no_argument, NULL, IMAGEX_PACK_STREAMS_OPTION}, + {T("no-pack-streams"), no_argument, NULL, IMAGEX_NO_PACK_STREAMS_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}, @@ -366,11 +379,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; } @@ -380,7 +395,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; } @@ -404,6 +419,8 @@ get_compression_type(const tchar *optarg) return WIMLIB_COMPRESSION_TYPE_LZX; else if (!tstrcasecmp(optarg, T("fast")) || !tstrcasecmp(optarg, T("xpress"))) return WIMLIB_COMPRESSION_TYPE_XPRESS; + else if (!tstrcasecmp(optarg, T("recovery")) || !tstrcasecmp(optarg, T("lzms"))) + return WIMLIB_COMPRESSION_TYPE_LZMS; else if (!tstrcasecmp(optarg, T("none"))) return WIMLIB_COMPRESSION_TYPE_NONE; else { @@ -413,61 +430,89 @@ get_compression_type(const tchar *optarg) } } -struct refglob_set { - const tchar **globs; - unsigned num_globs; - unsigned num_alloc_globs; +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 REFGLOB_SET_INITIALIZER \ - { .globs = NULL, .num_globs = 0, .num_alloc_globs = 0, } +#define STRING_SET_INITIALIZER \ + { .strings = NULL, .num_strings = 0, .num_alloc_strings = 0, } -#define REFGLOB_SET(_refglobs) \ - struct refglob_set _refglobs = REFGLOB_SET_INITIALIZER +#define STRING_SET(_strings) \ + struct string_set _strings = STRING_SET_INITIALIZER static int -refglob_set_append(struct refglob_set *set, const tchar *glob) +string_set_append(struct string_set *set, const tchar *glob) { - unsigned num_alloc_globs = set->num_alloc_globs; + unsigned num_alloc_strings = set->num_alloc_strings; - if (set->num_globs == num_alloc_globs) { - const tchar **new_globs; + if (set->num_strings == num_alloc_strings) { + const tchar **new_strings; - num_alloc_globs += 4; - new_globs = realloc(set->globs, sizeof(set->globs[0]) * num_alloc_globs); - if (!new_globs) { + 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->globs = new_globs; - set->num_alloc_globs = num_alloc_globs; + set->strings = new_strings; + set->num_alloc_strings = num_alloc_strings; } - set->globs[set->num_globs++] = glob; + 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 refglob_set *set, int open_flags) +wim_reference_globs(WIMStruct *wim, struct string_set *set, int open_flags) { - return wimlib_reference_resource_files(wim, set->globs, set->num_globs, + return wimlib_reference_resource_files(wim, set->strings, + set->num_strings, WIMLIB_REF_FLAG_GLOB_ENABLE, open_flags, imagex_progress_func); } -static void -refglob_set_destroy(struct refglob_set *set) -{ - free(set->globs); -} - static void do_resource_not_found_warning(const tchar *wimfile, const struct wimlib_wim_info *info, - const struct refglob_set *refglobs) + const struct string_set *refglobs) { if (info->total_parts > 1) { - if (refglobs->num_globs == 0) { + if (refglobs->num_strings == 0) { imagex_error(T("\"%"TS"\" is part of a split WIM. " "Use --ref to specify the other parts."), wimfile); @@ -478,7 +523,7 @@ do_resource_not_found_warning(const tchar *wimfile, } } else { imagex_error(T("If this is a delta WIM, use the --ref argument " - "to specify the WIM on which it is based.")); + "to specify the WIM(s) on which it is based.")); } } @@ -935,8 +980,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 @@ -986,22 +1031,6 @@ stdin_get_text_contents(size_t *num_tchars_ret) #define TO_PERCENT(numerator, denominator) \ (((denominator) == 0) ? 0 : ((numerator) * 100 / (denominator))) -/* Given an enumerated value for WIM compression type, return a descriptive - * string. */ -static const tchar * -get_data_type(int ctype) -{ - switch (ctype) { - case WIMLIB_COMPRESSION_TYPE_NONE: - return T("uncompressed"); - case WIMLIB_COMPRESSION_TYPE_LZX: - return T("LZX-compressed"); - case WIMLIB_COMPRESSION_TYPE_XPRESS: - return T("XPRESS-compressed"); - } - return NULL; -} - #define GIBIBYTE_MIN_NBYTES 10000000000ULL #define MEBIBYTE_MIN_NBYTES 10000000ULL #define KIBIBYTE_MIN_NBYTES 10000ULL @@ -1041,11 +1070,9 @@ imagex_progress_func(enum wimlib_progress_msg msg, info->write_streams.total_bytes); if (info->write_streams.completed_streams == 0) { - const tchar *data_type; - - data_type = get_data_type(info->write_streams.compression_type); - imagex_printf(T("Writing %"TS" data using %u thread%"TS"\n"), - data_type, info->write_streams.num_threads, + imagex_printf(T("Writing %"TS"-compressed data using %u thread%"TS"\n"), + wimlib_get_compression_type_string(info->write_streams.compression_type), + info->write_streams.num_threads, (info->write_streams.num_threads == 1) ? T("") : T("s")); } if (info->write_streams.total_parts <= 1) { @@ -1204,7 +1231,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 " @@ -1238,6 +1265,19 @@ parse_num_threads(const tchar *optarg) } } +static uint32_t parse_chunk_size(const tchar *optarg) +{ + tchar *tmp; + unsigned long chunk_size = tstrtoul(optarg, &tmp, 10); + if (chunk_size >= UINT32_MAX || *tmp || tmp == optarg) { + imagex_error(T("Chunk size must be a non-negative integer!")); + return UINT32_MAX; + } else { + return chunk_size; + } +} + + /* * Parse an option passed to an update command. * @@ -1273,9 +1313,9 @@ update_command_add_option(int op, const tchar *option, 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 +1346,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,7 +1492,7 @@ static int imagex_apply(int argc, tchar **argv, int cmd) { int c; - int open_flags = WIMLIB_OPEN_FLAG_SPLIT_OK; + int open_flags = 0; int image = WIMLIB_NO_IMAGE; WIMStruct *wim; struct wimlib_wim_info info; @@ -1462,7 +1502,7 @@ imagex_apply(int argc, tchar **argv, int cmd) const tchar *image_num_or_name = NULL; int extract_flags = WIMLIB_EXTRACT_FLAG_SEQUENTIAL; - REFGLOB_SET(refglobs); + STRING_SET(refglobs); for_opt(c, apply_options) { switch (c) { @@ -1479,7 +1519,7 @@ imagex_apply(int argc, tchar **argv, int cmd) extract_flags |= WIMLIB_EXTRACT_FLAG_VERBOSE; break; case IMAGEX_REF_OPTION: - ret = refglob_set_append(&refglobs, optarg); + ret = string_set_append(&refglobs, optarg); if (ret) goto out_free_refglobs; break; @@ -1558,7 +1598,7 @@ imagex_apply(int argc, tchar **argv, int cmd) } } - if (refglobs.num_globs) { + if (refglobs.num_strings) { if (wim == NULL) { imagex_error(T("Can't specify --ref when applying from stdin!")); ret = -1; @@ -1614,7 +1654,7 @@ imagex_apply(int argc, tchar **argv, int cmd) out_wimlib_free: wimlib_free(wim); out_free_refglobs: - refglob_set_destroy(&refglobs); + string_set_destroy(&refglobs); return ret; out_usage: @@ -1635,7 +1675,8 @@ imagex_capture_or_append(int argc, tchar **argv, int cmd) 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; + uint32_t chunk_size = UINT32_MAX; const tchar *wimfile; int wim_fd; const tchar *name; @@ -1643,8 +1684,9 @@ imagex_capture_or_append(int argc, tchar **argv, int cmd) const tchar *flags_element = NULL; WIMStruct *wim; - WIMStruct *base_wim; - const tchar *base_wimfile = NULL; + STRING_SET(base_wimfiles); + WIMStruct **base_wims; + WIMStruct *template_wim; const tchar *template_wimfile = NULL; const tchar *template_image_name_or_num = NULL; @@ -1689,6 +1731,20 @@ imagex_capture_or_append(int argc, tchar **argv, int cmd) 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_CHUNK_SIZE_OPTION: + chunk_size = parse_chunk_size(optarg); + if (chunk_size == UINT32_MAX) + goto out_err; + break; + case IMAGEX_PACK_STREAMS_OPTION: + write_flags |= WIMLIB_WRITE_FLAG_PACK_STREAMS; + break; case IMAGEX_FLAGS_OPTION: flags_element = optarg; break; @@ -1755,12 +1811,9 @@ imagex_capture_or_append(int argc, tchar **argv, int cmd) "valid for capture!")); goto out_usage; } - if (base_wimfile) { - imagex_error(T("'--delta-from' can only be " - "specified one time!")); - goto out_err; - } - base_wimfile = optarg; + ret = string_set_append(&base_wimfiles, optarg); + if (ret) + goto out_free_base_wimfiles; write_flags |= WIMLIB_WRITE_FLAG_SKIP_EXTERNAL_WIMS; break; default: @@ -1776,6 +1829,18 @@ 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 @@ -1803,9 +1868,10 @@ imagex_capture_or_append(int argc, tchar **argv, int cmd) /* 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_wimfile) { - /* Capturing delta WIM: default to base WIM. */ - template_wimfile = base_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. */ @@ -1813,9 +1879,17 @@ imagex_capture_or_append(int argc, tchar **argv, int cmd) } else { /* Capturing a normal (non-delta) WIM, so the WIM file * *must* be explicitly specified. */ - imagex_error(T("For capture of non-delta WIM, " - "'--update-of' must specify " - "WIMFILE:IMAGE!")); + 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; } } @@ -1901,6 +1975,13 @@ imagex_capture_or_append(int argc, tchar **argv, int cmd) if (ret) goto out_free_config; + /* Set chunk size if non-default. */ + if (chunk_size != UINT32_MAX) { + ret = wimlib_set_output_chunk_size(wim, chunk_size); + if (ret) + goto out_free_wim; + } + #ifndef __WIN32__ /* Detect if source is regular file or block device and set NTFS volume * capture mode. */ @@ -1938,22 +2019,41 @@ imagex_capture_or_append(int argc, tchar **argv, int cmd) } } - /* If capturing a delta WIM, reference resources from the base WIM + /* If capturing a delta WIM, reference resources from the base WIMs * before adding the new image. */ - if (base_wimfile) { - ret = wimlib_open_wim(base_wimfile, open_flags, - &base_wim, imagex_progress_func); - if (ret) + 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; + } - imagex_printf(T("Capturing delta WIM based on \"%"TS"\"\n"), - base_wimfile); + 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_wim, 1, 0); + ret = wimlib_reference_resources(wim, base_wims, + base_wimfiles.num_strings, 0); if (ret) - goto out_free_base_wim; + 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_wim = NULL; + base_wims = NULL; } /* If capturing or appending as an update of an existing (template) image, @@ -1961,15 +2061,16 @@ imagex_capture_or_append(int argc, tchar **argv, int cmd) if (template_image_name_or_num) { - if (template_wimfile == base_wimfile) { - template_wim = base_wim; + 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_wim; + goto out_free_base_wims; } template_image = wimlib_resolve_image(template_wim, @@ -1980,7 +2081,7 @@ imagex_capture_or_append(int argc, tchar **argv, int cmd) unsigned long n; struct wimlib_wim_info info; - wimlib_get_wim_info(wim, &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') && @@ -2062,11 +2163,14 @@ imagex_capture_or_append(int argc, tchar **argv, int cmd) imagex_progress_func); } out_free_template_wim: - /* template_wim may alias base_wim or wim. */ - if (template_wim != base_wim && template_wim != 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_wim: - wimlib_free(base_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: @@ -2080,14 +2184,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. */ @@ -2203,8 +2308,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; @@ -2267,7 +2371,7 @@ imagex_export(int argc, tchar **argv, int cmd) int image; struct stat stbuf; bool wim_is_new; - REFGLOB_SET(refglobs); + STRING_SET(refglobs); unsigned num_threads = 0; for_opt(c, export_options) { @@ -2288,7 +2392,7 @@ imagex_export(int argc, tchar **argv, int cmd) goto out_err; break; case IMAGEX_REF_OPTION: - ret = refglob_set_append(&refglobs, optarg); + ret = string_set_append(&refglobs, optarg); if (ret) goto out_free_refglobs; break; @@ -2319,8 +2423,7 @@ 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_free_refglobs; @@ -2361,7 +2464,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; @@ -2403,6 +2507,8 @@ imagex_export(int argc, tchar **argv, int cmd) ret = wimlib_create_new_wim(compression_type, &dest_wim); if (ret) goto out_free_src_wim; + + wimlib_set_output_chunk_size(dest_wim, src_info.chunk_size); } image = wimlib_resolve_image(src_wim, src_image_num_or_name); @@ -2410,7 +2516,7 @@ imagex_export(int argc, tchar **argv, int cmd) if (ret) goto out_free_dest_wim; - if (refglobs.num_globs) { + if (refglobs.num_strings) { ret = wim_reference_globs(src_wim, &refglobs, open_flags); if (ret) goto out_free_dest_wim; @@ -2451,7 +2557,7 @@ out_free_dest_wim: out_free_src_wim: wimlib_free(src_wim); out_free_refglobs: - refglob_set_destroy(&refglobs); + string_set_destroy(&refglobs); return ret; out_usage: @@ -2527,7 +2633,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; @@ -2536,7 +2642,7 @@ imagex_extract(int argc, tchar **argv, int cmd) tchar *dest_dir = T("."); int extract_flags = WIMLIB_EXTRACT_FLAG_SEQUENTIAL | WIMLIB_EXTRACT_FLAG_NORPFIX; - REFGLOB_SET(refglobs); + STRING_SET(refglobs); struct wimlib_extract_command *cmds; size_t num_cmds; @@ -2550,7 +2656,7 @@ imagex_extract(int argc, tchar **argv, int cmd) extract_flags |= WIMLIB_EXTRACT_FLAG_VERBOSE; break; case IMAGEX_REF_OPTION: - ret = refglob_set_append(&refglobs, optarg); + ret = string_set_append(&refglobs, optarg); if (ret) goto out_free_refglobs; break; @@ -2607,7 +2713,7 @@ imagex_extract(int argc, tchar **argv, int cmd) if (ret) goto out_wimlib_free; - if (refglobs.num_globs) { + if (refglobs.num_strings) { ret = wim_reference_globs(wim, &refglobs, open_flags); if (ret) goto out_wimlib_free; @@ -2634,7 +2740,7 @@ out_wimlib_free: out_free_cmds: free_extract_commands(cmds, num_cmds, dest_dir); out_free_refglobs: - refglob_set_destroy(&refglobs); + string_set_destroy(&refglobs); return ret; out_usage: @@ -2659,9 +2765,12 @@ print_wim_information(const tchar *wimfile, const struct wimlib_wim_info *info) tprintf(T("GUID: 0x")); print_byte_field(info->guid, sizeof(info->guid)); tputchar(T('\n')); + tprintf(T("Version: %u\n"), info->wim_version); tprintf(T("Image Count: %d\n"), info->image_count); tprintf(T("Compression: %"TS"\n"), wimlib_get_compression_type_string(info->compression_type)); + tprintf(T("Chunk Size: %"PRIu32" bytes\n"), + info->chunk_size); tprintf(T("Part Number: %d/%d\n"), info->part_number, info->total_parts); tprintf(T("Boot Index: %d\n"), info->boot_index); tprintf(T("Size: %"PRIu64" bytes\n"), info->total_bytes); @@ -2678,25 +2787,33 @@ static int print_resource(const struct wimlib_resource_entry *resource, void *_ignore) { - - tprintf(T("Uncompressed size = %"PRIu64" bytes\n"), + tprintf(T("Uncompressed size = %"PRIu64" bytes\n"), resource->uncompressed_size); + if (resource->packed) { + tprintf(T("Raw compressed size = %"PRIu64" bytes\n"), + resource->raw_resource_compressed_size); - tprintf(T("Compressed size = %"PRIu64" bytes\n"), - resource->compressed_size); + tprintf(T("Raw offset in WIM = %"PRIu64" bytes\n"), + resource->raw_resource_offset_in_wim); - tprintf(T("Offset = %"PRIu64" bytes\n"), - resource->offset); + tprintf(T("Offset in raw = %"PRIu64" bytes\n"), + resource->offset); + } else { + tprintf(T("Compressed size = %"PRIu64" bytes\n"), + resource->compressed_size); + tprintf(T("Offset in WIM = %"PRIu64" bytes\n"), + resource->offset); + } - tprintf(T("Part Number = %u\n"), resource->part_number); - tprintf(T("Reference Count = %u\n"), resource->reference_count); + tprintf(T("Part Number = %u\n"), resource->part_number); + tprintf(T("Reference Count = %u\n"), resource->reference_count); - tprintf(T("Hash = 0x")); + tprintf(T("Hash = 0x")); print_byte_field(resource->sha1_hash, sizeof(resource->sha1_hash)); tputchar(T('\n')); - tprintf(T("Flags = ")); + tprintf(T("Flags = ")); if (resource->is_compressed) tprintf(T("WIM_RESHDR_FLAG_COMPRESSED ")); if (resource->is_metadata) @@ -2705,6 +2822,8 @@ print_resource(const struct wimlib_resource_entry *resource, tprintf(T("WIM_RESHDR_FLAG_FREE ")); if (resource->is_spanned) tprintf(T("WIM_RESHDR_FLAG_SPANNED ")); + if (resource->packed) + tprintf(T("WIM_RESHDR_FLAG_PACKED_STREAMS ")); tputchar(T('\n')); tputchar(T('\n')); return 0; @@ -2738,7 +2857,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) { @@ -2804,8 +2923,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 " @@ -2997,7 +3115,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; @@ -3044,7 +3162,7 @@ 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; + int open_flags = 0; const tchar *staging_dir = NULL; const tchar *wimfile; const tchar *dir; @@ -3053,7 +3171,7 @@ imagex_mount_rw_or_ro(int argc, tchar **argv, int cmd) int image; int ret; - REFGLOB_SET(refglobs); + STRING_SET(refglobs); if (cmd == CMD_MOUNTRW) { mount_flags |= WIMLIB_MOUNT_FLAG_READWRITE; @@ -3085,7 +3203,7 @@ imagex_mount_rw_or_ro(int argc, tchar **argv, int cmd) } break; case IMAGEX_REF_OPTION: - ret = refglob_set_append(&refglobs, optarg); + ret = string_set_append(&refglobs, optarg); if (ret) goto out_free_refglobs; break; @@ -3133,7 +3251,7 @@ imagex_mount_rw_or_ro(int argc, tchar **argv, int cmd) dir = argv[1]; } - if (refglobs.num_globs) { + if (refglobs.num_strings) { ret = wim_reference_globs(wim, &refglobs, open_flags); if (ret) goto out_free_wim; @@ -3148,7 +3266,7 @@ imagex_mount_rw_or_ro(int argc, tchar **argv, int cmd) out_free_wim: wimlib_free(wim); out_free_refglobs: - refglob_set_destroy(&refglobs); + string_set_destroy(&refglobs); return ret; out_usage: @@ -3165,6 +3283,8 @@ 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; + uint32_t chunk_size = UINT32_MAX; int ret; WIMStruct *wim; const tchar *wimfile; @@ -3181,9 +3301,34 @@ 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_CHUNK_SIZE_OPTION: + chunk_size = parse_chunk_size(optarg); + if (chunk_size == UINT32_MAX) + goto out_err; + break; + case IMAGEX_PACK_STREAMS_OPTION: + write_flags |= WIMLIB_WRITE_FLAG_PACK_STREAMS; + write_flags |= WIMLIB_WRITE_FLAG_RECOMPRESS; + break; + case IMAGEX_NO_PACK_STREAMS_OPTION: + write_flags |= WIMLIB_WRITE_FLAG_NO_PACK_STREAMS; + break; case IMAGEX_THREADS_OPTION: num_threads = parse_num_threads(optarg); if (num_threads == UINT_MAX) @@ -3211,6 +3356,20 @@ imagex_optimize(int argc, tchar **argv, int cmd) if (ret) goto out; + if (compression_type != WIMLIB_COMPRESSION_TYPE_INVALID) { + /* Change compression type. */ + ret = wimlib_set_output_compression_type(wim, compression_type); + if (ret) + goto out_wimlib_free; + } + + if (chunk_size != UINT32_MAX) { + /* Change chunk size. */ + ret = wimlib_set_output_chunk_size(wim, chunk_size); + if (ret) + goto out_wimlib_free; + } + old_size = file_get_size(wimfile); tprintf(T("\"%"TS"\" original size: "), wimfile); if (old_size == -1) @@ -3525,7 +3684,7 @@ imagex_update(int argc, tchar **argv, int cmd) cmds[i].add.config = config; 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; @@ -3597,12 +3756,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] [--update-of=[WIMFILE:]IMAGE]\n" +" [--source-list] [--no-acls] [--strict-acls] [--rpfix]\n" +" [--norpfix] [--unix-data] [--pipable]\n" +" [--update-of=[WIMFILE:]IMAGE]\n" ), [CMD_APPLY] = T( @@ -3615,12 +3774,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" -" [--no-acls] [--strict-acls] [--norpfix] [--pipable]\n" -" [--update-of=[WIMFILE:]IMAGE] [--delta-from=WIMFILE]\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" +" [--unix-data] [--pipable] [--update-of=[WIMFILE:]IMAGE]\n" +" [--delta-from=WIMFILE]\n" ), [CMD_DELETE] = T( @@ -3674,6 +3834,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] =