X-Git-Url: https://wimlib.net/git/?p=wimlib;a=blobdiff_plain;f=programs%2Fimagex.c;h=28f0266356429b91879b6d1e59f421f435bcecf5;hp=39ed2742fcaca2fd40e9af9b3deecde241bad041;hb=e3cbda91f4a1a844bc8edb5b5240b18f8261a6df;hpb=9d9c2fe60b5842825002131f4ca926024e6f0038 diff --git a/programs/imagex.c b/programs/imagex.c index 39ed2742..28f02663 100644 --- a/programs/imagex.c +++ b/programs/imagex.c @@ -6,7 +6,7 @@ */ /* - * Copyright (C) 2012, 2013 Eric Biggers + * Copyright (C) 2012-2017 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,18 +46,15 @@ # include #endif +#define WIMLIB_COMPRESSION_TYPE_INVALID (-1) + #ifdef __WIN32__ # include "imagex-win32.h" -# define tbasename win32_wbasename -# define OS_PREFERRED_PATH_SEPARATOR L'\\' -# define OS_PREFERRED_PATH_SEPARATOR_STRING L"\\" +# define print_security_descriptor win32_print_security_descriptor #else /* __WIN32__ */ -# include # include # include -# define tbasename basename -# define OS_PREFERRED_PATH_SEPARATOR '/' -# define OS_PREFERRED_PATH_SEPARATOR_STRING "/" +# define print_security_descriptor default_print_security_descriptor static inline void set_fd_to_binary_mode(int fd) { } @@ -75,6 +72,34 @@ static inline void set_fd_to_binary_mode(int fd) #define ARRAY_LEN(array) (sizeof(array) / sizeof(array[0])) +static inline bool +is_any_path_separator(tchar c) +{ + return c == T('/') || c == T('\\'); +} + +/* Like basename(), but handles both forward and backwards slashes. */ +static tchar * +tbasename(tchar *path) +{ + tchar *p = tstrchr(path, T('\0')); + + for (;;) { + if (p == path) + return path; + if (!is_any_path_separator(*--p)) + break; + *p = T('\0'); + } + + for (;;) { + if (p == path) + return path; + if (is_any_path_separator(*--p)) + return ++p; + } +} + #define for_opt(c, opts) while ((c = getopt_long_only(argc, (tchar**)argv, T(""), \ opts, NULL)) != -1) @@ -99,91 +124,115 @@ enum { CMD_UNMOUNT, #endif CMD_UPDATE, + CMD_VERIFY, CMD_MAX, }; static void usage(int cmd, FILE *fp); static void usage_all(FILE *fp); static void recommend_man_page(int cmd, FILE *fp); -static const tchar *get_cmd_string(int cmd, bool nospace); - -static int imagex_progress_func(enum wimlib_progress_msg msg, - const union wimlib_progress_info *info); +static const tchar *get_cmd_string(int cmd, bool only_short_form); -static bool imagex_be_quiet = false; static FILE *imagex_info_file; -#define imagex_printf(format, ...) \ +#define imagex_printf(format, ...) \ + if (imagex_info_file) \ tfprintf(imagex_info_file, format, ##__VA_ARGS__) +static void imagex_suppress_output(void) +{ + imagex_info_file = NULL; +} + +static void imagex_output_to_stderr(void) +{ + if (imagex_info_file) + imagex_info_file = stderr; +} + +static void imagex_flush_output(void) +{ + if (imagex_info_file) + fflush(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, IMAGEX_DEREFERENCE_OPTION, IMAGEX_DEST_DIR_OPTION, + IMAGEX_DETAILED_OPTION, IMAGEX_EXTRACT_XML_OPTION, IMAGEX_FLAGS_OPTION, IMAGEX_FORCE_OPTION, - IMAGEX_HARDLINK_OPTION, IMAGEX_HEADER_OPTION, + IMAGEX_IMAGE_PROPERTY_OPTION, IMAGEX_INCLUDE_INVALID_NAMES_OPTION, IMAGEX_LAZY_OPTION, - IMAGEX_LOOKUP_TABLE_OPTION, IMAGEX_METADATA_OPTION, - IMAGEX_NORPFIX_OPTION, + IMAGEX_NEW_IMAGE_OPTION, IMAGEX_NOCHECK_OPTION, - IMAGEX_NO_ACLS_OPTION, - IMAGEX_NO_WILDCARDS_OPTION, + IMAGEX_NORPFIX_OPTION, IMAGEX_NOT_PIPABLE_OPTION, - IMAGEX_PACK_STREAMS_OPTION, + IMAGEX_NO_ACLS_OPTION, + IMAGEX_NO_ATTRIBUTES_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, IMAGEX_PIPABLE_OPTION, + IMAGEX_PRESERVE_DIR_STRUCTURE_OPTION, IMAGEX_REBUILD_OPTION, 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, IMAGEX_STRICT_ACLS_OPTION, - IMAGEX_STRICT_WILDCARDS_OPTION, - IMAGEX_SYMLINK_OPTION, IMAGEX_THREADS_OPTION, IMAGEX_TO_STDOUT_OPTION, IMAGEX_UNIX_DATA_OPTION, + IMAGEX_UNSAFE_COMPACT_OPTION, IMAGEX_UPDATE_OF_OPTION, IMAGEX_VERBOSE_OPTION, + IMAGEX_WIMBOOT_CONFIG_OPTION, + IMAGEX_WIMBOOT_OPTION, IMAGEX_XML_OPTION, }; static const struct option apply_options[] = { {T("check"), no_argument, NULL, IMAGEX_CHECK_OPTION}, - {T("hardlink"), no_argument, NULL, IMAGEX_HARDLINK_OPTION}, - {T("symlink"), no_argument, NULL, IMAGEX_SYMLINK_OPTION}, {T("verbose"), no_argument, NULL, IMAGEX_VERBOSE_OPTION}, {T("ref"), required_argument, NULL, IMAGEX_REF_OPTION}, {T("unix-data"), no_argument, NULL, IMAGEX_UNIX_DATA_OPTION}, {T("noacls"), no_argument, NULL, IMAGEX_NO_ACLS_OPTION}, {T("no-acls"), no_argument, NULL, IMAGEX_NO_ACLS_OPTION}, {T("strict-acls"), no_argument, NULL, IMAGEX_STRICT_ACLS_OPTION}, + {T("no-attributes"), no_argument, NULL, IMAGEX_NO_ATTRIBUTES_OPTION}, {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}, }; @@ -193,12 +242,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("pack-streams"), 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}, @@ -213,17 +265,24 @@ static const struct option capture_or_append_options[] = { {T("not-pipable"), no_argument, NULL, IMAGEX_NOT_PIPABLE_OPTION}, {T("update-of"), required_argument, NULL, IMAGEX_UPDATE_OF_OPTION}, {T("delta-from"), required_argument, NULL, IMAGEX_DELTA_FROM_OPTION}, + {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}, }; static const struct option dir_options[] = { - {T("path"), required_argument, NULL, IMAGEX_PATH_OPTION}, + {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}, }; @@ -233,13 +292,19 @@ 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("pack-streams"),no_argument, NULL, IMAGEX_PACK_STREAMS_OPTION}, + {T("recompress"), no_argument, NULL, IMAGEX_RECOMPRESS_OPTION}, {T("chunk-size"), required_argument, NULL, IMAGEX_CHUNK_SIZE_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}, }; @@ -251,11 +316,16 @@ static const struct option extract_options[] = { {T("noacls"), no_argument, NULL, IMAGEX_NO_ACLS_OPTION}, {T("no-acls"), no_argument, NULL, IMAGEX_NO_ACLS_OPTION}, {T("strict-acls"), no_argument, NULL, IMAGEX_STRICT_ACLS_OPTION}, + {T("no-attributes"), no_argument, NULL, IMAGEX_NO_ATTRIBUTES_OPTION}, {T("dest-dir"), required_argument, NULL, IMAGEX_DEST_DIR_OPTION}, {T("to-stdout"), no_argument, NULL, IMAGEX_TO_STDOUT_OPTION}, {T("include-invalid-names"), no_argument, NULL, IMAGEX_INCLUDE_INVALID_NAMES_OPTION}, - {T("strict-wildcards"), no_argument, NULL, IMAGEX_STRICT_WILDCARDS_OPTION}, - {T("no-wildcards"), no_argument, NULL, IMAGEX_NO_WILDCARDS_OPTION}, + {T("no-wildcards"), no_argument, NULL, IMAGEX_NO_GLOBS_OPTION}, + {T("no-globs"), no_argument, NULL, IMAGEX_NO_GLOBS_OPTION}, + {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}, }; @@ -266,9 +336,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}, }; @@ -277,6 +348,7 @@ static const struct option join_options[] = { {NULL, 0, NULL, 0}, }; +#if WIM_MOUNTING_SUPPORTED static const struct option mount_options[] = { {T("check"), no_argument, NULL, IMAGEX_CHECK_OPTION}, {T("debug"), no_argument, NULL, IMAGEX_DEBUG_OPTION}, @@ -287,6 +359,7 @@ static const struct option mount_options[] = { {T("allow-other"), no_argument, NULL, IMAGEX_ALLOW_OTHER_OPTION}, {NULL, 0, NULL, 0}, }; +#endif static const struct option optimize_options[] = { {T("check"), no_argument, NULL, IMAGEX_CHECK_OPTION}, @@ -294,13 +367,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("pack-streams"),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}, }; @@ -309,13 +384,17 @@ static const struct option split_options[] = { {NULL, 0, NULL, 0}, }; +#if WIM_MOUNTING_SUPPORTED static const struct option unmount_options[] = { {T("commit"), no_argument, NULL, IMAGEX_COMMIT_OPTION}, {T("check"), no_argument, NULL, IMAGEX_CHECK_OPTION}, {T("rebuild"), no_argument, NULL, IMAGEX_REBUILD_OPTION}, {T("lazy"), no_argument, NULL, IMAGEX_LAZY_OPTION}, + {T("force"), no_argument, NULL, IMAGEX_FORCE_OPTION}, + {T("new-image"), no_argument, NULL, IMAGEX_NEW_IMAGE_OPTION}, {NULL, 0, NULL, 0}, }; +#endif static const struct option update_options[] = { /* Careful: some of the options here set the defaults for update @@ -326,6 +405,7 @@ static const struct option update_options[] = { {T("check"), no_argument, NULL, IMAGEX_CHECK_OPTION}, {T("rebuild"), no_argument, NULL, IMAGEX_REBUILD_OPTION}, {T("command"), required_argument, NULL, IMAGEX_COMMAND_OPTION}, + {T("wimboot-config"), required_argument, NULL, IMAGEX_WIMBOOT_CONFIG_OPTION}, /* Default delete options */ {T("force"), no_argument, NULL, IMAGEX_FORCE_OPTION}, @@ -341,6 +421,15 @@ static const struct option update_options[] = { {T("noacls"), no_argument, NULL, IMAGEX_NO_ACLS_OPTION}, {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}, }; @@ -415,108 +504,207 @@ 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 * const 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) { - if (!tstrcasecmp(optarg, T("maximum")) || !tstrcasecmp(optarg, T("lzx"))) - 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); + 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"))) { + 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; } +/* Parse the argument to --compact */ static int -set_compress_slow(void) +set_compact_mode(const tchar *arg, int *extract_flags) { - int ret; - static const struct wimlib_lzx_compressor_params slow_params = { - .hdr = { - .size = sizeof(struct wimlib_lzx_compressor_params), - }, - .algorithm = WIMLIB_LZX_ALGORITHM_SLOW, - .alg_params = { - .slow = { - .use_len2_matches = 1, - .num_fast_bytes = 96, - .num_optim_passes = 4, - .max_search_depth = 100, - .max_matches_per_pos = 10, - .main_nostat_cost = 15, - .len_nostat_cost = 15, - .aligned_nostat_cost = 7, - }, - }, - }; - ret = wimlib_set_default_compressor_params(WIMLIB_COMPRESSION_TYPE_LZX, - &slow_params.hdr); - if (ret) - imagex_error(T("Couldn't set slow compression parameters.!")); - return ret; + 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; + +struct string_list { + tchar **strings; unsigned num_strings; unsigned num_alloc_strings; }; -#define STRING_SET_INITIALIZER \ +#define STRING_LIST_INITIALIZER \ { .strings = NULL, .num_strings = 0, .num_alloc_strings = 0, } -#define STRING_SET(_strings) \ - struct string_set _strings = STRING_SET_INITIALIZER +#define STRING_LIST(_strings) \ + struct string_list _strings = STRING_LIST_INITIALIZER static int -string_set_append(struct string_set *set, const tchar *glob) +string_list_append(struct string_list *list, tchar *glob) { - unsigned num_alloc_strings = set->num_alloc_strings; + unsigned num_alloc_strings = list->num_alloc_strings; - if (set->num_strings == num_alloc_strings) { - const tchar **new_strings; + if (list->num_strings == num_alloc_strings) { + tchar **new_strings; num_alloc_strings += 4; - new_strings = realloc(set->strings, - sizeof(set->strings[0]) * num_alloc_strings); + new_strings = realloc(list->strings, + sizeof(list->strings[0]) * num_alloc_strings); if (!new_strings) { imagex_error(T("Out of memory!")); return -1; } - set->strings = new_strings; - set->num_alloc_strings = num_alloc_strings; + list->strings = new_strings; + list->num_alloc_strings = num_alloc_strings; } - set->strings[set->num_strings++] = glob; + list->strings[list->num_strings++] = glob; return 0; } static void -string_set_destroy(struct string_set *set) +string_list_destroy(struct string_list *list) { - free(set->strings); + free(list->strings); } static int -wim_reference_globs(WIMStruct *wim, struct string_set *set, int open_flags) +wim_reference_globs(WIMStruct *wim, struct string_list *list, int open_flags) { - return wimlib_reference_resource_files(wim, set->strings, - set->num_strings, + return wimlib_reference_resource_files(wim, (const tchar **)list->strings, + list->num_strings, WIMLIB_REF_FLAG_GLOB_ENABLE, - open_flags, - imagex_progress_func); + open_flags); +} + +static int +append_image_property_argument(struct string_list *image_properties) +{ + if (!tstrchr(optarg, '=')) { + imagex_error(T("'--image-property' argument " + "must be in the form NAME=VALUE")); + return -1; + } + return string_list_append(image_properties, optarg); +} + +static int +apply_image_properties(struct string_list *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, - const struct string_set *refglobs) + const struct string_list *refglobs) { if (info->total_parts > 1) { if (refglobs->num_strings == 0) { @@ -534,6 +722,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 @@ -653,7 +852,7 @@ static bool is_comment_line(const tchar *line, size_t len) { for (;;) { - if (*line == T('#')) + if (*line == T('#') || *line == T(';')) return true; if (!istspace(*line) && *line != T('\0')) return false; @@ -751,144 +950,6 @@ parse_source_list(tchar **source_list_contents_p, size_t source_list_nchars, return sources; } - -enum capture_config_section { - CAPTURE_CONFIG_NO_SECTION, - CAPTURE_CONFIG_EXCLUSION_SECTION, - CAPTURE_CONFIG_EXCLUSION_EXCEPTION_SECTION, - CAPTURE_CONFIG_IGNORE_SECTION, -}; - -enum { - CAPTURE_CONFIG_INVALID_SECTION, - CAPTURE_CONFIG_CHANGED_SECTION, - CAPTURE_CONFIG_SAME_SECTION, -}; - -static int -check_config_section(tchar *line, size_t len, - enum capture_config_section *cur_section) -{ - while (istspace(*line)) - line++; - - if (*line != T('[')) - return CAPTURE_CONFIG_SAME_SECTION; - - line++; - tchar *endbrace = tstrrchr(line, T(']')); - if (!endbrace) - return CAPTURE_CONFIG_SAME_SECTION; - - if (!tmemcmp(line, T("ExclusionList"), endbrace - line)) { - *cur_section = CAPTURE_CONFIG_EXCLUSION_SECTION; - } else if (!tmemcmp(line, T("ExclusionException"), endbrace - line)) { - *cur_section = CAPTURE_CONFIG_EXCLUSION_EXCEPTION_SECTION; - } else if (!tmemcmp(line, T("CompressionExclusionList"), endbrace - line)) { - *cur_section = CAPTURE_CONFIG_IGNORE_SECTION; - tfputs(T("WARNING: Ignoring [CompressionExclusionList] section " - "of capture config file\n"), - stderr); - } else if (!tmemcmp(line, T("AlignmentList"), endbrace - line)) { - *cur_section = CAPTURE_CONFIG_IGNORE_SECTION; - tfputs(T("WARNING: Ignoring [AlignmentList] section " - "of capture config file\n"), - stderr); - } else { - imagex_error(T("Invalid capture config file section \"%"TS"\""), - line - 1); - return CAPTURE_CONFIG_INVALID_SECTION; - } - return CAPTURE_CONFIG_CHANGED_SECTION; -} - - -static bool -pattern_list_add_pattern(struct wimlib_pattern_list *pat_list, - tchar *pat) -{ - if (pat_list->num_pats == pat_list->num_allocated_pats) { - tchar **pats; - size_t num_allocated_pats = pat_list->num_pats + 8; - - pats = realloc(pat_list->pats, - num_allocated_pats * sizeof(pat_list->pats[0])); - if (!pats) { - imagex_error(T("Out of memory!")); - return false; - } - pat_list->pats = pats; - pat_list->num_allocated_pats = num_allocated_pats; - } - pat_list->pats[pat_list->num_pats++] = pat; - return true; -} - -static bool -parse_capture_config_line(tchar *line, size_t len, - enum capture_config_section *cur_section, - struct wimlib_capture_config *config) -{ - tchar *filename; - int ret; - - ret = check_config_section(line, len, cur_section); - if (ret == CAPTURE_CONFIG_INVALID_SECTION) - return false; - if (ret == CAPTURE_CONFIG_CHANGED_SECTION) - return true; - - switch (*cur_section) { - case CAPTURE_CONFIG_NO_SECTION: - imagex_error(T("Line \"%"TS"\" is not in a section " - "(such as [ExclusionList]"), line); - return false; - case CAPTURE_CONFIG_EXCLUSION_SECTION: - if (parse_string(&line, &len, &filename) != PARSE_STRING_SUCCESS) - return false; - return pattern_list_add_pattern(&config->exclusion_pats, - filename); - case CAPTURE_CONFIG_EXCLUSION_EXCEPTION_SECTION: - if (parse_string(&line, &len, &filename) != PARSE_STRING_SUCCESS) - return false; - return pattern_list_add_pattern(&config->exclusion_exception_pats, - filename); - case CAPTURE_CONFIG_IGNORE_SECTION: - return true; - } - return false; -} - -static int -parse_capture_config(tchar **contents_p, size_t nchars, - struct wimlib_capture_config *config) -{ - ssize_t nlines; - tchar *p; - size_t i; - enum capture_config_section cur_section; - - memset(config, 0, sizeof(*config)); - - nlines = text_file_count_lines(contents_p, &nchars); - if (nlines < 0) - return -1; - - cur_section = CAPTURE_CONFIG_NO_SECTION; - p = *contents_p; - for (i = 0; i < nlines; i++) { - tchar *endp = tmemchr(p, T('\n'), nchars); - size_t len = endp - p + 1; - *endp = T('\0'); - if (!is_comment_line(p, len)) - if (!parse_capture_config_line(p, len, &cur_section, config)) - return -1; - p = endp + 1; - - } - return 0; -} - /* Reads the contents of a file into memory. */ static char * file_get_contents(const tchar *filename, size_t *len_ret) @@ -1087,63 +1148,52 @@ report_scan_progress(const struct wimlib_progress_info_scan *scan, bool done) last_scan_progress = *scan; } } - /* Progress callback function passed to various wimlib functions. */ -static int +static enum wimlib_progress_status imagex_progress_func(enum wimlib_progress_msg msg, - const union wimlib_progress_info *info) + union wimlib_progress_info *info, + void *_ignored_context) { unsigned percent_done; unsigned unit_shift; const tchar *unit_name; - if (imagex_be_quiet) - return 0; switch (msg) { case WIMLIB_PROGRESS_MSG_WRITE_STREAMS: + { + 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); - if (info->write_streams.completed_streams == 0) { - imagex_printf(T("Writing %"TS"-compressed data using %u thread%"TS"\n"), - wimlib_get_compression_type_string(info->write_streams.compression_type), - info->write_streams.num_threads, - (info->write_streams.num_threads == 1) ? T("") : T("s")); - } - if (info->write_streams.total_parts <= 1) { - imagex_printf(T("\r%"PRIu64" %"TS" of %"PRIu64" %"TS" (uncompressed) " - "written (%u%% done)"), - info->write_streams.completed_bytes >> unit_shift, - unit_name, - info->write_streams.total_bytes >> unit_shift, - unit_name, - percent_done); - } else { - imagex_printf(T("\rWriting resources from part %u of %u: " - "%"PRIu64 " %"TS" of %"PRIu64" %"TS" (%u%%) written"), - (info->write_streams.completed_parts == - info->write_streams.total_parts) ? - info->write_streams.completed_parts : - info->write_streams.completed_parts + 1, - info->write_streams.total_parts, - info->write_streams.completed_bytes >> unit_shift, - unit_name, - info->write_streams.total_bytes >> unit_shift, - unit_name, - percent_done); - } + 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, + unit_name, + percent_done); if (info->write_streams.completed_bytes >= info->write_streams.total_bytes) imagex_printf(T("\n")); break; case WIMLIB_PROGRESS_MSG_SCAN_BEGIN: imagex_printf(T("Scanning \"%"TS"\""), info->scan.source); - if (*info->scan.wim_target_path) { - imagex_printf(T(" (loading as WIM path: " - "\""WIMLIB_WIM_PATH_SEPARATOR_STRING"%"TS"\")...\n"), - info->scan.wim_target_path); - } else { + if (WIMLIB_IS_WIM_ROOT_PATH(info->scan.wim_target_path)) { imagex_printf(T("\n")); + } else { + imagex_printf(T(" (loading as WIM path: \"%"TS"\")...\n"), + info->scan.wim_target_path); } memset(&last_scan_progress, 0, sizeof(last_scan_progress)); break; @@ -1159,13 +1209,22 @@ imagex_progress_func(enum wimlib_progress_msg msg, imagex_printf(T("\nWARNING: Excluding unsupported file or directory\n" " \"%"TS"\" from capture\n"), info->scan.cur_path); break; - case WIMLIB_SCAN_DENTRY_EXCLUDED_SYMLINK: - imagex_printf(T("\nWARNING: Ignoring absolute symbolic link " - "with out-of-tree target:\n" - " \"%"TS"\" => \"%"TS"\"\n" + case WIMLIB_SCAN_DENTRY_FIXED_SYMLINK: + /* Symlink fixups are enabled by default. This is + * mainly intended for Windows, which for some reason + * uses absolute junctions (with drive letters!) in the + * default installation. On UNIX-like systems, warn the + * user when fixing the target of an absolute symbolic + * link, so they know to disable this if they want. */ + #ifndef __WIN32__ + imagex_printf(T("\nWARNING: Adjusted target of " + "absolute symbolic link \"%"TS"\"\n" " (Use --norpfix to capture " "absolute symbolic links as-is)\n"), - info->scan.cur_path, info->scan.symlink_target); + info->scan.cur_path); + #endif + break; + default: break; } break; @@ -1212,24 +1271,22 @@ imagex_progress_func(enum wimlib_progress_msg msg, T("NTFS volume") : T("directory")), info->extract.target); break; - case WIMLIB_PROGRESS_MSG_EXTRACT_TREE_BEGIN: - if (info->extract.extract_root_wim_source_path[0] != T('\0')) { - imagex_printf(T("Extracting " - "\""WIMLIB_WIM_PATH_SEPARATOR_STRING"%"TS"\" " - "from image %d (\"%"TS"\") " - "in \"%"TS"\" to \"%"TS"\"\n"), - info->extract.extract_root_wim_source_path, - info->extract.image, - info->extract.image_name, - info->extract.wimfile_name, - info->extract.target); + 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, @@ -1239,6 +1296,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"), @@ -1246,16 +1314,6 @@ imagex_progress_func(enum wimlib_progress_msg msg, info->extract.total_parts); } break; - case WIMLIB_PROGRESS_MSG_APPLY_TIMESTAMPS: - if (info->extract.extract_root_wim_source_path[0] == T('\0')) - imagex_printf(T("Setting timestamps on all extracted files...\n")); - break; - case WIMLIB_PROGRESS_MSG_EXTRACT_IMAGE_END: - if (info->extract.extract_flags & WIMLIB_EXTRACT_FLAG_NTFS) { - imagex_printf(T("Unmounting NTFS volume \"%"TS"\"...\n"), - info->extract.target); - } - break; case WIMLIB_PROGRESS_MSG_SPLIT_BEGIN_PART: percent_done = TO_PERCENT(info->split.completed_bytes, info->split.total_bytes); @@ -1281,14 +1339,11 @@ imagex_progress_func(enum wimlib_progress_msg msg, case WIMLIB_PROGRESS_MSG_UPDATE_END_COMMAND: switch (info->update.command->op) { case WIMLIB_UPDATE_OP_DELETE: - imagex_printf(T("Deleted WIM path " - "\""WIMLIB_WIM_PATH_SEPARATOR_STRING "%"TS"\"\n"), + imagex_printf(T("Deleted WIM path \"%"TS"\"\n"), info->update.command->delete_.wim_path); break; case WIMLIB_UPDATE_OP_RENAME: - imagex_printf(T("Renamed WIM path " - "\""WIMLIB_WIM_PATH_SEPARATOR_STRING "%"TS"\" => " - "\""WIMLIB_WIM_PATH_SEPARATOR_STRING "%"TS"\"\n"), + imagex_printf(T("Renamed WIM path \"%"TS"\" => \"%"TS"\"\n"), info->update.command->rename.wim_source_path, info->update.command->rename.wim_target_path); break; @@ -1297,11 +1352,52 @@ imagex_progress_func(enum wimlib_progress_msg msg, break; } break; + case WIMLIB_PROGRESS_MSG_REPLACE_FILE_IN_WIM: + imagex_printf(T("Updating \"%"TS"\" in WIM image\n"), + info->replace.path_in_wim); + break; + case WIMLIB_PROGRESS_MSG_WIMBOOT_EXCLUDE: + imagex_printf(T("\nExtracting \"%"TS"\" as normal file (not WIMBoot pointer)\n"), + info->wimboot_exclude.path_in_wim); + break; + case WIMLIB_PROGRESS_MSG_UNMOUNT_BEGIN: + if (info->unmount.mount_flags & WIMLIB_MOUNT_FLAG_READWRITE) { + if (info->unmount.unmount_flags & WIMLIB_UNMOUNT_FLAG_COMMIT) { + imagex_printf(T("Committing changes to %"TS" (image %d)\n"), + info->unmount.mounted_wim, + info->unmount.mounted_image); + } else { + imagex_printf(T("Discarding changes to %"TS" (image %d)\n"), + info->unmount.mounted_wim, + info->unmount.mounted_image); + imagex_printf(T("\t(Use --commit to keep changes.)\n")); + } + } + 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; } - fflush(imagex_info_file); - return 0; + imagex_flush_output(); + return WIMLIB_PROGRESS_STATUS_CONTINUE; } static unsigned @@ -1317,16 +1413,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; } @@ -1360,6 +1477,8 @@ update_command_add_option(int op, const tchar *option, cmd->add.add_flags |= WIMLIB_ADD_FLAG_STRICT_ACLS; else if (!tstrcmp(option, T("--dereference"))) cmd->add.add_flags |= WIMLIB_ADD_FLAG_DEREFERENCE; + else if (!tstrcmp(option, T("--no-replace"))) + cmd->add.add_flags |= WIMLIB_ADD_FLAG_NO_REPLACE; else recognized = false; break; @@ -1538,8 +1657,8 @@ parse_update_command_file(tchar **cmd_file_contents_p, size_t cmd_file_nchars, return cmds; } -/* Apply one image, or all images, from a WIM file into a directory, OR apply - * one image from a WIM file to a NTFS volume. */ +/* Apply one image, or all images, from a WIM file to a directory, OR apply + * one image from a WIM file to an NTFS volume. */ static int imagex_apply(int argc, tchar **argv, int cmd) { @@ -1554,24 +1673,18 @@ imagex_apply(int argc, tchar **argv, int cmd) const tchar *image_num_or_name = NULL; int extract_flags = 0; - STRING_SET(refglobs); + STRING_LIST(refglobs); for_opt(c, apply_options) { switch (c) { case IMAGEX_CHECK_OPTION: open_flags |= WIMLIB_OPEN_FLAG_CHECK_INTEGRITY; break; - case IMAGEX_HARDLINK_OPTION: - extract_flags |= WIMLIB_EXTRACT_FLAG_HARDLINK; - break; - case IMAGEX_SYMLINK_OPTION: - extract_flags |= WIMLIB_EXTRACT_FLAG_SYMLINK; - break; case IMAGEX_VERBOSE_OPTION: /* No longer does anything. */ break; case IMAGEX_REF_OPTION: - ret = string_set_append(&refglobs, optarg); + ret = string_list_append(&refglobs, optarg); if (ret) goto out_free_refglobs; break; @@ -1584,6 +1697,9 @@ imagex_apply(int argc, tchar **argv, int cmd) case IMAGEX_STRICT_ACLS_OPTION: extract_flags |= WIMLIB_EXTRACT_FLAG_STRICT_ACLS; break; + case IMAGEX_NO_ATTRIBUTES_OPTION: + extract_flags |= WIMLIB_EXTRACT_FLAG_NO_ATTRIBUTES; + break; case IMAGEX_NORPFIX_OPTION: extract_flags |= WIMLIB_EXTRACT_FLAG_NORPFIX; break; @@ -1594,8 +1710,13 @@ 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; + 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; @@ -1619,8 +1740,8 @@ imagex_apply(int argc, tchar **argv, int cmd) } wim = NULL; } else { - ret = wimlib_open_wim(wimfile, open_flags, &wim, - imagex_progress_func); + ret = wimlib_open_wim_with_progress(wimfile, open_flags, &wim, + imagex_progress_func, NULL); if (ret) goto out_free_refglobs; @@ -1663,7 +1784,7 @@ imagex_apply(int argc, tchar **argv, int cmd) #ifndef __WIN32__ { - /* Interpret a regular file or block device target as a NTFS + /* Interpret a regular file or block device target as an NTFS * volume. */ struct stat stbuf; @@ -1682,14 +1803,16 @@ imagex_apply(int argc, tchar **argv, int cmd) #endif if (wim) { - ret = wimlib_extract_image(wim, image, target, extract_flags, - imagex_progress_func); + ret = wimlib_extract_image(wim, image, target, extract_flags); } else { set_fd_to_binary_mode(STDIN_FILENO); - ret = wimlib_extract_image_from_pipe(STDIN_FILENO, - image_num_or_name, - target, extract_flags, - imagex_progress_func); + ret = wimlib_extract_image_from_pipe_with_progress( + STDIN_FILENO, + image_num_or_name, + target, + extract_flags, + imagex_progress_func, + NULL); } if (ret == 0) { imagex_printf(T("Done applying WIM image.\n")); @@ -1702,11 +1825,13 @@ 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); out_free_refglobs: - string_set_destroy(&refglobs); + string_list_destroy(&refglobs); return ret; out_usage: @@ -1723,21 +1848,23 @@ 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 | + WIMLIB_ADD_FLAG_FILE_PATHS_UNNEEDED; int write_flags = 0; int compression_type = WIMLIB_COMPRESSION_TYPE_INVALID; uint32_t chunk_size = UINT32_MAX; + 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_LIST(image_properties); WIMStruct *wim; - STRING_SET(base_wimfiles); + STRING_LIST(base_wimfiles); WIMStruct **base_wims; WIMStruct *template_wim; @@ -1751,9 +1878,7 @@ imagex_capture_or_append(int argc, tchar **argv, int cmd) tchar *source; tchar *source_copy; - const tchar *config_file = NULL; - tchar *config_str; - struct wimlib_capture_config *config; + tchar *config_file = NULL; bool source_list = false; size_t source_list_nchars = 0; @@ -1766,7 +1891,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; @@ -1777,32 +1902,49 @@ 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: - ret = set_compress_slow(); - if (ret) - goto out_err; - compression_type = WIMLIB_COMPRESSION_TYPE_LZX; - break; case IMAGEX_CHUNK_SIZE_OPTION: chunk_size = parse_chunk_size(optarg); if (chunk_size == UINT32_MAX) goto out_err; break; - case IMAGEX_PACK_STREAMS_OPTION: - write_flags |= WIMLIB_WRITE_FLAG_PACK_STREAMS; + 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_SOLID_COMPRESS_OPTION: + 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_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_list_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. */ @@ -1816,22 +1958,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; @@ -1859,16 +2001,25 @@ imagex_capture_or_append(int argc, tchar **argv, int cmd) } break; case IMAGEX_DELTA_FROM_OPTION: - if (cmd != CMD_CAPTURE) { - imagex_error(T("'--delta-from' is only " - "valid for capture!")); - goto out_usage; - } - ret = string_set_append(&base_wimfiles, optarg); + ret = string_list_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_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; } @@ -1882,17 +2033,23 @@ imagex_capture_or_append(int argc, tchar **argv, int cmd) source = argv[0]; wimfile = argv[1]; - /* Set default compression type. */ - if (compression_type == WIMLIB_COMPRESSION_TYPE_INVALID) { - struct wimlib_lzx_compressor_params params; - memset(¶ms, 0, sizeof(params)); - params.hdr.size = sizeof(params); - params.algorithm = WIMLIB_LZX_ALGORITHM_FAST; - params.use_defaults = 1; + /* Set default compression type and parameters. */ + - wimlib_set_default_compressor_params(WIMLIB_COMPRESSION_TYPE_LZX, - ¶ms.hdr); - compression_type = WIMLIB_COMPRESSION_TYPE_LZX; + if (compression_type == WIMLIB_COMPRESSION_TYPE_INVALID) { + /* No compression type specified. Use the default. */ + + 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_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. */ + compression_type = WIMLIB_COMPRESSION_TYPE_LZX; + } } if (!tstrcmp(wimfile, T("-"))) { @@ -1915,7 +2072,7 @@ imagex_capture_or_append(int argc, tchar **argv, int cmd) } wim_fd = STDOUT_FILENO; wimfile = NULL; - imagex_info_file = stderr; + imagex_output_to_stderr(); set_fd_to_binary_mode(wim_fd); } @@ -1963,11 +2120,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_list_append(&image_properties, p); + if (ret) + goto out; + } if (source_list) { /* Set up capture sources in source list mode */ @@ -1992,48 +2153,59 @@ imagex_capture_or_append(int argc, tchar **argv, int cmd) /* Set up capture source in non-source-list mode. */ capture_sources = alloca(sizeof(struct wimlib_capture_source)); capture_sources[0].fs_source_path = source; - capture_sources[0].wim_target_path = NULL; + capture_sources[0].wim_target_path = WIMLIB_WIM_ROOT_PATH; capture_sources[0].reserved = 0; num_sources = 1; capture_sources_malloced = false; source_list_contents = NULL; } - if (config_file) { - /* Read and parse capture configuration file. */ - size_t config_len; - - config_str = file_get_text_contents(config_file, &config_len); - if (!config_str) { - ret = -1; - goto out_free_capture_sources; - } - - config = alloca(sizeof(*config)); - ret = parse_capture_config(&config_str, config_len, config); + /* Open the existing WIM, or create a new one. */ + if (cmd == CMD_APPEND) { + ret = wimlib_open_wim_with_progress(wimfile, + open_flags | WIMLIB_OPEN_FLAG_WRITE_ACCESS, + &wim, + imagex_progress_func, + NULL); if (ret) - goto out_free_config; + goto out_free_capture_sources; } else { - /* No capture configuration file specified; use default - * configuration for capturing Windows operating systems. */ - config = NULL; - add_image_flags |= WIMLIB_ADD_FLAG_WINCONFIG; - } - - /* Open the existing WIM, or create a new one. */ - if (cmd == CMD_APPEND) - ret = wimlib_open_wim(wimfile, open_flags, &wim, - imagex_progress_func); - else ret = wimlib_create_new_wim(compression_type, &wim); - if (ret) - goto out_free_config; + if (ret) + goto out_free_capture_sources; + wimlib_register_progress_function(wim, imagex_progress_func, NULL); + } /* Set chunk size if non-default. */ if (chunk_size != UINT32_MAX) { ret = wimlib_set_output_chunk_size(wim, chunk_size); if (ret) goto out_free_wim; + } 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); + if (ret) + goto out_free_wim; + } + if (solid_chunk_size != UINT32_MAX) { + ret = wimlib_set_output_pack_chunk_size(wim, solid_chunk_size); + if (ret) + goto out_free_wim; } #ifndef __WIN32__ @@ -2046,7 +2218,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) { @@ -2085,9 +2257,9 @@ 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(base_wimfiles.strings[i], - open_flags, &base_wims[i], - imagex_progress_func); + ret = wimlib_open_wim_with_progress( + base_wimfiles.strings[i], open_flags, + &base_wims[i], imagex_progress_func, NULL); if (ret) goto out_free_base_wims; @@ -2121,8 +2293,11 @@ imagex_capture_or_append(int argc, tchar **argv, int cmd) } else if (template_wimfile == wimfile) { template_wim = wim; } else { - ret = wimlib_open_wim(template_wimfile, open_flags, - &template_wim, imagex_progress_func); + ret = wimlib_open_wim_with_progress(template_wimfile, + open_flags, + &template_wim, + imagex_progress_func, + NULL); if (ret) goto out_free_base_wims; } @@ -2157,35 +2332,23 @@ imagex_capture_or_append(int argc, tchar **argv, int cmd) capture_sources, num_sources, name, - config, - add_image_flags, - imagex_progress_func); + config_file, + 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) { @@ -2196,7 +2359,7 @@ imagex_capture_or_append(int argc, tchar **argv, int cmd) info.image_count, template_wim, template_image, - 0, NULL); + 0); if (ret) goto out_free_template_wim; } @@ -2205,16 +2368,13 @@ imagex_capture_or_append(int argc, tchar **argv, int cmd) /* Write the new WIM or overwrite the existing WIM with the new image * appended. */ if (cmd == CMD_APPEND) { - ret = wimlib_overwrite(wim, write_flags, num_threads, - imagex_progress_func); + ret = wimlib_overwrite(wim, write_flags, num_threads); } else if (wimfile) { ret = wimlib_write(wim, wimfile, WIMLIB_ALL_IMAGES, - write_flags, num_threads, - imagex_progress_func); + write_flags, num_threads); } else { ret = wimlib_write_to_fd(wim, wim_fd, WIMLIB_ALL_IMAGES, - write_flags, num_threads, - imagex_progress_func); + write_flags, num_threads); } out_free_template_wim: /* template_wim may alias base_wims[0] or wim. */ @@ -2227,26 +2387,21 @@ out_free_base_wims: free(base_wims); out_free_wim: wimlib_free(wim); -out_free_config: - if (config) { - free(config->exclusion_pats.pats); - free(config->exclusion_exception_pats.pats); - free(config_str); - } out_free_capture_sources: if (capture_sources_malloced) free(capture_sources); out_free_source_list_contents: free(source_list_contents); -out_free_base_wimfiles: - string_set_destroy(&base_wimfiles); +out: + string_list_destroy(&image_properties); + string_list_destroy(&base_wimfiles); return ret; out_usage: usage(cmd, stderr); out_err: ret = -1; - goto out_free_base_wimfiles; + goto out; } /* Remove image(s) from a WIM. */ @@ -2271,6 +2426,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; } @@ -2288,8 +2446,8 @@ imagex_delete(int argc, tchar **argv, int cmd) wimfile = argv[0]; image_num_or_name = argv[1]; - ret = wimlib_open_wim(wimfile, open_flags, &wim, - imagex_progress_func); + ret = wimlib_open_wim_with_progress(wimfile, open_flags, &wim, + imagex_progress_func, NULL); if (ret) goto out; @@ -2306,7 +2464,7 @@ imagex_delete(int argc, tchar **argv, int cmd) goto out_wimlib_free; } - ret = wimlib_overwrite(wim, write_flags, 0, imagex_progress_func); + ret = wimlib_overwrite(wim, write_flags, 0); if (ret) { imagex_error(T("Failed to write the file \"%"TS"\" with image " "deleted"), wimfile); @@ -2322,11 +2480,267 @@ out_usage: goto out; } +struct print_dentry_options { + bool detailed; +}; + +static void +print_dentry_full_path(const struct wimlib_dir_entry *dentry) +{ + tprintf(T("%"TS"\n"), dentry->full_path); +} + +static const struct { + uint32_t flag; + const tchar *name; +} file_attr_flags[] = { + {WIMLIB_FILE_ATTRIBUTE_READONLY, T("READONLY")}, + {WIMLIB_FILE_ATTRIBUTE_HIDDEN, T("HIDDEN")}, + {WIMLIB_FILE_ATTRIBUTE_SYSTEM, T("SYSTEM")}, + {WIMLIB_FILE_ATTRIBUTE_DIRECTORY, T("DIRECTORY")}, + {WIMLIB_FILE_ATTRIBUTE_ARCHIVE, T("ARCHIVE")}, + {WIMLIB_FILE_ATTRIBUTE_DEVICE, T("DEVICE")}, + {WIMLIB_FILE_ATTRIBUTE_NORMAL, T("NORMAL")}, + {WIMLIB_FILE_ATTRIBUTE_TEMPORARY, T("TEMPORARY")}, + {WIMLIB_FILE_ATTRIBUTE_SPARSE_FILE, T("SPARSE_FILE")}, + {WIMLIB_FILE_ATTRIBUTE_REPARSE_POINT, T("REPARSE_POINT")}, + {WIMLIB_FILE_ATTRIBUTE_COMPRESSED, T("COMPRESSED")}, + {WIMLIB_FILE_ATTRIBUTE_OFFLINE, T("OFFLINE")}, + {WIMLIB_FILE_ATTRIBUTE_NOT_CONTENT_INDEXED, T("NOT_CONTENT_INDEXED")}, + {WIMLIB_FILE_ATTRIBUTE_ENCRYPTED, T("ENCRYPTED")}, + {WIMLIB_FILE_ATTRIBUTE_VIRTUAL, T("VIRTUAL")}, +}; + +#define TIMESTR_MAX 100 + +static void +print_time(const tchar *type, const struct wimlib_timespec *wts, + int32_t high_part) +{ + tchar timestr[TIMESTR_MAX]; + time_t t; + struct tm tm; + + if (sizeof(wts->tv_sec) == 4 && sizeof(t) > sizeof(wts->tv_sec)) + t = (uint32_t)wts->tv_sec | ((uint64_t)high_part << 32); + else + t = wts->tv_sec; + + gmtime_r(&t, &tm); + tstrftime(timestr, TIMESTR_MAX, T("%a %b %d %H:%M:%S %Y UTC"), &tm); + timestr[TIMESTR_MAX - 1] = '\0'; + + tprintf(T("%-20"TS"= %"TS"\n"), type, timestr); +} + +static void print_byte_field(const uint8_t field[], size_t len) +{ + while (len--) + tprintf(T("%02hhx"), *field++); +} + +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); + tprintf(T("GUID: 0x")); + print_byte_field(info->guid, sizeof(info->guid)); + tputchar(T('\n')); + tprintf(T("Version: %u\n"), info->wim_version); + tprintf(T("Image Count: %d\n"), info->image_count); + tprintf(T("Compression: %"TS"\n"), + wimlib_get_compression_type_string(info->compression_type)); + tprintf(T("Chunk Size: %"PRIu32" bytes\n"), + info->chunk_size); + tprintf(T("Part Number: %d/%d\n"), info->part_number, info->total_parts); + tprintf(T("Boot Index: %d\n"), info->boot_index); + tprintf(T("Size: %"PRIu64" bytes\n"), info->total_bytes); + + 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_full_path(const struct wimlib_dir_entry *wdentry, void *_ignore) +print_resource(const struct wimlib_resource_entry *resource, + void *_ignore) +{ + 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"), + resource->uncompressed_size); + if (resource->packed) { + 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("Solid offset = %"PRIu64" bytes\n"), + resource->offset); + } else { + tprintf(T("Compressed size = %"PRIu64" bytes\n"), + resource->compressed_size); + + tprintf(T("Offset in WIM = %"PRIu64" bytes\n"), + resource->offset); + } + + tprintf(T("Part Number = %u\n"), resource->part_number); + tprintf(T("Reference Count = %u\n"), resource->reference_count); + + tprintf(T("Flags = ")); + if (resource->is_compressed) + tprintf(T("WIM_RESHDR_FLAG_COMPRESSED ")); + if (resource->is_metadata) + tprintf(T("WIM_RESHDR_FLAG_METADATA ")); + if (resource->is_free) + tprintf(T("WIM_RESHDR_FLAG_FREE ")); + if (resource->is_spanned) + tprintf(T("WIM_RESHDR_FLAG_SPANNED ")); + if (resource->packed) + tprintf(T("WIM_RESHDR_FLAG_SOLID ")); + tputchar(T('\n')); + } + tputchar(T('\n')); + return 0; +} + +static void +print_blobs(WIMStruct *wim) +{ + wimlib_iterate_lookup_table(wim, 0, print_resource, NULL); +} + +#ifndef __WIN32__ +static void +default_print_security_descriptor(const uint8_t *sd, size_t size) +{ + tprintf(T("Security Descriptor = ")); + print_byte_field(sd, size); + tputchar(T('\n')); +} +#endif + +static bool +is_null_guid(const uint8_t *guid) { - int ret = tprintf(T("%"TS"\n"), wdentry->full_path); - return (ret >= 0) ? 0 : -1; + static const uint8_t null_guid[WIMLIB_GUID_LEN]; + + return !memcmp(guid, null_guid, WIMLIB_GUID_LEN); +} + +static void +print_guid(const tchar *label, const uint8_t *guid) +{ + if (is_null_guid(guid)) + return; + tprintf(T("%-20"TS"= 0x"), label); + print_byte_field(guid, WIMLIB_GUID_LEN); + tputchar(T('\n')); +} + +static void +print_dentry_detailed(const struct wimlib_dir_entry *dentry) +{ + tprintf(T( +"----------------------------------------------------------------------------\n")); + tprintf(T("Full Path = \"%"TS"\"\n"), dentry->full_path); + if (dentry->dos_name) + tprintf(T("Short Name = \"%"TS"\"\n"), dentry->dos_name); + tprintf(T("Attributes = 0x%08x\n"), dentry->attributes); + for (size_t i = 0; i < ARRAY_LEN(file_attr_flags); i++) + if (file_attr_flags[i].flag & dentry->attributes) + tprintf(T(" FILE_ATTRIBUTE_%"TS" is set\n"), + file_attr_flags[i].name); + + if (dentry->security_descriptor) { + print_security_descriptor(dentry->security_descriptor, + dentry->security_descriptor_size); + } + + print_time(T("Creation Time"), + &dentry->creation_time, dentry->creation_time_high); + print_time(T("Last Write Time"), + &dentry->last_write_time, dentry->last_write_time_high); + print_time(T("Last Access Time"), + &dentry->last_access_time, dentry->last_access_time_high); + + + if (dentry->attributes & WIMLIB_FILE_ATTRIBUTE_REPARSE_POINT) + tprintf(T("Reparse Tag = 0x%"PRIx32"\n"), dentry->reparse_tag); + + tprintf(T("Link Group ID = 0x%016"PRIx64"\n"), dentry->hard_link_group_id); + tprintf(T("Link Count = %"PRIu32"\n"), dentry->num_links); + + if (dentry->unix_mode != 0) { + tprintf(T("UNIX Data = uid:%"PRIu32" gid:%"PRIu32" " + "mode:0%"PRIo32" rdev:0x%"PRIx32"\n"), + dentry->unix_uid, dentry->unix_gid, + dentry->unix_mode, dentry->unix_rdev); + } + + if (!is_null_guid(dentry->object_id.object_id)) { + print_guid(T("Object ID"), dentry->object_id.object_id); + print_guid(T("Birth Volume ID"), dentry->object_id.birth_volume_id); + print_guid(T("Birth Object ID"), dentry->object_id.birth_object_id); + print_guid(T("Domain ID"), dentry->object_id.domain_id); + } + + for (uint32_t i = 0; i <= dentry->num_named_streams; i++) { + if (dentry->streams[i].stream_name) { + 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")); + } + print_resource(&dentry->streams[i].resource, NULL); + } +} + +static int +print_dentry(const struct wimlib_dir_entry *dentry, void *_options) +{ + const struct print_dentry_options *options = _options; + if (!options->detailed) + print_dentry_full_path(dentry); + else + print_dentry_detailed(dentry); + return 0; } /* Print the files contained in an image(s) in a WIM file. */ @@ -2337,14 +2751,31 @@ imagex_dir(int argc, tchar **argv, int cmd) WIMStruct *wim = NULL; int image; int ret; - const tchar *path = T(""); + const tchar *path = WIMLIB_WIM_ROOT_PATH; int c; + struct print_dentry_options options = { + .detailed = false, + }; + int iterate_flags = WIMLIB_ITERATE_DIR_TREE_FLAG_RECURSIVE; + + STRING_LIST(refglobs); for_opt(c, dir_options) { switch (c) { case IMAGEX_PATH_OPTION: path = optarg; break; + case IMAGEX_DETAILED_OPTION: + options.detailed = true; + break; + case IMAGEX_ONE_FILE_ONLY_OPTION: + iterate_flags &= ~WIMLIB_ITERATE_DIR_TREE_FLAG_RECURSIVE; + break; + case IMAGEX_REF_OPTION: + ret = string_list_append(&refglobs, optarg); + if (ret) + goto out_free_refglobs; + break; default: goto out_usage; } @@ -2362,9 +2793,10 @@ imagex_dir(int argc, tchar **argv, int cmd) } wimfile = argv[0]; - ret = wimlib_open_wim(wimfile, 0, &wim, imagex_progress_func); + 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]); @@ -2388,18 +2820,30 @@ imagex_dir(int argc, tchar **argv, int cmd) image = 1; } - ret = wimlib_iterate_dir_tree(wim, image, path, - WIMLIB_ITERATE_DIR_TREE_FLAG_RECURSIVE, - print_full_path, NULL); + 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_list_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 @@ -2409,7 +2853,7 @@ imagex_export(int argc, tchar **argv, int cmd) { int c; int open_flags = 0; - int export_flags = 0; + int export_flags = WIMLIB_EXPORT_FLAG_GIFT; int write_flags = 0; int compression_type = WIMLIB_COMPRESSION_TYPE_INVALID; const tchar *src_wimfile; @@ -2425,9 +2869,11 @@ imagex_export(int argc, tchar **argv, int cmd) int image; struct stat stbuf; bool wim_is_new; - STRING_SET(refglobs); + STRING_LIST(refglobs); unsigned num_threads = 0; uint32_t chunk_size = UINT32_MAX; + uint32_t solid_chunk_size = UINT32_MAX; + int solid_ctype = WIMLIB_COMPRESSION_TYPE_INVALID; for_opt(c, export_options) { switch (c) { @@ -2442,20 +2888,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_PACK_STREAMS_OPTION: - write_flags |= WIMLIB_WRITE_FLAG_PACK_STREAMS; + case IMAGEX_RECOMPRESS_OPTION: + write_flags |= WIMLIB_WRITE_FLAG_RECOMPRESS; + break; + 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_CHUNK_SIZE_OPTION: chunk_size = parse_chunk_size(optarg); if (chunk_size == UINT32_MAX) goto out_err; break; + 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_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: - ret = string_set_append(&refglobs, optarg); + ret = string_list_append(&refglobs, optarg); if (ret) goto out_free_refglobs; break; @@ -2473,6 +2935,12 @@ imagex_export(int argc, tchar **argv, int cmd) case IMAGEX_NOT_PIPABLE_OPTION: write_flags |= WIMLIB_WRITE_FLAG_NOT_PIPABLE; break; + 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; } @@ -2486,8 +2954,8 @@ imagex_export(int argc, tchar **argv, int cmd) dest_wimfile = argv[2]; dest_name = (argc >= 4) ? argv[3] : NULL; dest_desc = (argc >= 5) ? argv[4] : NULL; - ret = wimlib_open_wim(src_wimfile, open_flags, &src_wim, - imagex_progress_func); + ret = wimlib_open_wim_with_progress(src_wimfile, open_flags, &src_wim, + imagex_progress_func, NULL); if (ret) goto out_free_refglobs; @@ -2513,7 +2981,7 @@ imagex_export(int argc, tchar **argv, int cmd) #endif dest_wimfile = NULL; dest_wim_fd = STDOUT_FILENO; - imagex_info_file = stderr; + imagex_output_to_stderr(); set_fd_to_binary_mode(dest_wim_fd); } errno = ENOENT; @@ -2521,15 +2989,18 @@ imagex_export(int argc, tchar **argv, int cmd) wim_is_new = false; /* Destination file exists. */ - if (!S_ISREG(stbuf.st_mode)) { - imagex_error(T("\"%"TS"\" is not a regular file"), - dest_wimfile); + if (!S_ISREG(stbuf.st_mode) && !S_ISBLK(stbuf.st_mode)) { + imagex_error(T("\"%"TS"\" is not a regular file " + "or block device"), dest_wimfile); ret = -1; goto out_free_src_wim; } - ret = wimlib_open_wim(dest_wimfile, - open_flags | WIMLIB_OPEN_FLAG_WRITE_ACCESS, - &dest_wim, imagex_progress_func); + ret = wimlib_open_wim_with_progress(dest_wimfile, + open_flags | + WIMLIB_OPEN_FLAG_WRITE_ACCESS, + &dest_wim, + imagex_progress_func, + NULL); if (ret) goto out_free_src_wim; @@ -2559,22 +3030,45 @@ 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. */ - - compression_type = src_info.compression_type; + * to that of the source WIM, unless --solid or + * --wimboot was specified. */ + + 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; + else + compression_type = src_info.compression_type; } ret = wimlib_create_new_wim(compression_type, &dest_wim); if (ret) goto out_free_src_wim; - /* Use same chunk size if compression type is the same. */ - if (compression_type == src_info.compression_type && - chunk_size == UINT32_MAX) + wimlib_register_progress_function(dest_wim, + imagex_progress_func, NULL); + + if ((export_flags & WIMLIB_EXPORT_FLAG_WIMBOOT) + && compression_type == WIMLIB_COMPRESSION_TYPE_XPRESS) + { + /* For --wimboot export, use small XPRESS chunks. */ + wimlib_set_output_chunk_size(dest_wim, 4096); + } else if (compression_type == src_info.compression_type && + chunk_size == UINT32_MAX) + { + /* Use same chunk size if compression type is the same. */ wimlib_set_output_chunk_size(dest_wim, src_info.chunk_size); + } } if (chunk_size != UINT32_MAX) { @@ -2583,6 +3077,16 @@ imagex_export(int argc, tchar **argv, int cmd) if (ret) goto out_free_dest_wim; } + 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 (solid_chunk_size != UINT32_MAX) { + ret = wimlib_set_output_pack_chunk_size(dest_wim, solid_chunk_size); + if (ret) + goto out_free_dest_wim; + } image = wimlib_resolve_image(src_wim, src_image_num_or_name); ret = verify_image_exists(image, src_image_num_or_name, src_wimfile); @@ -2605,32 +3109,32 @@ imagex_export(int argc, tchar **argv, int cmd) } ret = wimlib_export_image(src_wim, image, dest_wim, dest_name, - dest_desc, export_flags, imagex_progress_func); + dest_desc, export_flags); if (ret) { 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; } if (!wim_is_new) - ret = wimlib_overwrite(dest_wim, write_flags, num_threads, - imagex_progress_func); + ret = wimlib_overwrite(dest_wim, write_flags, num_threads); else if (dest_wimfile) ret = wimlib_write(dest_wim, dest_wimfile, WIMLIB_ALL_IMAGES, - write_flags, num_threads, - imagex_progress_func); + write_flags, num_threads); else ret = wimlib_write_to_fd(dest_wim, dest_wim_fd, WIMLIB_ALL_IMAGES, write_flags, - num_threads, imagex_progress_func); + num_threads); out_free_dest_wim: wimlib_free(dest_wim); out_free_src_wim: wimlib_free(src_wim); out_free_refglobs: - string_set_destroy(&refglobs); + string_list_destroy(&refglobs); return ret; out_usage: @@ -2640,67 +3144,6 @@ out_err: goto out_free_refglobs; } -static bool -is_root_wim_path(const tchar *path) -{ - const tchar *p; - for (p = path; *p; p++) - if (*p != T('\\') && *p != T('/')) - return false; - return true; -} - -static void -free_extract_commands(struct wimlib_extract_command *cmds, size_t num_cmds, - const tchar *dest_dir) -{ - for (size_t i = 0; i < num_cmds; i++) - if (cmds[i].fs_dest_path != dest_dir) - free(cmds[i].fs_dest_path); - free(cmds); -} - -static struct wimlib_extract_command * -prepare_extract_commands(tchar **paths, unsigned num_paths, - int extract_flags, tchar *dest_dir, - size_t *num_cmds_ret) -{ - struct wimlib_extract_command *cmds; - size_t num_cmds; - tchar *emptystr = T(""); - - if (num_paths == 0) { - num_paths = 1; - paths = &emptystr; - } - num_cmds = num_paths; - cmds = calloc(num_cmds, sizeof(cmds[0])); - if (!cmds) { - imagex_error(T("Out of memory!")); - return NULL; - } - - for (size_t i = 0; i < num_cmds; i++) { - cmds[i].extract_flags = extract_flags; - cmds[i].wim_source_path = paths[i]; - if (is_root_wim_path(paths[i])) { - cmds[i].fs_dest_path = dest_dir; - } else { - size_t len = tstrlen(dest_dir) + 1 + tstrlen(paths[i]); - cmds[i].fs_dest_path = malloc((len + 1) * sizeof(tchar)); - if (!cmds[i].fs_dest_path) { - free_extract_commands(cmds, num_cmds, dest_dir); - return NULL; - } - tsprintf(cmds[i].fs_dest_path, - T("%"TS""OS_PREFERRED_PATH_SEPARATOR_STRING"%"TS), - dest_dir, tbasename(paths[i])); - } - } - *num_cmds_ret = num_cmds; - return cmds; -} - /* Extract files or directories from a WIM image */ static int imagex_extract(int argc, tchar **argv, int cmd) @@ -2712,15 +3155,15 @@ imagex_extract(int argc, tchar **argv, int cmd) int ret; const tchar *wimfile; const tchar *image_num_or_name; - const tchar *pathlist; tchar *dest_dir = T("."); - int extract_flags = WIMLIB_EXTRACT_FLAG_NORPFIX; - int listfile_extract_flags = WIMLIB_EXTRACT_FLAG_GLOB_PATHS; + int extract_flags = WIMLIB_EXTRACT_FLAG_NORPFIX | + WIMLIB_EXTRACT_FLAG_GLOB_PATHS | + WIMLIB_EXTRACT_FLAG_STRICT_GLOB; + int notlist_extract_flags = WIMLIB_EXTRACT_FLAG_NO_PRESERVE_DIR_STRUCTURE; - STRING_SET(refglobs); + STRING_LIST(refglobs); - struct wimlib_extract_command *cmds; - size_t num_cmds; + tchar *root_path = WIMLIB_WIM_ROOT_PATH; for_opt(c, extract_options) { switch (c) { @@ -2731,7 +3174,7 @@ imagex_extract(int argc, tchar **argv, int cmd) /* No longer does anything. */ break; case IMAGEX_REF_OPTION: - ret = string_set_append(&refglobs, optarg); + ret = string_list_append(&refglobs, optarg); if (ret) goto out_free_refglobs; break; @@ -2744,23 +3187,37 @@ imagex_extract(int argc, tchar **argv, int cmd) case IMAGEX_STRICT_ACLS_OPTION: extract_flags |= WIMLIB_EXTRACT_FLAG_STRICT_ACLS; break; + case IMAGEX_NO_ATTRIBUTES_OPTION: + extract_flags |= WIMLIB_EXTRACT_FLAG_NO_ATTRIBUTES; + break; case IMAGEX_DEST_DIR_OPTION: dest_dir = optarg; break; case IMAGEX_TO_STDOUT_OPTION: extract_flags |= WIMLIB_EXTRACT_FLAG_TO_STDOUT; - imagex_info_file = stderr; - imagex_be_quiet = true; + imagex_suppress_output(); + set_fd_to_binary_mode(STDOUT_FILENO); break; case IMAGEX_INCLUDE_INVALID_NAMES_OPTION: extract_flags |= WIMLIB_EXTRACT_FLAG_REPLACE_INVALID_FILENAMES; extract_flags |= WIMLIB_EXTRACT_FLAG_ALL_CASE_CONFLICTS; break; - case IMAGEX_NO_WILDCARDS_OPTION: - listfile_extract_flags &= ~WIMLIB_EXTRACT_FLAG_GLOB_PATHS; + case IMAGEX_NO_GLOBS_OPTION: + extract_flags &= ~WIMLIB_EXTRACT_FLAG_GLOB_PATHS; + break; + case IMAGEX_NULLGLOB_OPTION: + extract_flags &= ~WIMLIB_EXTRACT_FLAG_STRICT_GLOB; break; - case IMAGEX_STRICT_WILDCARDS_OPTION: - listfile_extract_flags |= WIMLIB_EXTRACT_FLAG_STRICT_GLOB; + case IMAGEX_PRESERVE_DIR_STRUCTURE_OPTION: + notlist_extract_flags &= ~WIMLIB_EXTRACT_FLAG_NO_PRESERVE_DIR_STRUCTURE; + 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; @@ -2772,27 +3229,23 @@ imagex_extract(int argc, tchar **argv, int cmd) if (argc < 2) goto out_usage; + if (!(extract_flags & (WIMLIB_EXTRACT_FLAG_GLOB_PATHS | + WIMLIB_EXTRACT_FLAG_STRICT_GLOB))) + { + imagex_error(T("Can't combine --no-globs and --nullglob!")); + goto out_err; + } + wimfile = argv[0]; image_num_or_name = argv[1]; argc -= 2; argv += 2; - if (argc == 1 && argv[0][0] == T('@')) { - pathlist = argv[0] + 1; - cmds = NULL; - num_cmds = 0; - } else { - cmds = prepare_extract_commands(argv, argc, extract_flags, dest_dir, - &num_cmds); - if (cmds == NULL) - goto out_err; - pathlist = NULL; - } - - ret = wimlib_open_wim(wimfile, open_flags, &wim, imagex_progress_func); + ret = wimlib_open_wim_with_progress(wimfile, open_flags, &wim, + imagex_progress_func, NULL); if (ret) - goto out_free_cmds; + goto out_free_refglobs; image = wimlib_resolve_image(wim, image_num_or_name); ret = verify_image_exists_and_is_single(image, @@ -2807,21 +3260,48 @@ imagex_extract(int argc, tchar **argv, int cmd) goto out_wimlib_free; } - ret = 0; - if (ret == 0 && cmds != NULL) { - ret = wimlib_extract_files(wim, image, cmds, num_cmds, 0, - imagex_progress_func); + if (argc == 0) { + argv = &root_path; + argc = 1; + extract_flags &= ~WIMLIB_EXTRACT_FLAG_GLOB_PATHS; } - if (ret == 0 && pathlist != NULL) { - ret = wimlib_extract_pathlist(wim, image, dest_dir, - pathlist, - extract_flags | listfile_extract_flags, - imagex_progress_func); + + while (argc != 0 && ret == 0) { + int num_paths; + + for (num_paths = 0; + num_paths < argc && argv[num_paths][0] != T('@'); + num_paths++) + ; + + if (num_paths) { + ret = wimlib_extract_paths(wim, image, dest_dir, + (const tchar **)argv, + num_paths, + extract_flags | notlist_extract_flags); + argc -= num_paths; + argv += num_paths; + } else { + ret = wimlib_extract_pathlist(wim, image, dest_dir, + argv[0] + 1, + extract_flags); + argc--; + argv++; + } } + if (ret == 0) { - if (!imagex_be_quiet) - imagex_printf(T("Done extracting files.\n")); + imagex_printf(T("Done extracting files.\n")); } else if (ret == WIMLIB_ERR_PATH_DOES_NOT_EXIST) { + if ((extract_flags & (WIMLIB_EXTRACT_FLAG_STRICT_GLOB | + WIMLIB_EXTRACT_FLAG_GLOB_PATHS)) + == (WIMLIB_EXTRACT_FLAG_STRICT_GLOB | + WIMLIB_EXTRACT_FLAG_GLOB_PATHS)) + { + tfprintf(stderr, + T("Note: You can use the '--nullglob' " + "option to ignore missing files.\n")); + } tfprintf(stderr, T("Note: You can use `%"TS"' to see what " "files and directories\n" " are in the WIM image.\n"), @@ -2831,13 +3311,16 @@ 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); -out_free_cmds: - free_extract_commands(cmds, num_cmds, dest_dir); out_free_refglobs: - string_set_destroy(&refglobs); + string_list_destroy(&refglobs); return ret; out_usage: @@ -2847,91 +3330,6 @@ out_err: goto out_free_refglobs; } -static void print_byte_field(const uint8_t field[], size_t len) -{ - while (len--) - tprintf(T("%02hhx"), *field++); -} - -static void -print_wim_information(const tchar *wimfile, const struct wimlib_wim_info *info) -{ - tputs(T("WIM Information:")); - tputs(T("----------------")); - tprintf(T("Path: %"TS"\n"), wimfile); - tprintf(T("GUID: 0x")); - print_byte_field(info->guid, sizeof(info->guid)); - tputchar(T('\n')); - tprintf(T("Version: %u\n"), info->wim_version); - tprintf(T("Image Count: %d\n"), info->image_count); - tprintf(T("Compression: %"TS"\n"), - wimlib_get_compression_type_string(info->compression_type)); - tprintf(T("Chunk Size: %"PRIu32" bytes\n"), - info->chunk_size); - tprintf(T("Part Number: %d/%d\n"), info->part_number, info->total_parts); - tprintf(T("Boot Index: %d\n"), info->boot_index); - tprintf(T("Size: %"PRIu64" bytes\n"), info->total_bytes); - 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')); -} - -static int -print_resource(const struct wimlib_resource_entry *resource, - void *_ignore) -{ - 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"), - resource->raw_resource_offset_in_wim); - - tprintf(T("Offset in raw = %"PRIu64" bytes\n"), - resource->offset); - } else { - tprintf(T("Compressed size = %"PRIu64" bytes\n"), - resource->compressed_size); - - tprintf(T("Offset in WIM = %"PRIu64" bytes\n"), - resource->offset); - } - - tprintf(T("Part Number = %u\n"), resource->part_number); - tprintf(T("Reference Count = %u\n"), resource->reference_count); - - tprintf(T("Hash = 0x")); - print_byte_field(resource->sha1_hash, sizeof(resource->sha1_hash)); - tputchar(T('\n')); - - tprintf(T("Flags = ")); - if (resource->is_compressed) - tprintf(T("WIM_RESHDR_FLAG_COMPRESSED ")); - if (resource->is_metadata) - tprintf(T("WIM_RESHDR_FLAG_METADATA ")); - if (resource->is_free) - tprintf(T("WIM_RESHDR_FLAG_FREE ")); - if (resource->is_spanned) - tprintf(T("WIM_RESHDR_FLAG_SPANNED ")); - if (resource->packed) - tprintf(T("WIM_RESHDR_FLAG_PACKED_STREAMS ")); - tputchar(T('\n')); - tputchar(T('\n')); - return 0; -} - -static void -print_lookup_table(WIMStruct *wim) -{ - wimlib_iterate_lookup_table(wim, 0, print_resource, NULL); -} - /* Prints information about a WIM file; also can mark an image as bootable, * change the name of an image, or change the description of an image. */ static int @@ -2942,15 +3340,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 metadata = 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_LIST(image_properties); WIMStruct *wim; int image; int ret; @@ -2972,8 +3368,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: @@ -2984,9 +3380,10 @@ imagex_info(int argc, tchar **argv, int cmd) xml_out_file = optarg; short_header = false; break; - case IMAGEX_METADATA_OPTION: - metadata = true; - short_header = false; + case IMAGEX_IMAGE_PROPERTY_OPTION: + ret = append_image_property_argument(&image_properties); + if (ret) + goto out; break; default: goto out_usage; @@ -3000,8 +3397,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_list_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_list_append(&image_properties, p); + if (ret) + goto out; + } if (check && nocheck) { imagex_error(T("Can't specify both --check and --nocheck")); @@ -3011,7 +3424,8 @@ imagex_info(int argc, tchar **argv, int cmd) if (check) open_flags |= WIMLIB_OPEN_FLAG_CHECK_INTEGRITY; - ret = wimlib_open_wim(wimfile, open_flags, &wim, imagex_progress_func); + ret = wimlib_open_wim_with_progress(wimfile, open_flags, &wim, + imagex_progress_func, NULL); if (ret) goto out; @@ -3041,17 +3455,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 */ @@ -3067,13 +3481,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) { @@ -3108,22 +3522,17 @@ imagex_info(int argc, tchar **argv, int cmd) if (short_header) wimlib_print_available_images(wim, image); - if (metadata) { - ret = wimlib_print_metadata(wim, image); - if (ret) - goto out_wimlib_free; - } 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; } @@ -3143,40 +3552,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)) { @@ -3186,8 +3570,7 @@ imagex_info(int argc, tchar **argv, int cmd) write_flags |= WIMLIB_WRITE_FLAG_CHECK_INTEGRITY; if (nocheck) write_flags |= WIMLIB_WRITE_FLAG_NO_CHECK_INTEGRITY; - ret = wimlib_overwrite(wim, write_flags, 1, - imagex_progress_func); + ret = wimlib_overwrite(wim, write_flags, 1); } else { imagex_printf(T("The file \"%"TS"\" was not modified " "because nothing needed to be done.\n"), @@ -3198,6 +3581,7 @@ imagex_info(int argc, tchar **argv, int cmd) out_wimlib_free: wimlib_free(wim); out: + string_list_destroy(&image_properties); return ret; out_usage: @@ -3236,12 +3620,13 @@ imagex_join(int argc, tchar **argv, int cmd) goto out_usage; } output_path = argv[0]; - ret = wimlib_join((const tchar * const *)++argv, - --argc, - output_path, - swm_open_flags, - wim_write_flags, - imagex_progress_func); + ret = wimlib_join_with_progress((const tchar * const *)++argv, + --argc, + output_path, + swm_open_flags, + wim_write_flags, + imagex_progress_func, + NULL); out: return ret; @@ -3268,7 +3653,7 @@ imagex_mount_rw_or_ro(int argc, tchar **argv, int cmd) int image; int ret; - STRING_SET(refglobs); + STRING_LIST(refglobs); if (cmd == CMD_MOUNTRW) { mount_flags |= WIMLIB_MOUNT_FLAG_READWRITE; @@ -3300,7 +3685,7 @@ imagex_mount_rw_or_ro(int argc, tchar **argv, int cmd) } break; case IMAGEX_REF_OPTION: - ret = string_set_append(&refglobs, optarg); + ret = string_list_append(&refglobs, optarg); if (ret) goto out_free_refglobs; break; @@ -3321,7 +3706,8 @@ imagex_mount_rw_or_ro(int argc, tchar **argv, int cmd) wimfile = argv[0]; - ret = wimlib_open_wim(wimfile, open_flags, &wim, imagex_progress_func); + ret = wimlib_open_wim_with_progress(wimfile, open_flags, &wim, + imagex_progress_func, NULL); if (ret) goto out_free_refglobs; @@ -3356,14 +3742,18 @@ 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); out_free_refglobs: - string_set_destroy(&refglobs); + string_list_destroy(&refglobs); return ret; out_usage: @@ -3382,6 +3772,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 solid_chunk_size = UINT32_MAX; + int solid_ctype = WIMLIB_COMPRESSION_TYPE_INVALID; int ret; WIMStruct *wim; const tchar *wimfile; @@ -3400,29 +3792,35 @@ 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: write_flags |= WIMLIB_WRITE_FLAG_RECOMPRESS; break; - case IMAGEX_COMPRESS_SLOW_OPTION: - write_flags |= WIMLIB_WRITE_FLAG_RECOMPRESS; - compression_type = WIMLIB_COMPRESSION_TYPE_LZX; - ret = set_compress_slow(); - if (ret) - goto out_err; - break; case IMAGEX_CHUNK_SIZE_OPTION: chunk_size = parse_chunk_size(optarg); if (chunk_size == UINT32_MAX) goto out_err; break; - case IMAGEX_PACK_STREAMS_OPTION: - write_flags |= WIMLIB_WRITE_FLAG_PACK_STREAMS; + 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_SOLID_COMPRESS_OPTION: + 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_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) @@ -3434,6 +3832,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; } @@ -3446,7 +3847,8 @@ imagex_optimize(int argc, tchar **argv, int cmd) wimfile = argv[0]; - ret = wimlib_open_wim(wimfile, open_flags, &wim, imagex_progress_func); + ret = wimlib_open_wim_with_progress(wimfile, open_flags, &wim, + imagex_progress_func, NULL); if (ret) goto out; @@ -3463,6 +3865,16 @@ imagex_optimize(int argc, tchar **argv, int cmd) if (ret) goto out_wimlib_free; } + if (solid_ctype != WIMLIB_COMPRESSION_TYPE_INVALID) { + ret = wimlib_set_output_pack_compression_type(wim, solid_ctype); + if (ret) + goto out_wimlib_free; + } + if (solid_chunk_size != UINT32_MAX) { + ret = wimlib_set_output_pack_chunk_size(wim, solid_chunk_size); + if (ret) + goto out_wimlib_free; + } old_size = file_get_size(wimfile); tprintf(T("\"%"TS"\" original size: "), wimfile); @@ -3471,8 +3883,7 @@ imagex_optimize(int argc, tchar **argv, int cmd) else tprintf(T("%"PRIu64" KiB\n"), old_size >> 10); - ret = wimlib_overwrite(wim, write_flags, num_threads, - imagex_progress_func); + ret = wimlib_overwrite(wim, write_flags, num_threads); if (ret) { imagex_error(T("Optimization of \"%"TS"\" failed."), wimfile); goto out_wimlib_free; @@ -3540,11 +3951,12 @@ imagex_split(int argc, tchar **argv, int cmd) "floating-point number of megabytes.")); goto out_err; } - ret = wimlib_open_wim(argv[0], open_flags, &wim, imagex_progress_func); + ret = wimlib_open_wim_with_progress(argv[0], open_flags, &wim, + imagex_progress_func, NULL); if (ret) goto out; - ret = wimlib_split(wim, argv[1], part_size, write_flags, imagex_progress_func); + ret = wimlib_split(wim, argv[1], part_size, write_flags); wimlib_free(wim); out: return ret; @@ -3577,7 +3989,17 @@ imagex_unmount(int argc, tchar **argv, int cmd) unmount_flags |= WIMLIB_UNMOUNT_FLAG_REBUILD; break; case IMAGEX_LAZY_OPTION: - unmount_flags |= WIMLIB_UNMOUNT_FLAG_LAZY; + case IMAGEX_FORCE_OPTION: + /* Now, unmount is lazy by default. However, committing + * the image will fail with + * WIMLIB_ERR_MOUNTED_IMAGE_IS_BUSY if there are open + * file descriptors on the WIM image. The + * WIMLIB_UNMOUNT_FLAG_FORCE option forces these file + * descriptors to be closed. */ + unmount_flags |= WIMLIB_UNMOUNT_FLAG_FORCE; + break; + case IMAGEX_NEW_IMAGE_OPTION: + unmount_flags |= WIMLIB_UNMOUNT_FLAG_NEW_IMAGE; break; default: goto out_usage; @@ -3588,15 +4010,31 @@ imagex_unmount(int argc, tchar **argv, int cmd) if (argc != 1) goto out_usage; - ret = wimlib_unmount_image(argv[0], unmount_flags, - imagex_progress_func); - if (ret) + if (unmount_flags & WIMLIB_UNMOUNT_FLAG_NEW_IMAGE) { + if (!(unmount_flags & WIMLIB_UNMOUNT_FLAG_COMMIT)) { + imagex_error(T("--new-image is meaningless " + "without --commit also specified!")); + goto out_err; + } + } + + ret = wimlib_unmount_image_with_progress(argv[0], unmount_flags, + imagex_progress_func, NULL); + if (ret) { imagex_error(T("Failed to unmount \"%"TS"\""), argv[0]); + if (ret == WIMLIB_ERR_MOUNTED_IMAGE_IS_BUSY) { + imagex_printf(T( + "\tNote: Use --commit --force to force changes " + "to be committed, regardless\n" + "\t of open files.\n")); + } + } out: return ret; out_usage: usage(CMD_UNMOUNT, stderr); +out_err: ret = -1; goto out; } @@ -3616,7 +4054,8 @@ imagex_update(int argc, tchar **argv, int cmd) int write_flags = 0; int update_flags = WIMLIB_UPDATE_FLAG_SEND_PROGRESS; int default_add_flags = WIMLIB_ADD_FLAG_EXCLUDE_VERBOSE | - WIMLIB_ADD_FLAG_VERBOSE; + WIMLIB_ADD_FLAG_VERBOSE | + WIMLIB_ADD_FLAG_WINCONFIG; int default_delete_flags = 0; unsigned num_threads = 0; int c; @@ -3625,10 +4064,8 @@ imagex_update(int argc, tchar **argv, int cmd) struct wimlib_update_command *cmds; size_t num_cmds; tchar *command_str = NULL; - - const tchar *config_file = NULL; - tchar *config_str; - struct wimlib_capture_config *config; + tchar *config_file = NULL; + tchar *wimboot_config = NULL; for_opt(c, update_options) { switch (c) { @@ -3659,6 +4096,9 @@ imagex_update(int argc, tchar **argv, int cmd) goto out_err; } break; + case IMAGEX_WIMBOOT_CONFIG_OPTION: + wimboot_config = optarg; + break; /* Default delete options */ case IMAGEX_FORCE_OPTION: default_delete_flags |= WIMLIB_DELETE_FLAG_FORCE; @@ -3689,6 +4129,12 @@ imagex_update(int argc, tchar **argv, int cmd) case IMAGEX_STRICT_ACLS_OPTION: default_add_flags |= WIMLIB_ADD_FLAG_STRICT_ACLS; break; + 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; } @@ -3700,7 +4146,8 @@ imagex_update(int argc, tchar **argv, int cmd) goto out_usage; wimfile = argv[0]; - ret = wimlib_open_wim(wimfile, open_flags, &wim, imagex_progress_func); + ret = wimlib_open_wim_with_progress(wimfile, open_flags, &wim, + imagex_progress_func, NULL); if (ret) goto out_free_command_str; @@ -3726,32 +4173,17 @@ imagex_update(int argc, tchar **argv, int cmd) image = 1; } - /* Parse capture configuration file if specified */ - if (config_file) { - size_t config_len; - - config_str = file_get_text_contents(config_file, &config_len); - if (!config_str) { - ret = -1; - goto out_wimlib_free; - } - - config = alloca(sizeof(*config)); - ret = parse_capture_config(&config_str, config_len, config); - if (ret) - goto out_free_config; - } else { - config = NULL; - default_add_flags |= WIMLIB_ADD_FLAG_WINCONFIG; - } - /* Read update commands from standard input, or the command string if * specified. */ if (command_str) { cmd_file_contents = NULL; cmds = parse_update_command_file(&command_str, tstrlen(command_str), &num_cmds); - } else { + if (!cmds) { + ret = -1; + goto out_free_cmd_file_contents; + } + } else if (!wimboot_config) { if (isatty(STDIN_FILENO)) { tputs(T("Reading update commands from standard input...")); recommend_man_page(CMD_UPDATE, stdout); @@ -3759,16 +4191,20 @@ imagex_update(int argc, tchar **argv, int cmd) cmd_file_contents = stdin_get_text_contents(&cmd_file_nchars); if (!cmd_file_contents) { ret = -1; - goto out_free_config; + goto out_wimlib_free; } /* Parse the update commands */ cmds = parse_update_command_file(&cmd_file_contents, cmd_file_nchars, &num_cmds); - } - if (!cmds) { - ret = -1; - goto out_free_cmd_file_contents; + if (!cmds) { + ret = -1; + goto out_free_cmd_file_contents; + } + } else { + cmd_file_contents = NULL; + cmds = NULL; + num_cmds = 0; } /* Set default flags and capture config on the update commands */ @@ -3776,7 +4212,7 @@ imagex_update(int argc, tchar **argv, int cmd) switch (cmds[i].op) { case WIMLIB_UPDATE_OP_ADD: cmds[i].add.add_flags |= default_add_flags; - cmds[i].add.config = config; + cmds[i].add.config_file = config_file; break; case WIMLIB_UPDATE_OP_DELETE: cmds[i].delete_.delete_flags |= default_delete_flags; @@ -3787,24 +4223,33 @@ imagex_update(int argc, tchar **argv, int cmd) } /* Execute the update commands */ - ret = wimlib_update_image(wim, image, cmds, num_cmds, update_flags, - imagex_progress_func); + ret = wimlib_update_image(wim, image, cmds, num_cmds, update_flags); if (ret) goto out_free_cmds; + if (wimboot_config) { + /* --wimboot-config=FILE is short for an + * "add FILE /Windows/System32/WimBootCompress.ini" command. + */ + struct wimlib_update_command cmd; + + cmd.op = WIMLIB_UPDATE_OP_ADD; + cmd.add.fs_source_path = wimboot_config; + cmd.add.wim_target_path = T("/Windows/System32/WimBootCompress.ini"); + cmd.add.config_file = NULL; + cmd.add.add_flags = 0; + + ret = wimlib_update_image(wim, image, &cmd, 1, update_flags); + if (ret) + goto out_free_cmds; + } + /* Overwrite the updated WIM */ - ret = wimlib_overwrite(wim, write_flags, num_threads, - imagex_progress_func); + ret = wimlib_overwrite(wim, write_flags, num_threads); out_free_cmds: free(cmds); out_free_cmd_file_contents: free(cmd_file_contents); -out_free_config: - if (config) { - free(config->exclusion_pats.pats); - free(config->exclusion_exception_pats.pats); - free(config_str); - } out_wimlib_free: wimlib_free(wim); out_free_command_str: @@ -3818,7 +4263,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_LIST(refglobs); + int c; + + for_opt(c, verify_options) { + switch (c) { + case IMAGEX_REF_OPTION: + ret = string_list_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_list_destroy(&refglobs); + return ret; + +out_usage: + usage(CMD_VERIFY, stderr); + ret = -1; + goto out_free_refglobs; +} struct imagex_command { const tchar *name; @@ -3845,63 +4368,85 @@ 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}, }; -static const tchar *usage_strings[] = { +#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 * const 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]\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" +" [--delta-from=WIMFILE] [--wimboot] [--unix-data]\n" +" [--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] [--rpfix] [--norpfix]\n" -" [--hardlink] [--symlink] [--include-invalid-names]\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]\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]\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] [--solid]\n" ), [CMD_EXTRACT] = T( -" %"TS" WIMFILE (IMAGE_NUM | IMAGE_NAME) ([PATH...] | @LISTFILE)\n" -" [--check] [--ref=\"GLOB\"] [--no-acls] [--strict-acls]\n" -" [--to-stdout] [--dest-dir=CMD_DIR]\n" -" [--include-invalid-names]\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" +" [--no-globs] [--nullglob] [--preserve-dir-structure]\n" ), [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( @@ -3910,22 +4455,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]\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]\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( @@ -3934,35 +4480,39 @@ T( #if WIM_MOUNTING_SUPPORTED [CMD_UNMOUNT] = T( -" %"TS" DIRECTORY [--commit] [--check] [--rebuild] [--lazy]\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] [< 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" ), }; static const tchar *invocation_name; static int invocation_cmd = CMD_NONE; -static const tchar *get_cmd_string(int cmd, bool nospace) +static const tchar *get_cmd_string(int cmd, bool only_short_form) { static tchar buf[50]; - if (cmd == CMD_NONE) { - tsprintf(buf, T("%"TS), T(IMAGEX_PROGNAME)); - } else if (invocation_cmd != CMD_NONE) { + + if (cmd == CMD_NONE) + return T("wimlib-imagex"); + + if (only_short_form || invocation_cmd != CMD_NONE) { tsprintf(buf, T("wim%"TS), imagex_commands[cmd].name); } else { - const tchar *format; - - if (nospace) - format = T("%"TS"-%"TS""); - else - format = T("%"TS" %"TS""); - tsprintf(buf, format, invocation_name, imagex_commands[cmd].name); + tsprintf(buf, T("%"TS" %"TS), invocation_name, + imagex_commands[cmd].name); } return buf; } @@ -3970,23 +4520,27 @@ static const tchar *get_cmd_string(int cmd, bool nospace) static void version(void) { - static const tchar *s = + uint32_t vers = wimlib_get_version(); + + static const tchar * const fmt = T( -IMAGEX_PROGNAME " (" PACKAGE ") " PACKAGE_VERSION "\n" -"Copyright (C) 2012, 2013 Eric Biggers\n" +"wimlib-imagex " PACKAGE_VERSION " (using wimlib %u.%u.%u)\n" +"Copyright (C) 2012-2017 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" "\n" "Report bugs to "PACKAGE_BUGREPORT".\n" ); - tfputs(s, stdout); + tfprintf(stdout, fmt, + vers >> 20, (vers >> 10) & 0x3ff, vers & 0x3ff); } static void -help_or_version(int argc, tchar **argv, int cmd) +do_common_options(int *argc_p, tchar **argv, int cmd) { + int argc = *argc_p; int i; const tchar *p; @@ -4003,9 +4557,18 @@ help_or_version(int argc, tchar **argv, int cmd) } else if (!tstrcmp(p, T("version"))) { version(); exit(0); - } + } else if (!tstrcmp(p, T("quiet"))) { + imagex_suppress_output(); + memmove(&argv[i], &argv[i + 1], + (argc - i) * sizeof(argv[i])); + argc--; + i--; + } else if (!*p) /* reached "--", no more options */ + break; } } + + *argc_p = argc; } static void @@ -4019,11 +4582,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" - "Try `man %"TS"' for more details.\n"); + format_str = T("Some uncommon options are not listed; see `man %"TS"' for more details.\n"); #endif tfprintf(fp, format_str, get_cmd_string(cmd, true)); } @@ -4045,28 +4607,32 @@ usage_all(FILE *fp) print_usage_string(cmd, fp); tfprintf(fp, T("\n")); } - static const tchar *extra = + static const tchar * const extra = 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); } +#ifdef __WIN32__ +extern int wmain(int argc, wchar_t **argv); +#define main wmain +#endif + /* Entry point for wimlib's ImageX implementation. On UNIX the command * arguments will just be 'char' strings (ideally UTF-8 encoded, but could be - * something else), while an Windows the command arguments will be UTF-16LE + * something else), while on Windows the command arguments will be UTF-16LE * encoded 'wchar_t' strings. */ int -#ifdef __WIN32__ -wmain(int argc, wchar_t **argv, wchar_t **envp) -#else -main(int argc, char **argv) -#endif +main(int argc, tchar **argv) { int ret; int init_flags = 0; @@ -4075,31 +4641,6 @@ main(int argc, char **argv) imagex_info_file = stdout; invocation_name = tbasename(argv[0]); -#ifndef __WIN32__ - if (getenv("WIMLIB_IMAGEX_USE_UTF8")) { - init_flags |= WIMLIB_INIT_FLAG_ASSUME_UTF8; - } else { - char *codeset; - - setlocale(LC_ALL, ""); - codeset = nl_langinfo(CODESET); - if (!strstr(codeset, "UTF-8") && - !strstr(codeset, "UTF8") && - !strstr(codeset, "utf-8") && - !strstr(codeset, "utf8")) - { - fprintf(stderr, -"WARNING: Running %"TS" in a UTF-8 locale is recommended!\n" -" Maybe try: `export LANG=en_US.UTF-8'?\n" -" Alternatively, set the environmental variable WIMLIB_IMAGEX_USE_UTF8\n" -" to any value to force wimlib to use UTF-8.\n", - invocation_name); - - } - } - -#endif /* !__WIN32__ */ - { tchar *igcase = tgetenv(T("WIMLIB_IMAGEX_IGNORE_CASE")); if (igcase != NULL) { @@ -4120,7 +4661,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)) @@ -4152,11 +4693,8 @@ main(int argc, char **argv) } } - /* Handle --help and --version. --help can be either for the program as - * a whole (cmd == CMD_NONE) or just for a specific command (cmd != - * CMD_NONE). Note: help_or_version() will not return if a --help or - * --version argument was found. */ - help_or_version(argc, argv, cmd); + /* Handle common options. May exit early (for --help or --version). */ + do_common_options(&argc, argv, cmd); /* Bail if a valid command was not specified. */ if (cmd == CMD_NONE) { @@ -4165,7 +4703,7 @@ main(int argc, char **argv) exit(2); } - /* Enable warning and error messages in wimlib be more user-friendly. + /* Enable warning and error messages in wimlib to be more user-friendly. * */ wimlib_set_print_errors(true);