X-Git-Url: https://wimlib.net/git/?p=wimlib;a=blobdiff_plain;f=programs%2Fimagex.c;h=cc8d0e2073336cb8fa7957d786908861e26ad258;hp=82354feb7d47f3c24bb86e1a991dcb74eeed1c55;hb=ccfc8894570ac542d2d38e6d4fa478968213f35d;hpb=e040fe071bd22f58716b851696a1b0a0139877c0 diff --git a/programs/imagex.c b/programs/imagex.c index 82354feb..cc8d0e20 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 @@ -141,13 +141,14 @@ 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, IMAGEX_DEBUG_OPTION, IMAGEX_DELTA_FROM_OPTION, @@ -158,9 +159,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, @@ -168,8 +169,9 @@ 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_PATH_OPTION, @@ -179,12 +181,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_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, @@ -192,10 +194,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, }; @@ -211,10 +214,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}, }; @@ -224,17 +225,15 @@ 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("solid"), no_argument, NULL, IMAGEX_SOLID_OPTION}, - {T("pack-streams"), no_argument, NULL, IMAGEX_SOLID_OPTION}, {T("solid-compress"),required_argument, NULL, IMAGEX_SOLID_COMPRESS_OPTION}, - {T("pack-compress"), required_argument, NULL, IMAGEX_SOLID_COMPRESS_OPTION}, {T("solid-chunk-size"),required_argument, NULL, IMAGEX_SOLID_CHUNK_SIZE_OPTION}, - {T("pack-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}, @@ -250,12 +249,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}, }; @@ -263,6 +265,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}, }; @@ -273,20 +276,18 @@ static const struct option export_options[] = { {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("chunk-size"), required_argument, NULL, IMAGEX_CHUNK_SIZE_OPTION}, {T("solid"), no_argument, NULL, IMAGEX_SOLID_OPTION}, - {T("pack-streams"),no_argument, NULL, IMAGEX_SOLID_OPTION}, {T("solid-compress"),required_argument, NULL, IMAGEX_SOLID_COMPRESS_OPTION}, - {T("pack-compress"), required_argument, NULL, IMAGEX_SOLID_COMPRESS_OPTION}, {T("solid-chunk-size"),required_argument, NULL, IMAGEX_SOLID_CHUNK_SIZE_OPTION}, - {T("pack-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}, }; @@ -307,6 +308,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}, }; @@ -317,9 +319,10 @@ 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("metadata"), no_argument, NULL, IMAGEX_METADATA_OPTION}, + {T("lookup-table"), no_argument, NULL, IMAGEX_BLOBS_OPTION}, + {T("blobs"), no_argument, NULL, IMAGEX_BLOBS_OPTION}, {T("xml"), no_argument, NULL, IMAGEX_XML_OPTION}, + {T("image-property"), required_argument, NULL, IMAGEX_IMAGE_PROPERTY_OPTION}, {NULL, 0, NULL, 0}, }; @@ -345,18 +348,15 @@ static const struct option optimize_options[] = { {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("solid"), no_argument, NULL, IMAGEX_SOLID_OPTION}, - {T("pack-streams"),no_argument, NULL, IMAGEX_SOLID_OPTION}, {T("solid-compress"),required_argument, NULL, IMAGEX_SOLID_COMPRESS_OPTION}, - {T("pack-compress"), required_argument, NULL, IMAGEX_SOLID_COMPRESS_OPTION}, {T("solid-chunk-size"),required_argument, NULL, IMAGEX_SOLID_CHUNK_SIZE_OPTION}, - {T("pack-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}, }; @@ -401,12 +401,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}, }; @@ -497,9 +499,9 @@ print_available_compression_types(FILE *fp) tfputs(s, fp); } -/* Parse the argument to --compress */ +/* Parse the argument to --compress or --solid-compress */ static int -get_compression_type(tchar *optarg) +get_compression_type(tchar *optarg, bool solid) { int ctype; unsigned int compression_level = 0; @@ -522,15 +524,27 @@ get_compression_type(tchar *optarg) if (!tstrcasecmp(optarg, T("maximum")) || !tstrcasecmp(optarg, T("lzx")) || - !tstrcasecmp(optarg, T("max"))) + !tstrcasecmp(optarg, T("max"))) { ctype = WIMLIB_COMPRESSION_TYPE_LZX; - else if (!tstrcasecmp(optarg, T("fast")) || !tstrcasecmp(optarg, T("xpress"))) + } else if (!tstrcasecmp(optarg, T("fast")) || !tstrcasecmp(optarg, T("xpress"))) { ctype = WIMLIB_COMPRESSION_TYPE_XPRESS; - else if (!tstrcasecmp(optarg, T("recovery")) || !tstrcasecmp(optarg, T("lzms"))) + } 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"))) + } else if (!tstrcasecmp(optarg, T("none"))) { ctype = WIMLIB_COMPRESSION_TYPE_NONE; - else { + } else { imagex_error(T("Invalid compression type \"%"TS"\"!"), optarg); print_available_compression_types(stderr); return WIMLIB_COMPRESSION_TYPE_INVALID; @@ -541,18 +555,39 @@ get_compression_type(tchar *optarg) return ctype; } -static void -set_compress_slow(void) +/* Parse the argument to --compact */ +static int +set_compact_mode(const tchar *arg, int *extract_flags) { -#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); + 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; + } + + 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; } + struct string_set { - const tchar **strings; + tchar **strings; unsigned num_strings; unsigned num_alloc_strings; }; @@ -564,12 +599,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, @@ -594,12 +629,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, @@ -621,6 +701,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 @@ -1051,23 +1142,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, @@ -1175,7 +1267,7 @@ imagex_progress_func(enum wimlib_progress_msg msg, 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, @@ -1272,7 +1364,7 @@ imagex_progress_func(enum wimlib_progress_msg msg, 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 streams: " + imagex_printf(T("\rVerifying file data: " "%"PRIu64" %"TS" of %"PRIu64" %"TS" (%u%%) done"), info->verify_streams.completed_bytes >> unit_shift, unit_name, @@ -1302,16 +1394,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; } @@ -1578,12 +1691,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; } @@ -1691,6 +1806,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); @@ -1712,10 +1829,10 @@ 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; @@ -1724,8 +1841,7 @@ imagex_capture_or_append(int argc, tchar **argv, int cmd) 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); @@ -1755,7 +1871,7 @@ imagex_capture_or_append(int argc, tchar **argv, int cmd) 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; @@ -1766,16 +1882,13 @@ 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: - set_compress_slow(); - break; case IMAGEX_CHUNK_SIZE_OPTION: chunk_size = parse_chunk_size(optarg); if (chunk_size == UINT32_MAX) @@ -1787,18 +1900,31 @@ imagex_capture_or_append(int argc, tchar **argv, int cmd) goto out_err; break; case IMAGEX_SOLID_COMPRESS_OPTION: - solid_ctype = get_compression_type(optarg); + solid_ctype = get_compression_type(optarg, true); if (solid_ctype == WIMLIB_COMPRESSION_TYPE_INVALID) goto out_err; break; case IMAGEX_SOLID_OPTION: - write_flags |= WIMLIB_WRITE_FLAG_PACK_STREAMS; + write_flags |= WIMLIB_WRITE_FLAG_SOLID; break; - case IMAGEX_FLAGS_OPTION: - flags_element = optarg; + case IMAGEX_NO_SOLID_SORT_OPTION: + write_flags |= WIMLIB_WRITE_FLAG_NO_SOLID_SORT; + break; + 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. */ @@ -1812,22 +1938,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; @@ -1862,11 +1988,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; @@ -1887,12 +2024,12 @@ 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) { + } else if (write_flags & WIMLIB_WRITE_FLAG_SOLID) { /* With --solid, default to LZMS compression. (However, - * this will not affect solid blocks!) */ + * this will not affect solid resources!) */ compression_type = WIMLIB_COMPRESSION_TYPE_LZMS; } else { /* Otherwise, default to LZX compression. */ @@ -1968,11 +2105,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 */ @@ -2006,8 +2147,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 { @@ -2022,11 +2166,21 @@ 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 (solid_ctype != WIMLIB_COMPRESSION_TYPE_INVALID) { ret = wimlib_set_output_pack_compression_type(wim, solid_ctype); @@ -2049,7 +2203,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) { @@ -2089,9 +2243,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; @@ -2165,33 +2318,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) { @@ -2235,7 +2377,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; @@ -2243,7 +2386,7 @@ out_usage: usage(cmd, stderr); out_err: ret = -1; - goto out_free_base_wimfiles; + goto out; } /* Remove image(s) from a WIM. */ @@ -2268,6 +2411,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; } @@ -2381,6 +2527,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); @@ -2396,47 +2545,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) @@ -2446,7 +2614,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')); @@ -2454,7 +2622,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); } @@ -2507,8 +2675,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")); } @@ -2542,6 +2714,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: @@ -2553,6 +2727,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; } @@ -2573,7 +2752,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]); @@ -2597,17 +2776,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 @@ -2652,19 +2844,18 @@ 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: - 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_PACK_STREAMS; + write_flags |= WIMLIB_WRITE_FLAG_SOLID; + break; + 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); @@ -2677,7 +2868,7 @@ imagex_export(int argc, tchar **argv, int cmd) goto out_err; break; case IMAGEX_SOLID_COMPRESS_OPTION: - solid_ctype = get_compression_type(optarg); + solid_ctype = get_compression_type(optarg, true); if (solid_ctype == WIMLIB_COMPRESSION_TYPE_INVALID) goto out_err; break; @@ -2703,6 +2894,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; } @@ -2792,6 +2986,13 @@ 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) { @@ -2799,7 +3000,7 @@ imagex_export(int argc, tchar **argv, int cmd) * 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; @@ -2869,6 +3070,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; } @@ -2968,6 +3171,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; } @@ -3061,6 +3269,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); @@ -3085,14 +3298,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; @@ -3114,8 +3326,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: @@ -3126,10 +3338,11 @@ imagex_info(int argc, tchar **argv, int cmd) xml_out_file = optarg; short_header = false; break; - case IMAGEX_METADATA_OPTION: - 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; } @@ -3142,8 +3355,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")); @@ -3184,17 +3413,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 */ @@ -3210,13 +3439,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) { @@ -3253,15 +3482,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; } @@ -3281,40 +3510,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)) { @@ -3335,6 +3539,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: @@ -3495,9 +3700,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); @@ -3541,14 +3750,10 @@ 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_COMPRESS_SLOW_OPTION: - set_compress_slow(); - write_flags |= WIMLIB_WRITE_FLAG_RECOMPRESS; - break; case IMAGEX_RECOMPRESS_OPTION: write_flags |= WIMLIB_WRITE_FLAG_RECOMPRESS; break; @@ -3563,14 +3768,17 @@ imagex_optimize(int argc, tchar **argv, int cmd) goto out_err; break; case IMAGEX_SOLID_COMPRESS_OPTION: - solid_ctype = get_compression_type(optarg); + solid_ctype = get_compression_type(optarg, true); if (solid_ctype == WIMLIB_COMPRESSION_TYPE_INVALID) goto out_err; break; case IMAGEX_SOLID_OPTION: - write_flags |= WIMLIB_WRITE_FLAG_PACK_STREAMS; + 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) @@ -3582,6 +3790,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; } @@ -3879,6 +4090,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; } @@ -4026,6 +4240,9 @@ imagex_verify(int argc, tchar **argv, int cmd) if (ret) goto out_free_refglobs; break; + case IMAGEX_NOCHECK_OPTION: + open_flags &= ~WIMLIB_OPEN_FLAG_CHECK_INTEGRITY; + break; default: goto out_usage; } @@ -4137,7 +4354,7 @@ T( " [--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]\n" +" [--wimboot] [--unix-data] [--dereference] [--snapshot]\n" ), [CMD_APPLY] = T( @@ -4145,6 +4362,7 @@ T( " [--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( @@ -4154,6 +4372,7 @@ T( " [--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( @@ -4169,7 +4388,7 @@ T( " [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( @@ -4183,7 +4402,8 @@ T( T( " %"TS" WIMFILE [IMAGE [NEW_NAME [NEW_DESC]]]\n" " [--boot] [--check] [--nocheck] [--xml]\n" -" [--extract-xml FILE] [--header] [--lookup-table]\n" +" [--extract-xml FILE] [--header] [--blobs]\n" +" [--image-property NAME=VALUE]\n" ), [CMD_JOIN] = T( @@ -4206,8 +4426,8 @@ T( [CMD_OPTIMIZE] = T( " %"TS" WIMFILE\n" -" [--recompress] [--compress=TYPE]\n" -" [--threads=NUM_THREADS] [--check] [--nocheck]\n" +" [--recompress] [--compress=TYPE] [--threads=NUM_THREADS]\n" +" [--check] [--nocheck] [--solid]\n" "\n" ), [CMD_SPLIT] = @@ -4242,7 +4462,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 { @@ -4262,8 +4482,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" @@ -4413,7 +4633,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))