X-Git-Url: https://wimlib.net/git/?p=wimlib;a=blobdiff_plain;f=programs%2Fimagex.c;h=556006f6e82b4ea61551c805aa6b2bd9b0919c48;hp=81771898906b3a6566d0ca7134cb97a7c33aafda;hb=8b709192cd2811b83c248fbe61ca4f11ee9de797;hpb=269f10a27c62027d48c0ba58f164d20e3bf3cf85 diff --git a/programs/imagex.c b/programs/imagex.c index 81771898..556006f6 100644 --- a/programs/imagex.c +++ b/programs/imagex.c @@ -6,7 +6,7 @@ */ /* - * Copyright (C) 2012, 2013, 2014 Eric Biggers + * Copyright (C) 2012, 2013, 2014, 2015 Eric Biggers * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -46,16 +46,14 @@ # include #endif +#define WIMLIB_COMPRESSION_TYPE_INVALID (-1) + #ifdef __WIN32__ # include "imagex-win32.h" -# 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 -# 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) { @@ -126,6 +124,7 @@ enum { CMD_UNMOUNT, #endif CMD_UPDATE, + CMD_VERIFY, CMD_MAX, }; @@ -134,9 +133,6 @@ static void usage_all(FILE *fp); static void recommend_man_page(int cmd, FILE *fp); static const tchar *get_cmd_string(int cmd, bool nospace); -static int imagex_progress_func(enum wimlib_progress_msg msg, - const union wimlib_progress_info *info); - static bool imagex_be_quiet = false; static FILE *imagex_info_file; @@ -145,11 +141,13 @@ static FILE *imagex_info_file; enum { IMAGEX_ALLOW_OTHER_OPTION, + IMAGEX_BLOBS_OPTION, IMAGEX_BOOT_OPTION, IMAGEX_CHECK_OPTION, IMAGEX_CHUNK_SIZE_OPTION, IMAGEX_COMMAND_OPTION, IMAGEX_COMMIT_OPTION, + IMAGEX_COMPACT_OPTION, IMAGEX_COMPRESS_OPTION, IMAGEX_COMPRESS_SLOW_OPTION, IMAGEX_CONFIG_OPTION, @@ -161,11 +159,9 @@ enum { 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_NEW_IMAGE_OPTION, IMAGEX_NOCHECK_OPTION, @@ -173,12 +169,11 @@ enum { IMAGEX_NOT_PIPABLE_OPTION, IMAGEX_NO_ACLS_OPTION, IMAGEX_NO_ATTRIBUTES_OPTION, - IMAGEX_NO_WILDCARDS_OPTION, + IMAGEX_NO_GLOBS_OPTION, + IMAGEX_NO_REPLACE_OPTION, + IMAGEX_NO_SOLID_SORT_OPTION, IMAGEX_NULLGLOB_OPTION, IMAGEX_ONE_FILE_ONLY_OPTION, - IMAGEX_PACK_CHUNK_SIZE_OPTION, - IMAGEX_PACK_COMPRESS_OPTION, - IMAGEX_PACK_STREAMS_OPTION, IMAGEX_PATH_OPTION, IMAGEX_PIPABLE_OPTION, IMAGEX_PRESERVE_DIR_STRUCTURE_OPTION, @@ -189,24 +184,25 @@ enum { IMAGEX_RESUME_OPTION, IMAGEX_RPFIX_OPTION, IMAGEX_SOFT_OPTION, + IMAGEX_SOLID_CHUNK_SIZE_OPTION, + IMAGEX_SOLID_COMPRESS_OPTION, + IMAGEX_SOLID_OPTION, IMAGEX_SOURCE_LIST_OPTION, IMAGEX_STAGING_DIR_OPTION, IMAGEX_STREAMS_INTERFACE_OPTION, IMAGEX_STRICT_ACLS_OPTION, - IMAGEX_SYMLINK_OPTION, IMAGEX_THREADS_OPTION, IMAGEX_TO_STDOUT_OPTION, IMAGEX_UNIX_DATA_OPTION, IMAGEX_UPDATE_OF_OPTION, IMAGEX_VERBOSE_OPTION, + IMAGEX_WIMBOOT_CONFIG_OPTION, IMAGEX_WIMBOOT_OPTION, IMAGEX_XML_OPTION, }; static const struct option apply_options[] = { {T("check"), no_argument, NULL, IMAGEX_CHECK_OPTION}, - {T("hardlink"), no_argument, NULL, IMAGEX_HARDLINK_OPTION}, - {T("symlink"), no_argument, NULL, IMAGEX_SYMLINK_OPTION}, {T("verbose"), no_argument, NULL, IMAGEX_VERBOSE_OPTION}, {T("ref"), required_argument, NULL, IMAGEX_REF_OPTION}, {T("unix-data"), no_argument, NULL, IMAGEX_UNIX_DATA_OPTION}, @@ -221,6 +217,7 @@ static const struct option apply_options[] = { /* --resume is undocumented for now as it needs improvement. */ {T("resume"), no_argument, NULL, IMAGEX_RESUME_OPTION}, {T("wimboot"), no_argument, NULL, IMAGEX_WIMBOOT_OPTION}, + {T("compact"), required_argument, NULL, IMAGEX_COMPACT_OPTION}, {NULL, 0, NULL, 0}, }; @@ -232,12 +229,13 @@ static const struct option capture_or_append_options[] = { {T("compress"), required_argument, NULL, IMAGEX_COMPRESS_OPTION}, {T("compress-slow"), no_argument, NULL, IMAGEX_COMPRESS_SLOW_OPTION}, {T("chunk-size"), required_argument, NULL, IMAGEX_CHUNK_SIZE_OPTION}, - {T("pack-chunk-size"), required_argument, NULL, IMAGEX_PACK_CHUNK_SIZE_OPTION}, - {T("solid-chunk-size"),required_argument, NULL, IMAGEX_PACK_CHUNK_SIZE_OPTION}, - {T("pack-compress"), required_argument, NULL, IMAGEX_PACK_COMPRESS_OPTION}, - {T("solid-compress"),required_argument, NULL, IMAGEX_PACK_COMPRESS_OPTION}, - {T("pack-streams"), no_argument, NULL, IMAGEX_PACK_STREAMS_OPTION}, - {T("solid"), no_argument, NULL, IMAGEX_PACK_STREAMS_OPTION}, + {T("solid"), no_argument, NULL, IMAGEX_SOLID_OPTION}, + {T("pack-streams"), no_argument, NULL, IMAGEX_SOLID_OPTION}, + {T("solid-compress"),required_argument, NULL, IMAGEX_SOLID_COMPRESS_OPTION}, + {T("pack-compress"), required_argument, NULL, IMAGEX_SOLID_COMPRESS_OPTION}, + {T("solid-chunk-size"),required_argument, NULL, IMAGEX_SOLID_CHUNK_SIZE_OPTION}, + {T("pack-chunk-size"), required_argument, NULL, IMAGEX_SOLID_CHUNK_SIZE_OPTION}, + {T("no-solid-sort"), no_argument, NULL, IMAGEX_NO_SOLID_SORT_OPTION}, {T("config"), required_argument, NULL, IMAGEX_CONFIG_OPTION}, {T("dereference"), no_argument, NULL, IMAGEX_DEREFERENCE_OPTION}, {T("flags"), required_argument, NULL, IMAGEX_FLAGS_OPTION}, @@ -278,19 +276,22 @@ static const struct option export_options[] = { {T("nocheck"), no_argument, NULL, IMAGEX_NOCHECK_OPTION}, {T("no-check"), no_argument, NULL, IMAGEX_NOCHECK_OPTION}, {T("compress"), required_argument, NULL, IMAGEX_COMPRESS_OPTION}, + {T("recompress"), no_argument, NULL, IMAGEX_RECOMPRESS_OPTION}, {T("compress-slow"), no_argument, NULL, IMAGEX_COMPRESS_SLOW_OPTION}, - {T("pack-streams"),no_argument, NULL, IMAGEX_PACK_STREAMS_OPTION}, - {T("solid"), no_argument, NULL, IMAGEX_PACK_STREAMS_OPTION}, {T("chunk-size"), required_argument, NULL, IMAGEX_CHUNK_SIZE_OPTION}, - {T("pack-chunk-size"), required_argument, NULL, IMAGEX_PACK_CHUNK_SIZE_OPTION}, - {T("solid-chunk-size"),required_argument, NULL, IMAGEX_PACK_CHUNK_SIZE_OPTION}, - {T("pack-compress"), required_argument, NULL, IMAGEX_PACK_COMPRESS_OPTION}, - {T("solid-compress"),required_argument, NULL, IMAGEX_PACK_COMPRESS_OPTION}, + {T("solid"), no_argument, NULL, IMAGEX_SOLID_OPTION}, + {T("pack-streams"),no_argument, NULL, IMAGEX_SOLID_OPTION}, + {T("solid-compress"),required_argument, NULL, IMAGEX_SOLID_COMPRESS_OPTION}, + {T("pack-compress"), required_argument, NULL, IMAGEX_SOLID_COMPRESS_OPTION}, + {T("solid-chunk-size"),required_argument, NULL, IMAGEX_SOLID_CHUNK_SIZE_OPTION}, + {T("pack-chunk-size"), required_argument, NULL, IMAGEX_SOLID_CHUNK_SIZE_OPTION}, + {T("no-solid-sort"), no_argument, NULL, IMAGEX_NO_SOLID_SORT_OPTION}, {T("ref"), required_argument, NULL, IMAGEX_REF_OPTION}, {T("threads"), required_argument, NULL, IMAGEX_THREADS_OPTION}, {T("rebuild"), no_argument, NULL, IMAGEX_REBUILD_OPTION}, {T("pipable"), no_argument, NULL, IMAGEX_PIPABLE_OPTION}, {T("not-pipable"), no_argument, NULL, IMAGEX_NOT_PIPABLE_OPTION}, + {T("wimboot"), no_argument, NULL, IMAGEX_WIMBOOT_OPTION}, {NULL, 0, NULL, 0}, }; @@ -306,10 +307,12 @@ static const struct option extract_options[] = { {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("no-wildcards"), no_argument, NULL, IMAGEX_NO_GLOBS_OPTION}, + {T("no-globs"), no_argument, NULL, IMAGEX_NO_GLOBS_OPTION}, {T("nullglob"), no_argument, NULL, IMAGEX_NULLGLOB_OPTION}, {T("preserve-dir-structure"), no_argument, NULL, IMAGEX_PRESERVE_DIR_STRUCTURE_OPTION}, {T("wimboot"), no_argument, NULL, IMAGEX_WIMBOOT_OPTION}, + {T("compact"), required_argument, NULL, IMAGEX_COMPACT_OPTION}, {NULL, 0, NULL, 0}, }; @@ -320,7 +323,8 @@ static const struct option info_options[] = { {T("no-check"), no_argument, NULL, IMAGEX_NOCHECK_OPTION}, {T("extract-xml"), required_argument, NULL, IMAGEX_EXTRACT_XML_OPTION}, {T("header"), no_argument, NULL, IMAGEX_HEADER_OPTION}, - {T("lookup-table"), no_argument, NULL, IMAGEX_LOOKUP_TABLE_OPTION}, + {T("lookup-table"), no_argument, NULL, IMAGEX_BLOBS_OPTION}, + {T("blobs"), no_argument, NULL, IMAGEX_BLOBS_OPTION}, {T("metadata"), no_argument, NULL, IMAGEX_METADATA_OPTION}, {T("xml"), no_argument, NULL, IMAGEX_XML_OPTION}, {NULL, 0, NULL, 0}, @@ -349,14 +353,15 @@ static const struct option optimize_options[] = { {T("compress"), required_argument, NULL, IMAGEX_COMPRESS_OPTION}, {T("recompress"), no_argument, NULL, IMAGEX_RECOMPRESS_OPTION}, {T("compress-slow"), no_argument, NULL, IMAGEX_COMPRESS_SLOW_OPTION}, - {T("recompress-slow"), no_argument, NULL, IMAGEX_COMPRESS_SLOW_OPTION}, + {T("recompress-slow"), no_argument, NULL, IMAGEX_COMPRESS_SLOW_OPTION}, {T("chunk-size"), required_argument, NULL, IMAGEX_CHUNK_SIZE_OPTION}, - {T("pack-chunk-size"), required_argument, NULL, IMAGEX_PACK_CHUNK_SIZE_OPTION}, - {T("solid-chunk-size"),required_argument, NULL, IMAGEX_PACK_CHUNK_SIZE_OPTION}, - {T("pack-compress"), required_argument, NULL, IMAGEX_PACK_COMPRESS_OPTION}, - {T("solid-compress"),required_argument, NULL, IMAGEX_PACK_COMPRESS_OPTION}, - {T("pack-streams"),no_argument, NULL, IMAGEX_PACK_STREAMS_OPTION}, - {T("solid"), no_argument, NULL, IMAGEX_PACK_STREAMS_OPTION}, + {T("solid"), no_argument, NULL, IMAGEX_SOLID_OPTION}, + {T("pack-streams"),no_argument, NULL, IMAGEX_SOLID_OPTION}, + {T("solid-compress"),required_argument, NULL, IMAGEX_SOLID_COMPRESS_OPTION}, + {T("pack-compress"), required_argument, NULL, IMAGEX_SOLID_COMPRESS_OPTION}, + {T("solid-chunk-size"),required_argument, NULL, IMAGEX_SOLID_CHUNK_SIZE_OPTION}, + {T("pack-chunk-size"), required_argument, NULL, IMAGEX_SOLID_CHUNK_SIZE_OPTION}, + {T("no-solid-sort"), no_argument, NULL, IMAGEX_NO_SOLID_SORT_OPTION}, {T("threads"), required_argument, NULL, IMAGEX_THREADS_OPTION}, {T("pipable"), no_argument, NULL, IMAGEX_PIPABLE_OPTION}, {T("not-pipable"), no_argument, NULL, IMAGEX_NOT_PIPABLE_OPTION}, @@ -373,6 +378,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("force"), no_argument, NULL, IMAGEX_FORCE_OPTION}, {T("new-image"), no_argument, NULL, IMAGEX_NEW_IMAGE_OPTION}, {NULL, 0, NULL, 0}, }; @@ -386,6 +392,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}, @@ -401,6 +408,14 @@ 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}, +}; + +static const struct option verify_options[] = { + {T("ref"), required_argument, NULL, IMAGEX_REF_OPTION}, + {T("nocheck"), no_argument, NULL, IMAGEX_NOCHECK_OPTION}, {NULL, 0, NULL, 0}, }; @@ -475,64 +490,105 @@ verify_image_exists_and_is_single(int image, const tchar *image_name, return ret; } +static void +print_available_compression_types(FILE *fp) +{ + static const tchar *s = + T( + "Available compression types:\n" + "\n" + " none\n" + " xpress (alias: \"fast\")\n" + " lzx (alias: \"maximum\") (default for capture)\n" + " lzms (alias: \"recovery\")\n" + "\n" + ); + tfputs(s, fp); +} + /* Parse the argument to --compress */ static int -get_compression_type(const tchar *optarg) +get_compression_type(tchar *optarg) { - if (!tstrcasecmp(optarg, T("maximum")) || !tstrcasecmp(optarg, T("lzx"))) - return WIMLIB_COMPRESSION_TYPE_LZX; + int ctype; + unsigned int compression_level = 0; + tchar *plevel; + + plevel = tstrchr(optarg, T(':')); + if (plevel) { + tchar *ptmp; + unsigned long ultmp; + + *plevel++ = T('\0'); + ultmp = tstrtoul(plevel, &ptmp, 10); + if (ultmp >= UINT_MAX || ultmp == 0 || *ptmp || ptmp == plevel) { + imagex_error(T("Compression level must be a positive integer! " + "e.g. --compress=lzx:80")); + return WIMLIB_COMPRESSION_TYPE_INVALID; + } + compression_level = ultmp; + } + + if (!tstrcasecmp(optarg, T("maximum")) || + !tstrcasecmp(optarg, T("lzx")) || + !tstrcasecmp(optarg, T("max"))) + ctype = WIMLIB_COMPRESSION_TYPE_LZX; else if (!tstrcasecmp(optarg, T("fast")) || !tstrcasecmp(optarg, T("xpress"))) - return WIMLIB_COMPRESSION_TYPE_XPRESS; + ctype = WIMLIB_COMPRESSION_TYPE_XPRESS; else if (!tstrcasecmp(optarg, T("recovery")) || !tstrcasecmp(optarg, T("lzms"))) - return WIMLIB_COMPRESSION_TYPE_LZMS; + ctype = WIMLIB_COMPRESSION_TYPE_LZMS; else if (!tstrcasecmp(optarg, T("none"))) - return WIMLIB_COMPRESSION_TYPE_NONE; + ctype = WIMLIB_COMPRESSION_TYPE_NONE; else { - imagex_error(T("Invalid compression type \"%"TS"\"! Must be " - "\"maximum\", \"fast\", or \"none\"."), optarg); + imagex_error(T("Invalid compression type \"%"TS"\"!"), optarg); + print_available_compression_types(stderr); return WIMLIB_COMPRESSION_TYPE_INVALID; } + + if (compression_level != 0) + wimlib_set_default_compression_level(ctype, compression_level); + return ctype; } -static void -set_compress_slow(void) +/* Parse the argument to --compact */ +static int +set_compact_mode(const tchar *arg, int *extract_flags) { - static const struct wimlib_lzx_compressor_params lzx_slow_params = { - .hdr = { - .size = sizeof(struct wimlib_lzx_compressor_params), - }, - .algorithm = WIMLIB_LZX_ALGORITHM_SLOW, - .alg_params = { - .slow = { - .use_len2_matches = 1, - .nice_match_length = 96, - .num_optim_passes = 4, - .max_search_depth = 100, - .max_matches_per_pos = 10, - .main_nostat_cost = 15, - .len_nostat_cost = 15, - .aligned_nostat_cost = 7, - }, - }, - }; + int flag = 0; + if (!tstrcasecmp(arg, T("xpress4k"))) + flag = WIMLIB_EXTRACT_FLAG_COMPACT_XPRESS4K; + else if (!tstrcasecmp(arg, T("xpress8k"))) + flag = WIMLIB_EXTRACT_FLAG_COMPACT_XPRESS8K; + else if (!tstrcasecmp(arg, T("xpress16k"))) + flag = WIMLIB_EXTRACT_FLAG_COMPACT_XPRESS16K; + else if (!tstrcasecmp(arg, T("lzx"))) + flag = WIMLIB_EXTRACT_FLAG_COMPACT_LZX; + + if (flag) { + *extract_flags |= flag; + return 0; + } - static const struct wimlib_lzms_compressor_params lzms_slow_params = { - .hdr = { - .size = sizeof(struct wimlib_lzms_compressor_params), - }, - .min_match_length = 2, - .max_match_length = UINT32_MAX, - .nice_match_length = 96, - .max_search_depth = 100, - .max_matches_per_pos = 10, - .optim_array_length = 1024, - }; + imagex_error(T( +"\"%"TS"\" is not a recognized System Compression format. The options are:" +"\n" +" --compact=xpress4k\n" +" --compact=xpress8k\n" +" --compact=xpress16k\n" +" --compact=lzx\n" + ), arg); + return -1; +} - wimlib_set_default_compressor_params(WIMLIB_COMPRESSION_TYPE_LZX, - &lzx_slow_params.hdr); - wimlib_set_default_compressor_params(WIMLIB_COMPRESSION_TYPE_LZMS, - &lzms_slow_params.hdr); +static void +set_compress_slow(void) +{ +#if 0 + fprintf(stderr, "WARNING: the '--compress-slow' option is deprecated.\n" + " Use the '--compress=TYPE:LEVEL' option instead.\n"); +#endif + wimlib_set_default_compression_level(-1, 100); } struct string_set { @@ -581,8 +637,7 @@ 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, - imagex_progress_func); + open_flags); } static void @@ -1021,18 +1076,18 @@ report_scan_progress(const struct wimlib_progress_info_scan *scan, bool done) last_scan_progress = *scan; } } - /* Progress callback function passed to various wimlib functions. */ -static int +static enum wimlib_progress_status imagex_progress_func(enum wimlib_progress_msg msg, - const union wimlib_progress_info *info) + union wimlib_progress_info *info, + void *_ignored_context) { unsigned percent_done; unsigned unit_shift; const tchar *unit_name; if (imagex_be_quiet) - return 0; + return WIMLIB_PROGRESS_STATUS_CONTINUE; switch (msg) { case WIMLIB_PROGRESS_MSG_WRITE_STREAMS: { @@ -1051,39 +1106,23 @@ imagex_progress_func(enum wimlib_progress_msg msg, percent_done = TO_PERCENT(info->write_streams.completed_bytes, info->write_streams.total_bytes); - if (info->write_streams.total_parts <= 1) { - imagex_printf(T("\r%"PRIu64" %"TS" of %"PRIu64" %"TS" (uncompressed) " - "written (%u%% done)"), - info->write_streams.completed_bytes >> unit_shift, - unit_name, - info->write_streams.total_bytes >> unit_shift, - unit_name, - percent_done); - } else { - imagex_printf(T("\rWriting resources from part %u of %u: " - "%"PRIu64 " %"TS" of %"PRIu64" %"TS" (%u%%) written"), - (info->write_streams.completed_parts == - info->write_streams.total_parts) ? - info->write_streams.completed_parts : - info->write_streams.completed_parts + 1, - info->write_streams.total_parts, - info->write_streams.completed_bytes >> unit_shift, - unit_name, - info->write_streams.total_bytes >> unit_shift, - unit_name, - percent_done); - } + imagex_printf(T("\r%"PRIu64" %"TS" of %"PRIu64" %"TS" (uncompressed) " + "written (%u%% done)"), + info->write_streams.completed_bytes >> unit_shift, + unit_name, + info->write_streams.total_bytes >> unit_shift, + unit_name, + percent_done); if (info->write_streams.completed_bytes >= info->write_streams.total_bytes) imagex_printf(T("\n")); break; case WIMLIB_PROGRESS_MSG_SCAN_BEGIN: imagex_printf(T("Scanning \"%"TS"\""), info->scan.source); - if (*info->scan.wim_target_path) { - imagex_printf(T(" (loading as WIM path: " - "\""WIMLIB_WIM_PATH_SEPARATOR_STRING"%"TS"\")...\n"), - info->scan.wim_target_path); - } else { + if (WIMLIB_IS_WIM_ROOT_PATH(info->scan.wim_target_path)) { imagex_printf(T("\n")); + } else { + imagex_printf(T(" (loading as WIM path: \"%"TS"\")...\n"), + info->scan.wim_target_path); } memset(&last_scan_progress, 0, sizeof(last_scan_progress)); break; @@ -1099,13 +1138,22 @@ imagex_progress_func(enum wimlib_progress_msg msg, imagex_printf(T("\nWARNING: Excluding unsupported file or directory\n" " \"%"TS"\" from capture\n"), info->scan.cur_path); break; - case WIMLIB_SCAN_DENTRY_EXCLUDED_SYMLINK: - imagex_printf(T("\nWARNING: Ignoring absolute symbolic link " - "with out-of-tree target:\n" - " \"%"TS"\" => \"%"TS"\"\n" + case WIMLIB_SCAN_DENTRY_FIXED_SYMLINK: + /* Symlink fixups are enabled by default. This is + * mainly intended for Windows, which for some reason + * uses absolute junctions (with drive letters!) in the + * default installation. On UNIX-like systems, warn the + * user when fixing the target of an absolute symbolic + * link, so they know to disable this if they want. */ + #ifndef __WIN32__ + imagex_printf(T("\nWARNING: Adjusted target of " + "absolute symbolic link \"%"TS"\"\n" " (Use --norpfix to capture " "absolute symbolic links as-is)\n"), - info->scan.cur_path, info->scan.symlink_target); + info->scan.cur_path); + #endif + break; + default: break; } break; @@ -1152,22 +1200,22 @@ imagex_progress_func(enum wimlib_progress_msg msg, T("NTFS volume") : T("directory")), info->extract.target); break; - case WIMLIB_PROGRESS_MSG_EXTRACT_TREE_BEGIN: - if (info->extract.extract_root_wim_source_path[0]) { - 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); + case WIMLIB_PROGRESS_MSG_EXTRACT_FILE_STRUCTURE: + if (info->extract.end_file_count >= 2000) { + percent_done = TO_PERCENT(info->extract.current_file_count, + info->extract.end_file_count); + imagex_printf(T("\rCreating files: %"PRIu64" of %"PRIu64" (%u%%) done"), + info->extract.current_file_count, + info->extract.end_file_count, percent_done); + if (info->extract.current_file_count == info->extract.end_file_count) + imagex_printf(T("\n")); } break; case WIMLIB_PROGRESS_MSG_EXTRACT_STREAMS: percent_done = TO_PERCENT(info->extract.completed_bytes, info->extract.total_bytes); unit_shift = get_unit(info->extract.total_bytes, &unit_name); - imagex_printf(T("\rExtracting files: " + imagex_printf(T("\rExtracting file data: " "%"PRIu64" %"TS" of %"PRIu64" %"TS" (%u%%) done"), info->extract.completed_bytes >> unit_shift, unit_name, @@ -1177,6 +1225,17 @@ imagex_progress_func(enum wimlib_progress_msg msg, if (info->extract.completed_bytes >= info->extract.total_bytes) imagex_printf(T("\n")); break; + case WIMLIB_PROGRESS_MSG_EXTRACT_METADATA: + if (info->extract.end_file_count >= 2000) { + percent_done = TO_PERCENT(info->extract.current_file_count, + info->extract.end_file_count); + imagex_printf(T("\rApplying metadata to files: %"PRIu64" of %"PRIu64" (%u%%) done"), + info->extract.current_file_count, + info->extract.end_file_count, percent_done); + if (info->extract.current_file_count == info->extract.end_file_count) + imagex_printf(T("\n")); + } + break; case WIMLIB_PROGRESS_MSG_EXTRACT_SPWM_PART_BEGIN: if (info->extract.total_parts != 1) { imagex_printf(T("\nReading split pipable WIM part %u of %u\n"), @@ -1184,16 +1243,6 @@ imagex_progress_func(enum wimlib_progress_msg msg, info->extract.total_parts); } break; - case WIMLIB_PROGRESS_MSG_APPLY_TIMESTAMPS: - if (info->extract.extract_root_wim_source_path[0] == T('\0')) - imagex_printf(T("Setting timestamps on all extracted files...\n")); - break; - case WIMLIB_PROGRESS_MSG_EXTRACT_IMAGE_END: - if (info->extract.extract_flags & WIMLIB_EXTRACT_FLAG_NTFS) { - imagex_printf(T("Unmounting NTFS volume \"%"TS"\"...\n"), - info->extract.target); - } - break; case WIMLIB_PROGRESS_MSG_SPLIT_BEGIN_PART: percent_done = TO_PERCENT(info->split.completed_bytes, info->split.total_bytes); @@ -1219,14 +1268,11 @@ imagex_progress_func(enum wimlib_progress_msg msg, case WIMLIB_PROGRESS_MSG_UPDATE_END_COMMAND: switch (info->update.command->op) { case WIMLIB_UPDATE_OP_DELETE: - imagex_printf(T("Deleted WIM path " - "\""WIMLIB_WIM_PATH_SEPARATOR_STRING "%"TS"\"\n"), + imagex_printf(T("Deleted WIM path \"%"TS"\"\n"), info->update.command->delete_.wim_path); break; case WIMLIB_UPDATE_OP_RENAME: - imagex_printf(T("Renamed WIM path " - "\""WIMLIB_WIM_PATH_SEPARATOR_STRING "%"TS"\" => " - "\""WIMLIB_WIM_PATH_SEPARATOR_STRING "%"TS"\"\n"), + imagex_printf(T("Renamed WIM path \"%"TS"\" => \"%"TS"\"\n"), info->update.command->rename.wim_source_path, info->update.command->rename.wim_target_path); break; @@ -1239,11 +1285,48 @@ imagex_progress_func(enum wimlib_progress_msg msg, imagex_printf(T("Updating \"%"TS"\" in WIM image\n"), info->replace.path_in_wim); break; + case WIMLIB_PROGRESS_MSG_WIMBOOT_EXCLUDE: + imagex_printf(T("\nExtracting \"%"TS"\" as normal file (not WIMBoot pointer)\n"), + info->wimboot_exclude.path_in_wim); + break; + case WIMLIB_PROGRESS_MSG_UNMOUNT_BEGIN: + if (info->unmount.mount_flags & WIMLIB_MOUNT_FLAG_READWRITE) { + if (info->unmount.unmount_flags & WIMLIB_UNMOUNT_FLAG_COMMIT) { + imagex_printf(T("Committing changes to %"TS" (image %d)\n"), + info->unmount.mounted_wim, + info->unmount.mounted_image); + } else { + imagex_printf(T("Discarding changes to %"TS" (image %d)\n"), + info->unmount.mounted_wim, + info->unmount.mounted_image); + imagex_printf(T("\t(Use --commit to keep changes.)\n")); + } + } + break; + case WIMLIB_PROGRESS_MSG_BEGIN_VERIFY_IMAGE: + imagex_printf(T("Verifying metadata for image %"PRIu32" of %"PRIu32"\n"), + info->verify_image.current_image, + info->verify_image.total_images); + break; + case WIMLIB_PROGRESS_MSG_VERIFY_STREAMS: + percent_done = TO_PERCENT(info->verify_streams.completed_bytes, + info->verify_streams.total_bytes); + unit_shift = get_unit(info->verify_streams.total_bytes, &unit_name); + imagex_printf(T("\rVerifying file data: " + "%"PRIu64" %"TS" of %"PRIu64" %"TS" (%u%%) done"), + info->verify_streams.completed_bytes >> unit_shift, + unit_name, + info->verify_streams.total_bytes >> unit_shift, + unit_name, + percent_done); + if (info->verify_streams.completed_bytes == info->verify_streams.total_bytes) + imagex_printf(T("\n")); + break; default: break; } fflush(imagex_info_file); - return 0; + return WIMLIB_PROGRESS_STATUS_CONTINUE; } static unsigned @@ -1259,16 +1342,37 @@ parse_num_threads(const tchar *optarg) } } -static uint32_t parse_chunk_size(const tchar *optarg) +static uint32_t +parse_chunk_size(const tchar *optarg) { - tchar *tmp; - unsigned long chunk_size = tstrtoul(optarg, &tmp, 10); - if (chunk_size >= UINT32_MAX || *tmp || tmp == optarg) { - imagex_error(T("Chunk size must be a non-negative integer!")); - return UINT32_MAX; - } else { - return chunk_size; - } + tchar *tmp; + uint64_t chunk_size = tstrtoul(optarg, &tmp, 10); + if (chunk_size == 0) { + imagex_error(T("Invalid chunk size specification; must be a positive integer\n" + " with optional K, M, or G suffix")); + return UINT32_MAX; + } + if (*tmp) { + if (*tmp == T('k') || *tmp == T('K')) { + chunk_size <<= 10; + tmp++; + } else if (*tmp == T('m') || *tmp == T('M')) { + chunk_size <<= 20; + tmp++; + } else if (*tmp == T('g') || *tmp == T('G')) { + chunk_size <<= 30; + tmp++; + } + if (*tmp && !(*tmp == T('i') && *(tmp + 1) == T('B'))) { + imagex_error(T("Invalid chunk size specification; suffix must be K, M, or G")); + return UINT32_MAX; + } + } + if (chunk_size >= UINT32_MAX) { + imagex_error(T("Invalid chunk size specification; the value is too large!")); + return UINT32_MAX; + } + return chunk_size; } @@ -1483,7 +1587,7 @@ parse_update_command_file(tchar **cmd_file_contents_p, size_t cmd_file_nchars, } /* 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. */ + * one image from a WIM file to an NTFS volume. */ static int imagex_apply(int argc, tchar **argv, int cmd) { @@ -1505,12 +1609,6 @@ imagex_apply(int argc, tchar **argv, int cmd) case IMAGEX_CHECK_OPTION: open_flags |= WIMLIB_OPEN_FLAG_CHECK_INTEGRITY; break; - case IMAGEX_HARDLINK_OPTION: - extract_flags |= WIMLIB_EXTRACT_FLAG_HARDLINK; - break; - case IMAGEX_SYMLINK_OPTION: - extract_flags |= WIMLIB_EXTRACT_FLAG_SYMLINK; - break; case IMAGEX_VERBOSE_OPTION: /* No longer does anything. */ break; @@ -1547,6 +1645,11 @@ imagex_apply(int argc, tchar **argv, int cmd) case IMAGEX_WIMBOOT_OPTION: extract_flags |= WIMLIB_EXTRACT_FLAG_WIMBOOT; break; + case IMAGEX_COMPACT_OPTION: + ret = set_compact_mode(optarg, &extract_flags); + if (ret) + goto out_free_refglobs; + break; default: goto out_usage; } @@ -1569,8 +1672,8 @@ imagex_apply(int argc, tchar **argv, int cmd) } wim = NULL; } else { - ret = wimlib_open_wim(wimfile, open_flags, &wim, - imagex_progress_func); + ret = wimlib_open_wim_with_progress(wimfile, open_flags, &wim, + imagex_progress_func, NULL); if (ret) goto out_free_refglobs; @@ -1613,7 +1716,7 @@ imagex_apply(int argc, tchar **argv, int cmd) #ifndef __WIN32__ { - /* Interpret a regular file or block device target as a NTFS + /* Interpret a regular file or block device target as an NTFS * volume. */ struct stat stbuf; @@ -1632,14 +1735,16 @@ imagex_apply(int argc, tchar **argv, int cmd) #endif if (wim) { - ret = wimlib_extract_image(wim, image, target, extract_flags, - imagex_progress_func); + ret = wimlib_extract_image(wim, image, target, extract_flags); } else { set_fd_to_binary_mode(STDIN_FILENO); - ret = wimlib_extract_image_from_pipe(STDIN_FILENO, - image_num_or_name, - target, extract_flags, - imagex_progress_func); + ret = wimlib_extract_image_from_pipe_with_progress( + STDIN_FILENO, + image_num_or_name, + target, + extract_flags, + imagex_progress_func, + NULL); } if (ret == 0) { imagex_printf(T("Done applying WIM image.\n")); @@ -1673,15 +1778,15 @@ static int imagex_capture_or_append(int argc, tchar **argv, int cmd) { int c; - int open_flags = WIMLIB_OPEN_FLAG_WRITE_ACCESS; - int add_image_flags = WIMLIB_ADD_IMAGE_FLAG_EXCLUDE_VERBOSE | - WIMLIB_ADD_IMAGE_FLAG_WINCONFIG | - WIMLIB_ADD_IMAGE_FLAG_VERBOSE; + int open_flags = 0; + int add_flags = WIMLIB_ADD_FLAG_EXCLUDE_VERBOSE | + WIMLIB_ADD_FLAG_WINCONFIG | + WIMLIB_ADD_FLAG_VERBOSE; int write_flags = 0; int compression_type = WIMLIB_COMPRESSION_TYPE_INVALID; uint32_t chunk_size = UINT32_MAX; - uint32_t pack_chunk_size = UINT32_MAX; - int pack_ctype = WIMLIB_COMPRESSION_TYPE_INVALID; + uint32_t solid_chunk_size = UINT32_MAX; + int solid_ctype = WIMLIB_COMPRESSION_TYPE_INVALID; const tchar *wimfile; int wim_fd; const tchar *name; @@ -1712,12 +1817,11 @@ imagex_capture_or_append(int argc, tchar **argv, int cmd) struct wimlib_capture_source *capture_sources; size_t num_sources; bool name_defaulted; - bool compress_slow = false; for_opt(c, capture_or_append_options) { switch (c) { case IMAGEX_BOOT_OPTION: - add_image_flags |= WIMLIB_ADD_IMAGE_FLAG_BOOT; + add_flags |= WIMLIB_ADD_FLAG_BOOT; break; case IMAGEX_CHECK_OPTION: open_flags |= WIMLIB_OPEN_FLAG_CHECK_INTEGRITY; @@ -1728,7 +1832,7 @@ imagex_capture_or_append(int argc, tchar **argv, int cmd) break; case IMAGEX_CONFIG_OPTION: config_file = optarg; - add_image_flags &= ~WIMLIB_ADD_IMAGE_FLAG_WINCONFIG; + add_flags &= ~WIMLIB_ADD_FLAG_WINCONFIG; break; case IMAGEX_COMPRESS_OPTION: compression_type = get_compression_type(optarg); @@ -1736,31 +1840,34 @@ imagex_capture_or_append(int argc, tchar **argv, int cmd) goto out_err; break; case IMAGEX_COMPRESS_SLOW_OPTION: - compress_slow = true; + set_compress_slow(); break; case IMAGEX_CHUNK_SIZE_OPTION: chunk_size = parse_chunk_size(optarg); if (chunk_size == UINT32_MAX) goto out_err; break; - case IMAGEX_PACK_CHUNK_SIZE_OPTION: - pack_chunk_size = parse_chunk_size(optarg); - if (pack_chunk_size == UINT32_MAX) + case IMAGEX_SOLID_CHUNK_SIZE_OPTION: + solid_chunk_size = parse_chunk_size(optarg); + if (solid_chunk_size == UINT32_MAX) goto out_err; break; - case IMAGEX_PACK_COMPRESS_OPTION: - pack_ctype = get_compression_type(optarg); - if (pack_ctype == WIMLIB_COMPRESSION_TYPE_INVALID) + case IMAGEX_SOLID_COMPRESS_OPTION: + solid_ctype = get_compression_type(optarg); + if (solid_ctype == WIMLIB_COMPRESSION_TYPE_INVALID) goto out_err; break; - case IMAGEX_PACK_STREAMS_OPTION: - write_flags |= WIMLIB_WRITE_FLAG_PACK_STREAMS; + case IMAGEX_SOLID_OPTION: + write_flags |= WIMLIB_WRITE_FLAG_SOLID; + break; + case IMAGEX_NO_SOLID_SORT_OPTION: + write_flags |= WIMLIB_WRITE_FLAG_NO_SOLID_SORT; break; case IMAGEX_FLAGS_OPTION: flags_element = optarg; break; case IMAGEX_DEREFERENCE_OPTION: - add_image_flags |= WIMLIB_ADD_IMAGE_FLAG_DEREFERENCE; + add_flags |= WIMLIB_ADD_FLAG_DEREFERENCE; break; case IMAGEX_VERBOSE_OPTION: /* No longer does anything. */ @@ -1774,22 +1881,22 @@ imagex_capture_or_append(int argc, tchar **argv, int cmd) write_flags |= WIMLIB_WRITE_FLAG_REBUILD; break; case IMAGEX_UNIX_DATA_OPTION: - add_image_flags |= WIMLIB_ADD_IMAGE_FLAG_UNIX_DATA; + add_flags |= WIMLIB_ADD_FLAG_UNIX_DATA; break; case IMAGEX_SOURCE_LIST_OPTION: source_list = true; break; case IMAGEX_NO_ACLS_OPTION: - add_image_flags |= WIMLIB_ADD_IMAGE_FLAG_NO_ACLS; + add_flags |= WIMLIB_ADD_FLAG_NO_ACLS; break; case IMAGEX_STRICT_ACLS_OPTION: - add_image_flags |= WIMLIB_ADD_IMAGE_FLAG_STRICT_ACLS; + add_flags |= WIMLIB_ADD_FLAG_STRICT_ACLS; break; case IMAGEX_RPFIX_OPTION: - add_image_flags |= WIMLIB_ADD_IMAGE_FLAG_RPFIX; + add_flags |= WIMLIB_ADD_FLAG_RPFIX; break; case IMAGEX_NORPFIX_OPTION: - add_image_flags |= WIMLIB_ADD_IMAGE_FLAG_NORPFIX; + add_flags |= WIMLIB_ADD_FLAG_NORPFIX; break; case IMAGEX_PIPABLE_OPTION: write_flags |= WIMLIB_WRITE_FLAG_PIPABLE; @@ -1828,7 +1935,7 @@ imagex_capture_or_append(int argc, tchar **argv, int cmd) write_flags |= WIMLIB_WRITE_FLAG_SKIP_EXTERNAL_WIMS; break; case IMAGEX_WIMBOOT_OPTION: - add_image_flags |= WIMLIB_ADD_IMAGE_FLAG_WIMBOOT; + add_flags |= WIMLIB_ADD_FLAG_WIMBOOT; break; default: goto out_usage; @@ -1847,25 +1954,21 @@ imagex_capture_or_append(int argc, tchar **argv, int cmd) if (compression_type == WIMLIB_COMPRESSION_TYPE_INVALID) { - if (add_image_flags & WIMLIB_ADD_IMAGE_FLAG_WIMBOOT) { + /* No compression type specified. Use the default. */ + + if (add_flags & WIMLIB_ADD_FLAG_WIMBOOT) { + /* With --wimboot, default to XPRESS compression. */ compression_type = WIMLIB_COMPRESSION_TYPE_XPRESS; + } else if (write_flags & WIMLIB_WRITE_FLAG_SOLID) { + /* With --solid, default to LZMS compression. (However, + * this will not affect solid resources!) */ + compression_type = WIMLIB_COMPRESSION_TYPE_LZMS; } else { + /* Otherwise, default to LZX compression. */ compression_type = WIMLIB_COMPRESSION_TYPE_LZX; - if (!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 @@ -1963,7 +2066,7 @@ imagex_capture_or_append(int argc, tchar **argv, int cmd) /* Set up capture source in non-source-list mode. */ capture_sources = alloca(sizeof(struct wimlib_capture_source)); capture_sources[0].fs_source_path = source; - capture_sources[0].wim_target_path = NULL; + capture_sources[0].wim_target_path = WIMLIB_WIM_ROOT_PATH; capture_sources[0].reserved = 0; num_sources = 1; capture_sources_malloced = false; @@ -1971,32 +2074,39 @@ imagex_capture_or_append(int argc, tchar **argv, int cmd) } /* Open the existing WIM, or create a new one. */ - if (cmd == CMD_APPEND) - ret = wimlib_open_wim(wimfile, open_flags, &wim, - imagex_progress_func); - else + if (cmd == CMD_APPEND) { + ret = wimlib_open_wim_with_progress(wimfile, + open_flags | WIMLIB_OPEN_FLAG_WRITE_ACCESS, + &wim, + imagex_progress_func, + NULL); + if (ret) + goto out_free_capture_sources; + } else { ret = wimlib_create_new_wim(compression_type, &wim); - if (ret) - goto out_free_capture_sources; + if (ret) + goto out_free_capture_sources; + wimlib_register_progress_function(wim, imagex_progress_func, NULL); + } /* Set chunk size if non-default. */ if (chunk_size != UINT32_MAX) { ret = wimlib_set_output_chunk_size(wim, chunk_size); if (ret) goto out_free_wim; - } else if ((add_image_flags & WIMLIB_ADD_IMAGE_FLAG_WIMBOOT) && + } else if ((add_flags & WIMLIB_ADD_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 (solid_ctype != WIMLIB_COMPRESSION_TYPE_INVALID) { + ret = wimlib_set_output_pack_compression_type(wim, solid_ctype); if (ret) goto out_free_wim; } - if (pack_chunk_size != UINT32_MAX) { - ret = wimlib_set_output_pack_chunk_size(wim, pack_chunk_size); + if (solid_chunk_size != UINT32_MAX) { + ret = wimlib_set_output_pack_chunk_size(wim, solid_chunk_size); if (ret) goto out_free_wim; } @@ -2011,7 +2121,7 @@ imagex_capture_or_append(int argc, tchar **argv, int cmd) if (S_ISBLK(stbuf.st_mode) || S_ISREG(stbuf.st_mode)) { imagex_printf(T("Capturing WIM image from NTFS " "filesystem on \"%"TS"\"\n"), source); - add_image_flags |= WIMLIB_ADD_IMAGE_FLAG_NTFS; + add_flags |= WIMLIB_ADD_FLAG_NTFS; } } else { if (errno != ENOENT) { @@ -2050,9 +2160,9 @@ imagex_capture_or_append(int argc, tchar **argv, int cmd) } for (size_t i = 0; i < base_wimfiles.num_strings; i++) { - ret = wimlib_open_wim(base_wimfiles.strings[i], - open_flags, &base_wims[i], - imagex_progress_func); + ret = wimlib_open_wim_with_progress( + base_wimfiles.strings[i], open_flags, + &base_wims[i], imagex_progress_func, NULL); if (ret) goto out_free_base_wims; @@ -2086,8 +2196,11 @@ imagex_capture_or_append(int argc, tchar **argv, int cmd) } else if (template_wimfile == wimfile) { template_wim = wim; } else { - ret = wimlib_open_wim(template_wimfile, open_flags, - &template_wim, imagex_progress_func); + ret = wimlib_open_wim_with_progress(template_wimfile, + open_flags, + &template_wim, + imagex_progress_func, + NULL); if (ret) goto out_free_base_wims; } @@ -2123,8 +2236,7 @@ imagex_capture_or_append(int argc, tchar **argv, int cmd) num_sources, name, config_file, - add_image_flags, - imagex_progress_func); + add_flags); if (ret) goto out_free_template_wim; @@ -2161,7 +2273,7 @@ imagex_capture_or_append(int argc, tchar **argv, int cmd) info.image_count, template_wim, template_image, - 0, NULL); + 0); if (ret) goto out_free_template_wim; } @@ -2170,16 +2282,13 @@ imagex_capture_or_append(int argc, tchar **argv, int cmd) /* Write the new WIM or overwrite the existing WIM with the new image * appended. */ if (cmd == CMD_APPEND) { - ret = wimlib_overwrite(wim, write_flags, num_threads, - imagex_progress_func); + ret = wimlib_overwrite(wim, write_flags, num_threads); } else if (wimfile) { ret = wimlib_write(wim, wimfile, WIMLIB_ALL_IMAGES, - write_flags, num_threads, - imagex_progress_func); + write_flags, num_threads); } else { ret = wimlib_write_to_fd(wim, wim_fd, WIMLIB_ALL_IMAGES, - write_flags, num_threads, - imagex_progress_func); + write_flags, num_threads); } out_free_template_wim: /* template_wim may alias base_wims[0] or wim. */ @@ -2247,8 +2356,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; @@ -2265,7 +2374,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); @@ -2343,6 +2452,9 @@ static void print_byte_field(const uint8_t field[], size_t len) static void print_wim_information(const tchar *wimfile, const struct wimlib_wim_info *info) { + tchar attr_string[256]; + tchar *p; + tputs(T("WIM Information:")); tputs(T("----------------")); tprintf(T("Path: %"TS"\n"), wimfile); @@ -2358,47 +2470,66 @@ print_wim_information(const tchar *wimfile, const struct wimlib_wim_info *info) tprintf(T("Part Number: %d/%d\n"), info->part_number, info->total_parts); tprintf(T("Boot Index: %d\n"), info->boot_index); tprintf(T("Size: %"PRIu64" bytes\n"), info->total_bytes); - tprintf(T("Integrity Info: %"TS"\n"), - info->has_integrity_table ? T("yes") : T("no")); - tprintf(T("Relative path junction: %"TS"\n"), - info->has_rpfix ? T("yes") : T("no")); - tprintf(T("Pipable: %"TS"\n"), - info->pipable ? T("yes") : T("no")); - tputchar(T('\n')); + + attr_string[0] = T('\0'); + + if (info->pipable) + tstrcat(attr_string, T("Pipable, ")); + + if (info->has_integrity_table) + tstrcat(attr_string, T("Integrity info, ")); + + if (info->has_rpfix) + tstrcat(attr_string, T("Relative path junction, ")); + + if (info->resource_only) + tstrcat(attr_string, T("Resource only, ")); + + if (info->metadata_only) + tstrcat(attr_string, T("Metadata only, ")); + + if (info->is_marked_readonly) + tstrcat(attr_string, T("Readonly, ")); + + p = tstrchr(attr_string, T('\0')); + if (p >= &attr_string[2] && p[-1] == T(' ') && p[-2] == T(',')) + p[-2] = T('\0'); + + tprintf(T("Attributes: %"TS"\n\n"), attr_string); } static int print_resource(const struct wimlib_resource_entry *resource, void *_ignore) { - tprintf(T("Hash = 0x")); + tprintf(T("Hash = 0x")); print_byte_field(resource->sha1_hash, sizeof(resource->sha1_hash)); tputchar(T('\n')); if (!resource->is_missing) { - tprintf(T("Uncompressed size = %"PRIu64" bytes\n"), + tprintf(T("Uncompressed size = %"PRIu64" bytes\n"), resource->uncompressed_size); if (resource->packed) { - tprintf(T("Raw compressed size = %"PRIu64" bytes\n"), - resource->raw_resource_compressed_size); - - tprintf(T("Raw offset in WIM = %"PRIu64" bytes\n"), + tprintf(T("Solid resource = %"PRIu64" => %"PRIu64" " + "bytes @ offset %"PRIu64"\n"), + resource->raw_resource_uncompressed_size, + resource->raw_resource_compressed_size, resource->raw_resource_offset_in_wim); - tprintf(T("Offset in raw = %"PRIu64" bytes\n"), + tprintf(T("Solid offset = %"PRIu64" bytes\n"), resource->offset); } else { - tprintf(T("Compressed size = %"PRIu64" bytes\n"), + tprintf(T("Compressed size = %"PRIu64" bytes\n"), resource->compressed_size); - tprintf(T("Offset in WIM = %"PRIu64" bytes\n"), + tprintf(T("Offset in WIM = %"PRIu64" bytes\n"), resource->offset); } - tprintf(T("Part Number = %u\n"), resource->part_number); - tprintf(T("Reference Count = %u\n"), resource->reference_count); + tprintf(T("Part Number = %u\n"), resource->part_number); + tprintf(T("Reference Count = %u\n"), resource->reference_count); - tprintf(T("Flags = ")); + tprintf(T("Flags = ")); if (resource->is_compressed) tprintf(T("WIM_RESHDR_FLAG_COMPRESSED ")); if (resource->is_metadata) @@ -2408,7 +2539,7 @@ print_resource(const struct wimlib_resource_entry *resource, if (resource->is_spanned) tprintf(T("WIM_RESHDR_FLAG_SPANNED ")); if (resource->packed) - tprintf(T("WIM_RESHDR_FLAG_PACKED_STREAMS ")); + tprintf(T("WIM_RESHDR_FLAG_SOLID ")); tputchar(T('\n')); } tputchar(T('\n')); @@ -2416,7 +2547,7 @@ print_resource(const struct wimlib_resource_entry *resource, } static void -print_lookup_table(WIMStruct *wim) +print_blobs(WIMStruct *wim) { wimlib_iterate_lookup_table(wim, 0, print_resource, NULL); } @@ -2460,10 +2591,21 @@ print_dentry_detailed(const struct wimlib_dir_entry *dentry) tprintf(T("Link Group ID = 0x%016"PRIx64"\n"), dentry->hard_link_group_id); tprintf(T("Link Count = %"PRIu32"\n"), dentry->num_links); + if (dentry->unix_mode != 0) { + tprintf(T("UNIX Data = uid:%"PRIu32" gid:%"PRIu32" " + "mode:0%"PRIo32" rdev:0x%"PRIx32"\n"), + dentry->unix_uid, dentry->unix_gid, + dentry->unix_mode, dentry->unix_rdev); + } + for (uint32_t i = 0; i <= dentry->num_named_streams; i++) { if (dentry->streams[i].stream_name) { - tprintf(T("\tData stream \"%"TS"\":\n"), + tprintf(T("\tNamed data stream \"%"TS"\":\n"), dentry->streams[i].stream_name); + } else if (dentry->attributes & WIMLIB_FILE_ATTRIBUTE_ENCRYPTED) { + tprintf(T("\tRaw encrypted data stream:\n")); + } else if (dentry->attributes & WIMLIB_FILE_ATTRIBUTE_REPARSE_POINT) { + tprintf(T("\tReparse point stream:\n")); } else { tprintf(T("\tUnnamed data stream:\n")); } @@ -2490,7 +2632,7 @@ 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, @@ -2525,7 +2667,8 @@ imagex_dir(int argc, tchar **argv, int cmd) } wimfile = argv[0]; - ret = wimlib_open_wim(wimfile, 0, &wim, imagex_progress_func); + ret = wimlib_open_wim_with_progress(wimfile, 0, &wim, + imagex_progress_func, NULL); if (ret) goto out; @@ -2571,7 +2714,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; @@ -2590,8 +2733,8 @@ imagex_export(int argc, tchar **argv, int cmd) STRING_SET(refglobs); unsigned num_threads = 0; uint32_t chunk_size = UINT32_MAX; - uint32_t pack_chunk_size = UINT32_MAX; - int pack_ctype = WIMLIB_COMPRESSION_TYPE_INVALID; + uint32_t solid_chunk_size = UINT32_MAX; + int solid_ctype = WIMLIB_COMPRESSION_TYPE_INVALID; for_opt(c, export_options) { switch (c) { @@ -2611,25 +2754,31 @@ imagex_export(int argc, tchar **argv, int cmd) goto out_err; break; case IMAGEX_COMPRESS_SLOW_OPTION: - write_flags |= WIMLIB_WRITE_FLAG_RECOMPRESS; set_compress_slow(); + write_flags |= WIMLIB_WRITE_FLAG_RECOMPRESS; + break; + case IMAGEX_RECOMPRESS_OPTION: + write_flags |= WIMLIB_WRITE_FLAG_RECOMPRESS; + break; + case IMAGEX_SOLID_OPTION: + write_flags |= WIMLIB_WRITE_FLAG_SOLID; break; - case IMAGEX_PACK_STREAMS_OPTION: - write_flags |= WIMLIB_WRITE_FLAG_PACK_STREAMS; + case IMAGEX_NO_SOLID_SORT_OPTION: + write_flags |= WIMLIB_WRITE_FLAG_NO_SOLID_SORT; break; case IMAGEX_CHUNK_SIZE_OPTION: chunk_size = parse_chunk_size(optarg); if (chunk_size == UINT32_MAX) goto out_err; break; - case IMAGEX_PACK_CHUNK_SIZE_OPTION: - pack_chunk_size = parse_chunk_size(optarg); - if (pack_chunk_size == UINT32_MAX) + case IMAGEX_SOLID_CHUNK_SIZE_OPTION: + solid_chunk_size = parse_chunk_size(optarg); + if (solid_chunk_size == UINT32_MAX) goto out_err; break; - case IMAGEX_PACK_COMPRESS_OPTION: - pack_ctype = get_compression_type(optarg); - if (pack_ctype == WIMLIB_COMPRESSION_TYPE_INVALID) + case IMAGEX_SOLID_COMPRESS_OPTION: + solid_ctype = get_compression_type(optarg); + if (solid_ctype == WIMLIB_COMPRESSION_TYPE_INVALID) goto out_err; break; case IMAGEX_REF_OPTION: @@ -2651,6 +2800,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; } @@ -2664,8 +2816,8 @@ imagex_export(int argc, tchar **argv, int cmd) dest_wimfile = argv[2]; dest_name = (argc >= 4) ? argv[3] : NULL; dest_desc = (argc >= 5) ? argv[4] : NULL; - ret = wimlib_open_wim(src_wimfile, open_flags, &src_wim, - imagex_progress_func); + ret = wimlib_open_wim_with_progress(src_wimfile, open_flags, &src_wim, + imagex_progress_func, NULL); if (ret) goto out_free_refglobs; @@ -2705,9 +2857,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; @@ -2741,18 +2896,34 @@ 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. */ - - compression_type = src_info.compression_type; + * to that of the source WIM, unless --solid or + * --wimboot was specified. */ + + if (write_flags & WIMLIB_WRITE_FLAG_SOLID) + compression_type = WIMLIB_COMPRESSION_TYPE_LZMS; + else if (export_flags & WIMLIB_EXPORT_FLAG_WIMBOOT) + compression_type = WIMLIB_COMPRESSION_TYPE_XPRESS; + else + compression_type = src_info.compression_type; } ret = wimlib_create_new_wim(compression_type, &dest_wim); if (ret) goto out_free_src_wim; - /* Use same chunk size if compression type is the same. */ - if (compression_type == src_info.compression_type && - chunk_size == UINT32_MAX) + wimlib_register_progress_function(dest_wim, + imagex_progress_func, NULL); + + if ((export_flags & WIMLIB_EXPORT_FLAG_WIMBOOT) + && compression_type == WIMLIB_COMPRESSION_TYPE_XPRESS) + { + /* For --wimboot export, use small XPRESS chunks. */ + wimlib_set_output_chunk_size(dest_wim, 4096); + } else if (compression_type == src_info.compression_type && + chunk_size == UINT32_MAX) + { + /* Use same chunk size if compression type is the same. */ wimlib_set_output_chunk_size(dest_wim, src_info.chunk_size); + } } if (chunk_size != UINT32_MAX) { @@ -2761,13 +2932,13 @@ imagex_export(int argc, tchar **argv, int cmd) if (ret) goto out_free_dest_wim; } - if (pack_ctype != WIMLIB_COMPRESSION_TYPE_INVALID) { - ret = wimlib_set_output_pack_compression_type(dest_wim, pack_ctype); + if (solid_ctype != WIMLIB_COMPRESSION_TYPE_INVALID) { + ret = wimlib_set_output_pack_compression_type(dest_wim, solid_ctype); if (ret) goto out_free_dest_wim; } - if (pack_chunk_size != UINT32_MAX) { - ret = wimlib_set_output_pack_chunk_size(dest_wim, pack_chunk_size); + if (solid_chunk_size != UINT32_MAX) { + ret = wimlib_set_output_pack_chunk_size(dest_wim, solid_chunk_size); if (ret) goto out_free_dest_wim; } @@ -2793,7 +2964,7 @@ imagex_export(int argc, tchar **argv, int cmd) } ret = wimlib_export_image(src_wim, image, dest_wim, dest_name, - dest_desc, export_flags, imagex_progress_func); + dest_desc, export_flags); if (ret) { if (ret == WIMLIB_ERR_RESOURCE_NOT_FOUND) { do_resource_not_found_warning(src_wimfile, @@ -2803,16 +2974,14 @@ imagex_export(int argc, tchar **argv, int cmd) } if (!wim_is_new) - ret = wimlib_overwrite(dest_wim, write_flags, num_threads, - imagex_progress_func); + ret = wimlib_overwrite(dest_wim, write_flags, num_threads); else if (dest_wimfile) ret = wimlib_write(dest_wim, dest_wimfile, WIMLIB_ALL_IMAGES, - write_flags, num_threads, - imagex_progress_func); + write_flags, num_threads); else ret = wimlib_write_to_fd(dest_wim, dest_wim_fd, WIMLIB_ALL_IMAGES, write_flags, - num_threads, imagex_progress_func); + num_threads); out_free_dest_wim: wimlib_free(dest_wim); out_free_src_wim: @@ -2847,7 +3016,7 @@ imagex_extract(int argc, tchar **argv, int cmd) STRING_SET(refglobs); - tchar *root_path = T(""); + tchar *root_path = WIMLIB_WIM_ROOT_PATH; for_opt(c, extract_options) { switch (c) { @@ -2881,12 +3050,13 @@ 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: + case IMAGEX_NO_GLOBS_OPTION: extract_flags &= ~WIMLIB_EXTRACT_FLAG_GLOB_PATHS; break; case IMAGEX_NULLGLOB_OPTION: @@ -2898,6 +3068,11 @@ imagex_extract(int argc, tchar **argv, int cmd) case IMAGEX_WIMBOOT_OPTION: extract_flags |= WIMLIB_EXTRACT_FLAG_WIMBOOT; break; + case IMAGEX_COMPACT_OPTION: + ret = set_compact_mode(optarg, &extract_flags); + if (ret) + goto out_free_refglobs; + break; default: goto out_usage; } @@ -2911,7 +3086,7 @@ imagex_extract(int argc, tchar **argv, int cmd) if (!(extract_flags & (WIMLIB_EXTRACT_FLAG_GLOB_PATHS | WIMLIB_EXTRACT_FLAG_STRICT_GLOB))) { - imagex_error(T("Can't combine --no-wildcards and --nullglob!")); + imagex_error(T("Can't combine --no-globs and --nullglob!")); goto out_err; } @@ -2921,7 +3096,8 @@ imagex_extract(int argc, tchar **argv, int cmd) argc -= 2; argv += 2; - ret = wimlib_open_wim(wimfile, open_flags, &wim, imagex_progress_func); + ret = wimlib_open_wim_with_progress(wimfile, open_flags, &wim, + imagex_progress_func, NULL); if (ret) goto out_free_refglobs; @@ -2956,15 +3132,13 @@ imagex_extract(int argc, tchar **argv, int cmd) ret = wimlib_extract_paths(wim, image, dest_dir, (const tchar **)argv, num_paths, - extract_flags | notlist_extract_flags, - imagex_progress_func); + 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, - imagex_progress_func); + extract_flags); argc--; argv++; } @@ -2974,6 +3148,15 @@ imagex_extract(int argc, tchar **argv, int cmd) if (!imagex_be_quiet) imagex_printf(T("Done extracting files.\n")); } else if (ret == WIMLIB_ERR_PATH_DOES_NOT_EXIST) { + if ((extract_flags & (WIMLIB_EXTRACT_FLAG_STRICT_GLOB | + WIMLIB_EXTRACT_FLAG_GLOB_PATHS)) + == (WIMLIB_EXTRACT_FLAG_STRICT_GLOB | + WIMLIB_EXTRACT_FLAG_GLOB_PATHS)) + { + tfprintf(stderr, + T("Note: You can use the '--nullglob' " + "option to ignore missing files.\n")); + } tfprintf(stderr, T("Note: You can use `%"TS"' to see what " "files and directories\n" " are in the WIM image.\n"), @@ -3007,7 +3190,7 @@ imagex_info(int argc, tchar **argv, int cmd) bool check = false; bool nocheck = false; bool header = false; - bool lookup_table = false; + bool blobs = false; bool xml = false; bool short_header = true; const tchar *xml_out_file = NULL; @@ -3036,8 +3219,8 @@ imagex_info(int argc, tchar **argv, int cmd) header = true; short_header = false; break; - case IMAGEX_LOOKUP_TABLE_OPTION: - lookup_table = true; + case IMAGEX_BLOBS_OPTION: + blobs = true; short_header = false; break; case IMAGEX_XML_OPTION: @@ -3075,7 +3258,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; @@ -3131,13 +3315,13 @@ imagex_info(int argc, tchar **argv, int cmd) if (header) wimlib_print_header(wim); - if (lookup_table) { + if (blobs) { if (info.total_parts != 1) { - tfprintf(stderr, T("Warning: Only showing the lookup table " + tfprintf(stderr, T("Warning: Only showing the blobs " "for part %d of a %d-part WIM.\n"), info.part_number, info.total_parts); } - print_lookup_table(wim); + print_blobs(wim); } if (xml) { @@ -3245,8 +3429,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"), @@ -3295,12 +3478,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; @@ -3380,7 +3564,8 @@ imagex_mount_rw_or_ro(int argc, tchar **argv, int cmd) wimfile = argv[0]; - ret = wimlib_open_wim(wimfile, open_flags, &wim, imagex_progress_func); + ret = wimlib_open_wim_with_progress(wimfile, open_flags, &wim, + imagex_progress_func, NULL); if (ret) goto out_free_refglobs; @@ -3441,8 +3626,8 @@ imagex_optimize(int argc, tchar **argv, int cmd) int write_flags = WIMLIB_WRITE_FLAG_REBUILD; int compression_type = WIMLIB_COMPRESSION_TYPE_INVALID; uint32_t chunk_size = UINT32_MAX; - uint32_t pack_chunk_size = UINT32_MAX; - int pack_ctype = WIMLIB_COMPRESSION_TYPE_INVALID; + uint32_t solid_chunk_size = UINT32_MAX; + int solid_ctype = WIMLIB_COMPRESSION_TYPE_INVALID; int ret; WIMStruct *wim; const tchar *wimfile; @@ -3465,32 +3650,35 @@ imagex_optimize(int argc, tchar **argv, int cmd) if (compression_type == WIMLIB_COMPRESSION_TYPE_INVALID) goto out_err; break; - case IMAGEX_RECOMPRESS_OPTION: + case IMAGEX_COMPRESS_SLOW_OPTION: + set_compress_slow(); write_flags |= WIMLIB_WRITE_FLAG_RECOMPRESS; break; - case IMAGEX_COMPRESS_SLOW_OPTION: + case IMAGEX_RECOMPRESS_OPTION: write_flags |= WIMLIB_WRITE_FLAG_RECOMPRESS; - set_compress_slow(); break; case IMAGEX_CHUNK_SIZE_OPTION: chunk_size = parse_chunk_size(optarg); if (chunk_size == UINT32_MAX) goto out_err; break; - case IMAGEX_PACK_CHUNK_SIZE_OPTION: - pack_chunk_size = parse_chunk_size(optarg); - if (pack_chunk_size == UINT32_MAX) + case IMAGEX_SOLID_CHUNK_SIZE_OPTION: + solid_chunk_size = parse_chunk_size(optarg); + if (solid_chunk_size == UINT32_MAX) goto out_err; break; - case IMAGEX_PACK_COMPRESS_OPTION: - pack_ctype = get_compression_type(optarg); - if (pack_ctype == WIMLIB_COMPRESSION_TYPE_INVALID) + case IMAGEX_SOLID_COMPRESS_OPTION: + solid_ctype = get_compression_type(optarg); + if (solid_ctype == WIMLIB_COMPRESSION_TYPE_INVALID) goto out_err; break; - case IMAGEX_PACK_STREAMS_OPTION: - write_flags |= WIMLIB_WRITE_FLAG_PACK_STREAMS; + case IMAGEX_SOLID_OPTION: + write_flags |= WIMLIB_WRITE_FLAG_SOLID; write_flags |= WIMLIB_WRITE_FLAG_RECOMPRESS; break; + case IMAGEX_NO_SOLID_SORT_OPTION: + write_flags |= WIMLIB_WRITE_FLAG_NO_SOLID_SORT; + break; case IMAGEX_THREADS_OPTION: num_threads = parse_num_threads(optarg); if (num_threads == UINT_MAX) @@ -3514,7 +3702,8 @@ imagex_optimize(int argc, tchar **argv, int cmd) wimfile = argv[0]; - ret = wimlib_open_wim(wimfile, open_flags, &wim, imagex_progress_func); + ret = wimlib_open_wim_with_progress(wimfile, open_flags, &wim, + imagex_progress_func, NULL); if (ret) goto out; @@ -3531,13 +3720,13 @@ imagex_optimize(int argc, tchar **argv, int cmd) if (ret) goto out_wimlib_free; } - if (pack_ctype != WIMLIB_COMPRESSION_TYPE_INVALID) { - ret = wimlib_set_output_pack_compression_type(wim, pack_ctype); + if (solid_ctype != WIMLIB_COMPRESSION_TYPE_INVALID) { + ret = wimlib_set_output_pack_compression_type(wim, solid_ctype); if (ret) goto out_wimlib_free; } - if (pack_chunk_size != UINT32_MAX) { - ret = wimlib_set_output_pack_chunk_size(wim, pack_chunk_size); + if (solid_chunk_size != UINT32_MAX) { + ret = wimlib_set_output_pack_chunk_size(wim, solid_chunk_size); if (ret) goto out_wimlib_free; } @@ -3549,8 +3738,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; @@ -3618,11 +3806,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; @@ -3655,7 +3844,14 @@ imagex_unmount(int argc, tchar **argv, int cmd) unmount_flags |= WIMLIB_UNMOUNT_FLAG_REBUILD; break; case IMAGEX_LAZY_OPTION: - unmount_flags |= WIMLIB_UNMOUNT_FLAG_LAZY; + case IMAGEX_FORCE_OPTION: + /* Now, unmount is lazy by default. However, committing + * the image will fail with + * WIMLIB_ERR_MOUNTED_IMAGE_IS_BUSY if there are open + * file descriptors on the WIM image. The + * WIMLIB_UNMOUNT_FLAG_FORCE option forces these file + * descriptors to be closed. */ + unmount_flags |= WIMLIB_UNMOUNT_FLAG_FORCE; break; case IMAGEX_NEW_IMAGE_OPTION: unmount_flags |= WIMLIB_UNMOUNT_FLAG_NEW_IMAGE; @@ -3675,13 +3871,19 @@ imagex_unmount(int argc, tchar **argv, int cmd) "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) + ret = wimlib_unmount_image_with_progress(argv[0], unmount_flags, + imagex_progress_func, NULL); + if (ret) { imagex_error(T("Failed to unmount \"%"TS"\""), argv[0]); + if (ret == WIMLIB_ERR_MOUNTED_IMAGE_IS_BUSY) { + imagex_printf(T( + "\tNote: Use --commit --force to force changes " + "to be committed, regardless\n" + "\t of open files.\n")); + } + } out: return ret; @@ -3718,6 +3920,7 @@ imagex_update(int argc, tchar **argv, int cmd) size_t num_cmds; tchar *command_str = NULL; tchar *config_file = NULL; + tchar *wimboot_config = NULL; for_opt(c, update_options) { switch (c) { @@ -3748,6 +3951,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; @@ -3778,6 +3984,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; } @@ -3789,7 +3998,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; @@ -3821,7 +4031,11 @@ imagex_update(int argc, tchar **argv, int cmd) 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); @@ -3835,10 +4049,14 @@ imagex_update(int argc, tchar **argv, int cmd) /* 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 */ @@ -3857,14 +4075,29 @@ 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: @@ -3882,7 +4115,85 @@ out_err: goto out_free_command_str; } +/* Verify a WIM file. */ +static int +imagex_verify(int argc, tchar **argv, int cmd) +{ + int ret; + const tchar *wimfile; + WIMStruct *wim; + int open_flags = WIMLIB_OPEN_FLAG_CHECK_INTEGRITY; + int verify_flags = 0; + STRING_SET(refglobs); + int c; + + for_opt(c, verify_options) { + switch (c) { + case IMAGEX_REF_OPTION: + ret = string_set_append(&refglobs, optarg); + if (ret) + goto out_free_refglobs; + break; + case IMAGEX_NOCHECK_OPTION: + open_flags &= ~WIMLIB_OPEN_FLAG_CHECK_INTEGRITY; + break; + default: + goto out_usage; + } + } + + argv += optind; + argc -= optind; + + if (argc != 1) { + if (argc == 0) + imagex_error(T("Must specify a WIM file!")); + else + imagex_error(T("At most one WIM file can be specified!")); + goto out_usage; + } + + wimfile = argv[0]; + + ret = wimlib_open_wim_with_progress(wimfile, + open_flags, + &wim, + imagex_progress_func, + NULL); + if (ret) + goto out_free_refglobs; + + ret = wim_reference_globs(wim, &refglobs, open_flags); + if (ret) + goto out_wimlib_free; + + ret = wimlib_verify_wim(wim, verify_flags); + if (ret) { + tputc(T('\n'), stderr); + imagex_error(T("\"%"TS"\" failed verification!"), + wimfile); + if (ret == WIMLIB_ERR_RESOURCE_NOT_FOUND && + refglobs.num_strings == 0) + { + imagex_printf(T("Note: if this WIM file is not standalone, " + "use the --ref option to specify the other parts.\n")); + } + } else { + imagex_printf(T("\n\"%"TS"\" was successfully verified.\n"), + wimfile); + } + +out_wimlib_free: + wimlib_free(wim); +out_free_refglobs: + string_set_destroy(&refglobs); + return ret; +out_usage: + usage(CMD_VERIFY, stderr); + ret = -1; + goto out_free_refglobs; +} struct imagex_command { const tchar *name; @@ -3909,65 +4220,82 @@ static const struct imagex_command imagex_commands[] = { [CMD_UNMOUNT] = {T("unmount"), imagex_unmount}, #endif [CMD_UPDATE] = {T("update"), imagex_update}, + [CMD_VERIFY] = {T("verify"), imagex_verify}, }; +#ifdef __WIN32__ + + /* Can be a directory or source list file. But source list file is probably + * a rare use case, so just say directory. */ +# define SOURCE_STR T("DIRECTORY") + + /* Can only be a directory */ +# define TARGET_STR T("DIRECTORY") + +#else + /* Can be a directory, NTFS volume, or source list file. */ +# define SOURCE_STR T("SOURCE") + + /* Can be a directory or NTFS volume. */ +# define TARGET_STR T("TARGET") + +#endif + static const tchar *usage_strings[] = { [CMD_APPEND] = T( -" %"TS" (DIRECTORY | NTFS_VOLUME) WIMFILE\n" -" [IMAGE_NAME [IMAGE_DESCRIPTION]] [--boot] [--check]\n" -" [--nocheck] [--flags EDITION_ID] [--dereference]\n" -" [--config=FILE] [--threads=NUM_THREADS] [--source-list]\n" -" [--no-acls] [--strict-acls] [--rpfix] [--norpfix]\n" -" [--update-of=[WIMFILE:]IMAGE]\n" +" %"TS" " SOURCE_STR " WIMFILE [IMAGE_NAME [IMAGE_DESC]]\n" +" [--boot] [--check] [--nocheck] [--config=FILE]\n" +" [--threads=NUM_THREADS] [--no-acls] [--strict-acls]\n" +" [--rpfix] [--norpfix] [--update-of=[WIMFILE:]IMAGE]\n" +" [--wimboot] [--unix-data] [--dereference]\n" ), [CMD_APPLY] = T( -" %"TS" WIMFILE [(IMAGE_NUM | IMAGE_NAME | all)]\n" -" (DIRECTORY | NTFS_VOLUME) [--check] [--ref=\"GLOB\"]\n" -" [--no-acls] [--strict-acls] [--no-attributes]\n" -" [--rpfix] [--norpfix] [--hardlink] [--symlink]\n" -" [--include-invalid-names]\n" +" %"TS" WIMFILE [IMAGE] " TARGET_STR "\n" +" [--check] [--ref=\"GLOB\"] [--no-acls] [--strict-acls]\n" +" [--no-attributes] [--rpfix] [--norpfix]\n" +" [--include-invalid-names] [--wimboot] [--unix-data]\n" +" [--compact=FORMAT]\n" ), [CMD_CAPTURE] = T( -" %"TS" (DIRECTORY | NTFS_VOLUME) WIMFILE\n" -" [IMAGE_NAME [IMAGE_DESCRIPTION]] [--boot] [--check]\n" -" [--nocheck] [--compress=TYPE] [--flags EDITION_ID]\n" -" [--dereference] [--config=FILE] [--threads=NUM_THREADS]\n" -" [--source-list] [--no-acls] [--strict-acls] [--rpfix]\n" -" [--norpfix] [--update-of=[WIMFILE:]IMAGE]\n" -" [--delta-from=WIMFILE]\n" +" %"TS" " SOURCE_STR " WIMFILE [IMAGE_NAME [IMAGE_DESC]]\n" +" [--compress=TYPE] [--boot] [--check] [--nocheck]\n" +" [--config=FILE] [--threads=NUM_THREADS]\n" +" [--no-acls] [--strict-acls] [--rpfix] [--norpfix]\n" +" [--update-of=[WIMFILE:]IMAGE] [--delta-from=WIMFILE]\n" +" [--wimboot] [--unix-data] [--dereference] [--solid]\n" ), [CMD_DELETE] = T( -" %"TS" WIMFILE (IMAGE_NUM | IMAGE_NAME | all)\n" -" [--check] [--soft]\n" +" %"TS" WIMFILE IMAGE [--check] [--soft]\n" ), [CMD_DIR] = T( -" %"TS" WIMFILE (IMAGE_NUM | IMAGE_NAME | all) [--path=PATH] [--detailed]\n" +" %"TS" WIMFILE IMAGE [--path=PATH] [--detailed]\n" ), [CMD_EXPORT] = T( -" %"TS" SRC_WIMFILE (SRC_IMAGE_NUM | SRC_IMAGE_NAME | all ) \n" -" DEST_WIMFILE [DEST_IMAGE_NAME [DEST_IMAGE_DESCRIPTION]]\n" +" %"TS" SRC_WIMFILE SRC_IMAGE DEST_WIMFILE\n" +" [DEST_IMAGE_NAME [DEST_IMAGE_DESC]]\n" " [--boot] [--check] [--nocheck] [--compress=TYPE]\n" " [--ref=\"GLOB\"] [--threads=NUM_THREADS] [--rebuild]\n" +" [--wimboot] [--solid]\n" ), [CMD_EXTRACT] = T( -" %"TS" WIMFILE (IMAGE_NUM | IMAGE_NAME) [(PATH | @LISTFILE)...]\n" +" %"TS" WIMFILE IMAGE [(PATH | @LISTFILE)...]\n" " [--check] [--ref=\"GLOB\"] [--dest-dir=CMD_DIR]\n" " [--to-stdout] [--no-acls] [--strict-acls]\n" " [--no-attributes] [--include-invalid-names]\n" -" [--no-wildcards] [--nullglob] [--preserve-dir-structure]\n" +" [--no-globs] [--nullglob] [--preserve-dir-structure]\n" ), [CMD_INFO] = T( -" %"TS" WIMFILE [(IMAGE_NUM | IMAGE_NAME) [NEW_NAME\n" -" [NEW_DESC]]] [--boot] [--check] [--nocheck] [--xml]\n" -" [--extract-xml FILE] [--header] [--lookup-table]\n" +" %"TS" WIMFILE [IMAGE [NEW_NAME [NEW_DESC]]]\n" +" [--boot] [--check] [--nocheck] [--xml]\n" +" [--extract-xml FILE] [--header] [--blobs]\n" ), [CMD_JOIN] = T( @@ -3976,22 +4304,23 @@ T( #if WIM_MOUNTING_SUPPORTED [CMD_MOUNT] = T( -" %"TS" WIMFILE [(IMAGE_NUM | IMAGE_NAME)] DIRECTORY\n" +" %"TS" WIMFILE [IMAGE] DIRECTORY\n" " [--check] [--streams-interface=INTERFACE]\n" -" [--ref=\"GLOB\"] [--allow-other]\n" +" [--ref=\"GLOB\"] [--allow-other] [--unix-data]\n" ), [CMD_MOUNTRW] = T( -" %"TS" WIMFILE [(IMAGE_NUM | IMAGE_NAME)] DIRECTORY\n" +" %"TS" WIMFILE [IMAGE] DIRECTORY\n" " [--check] [--streams-interface=INTERFACE]\n" -" [--staging-dir=CMD_DIR] [--allow-other]\n" +" [--staging-dir=CMD_DIR] [--allow-other] [--unix-data]\n" ), #endif [CMD_OPTIMIZE] = T( -" %"TS" WIMFILE [--check] [--nocheck] [--recompress]\n" -" [--recompress-slow] [--compress=TYPE]\n" -" [--threads=NUM_THREADS]\n" +" %"TS" WIMFILE\n" +" [--recompress] [--compress=TYPE] [--threads=NUM_THREADS]\n" +" [--check] [--nocheck] [--solid]\n" +"\n" ), [CMD_SPLIT] = T( @@ -4000,15 +4329,21 @@ T( #if WIM_MOUNTING_SUPPORTED [CMD_UNMOUNT] = T( -" %"TS" DIRECTORY [--commit] [--check] [--rebuild] [--lazy]\n" -" [--new-image]\n" +" %"TS" DIRECTORY\n" +" [--commit] [--force] [--new-image] [--check] [--rebuild]\n" ), #endif [CMD_UPDATE] = T( -" %"TS" WIMFILE [IMAGE_NUM | IMAGE_NAME] [--check] [--rebuild]\n" -" [--threads=NUM_THREADS] [DEFAULT_ADD_OPTIONS]\n" -" [DEFAULT_DELETE_OPTIONS] [--command=STRING] [< CMDFILE]\n" +" %"TS" WIMFILE [IMAGE]\n" +" [--check] [--rebuild] [--threads=NUM_THREADS]\n" +" [DEFAULT_ADD_OPTIONS] [DEFAULT_DELETE_OPTIONS]\n" +" [--command=STRING] [--wimboot-config=FILE]\n" +" [< CMDFILE]\n" +), +[CMD_VERIFY] = +T( +" %"TS" WIMFILE [--ref=\"GLOB\"]\n" ), }; @@ -4019,7 +4354,7 @@ static const tchar *get_cmd_string(int cmd, bool nospace) { static tchar buf[50]; if (cmd == CMD_NONE) { - tsprintf(buf, T("%"TS), T(IMAGEX_PROGNAME)); + return T("wimlib-imagex"); } else if (invocation_cmd != CMD_NONE) { tsprintf(buf, T("wim%"TS), imagex_commands[cmd].name); } else { @@ -4039,8 +4374,8 @@ version(void) { static const tchar *s = T( -IMAGEX_PROGNAME " (distributed with " PACKAGE " " PACKAGE_VERSION ")\n" -"Copyright (C) 2012, 2013, 2014 Eric Biggers\n" +"wimlib-imagex (distributed with " PACKAGE " " PACKAGE_VERSION ")\n" +"Copyright (C) 2012, 2013, 2014, 2015 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" @@ -4086,10 +4421,10 @@ recommend_man_page(int cmd, FILE *fp) { const tchar *format_str; #ifdef __WIN32__ - format_str = T("Uncommon options are not listed;\n" + format_str = T("Some uncommon options are not listed;\n" "See %"TS".pdf in the doc directory for more details.\n"); #else - format_str = T("Uncommon options are not listed;\n" + format_str = T("Some uncommon options are not listed;\n" "Try `man %"TS"' for more details.\n"); #endif tfprintf(fp, format_str, get_cmd_string(cmd, true)); @@ -4116,17 +4451,20 @@ usage_all(FILE *fp) T( " %"TS" --help\n" " %"TS" --version\n" -"\n" -" The compression TYPE may be \"maximum\", \"fast\", or \"none\".\n" "\n" ); tfprintf(fp, extra, invocation_name, invocation_name); + tfprintf(fp, + T("IMAGE can be the 1-based index or name of an image in the WIM file.\n" + "For some commands IMAGE is optional if the WIM file only contains one image.\n" + "For some commands IMAGE may be \"all\".\n" + "\n")); recommend_man_page(CMD_NONE, fp); } /* 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__ @@ -4187,7 +4525,7 @@ main(int argc, char **argv) /* Allow being invoked as wimCOMMAND (e.g. wimapply). */ cmd = CMD_NONE; if (!tstrncmp(invocation_name, T("wim"), 3) && - tstrcmp(invocation_name, T(IMAGEX_PROGNAME))) { + tstrcmp(invocation_name, T("wimlib-imagex"))) { for (int i = 0; i < CMD_MAX; i++) { if (!tstrcmp(invocation_name + 3, imagex_commands[i].name))