X-Git-Url: https://wimlib.net/git/?a=blobdiff_plain;f=programs%2Fimagex.c;h=f23f043897d42dd7b90da85d4a527a3857db518d;hb=71abd45bcc85ddb5cf60aba8bbeb53b40780f521;hp=b74502b5fc0948e6b1e1ee5be4f14bb0e10ee454;hpb=df1050ef86e54f027912a15fe60bf67c8ab43d2c;p=wimlib diff --git a/programs/imagex.c b/programs/imagex.c index b74502b5..f23f0438 100644 --- a/programs/imagex.c +++ b/programs/imagex.c @@ -123,6 +123,7 @@ enum { IMAGEX_COMMAND_OPTION, IMAGEX_COMMIT_OPTION, IMAGEX_COMPRESS_OPTION, + IMAGEX_COMPRESS_SLOW_OPTION, IMAGEX_CONFIG_OPTION, IMAGEX_DEBUG_OPTION, IMAGEX_DELTA_FROM_OPTION, @@ -188,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}, @@ -281,6 +283,7 @@ static const struct option optimize_options[] = { {T("nocheck"), no_argument, NULL, IMAGEX_NOCHECK_OPTION}, {T("no-check"), no_argument, NULL, IMAGEX_NOCHECK_OPTION}, {T("recompress"), no_argument, NULL, IMAGEX_RECOMPRESS_OPTION}, + {T("compress-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}, @@ -415,61 +418,63 @@ get_compression_type(const tchar *optarg) } } -struct refglob_set { - const tchar **globs; - unsigned num_globs; - unsigned num_alloc_globs; +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); @@ -480,7 +485,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.")); } } @@ -1464,7 +1469,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) { @@ -1481,7 +1486,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; @@ -1560,7 +1565,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; @@ -1616,7 +1621,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: @@ -1645,8 +1650,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; @@ -1691,6 +1697,9 @@ 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: + write_flags |= WIMLIB_WRITE_FLAG_COMPRESS_SLOW; + break; case IMAGEX_FLAGS_OPTION: flags_element = optarg; break; @@ -1757,12 +1766,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: @@ -1805,9 +1811,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. */ @@ -1815,9 +1822,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; } } @@ -1940,22 +1955,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; + } + + 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; - imagex_printf(T("Capturing delta WIM based on \"%"TS"\"\n"), - base_wimfile); + } - 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, @@ -1963,15 +1997,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, @@ -1982,7 +2017,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') && @@ -2064,11 +2099,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: @@ -2082,14 +2120,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. */ @@ -2268,7 +2307,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) { @@ -2289,7 +2328,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; @@ -2411,7 +2450,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; @@ -2452,7 +2491,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: @@ -2537,7 +2576,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; @@ -2551,7 +2590,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; @@ -2608,7 +2647,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; @@ -2635,7 +2674,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: @@ -3053,7 +3092,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 +3124,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 +3172,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 +3187,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: @@ -3184,6 +3223,9 @@ imagex_optimize(int argc, tchar **argv, int cmd) case IMAGEX_RECOMPRESS_OPTION: write_flags |= WIMLIB_WRITE_FLAG_RECOMPRESS; break; + case IMAGEX_COMPRESS_SLOW_OPTION: + write_flags |= WIMLIB_WRITE_FLAG_COMPRESS_SLOW; + break; case IMAGEX_THREADS_OPTION: num_threads = parse_num_threads(optarg); if (num_threads == UINT_MAX) @@ -3597,12 +3639,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" -" [--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" +" [IMAGE_NAME [IMAGE_DESCRIPTION]] [--boot]\n" +" [--check] [--nocheck] [--compress-slow]\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" ), [CMD_APPLY] = T( @@ -3615,12 +3657,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] [--compress-slow]\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,7 +3717,8 @@ T( [CMD_OPTIMIZE] = T( " %"TS" WIMFILE [--check] [--nocheck] [--recompress]\n" -" [--threads=NUM_THREADS] [--pipable] [--not-pipable]\n" +" [--compress-slow] [--threads=NUM_THREADS]\n" +" [--pipable] [--not-pipable]\n" ), [CMD_SPLIT] = T(