X-Git-Url: https://wimlib.net/git/?p=wimlib;a=blobdiff_plain;f=programs%2Fimagex.c;h=2a474d7e172f6594eda8b25063490a0c500e2841;hp=f795ded78c0bd9f5de27def77750c96c78e0b93d;hb=4efdef43a8bb9e821f39572e1c9086e3f069ac7c;hpb=2850f8933244f6c63f608eec612ad804e01072e1 diff --git a/programs/imagex.c b/programs/imagex.c index f795ded7..2a474d7e 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,15 +48,12 @@ #ifdef __WIN32__ # include "imagex-win32.h" -# define tbasename win32_wbasename # define OS_PREFERRED_PATH_SEPARATOR L'\\' # define OS_PREFERRED_PATH_SEPARATOR_STRING L"\\" # define print_security_descriptor win32_print_security_descriptor #else /* __WIN32__ */ -# include # include # include -# define tbasename basename # define OS_PREFERRED_PATH_SEPARATOR '/' # define OS_PREFERRED_PATH_SEPARATOR_STRING "/" # define print_security_descriptor default_print_security_descriptor @@ -77,6 +74,34 @@ static inline void set_fd_to_binary_mode(int fd) #define ARRAY_LEN(array) (sizeof(array) / sizeof(array[0])) +static inline bool +is_any_path_separator(tchar c) +{ + return c == T('/') || c == T('\\'); +} + +/* Like basename(), but handles both forward and backwards slashes. */ +static tchar * +tbasename(tchar *path) +{ + tchar *p = tstrchr(path, T('\0')); + + for (;;) { + if (p == path) + return path; + if (!is_any_path_separator(*--p)) + break; + *p = T('\0'); + } + + for (;;) { + if (p == path) + return path; + if (is_any_path_separator(*--p)) + return ++p; + } +} + #define for_opt(c, opts) while ((c = getopt_long_only(argc, (tchar**)argv, T(""), \ opts, NULL)) != -1) @@ -142,15 +167,22 @@ enum { IMAGEX_LAZY_OPTION, IMAGEX_LOOKUP_TABLE_OPTION, IMAGEX_METADATA_OPTION, - IMAGEX_NORPFIX_OPTION, + IMAGEX_NEW_IMAGE_OPTION, IMAGEX_NOCHECK_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_NOT_PIPABLE_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, @@ -162,13 +194,14 @@ enum { IMAGEX_STAGING_DIR_OPTION, IMAGEX_STREAMS_INTERFACE_OPTION, IMAGEX_STRICT_ACLS_OPTION, - IMAGEX_STRICT_WILDCARDS_OPTION, IMAGEX_SYMLINK_OPTION, IMAGEX_THREADS_OPTION, IMAGEX_TO_STDOUT_OPTION, IMAGEX_UNIX_DATA_OPTION, IMAGEX_UPDATE_OF_OPTION, IMAGEX_VERBOSE_OPTION, + IMAGEX_WIMBOOT_OPTION, + IMAGEX_WIMBOOT_CONFIG_OPTION, IMAGEX_XML_OPTION, }; @@ -182,12 +215,14 @@ static const struct option apply_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("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}, }; @@ -201,6 +236,8 @@ static const struct option capture_or_append_options[] = { {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}, @@ -220,6 +257,7 @@ static const struct option capture_or_append_options[] = { {T("not-pipable"), no_argument, NULL, IMAGEX_NOT_PIPABLE_OPTION}, {T("update-of"), required_argument, NULL, IMAGEX_UPDATE_OF_OPTION}, {T("delta-from"), required_argument, NULL, IMAGEX_DELTA_FROM_OPTION}, + {T("wimboot"), no_argument, NULL, IMAGEX_WIMBOOT_OPTION}, {NULL, 0, NULL, 0}, }; @@ -232,6 +270,7 @@ static const struct option delete_options[] = { static const struct option dir_options[] = { {T("path"), required_argument, NULL, IMAGEX_PATH_OPTION}, {T("detailed"), no_argument, NULL, IMAGEX_DETAILED_OPTION}, + {T("one-file-only"), no_argument, NULL, IMAGEX_ONE_FILE_ONLY_OPTION}, {NULL, 0, NULL, 0}, }; @@ -241,11 +280,14 @@ 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}, @@ -262,11 +304,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("strict-wildcards"), no_argument, NULL, IMAGEX_STRICT_WILDCARDS_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}, }; @@ -310,6 +355,8 @@ static const struct option optimize_options[] = { {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}, @@ -328,6 +375,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}, }; @@ -340,6 +388,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}, @@ -355,6 +404,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}, }; @@ -679,7 +729,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; @@ -777,144 +827,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) @@ -1245,16 +1157,14 @@ imagex_progress_func(enum wimlib_progress_msg msg, info->extract.target); break; case WIMLIB_PROGRESS_MSG_EXTRACT_TREE_BEGIN: - if (info->extract.extract_root_wim_source_path[0] != T('\0')) { - imagex_printf(T("Extracting " - "\""WIMLIB_WIM_PATH_SEPARATOR_STRING"%"TS"\" " - "from image %d (\"%"TS"\") " - "in \"%"TS"\" to \"%"TS"\"\n"), - info->extract.extract_root_wim_source_path, - info->extract.image, - info->extract.image_name, - info->extract.wimfile_name, - info->extract.target); + if (info->extract.extract_root_wim_source_path[0]) { + imagex_printf(T("Extracting \"%"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_STREAMS: @@ -1329,6 +1239,10 @@ 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; default: break; } @@ -1392,6 +1306,8 @@ update_command_add_option(int op, const tchar *option, cmd->add.add_flags |= WIMLIB_ADD_FLAG_STRICT_ACLS; else if (!tstrcmp(option, T("--dereference"))) cmd->add.add_flags |= WIMLIB_ADD_FLAG_DEREFERENCE; + else if (!tstrcmp(option, T("--no-replace"))) + cmd->add.add_flags |= WIMLIB_ADD_FLAG_NO_REPLACE; else recognized = false; break; @@ -1570,7 +1486,7 @@ 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 +/* Apply one image, or all images, from a WIM file to a directory, OR apply * one image from a WIM file to a NTFS volume. */ static int imagex_apply(int argc, tchar **argv, int cmd) @@ -1616,6 +1532,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; @@ -1629,6 +1548,9 @@ imagex_apply(int argc, tchar **argv, int cmd) 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; } @@ -1763,6 +1685,7 @@ imagex_capture_or_append(int argc, tchar **argv, int cmd) 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; @@ -1784,9 +1707,7 @@ imagex_capture_or_append(int argc, tchar **argv, int cmd) tchar *source; tchar *source_copy; - const tchar *config_file = NULL; - tchar *config_str; - struct wimlib_capture_config *config; + tchar *config_file = NULL; bool source_list = false; size_t source_list_nchars = 0; @@ -1831,6 +1752,11 @@ imagex_capture_or_append(int argc, tchar **argv, int cmd) 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; @@ -1905,6 +1831,9 @@ imagex_capture_or_append(int argc, tchar **argv, int cmd) 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; } @@ -1922,16 +1851,19 @@ imagex_capture_or_append(int argc, tchar **argv, int cmd) if (compression_type == WIMLIB_COMPRESSION_TYPE_INVALID) { - compression_type = WIMLIB_COMPRESSION_TYPE_LZX; - - if (!compress_slow) { - 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 (add_image_flags & WIMLIB_ADD_IMAGE_FLAG_WIMBOOT) { + compression_type = WIMLIB_COMPRESSION_TYPE_XPRESS; + } else { + 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); + } } } @@ -2042,27 +1974,6 @@ imagex_capture_or_append(int argc, tchar **argv, int cmd) source_list_contents = NULL; } - if (config_file) { - /* Read and parse capture configuration file. */ - size_t config_len; - - config_str = file_get_text_contents(config_file, &config_len); - if (!config_str) { - ret = -1; - goto out_free_capture_sources; - } - - config = alloca(sizeof(*config)); - ret = parse_capture_config(&config_str, config_len, config); - if (ret) - goto out_free_config; - } else { - /* No capture configuration file specified; use default - * configuration for capturing Windows operating systems. */ - config = NULL; - add_image_flags |= WIMLIB_ADD_FLAG_WINCONFIG; - } - /* Open the existing WIM, or create a new one. */ if (cmd == CMD_APPEND) ret = wimlib_open_wim(wimfile, open_flags, &wim, @@ -2070,13 +1981,23 @@ imagex_capture_or_append(int argc, tchar **argv, int cmd) else ret = wimlib_create_new_wim(compression_type, &wim); if (ret) - goto out_free_config; + goto out_free_capture_sources; /* 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); @@ -2205,7 +2126,7 @@ imagex_capture_or_append(int argc, tchar **argv, int cmd) capture_sources, num_sources, name, - config, + config_file, add_image_flags, imagex_progress_func); if (ret) @@ -2275,12 +2196,6 @@ out_free_base_wims: free(base_wims); out_free_wim: wimlib_free(wim); -out_free_config: - if (config) { - free(config->exclusion_pats.pats); - free(config->exclusion_exception_pats.pats); - free(config_str); - } out_free_capture_sources: if (capture_sources_malloced) free(capture_sources); @@ -2584,6 +2499,7 @@ imagex_dir(int argc, tchar **argv, int cmd) struct print_dentry_options options = { .detailed = false, }; + int iterate_flags = WIMLIB_ITERATE_DIR_TREE_FLAG_RECURSIVE; for_opt(c, dir_options) { switch (c) { @@ -2593,6 +2509,9 @@ imagex_dir(int argc, tchar **argv, int cmd) 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; } @@ -2636,8 +2555,7 @@ imagex_dir(int argc, tchar **argv, int cmd) image = 1; } - ret = wimlib_iterate_dir_tree(wim, image, path, - WIMLIB_ITERATE_DIR_TREE_FLAG_RECURSIVE, + ret = wimlib_iterate_dir_tree(wim, image, path, iterate_flags, print_dentry, &options); out_wimlib_free: wimlib_free(wim); @@ -2677,6 +2595,7 @@ imagex_export(int argc, tchar **argv, int cmd) 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) { @@ -2695,6 +2614,10 @@ 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; @@ -2708,6 +2631,11 @@ imagex_export(int argc, tchar **argv, int cmd) 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: ret = string_set_append(&refglobs, optarg); if (ret) @@ -2837,6 +2765,11 @@ imagex_export(int argc, tchar **argv, int cmd) if (ret) goto out_free_dest_wim; } + if (pack_ctype != WIMLIB_COMPRESSION_TYPE_INVALID) { + ret = wimlib_set_output_pack_compression_type(dest_wim, pack_ctype); + if (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) @@ -2899,67 +2832,6 @@ out_err: goto out_free_refglobs; } -static bool -is_root_wim_path(const tchar *path) -{ - const tchar *p; - for (p = path; *p; p++) - if (*p != T('\\') && *p != T('/')) - return false; - return true; -} - -static void -free_extract_commands(struct wimlib_extract_command *cmds, size_t num_cmds, - const tchar *dest_dir) -{ - for (size_t i = 0; i < num_cmds; i++) - if (cmds[i].fs_dest_path != dest_dir) - free(cmds[i].fs_dest_path); - free(cmds); -} - -static struct wimlib_extract_command * -prepare_extract_commands(tchar **paths, unsigned num_paths, - int extract_flags, tchar *dest_dir, - size_t *num_cmds_ret) -{ - struct wimlib_extract_command *cmds; - size_t num_cmds; - tchar *emptystr = T(""); - - if (num_paths == 0) { - num_paths = 1; - paths = &emptystr; - } - num_cmds = num_paths; - cmds = calloc(num_cmds, sizeof(cmds[0])); - if (!cmds) { - imagex_error(T("Out of memory!")); - return NULL; - } - - for (size_t i = 0; i < num_cmds; i++) { - cmds[i].extract_flags = extract_flags; - cmds[i].wim_source_path = paths[i]; - if (is_root_wim_path(paths[i])) { - cmds[i].fs_dest_path = dest_dir; - } else { - size_t len = tstrlen(dest_dir) + 1 + tstrlen(paths[i]); - cmds[i].fs_dest_path = malloc((len + 1) * sizeof(tchar)); - if (!cmds[i].fs_dest_path) { - free_extract_commands(cmds, num_cmds, dest_dir); - return NULL; - } - tsprintf(cmds[i].fs_dest_path, - T("%"TS""OS_PREFERRED_PATH_SEPARATOR_STRING"%"TS), - dest_dir, tbasename(paths[i])); - } - } - *num_cmds_ret = num_cmds; - return cmds; -} - /* Extract files or directories from a WIM image */ static int imagex_extract(int argc, tchar **argv, int cmd) @@ -2971,15 +2843,15 @@ imagex_extract(int argc, tchar **argv, int cmd) int ret; const tchar *wimfile; const tchar *image_num_or_name; - const tchar *pathlist; tchar *dest_dir = T("."); - int extract_flags = WIMLIB_EXTRACT_FLAG_NORPFIX; - int listfile_extract_flags = WIMLIB_EXTRACT_FLAG_GLOB_PATHS; + int extract_flags = WIMLIB_EXTRACT_FLAG_NORPFIX | + WIMLIB_EXTRACT_FLAG_GLOB_PATHS | + WIMLIB_EXTRACT_FLAG_STRICT_GLOB; + int notlist_extract_flags = WIMLIB_EXTRACT_FLAG_NO_PRESERVE_DIR_STRUCTURE; STRING_SET(refglobs); - struct wimlib_extract_command *cmds; - size_t num_cmds; + tchar *root_path = T(""); for_opt(c, extract_options) { switch (c) { @@ -3003,6 +2875,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; @@ -3016,10 +2891,16 @@ imagex_extract(int argc, tchar **argv, int cmd) extract_flags |= WIMLIB_EXTRACT_FLAG_ALL_CASE_CONFLICTS; break; case IMAGEX_NO_WILDCARDS_OPTION: - listfile_extract_flags &= ~WIMLIB_EXTRACT_FLAG_GLOB_PATHS; + extract_flags &= ~WIMLIB_EXTRACT_FLAG_GLOB_PATHS; break; - case IMAGEX_STRICT_WILDCARDS_OPTION: - listfile_extract_flags |= WIMLIB_EXTRACT_FLAG_STRICT_GLOB; + 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; @@ -3031,27 +2912,22 @@ 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; - if (argc == 1 && argv[0][0] == T('@')) { - pathlist = argv[0] + 1; - cmds = NULL; - num_cmds = 0; - } else { - cmds = prepare_extract_commands(argv, argc, extract_flags, dest_dir, - &num_cmds); - if (cmds == NULL) - goto out_err; - pathlist = NULL; - } - ret = wimlib_open_wim(wimfile, open_flags, &wim, imagex_progress_func); 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, @@ -3066,17 +2942,38 @@ imagex_extract(int argc, tchar **argv, int cmd) goto out_wimlib_free; } - ret = 0; - if (ret == 0 && cmds != NULL) { - ret = wimlib_extract_files(wim, image, cmds, num_cmds, 0, - imagex_progress_func); + if (argc == 0) { + argv = &root_path; + argc = 1; + extract_flags &= ~WIMLIB_EXTRACT_FLAG_GLOB_PATHS; } - if (ret == 0 && pathlist != NULL) { - ret = wimlib_extract_pathlist(wim, image, dest_dir, - pathlist, - extract_flags | listfile_extract_flags, - imagex_progress_func); + + while (argc != 0 && ret == 0) { + int num_paths; + + for (num_paths = 0; + num_paths < argc && argv[num_paths][0] != T('@'); + num_paths++) + ; + + if (num_paths) { + ret = wimlib_extract_paths(wim, image, dest_dir, + (const tchar **)argv, + num_paths, + extract_flags | notlist_extract_flags, + imagex_progress_func); + argc -= num_paths; + argv += num_paths; + } else { + ret = wimlib_extract_pathlist(wim, image, dest_dir, + argv[0] + 1, + extract_flags, + imagex_progress_func); + argc--; + argv++; + } } + if (ret == 0) { if (!imagex_be_quiet) imagex_printf(T("Done extracting files.\n")); @@ -3093,8 +2990,6 @@ imagex_extract(int argc, tchar **argv, int cmd) } out_wimlib_free: wimlib_free(wim); -out_free_cmds: - free_extract_commands(cmds, num_cmds, dest_dir); out_free_refglobs: string_set_destroy(&refglobs); return ret; @@ -3551,6 +3446,7 @@ imagex_optimize(int argc, tchar **argv, int cmd) 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; @@ -3590,6 +3486,11 @@ imagex_optimize(int argc, tchar **argv, int cmd) 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; @@ -3634,6 +3535,11 @@ imagex_optimize(int argc, tchar **argv, int cmd) if (ret) goto out_wimlib_free; } + if (pack_ctype != WIMLIB_COMPRESSION_TYPE_INVALID) { + ret = wimlib_set_output_pack_compression_type(wim, pack_ctype); + if (ret) + goto out_wimlib_free; + } if (pack_chunk_size != UINT32_MAX) { ret = wimlib_set_output_pack_chunk_size(wim, pack_chunk_size); if (ret) @@ -3755,6 +3661,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; } @@ -3764,6 +3673,15 @@ imagex_unmount(int argc, tchar **argv, int cmd) if (argc != 1) goto out_usage; + 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(argv[0], unmount_flags, imagex_progress_func); if (ret) @@ -3773,6 +3691,7 @@ out: out_usage: usage(CMD_UNMOUNT, stderr); +out_err: ret = -1; goto out; } @@ -3792,7 +3711,8 @@ imagex_update(int argc, tchar **argv, int cmd) int write_flags = 0; int update_flags = WIMLIB_UPDATE_FLAG_SEND_PROGRESS; int default_add_flags = WIMLIB_ADD_FLAG_EXCLUDE_VERBOSE | - WIMLIB_ADD_FLAG_VERBOSE; + WIMLIB_ADD_FLAG_VERBOSE | + WIMLIB_ADD_FLAG_WINCONFIG; int default_delete_flags = 0; unsigned num_threads = 0; int c; @@ -3801,10 +3721,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) { @@ -3835,6 +3753,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; @@ -3865,6 +3786,9 @@ imagex_update(int argc, tchar **argv, int cmd) case IMAGEX_STRICT_ACLS_OPTION: default_add_flags |= WIMLIB_ADD_FLAG_STRICT_ACLS; break; + case IMAGEX_NO_REPLACE_OPTION: + default_add_flags |= WIMLIB_ADD_FLAG_NO_REPLACE; + break; default: goto out_usage; } @@ -3902,32 +3826,17 @@ imagex_update(int argc, tchar **argv, int cmd) image = 1; } - /* Parse capture configuration file if specified */ - if (config_file) { - size_t config_len; - - config_str = file_get_text_contents(config_file, &config_len); - if (!config_str) { - ret = -1; - goto out_wimlib_free; - } - - config = alloca(sizeof(*config)); - ret = parse_capture_config(&config_str, config_len, config); - if (ret) - goto out_free_config; - } else { - config = NULL; - default_add_flags |= WIMLIB_ADD_FLAG_WINCONFIG; - } - /* Read update commands from standard input, or the command string if * specified. */ if (command_str) { cmd_file_contents = NULL; cmds = parse_update_command_file(&command_str, tstrlen(command_str), &num_cmds); - } else { + if (!cmds) { + ret = -1; + goto out_free_cmd_file_contents; + } + } else if (!wimboot_config) { if (isatty(STDIN_FILENO)) { tputs(T("Reading update commands from standard input...")); recommend_man_page(CMD_UPDATE, stdout); @@ -3935,16 +3844,20 @@ imagex_update(int argc, tchar **argv, int cmd) cmd_file_contents = stdin_get_text_contents(&cmd_file_nchars); if (!cmd_file_contents) { ret = -1; - goto out_free_config; + goto out_wimlib_free; } /* Parse the update commands */ cmds = parse_update_command_file(&cmd_file_contents, cmd_file_nchars, &num_cmds); - } - if (!cmds) { - ret = -1; - goto out_free_cmd_file_contents; + if (!cmds) { + ret = -1; + goto out_free_cmd_file_contents; + } + } else { + cmd_file_contents = NULL; + cmds = NULL; + num_cmds = 0; } /* Set default flags and capture config on the update commands */ @@ -3952,7 +3865,7 @@ imagex_update(int argc, tchar **argv, int cmd) switch (cmds[i].op) { case WIMLIB_UPDATE_OP_ADD: cmds[i].add.add_flags |= default_add_flags; - cmds[i].add.config = config; + cmds[i].add.config_file = config_file; break; case WIMLIB_UPDATE_OP_DELETE: cmds[i].delete_.delete_flags |= default_delete_flags; @@ -3968,6 +3881,26 @@ imagex_update(int argc, tchar **argv, int cmd) 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 = { + .op = WIMLIB_UPDATE_OP_ADD, + .add = { + .fs_source_path = wimboot_config, + .wim_target_path = + T("/Windows/System32/WimBootCompress.ini"), + .config_file = NULL, + .add_flags = 0, + }, + }; + ret = wimlib_update_image(wim, image, &cmd, 1, + update_flags, imagex_progress_func); + if (ret) + goto out_free_cmds; + } + /* Overwrite the updated WIM */ ret = wimlib_overwrite(wim, write_flags, num_threads, imagex_progress_func); @@ -3975,12 +3908,6 @@ out_free_cmds: free(cmds); out_free_cmd_file_contents: free(cmd_file_contents); -out_free_config: - if (config) { - free(config->exclusion_pats.pats); - free(config->exclusion_exception_pats.pats); - free(config_str); - } out_wimlib_free: wimlib_free(wim); out_free_command_str: @@ -4031,14 +3958,15 @@ T( " [--nocheck] [--flags EDITION_ID] [--dereference]\n" " [--config=FILE] [--threads=NUM_THREADS] [--source-list]\n" " [--no-acls] [--strict-acls] [--rpfix] [--norpfix]\n" -" [--update-of=[WIMFILE:]IMAGE]\n" +" [--update-of=[WIMFILE:]IMAGE] [--wimboot]\n" ), [CMD_APPLY] = T( " %"TS" WIMFILE [(IMAGE_NUM | IMAGE_NAME | all)]\n" " (DIRECTORY | NTFS_VOLUME) [--check] [--ref=\"GLOB\"]\n" -" [--no-acls] [--strict-acls] [--rpfix] [--norpfix]\n" -" [--hardlink] [--symlink] [--include-invalid-names]\n" +" [--no-acls] [--strict-acls] [--no-attributes]\n" +" [--rpfix] [--norpfix] [--hardlink] [--symlink]\n" +" [--include-invalid-names] [--wimboot]\n" ), [CMD_CAPTURE] = T( @@ -4048,7 +3976,7 @@ T( " [--dereference] [--config=FILE] [--threads=NUM_THREADS]\n" " [--source-list] [--no-acls] [--strict-acls] [--rpfix]\n" " [--norpfix] [--update-of=[WIMFILE:]IMAGE]\n" -" [--delta-from=WIMFILE]\n" +" [--delta-from=WIMFILE] [--wimboot]\n" ), [CMD_DELETE] = T( @@ -4068,10 +3996,11 @@ T( ), [CMD_EXTRACT] = T( -" %"TS" WIMFILE (IMAGE_NUM | IMAGE_NAME) ([PATH...] | @LISTFILE)\n" -" [--check] [--ref=\"GLOB\"] [--no-acls] [--strict-acls]\n" -" [--to-stdout] [--dest-dir=CMD_DIR]\n" -" [--include-invalid-names]\n" +" %"TS" WIMFILE (IMAGE_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( @@ -4111,13 +4040,15 @@ 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" ), }; @@ -4148,8 +4079,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" @@ -4341,7 +4272,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);