X-Git-Url: https://wimlib.net/git/?p=wimlib;a=blobdiff_plain;f=programs%2Fimagex.c;h=41ab646dbacb138557d63659bb5cf11dadf33e11;hp=e99202b1effdbf659a43b4b38096844bfeca8570;hb=d82950b8ae73d50bffebb88c2b5c10b49f4082f4;hpb=3d84c998673ba7acf82ec5c26769a41e28a2cc7b diff --git a/programs/imagex.c b/programs/imagex.c index e99202b1..41ab646d 100644 --- a/programs/imagex.c +++ b/programs/imagex.c @@ -6,7 +6,7 @@ */ /* - * Copyright (C) 2012, 2013 Eric Biggers + * Copyright (C) 2012, 2013, 2014 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 @@ -48,18 +48,11 @@ #ifdef __WIN32__ # include "imagex-win32.h" -# define tbasename win32_wbasename -# define tglob win32_wglob -# 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 tglob glob -# 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) { } @@ -77,10 +70,37 @@ 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) - enum { CMD_NONE = -1, CMD_APPEND = 0, @@ -120,59 +140,78 @@ enum { IMAGEX_ALLOW_OTHER_OPTION, IMAGEX_BOOT_OPTION, IMAGEX_CHECK_OPTION, + IMAGEX_CHUNK_SIZE_OPTION, IMAGEX_COMMAND_OPTION, IMAGEX_COMMIT_OPTION, IMAGEX_COMPRESS_OPTION, + IMAGEX_COMPRESS_SLOW_OPTION, IMAGEX_CONFIG_OPTION, IMAGEX_DEBUG_OPTION, + IMAGEX_DELTA_FROM_OPTION, 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_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_NORPFIX_OPTION, IMAGEX_NOT_PIPABLE_OPTION, + IMAGEX_NO_ACLS_OPTION, + IMAGEX_NO_ATTRIBUTES_OPTION, + IMAGEX_NO_REPLACE_OPTION, + IMAGEX_NO_WILDCARDS_OPTION, + IMAGEX_NULLGLOB_OPTION, + IMAGEX_ONE_FILE_ONLY_OPTION, + IMAGEX_PACK_CHUNK_SIZE_OPTION, + IMAGEX_PACK_COMPRESS_OPTION, + IMAGEX_PACK_STREAMS_OPTION, IMAGEX_PATH_OPTION, IMAGEX_PIPABLE_OPTION, + IMAGEX_PRESERVE_DIR_STRUCTURE_OPTION, IMAGEX_REBUILD_OPTION, IMAGEX_RECOMPRESS_OPTION, IMAGEX_RECURSIVE_OPTION, IMAGEX_REF_OPTION, + IMAGEX_RESUME_OPTION, IMAGEX_RPFIX_OPTION, IMAGEX_SOFT_OPTION, IMAGEX_SOURCE_LIST_OPTION, IMAGEX_STAGING_DIR_OPTION, IMAGEX_STREAMS_INTERFACE_OPTION, IMAGEX_STRICT_ACLS_OPTION, - IMAGEX_SYMLINK_OPTION, IMAGEX_THREADS_OPTION, IMAGEX_TO_STDOUT_OPTION, IMAGEX_UNIX_DATA_OPTION, + IMAGEX_UPDATE_OF_OPTION, IMAGEX_VERBOSE_OPTION, + IMAGEX_WIMBOOT_OPTION, + IMAGEX_WIMBOOT_CONFIG_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}, {NULL, 0, NULL, 0}, }; @@ -182,6 +221,14 @@ 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-chunk-size"), required_argument, NULL, IMAGEX_PACK_CHUNK_SIZE_OPTION}, + {T("solid-chunk-size"),required_argument, NULL, IMAGEX_PACK_CHUNK_SIZE_OPTION}, + {T("pack-compress"), required_argument, NULL, IMAGEX_PACK_COMPRESS_OPTION}, + {T("solid-compress"),required_argument, NULL, IMAGEX_PACK_COMPRESS_OPTION}, + {T("pack-streams"), no_argument, NULL, IMAGEX_PACK_STREAMS_OPTION}, + {T("solid"), no_argument, NULL, IMAGEX_PACK_STREAMS_OPTION}, {T("config"), required_argument, NULL, IMAGEX_CONFIG_OPTION}, {T("dereference"), no_argument, NULL, IMAGEX_DEREFERENCE_OPTION}, {T("flags"), required_argument, NULL, IMAGEX_FLAGS_OPTION}, @@ -197,6 +244,9 @@ static const struct option capture_or_append_options[] = { {T("norpfix"), no_argument, NULL, IMAGEX_NORPFIX_OPTION}, {T("pipable"), no_argument, NULL, IMAGEX_PIPABLE_OPTION}, {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}, {NULL, 0, NULL, 0}, }; @@ -207,7 +257,9 @@ static const struct option delete_options[] = { }; 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}, {NULL, 0, NULL, 0}, }; @@ -217,11 +269,20 @@ static const struct option export_options[] = { {T("nocheck"), no_argument, NULL, IMAGEX_NOCHECK_OPTION}, {T("no-check"), no_argument, NULL, IMAGEX_NOCHECK_OPTION}, {T("compress"), required_argument, NULL, IMAGEX_COMPRESS_OPTION}, + {T("compress-slow"), no_argument, NULL, IMAGEX_COMPRESS_SLOW_OPTION}, + {T("pack-streams"),no_argument, NULL, IMAGEX_PACK_STREAMS_OPTION}, + {T("solid"), no_argument, NULL, IMAGEX_PACK_STREAMS_OPTION}, + {T("chunk-size"), required_argument, NULL, IMAGEX_CHUNK_SIZE_OPTION}, + {T("pack-chunk-size"), required_argument, NULL, IMAGEX_PACK_CHUNK_SIZE_OPTION}, + {T("solid-chunk-size"),required_argument, NULL, IMAGEX_PACK_CHUNK_SIZE_OPTION}, + {T("pack-compress"), required_argument, NULL, IMAGEX_PACK_COMPRESS_OPTION}, + {T("solid-compress"),required_argument, NULL, IMAGEX_PACK_COMPRESS_OPTION}, {T("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}, {NULL, 0, NULL, 0}, }; @@ -233,9 +294,14 @@ 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("no-wildcards"), no_argument, NULL, IMAGEX_NO_WILDCARDS_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}, {NULL, 0, NULL, 0}, }; @@ -272,7 +338,17 @@ static const struct option optimize_options[] = { {T("check"), no_argument, NULL, IMAGEX_CHECK_OPTION}, {T("nocheck"), no_argument, NULL, IMAGEX_NOCHECK_OPTION}, {T("no-check"), no_argument, NULL, IMAGEX_NOCHECK_OPTION}, + {T("compress"), required_argument, NULL, IMAGEX_COMPRESS_OPTION}, {T("recompress"), no_argument, NULL, IMAGEX_RECOMPRESS_OPTION}, + {T("compress-slow"), no_argument, NULL, IMAGEX_COMPRESS_SLOW_OPTION}, + {T("recompress-slow"), no_argument, NULL, IMAGEX_COMPRESS_SLOW_OPTION}, + {T("chunk-size"), required_argument, NULL, IMAGEX_CHUNK_SIZE_OPTION}, + {T("pack-chunk-size"), required_argument, NULL, IMAGEX_PACK_CHUNK_SIZE_OPTION}, + {T("solid-chunk-size"),required_argument, NULL, IMAGEX_PACK_CHUNK_SIZE_OPTION}, + {T("pack-compress"), required_argument, NULL, IMAGEX_PACK_COMPRESS_OPTION}, + {T("solid-compress"),required_argument, NULL, IMAGEX_PACK_COMPRESS_OPTION}, + {T("pack-streams"),no_argument, NULL, IMAGEX_PACK_STREAMS_OPTION}, + {T("solid"), no_argument, NULL, IMAGEX_PACK_STREAMS_OPTION}, {T("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}, @@ -289,6 +365,7 @@ static const struct option unmount_options[] = { {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("new-image"), no_argument, NULL, IMAGEX_NEW_IMAGE_OPTION}, {NULL, 0, NULL, 0}, }; @@ -301,6 +378,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}, @@ -316,6 +394,7 @@ 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}, {NULL, 0, NULL, 0}, }; @@ -358,11 +437,13 @@ verify_image_exists(int image, const tchar *image_name, const tchar *wim_name) if (image == WIMLIB_NO_IMAGE) { imagex_error(T("\"%"TS"\" is not a valid image in \"%"TS"\"!\n" " Please specify a 1-based image index or " - "image name.\n" - " You may use `%"TS"' to list the images " - "contained in a WIM."), - image_name, wim_name, get_cmd_string(CMD_INFO, false)); - return -1; + "image name. To list the images\n" + " contained in the WIM archive, run\n" + "\n" + " %"TS" \"%"TS"\"\n"), + image_name, wim_name, + get_cmd_string(CMD_INFO, false), wim_name); + return WIMLIB_ERR_INVALID_IMAGE; } return 0; } @@ -372,7 +453,7 @@ verify_image_is_single(int image) { if (image == WIMLIB_ALL_IMAGES) { imagex_error(T("Cannot specify all images for this action!")); - return -1; + return WIMLIB_ERR_INVALID_IMAGE; } return 0; } @@ -392,10 +473,14 @@ verify_image_exists_and_is_single(int image, const tchar *image_name, static int get_compression_type(const tchar *optarg) { - if (!tstrcasecmp(optarg, T("maximum")) || !tstrcasecmp(optarg, T("lzx"))) + if (!tstrcasecmp(optarg, T("maximum")) || + !tstrcasecmp(optarg, T("lzx")) || + !tstrcasecmp(optarg, T("max"))) return WIMLIB_COMPRESSION_TYPE_LZX; else if (!tstrcasecmp(optarg, T("fast")) || !tstrcasecmp(optarg, T("xpress"))) return WIMLIB_COMPRESSION_TYPE_XPRESS; + else if (!tstrcasecmp(optarg, T("recovery")) || !tstrcasecmp(optarg, T("lzms"))) + return WIMLIB_COMPRESSION_TYPE_LZMS; else if (!tstrcasecmp(optarg, T("none"))) return WIMLIB_COMPRESSION_TYPE_NONE; else { @@ -405,6 +490,117 @@ get_compression_type(const tchar *optarg) } } +static void +set_compress_slow(void) +{ + static const struct wimlib_lzx_compressor_params lzx_slow_params = { + .hdr = { + .size = sizeof(struct wimlib_lzx_compressor_params), + }, + .algorithm = WIMLIB_LZX_ALGORITHM_SLOW, + .alg_params = { + .slow = { + .use_len2_matches = 1, + .nice_match_length = 96, + .num_optim_passes = 4, + .max_search_depth = 100, + .max_matches_per_pos = 10, + .main_nostat_cost = 15, + .len_nostat_cost = 15, + .aligned_nostat_cost = 7, + }, + }, + }; + + static const struct wimlib_lzms_compressor_params lzms_slow_params = { + .hdr = { + .size = sizeof(struct wimlib_lzms_compressor_params), + }, + .min_match_length = 2, + .max_match_length = UINT32_MAX, + .nice_match_length = 96, + .max_search_depth = 100, + .max_matches_per_pos = 10, + .optim_array_length = 1024, + }; + + wimlib_set_default_compressor_params(WIMLIB_COMPRESSION_TYPE_LZX, + &lzx_slow_params.hdr); + + wimlib_set_default_compressor_params(WIMLIB_COMPRESSION_TYPE_LZMS, + &lzms_slow_params.hdr); +} + +struct string_set { + const tchar **strings; + unsigned num_strings; + unsigned num_alloc_strings; +}; + +#define STRING_SET_INITIALIZER \ + { .strings = NULL, .num_strings = 0, .num_alloc_strings = 0, } + +#define STRING_SET(_strings) \ + struct string_set _strings = STRING_SET_INITIALIZER + +static int +string_set_append(struct string_set *set, const tchar *glob) +{ + unsigned num_alloc_strings = set->num_alloc_strings; + + if (set->num_strings == num_alloc_strings) { + const tchar **new_strings; + + num_alloc_strings += 4; + new_strings = realloc(set->strings, + sizeof(set->strings[0]) * num_alloc_strings); + if (!new_strings) { + imagex_error(T("Out of memory!")); + return -1; + } + set->strings = new_strings; + set->num_alloc_strings = num_alloc_strings; + } + set->strings[set->num_strings++] = glob; + return 0; +} + +static void +string_set_destroy(struct string_set *set) +{ + free(set->strings); +} + +static int +wim_reference_globs(WIMStruct *wim, struct string_set *set, int open_flags) +{ + return wimlib_reference_resource_files(wim, set->strings, + set->num_strings, + WIMLIB_REF_FLAG_GLOB_ENABLE, + open_flags); +} + +static void +do_resource_not_found_warning(const tchar *wimfile, + const struct wimlib_wim_info *info, + const struct string_set *refglobs) +{ + if (info->total_parts > 1) { + if (refglobs->num_strings == 0) { + imagex_error(T("\"%"TS"\" is part of a split WIM. " + "Use --ref to specify the other parts."), + wimfile); + } else { + imagex_error(T("Perhaps the '--ref' argument did not " + "specify all other parts of the split " + "WIM?")); + } + } else { + imagex_error(T("If this is a delta WIM, use the --ref argument " + "to specify the WIM(s) on which it is based.")); + } +} + /* 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 @@ -417,29 +613,6 @@ file_get_size(const tchar *filename) return (off_t)-1; } -tchar pat_ntfs_log[] = T("/$ntfs.log"); -tchar pat_hiberfil_sys[] = T("/hiberfil.sys"); -tchar pat_pagefile_sys[] = T("/pagefile.sys"); -tchar pat_system_volume_information[] = T("/System Volume Information"); -tchar pat_recycler[] = T("/RECYCLER"); -tchar pat_windows_csc[] = T("/Windows/CSC"); - -tchar *default_pats[] = { - pat_ntfs_log, - pat_hiberfil_sys, - pat_pagefile_sys, - pat_system_volume_information, - pat_recycler, - pat_windows_csc, -}; - -static struct wimlib_capture_config default_capture_config = { - .exclusion_pats = { - .num_pats = sizeof(default_pats) / sizeof(default_pats[0]), - .pats = default_pats, - }, -}; - enum { PARSE_STRING_SUCCESS = 0, PARSE_STRING_FAILURE = 1, @@ -547,7 +720,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; @@ -645,144 +818,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) @@ -881,8 +916,8 @@ translate_text_to_tstr(char *text, size_t num_bytes, size_t *num_tchars_ret) size_t num_wchars; if (num_bytes >= 2 && - ((text[0] == 0xff && text[1] == 0xfe) || - (text[0] <= 0x7f && text[1] == 0x00))) + (((unsigned char)text[0] == 0xff && (unsigned char)text[1] == 0xfe) || + ((unsigned char)text[0] <= 0x7f && (unsigned char)text[1] == 0x00))) { /* File begins with 0xfeff, the BOM for UTF-16LE, or it begins * with something that looks like an ASCII character encoded as @@ -932,22 +967,6 @@ stdin_get_text_contents(size_t *num_tchars_ret) #define TO_PERCENT(numerator, denominator) \ (((denominator) == 0) ? 0 : ((numerator) * 100 / (denominator))) -/* Given an enumerated value for WIM compression type, return a descriptive - * string. */ -static const tchar * -get_data_type(int ctype) -{ - switch (ctype) { - case WIMLIB_COMPRESSION_TYPE_NONE: - return T("uncompressed"); - case WIMLIB_COMPRESSION_TYPE_LZX: - return T("LZX-compressed"); - case WIMLIB_COMPRESSION_TYPE_XPRESS: - return T("XPRESS-compressed"); - } - return NULL; -} - #define GIBIBYTE_MIN_NBYTES 10000000000ULL #define MEBIBYTE_MIN_NBYTES 10000000ULL #define KIBIBYTE_MIN_NBYTES 10000ULL @@ -970,29 +989,63 @@ get_unit(uint64_t total_bytes, const tchar **name_ret) } } +static struct wimlib_progress_info_scan last_scan_progress; + +static void +report_scan_progress(const struct wimlib_progress_info_scan *scan, bool done) +{ + uint64_t prev_count, cur_count; + + prev_count = last_scan_progress.num_nondirs_scanned + + last_scan_progress.num_dirs_scanned; + cur_count = scan->num_nondirs_scanned + scan->num_dirs_scanned; + + if (done || prev_count == 0 || cur_count >= prev_count + 100 || + cur_count % 128 == 0) + { + unsigned unit_shift; + const tchar *unit_name; + + unit_shift = get_unit(scan->num_bytes_scanned, &unit_name); + imagex_printf(T("\r%"PRIu64" %"TS" scanned (%"PRIu64" files, " + "%"PRIu64" directories) "), + scan->num_bytes_scanned >> unit_shift, + unit_name, + scan->num_nondirs_scanned, + scan->num_dirs_scanned); + 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; + return WIMLIB_PROGRESS_STATUS_CONTINUE; switch (msg) { case WIMLIB_PROGRESS_MSG_WRITE_STREAMS: + { + static bool first = true; + if (first) { + imagex_printf(T("Writing %"TS"-compressed data " + "using %u thread%"TS"\n"), + wimlib_get_compression_type_string( + info->write_streams.compression_type), + info->write_streams.num_threads, + (info->write_streams.num_threads == 1) ? T("") : T("s")); + first = false; + } + } 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) { - const tchar *data_type; - data_type = get_data_type(info->write_streams.compression_type); - imagex_printf(T("Writing %"TS" data using %u thread%"TS"\n"), - data_type, info->write_streams.num_threads, - (info->write_streams.num_threads == 1) ? T("") : T("s")); - } imagex_printf(T("\r%"PRIu64" %"TS" of %"PRIu64" %"TS" (uncompressed) " "written (%u%% done)"), info->write_streams.completed_bytes >> unit_shift, @@ -1005,22 +1058,40 @@ imagex_progress_func(enum wimlib_progress_msg msg, 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); + if (WIMLIB_IS_WIM_ROOT_PATH(info->scan.wim_target_path)) { + imagex_printf(T("\n")); } else { - imagex_printf(T(" (loading as root of WIM image)...\n")); + imagex_printf(T(" (loading as WIM path: \"%"TS"\")...\n"), + info->scan.wim_target_path); } + memset(&last_scan_progress, 0, sizeof(last_scan_progress)); break; case WIMLIB_PROGRESS_MSG_SCAN_DENTRY: - if (info->scan.excluded) - imagex_printf(T("Excluding \"%"TS"\" from capture\n"), info->scan.cur_path); - else - imagex_printf(T("Scanning \"%"TS"\"\n"), info->scan.cur_path); + switch (info->scan.status) { + case WIMLIB_SCAN_DENTRY_OK: + report_scan_progress(&info->scan, false); + break; + case WIMLIB_SCAN_DENTRY_EXCLUDED: + imagex_printf(T("\nExcluding \"%"TS"\" from capture\n"), info->scan.cur_path); + break; + case WIMLIB_SCAN_DENTRY_UNSUPPORTED: + 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" + " (Use --norpfix to capture " + "absolute symbolic links as-is)\n"), + info->scan.cur_path, info->scan.symlink_target); + break; + } + break; + case WIMLIB_PROGRESS_MSG_SCAN_END: + report_scan_progress(&info->scan, true); + imagex_printf(T("\n")); break; - /*case WIMLIB_PROGRESS_MSG_SCAN_END:*/ - /*break;*/ case WIMLIB_PROGRESS_MSG_VERIFY_INTEGRITY: unit_shift = get_unit(info->integrity.total_bytes, &unit_name); percent_done = TO_PERCENT(info->integrity.completed_bytes, @@ -1060,20 +1131,6 @@ imagex_progress_func(enum wimlib_progress_msg msg, T("NTFS volume") : T("directory")), info->extract.target); break; - case WIMLIB_PROGRESS_MSG_EXTRACT_TREE_BEGIN: - 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); - break; - /*case WIMLIB_PROGRESS_MSG_EXTRACT_DIR_STRUCTURE_BEGIN:*/ - /*imagex_printf(T("Applying directory structure to %"TS"\n"),*/ - /*info->extract.target);*/ - /*break;*/ case WIMLIB_PROGRESS_MSG_EXTRACT_STREAMS: percent_done = TO_PERCENT(info->extract.completed_bytes, info->extract.total_bytes); @@ -1088,31 +1145,13 @@ 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_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); + 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"), + info->extract.part_number, + info->extract.total_parts); } break; - case WIMLIB_PROGRESS_MSG_JOIN_STREAMS: - percent_done = TO_PERCENT(info->join.completed_bytes, - info->join.total_bytes); - unit_shift = get_unit(info->join.total_bytes, &unit_name); - imagex_printf(T("Writing resources from part %u of %u: " - "%"PRIu64 " %"TS" of %"PRIu64" %"TS" (%u%%) written\n"), - (info->join.completed_parts == info->join.total_parts) ? - info->join.completed_parts : info->join.completed_parts + 1, - info->join.total_parts, - info->join.completed_bytes >> unit_shift, - unit_name, - info->join.total_bytes >> unit_shift, - unit_name, - percent_done); - break; case WIMLIB_PROGRESS_MSG_SPLIT_BEGIN_PART: percent_done = TO_PERCENT(info->split.completed_bytes, info->split.total_bytes); @@ -1130,7 +1169,7 @@ imagex_progress_func(enum wimlib_progress_msg msg, break; case WIMLIB_PROGRESS_MSG_SPLIT_END_PART: if (info->split.completed_bytes == info->split.total_bytes) { - imagex_printf(T("Finished writing part %u of %u WIM parts\n"), + imagex_printf(T("Finished writing split WIM part %u of %u\n"), info->split.cur_part_number, info->split.total_parts); } @@ -1138,14 +1177,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"), - info->update.command->delete.wim_path); + 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; @@ -1154,77 +1190,21 @@ 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; default: break; } fflush(imagex_info_file); - return 0; -} - -/* Open all the split WIM parts that correspond to a file glob. - * - * @first_part specifies the first part of the split WIM and it may be either - * included or omitted from the glob. */ -static int -open_swms_from_glob(const tchar *swm_glob, - const tchar *first_part, - int open_flags, - WIMStruct ***additional_swms_ret, - unsigned *num_additional_swms_ret) -{ - unsigned num_additional_swms = 0; - WIMStruct **additional_swms = NULL; - glob_t globbuf; - int ret; - - /* Warning: glob() is replaced in Windows native builds */ - ret = tglob(swm_glob, GLOB_ERR | GLOB_NOSORT, NULL, &globbuf); - if (ret) { - if (ret == GLOB_NOMATCH) { - imagex_error(T("Found no files for glob \"%"TS"\""), - swm_glob); - } else { - imagex_error_with_errno(T("Failed to process glob \"%"TS"\""), - swm_glob); - } - ret = -1; - goto out; - } - num_additional_swms = globbuf.gl_pathc; - additional_swms = calloc(num_additional_swms, sizeof(additional_swms[0])); - if (!additional_swms) { - imagex_error(T("Out of memory")); - ret = -1; - goto out_globfree; - } - unsigned offset = 0; - for (unsigned i = 0; i < num_additional_swms; i++) { - if (tstrcmp(globbuf.gl_pathv[i], first_part) == 0) { - offset++; - continue; - } - ret = wimlib_open_wim(globbuf.gl_pathv[i], - open_flags | WIMLIB_OPEN_FLAG_SPLIT_OK, - &additional_swms[i - offset], - imagex_progress_func); - if (ret) - goto out_close_swms; - } - *additional_swms_ret = additional_swms; - *num_additional_swms_ret = num_additional_swms - offset; - ret = 0; - goto out_globfree; -out_close_swms: - for (unsigned i = 0; i < num_additional_swms; i++) - wimlib_free(additional_swms[i]); - free(additional_swms); -out_globfree: - globfree(&globbuf); -out: - return ret; + return WIMLIB_PROGRESS_STATUS_CONTINUE; } - static unsigned parse_num_threads(const tchar *optarg) { @@ -1238,6 +1218,19 @@ parse_num_threads(const tchar *optarg) } } +static uint32_t parse_chunk_size(const tchar *optarg) +{ + tchar *tmp; + unsigned long chunk_size = tstrtoul(optarg, &tmp, 10); + if (chunk_size >= UINT32_MAX || *tmp || tmp == optarg) { + imagex_error(T("Chunk size must be a non-negative integer!")); + return UINT32_MAX; + } else { + return chunk_size; + } +} + + /* * Parse an option passed to an update command. * @@ -1259,23 +1252,25 @@ update_command_add_option(int op, const tchar *option, switch (op) { case WIMLIB_UPDATE_OP_ADD: if (!tstrcmp(option, T("--verbose"))) - cmd->add.add_flags |= WIMLIB_ADD_IMAGE_FLAG_VERBOSE; + cmd->add.add_flags |= WIMLIB_ADD_FLAG_VERBOSE; else if (!tstrcmp(option, T("--unix-data"))) - cmd->add.add_flags |= WIMLIB_ADD_IMAGE_FLAG_UNIX_DATA; + cmd->add.add_flags |= WIMLIB_ADD_FLAG_UNIX_DATA; else if (!tstrcmp(option, T("--no-acls")) || !tstrcmp(option, T("--noacls"))) - cmd->add.add_flags |= WIMLIB_ADD_IMAGE_FLAG_NO_ACLS; + cmd->add.add_flags |= WIMLIB_ADD_FLAG_NO_ACLS; else if (!tstrcmp(option, T("--strict-acls"))) - cmd->add.add_flags |= WIMLIB_ADD_IMAGE_FLAG_STRICT_ACLS; + cmd->add.add_flags |= WIMLIB_ADD_FLAG_STRICT_ACLS; else if (!tstrcmp(option, T("--dereference"))) - cmd->add.add_flags |= WIMLIB_ADD_IMAGE_FLAG_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; case WIMLIB_UPDATE_OP_DELETE: if (!tstrcmp(option, T("--force"))) - cmd->delete.delete_flags |= WIMLIB_DELETE_FLAG_FORCE; + cmd->delete_.delete_flags |= WIMLIB_DELETE_FLAG_FORCE; else if (!tstrcmp(option, T("--recursive"))) - cmd->delete.delete_flags |= WIMLIB_DELETE_FLAG_RECURSIVE; + cmd->delete_.delete_flags |= WIMLIB_DELETE_FLAG_RECURSIVE; else recognized = false; break; @@ -1306,7 +1301,7 @@ update_command_add_nonoption(int op, const tchar *nonoption, cmd->add.wim_target_path = (tchar*)nonoption; break; case WIMLIB_UPDATE_OP_DELETE: - cmd->delete.wim_path = (tchar*)nonoption; + cmd->delete_.wim_path = (tchar*)nonoption; break; case WIMLIB_UPDATE_OP_RENAME: if (num_nonoptions == 0) @@ -1446,41 +1441,36 @@ 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) { int c; - int open_flags = WIMLIB_OPEN_FLAG_SPLIT_OK; - int image; + int open_flags = 0; + int image = WIMLIB_NO_IMAGE; WIMStruct *wim; + struct wimlib_wim_info info; int ret; const tchar *wimfile; const tchar *target; - const tchar *image_num_or_name; - int extract_flags = WIMLIB_EXTRACT_FLAG_SEQUENTIAL; + const tchar *image_num_or_name = NULL; + int extract_flags = 0; - const tchar *swm_glob = NULL; - WIMStruct **additional_swms; - unsigned num_additional_swms; + STRING_SET(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: - extract_flags |= WIMLIB_EXTRACT_FLAG_VERBOSE; + /* No longer does anything. */ break; case IMAGEX_REF_OPTION: - swm_glob = optarg; + ret = string_set_append(&refglobs, optarg); + if (ret) + goto out_free_refglobs; break; case IMAGEX_UNIX_DATA_OPTION: extract_flags |= WIMLIB_EXTRACT_FLAG_UNIX_DATA; @@ -1491,6 +1481,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; @@ -1501,6 +1494,12 @@ imagex_apply(int argc, tchar **argv, int cmd) extract_flags |= WIMLIB_EXTRACT_FLAG_REPLACE_INVALID_FILENAMES; extract_flags |= WIMLIB_EXTRACT_FLAG_ALL_CASE_CONFLICTS; break; + case IMAGEX_RESUME_OPTION: + extract_flags |= WIMLIB_EXTRACT_FLAG_RESUME; + break; + case IMAGEX_WIMBOOT_OPTION: + extract_flags |= WIMLIB_EXTRACT_FLAG_WIMBOOT; + break; default: goto out_usage; } @@ -1522,13 +1521,13 @@ imagex_apply(int argc, tchar **argv, int cmd) target = argv[2]; } wim = NULL; - num_additional_swms = 0; - additional_swms = 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; + goto out_free_refglobs; + + wimlib_get_wim_info(wim, &info); if (argc >= 3) { /* Image explicitly specified. */ @@ -1541,9 +1540,7 @@ imagex_apply(int argc, tchar **argv, int cmd) } else { /* No image specified; default to image 1, but only if the WIM * contains exactly one image. */ - struct wimlib_wim_info info; - wimlib_get_wim_info(wim, &info); if (info.image_count != 1) { imagex_error(T("\"%"TS"\" contains %d images; " "Please select one (or all)."), @@ -1554,22 +1551,22 @@ imagex_apply(int argc, tchar **argv, int cmd) image = 1; target = argv[1]; } + } - if (swm_glob) { - ret = open_swms_from_glob(swm_glob, wimfile, open_flags, - &additional_swms, - &num_additional_swms); - if (ret) - goto out_wimlib_free; - } else { - additional_swms = NULL; - num_additional_swms = 0; + if (refglobs.num_strings) { + if (wim == NULL) { + imagex_error(T("Can't specify --ref when applying from stdin!")); + ret = -1; + goto out_wimlib_free; } + ret = wim_reference_globs(wim, &refglobs, open_flags); + if (ret) + goto out_wimlib_free; } #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; @@ -1578,7 +1575,7 @@ imagex_apply(int argc, tchar **argv, int cmd) imagex_error_with_errno(T("Failed to stat \"%"TS"\""), target); ret = -1; - goto out_free_swms; + goto out_wimlib_free; } } else { if (S_ISBLK(stbuf.st_mode) || S_ISREG(stbuf.st_mode)) @@ -1588,31 +1585,39 @@ imagex_apply(int argc, tchar **argv, int cmd) #endif if (wim) { - ret = wimlib_extract_image(wim, image, target, extract_flags, - additional_swms, num_additional_swms, - 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) + if (ret == 0) { imagex_printf(T("Done applying WIM image.\n")); -out_free_swms: - for (unsigned i = 0; i < num_additional_swms; i++) - wimlib_free(additional_swms[i]); - free(additional_swms); + } else if (ret == WIMLIB_ERR_RESOURCE_NOT_FOUND) { + if (wim) { + do_resource_not_found_warning(wimfile, &info, &refglobs); + } else { + imagex_error(T( "If you are applying an image " + "from a split pipable WIM,\n" + " make sure you have " + "concatenated together all parts.")); + } + } out_wimlib_free: wimlib_free(wim); -out: +out_free_refglobs: + string_set_destroy(&refglobs); return ret; out_usage: usage(CMD_APPLY, stderr); ret = -1; - goto out; + goto out_free_refglobs; } /* Create a WIM image from a directory tree, NTFS volume, or multiple files or @@ -1624,32 +1629,45 @@ 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; + int add_image_flags = WIMLIB_ADD_IMAGE_FLAG_EXCLUDE_VERBOSE | + WIMLIB_ADD_IMAGE_FLAG_WINCONFIG | + WIMLIB_ADD_IMAGE_FLAG_VERBOSE; int write_flags = 0; - int compression_type = WIMLIB_COMPRESSION_TYPE_LZX; + int compression_type = WIMLIB_COMPRESSION_TYPE_INVALID; + uint32_t chunk_size = UINT32_MAX; + uint32_t pack_chunk_size = UINT32_MAX; + int pack_ctype = WIMLIB_COMPRESSION_TYPE_INVALID; const tchar *wimfile; int wim_fd; const tchar *name; const tchar *desc; const tchar *flags_element = NULL; + WIMStruct *wim; + STRING_SET(base_wimfiles); + WIMStruct **base_wims; + + WIMStruct *template_wim; + const tchar *template_wimfile = NULL; + const tchar *template_image_name_or_num = NULL; + int template_image = WIMLIB_NO_IMAGE; + int ret; unsigned num_threads = 0; 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; + size_t source_list_nchars = 0; tchar *source_list_contents; bool capture_sources_malloced; struct wimlib_capture_source *capture_sources; size_t num_sources; bool name_defaulted; + bool compress_slow = false; for_opt(c, capture_or_append_options) { switch (c) { @@ -1665,12 +1683,34 @@ 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; break; case IMAGEX_COMPRESS_OPTION: compression_type = get_compression_type(optarg); if (compression_type == WIMLIB_COMPRESSION_TYPE_INVALID) goto out_err; break; + case IMAGEX_COMPRESS_SLOW_OPTION: + compress_slow = true; + break; + case IMAGEX_CHUNK_SIZE_OPTION: + chunk_size = parse_chunk_size(optarg); + if (chunk_size == UINT32_MAX) + goto out_err; + break; + case IMAGEX_PACK_CHUNK_SIZE_OPTION: + pack_chunk_size = parse_chunk_size(optarg); + if (pack_chunk_size == UINT32_MAX) + goto out_err; + break; + case IMAGEX_PACK_COMPRESS_OPTION: + pack_ctype = get_compression_type(optarg); + if (pack_ctype == WIMLIB_COMPRESSION_TYPE_INVALID) + goto out_err; + break; + case IMAGEX_PACK_STREAMS_OPTION: + write_flags |= WIMLIB_WRITE_FLAG_PACK_STREAMS; + break; case IMAGEX_FLAGS_OPTION: flags_element = optarg; break; @@ -1678,7 +1718,7 @@ imagex_capture_or_append(int argc, tchar **argv, int cmd) add_image_flags |= WIMLIB_ADD_IMAGE_FLAG_DEREFERENCE; break; case IMAGEX_VERBOSE_OPTION: - add_image_flags |= WIMLIB_ADD_IMAGE_FLAG_VERBOSE; + /* No longer does anything. */ break; case IMAGEX_THREADS_OPTION: num_threads = parse_num_threads(optarg); @@ -1712,6 +1752,39 @@ imagex_capture_or_append(int argc, tchar **argv, int cmd) case IMAGEX_NOT_PIPABLE_OPTION: write_flags |= WIMLIB_WRITE_FLAG_NOT_PIPABLE; break; + case IMAGEX_UPDATE_OF_OPTION: + if (template_image_name_or_num) { + imagex_error(T("'--update-of' can only be " + "specified one time!")); + goto out_err; + } else { + tchar *colon; + colon = tstrrchr(optarg, T(':')); + + if (colon) { + template_wimfile = optarg; + *colon = T('\0'); + template_image_name_or_num = colon + 1; + } else { + template_wimfile = NULL; + template_image_name_or_num = optarg; + } + } + 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); + if (ret) + goto out_free_base_wimfiles; + write_flags |= WIMLIB_WRITE_FLAG_SKIP_EXTERNAL_WIMS; + break; + case IMAGEX_WIMBOOT_OPTION: + add_image_flags |= WIMLIB_ADD_IMAGE_FLAG_WIMBOOT; + break; default: goto out_usage; } @@ -1725,7 +1798,41 @@ imagex_capture_or_append(int argc, tchar **argv, int cmd) source = argv[0]; wimfile = argv[1]; + /* Set default compression type and parameters. */ + + + if (compression_type == WIMLIB_COMPRESSION_TYPE_INVALID) { + /* No compression type specified. Use the default. */ + + if (add_image_flags & WIMLIB_ADD_IMAGE_FLAG_WIMBOOT) { + /* With --wimboot, default to XPRESS compression. */ + compression_type = WIMLIB_COMPRESSION_TYPE_XPRESS; + } else if (write_flags & WIMLIB_WRITE_FLAG_PACK_STREAMS) { + /* With --pack-streams or --solid, default to LZMS + * compression. (However, this will not affect packed + * resources!) */ + compression_type = WIMLIB_COMPRESSION_TYPE_LZMS; + } else { + /* Otherwise, default to LZX compression in fast mode. + */ + compression_type = WIMLIB_COMPRESSION_TYPE_LZX; + if (!compress_slow && pack_ctype != WIMLIB_COMPRESSION_TYPE_LZX) { + struct wimlib_lzx_compressor_params params = { + .hdr.size = sizeof(params), + .algorithm = WIMLIB_LZX_ALGORITHM_FAST, + .use_defaults = 1, + }; + wimlib_set_default_compressor_params(WIMLIB_COMPRESSION_TYPE_LZX, + ¶ms.hdr); + } + } + } + + if (compress_slow) + set_compress_slow(); + if (!tstrcmp(wimfile, T("-"))) { + /* Writing captured WIM to standard output. */ #if 0 if (!(write_flags & WIMLIB_WRITE_FLAG_PIPABLE)) { imagex_error("Can't write a non-pipable WIM to " @@ -1745,6 +1852,36 @@ imagex_capture_or_append(int argc, tchar **argv, int cmd) wim_fd = STDOUT_FILENO; wimfile = NULL; imagex_info_file = stderr; + set_fd_to_binary_mode(wim_fd); + } + + /* If template image was specified using --update-of=IMAGE rather + * than --update-of=WIMFILE:IMAGE, set the default WIMFILE. */ + if (template_image_name_or_num && !template_wimfile) { + if (base_wimfiles.num_strings == 1) { + /* Capturing delta WIM based on single WIM: default to + * base WIM. */ + template_wimfile = base_wimfiles.strings[0]; + } else if (cmd == CMD_APPEND) { + /* Appending to WIM: default to WIM being appended to. + */ + template_wimfile = wimfile; + } else { + /* Capturing a normal (non-delta) WIM, so the WIM file + * *must* be explicitly specified. */ + if (base_wimfiles.num_strings > 1) { + imagex_error(T("For capture of delta WIM " + "based on multiple existing " + "WIMs,\n" + " '--update-of' must " + "specify WIMFILE:IMAGE!")); + } else { + imagex_error(T("For capture of non-delta WIM, " + "'--update-of' must specify " + "WIMFILE:IMAGE!")); + } + goto out_usage; + } } if (argc >= 3) { @@ -1788,43 +1925,54 @@ imagex_capture_or_append(int argc, tchar **argv, int cmd) } capture_sources_malloced = true; } else { - /* Set up capture source in non-source-list mode (could be - * either "normal" mode or "NTFS mode"--- see the man page). */ + /* 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) { - 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, &wim, + imagex_progress_func, NULL); if (ret) - goto out_free_config; + goto out_free_capture_sources; } else { - config = &default_capture_config; + ret = wimlib_create_new_wim(compression_type, &wim); + if (ret) + goto out_free_capture_sources; + wimlib_register_progress_function(wim, imagex_progress_func, NULL); } - 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; + /* 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_image_flags & WIMLIB_ADD_IMAGE_FLAG_WIMBOOT) && + compression_type == WIMLIB_COMPRESSION_TYPE_XPRESS) { + ret = wimlib_set_output_chunk_size(wim, 4096); + if (ret) + goto out_free_wim; + } + if (pack_ctype != WIMLIB_COMPRESSION_TYPE_INVALID) { + ret = wimlib_set_output_pack_compression_type(wim, pack_ctype); + if (ret) + goto out_free_wim; + } + if (pack_chunk_size != UINT32_MAX) { + ret = wimlib_set_output_pack_chunk_size(wim, pack_chunk_size); + if (ret) + goto out_free_wim; + } #ifndef __WIN32__ + /* Detect if source is regular file or block device and set NTFS volume + * capture mode. */ if (!source_list) { struct stat stbuf; @@ -1839,16 +1987,16 @@ imagex_capture_or_append(int argc, tchar **argv, int cmd) imagex_error_with_errno(T("Failed to stat " "\"%"TS"\""), source); ret = -1; - goto out_wimlib_free; + goto out_free_wim; } } } #endif + /* If the user did not specify an image name, and the basename of the + * source already exists as an image name in the WIM file, append a + * suffix to make it unique. */ if (cmd == CMD_APPEND && name_defaulted) { - /* If the user did not specify an image name, and the basename - * of the source already exists as an image name in the WIM - * file, append a suffix to make it unique. */ unsigned long conflict_idx; tchar *name_end = tstrchr(name, T('\0')); for (conflict_idx = 1; @@ -1858,20 +2006,105 @@ imagex_capture_or_append(int argc, tchar **argv, int cmd) tsprintf(name_end, T(" (%lu)"), conflict_idx); } } + + /* If capturing a delta WIM, reference resources from the base WIMs + * before adding the new image. */ + if (base_wimfiles.num_strings) { + base_wims = calloc(base_wimfiles.num_strings, + sizeof(base_wims[0])); + if (base_wims == NULL) { + imagex_error(T("Out of memory!")); + ret = -1; + goto out_free_wim; + } + + for (size_t i = 0; i < base_wimfiles.num_strings; i++) { + ret = wimlib_open_wim_with_progress( + base_wimfiles.strings[i], + open_flags, &base_wims[i], + imagex_progress_func, NULL); + if (ret) + goto out_free_base_wims; + + } + + ret = wimlib_reference_resources(wim, base_wims, + base_wimfiles.num_strings, 0); + if (ret) + goto out_free_base_wims; + + if (base_wimfiles.num_strings == 1) { + imagex_printf(T("Capturing delta WIM based on \"%"TS"\"\n"), + base_wimfiles.strings[0]); + } else { + imagex_printf(T("Capturing delta WIM based on %u WIMs\n"), + base_wimfiles.num_strings); + } + + } else { + base_wims = NULL; + } + + /* If capturing or appending as an update of an existing (template) image, + * open the WIM if needed and parse the image index. */ + if (template_image_name_or_num) { + + + if (base_wimfiles.num_strings == 1 && + template_wimfile == base_wimfiles.strings[0]) { + template_wim = base_wims[0]; + } else if (template_wimfile == wimfile) { + template_wim = wim; + } else { + ret = wimlib_open_wim_with_progress(template_wimfile, + open_flags, + &template_wim, + imagex_progress_func, + NULL); + if (ret) + goto out_free_base_wims; + } + + template_image = wimlib_resolve_image(template_wim, + template_image_name_or_num); + + if (template_image_name_or_num[0] == T('-')) { + tchar *tmp; + unsigned long n; + struct wimlib_wim_info info; + + wimlib_get_wim_info(template_wim, &info); + n = tstrtoul(template_image_name_or_num + 1, &tmp, 10); + if (n >= 1 && n <= info.image_count && + *tmp == T('\0') && + tmp != template_image_name_or_num + 1) + { + template_image = info.image_count - (n - 1); + } + } + ret = verify_image_exists_and_is_single(template_image, + template_image_name_or_num, + template_wimfile); + if (ret) + goto out_free_template_wim; + } else { + template_wim = NULL; + } + ret = wimlib_add_image_multisource(wim, capture_sources, num_sources, name, - config, - add_image_flags, - imagex_progress_func); + config_file, + add_image_flags); if (ret) - goto out_wimlib_free; + goto out_free_template_wim; - if (desc || flags_element) { - /* User provided or element. Get the - * index of the image we just added, then use it to call the - * appropriate functions. */ + 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. */ struct wimlib_wim_info info; wimlib_get_wim_info(wim, &info); @@ -1881,52 +2114,67 @@ imagex_capture_or_append(int argc, tchar **argv, int cmd) info.image_count, desc); if (ret) - goto out_wimlib_free; + goto out_free_template_wim; } if (flags_element) { ret = wimlib_set_image_flags(wim, info.image_count, flags_element); if (ret) - goto out_wimlib_free; + goto out_free_template_wim; + } + + /* Reference template image if the user provided one. */ + if (template_image_name_or_num) { + imagex_printf(T("Using image %d " + "from \"%"TS"\" as template\n"), + template_image, template_wimfile); + ret = wimlib_reference_template_image(wim, + info.image_count, + template_wim, + template_image, + 0); + if (ret) + goto out_free_template_wim; } } /* 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_wimlib_free: +out_free_template_wim: + /* template_wim may alias base_wims[0] or wim. */ + if ((base_wimfiles.num_strings != 1 || template_wim != base_wims[0]) && + template_wim != wim) + wimlib_free(template_wim); +out_free_base_wims: + for (size_t i = 0; i < base_wimfiles.num_strings; i++) + wimlib_free(base_wims[i]); + free(base_wims); +out_free_wim: wimlib_free(wim); -out_free_config: - if (config != &default_capture_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: +out_free_base_wimfiles: + string_set_destroy(&base_wimfiles); return ret; out_usage: usage(cmd, stderr); out_err: ret = -1; - goto out; + goto out_free_base_wimfiles; } /* Remove image(s) from a WIM. */ @@ -1968,8 +2216,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; @@ -1986,7 +2234,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); @@ -2002,11 +2250,210 @@ 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 +timespec_to_string(const struct timespec *spec, tchar *buf) +{ + time_t t = spec->tv_sec; + struct tm tm; + gmtime_r(&t, &tm); + tstrftime(buf, TIMESTR_MAX, T("%a %b %d %H:%M:%S %Y UTC"), &tm); + buf[TIMESTR_MAX - 1] = '\0'; +} + +static void +print_time(const tchar *type, const struct timespec *spec) +{ + tchar timestr[TIMESTR_MAX]; + + timespec_to_string(spec, timestr); + + 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) +{ + 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("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("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("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); +} + +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')); +} + +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); + print_time(T("Last Write Time"), &dentry->last_write_time); + print_time(T("Last Access Time"), &dentry->last_access_time); + + + 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"\n"), + dentry->unix_uid, dentry->unix_gid, dentry->unix_mode); + } + + for (uint32_t i = 0; i <= dentry->num_named_streams; i++) { + if (dentry->streams[i].stream_name) { + tprintf(T("\tData stream \"%"TS"\":\n"), + dentry->streams[i].stream_name); + } else { + tprintf(T("\tUnnamed data stream:\n")); + } + print_resource(&dentry->streams[i].resource, NULL); + } +} + static int -print_full_path(const struct wimlib_dir_entry *wdentry, void *_ignore) +print_dentry(const struct wimlib_dir_entry *dentry, void *_options) { - int ret = tprintf(T("%"TS"\n"), wdentry->full_path); - return (ret >= 0) ? 0 : -1; + 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. */ @@ -2017,14 +2464,24 @@ 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; 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; default: goto out_usage; } @@ -2042,8 +2499,8 @@ imagex_dir(int argc, tchar **argv, int cmd) } wimfile = argv[0]; - ret = wimlib_open_wim(wimfile, WIMLIB_OPEN_FLAG_SPLIT_OK, &wim, - imagex_progress_func); + ret = wimlib_open_wim_with_progress(wimfile, 0, &wim, + imagex_progress_func, NULL); if (ret) goto out; @@ -2069,9 +2526,8 @@ 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); + ret = wimlib_iterate_dir_tree(wim, image, path, iterate_flags, + print_dentry, &options); out_wimlib_free: wimlib_free(wim); out: @@ -2090,7 +2546,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; @@ -2100,15 +2556,17 @@ imagex_export(int argc, tchar **argv, int cmd) const tchar *dest_name; const tchar *dest_desc; WIMStruct *src_wim; + struct wimlib_wim_info src_info; WIMStruct *dest_wim; int ret; int image; struct stat stbuf; bool wim_is_new; - const tchar *swm_glob = NULL; - WIMStruct **additional_swms; - unsigned num_additional_swms; + STRING_SET(refglobs); unsigned num_threads = 0; + uint32_t chunk_size = UINT32_MAX; + uint32_t pack_chunk_size = UINT32_MAX; + int pack_ctype = WIMLIB_COMPRESSION_TYPE_INVALID; for_opt(c, export_options) { switch (c) { @@ -2127,8 +2585,32 @@ imagex_export(int argc, tchar **argv, int cmd) if (compression_type == WIMLIB_COMPRESSION_TYPE_INVALID) goto out_err; break; + case IMAGEX_COMPRESS_SLOW_OPTION: + write_flags |= WIMLIB_WRITE_FLAG_RECOMPRESS; + set_compress_slow(); + break; + case IMAGEX_PACK_STREAMS_OPTION: + write_flags |= WIMLIB_WRITE_FLAG_PACK_STREAMS; + break; + case IMAGEX_CHUNK_SIZE_OPTION: + chunk_size = parse_chunk_size(optarg); + if (chunk_size == UINT32_MAX) + goto out_err; + break; + case IMAGEX_PACK_CHUNK_SIZE_OPTION: + pack_chunk_size = parse_chunk_size(optarg); + if (pack_chunk_size == UINT32_MAX) + goto out_err; + break; + case IMAGEX_PACK_COMPRESS_OPTION: + pack_ctype = get_compression_type(optarg); + if (pack_ctype == WIMLIB_COMPRESSION_TYPE_INVALID) + goto out_err; + break; case IMAGEX_REF_OPTION: - swm_glob = optarg; + ret = string_set_append(&refglobs, optarg); + if (ret) + goto out_free_refglobs; break; case IMAGEX_THREADS_OPTION: num_threads = parse_num_threads(optarg); @@ -2144,6 +2626,9 @@ 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; default: goto out_usage; } @@ -2157,11 +2642,12 @@ imagex_export(int argc, tchar **argv, int cmd) dest_wimfile = argv[2]; dest_name = (argc >= 4) ? argv[3] : NULL; dest_desc = (argc >= 5) ? argv[4] : NULL; - ret = wimlib_open_wim(src_wimfile, - open_flags | WIMLIB_OPEN_FLAG_SPLIT_OK, &src_wim, - imagex_progress_func); + ret = wimlib_open_wim_with_progress(src_wimfile, open_flags, &src_wim, + imagex_progress_func, NULL); if (ret) - goto out; + goto out_free_refglobs; + + wimlib_get_wim_info(src_wim, &src_info); /* Determine if the destination is an existing file or not. If so, we * try to append the exported image(s) to it; otherwise, we create a new @@ -2184,6 +2670,7 @@ imagex_export(int argc, tchar **argv, int cmd) dest_wimfile = NULL; dest_wim_fd = STDOUT_FILENO; imagex_info_file = stderr; + set_fd_to_binary_mode(dest_wim_fd); } errno = ENOENT; if (dest_wimfile != NULL && tstat(dest_wimfile, &stbuf) == 0) { @@ -2196,8 +2683,12 @@ imagex_export(int argc, tchar **argv, int cmd) ret = -1; goto out_free_src_wim; } - ret = wimlib_open_wim(dest_wimfile, open_flags | WIMLIB_OPEN_FLAG_WRITE_ACCESS, - &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; @@ -2231,16 +2722,51 @@ imagex_export(int argc, tchar **argv, int cmd) if (compression_type == WIMLIB_COMPRESSION_TYPE_INVALID) { /* The user did not specify a compression type; default - * to that of the source WIM. */ - - struct wimlib_wim_info src_info; - - wimlib_get_wim_info(src_wim, &src_info); - compression_type = src_info.compression_type; + * to that of the source WIM, unless --pack-streams, + * --solid, or --wimboot was specified. */ + + if (write_flags & WIMLIB_WRITE_FLAG_PACK_STREAMS) + 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; + + 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) { + /* Set destination chunk size. */ + ret = wimlib_set_output_chunk_size(dest_wim, chunk_size); + if (ret) + goto out_free_dest_wim; + } + if (pack_ctype != WIMLIB_COMPRESSION_TYPE_INVALID) { + ret = wimlib_set_output_pack_compression_type(dest_wim, pack_ctype); + if (ret) + goto out_free_dest_wim; + } + if (pack_chunk_size != UINT32_MAX) { + ret = wimlib_set_output_pack_chunk_size(dest_wim, pack_chunk_size); + if (ret) + goto out_free_dest_wim; } image = wimlib_resolve_image(src_wim, src_image_num_or_name); @@ -2248,113 +2774,53 @@ imagex_export(int argc, tchar **argv, int cmd) if (ret) goto out_free_dest_wim; - if (swm_glob) { - ret = open_swms_from_glob(swm_glob, src_wimfile, open_flags, - &additional_swms, - &num_additional_swms); + if (refglobs.num_strings) { + ret = wim_reference_globs(src_wim, &refglobs, open_flags); if (ret) goto out_free_dest_wim; - } else { - additional_swms = NULL; - num_additional_swms = 0; + } + + if ((export_flags & WIMLIB_EXPORT_FLAG_BOOT) && + image == WIMLIB_ALL_IMAGES && src_info.boot_index == 0) + { + imagex_error(T("--boot specified for all-images export, but source WIM " + "has no bootable image.")); + ret = -1; + goto out_free_dest_wim; } ret = wimlib_export_image(src_wim, image, dest_wim, dest_name, - dest_desc, export_flags, additional_swms, - num_additional_swms, imagex_progress_func); - if (ret) - goto out_free_swms; + dest_desc, export_flags); + if (ret) { + if (ret == WIMLIB_ERR_RESOURCE_NOT_FOUND) { + do_resource_not_found_warning(src_wimfile, + &src_info, &refglobs); + } + 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); - if (ret) - imagex_error(T("Export failed.")); -out_free_swms: - for (unsigned i = 0; i < num_additional_swms; i++) - wimlib_free(additional_swms[i]); - free(additional_swms); + num_threads); out_free_dest_wim: wimlib_free(dest_wim); out_free_src_wim: wimlib_free(src_wim); -out: +out_free_refglobs: + string_set_destroy(&refglobs); return ret; out_usage: usage(CMD_EXPORT, stderr); out_err: ret = -1; - goto out; -} - -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; + goto out_free_refglobs; } /* Extract files or directories from a WIM image */ @@ -2362,21 +2828,21 @@ static int imagex_extract(int argc, tchar **argv, int cmd) { int c; - int open_flags = WIMLIB_OPEN_FLAG_SPLIT_OK; + int open_flags = 0; int image; WIMStruct *wim; int ret; const tchar *wimfile; const tchar *image_num_or_name; tchar *dest_dir = T("."); - int extract_flags = WIMLIB_EXTRACT_FLAG_SEQUENTIAL | WIMLIB_EXTRACT_FLAG_NORPFIX; + 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; - const tchar *swm_glob = NULL; - WIMStruct **additional_swms; - unsigned num_additional_swms; + STRING_SET(refglobs); - struct wimlib_extract_command *cmds; - size_t num_cmds; + tchar *root_path = WIMLIB_WIM_ROOT_PATH; for_opt(c, extract_options) { switch (c) { @@ -2384,10 +2850,12 @@ imagex_extract(int argc, tchar **argv, int cmd) open_flags |= WIMLIB_OPEN_FLAG_CHECK_INTEGRITY; break; case IMAGEX_VERBOSE_OPTION: - extract_flags |= WIMLIB_EXTRACT_FLAG_VERBOSE; + /* No longer does anything. */ break; case IMAGEX_REF_OPTION: - swm_glob = optarg; + ret = string_set_append(&refglobs, optarg); + if (ret) + goto out_free_refglobs; break; case IMAGEX_UNIX_DATA_OPTION: extract_flags |= WIMLIB_EXTRACT_FLAG_UNIX_DATA; @@ -2398,6 +2866,9 @@ 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; @@ -2405,11 +2876,24 @@ imagex_extract(int argc, tchar **argv, int cmd) extract_flags |= WIMLIB_EXTRACT_FLAG_TO_STDOUT; imagex_info_file = stderr; imagex_be_quiet = true; + 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: + extract_flags &= ~WIMLIB_EXTRACT_FLAG_GLOB_PATHS; + break; + case IMAGEX_NULLGLOB_OPTION: + extract_flags &= ~WIMLIB_EXTRACT_FLAG_STRICT_GLOB; + break; + 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; default: goto out_usage; } @@ -2420,20 +2904,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-wildcards and --nullglob!")); + goto out_err; + } + wimfile = argv[0]; image_num_or_name = argv[1]; argc -= 2; argv += 2; - cmds = prepare_extract_commands(argv, argc, extract_flags, dest_dir, - &num_cmds); - if (!cmds) - goto out_err; - - 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, @@ -2442,20 +2929,42 @@ imagex_extract(int argc, tchar **argv, int cmd) if (ret) goto out_wimlib_free; - if (swm_glob) { - ret = open_swms_from_glob(swm_glob, wimfile, open_flags, - &additional_swms, - &num_additional_swms); + if (refglobs.num_strings) { + ret = wim_reference_globs(wim, &refglobs, open_flags); if (ret) goto out_wimlib_free; - } else { - additional_swms = NULL; - num_additional_swms = 0; } - ret = wimlib_extract_files(wim, image, cmds, num_cmds, 0, - additional_swms, num_additional_swms, - imagex_progress_func); + if (argc == 0) { + argv = &root_path; + argc = 1; + extract_flags &= ~WIMLIB_EXTRACT_FLAG_GLOB_PATHS; + } + + 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")); @@ -2463,95 +2972,24 @@ imagex_extract(int argc, tchar **argv, int cmd) tfprintf(stderr, T("Note: You can use `%"TS"' to see what " "files and directories\n" " are in the WIM image.\n"), - get_cmd_string(CMD_INFO, false)); + get_cmd_string(CMD_DIR, false)); + } else if (ret == WIMLIB_ERR_RESOURCE_NOT_FOUND) { + struct wimlib_wim_info info; + + wimlib_get_wim_info(wim, &info); + do_resource_not_found_warning(wimfile, &info, &refglobs); } - for (unsigned i = 0; i < num_additional_swms; i++) - wimlib_free(additional_swms[i]); - free(additional_swms); out_wimlib_free: wimlib_free(wim); -out_free_cmds: - free_extract_commands(cmds, num_cmds, dest_dir); -out: +out_free_refglobs: + string_set_destroy(&refglobs); return ret; out_usage: usage(CMD_EXTRACT, stderr); out_err: ret = -1; - goto out; -} - -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("Image Count: %d\n"), info->image_count); - tprintf(T("Compression: %"TS"\n"), - wimlib_get_compression_type_string(info->compression_type)); - 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); - - tprintf(T("Compressed size = %"PRIu64" bytes\n"), - resource->compressed_size); - - tprintf(T("Offset = %"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 ")); - tputchar(T('\n')); - tputchar(T('\n')); - return 0; -} - -static void -print_lookup_table(WIMStruct *wim) -{ - wimlib_iterate_lookup_table(wim, 0, print_resource, NULL); + goto out_free_refglobs; } /* Prints information about a WIM file; also can mark an image as bootable, @@ -2566,7 +3004,6 @@ imagex_info(int argc, tchar **argv, int cmd) bool header = false; bool lookup_table = false; bool xml = false; - bool metadata = false; bool short_header = true; const tchar *xml_out_file = NULL; const tchar *wimfile; @@ -2576,7 +3013,7 @@ imagex_info(int argc, tchar **argv, int cmd) WIMStruct *wim; int image; int ret; - int open_flags = WIMLIB_OPEN_FLAG_SPLIT_OK; + int open_flags = 0; struct wimlib_wim_info info; for_opt(c, info_options) { @@ -2607,9 +3044,9 @@ imagex_info(int argc, tchar **argv, int cmd) short_header = false; break; case IMAGEX_METADATA_OPTION: - metadata = true; - short_header = false; - break; + imagex_error(T("The --metadata option has been removed. " + "Use 'wimdir --detail' instead.")); + goto out_err; default: goto out_usage; } @@ -2633,7 +3070,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; @@ -2642,8 +3080,7 @@ imagex_info(int argc, tchar **argv, int cmd) image = wimlib_resolve_image(wim, image_num_or_name); ret = WIMLIB_ERR_INVALID_IMAGE; if (image == WIMLIB_NO_IMAGE && tstrcmp(image_num_or_name, T("0"))) { - imagex_error(T("The image \"%"TS"\" does not exist in \"%"TS"\""), - image_num_or_name, wimfile); + verify_image_exists(image, image_num_or_name, wimfile); if (boot) { imagex_error(T("If you would like to set the boot " "index to 0, specify image \"0\" with " @@ -2731,11 +3168,6 @@ 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 { @@ -2809,8 +3241,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"), @@ -2835,7 +3266,7 @@ static int imagex_join(int argc, tchar **argv, int cmd) { int c; - int swm_open_flags = WIMLIB_OPEN_FLAG_SPLIT_OK; + int swm_open_flags = 0; int wim_write_flags = 0; const tchar *output_path; int ret; @@ -2859,12 +3290,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; @@ -2882,16 +3314,16 @@ imagex_mount_rw_or_ro(int argc, tchar **argv, int cmd) { int c; int mount_flags = 0; - int open_flags = WIMLIB_OPEN_FLAG_SPLIT_OK; - const tchar *swm_glob = NULL; + int open_flags = 0; const tchar *staging_dir = NULL; const tchar *wimfile; const tchar *dir; WIMStruct *wim; + struct wimlib_wim_info info; int image; int ret; - WIMStruct **additional_swms; - unsigned num_additional_swms; + + STRING_SET(refglobs); if (cmd == CMD_MOUNTRW) { mount_flags |= WIMLIB_MOUNT_FLAG_READWRITE; @@ -2923,7 +3355,9 @@ imagex_mount_rw_or_ro(int argc, tchar **argv, int cmd) } break; case IMAGEX_REF_OPTION: - swm_glob = optarg; + ret = string_set_append(&refglobs, optarg); + if (ret) + goto out_free_refglobs; break; case IMAGEX_STAGING_DIR_OPTION: staging_dir = optarg; @@ -2942,9 +3376,12 @@ 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; + goto out_free_refglobs; + + wimlib_get_wim_info(wim, &info); if (argc >= 3) { /* Image explicitly specified. */ @@ -2956,9 +3393,7 @@ imagex_mount_rw_or_ro(int argc, tchar **argv, int cmd) } else { /* No image specified; default to image 1, but only if the WIM * contains exactly one image. */ - struct wimlib_wim_info info; - wimlib_get_wim_info(wim, &info); if (info.image_count != 1) { imagex_error(T("\"%"TS"\" contains %d images; Please " "select one."), wimfile, info.image_count); @@ -2969,36 +3404,28 @@ imagex_mount_rw_or_ro(int argc, tchar **argv, int cmd) dir = argv[1]; } - if (swm_glob) { - ret = open_swms_from_glob(swm_glob, wimfile, open_flags, - &additional_swms, - &num_additional_swms); + if (refglobs.num_strings) { + ret = wim_reference_globs(wim, &refglobs, open_flags); if (ret) goto out_free_wim; - } else { - additional_swms = NULL; - num_additional_swms = 0; } - ret = wimlib_mount_image(wim, image, dir, mount_flags, additional_swms, - num_additional_swms, staging_dir); + 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); } - for (unsigned i = 0; i < num_additional_swms; i++) - wimlib_free(additional_swms[i]); - free(additional_swms); out_free_wim: wimlib_free(wim); -out: +out_free_refglobs: + string_set_destroy(&refglobs); return ret; out_usage: usage(cmd, stderr); ret = -1; - goto out; + goto out_free_refglobs; } #endif /* WIM_MOUNTING_SUPPORTED */ @@ -3009,6 +3436,10 @@ imagex_optimize(int argc, tchar **argv, int cmd) int c; int open_flags = WIMLIB_OPEN_FLAG_WRITE_ACCESS; int write_flags = WIMLIB_WRITE_FLAG_REBUILD; + int compression_type = WIMLIB_COMPRESSION_TYPE_INVALID; + uint32_t chunk_size = UINT32_MAX; + uint32_t pack_chunk_size = UINT32_MAX; + int pack_ctype = WIMLIB_COMPRESSION_TYPE_INVALID; int ret; WIMStruct *wim; const tchar *wimfile; @@ -3025,9 +3456,38 @@ imagex_optimize(int argc, tchar **argv, int cmd) case IMAGEX_NOCHECK_OPTION: write_flags |= WIMLIB_WRITE_FLAG_NO_CHECK_INTEGRITY; break; + case IMAGEX_COMPRESS_OPTION: + write_flags |= WIMLIB_WRITE_FLAG_RECOMPRESS; + compression_type = get_compression_type(optarg); + if (compression_type == WIMLIB_COMPRESSION_TYPE_INVALID) + goto out_err; + break; case IMAGEX_RECOMPRESS_OPTION: write_flags |= WIMLIB_WRITE_FLAG_RECOMPRESS; break; + case IMAGEX_COMPRESS_SLOW_OPTION: + write_flags |= WIMLIB_WRITE_FLAG_RECOMPRESS; + set_compress_slow(); + break; + case IMAGEX_CHUNK_SIZE_OPTION: + chunk_size = parse_chunk_size(optarg); + if (chunk_size == UINT32_MAX) + goto out_err; + break; + case IMAGEX_PACK_CHUNK_SIZE_OPTION: + pack_chunk_size = parse_chunk_size(optarg); + if (pack_chunk_size == UINT32_MAX) + goto out_err; + break; + case IMAGEX_PACK_COMPRESS_OPTION: + pack_ctype = get_compression_type(optarg); + if (pack_ctype == WIMLIB_COMPRESSION_TYPE_INVALID) + goto out_err; + break; + case IMAGEX_PACK_STREAMS_OPTION: + write_flags |= WIMLIB_WRITE_FLAG_PACK_STREAMS; + write_flags |= WIMLIB_WRITE_FLAG_RECOMPRESS; + break; case IMAGEX_THREADS_OPTION: num_threads = parse_num_threads(optarg); if (num_threads == UINT_MAX) @@ -3051,10 +3511,35 @@ 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; + if (compression_type != WIMLIB_COMPRESSION_TYPE_INVALID) { + /* Change compression type. */ + ret = wimlib_set_output_compression_type(wim, compression_type); + if (ret) + goto out_wimlib_free; + } + + if (chunk_size != UINT32_MAX) { + /* Change chunk size. */ + ret = wimlib_set_output_chunk_size(wim, chunk_size); + if (ret) + goto out_wimlib_free; + } + if (pack_ctype != WIMLIB_COMPRESSION_TYPE_INVALID) { + ret = wimlib_set_output_pack_compression_type(wim, pack_ctype); + if (ret) + goto out_wimlib_free; + } + if (pack_chunk_size != UINT32_MAX) { + ret = wimlib_set_output_pack_chunk_size(wim, pack_chunk_size); + if (ret) + goto out_wimlib_free; + } + old_size = file_get_size(wimfile); tprintf(T("\"%"TS"\" original size: "), wimfile); if (old_size == -1) @@ -3062,8 +3547,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; @@ -3131,11 +3615,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; @@ -3170,6 +3655,9 @@ imagex_unmount(int argc, tchar **argv, int cmd) case IMAGEX_LAZY_OPTION: unmount_flags |= WIMLIB_UNMOUNT_FLAG_LAZY; break; + case IMAGEX_NEW_IMAGE_OPTION: + unmount_flags |= WIMLIB_UNMOUNT_FLAG_NEW_IMAGE; + break; default: goto out_usage; } @@ -3179,8 +3667,17 @@ 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 (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; + } + imagex_printf(T("Committing changes as new image...\n")); + } + + 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]); out: @@ -3188,6 +3685,7 @@ out: out_usage: usage(CMD_UNMOUNT, stderr); +out_err: ret = -1; goto out; } @@ -3206,7 +3704,9 @@ imagex_update(int argc, tchar **argv, int cmd) int open_flags = WIMLIB_OPEN_FLAG_WRITE_ACCESS; int write_flags = 0; int update_flags = WIMLIB_UPDATE_FLAG_SEND_PROGRESS; - int default_add_flags = WIMLIB_ADD_IMAGE_FLAG_EXCLUDE_VERBOSE; + int default_add_flags = WIMLIB_ADD_FLAG_EXCLUDE_VERBOSE | + WIMLIB_ADD_FLAG_VERBOSE | + WIMLIB_ADD_FLAG_WINCONFIG; int default_delete_flags = 0; unsigned num_threads = 0; int c; @@ -3215,10 +3715,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) { @@ -3249,6 +3747,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; @@ -3259,24 +3760,28 @@ imagex_update(int argc, tchar **argv, int cmd) /* Global add option */ case IMAGEX_CONFIG_OPTION: + default_add_flags &= ~WIMLIB_ADD_FLAG_WINCONFIG; config_file = optarg; break; /* Default add options */ case IMAGEX_VERBOSE_OPTION: - default_add_flags |= WIMLIB_ADD_IMAGE_FLAG_VERBOSE; + /* No longer does anything. */ break; case IMAGEX_DEREFERENCE_OPTION: - default_add_flags |= WIMLIB_ADD_IMAGE_FLAG_DEREFERENCE; + default_add_flags |= WIMLIB_ADD_FLAG_DEREFERENCE; break; case IMAGEX_UNIX_DATA_OPTION: - default_add_flags |= WIMLIB_ADD_IMAGE_FLAG_UNIX_DATA; + default_add_flags |= WIMLIB_ADD_FLAG_UNIX_DATA; break; case IMAGEX_NO_ACLS_OPTION: - default_add_flags |= WIMLIB_ADD_IMAGE_FLAG_NO_ACLS; + default_add_flags |= WIMLIB_ADD_FLAG_NO_ACLS; break; case IMAGEX_STRICT_ACLS_OPTION: - default_add_flags |= WIMLIB_ADD_IMAGE_FLAG_STRICT_ACLS; + default_add_flags |= WIMLIB_ADD_FLAG_STRICT_ACLS; + break; + case IMAGEX_NO_REPLACE_OPTION: + default_add_flags |= WIMLIB_ADD_FLAG_NO_REPLACE; break; default: goto out_usage; @@ -3289,7 +3794,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; @@ -3315,31 +3821,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 = &default_capture_config; - } - /* 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); @@ -3347,29 +3839,31 @@ 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 */ - bool have_add_command = false; for (size_t i = 0; i < num_cmds; i++) { switch (cmds[i].op) { case WIMLIB_UPDATE_OP_ADD: cmds[i].add.add_flags |= default_add_flags; - cmds[i].add.config = config; - have_add_command = true; + cmds[i].add.config_file = config_file; break; case WIMLIB_UPDATE_OP_DELETE: - cmds[i].delete.delete_flags |= default_delete_flags; + cmds[i].delete_.delete_flags |= default_delete_flags; break; default: break; @@ -3377,24 +3871,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 != &default_capture_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: @@ -3442,38 +3945,37 @@ static const tchar *usage_strings[] = { T( " %"TS" (DIRECTORY | NTFS_VOLUME) WIMFILE\n" " [IMAGE_NAME [IMAGE_DESCRIPTION]] [--boot] [--check]\n" -" [--nocheck] [--flags EDITION_ID] [--verbose]\n" -" [--dereference] [--config=FILE] [--threads=NUM_THREADS]\n" -" [--rebuild] [--unix-data] [--source-list] [--no-acls]\n" -" [--strict-acls] [--rpfix] [--norpfix] [--pipable]\n" -" [--not-pipable]\n" +" [--nocheck] [--flags EDITION_ID] [--dereference]\n" +" [--config=FILE] [--threads=NUM_THREADS] [--source-list]\n" +" [--no-acls] [--strict-acls] [--rpfix] [--norpfix]\n" +" [--update-of=[WIMFILE:]IMAGE] [--wimboot]\n" ), [CMD_APPLY] = T( " %"TS" WIMFILE [(IMAGE_NUM | IMAGE_NAME | all)]\n" -" (DIRECTORY | NTFS_VOLUME) [--check] [--hardlink]\n" -" [--symlink] [--verbose] [--ref=\"GLOB\"] [--unix-data]\n" -" [--no-acls] [--strict-acls] [--rpfix] [--norpfix]\n" -" [--include-invalid-names]\n" +" (DIRECTORY | NTFS_VOLUME) [--check] [--ref=\"GLOB\"]\n" +" [--no-acls] [--strict-acls] [--no-attributes]\n" +" [--rpfix] [--norpfix] [--include-invalid-names]\n" +" [--wimboot] [--unix-data]\n" ), [CMD_CAPTURE] = T( " %"TS" (DIRECTORY | NTFS_VOLUME) WIMFILE\n" " [IMAGE_NAME [IMAGE_DESCRIPTION]] [--boot] [--check]\n" " [--nocheck] [--compress=TYPE] [--flags EDITION_ID]\n" -" [--verbose] [--dereference] [--config=FILE]\n" -" [--threads=NUM_THREADS] [--unix-data] [--source-list]\n" -" [--no-acls] [--strict-acls] [--rpfix] [--norpfix]\n" -" [--pipable] [--not-pipable]\n" +" [--dereference] [--config=FILE] [--threads=NUM_THREADS]\n" +" [--source-list] [--no-acls] [--strict-acls] [--rpfix]\n" +" [--norpfix] [--update-of=[WIMFILE:]IMAGE]\n" +" [--delta-from=WIMFILE] [--wimboot] [--unix-data]\n" ), [CMD_DELETE] = T( -" %"TS" WIMFILE (IMAGE_NUM | IMAGE_NAME | all) [--check]\n" -" [--soft]\n" +" %"TS" WIMFILE (IMAGE_NUM | IMAGE_NAME | all)\n" +" [--check] [--soft]\n" ), [CMD_DIR] = T( -" %"TS" WIMFILE (IMAGE_NUM | IMAGE_NAME | all) [--path=PATH]\n" +" %"TS" WIMFILE (IMAGE_NUM | IMAGE_NAME | all) [--path=PATH] [--detailed]\n" ), [CMD_EXPORT] = T( @@ -3481,21 +3983,20 @@ T( " DEST_WIMFILE [DEST_IMAGE_NAME [DEST_IMAGE_DESCRIPTION]]\n" " [--boot] [--check] [--nocheck] [--compress=TYPE]\n" " [--ref=\"GLOB\"] [--threads=NUM_THREADS] [--rebuild]\n" -" [--pipable] [--not-pipable]\n" ), [CMD_EXTRACT] = T( -" %"TS" WIMFILE (IMAGE_NUM | IMAGE_NAME) [PATH...]\n" -" [--check] [--ref=\"GLOB\"] [--verbose] [--unix-data]\n" -" [--no-acls] [--strict-acls] [--to-stdout]\n" -" [--dest-dir=CMD_DIR] [--include-invalid-names]\n" +" %"TS" WIMFILE (IMAGE_NUM | IMAGE_NAME) [(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-wildcards] [--nullglob] [--preserve-dir-structure]\n" ), [CMD_INFO] = T( " %"TS" WIMFILE [(IMAGE_NUM | IMAGE_NAME) [NEW_NAME\n" -" [NEW_DESC]]] [--boot] [--check] [--nocheck] [--header]\n" -" [--lookup-table] [--xml] [--extract-xml FILE]\n" -" [--metadata]\n" +" [NEW_DESC]]] [--boot] [--check] [--nocheck] [--xml]\n" +" [--extract-xml FILE] [--header] [--lookup-table]\n" ), [CMD_JOIN] = T( @@ -3505,20 +4006,21 @@ T( [CMD_MOUNT] = T( " %"TS" WIMFILE [(IMAGE_NUM | IMAGE_NAME)] DIRECTORY\n" -" [--check] [--debug] [--streams-interface=INTERFACE]\n" -" [--ref=\"GLOB\"] [--unix-data] [--allow-other]\n" +" [--check] [--streams-interface=INTERFACE]\n" +" [--ref=\"GLOB\"] [--allow-other] [--unix-data]\n" ), [CMD_MOUNTRW] = T( " %"TS" WIMFILE [(IMAGE_NUM | IMAGE_NAME)] DIRECTORY\n" -" [--check] [--debug] [--streams-interface=INTERFACE]\n" -" [--staging-dir=CMD_DIR] [--unix-data] [--allow-other]\n" +" [--check] [--streams-interface=INTERFACE]\n" +" [--staging-dir=CMD_DIR] [--allow-other] [--unix-data]\n" ), #endif [CMD_OPTIMIZE] = T( " %"TS" WIMFILE [--check] [--nocheck] [--recompress]\n" -" [--threads=NUM_THREADS] [--pipable] [--not-pipable]\n" +" [--recompress-slow] [--compress=TYPE]\n" +" [--threads=NUM_THREADS]\n" ), [CMD_SPLIT] = T( @@ -3528,35 +4030,38 @@ T( [CMD_UNMOUNT] = T( " %"TS" DIRECTORY [--commit] [--check] [--rebuild] [--lazy]\n" +" [--new-image]\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" +" [DEFAULT_DELETE_OPTIONS] [--command=STRING]\n" +" [--wimboot-config=FILE| [< CMDFILE]\n" ), }; static const tchar *invocation_name; -static bool using_cmd_from_invocation_name = false; +static int invocation_cmd = CMD_NONE; static const tchar *get_cmd_string(int cmd, bool nospace) { - - if (using_cmd_from_invocation_name || cmd == CMD_NONE) { - return invocation_name; + static tchar buf[50]; + if (cmd == CMD_NONE) { + tsprintf(buf, T("%"TS), T(IMAGEX_PROGNAME)); + } else if (invocation_cmd != CMD_NONE) { + tsprintf(buf, T("wim%"TS), imagex_commands[cmd].name); } else { const tchar *format; - static tchar buf[50]; if (nospace) format = T("%"TS"-%"TS""); else format = T("%"TS" %"TS""); tsprintf(buf, format, invocation_name, imagex_commands[cmd].name); - return buf; } + return buf; } static void @@ -3564,8 +4069,8 @@ version(void) { static const tchar *s = T( -IMAGEX_PROGNAME " (" PACKAGE ") " PACKAGE_VERSION "\n" -"Copyright (C) 2012, 2013 Eric Biggers\n" +IMAGEX_PROGNAME " (distributed with " PACKAGE " " PACKAGE_VERSION ")\n" +"Copyright (C) 2012, 2013, 2014 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" @@ -3611,9 +4116,11 @@ recommend_man_page(int cmd, FILE *fp) { const tchar *format_str; #ifdef __WIN32__ - format_str = T("See %"TS".pdf in the doc directory for more details.\n"); + format_str = T("Uncommon options are not listed;\n" + "See %"TS".pdf in the doc directory for more details.\n"); #else - format_str = T("Try `man %"TS"' for more details.\n"); + format_str = T("Uncommon options are not listed;\n" + "Try `man %"TS"' for more details.\n"); #endif tfprintf(fp, format_str, get_cmd_string(cmd, true)); } @@ -3649,7 +4156,7 @@ usage_all(FILE *fp) /* 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__ @@ -3687,8 +4194,26 @@ main(int argc, char **argv) } } + #endif /* !__WIN32__ */ + { + tchar *igcase = tgetenv(T("WIMLIB_IMAGEX_IGNORE_CASE")); + if (igcase != NULL) { + if (!tstrcmp(igcase, T("no")) || + !tstrcmp(igcase, T("0"))) + init_flags |= WIMLIB_INIT_FLAG_DEFAULT_CASE_SENSITIVE; + else if (!tstrcmp(igcase, T("yes")) || + !tstrcmp(igcase, T("1"))) + init_flags |= WIMLIB_INIT_FLAG_DEFAULT_CASE_INSENSITIVE; + else { + fprintf(stderr, + "WARNING: Ignoring unknown setting of " + "WIMLIB_IMAGEX_IGNORE_CASE\n"); + } + } + } + /* Allow being invoked as wimCOMMAND (e.g. wimapply). */ cmd = CMD_NONE; if (!tstrncmp(invocation_name, T("wim"), 3) && @@ -3697,7 +4222,7 @@ main(int argc, char **argv) if (!tstrcmp(invocation_name + 3, imagex_commands[i].name)) { - using_cmd_from_invocation_name = true; + invocation_cmd = i; cmd = i; break; } @@ -3737,7 +4262,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);