X-Git-Url: https://wimlib.net/git/?p=wimlib;a=blobdiff_plain;f=programs%2Fimagex.c;h=fdd35c8072b089b19b6793da3d16a78ad60a3cb0;hp=81f2f9f6a7b9aa392488e8e930dd6657dbed5133;hb=4b1e717ade0d3a519f84b950f33d8cd14a30b698;hpb=157ec1472cea867b62aa59405fe9023aa0549399 diff --git a/programs/imagex.c b/programs/imagex.c index 81f2f9f6..fdd35c80 100644 --- a/programs/imagex.c +++ b/programs/imagex.c @@ -6,7 +6,7 @@ */ /* - * Copyright (C) 2012, 2013, 2014 Eric Biggers + * Copyright (C) 2012-2016 Eric Biggers * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -46,6 +46,8 @@ # include #endif +#define WIMLIB_COMPRESSION_TYPE_INVALID (-1) + #ifdef __WIN32__ # include "imagex-win32.h" # define print_security_descriptor win32_print_security_descriptor @@ -122,6 +124,7 @@ enum { CMD_UNMOUNT, #endif CMD_UPDATE, + CMD_VERIFY, CMD_MAX, }; @@ -138,11 +141,13 @@ static FILE *imagex_info_file; enum { IMAGEX_ALLOW_OTHER_OPTION, + IMAGEX_BLOBS_OPTION, IMAGEX_BOOT_OPTION, IMAGEX_CHECK_OPTION, IMAGEX_CHUNK_SIZE_OPTION, IMAGEX_COMMAND_OPTION, IMAGEX_COMMIT_OPTION, + IMAGEX_COMPACT_OPTION, IMAGEX_COMPRESS_OPTION, IMAGEX_COMPRESS_SLOW_OPTION, IMAGEX_CONFIG_OPTION, @@ -155,9 +160,9 @@ enum { IMAGEX_FLAGS_OPTION, IMAGEX_FORCE_OPTION, IMAGEX_HEADER_OPTION, + IMAGEX_IMAGE_PROPERTY_OPTION, IMAGEX_INCLUDE_INVALID_NAMES_OPTION, IMAGEX_LAZY_OPTION, - IMAGEX_LOOKUP_TABLE_OPTION, IMAGEX_METADATA_OPTION, IMAGEX_NEW_IMAGE_OPTION, IMAGEX_NOCHECK_OPTION, @@ -165,13 +170,11 @@ enum { IMAGEX_NOT_PIPABLE_OPTION, IMAGEX_NO_ACLS_OPTION, IMAGEX_NO_ATTRIBUTES_OPTION, - IMAGEX_NO_REPLACE_OPTION, IMAGEX_NO_GLOBS_OPTION, + IMAGEX_NO_REPLACE_OPTION, + IMAGEX_NO_SOLID_SORT_OPTION, IMAGEX_NULLGLOB_OPTION, IMAGEX_ONE_FILE_ONLY_OPTION, - IMAGEX_PACK_CHUNK_SIZE_OPTION, - IMAGEX_PACK_COMPRESS_OPTION, - IMAGEX_PACK_STREAMS_OPTION, IMAGEX_PATH_OPTION, IMAGEX_PIPABLE_OPTION, IMAGEX_PRESERVE_DIR_STRUCTURE_OPTION, @@ -179,9 +182,12 @@ enum { IMAGEX_RECOMPRESS_OPTION, IMAGEX_RECURSIVE_OPTION, IMAGEX_REF_OPTION, - IMAGEX_RESUME_OPTION, IMAGEX_RPFIX_OPTION, + IMAGEX_SNAPSHOT_OPTION, IMAGEX_SOFT_OPTION, + IMAGEX_SOLID_CHUNK_SIZE_OPTION, + IMAGEX_SOLID_COMPRESS_OPTION, + IMAGEX_SOLID_OPTION, IMAGEX_SOURCE_LIST_OPTION, IMAGEX_STAGING_DIR_OPTION, IMAGEX_STREAMS_INTERFACE_OPTION, @@ -189,10 +195,11 @@ enum { IMAGEX_THREADS_OPTION, IMAGEX_TO_STDOUT_OPTION, IMAGEX_UNIX_DATA_OPTION, + IMAGEX_UNSAFE_COMPACT_OPTION, IMAGEX_UPDATE_OF_OPTION, IMAGEX_VERBOSE_OPTION, - IMAGEX_WIMBOOT_OPTION, IMAGEX_WIMBOOT_CONFIG_OPTION, + IMAGEX_WIMBOOT_OPTION, IMAGEX_XML_OPTION, }; @@ -208,10 +215,8 @@ 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}, {T("wimboot"), no_argument, NULL, IMAGEX_WIMBOOT_OPTION}, + {T("compact"), required_argument, NULL, IMAGEX_COMPACT_OPTION}, {NULL, 0, NULL, 0}, }; @@ -223,15 +228,14 @@ static const struct option capture_or_append_options[] = { {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-chunk-size"), required_argument, NULL, IMAGEX_PACK_CHUNK_SIZE_OPTION}, - {T("solid-chunk-size"),required_argument, NULL, IMAGEX_PACK_CHUNK_SIZE_OPTION}, - {T("pack-compress"), required_argument, NULL, IMAGEX_PACK_COMPRESS_OPTION}, - {T("solid-compress"),required_argument, NULL, IMAGEX_PACK_COMPRESS_OPTION}, - {T("pack-streams"), no_argument, NULL, IMAGEX_PACK_STREAMS_OPTION}, - {T("solid"), no_argument, NULL, IMAGEX_PACK_STREAMS_OPTION}, + {T("solid"), no_argument, NULL, IMAGEX_SOLID_OPTION}, + {T("solid-compress"),required_argument, NULL, IMAGEX_SOLID_COMPRESS_OPTION}, + {T("solid-chunk-size"),required_argument, NULL, IMAGEX_SOLID_CHUNK_SIZE_OPTION}, + {T("no-solid-sort"), no_argument, NULL, IMAGEX_NO_SOLID_SORT_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}, + {T("image-property"), required_argument, NULL, IMAGEX_IMAGE_PROPERTY_OPTION}, {T("verbose"), no_argument, NULL, IMAGEX_VERBOSE_OPTION}, {T("threads"), required_argument, NULL, IMAGEX_THREADS_OPTION}, {T("rebuild"), no_argument, NULL, IMAGEX_REBUILD_OPTION}, @@ -247,12 +251,15 @@ static const struct option capture_or_append_options[] = { {T("update-of"), required_argument, NULL, IMAGEX_UPDATE_OF_OPTION}, {T("delta-from"), required_argument, NULL, IMAGEX_DELTA_FROM_OPTION}, {T("wimboot"), no_argument, NULL, IMAGEX_WIMBOOT_OPTION}, + {T("unsafe-compact"), no_argument, NULL, IMAGEX_UNSAFE_COMPACT_OPTION}, + {T("snapshot"), no_argument, NULL, IMAGEX_SNAPSHOT_OPTION}, {NULL, 0, NULL, 0}, }; static const struct option delete_options[] = { {T("check"), no_argument, NULL, IMAGEX_CHECK_OPTION}, {T("soft"), no_argument, NULL, IMAGEX_SOFT_OPTION}, + {T("unsafe-compact"), no_argument, NULL, IMAGEX_UNSAFE_COMPACT_OPTION}, {NULL, 0, NULL, 0}, }; @@ -260,6 +267,7 @@ static const struct option dir_options[] = { {T("path"), required_argument, NULL, IMAGEX_PATH_OPTION}, {T("detailed"), no_argument, NULL, IMAGEX_DETAILED_OPTION}, {T("one-file-only"), no_argument, NULL, IMAGEX_ONE_FILE_ONLY_OPTION}, + {T("ref"), required_argument, NULL, IMAGEX_REF_OPTION}, {NULL, 0, NULL, 0}, }; @@ -269,20 +277,20 @@ static const struct option export_options[] = { {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("pack-streams"),no_argument, NULL, IMAGEX_PACK_STREAMS_OPTION}, - {T("solid"), no_argument, NULL, IMAGEX_PACK_STREAMS_OPTION}, {T("chunk-size"), required_argument, NULL, IMAGEX_CHUNK_SIZE_OPTION}, - {T("pack-chunk-size"), required_argument, NULL, IMAGEX_PACK_CHUNK_SIZE_OPTION}, - {T("solid-chunk-size"),required_argument, NULL, IMAGEX_PACK_CHUNK_SIZE_OPTION}, - {T("pack-compress"), required_argument, NULL, IMAGEX_PACK_COMPRESS_OPTION}, - {T("solid-compress"),required_argument, NULL, IMAGEX_PACK_COMPRESS_OPTION}, + {T("solid"), no_argument, NULL, IMAGEX_SOLID_OPTION}, + {T("solid-compress"),required_argument, NULL, IMAGEX_SOLID_COMPRESS_OPTION}, + {T("solid-chunk-size"),required_argument, NULL, IMAGEX_SOLID_CHUNK_SIZE_OPTION}, + {T("no-solid-sort"), no_argument, NULL, IMAGEX_NO_SOLID_SORT_OPTION}, {T("ref"), required_argument, NULL, IMAGEX_REF_OPTION}, {T("threads"), required_argument, NULL, IMAGEX_THREADS_OPTION}, {T("rebuild"), no_argument, NULL, IMAGEX_REBUILD_OPTION}, {T("pipable"), no_argument, NULL, IMAGEX_PIPABLE_OPTION}, {T("not-pipable"), no_argument, NULL, IMAGEX_NOT_PIPABLE_OPTION}, {T("wimboot"), no_argument, NULL, IMAGEX_WIMBOOT_OPTION}, + {T("unsafe-compact"), no_argument, NULL, IMAGEX_UNSAFE_COMPACT_OPTION}, {NULL, 0, NULL, 0}, }; @@ -303,6 +311,7 @@ static const struct option extract_options[] = { {T("nullglob"), no_argument, NULL, IMAGEX_NULLGLOB_OPTION}, {T("preserve-dir-structure"), no_argument, NULL, IMAGEX_PRESERVE_DIR_STRUCTURE_OPTION}, {T("wimboot"), no_argument, NULL, IMAGEX_WIMBOOT_OPTION}, + {T("compact"), required_argument, NULL, IMAGEX_COMPACT_OPTION}, {NULL, 0, NULL, 0}, }; @@ -313,9 +322,11 @@ static const struct option info_options[] = { {T("no-check"), no_argument, NULL, IMAGEX_NOCHECK_OPTION}, {T("extract-xml"), required_argument, NULL, IMAGEX_EXTRACT_XML_OPTION}, {T("header"), no_argument, NULL, IMAGEX_HEADER_OPTION}, - {T("lookup-table"), no_argument, NULL, IMAGEX_LOOKUP_TABLE_OPTION}, + {T("lookup-table"), no_argument, NULL, IMAGEX_BLOBS_OPTION}, + {T("blobs"), no_argument, NULL, IMAGEX_BLOBS_OPTION}, {T("metadata"), no_argument, NULL, IMAGEX_METADATA_OPTION}, {T("xml"), no_argument, NULL, IMAGEX_XML_OPTION}, + {T("image-property"), required_argument, NULL, IMAGEX_IMAGE_PROPERTY_OPTION}, {NULL, 0, NULL, 0}, }; @@ -342,17 +353,16 @@ static const struct option optimize_options[] = { {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("recompress-slow"), no_argument, NULL, IMAGEX_COMPRESS_SLOW_OPTION}, {T("chunk-size"), required_argument, NULL, IMAGEX_CHUNK_SIZE_OPTION}, - {T("pack-chunk-size"), required_argument, NULL, IMAGEX_PACK_CHUNK_SIZE_OPTION}, - {T("solid-chunk-size"),required_argument, NULL, IMAGEX_PACK_CHUNK_SIZE_OPTION}, - {T("pack-compress"), required_argument, NULL, IMAGEX_PACK_COMPRESS_OPTION}, - {T("solid-compress"),required_argument, NULL, IMAGEX_PACK_COMPRESS_OPTION}, - {T("pack-streams"),no_argument, NULL, IMAGEX_PACK_STREAMS_OPTION}, - {T("solid"), no_argument, NULL, IMAGEX_PACK_STREAMS_OPTION}, + {T("solid"), no_argument, NULL, IMAGEX_SOLID_OPTION}, + {T("solid-compress"),required_argument, NULL, IMAGEX_SOLID_COMPRESS_OPTION}, + {T("solid-chunk-size"),required_argument, NULL, IMAGEX_SOLID_CHUNK_SIZE_OPTION}, + {T("no-solid-sort"), no_argument, NULL, IMAGEX_NO_SOLID_SORT_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}, + {T("unsafe-compact"), no_argument, NULL, IMAGEX_UNSAFE_COMPACT_OPTION}, {NULL, 0, NULL, 0}, }; @@ -397,6 +407,14 @@ static const struct option update_options[] = { {T("no-acls"), no_argument, NULL, IMAGEX_NO_ACLS_OPTION}, {T("strict-acls"), no_argument, NULL, IMAGEX_STRICT_ACLS_OPTION}, {T("no-replace"), no_argument, NULL, IMAGEX_NO_REPLACE_OPTION}, + {T("unsafe-compact"), no_argument, NULL, IMAGEX_UNSAFE_COMPACT_OPTION}, + + {NULL, 0, NULL, 0}, +}; + +static const struct option verify_options[] = { + {T("ref"), required_argument, NULL, IMAGEX_REF_OPTION}, + {T("nocheck"), no_argument, NULL, IMAGEX_NOCHECK_OPTION}, {NULL, 0, NULL, 0}, }; @@ -471,68 +489,121 @@ verify_image_exists_and_is_single(int image, const tchar *image_name, return ret; } -/* Parse the argument to --compress */ +static void +print_available_compression_types(FILE *fp) +{ + static const tchar *s = + T( + "Available compression types:\n" + "\n" + " none\n" + " xpress (alias: \"fast\")\n" + " lzx (alias: \"maximum\") (default for capture)\n" + " lzms (alias: \"recovery\")\n" + "\n" + ); + tfputs(s, fp); +} + +/* Parse the argument to --compress or --solid-compress */ static int -get_compression_type(const tchar *optarg) +get_compression_type(tchar *optarg, bool solid) { + int ctype; + unsigned int compression_level = 0; + tchar *plevel; + + plevel = tstrchr(optarg, T(':')); + if (plevel) { + tchar *ptmp; + unsigned long ultmp; + + *plevel++ = T('\0'); + ultmp = tstrtoul(plevel, &ptmp, 10); + if (ultmp >= UINT_MAX || ultmp == 0 || *ptmp || ptmp == plevel) { + imagex_error(T("Compression level must be a positive integer! " + "e.g. --compress=lzx:80")); + return WIMLIB_COMPRESSION_TYPE_INVALID; + } + compression_level = ultmp; + } + if (!tstrcasecmp(optarg, T("maximum")) || !tstrcasecmp(optarg, T("lzx")) || - !tstrcasecmp(optarg, T("max"))) - 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 { - imagex_error(T("Invalid compression type \"%"TS"\"! Must be " - "\"maximum\", \"fast\", or \"none\"."), optarg); + !tstrcasecmp(optarg, T("max"))) { + ctype = WIMLIB_COMPRESSION_TYPE_LZX; + } else if (!tstrcasecmp(optarg, T("fast")) || !tstrcasecmp(optarg, T("xpress"))) { + ctype = WIMLIB_COMPRESSION_TYPE_XPRESS; + } else if (!tstrcasecmp(optarg, T("recovery"))) { + if (!solid) { + tfprintf(stderr, +T( +"Warning: use of '--compress=recovery' is discouraged because it behaves\n" +" differently from DISM. Instead, you typically want to use '--solid' to\n" +" create a solid LZMS-compressed WIM or \"ESD file\", similar to DISM's\n" +" /compress:recovery. But if you really want *non-solid* LZMS compression,\n" +" then you may suppress this warning by specifying '--compress=lzms' instead\n" +" of '--compress=recovery'.\n")); + } + ctype = WIMLIB_COMPRESSION_TYPE_LZMS; + } else if (!tstrcasecmp(optarg, T("lzms"))) { + ctype = WIMLIB_COMPRESSION_TYPE_LZMS; + } else if (!tstrcasecmp(optarg, T("none"))) { + ctype = WIMLIB_COMPRESSION_TYPE_NONE; + } else { + imagex_error(T("Invalid compression type \"%"TS"\"!"), optarg); + print_available_compression_types(stderr); return WIMLIB_COMPRESSION_TYPE_INVALID; } + + if (compression_level != 0) + wimlib_set_default_compression_level(ctype, compression_level); + return ctype; } -static void -set_compress_slow(void) +/* Parse the argument to --compact */ +static int +set_compact_mode(const tchar *arg, int *extract_flags) { - static const struct wimlib_lzx_compressor_params lzx_slow_params = { - .hdr = { - .size = sizeof(struct wimlib_lzx_compressor_params), - }, - .algorithm = WIMLIB_LZX_ALGORITHM_SLOW, - .alg_params = { - .slow = { - .use_len2_matches = 1, - .nice_match_length = 96, - .num_optim_passes = 4, - .max_search_depth = 100, - .main_nostat_cost = 15, - .len_nostat_cost = 15, - .aligned_nostat_cost = 7, - }, - }, - }; + int flag = 0; + if (!tstrcasecmp(arg, T("xpress4k"))) + flag = WIMLIB_EXTRACT_FLAG_COMPACT_XPRESS4K; + else if (!tstrcasecmp(arg, T("xpress8k"))) + flag = WIMLIB_EXTRACT_FLAG_COMPACT_XPRESS8K; + else if (!tstrcasecmp(arg, T("xpress16k"))) + flag = WIMLIB_EXTRACT_FLAG_COMPACT_XPRESS16K; + else if (!tstrcasecmp(arg, T("lzx"))) + flag = WIMLIB_EXTRACT_FLAG_COMPACT_LZX; + + if (flag) { + *extract_flags |= flag; + return 0; + } - static const struct wimlib_lzms_compressor_params lzms_slow_params = { - .hdr = { - .size = sizeof(struct wimlib_lzms_compressor_params), - }, - .min_match_length = 2, - .max_match_length = UINT32_MAX, - .nice_match_length = 96, - .max_search_depth = 100, - .optim_array_length = 1024, - }; + imagex_error(T( +"\"%"TS"\" is not a recognized System Compression format. The options are:" +"\n" +" --compact=xpress4k\n" +" --compact=xpress8k\n" +" --compact=xpress16k\n" +" --compact=lzx\n" + ), arg); + return -1; +} - wimlib_set_default_compressor_params(WIMLIB_COMPRESSION_TYPE_LZX, - &lzx_slow_params.hdr); - wimlib_set_default_compressor_params(WIMLIB_COMPRESSION_TYPE_LZMS, - &lzms_slow_params.hdr); +static void +set_compress_slow(void) +{ +#if 0 + fprintf(stderr, "WARNING: the '--compress-slow' option is deprecated.\n" + " Use the '--compress=TYPE:LEVEL' option instead.\n"); +#endif + wimlib_set_default_compression_level(-1, 100); } struct string_set { - const tchar **strings; + tchar **strings; unsigned num_strings; unsigned num_alloc_strings; }; @@ -544,12 +615,12 @@ struct string_set { struct string_set _strings = STRING_SET_INITIALIZER static int -string_set_append(struct string_set *set, const tchar *glob) +string_set_append(struct string_set *set, tchar *glob) { unsigned num_alloc_strings = set->num_alloc_strings; if (set->num_strings == num_alloc_strings) { - const tchar **new_strings; + tchar **new_strings; num_alloc_strings += 4; new_strings = realloc(set->strings, @@ -574,12 +645,57 @@ string_set_destroy(struct string_set *set) static int wim_reference_globs(WIMStruct *wim, struct string_set *set, int open_flags) { - return wimlib_reference_resource_files(wim, set->strings, + return wimlib_reference_resource_files(wim, (const tchar **)set->strings, set->num_strings, WIMLIB_REF_FLAG_GLOB_ENABLE, open_flags); } +static int +append_image_property_argument(struct string_set *image_properties) +{ + if (!tstrchr(optarg, '=')) { + imagex_error(T("'--image-property' argument " + "must be in the form NAME=VALUE")); + return -1; + } + return string_set_append(image_properties, optarg); +} + +static int +apply_image_properties(struct string_set *image_properties, + WIMStruct *wim, int image, bool *any_changes_ret) +{ + bool any_changes = false; + for (unsigned i = 0; i < image_properties->num_strings; i++) { + tchar *name, *value; + const tchar *current_value; + int ret; + + name = image_properties->strings[i]; + value = tstrchr(name, '='); + *value++ = '\0'; + + current_value = wimlib_get_image_property(wim, image, name); + if (current_value && !tstrcmp(current_value, value)) { + imagex_printf(T("The %"TS" property of image %d " + "already has value \"%"TS"\".\n"), + name, image, value); + } else { + imagex_printf(T("Setting the %"TS" property of image " + "%d to \"%"TS"\".\n"), + name, image, value); + ret = wimlib_set_image_property(wim, image, name, value); + if (ret) + return ret; + any_changes = true; + } + } + if (any_changes_ret) + *any_changes_ret = any_changes; + return 0; +} + static void do_resource_not_found_warning(const tchar *wimfile, const struct wimlib_wim_info *info, @@ -601,6 +717,17 @@ do_resource_not_found_warning(const tchar *wimfile, } } +static void +do_metadata_not_found_warning(const tchar *wimfile, + const struct wimlib_wim_info *info) +{ + if (info->part_number != 1) { + imagex_error(T("\"%"TS"\" is not the first part of the split WIM.\n" + " You must specify the first part."), + wimfile); + } +} + /* 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 @@ -1031,23 +1158,24 @@ imagex_progress_func(enum wimlib_progress_msg msg, switch (msg) { case WIMLIB_PROGRESS_MSG_WRITE_STREAMS: { - static bool first = true; - if (first) { - 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")); - first = false; + static bool started; + if (!started) { + if (info->write_streams.compression_type != WIMLIB_COMPRESSION_TYPE_NONE) { + imagex_printf(T("Using %"TS" compression " + "with %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")); + } + started = true; } } 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); - imagex_printf(T("\r%"PRIu64" %"TS" of %"PRIu64" %"TS" (uncompressed) " - "written (%u%% done)"), + imagex_printf(T("\rArchiving file data: %"PRIu64" %"TS" of %"PRIu64" %"TS" (%u%%) done"), info->write_streams.completed_bytes >> unit_shift, unit_name, info->write_streams.total_bytes >> unit_shift, @@ -1140,11 +1268,22 @@ imagex_progress_func(enum wimlib_progress_msg msg, T("NTFS volume") : T("directory")), info->extract.target); break; + case WIMLIB_PROGRESS_MSG_EXTRACT_FILE_STRUCTURE: + if (info->extract.end_file_count >= 2000) { + percent_done = TO_PERCENT(info->extract.current_file_count, + info->extract.end_file_count); + imagex_printf(T("\rCreating files: %"PRIu64" of %"PRIu64" (%u%%) done"), + info->extract.current_file_count, + info->extract.end_file_count, percent_done); + if (info->extract.current_file_count == info->extract.end_file_count) + imagex_printf(T("\n")); + } + break; case WIMLIB_PROGRESS_MSG_EXTRACT_STREAMS: percent_done = TO_PERCENT(info->extract.completed_bytes, info->extract.total_bytes); unit_shift = get_unit(info->extract.total_bytes, &unit_name); - imagex_printf(T("\rExtracting files: " + imagex_printf(T("\rExtracting file data: " "%"PRIu64" %"TS" of %"PRIu64" %"TS" (%u%%) done"), info->extract.completed_bytes >> unit_shift, unit_name, @@ -1154,6 +1293,17 @@ 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_METADATA: + if (info->extract.end_file_count >= 2000) { + percent_done = TO_PERCENT(info->extract.current_file_count, + info->extract.end_file_count); + imagex_printf(T("\rApplying metadata to files: %"PRIu64" of %"PRIu64" (%u%%) done"), + info->extract.current_file_count, + info->extract.end_file_count, percent_done); + if (info->extract.current_file_count == info->extract.end_file_count) + 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"), @@ -1221,6 +1371,25 @@ imagex_progress_func(enum wimlib_progress_msg msg, } } break; + case WIMLIB_PROGRESS_MSG_BEGIN_VERIFY_IMAGE: + imagex_printf(T("Verifying metadata for image %"PRIu32" of %"PRIu32"\n"), + info->verify_image.current_image, + info->verify_image.total_images); + break; + case WIMLIB_PROGRESS_MSG_VERIFY_STREAMS: + percent_done = TO_PERCENT(info->verify_streams.completed_bytes, + info->verify_streams.total_bytes); + unit_shift = get_unit(info->verify_streams.total_bytes, &unit_name); + imagex_printf(T("\rVerifying file data: " + "%"PRIu64" %"TS" of %"PRIu64" %"TS" (%u%%) done"), + info->verify_streams.completed_bytes >> unit_shift, + unit_name, + info->verify_streams.total_bytes >> unit_shift, + unit_name, + percent_done); + if (info->verify_streams.completed_bytes == info->verify_streams.total_bytes) + imagex_printf(T("\n")); + break; default: break; } @@ -1241,16 +1410,37 @@ parse_num_threads(const tchar *optarg) } } -static uint32_t parse_chunk_size(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; - } + tchar *tmp; + uint64_t chunk_size = tstrtoul(optarg, &tmp, 10); + if (chunk_size == 0) { + imagex_error(T("Invalid chunk size specification; must be a positive integer\n" + " with optional K, M, or G suffix")); + return UINT32_MAX; + } + if (*tmp) { + if (*tmp == T('k') || *tmp == T('K')) { + chunk_size <<= 10; + tmp++; + } else if (*tmp == T('m') || *tmp == T('M')) { + chunk_size <<= 20; + tmp++; + } else if (*tmp == T('g') || *tmp == T('G')) { + chunk_size <<= 30; + tmp++; + } + if (*tmp && !(*tmp == T('i') && *(tmp + 1) == T('B'))) { + imagex_error(T("Invalid chunk size specification; suffix must be K, M, or G")); + return UINT32_MAX; + } + } + if (chunk_size >= UINT32_MAX) { + imagex_error(T("Invalid chunk size specification; the value is too large!")); + return UINT32_MAX; + } + return chunk_size; } @@ -1517,12 +1707,14 @@ 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; case IMAGEX_WIMBOOT_OPTION: extract_flags |= WIMLIB_EXTRACT_FLAG_WIMBOOT; break; + case IMAGEX_COMPACT_OPTION: + ret = set_compact_mode(optarg, &extract_flags); + if (ret) + goto out_free_refglobs; + break; default: goto out_usage; } @@ -1630,6 +1822,8 @@ imagex_apply(int argc, tchar **argv, int cmd) " make sure you have " "concatenated together all parts.")); } + } else if (ret == WIMLIB_ERR_METADATA_NOT_FOUND && wim) { + do_metadata_not_found_warning(wimfile, &info); } out_wimlib_free: wimlib_free(wim); @@ -1651,20 +1845,19 @@ static int 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 | - WIMLIB_ADD_IMAGE_FLAG_WINCONFIG | - WIMLIB_ADD_IMAGE_FLAG_VERBOSE; + int open_flags = 0; + int add_flags = WIMLIB_ADD_FLAG_EXCLUDE_VERBOSE | + WIMLIB_ADD_FLAG_WINCONFIG | + WIMLIB_ADD_FLAG_VERBOSE; int write_flags = 0; int compression_type = WIMLIB_COMPRESSION_TYPE_INVALID; uint32_t chunk_size = UINT32_MAX; - uint32_t pack_chunk_size = UINT32_MAX; - int pack_ctype = WIMLIB_COMPRESSION_TYPE_INVALID; + uint32_t solid_chunk_size = UINT32_MAX; + int solid_ctype = WIMLIB_COMPRESSION_TYPE_INVALID; const tchar *wimfile; int wim_fd; const tchar *name; - const tchar *desc; - const tchar *flags_element = NULL; + STRING_SET(image_properties); WIMStruct *wim; STRING_SET(base_wimfiles); @@ -1690,12 +1883,11 @@ imagex_capture_or_append(int argc, tchar **argv, int cmd) struct wimlib_capture_source *capture_sources; size_t num_sources; bool name_defaulted; - bool compress_slow = false; for_opt(c, capture_or_append_options) { switch (c) { case IMAGEX_BOOT_OPTION: - add_image_flags |= WIMLIB_ADD_IMAGE_FLAG_BOOT; + add_flags |= WIMLIB_ADD_FLAG_BOOT; break; case IMAGEX_CHECK_OPTION: open_flags |= WIMLIB_OPEN_FLAG_CHECK_INTEGRITY; @@ -1706,39 +1898,52 @@ 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; + add_flags &= ~WIMLIB_ADD_FLAG_WINCONFIG; break; case IMAGEX_COMPRESS_OPTION: - compression_type = get_compression_type(optarg); + compression_type = get_compression_type(optarg, false); if (compression_type == WIMLIB_COMPRESSION_TYPE_INVALID) goto out_err; break; case IMAGEX_COMPRESS_SLOW_OPTION: - compress_slow = true; + set_compress_slow(); break; case IMAGEX_CHUNK_SIZE_OPTION: chunk_size = parse_chunk_size(optarg); if (chunk_size == UINT32_MAX) goto out_err; break; - case IMAGEX_PACK_CHUNK_SIZE_OPTION: - pack_chunk_size = parse_chunk_size(optarg); - if (pack_chunk_size == UINT32_MAX) + case IMAGEX_SOLID_CHUNK_SIZE_OPTION: + solid_chunk_size = parse_chunk_size(optarg); + if (solid_chunk_size == UINT32_MAX) goto out_err; break; - case IMAGEX_PACK_COMPRESS_OPTION: - pack_ctype = get_compression_type(optarg); - if (pack_ctype == WIMLIB_COMPRESSION_TYPE_INVALID) + case IMAGEX_SOLID_COMPRESS_OPTION: + solid_ctype = get_compression_type(optarg, true); + if (solid_ctype == WIMLIB_COMPRESSION_TYPE_INVALID) goto out_err; break; - case IMAGEX_PACK_STREAMS_OPTION: - write_flags |= WIMLIB_WRITE_FLAG_PACK_STREAMS; + case IMAGEX_SOLID_OPTION: + write_flags |= WIMLIB_WRITE_FLAG_SOLID; + break; + case IMAGEX_NO_SOLID_SORT_OPTION: + write_flags |= WIMLIB_WRITE_FLAG_NO_SOLID_SORT; break; - case IMAGEX_FLAGS_OPTION: - flags_element = optarg; + case IMAGEX_FLAGS_OPTION: { + tchar *p = alloca((6 + tstrlen(optarg) + 1) * sizeof(tchar)); + tsprintf(p, T("FLAGS=%"TS), optarg); + ret = string_set_append(&image_properties, p); + if (ret) + goto out; + break; + } + case IMAGEX_IMAGE_PROPERTY_OPTION: + ret = append_image_property_argument(&image_properties); + if (ret) + goto out; break; case IMAGEX_DEREFERENCE_OPTION: - add_image_flags |= WIMLIB_ADD_IMAGE_FLAG_DEREFERENCE; + add_flags |= WIMLIB_ADD_FLAG_DEREFERENCE; break; case IMAGEX_VERBOSE_OPTION: /* No longer does anything. */ @@ -1752,22 +1957,22 @@ imagex_capture_or_append(int argc, tchar **argv, int cmd) write_flags |= WIMLIB_WRITE_FLAG_REBUILD; break; case IMAGEX_UNIX_DATA_OPTION: - add_image_flags |= WIMLIB_ADD_IMAGE_FLAG_UNIX_DATA; + add_flags |= WIMLIB_ADD_FLAG_UNIX_DATA; break; case IMAGEX_SOURCE_LIST_OPTION: source_list = true; break; case IMAGEX_NO_ACLS_OPTION: - add_image_flags |= WIMLIB_ADD_IMAGE_FLAG_NO_ACLS; + add_flags |= WIMLIB_ADD_FLAG_NO_ACLS; break; case IMAGEX_STRICT_ACLS_OPTION: - add_image_flags |= WIMLIB_ADD_IMAGE_FLAG_STRICT_ACLS; + add_flags |= WIMLIB_ADD_FLAG_STRICT_ACLS; break; case IMAGEX_RPFIX_OPTION: - add_image_flags |= WIMLIB_ADD_IMAGE_FLAG_RPFIX; + add_flags |= WIMLIB_ADD_FLAG_RPFIX; break; case IMAGEX_NORPFIX_OPTION: - add_image_flags |= WIMLIB_ADD_IMAGE_FLAG_NORPFIX; + add_flags |= WIMLIB_ADD_FLAG_NORPFIX; break; case IMAGEX_PIPABLE_OPTION: write_flags |= WIMLIB_WRITE_FLAG_PIPABLE; @@ -1802,11 +2007,22 @@ imagex_capture_or_append(int argc, tchar **argv, int cmd) } ret = string_set_append(&base_wimfiles, optarg); if (ret) - goto out_free_base_wimfiles; + goto out; write_flags |= WIMLIB_WRITE_FLAG_SKIP_EXTERNAL_WIMS; break; case IMAGEX_WIMBOOT_OPTION: - add_image_flags |= WIMLIB_ADD_IMAGE_FLAG_WIMBOOT; + add_flags |= WIMLIB_ADD_FLAG_WIMBOOT; + break; + case IMAGEX_UNSAFE_COMPACT_OPTION: + if (cmd != CMD_APPEND) { + imagex_error(T("'--unsafe-compact' is only " + "valid for append!")); + goto out_err; + } + write_flags |= WIMLIB_WRITE_FLAG_UNSAFE_COMPACT; + break; + case IMAGEX_SNAPSHOT_OPTION: + add_flags |= WIMLIB_ADD_FLAG_SNAPSHOT; break; default: goto out_usage; @@ -1827,33 +2043,19 @@ imagex_capture_or_append(int argc, tchar **argv, int cmd) if (compression_type == WIMLIB_COMPRESSION_TYPE_INVALID) { /* No compression type specified. Use the default. */ - if (add_image_flags & WIMLIB_ADD_IMAGE_FLAG_WIMBOOT) { + if (add_flags & WIMLIB_ADD_FLAG_WIMBOOT) { /* With --wimboot, default to XPRESS compression. */ compression_type = WIMLIB_COMPRESSION_TYPE_XPRESS; - } else if (write_flags & WIMLIB_WRITE_FLAG_PACK_STREAMS) { - /* With --pack-streams or --solid, default to LZMS - * compression. (However, this will not affect packed - * resources!) */ + } else if (write_flags & WIMLIB_WRITE_FLAG_SOLID) { + /* With --solid, default to LZMS compression. (However, + * this will not affect solid resources!) */ compression_type = WIMLIB_COMPRESSION_TYPE_LZMS; } else { - /* Otherwise, default to LZX compression in fast mode. - */ + /* Otherwise, default to LZX compression. */ compression_type = WIMLIB_COMPRESSION_TYPE_LZX; - if (!compress_slow && pack_ctype != WIMLIB_COMPRESSION_TYPE_LZX) { - struct wimlib_lzx_compressor_params params = { - .hdr.size = sizeof(params), - .algorithm = WIMLIB_LZX_ALGORITHM_FAST, - .use_defaults = 1, - }; - wimlib_set_default_compressor_params(WIMLIB_COMPRESSION_TYPE_LZX, - ¶ms.hdr); - } } } - if (compress_slow) - set_compress_slow(); - if (!tstrcmp(wimfile, T("-"))) { /* Writing captured WIM to standard output. */ #if 0 @@ -1922,11 +2124,15 @@ imagex_capture_or_append(int argc, tchar **argv, int cmd) name = tbasename(tstrcpy(source_copy, source)); name_defaulted = true; } - /* Image description defaults to NULL if not given. */ - if (argc >= 4) - desc = argv[3]; - else - desc = NULL; + + /* Image description (if given). */ + if (argc >= 4) { + tchar *p = alloca((12 + tstrlen(argv[3]) + 1) * sizeof(tchar)); + tsprintf(p, T("DESCRIPTION=%"TS), argv[3]); + ret = string_set_append(&image_properties, p); + if (ret) + goto out; + } if (source_list) { /* Set up capture sources in source list mode */ @@ -1960,8 +2166,11 @@ imagex_capture_or_append(int argc, tchar **argv, int cmd) /* Open the existing WIM, or create a new one. */ if (cmd == CMD_APPEND) { - ret = wimlib_open_wim_with_progress(wimfile, open_flags, &wim, - imagex_progress_func, NULL); + ret = wimlib_open_wim_with_progress(wimfile, + open_flags | WIMLIB_OPEN_FLAG_WRITE_ACCESS, + &wim, + imagex_progress_func, + NULL); if (ret) goto out_free_capture_sources; } else { @@ -1976,19 +2185,29 @@ imagex_capture_or_append(int argc, tchar **argv, int cmd) ret = wimlib_set_output_chunk_size(wim, chunk_size); if (ret) goto out_free_wim; - } else if ((add_image_flags & WIMLIB_ADD_IMAGE_FLAG_WIMBOOT) && - compression_type == WIMLIB_COMPRESSION_TYPE_XPRESS) { - ret = wimlib_set_output_chunk_size(wim, 4096); - if (ret) - goto out_free_wim; + } else if ((add_flags & WIMLIB_ADD_FLAG_WIMBOOT)) { + + int ctype = compression_type; + + if (cmd == CMD_APPEND) { + struct wimlib_wim_info info; + wimlib_get_wim_info(wim, &info); + ctype = info.compression_type; + } + + if (ctype == WIMLIB_COMPRESSION_TYPE_XPRESS) { + ret = wimlib_set_output_chunk_size(wim, 4096); + if (ret) + goto out_free_wim; + } } - if (pack_ctype != WIMLIB_COMPRESSION_TYPE_INVALID) { - ret = wimlib_set_output_pack_compression_type(wim, pack_ctype); + if (solid_ctype != WIMLIB_COMPRESSION_TYPE_INVALID) { + ret = wimlib_set_output_pack_compression_type(wim, solid_ctype); if (ret) goto out_free_wim; } - if (pack_chunk_size != UINT32_MAX) { - ret = wimlib_set_output_pack_chunk_size(wim, pack_chunk_size); + if (solid_chunk_size != UINT32_MAX) { + ret = wimlib_set_output_pack_chunk_size(wim, solid_chunk_size); if (ret) goto out_free_wim; } @@ -2003,7 +2222,7 @@ imagex_capture_or_append(int argc, tchar **argv, int cmd) if (S_ISBLK(stbuf.st_mode) || S_ISREG(stbuf.st_mode)) { imagex_printf(T("Capturing WIM image from NTFS " "filesystem on \"%"TS"\"\n"), source); - add_image_flags |= WIMLIB_ADD_IMAGE_FLAG_NTFS; + add_flags |= WIMLIB_ADD_FLAG_NTFS; } } else { if (errno != ENOENT) { @@ -2043,9 +2262,8 @@ imagex_capture_or_append(int argc, tchar **argv, int cmd) for (size_t i = 0; i < base_wimfiles.num_strings; i++) { ret = wimlib_open_wim_with_progress( - base_wimfiles.strings[i], - open_flags, &base_wims[i], - imagex_progress_func, NULL); + base_wimfiles.strings[i], open_flags, + &base_wims[i], imagex_progress_func, NULL); if (ret) goto out_free_base_wims; @@ -2119,33 +2337,22 @@ imagex_capture_or_append(int argc, tchar **argv, int cmd) num_sources, name, config_file, - add_image_flags); + add_flags); if (ret) goto out_free_template_wim; - 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. */ + if (image_properties.num_strings || template_image_name_or_num) { + /* User asked to set additional image properties, or an image on + * which the added one is to be based has been specified with + * --update-of. */ struct wimlib_wim_info info; wimlib_get_wim_info(wim, &info); - if (desc) { - ret = wimlib_set_image_descripton(wim, - info.image_count, - desc); - if (ret) - goto out_free_template_wim; - } - - if (flags_element) { - ret = wimlib_set_image_flags(wim, info.image_count, - flags_element); - if (ret) - goto out_free_template_wim; - } + ret = apply_image_properties(&image_properties, wim, + info.image_count, NULL); + if (ret) + goto out_free_template_wim; /* Reference template image if the user provided one. */ if (template_image_name_or_num) { @@ -2189,7 +2396,8 @@ out_free_capture_sources: free(capture_sources); out_free_source_list_contents: free(source_list_contents); -out_free_base_wimfiles: +out: + string_set_destroy(&image_properties); string_set_destroy(&base_wimfiles); return ret; @@ -2197,7 +2405,7 @@ out_usage: usage(cmd, stderr); out_err: ret = -1; - goto out_free_base_wimfiles; + goto out; } /* Remove image(s) from a WIM. */ @@ -2222,6 +2430,9 @@ imagex_delete(int argc, tchar **argv, int cmd) case IMAGEX_SOFT_OPTION: write_flags |= WIMLIB_WRITE_FLAG_SOFT_DELETE; break; + case IMAGEX_UNSAFE_COMPACT_OPTION: + write_flags |= WIMLIB_WRITE_FLAG_UNSAFE_COMPACT; + break; default: goto out_usage; } @@ -2335,6 +2546,9 @@ static void print_byte_field(const uint8_t field[], size_t len) static void print_wim_information(const tchar *wimfile, const struct wimlib_wim_info *info) { + tchar attr_string[256]; + tchar *p; + tputs(T("WIM Information:")); tputs(T("----------------")); tprintf(T("Path: %"TS"\n"), wimfile); @@ -2350,47 +2564,66 @@ print_wim_information(const tchar *wimfile, const struct wimlib_wim_info *info) 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); - tprintf(T("Integrity Info: %"TS"\n"), - info->has_integrity_table ? T("yes") : T("no")); - tprintf(T("Relative path junction: %"TS"\n"), - info->has_rpfix ? T("yes") : T("no")); - tprintf(T("Pipable: %"TS"\n"), - info->pipable ? T("yes") : T("no")); - tputchar(T('\n')); + + attr_string[0] = T('\0'); + + if (info->pipable) + tstrcat(attr_string, T("Pipable, ")); + + if (info->has_integrity_table) + tstrcat(attr_string, T("Integrity info, ")); + + if (info->has_rpfix) + tstrcat(attr_string, T("Relative path junction, ")); + + if (info->resource_only) + tstrcat(attr_string, T("Resource only, ")); + + if (info->metadata_only) + tstrcat(attr_string, T("Metadata only, ")); + + if (info->is_marked_readonly) + tstrcat(attr_string, T("Readonly, ")); + + p = tstrchr(attr_string, T('\0')); + if (p >= &attr_string[2] && p[-1] == T(' ') && p[-2] == T(',')) + p[-2] = T('\0'); + + tprintf(T("Attributes: %"TS"\n\n"), attr_string); } static int print_resource(const struct wimlib_resource_entry *resource, void *_ignore) { - tprintf(T("Hash = 0x")); + tprintf(T("Hash = 0x")); print_byte_field(resource->sha1_hash, sizeof(resource->sha1_hash)); tputchar(T('\n')); if (!resource->is_missing) { - 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("Raw offset in WIM = %"PRIu64" bytes\n"), + tprintf(T("Solid resource = %"PRIu64" => %"PRIu64" " + "bytes @ offset %"PRIu64"\n"), + resource->raw_resource_uncompressed_size, + resource->raw_resource_compressed_size, resource->raw_resource_offset_in_wim); - tprintf(T("Offset in raw = %"PRIu64" bytes\n"), + tprintf(T("Solid offset = %"PRIu64" bytes\n"), resource->offset); } else { - tprintf(T("Compressed size = %"PRIu64" bytes\n"), + tprintf(T("Compressed size = %"PRIu64" bytes\n"), resource->compressed_size); - tprintf(T("Offset in WIM = %"PRIu64" bytes\n"), + 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("Flags = ")); + tprintf(T("Flags = ")); if (resource->is_compressed) tprintf(T("WIM_RESHDR_FLAG_COMPRESSED ")); if (resource->is_metadata) @@ -2400,7 +2633,7 @@ print_resource(const struct wimlib_resource_entry *resource, if (resource->is_spanned) tprintf(T("WIM_RESHDR_FLAG_SPANNED ")); if (resource->packed) - tprintf(T("WIM_RESHDR_FLAG_PACKED_STREAMS ")); + tprintf(T("WIM_RESHDR_FLAG_SOLID ")); tputchar(T('\n')); } tputchar(T('\n')); @@ -2408,7 +2641,7 @@ print_resource(const struct wimlib_resource_entry *resource, } static void -print_lookup_table(WIMStruct *wim) +print_blobs(WIMStruct *wim) { wimlib_iterate_lookup_table(wim, 0, print_resource, NULL); } @@ -2461,8 +2694,12 @@ print_dentry_detailed(const struct wimlib_dir_entry *dentry) for (uint32_t i = 0; i <= dentry->num_named_streams; i++) { if (dentry->streams[i].stream_name) { - tprintf(T("\tData stream \"%"TS"\":\n"), + tprintf(T("\tNamed data stream \"%"TS"\":\n"), dentry->streams[i].stream_name); + } else if (dentry->attributes & WIMLIB_FILE_ATTRIBUTE_ENCRYPTED) { + tprintf(T("\tRaw encrypted data stream:\n")); + } else if (dentry->attributes & WIMLIB_FILE_ATTRIBUTE_REPARSE_POINT) { + tprintf(T("\tReparse point stream:\n")); } else { tprintf(T("\tUnnamed data stream:\n")); } @@ -2496,6 +2733,8 @@ imagex_dir(int argc, tchar **argv, int cmd) }; int iterate_flags = WIMLIB_ITERATE_DIR_TREE_FLAG_RECURSIVE; + STRING_SET(refglobs); + for_opt(c, dir_options) { switch (c) { case IMAGEX_PATH_OPTION: @@ -2507,6 +2746,11 @@ imagex_dir(int argc, tchar **argv, int cmd) case IMAGEX_ONE_FILE_ONLY_OPTION: iterate_flags &= ~WIMLIB_ITERATE_DIR_TREE_FLAG_RECURSIVE; break; + case IMAGEX_REF_OPTION: + ret = string_set_append(&refglobs, optarg); + if (ret) + goto out_free_refglobs; + break; default: goto out_usage; } @@ -2527,7 +2771,7 @@ imagex_dir(int argc, tchar **argv, int cmd) ret = wimlib_open_wim_with_progress(wimfile, 0, &wim, imagex_progress_func, NULL); if (ret) - goto out; + goto out_free_refglobs; if (argc >= 2) { image = wimlib_resolve_image(wim, argv[1]); @@ -2551,17 +2795,30 @@ imagex_dir(int argc, tchar **argv, int cmd) image = 1; } + if (refglobs.num_strings) { + ret = wim_reference_globs(wim, &refglobs, 0); + if (ret) + goto out_wimlib_free; + } + ret = wimlib_iterate_dir_tree(wim, image, path, iterate_flags, print_dentry, &options); + if (ret == WIMLIB_ERR_METADATA_NOT_FOUND) { + struct wimlib_wim_info info; + + wimlib_get_wim_info(wim, &info); + do_metadata_not_found_warning(wimfile, &info); + } out_wimlib_free: wimlib_free(wim); -out: +out_free_refglobs: + string_set_destroy(&refglobs); return ret; out_usage: usage(CMD_DIR, stderr); ret = -1; - goto out; + goto out_free_refglobs; } /* Exports one, or all, images from a WIM file to a new WIM file or an existing @@ -2590,8 +2847,8 @@ imagex_export(int argc, tchar **argv, int cmd) STRING_SET(refglobs); unsigned num_threads = 0; uint32_t chunk_size = UINT32_MAX; - uint32_t pack_chunk_size = UINT32_MAX; - int pack_ctype = WIMLIB_COMPRESSION_TYPE_INVALID; + uint32_t solid_chunk_size = UINT32_MAX; + int solid_ctype = WIMLIB_COMPRESSION_TYPE_INVALID; for_opt(c, export_options) { switch (c) { @@ -2606,30 +2863,36 @@ imagex_export(int argc, tchar **argv, int cmd) write_flags |= WIMLIB_WRITE_FLAG_NO_CHECK_INTEGRITY; break; case IMAGEX_COMPRESS_OPTION: - compression_type = get_compression_type(optarg); + compression_type = get_compression_type(optarg, false); if (compression_type == WIMLIB_COMPRESSION_TYPE_INVALID) goto out_err; break; case IMAGEX_COMPRESS_SLOW_OPTION: - write_flags |= WIMLIB_WRITE_FLAG_RECOMPRESS; set_compress_slow(); + write_flags |= WIMLIB_WRITE_FLAG_RECOMPRESS; + break; + case IMAGEX_RECOMPRESS_OPTION: + write_flags |= WIMLIB_WRITE_FLAG_RECOMPRESS; + break; + case IMAGEX_SOLID_OPTION: + write_flags |= WIMLIB_WRITE_FLAG_SOLID; break; - case IMAGEX_PACK_STREAMS_OPTION: - write_flags |= WIMLIB_WRITE_FLAG_PACK_STREAMS; + case IMAGEX_NO_SOLID_SORT_OPTION: + write_flags |= WIMLIB_WRITE_FLAG_NO_SOLID_SORT; break; case IMAGEX_CHUNK_SIZE_OPTION: chunk_size = parse_chunk_size(optarg); if (chunk_size == UINT32_MAX) goto out_err; break; - case IMAGEX_PACK_CHUNK_SIZE_OPTION: - pack_chunk_size = parse_chunk_size(optarg); - if (pack_chunk_size == UINT32_MAX) + case IMAGEX_SOLID_CHUNK_SIZE_OPTION: + solid_chunk_size = parse_chunk_size(optarg); + if (solid_chunk_size == UINT32_MAX) goto out_err; break; - case IMAGEX_PACK_COMPRESS_OPTION: - pack_ctype = get_compression_type(optarg); - if (pack_ctype == WIMLIB_COMPRESSION_TYPE_INVALID) + case IMAGEX_SOLID_COMPRESS_OPTION: + solid_ctype = get_compression_type(optarg, true); + if (solid_ctype == WIMLIB_COMPRESSION_TYPE_INVALID) goto out_err; break; case IMAGEX_REF_OPTION: @@ -2654,6 +2917,9 @@ imagex_export(int argc, tchar **argv, int cmd) case IMAGEX_WIMBOOT_OPTION: export_flags |= WIMLIB_EXPORT_FLAG_WIMBOOT; break; + case IMAGEX_UNSAFE_COMPACT_OPTION: + write_flags |= WIMLIB_WRITE_FLAG_UNSAFE_COMPACT; + break; default: goto out_usage; } @@ -2743,14 +3009,21 @@ imagex_export(int argc, tchar **argv, int cmd) goto out_free_src_wim; } + if (write_flags & WIMLIB_WRITE_FLAG_UNSAFE_COMPACT) { + imagex_error(T("'--unsafe-compact' is only valid when " + "exporting to an existing WIM file!")); + ret = -1; + goto out_free_src_wim; + } + /* dest_wimfile is not an existing file, so create a new WIM. */ if (compression_type == WIMLIB_COMPRESSION_TYPE_INVALID) { /* The user did not specify a compression type; default - * to that of the source WIM, unless --pack-streams, - * --solid, or --wimboot was specified. */ + * to that of the source WIM, unless --solid or + * --wimboot was specified. */ - if (write_flags & WIMLIB_WRITE_FLAG_PACK_STREAMS) + if (write_flags & WIMLIB_WRITE_FLAG_SOLID) compression_type = WIMLIB_COMPRESSION_TYPE_LZMS; else if (export_flags & WIMLIB_EXPORT_FLAG_WIMBOOT) compression_type = WIMLIB_COMPRESSION_TYPE_XPRESS; @@ -2783,13 +3056,13 @@ imagex_export(int argc, tchar **argv, int cmd) if (ret) goto out_free_dest_wim; } - if (pack_ctype != WIMLIB_COMPRESSION_TYPE_INVALID) { - ret = wimlib_set_output_pack_compression_type(dest_wim, pack_ctype); + if (solid_ctype != WIMLIB_COMPRESSION_TYPE_INVALID) { + ret = wimlib_set_output_pack_compression_type(dest_wim, solid_ctype); if (ret) goto out_free_dest_wim; } - if (pack_chunk_size != UINT32_MAX) { - ret = wimlib_set_output_pack_chunk_size(dest_wim, pack_chunk_size); + if (solid_chunk_size != UINT32_MAX) { + ret = wimlib_set_output_pack_chunk_size(dest_wim, solid_chunk_size); if (ret) goto out_free_dest_wim; } @@ -2820,6 +3093,8 @@ imagex_export(int argc, tchar **argv, int cmd) if (ret == WIMLIB_ERR_RESOURCE_NOT_FOUND) { do_resource_not_found_warning(src_wimfile, &src_info, &refglobs); + } else if (ret == WIMLIB_ERR_METADATA_NOT_FOUND) { + do_metadata_not_found_warning(src_wimfile, &src_info); } goto out_free_dest_wim; } @@ -2919,6 +3194,11 @@ imagex_extract(int argc, tchar **argv, int cmd) case IMAGEX_WIMBOOT_OPTION: extract_flags |= WIMLIB_EXTRACT_FLAG_WIMBOOT; break; + case IMAGEX_COMPACT_OPTION: + ret = set_compact_mode(optarg, &extract_flags); + if (ret) + goto out_free_refglobs; + break; default: goto out_usage; } @@ -3012,6 +3292,11 @@ imagex_extract(int argc, tchar **argv, int cmd) wimlib_get_wim_info(wim, &info); do_resource_not_found_warning(wimfile, &info, &refglobs); + } else if (ret == WIMLIB_ERR_METADATA_NOT_FOUND) { + struct wimlib_wim_info info; + + wimlib_get_wim_info(wim, &info); + do_metadata_not_found_warning(wimfile, &info); } out_wimlib_free: wimlib_free(wim); @@ -3036,14 +3321,13 @@ imagex_info(int argc, tchar **argv, int cmd) bool check = false; bool nocheck = false; bool header = false; - bool lookup_table = false; + bool blobs = false; bool xml = false; bool short_header = true; const tchar *xml_out_file = NULL; const tchar *wimfile; const tchar *image_num_or_name; - const tchar *new_name; - const tchar *new_desc; + STRING_SET(image_properties); WIMStruct *wim; int image; int ret; @@ -3065,8 +3349,8 @@ imagex_info(int argc, tchar **argv, int cmd) header = true; short_header = false; break; - case IMAGEX_LOOKUP_TABLE_OPTION: - lookup_table = true; + case IMAGEX_BLOBS_OPTION: + blobs = true; short_header = false; break; case IMAGEX_XML_OPTION: @@ -3081,6 +3365,11 @@ imagex_info(int argc, tchar **argv, int cmd) imagex_error(T("The --metadata option has been removed. " "Use 'wimdir --detail' instead.")); goto out_err; + case IMAGEX_IMAGE_PROPERTY_OPTION: + ret = append_image_property_argument(&image_properties); + if (ret) + goto out; + break; default: goto out_usage; } @@ -3093,8 +3382,24 @@ imagex_info(int argc, tchar **argv, int cmd) wimfile = argv[0]; image_num_or_name = (argc >= 2) ? argv[1] : T("all"); - new_name = (argc >= 3) ? argv[2] : NULL; - new_desc = (argc >= 4) ? argv[3] : NULL; + + if (argc >= 3) { + /* NEW_NAME */ + tchar *p = alloca((5 + tstrlen(argv[2]) + 1) * sizeof(tchar)); + tsprintf(p, T("NAME=%"TS), argv[2]); + ret = string_set_append(&image_properties, p); + if (ret) + goto out; + } + + if (argc >= 4) { + /* NEW_DESC */ + tchar *p = alloca((12 + tstrlen(argv[3]) + 1) * sizeof(tchar)); + tsprintf(p, T("DESCRIPTION=%"TS), argv[3]); + ret = string_set_append(&image_properties, p); + if (ret) + goto out; + } if (check && nocheck) { imagex_error(T("Can't specify both --check and --nocheck")); @@ -3135,17 +3440,17 @@ imagex_info(int argc, tchar **argv, int cmd) "image in a multi-image WIM")); goto out_wimlib_free; } - if (new_name) { - imagex_error(T("Cannot specify the NEW_NAME " - "without specifying a specific " - "image in a multi-image WIM")); + if (image_properties.num_strings) { + imagex_error(T("Can't change image properties without " + "specifying a specific image in a " + "multi-image WIM")); goto out_wimlib_free; } } /* Operations that print information are separated from operations that * recreate the WIM file. */ - if (!new_name && !boot) { + if (!image_properties.num_strings && !boot) { /* Read-only operations */ @@ -3161,13 +3466,13 @@ imagex_info(int argc, tchar **argv, int cmd) if (header) wimlib_print_header(wim); - if (lookup_table) { + if (blobs) { if (info.total_parts != 1) { - tfprintf(stderr, T("Warning: Only showing the lookup table " + tfprintf(stderr, T("Warning: Only showing the blobs " "for part %d of a %d-part WIM.\n"), info.part_number, info.total_parts); } - print_lookup_table(wim); + print_blobs(wim); } if (xml) { @@ -3204,15 +3509,15 @@ imagex_info(int argc, tchar **argv, int cmd) ret = 0; } else { - /* Modification operations */ + bool any_property_changes; if (image == WIMLIB_ALL_IMAGES) image = 1; - if (image == WIMLIB_NO_IMAGE && new_name) { - imagex_error(T("Cannot specify new_name (\"%"TS"\") " - "when using image 0"), new_name); + if (image == WIMLIB_NO_IMAGE && image_properties.num_strings) { + imagex_error(T("Cannot change image properties " + "when using image 0")); ret = -1; goto out_wimlib_free; } @@ -3232,40 +3537,15 @@ imagex_info(int argc, tchar **argv, int cmd) goto out_wimlib_free; } } - if (new_name) { - if (!tstrcmp(wimlib_get_image_name(wim, image), new_name)) - { - imagex_printf(T("Image %d is already named \"%"TS"\".\n"), - image, new_name); - new_name = NULL; - } else { - imagex_printf(T("Changing the name of image %d to " - "\"%"TS"\".\n"), image, new_name); - ret = wimlib_set_image_name(wim, image, new_name); - if (ret) - goto out_wimlib_free; - } - } - if (new_desc) { - const tchar *old_desc; - old_desc = wimlib_get_image_description(wim, image); - if (old_desc && !tstrcmp(old_desc, new_desc)) { - imagex_printf(T("The description of image %d is already " - "\"%"TS"\".\n"), image, new_desc); - new_desc = NULL; - } else { - imagex_printf(T("Changing the description of image %d " - "to \"%"TS"\".\n"), image, new_desc); - ret = wimlib_set_image_descripton(wim, image, - new_desc); - if (ret) - goto out_wimlib_free; - } - } + + ret = apply_image_properties(&image_properties, wim, image, + &any_property_changes); + if (ret) + goto out_wimlib_free; /* Only call wimlib_overwrite() if something actually needs to * be changed. */ - if (boot || new_name || new_desc || + if (boot || any_property_changes || (check && !info.has_integrity_table) || (nocheck && info.has_integrity_table)) { @@ -3286,6 +3566,7 @@ imagex_info(int argc, tchar **argv, int cmd) out_wimlib_free: wimlib_free(wim); out: + string_set_destroy(&image_properties); return ret; out_usage: @@ -3446,9 +3727,13 @@ imagex_mount_rw_or_ro(int argc, tchar **argv, int cmd) 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); + if (ret == WIMLIB_ERR_METADATA_NOT_FOUND) { + do_metadata_not_found_warning(wimfile, &info); + } else { + imagex_error(T("Failed to mount image %d from \"%"TS"\" " + "on \"%"TS"\""), + image, wimfile, dir); + } } out_free_wim: wimlib_free(wim); @@ -3472,8 +3757,8 @@ imagex_optimize(int argc, tchar **argv, int cmd) int write_flags = WIMLIB_WRITE_FLAG_REBUILD; int compression_type = WIMLIB_COMPRESSION_TYPE_INVALID; uint32_t chunk_size = UINT32_MAX; - uint32_t pack_chunk_size = UINT32_MAX; - int pack_ctype = WIMLIB_COMPRESSION_TYPE_INVALID; + uint32_t solid_chunk_size = UINT32_MAX; + int solid_ctype = WIMLIB_COMPRESSION_TYPE_INVALID; int ret; WIMStruct *wim; const tchar *wimfile; @@ -3492,36 +3777,39 @@ imagex_optimize(int argc, tchar **argv, int cmd) break; case IMAGEX_COMPRESS_OPTION: write_flags |= WIMLIB_WRITE_FLAG_RECOMPRESS; - compression_type = get_compression_type(optarg); + compression_type = get_compression_type(optarg, false); if (compression_type == WIMLIB_COMPRESSION_TYPE_INVALID) goto out_err; break; - case IMAGEX_RECOMPRESS_OPTION: + case IMAGEX_COMPRESS_SLOW_OPTION: + set_compress_slow(); write_flags |= WIMLIB_WRITE_FLAG_RECOMPRESS; break; - case IMAGEX_COMPRESS_SLOW_OPTION: + case IMAGEX_RECOMPRESS_OPTION: write_flags |= WIMLIB_WRITE_FLAG_RECOMPRESS; - set_compress_slow(); break; case IMAGEX_CHUNK_SIZE_OPTION: chunk_size = parse_chunk_size(optarg); if (chunk_size == UINT32_MAX) goto out_err; break; - case IMAGEX_PACK_CHUNK_SIZE_OPTION: - pack_chunk_size = parse_chunk_size(optarg); - if (pack_chunk_size == UINT32_MAX) + case IMAGEX_SOLID_CHUNK_SIZE_OPTION: + solid_chunk_size = parse_chunk_size(optarg); + if (solid_chunk_size == UINT32_MAX) goto out_err; break; - case IMAGEX_PACK_COMPRESS_OPTION: - pack_ctype = get_compression_type(optarg); - if (pack_ctype == WIMLIB_COMPRESSION_TYPE_INVALID) + case IMAGEX_SOLID_COMPRESS_OPTION: + solid_ctype = get_compression_type(optarg, true); + if (solid_ctype == WIMLIB_COMPRESSION_TYPE_INVALID) goto out_err; break; - case IMAGEX_PACK_STREAMS_OPTION: - write_flags |= WIMLIB_WRITE_FLAG_PACK_STREAMS; + case IMAGEX_SOLID_OPTION: + write_flags |= WIMLIB_WRITE_FLAG_SOLID; write_flags |= WIMLIB_WRITE_FLAG_RECOMPRESS; break; + case IMAGEX_NO_SOLID_SORT_OPTION: + write_flags |= WIMLIB_WRITE_FLAG_NO_SOLID_SORT; + break; case IMAGEX_THREADS_OPTION: num_threads = parse_num_threads(optarg); if (num_threads == UINT_MAX) @@ -3533,6 +3821,9 @@ imagex_optimize(int argc, tchar **argv, int cmd) case IMAGEX_NOT_PIPABLE_OPTION: write_flags |= WIMLIB_WRITE_FLAG_NOT_PIPABLE; break; + case IMAGEX_UNSAFE_COMPACT_OPTION: + write_flags |= WIMLIB_WRITE_FLAG_UNSAFE_COMPACT; + break; default: goto out_usage; } @@ -3563,13 +3854,13 @@ imagex_optimize(int argc, tchar **argv, int cmd) if (ret) goto out_wimlib_free; } - if (pack_ctype != WIMLIB_COMPRESSION_TYPE_INVALID) { - ret = wimlib_set_output_pack_compression_type(wim, pack_ctype); + if (solid_ctype != WIMLIB_COMPRESSION_TYPE_INVALID) { + ret = wimlib_set_output_pack_compression_type(wim, solid_ctype); if (ret) goto out_wimlib_free; } - if (pack_chunk_size != UINT32_MAX) { - ret = wimlib_set_output_pack_chunk_size(wim, pack_chunk_size); + if (solid_chunk_size != UINT32_MAX) { + ret = wimlib_set_output_pack_chunk_size(wim, solid_chunk_size); if (ret) goto out_wimlib_free; } @@ -3830,6 +4121,9 @@ imagex_update(int argc, tchar **argv, int cmd) case IMAGEX_NO_REPLACE_OPTION: default_add_flags |= WIMLIB_ADD_FLAG_NO_REPLACE; break; + case IMAGEX_UNSAFE_COMPACT_OPTION: + write_flags |= WIMLIB_WRITE_FLAG_UNSAFE_COMPACT; + break; default: goto out_usage; } @@ -3958,7 +4252,85 @@ out_err: goto out_free_command_str; } +/* Verify a WIM file. */ +static int +imagex_verify(int argc, tchar **argv, int cmd) +{ + int ret; + const tchar *wimfile; + WIMStruct *wim; + int open_flags = WIMLIB_OPEN_FLAG_CHECK_INTEGRITY; + int verify_flags = 0; + STRING_SET(refglobs); + int c; + + for_opt(c, verify_options) { + switch (c) { + case IMAGEX_REF_OPTION: + ret = string_set_append(&refglobs, optarg); + if (ret) + goto out_free_refglobs; + break; + case IMAGEX_NOCHECK_OPTION: + open_flags &= ~WIMLIB_OPEN_FLAG_CHECK_INTEGRITY; + break; + default: + goto out_usage; + } + } + + argv += optind; + argc -= optind; + + if (argc != 1) { + if (argc == 0) + imagex_error(T("Must specify a WIM file!")); + else + imagex_error(T("At most one WIM file can be specified!")); + goto out_usage; + } + wimfile = argv[0]; + + ret = wimlib_open_wim_with_progress(wimfile, + open_flags, + &wim, + imagex_progress_func, + NULL); + if (ret) + goto out_free_refglobs; + + ret = wim_reference_globs(wim, &refglobs, open_flags); + if (ret) + goto out_wimlib_free; + + ret = wimlib_verify_wim(wim, verify_flags); + if (ret) { + tputc(T('\n'), stderr); + imagex_error(T("\"%"TS"\" failed verification!"), + wimfile); + if (ret == WIMLIB_ERR_RESOURCE_NOT_FOUND && + refglobs.num_strings == 0) + { + imagex_printf(T("Note: if this WIM file is not standalone, " + "use the --ref option to specify the other parts.\n")); + } + } else { + imagex_printf(T("\n\"%"TS"\" was successfully verified.\n"), + wimfile); + } + +out_wimlib_free: + wimlib_free(wim); +out_free_refglobs: + string_set_destroy(&refglobs); + return ret; + +out_usage: + usage(CMD_VERIFY, stderr); + ret = -1; + goto out_free_refglobs; +} struct imagex_command { const tchar *name; @@ -3985,56 +4357,73 @@ static const struct imagex_command imagex_commands[] = { [CMD_UNMOUNT] = {T("unmount"), imagex_unmount}, #endif [CMD_UPDATE] = {T("update"), imagex_update}, + [CMD_VERIFY] = {T("verify"), imagex_verify}, }; +#ifdef __WIN32__ + + /* Can be a directory or source list file. But source list file is probably + * a rare use case, so just say directory. */ +# define SOURCE_STR T("DIRECTORY") + + /* Can only be a directory */ +# define TARGET_STR T("DIRECTORY") + +#else + /* Can be a directory, NTFS volume, or source list file. */ +# define SOURCE_STR T("SOURCE") + + /* Can be a directory or NTFS volume. */ +# define TARGET_STR T("TARGET") + +#endif + 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] [--dereference]\n" -" [--config=FILE] [--threads=NUM_THREADS] [--source-list]\n" -" [--no-acls] [--strict-acls] [--rpfix] [--norpfix]\n" -" [--update-of=[WIMFILE:]IMAGE] [--wimboot]\n" +" %"TS" " SOURCE_STR " WIMFILE [IMAGE_NAME [IMAGE_DESC]]\n" +" [--boot] [--check] [--nocheck] [--config=FILE]\n" +" [--threads=NUM_THREADS] [--no-acls] [--strict-acls]\n" +" [--rpfix] [--norpfix] [--update-of=[WIMFILE:]IMAGE]\n" +" [--wimboot] [--unix-data] [--dereference] [--snapshot]\n" ), [CMD_APPLY] = T( -" %"TS" WIMFILE [(IMAGE_NUM | IMAGE_NAME | all)]\n" -" (DIRECTORY | NTFS_VOLUME) [--check] [--ref=\"GLOB\"]\n" -" [--no-acls] [--strict-acls] [--no-attributes]\n" -" [--rpfix] [--norpfix] [--include-invalid-names]\n" -" [--wimboot] [--unix-data]\n" +" %"TS" WIMFILE [IMAGE] " TARGET_STR "\n" +" [--check] [--ref=\"GLOB\"] [--no-acls] [--strict-acls]\n" +" [--no-attributes] [--rpfix] [--norpfix]\n" +" [--include-invalid-names] [--wimboot] [--unix-data]\n" +" [--compact=FORMAT]\n" ), [CMD_CAPTURE] = T( -" %"TS" (DIRECTORY | NTFS_VOLUME) WIMFILE\n" -" [IMAGE_NAME [IMAGE_DESCRIPTION]] [--boot] [--check]\n" -" [--nocheck] [--compress=TYPE] [--flags EDITION_ID]\n" -" [--dereference] [--config=FILE] [--threads=NUM_THREADS]\n" -" [--source-list] [--no-acls] [--strict-acls] [--rpfix]\n" -" [--norpfix] [--update-of=[WIMFILE:]IMAGE]\n" -" [--delta-from=WIMFILE] [--wimboot] [--unix-data]\n" +" %"TS" " SOURCE_STR " WIMFILE [IMAGE_NAME [IMAGE_DESC]]\n" +" [--compress=TYPE] [--boot] [--check] [--nocheck]\n" +" [--config=FILE] [--threads=NUM_THREADS]\n" +" [--no-acls] [--strict-acls] [--rpfix] [--norpfix]\n" +" [--update-of=[WIMFILE:]IMAGE] [--delta-from=WIMFILE]\n" +" [--wimboot] [--unix-data] [--dereference] [--solid]\n" +" [--snapshot]\n" ), [CMD_DELETE] = T( -" %"TS" WIMFILE (IMAGE_NUM | IMAGE_NAME | all)\n" -" [--check] [--soft]\n" +" %"TS" WIMFILE IMAGE [--check] [--soft]\n" ), [CMD_DIR] = T( -" %"TS" WIMFILE (IMAGE_NUM | IMAGE_NAME | all) [--path=PATH] [--detailed]\n" +" %"TS" WIMFILE IMAGE [--path=PATH] [--detailed]\n" ), [CMD_EXPORT] = T( -" %"TS" SRC_WIMFILE (SRC_IMAGE_NUM | SRC_IMAGE_NAME | all ) \n" -" DEST_WIMFILE [DEST_IMAGE_NAME [DEST_IMAGE_DESCRIPTION]]\n" +" %"TS" SRC_WIMFILE SRC_IMAGE DEST_WIMFILE\n" +" [DEST_IMAGE_NAME [DEST_IMAGE_DESC]]\n" " [--boot] [--check] [--nocheck] [--compress=TYPE]\n" " [--ref=\"GLOB\"] [--threads=NUM_THREADS] [--rebuild]\n" -" [--wimboot]\n" +" [--wimboot] [--solid]\n" ), [CMD_EXTRACT] = T( -" %"TS" WIMFILE (IMAGE_NUM | IMAGE_NAME) [(PATH | @LISTFILE)...]\n" +" %"TS" WIMFILE IMAGE [(PATH | @LISTFILE)...]\n" " [--check] [--ref=\"GLOB\"] [--dest-dir=CMD_DIR]\n" " [--to-stdout] [--no-acls] [--strict-acls]\n" " [--no-attributes] [--include-invalid-names]\n" @@ -4042,9 +4431,10 @@ T( ), [CMD_INFO] = T( -" %"TS" WIMFILE [(IMAGE_NUM | IMAGE_NAME) [NEW_NAME\n" -" [NEW_DESC]]] [--boot] [--check] [--nocheck] [--xml]\n" -" [--extract-xml FILE] [--header] [--lookup-table]\n" +" %"TS" WIMFILE [IMAGE [NEW_NAME [NEW_DESC]]]\n" +" [--boot] [--check] [--nocheck] [--xml]\n" +" [--extract-xml FILE] [--header] [--blobs]\n" +" [--image-property NAME=VALUE]\n" ), [CMD_JOIN] = T( @@ -4053,22 +4443,23 @@ T( #if WIM_MOUNTING_SUPPORTED [CMD_MOUNT] = T( -" %"TS" WIMFILE [(IMAGE_NUM | IMAGE_NAME)] DIRECTORY\n" +" %"TS" WIMFILE [IMAGE] DIRECTORY\n" " [--check] [--streams-interface=INTERFACE]\n" " [--ref=\"GLOB\"] [--allow-other] [--unix-data]\n" ), [CMD_MOUNTRW] = T( -" %"TS" WIMFILE [(IMAGE_NUM | IMAGE_NAME)] DIRECTORY\n" +" %"TS" WIMFILE [IMAGE] DIRECTORY\n" " [--check] [--streams-interface=INTERFACE]\n" " [--staging-dir=CMD_DIR] [--allow-other] [--unix-data]\n" ), #endif [CMD_OPTIMIZE] = T( -" %"TS" WIMFILE [--check] [--nocheck] [--recompress]\n" -" [--recompress-slow] [--compress=TYPE]\n" -" [--threads=NUM_THREADS]\n" +" %"TS" WIMFILE\n" +" [--recompress] [--compress=TYPE] [--threads=NUM_THREADS]\n" +" [--check] [--nocheck] [--solid]\n" +"\n" ), [CMD_SPLIT] = T( @@ -4077,16 +4468,21 @@ T( #if WIM_MOUNTING_SUPPORTED [CMD_UNMOUNT] = T( -" %"TS" DIRECTORY [--commit] [--force] [--new-image]\n" -" [--check] [--rebuild]\n" +" %"TS" DIRECTORY\n" +" [--commit] [--force] [--new-image] [--check] [--rebuild]\n" ), #endif [CMD_UPDATE] = T( -" %"TS" WIMFILE [IMAGE_NUM | IMAGE_NAME] [--check] [--rebuild]\n" -" [--threads=NUM_THREADS] [DEFAULT_ADD_OPTIONS]\n" -" [DEFAULT_DELETE_OPTIONS] [--command=STRING]\n" -" [--wimboot-config=FILE| [< CMDFILE]\n" +" %"TS" WIMFILE [IMAGE]\n" +" [--check] [--rebuild] [--threads=NUM_THREADS]\n" +" [DEFAULT_ADD_OPTIONS] [DEFAULT_DELETE_OPTIONS]\n" +" [--command=STRING] [--wimboot-config=FILE]\n" +" [< CMDFILE]\n" +), +[CMD_VERIFY] = +T( +" %"TS" WIMFILE [--ref=\"GLOB\"]\n" ), }; @@ -4097,7 +4493,7 @@ static const tchar *get_cmd_string(int cmd, bool nospace) { static tchar buf[50]; if (cmd == CMD_NONE) { - tsprintf(buf, T("%"TS), T(IMAGEX_PROGNAME)); + return T("wimlib-imagex"); } else if (invocation_cmd != CMD_NONE) { tsprintf(buf, T("wim%"TS), imagex_commands[cmd].name); } else { @@ -4117,8 +4513,8 @@ version(void) { static const tchar *s = T( -IMAGEX_PROGNAME " (distributed with " PACKAGE " " PACKAGE_VERSION ")\n" -"Copyright (C) 2012, 2013, 2014 Eric Biggers\n" +"wimlib-imagex (distributed with " PACKAGE " " PACKAGE_VERSION ")\n" +"Copyright (C) 2012-2016 Eric Biggers\n" "License GPLv3+; GNU GPL version 3 or later .\n" "This is free software: you are free to change and redistribute it.\n" "There is NO WARRANTY, to the extent permitted by law.\n" @@ -4164,10 +4560,10 @@ recommend_man_page(int cmd, FILE *fp) { const tchar *format_str; #ifdef __WIN32__ - format_str = T("Uncommon options are not listed;\n" + format_str = T("Some uncommon options are not listed;\n" "See %"TS".pdf in the doc directory for more details.\n"); #else - format_str = T("Uncommon options are not listed;\n" + format_str = T("Some uncommon options are not listed;\n" "Try `man %"TS"' for more details.\n"); #endif tfprintf(fp, format_str, get_cmd_string(cmd, true)); @@ -4194,11 +4590,14 @@ usage_all(FILE *fp) T( " %"TS" --help\n" " %"TS" --version\n" -"\n" -" The compression TYPE may be \"maximum\", \"fast\", or \"none\".\n" "\n" ); tfprintf(fp, extra, invocation_name, invocation_name); + tfprintf(fp, + T("IMAGE can be the 1-based index or name of an image in the WIM file.\n" + "For some commands IMAGE is optional if the WIM file only contains one image.\n" + "For some commands IMAGE may be \"all\".\n" + "\n")); recommend_man_page(CMD_NONE, fp); } @@ -4265,7 +4664,7 @@ main(int argc, char **argv) /* Allow being invoked as wimCOMMAND (e.g. wimapply). */ cmd = CMD_NONE; if (!tstrncmp(invocation_name, T("wim"), 3) && - tstrcmp(invocation_name, T(IMAGEX_PROGNAME))) { + tstrcmp(invocation_name, T("wimlib-imagex"))) { for (int i = 0; i < CMD_MAX; i++) { if (!tstrcmp(invocation_name + 3, imagex_commands[i].name))