X-Git-Url: https://wimlib.net/git/?a=blobdiff_plain;f=programs%2Fimagex.c;h=39ed2742fcaca2fd40e9af9b3deecde241bad041;hb=02c88b0b316e3ece9b488c7f078bf6a24c660928;hp=06ddeddd4060730ad083fcff690629d413583ffe;hpb=84aa21bf2722d14eff30fac2ec4904ed2ed6de52;p=wimlib diff --git a/programs/imagex.c b/programs/imagex.c index 06ddeddd..39ed2742 100644 --- a/programs/imagex.c +++ b/programs/imagex.c @@ -120,6 +120,7 @@ enum { IMAGEX_ALLOW_OTHER_OPTION, IMAGEX_BOOT_OPTION, IMAGEX_CHECK_OPTION, + IMAGEX_CHUNK_SIZE_OPTION, IMAGEX_COMMAND_OPTION, IMAGEX_COMMIT_OPTION, IMAGEX_COMPRESS_OPTION, @@ -141,7 +142,9 @@ enum { IMAGEX_NORPFIX_OPTION, IMAGEX_NOCHECK_OPTION, IMAGEX_NO_ACLS_OPTION, + IMAGEX_NO_WILDCARDS_OPTION, IMAGEX_NOT_PIPABLE_OPTION, + IMAGEX_PACK_STREAMS_OPTION, IMAGEX_PATH_OPTION, IMAGEX_PIPABLE_OPTION, IMAGEX_REBUILD_OPTION, @@ -155,6 +158,7 @@ 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, @@ -190,6 +194,8 @@ static const struct option capture_or_append_options[] = { {T("nocheck"), no_argument, NULL, IMAGEX_NOCHECK_OPTION}, {T("compress"), required_argument, NULL, IMAGEX_COMPRESS_OPTION}, {T("compress-slow"), no_argument, NULL, IMAGEX_COMPRESS_SLOW_OPTION}, + {T("chunk-size"), required_argument, NULL, IMAGEX_CHUNK_SIZE_OPTION}, + {T("pack-streams"), no_argument, NULL, IMAGEX_PACK_STREAMS_OPTION}, {T("config"), required_argument, NULL, IMAGEX_CONFIG_OPTION}, {T("dereference"), no_argument, NULL, IMAGEX_DEREFERENCE_OPTION}, {T("flags"), required_argument, NULL, IMAGEX_FLAGS_OPTION}, @@ -227,6 +233,8 @@ static const struct option export_options[] = { {T("nocheck"), no_argument, NULL, IMAGEX_NOCHECK_OPTION}, {T("no-check"), no_argument, NULL, IMAGEX_NOCHECK_OPTION}, {T("compress"), required_argument, NULL, IMAGEX_COMPRESS_OPTION}, + {T("pack-streams"),no_argument, NULL, IMAGEX_PACK_STREAMS_OPTION}, + {T("chunk-size"), required_argument, NULL, IMAGEX_CHUNK_SIZE_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}, @@ -246,6 +254,8 @@ 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("strict-wildcards"), no_argument, NULL, IMAGEX_STRICT_WILDCARDS_OPTION}, + {T("no-wildcards"), no_argument, NULL, IMAGEX_NO_WILDCARDS_OPTION}, {NULL, 0, NULL, 0}, }; @@ -286,6 +296,8 @@ static const struct option optimize_options[] = { {T("recompress"), no_argument, NULL, IMAGEX_RECOMPRESS_OPTION}, {T("compress-slow"), no_argument, NULL, IMAGEX_COMPRESS_SLOW_OPTION}, {T("recompress-slow"), no_argument, NULL, IMAGEX_COMPRESS_SLOW_OPTION}, + {T("chunk-size"), required_argument, NULL, IMAGEX_CHUNK_SIZE_OPTION}, + {T("pack-streams"),no_argument, NULL, IMAGEX_PACK_STREAMS_OPTION}, {T("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}, @@ -411,6 +423,8 @@ get_compression_type(const tchar *optarg) return WIMLIB_COMPRESSION_TYPE_LZX; else if (!tstrcasecmp(optarg, T("fast")) || !tstrcasecmp(optarg, T("xpress"))) return WIMLIB_COMPRESSION_TYPE_XPRESS; + else if (!tstrcasecmp(optarg, T("recovery")) || !tstrcasecmp(optarg, T("lzms"))) + return WIMLIB_COMPRESSION_TYPE_LZMS; else if (!tstrcasecmp(optarg, T("none"))) return WIMLIB_COMPRESSION_TYPE_NONE; else { @@ -424,8 +438,10 @@ static int set_compress_slow(void) { int ret; - static const struct wimlib_lzx_params slow_params = { - .size_of_this = sizeof(struct wimlib_lzx_params), + static const struct wimlib_lzx_compressor_params slow_params = { + .hdr = { + .size = sizeof(struct wimlib_lzx_compressor_params), + }, .algorithm = WIMLIB_LZX_ALGORITHM_SLOW, .alg_params = { .slow = { @@ -440,7 +456,8 @@ set_compress_slow(void) }, }, }; - ret = wimlib_lzx_set_default_params(&slow_params); + ret = wimlib_set_default_compressor_params(WIMLIB_COMPRESSION_TYPE_LZX, + &slow_params.hdr); if (ret) imagex_error(T("Couldn't set slow compression parameters.!")); return ret; @@ -1021,22 +1038,6 @@ stdin_get_text_contents(size_t *num_tchars_ret) #define TO_PERCENT(numerator, denominator) \ (((denominator) == 0) ? 0 : ((numerator) * 100 / (denominator))) -/* Given an enumerated value for WIM compression type, return a descriptive - * string. */ -static const tchar * -get_data_type(int ctype) -{ - switch (ctype) { - case WIMLIB_COMPRESSION_TYPE_NONE: - return T("uncompressed"); - case WIMLIB_COMPRESSION_TYPE_LZX: - return T("LZX-compressed"); - case WIMLIB_COMPRESSION_TYPE_XPRESS: - return T("XPRESS-compressed"); - } - return NULL; -} - #define GIBIBYTE_MIN_NBYTES 10000000000ULL #define MEBIBYTE_MIN_NBYTES 10000000ULL #define KIBIBYTE_MIN_NBYTES 10000ULL @@ -1059,6 +1060,34 @@ get_unit(uint64_t total_bytes, const tchar **name_ret) } } +static struct wimlib_progress_info_scan last_scan_progress; + +static void +report_scan_progress(const struct wimlib_progress_info_scan *scan, bool done) +{ + uint64_t prev_count, cur_count; + + prev_count = last_scan_progress.num_nondirs_scanned + + last_scan_progress.num_dirs_scanned; + cur_count = scan->num_nondirs_scanned + scan->num_dirs_scanned; + + if (done || prev_count == 0 || cur_count >= prev_count + 100 || + cur_count % 128 == 0) + { + unsigned unit_shift; + const tchar *unit_name; + + unit_shift = get_unit(scan->num_bytes_scanned, &unit_name); + imagex_printf(T("\r%"PRIu64" %"TS" scanned (%"PRIu64" files, " + "%"PRIu64" directories) "), + scan->num_bytes_scanned >> unit_shift, + unit_name, + scan->num_nondirs_scanned, + scan->num_dirs_scanned); + last_scan_progress = *scan; + } +} + /* Progress callback function passed to various wimlib functions. */ static int imagex_progress_func(enum wimlib_progress_msg msg, @@ -1067,6 +1096,7 @@ imagex_progress_func(enum wimlib_progress_msg msg, unsigned percent_done; unsigned unit_shift; const tchar *unit_name; + if (imagex_be_quiet) return 0; switch (msg) { @@ -1076,11 +1106,9 @@ imagex_progress_func(enum wimlib_progress_msg msg, info->write_streams.total_bytes); if (info->write_streams.completed_streams == 0) { - const tchar *data_type; - - data_type = get_data_type(info->write_streams.compression_type); - imagex_printf(T("Writing %"TS" data using %u thread%"TS"\n"), - data_type, info->write_streams.num_threads, + imagex_printf(T("Writing %"TS"-compressed data using %u thread%"TS"\n"), + wimlib_get_compression_type_string(info->write_streams.compression_type), + info->write_streams.num_threads, (info->write_streams.num_threads == 1) ? T("") : T("s")); } if (info->write_streams.total_parts <= 1) { @@ -1115,23 +1143,36 @@ imagex_progress_func(enum wimlib_progress_msg msg, "\""WIMLIB_WIM_PATH_SEPARATOR_STRING"%"TS"\")...\n"), info->scan.wim_target_path); } else { - imagex_printf(T(" (loading as root of WIM image)...\n")); + imagex_printf(T("\n")); } + memset(&last_scan_progress, 0, sizeof(last_scan_progress)); break; case WIMLIB_PROGRESS_MSG_SCAN_DENTRY: switch (info->scan.status) { case WIMLIB_SCAN_DENTRY_OK: - imagex_printf(T("Scanning \"%"TS"\"\n"), info->scan.cur_path); + report_scan_progress(&info->scan, false); break; case WIMLIB_SCAN_DENTRY_EXCLUDED: - imagex_printf(T("Excluding \"%"TS"\" from capture\n"), info->scan.cur_path); + imagex_printf(T("\nExcluding \"%"TS"\" from capture\n"), info->scan.cur_path); break; case WIMLIB_SCAN_DENTRY_UNSUPPORTED: - imagex_printf(T("WARNING: Excluding unsupported file or directory\n" + imagex_printf(T("\nWARNING: Excluding unsupported file or directory\n" " \"%"TS"\" from capture\n"), info->scan.cur_path); break; + case WIMLIB_SCAN_DENTRY_EXCLUDED_SYMLINK: + imagex_printf(T("\nWARNING: Ignoring absolute symbolic link " + "with out-of-tree target:\n" + " \"%"TS"\" => \"%"TS"\"\n" + " (Use --norpfix to capture " + "absolute symbolic links as-is)\n"), + info->scan.cur_path, info->scan.symlink_target); + break; } break; + case WIMLIB_PROGRESS_MSG_SCAN_END: + report_scan_progress(&info->scan, true); + imagex_printf(T("\n")); + break; case WIMLIB_PROGRESS_MSG_VERIFY_INTEGRITY: unit_shift = get_unit(info->integrity.total_bytes, &unit_name); percent_done = TO_PERCENT(info->integrity.completed_bytes, @@ -1172,14 +1213,17 @@ imagex_progress_func(enum wimlib_progress_msg msg, info->extract.target); break; case WIMLIB_PROGRESS_MSG_EXTRACT_TREE_BEGIN: - imagex_printf(T("Extracting " - "\""WIMLIB_WIM_PATH_SEPARATOR_STRING"%"TS"\" from image %d (\"%"TS"\") " - "in \"%"TS"\" to \"%"TS"\"\n"), - info->extract.extract_root_wim_source_path, - info->extract.image, - info->extract.image_name, - info->extract.wimfile_name, - info->extract.target); + 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); + } break; case WIMLIB_PROGRESS_MSG_EXTRACT_STREAMS: percent_done = TO_PERCENT(info->extract.completed_bytes, @@ -1273,6 +1317,19 @@ parse_num_threads(const tchar *optarg) } } +static uint32_t parse_chunk_size(const tchar *optarg) +{ + tchar *tmp; + unsigned long chunk_size = tstrtoul(optarg, &tmp, 10); + if (chunk_size >= UINT32_MAX || *tmp || tmp == optarg) { + imagex_error(T("Chunk size must be a non-negative integer!")); + return UINT32_MAX; + } else { + return chunk_size; + } +} + + /* * Parse an option passed to an update command. * @@ -1495,7 +1552,7 @@ imagex_apply(int argc, tchar **argv, int cmd) const tchar *wimfile; const tchar *target; const tchar *image_num_or_name = NULL; - int extract_flags = WIMLIB_EXTRACT_FLAG_SEQUENTIAL; + int extract_flags = 0; STRING_SET(refglobs); @@ -1511,7 +1568,7 @@ imagex_apply(int argc, tchar **argv, int cmd) extract_flags |= WIMLIB_EXTRACT_FLAG_SYMLINK; break; case IMAGEX_VERBOSE_OPTION: - extract_flags |= WIMLIB_EXTRACT_FLAG_VERBOSE; + /* No longer does anything. */ break; case IMAGEX_REF_OPTION: ret = string_set_append(&refglobs, optarg); @@ -1668,9 +1725,11 @@ 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_WINCONFIG | + WIMLIB_ADD_IMAGE_FLAG_VERBOSE; int write_flags = 0; int compression_type = WIMLIB_COMPRESSION_TYPE_INVALID; + uint32_t chunk_size = UINT32_MAX; const tchar *wimfile; int wim_fd; const tchar *name; @@ -1731,6 +1790,14 @@ imagex_capture_or_append(int argc, tchar **argv, int cmd) goto out_err; compression_type = WIMLIB_COMPRESSION_TYPE_LZX; break; + case IMAGEX_CHUNK_SIZE_OPTION: + chunk_size = parse_chunk_size(optarg); + if (chunk_size == UINT32_MAX) + goto out_err; + break; + case IMAGEX_PACK_STREAMS_OPTION: + write_flags |= WIMLIB_WRITE_FLAG_PACK_STREAMS; + break; case IMAGEX_FLAGS_OPTION: flags_element = optarg; break; @@ -1738,7 +1805,7 @@ imagex_capture_or_append(int argc, tchar **argv, int cmd) add_image_flags |= WIMLIB_ADD_IMAGE_FLAG_DEREFERENCE; break; case IMAGEX_VERBOSE_OPTION: - add_image_flags |= WIMLIB_ADD_IMAGE_FLAG_VERBOSE; + /* No longer does anything. */ break; case IMAGEX_THREADS_OPTION: num_threads = parse_num_threads(optarg); @@ -1817,13 +1884,14 @@ imagex_capture_or_append(int argc, tchar **argv, int cmd) /* Set default compression type. */ if (compression_type == WIMLIB_COMPRESSION_TYPE_INVALID) { - struct wimlib_lzx_params params; + struct wimlib_lzx_compressor_params params; memset(¶ms, 0, sizeof(params)); - params.size_of_this = sizeof(params); + params.hdr.size = sizeof(params); params.algorithm = WIMLIB_LZX_ALGORITHM_FAST; params.use_defaults = 1; - wimlib_lzx_set_default_params(¶ms); + wimlib_set_default_compressor_params(WIMLIB_COMPRESSION_TYPE_LZX, + ¶ms.hdr); compression_type = WIMLIB_COMPRESSION_TYPE_LZX; } @@ -1961,6 +2029,13 @@ imagex_capture_or_append(int argc, tchar **argv, int cmd) if (ret) goto out_free_config; + /* Set chunk size if non-default. */ + if (chunk_size != UINT32_MAX) { + ret = wimlib_set_output_chunk_size(wim, chunk_size); + if (ret) + goto out_free_wim; + } + #ifndef __WIN32__ /* Detect if source is regular file or block device and set NTFS volume * capture mode. */ @@ -2352,6 +2427,7 @@ imagex_export(int argc, tchar **argv, int cmd) bool wim_is_new; STRING_SET(refglobs); unsigned num_threads = 0; + uint32_t chunk_size = UINT32_MAX; for_opt(c, export_options) { switch (c) { @@ -2370,6 +2446,14 @@ imagex_export(int argc, tchar **argv, int cmd) if (compression_type == WIMLIB_COMPRESSION_TYPE_INVALID) goto out_err; break; + case IMAGEX_PACK_STREAMS_OPTION: + write_flags |= WIMLIB_WRITE_FLAG_PACK_STREAMS; + break; + case IMAGEX_CHUNK_SIZE_OPTION: + chunk_size = parse_chunk_size(optarg); + if (chunk_size == UINT32_MAX) + goto out_err; + break; case IMAGEX_REF_OPTION: ret = string_set_append(&refglobs, optarg); if (ret) @@ -2486,6 +2570,18 @@ imagex_export(int argc, tchar **argv, int cmd) 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_set_output_chunk_size(dest_wim, src_info.chunk_size); + } + + if (chunk_size != UINT32_MAX) { + /* Set destination chunk size. */ + ret = wimlib_set_output_chunk_size(dest_wim, chunk_size); + if (ret) + goto out_free_dest_wim; } image = wimlib_resolve_image(src_wim, src_image_num_or_name); @@ -2616,8 +2712,10 @@ 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_SEQUENTIAL | WIMLIB_EXTRACT_FLAG_NORPFIX; + int extract_flags = WIMLIB_EXTRACT_FLAG_NORPFIX; + int listfile_extract_flags = WIMLIB_EXTRACT_FLAG_GLOB_PATHS; STRING_SET(refglobs); @@ -2630,7 +2728,7 @@ imagex_extract(int argc, tchar **argv, int cmd) open_flags |= WIMLIB_OPEN_FLAG_CHECK_INTEGRITY; break; case IMAGEX_VERBOSE_OPTION: - extract_flags |= WIMLIB_EXTRACT_FLAG_VERBOSE; + /* No longer does anything. */ break; case IMAGEX_REF_OPTION: ret = string_set_append(&refglobs, optarg); @@ -2658,6 +2756,12 @@ imagex_extract(int argc, tchar **argv, int cmd) extract_flags |= WIMLIB_EXTRACT_FLAG_REPLACE_INVALID_FILENAMES; extract_flags |= WIMLIB_EXTRACT_FLAG_ALL_CASE_CONFLICTS; break; + case IMAGEX_NO_WILDCARDS_OPTION: + listfile_extract_flags &= ~WIMLIB_EXTRACT_FLAG_GLOB_PATHS; + break; + case IMAGEX_STRICT_WILDCARDS_OPTION: + listfile_extract_flags |= WIMLIB_EXTRACT_FLAG_STRICT_GLOB; + break; default: goto out_usage; } @@ -2674,10 +2778,17 @@ imagex_extract(int argc, tchar **argv, int cmd) argc -= 2; argv += 2; - cmds = prepare_extract_commands(argv, argc, extract_flags, dest_dir, - &num_cmds); - if (!cmds) - goto out_err; + 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) @@ -2696,8 +2807,17 @@ imagex_extract(int argc, tchar **argv, int cmd) goto out_wimlib_free; } - ret = wimlib_extract_files(wim, image, cmds, num_cmds, 0, - imagex_progress_func); + ret = 0; + if (ret == 0 && cmds != NULL) { + ret = wimlib_extract_files(wim, image, cmds, num_cmds, 0, + imagex_progress_func); + } + if (ret == 0 && pathlist != NULL) { + ret = wimlib_extract_pathlist(wim, image, dest_dir, + pathlist, + extract_flags | listfile_extract_flags, + imagex_progress_func); + } if (ret == 0) { if (!imagex_be_quiet) imagex_printf(T("Done extracting files.\n")); @@ -2705,7 +2825,7 @@ imagex_extract(int argc, tchar **argv, int cmd) tfprintf(stderr, T("Note: You can use `%"TS"' to see what " "files and directories\n" " are in the WIM image.\n"), - get_cmd_string(CMD_INFO, false)); + get_cmd_string(CMD_DIR, false)); } else if (ret == WIMLIB_ERR_RESOURCE_NOT_FOUND) { struct wimlib_wim_info info; @@ -2742,9 +2862,12 @@ print_wim_information(const tchar *wimfile, const struct wimlib_wim_info *info) tprintf(T("GUID: 0x")); print_byte_field(info->guid, sizeof(info->guid)); tputchar(T('\n')); + tprintf(T("Version: %u\n"), info->wim_version); tprintf(T("Image Count: %d\n"), info->image_count); tprintf(T("Compression: %"TS"\n"), wimlib_get_compression_type_string(info->compression_type)); + tprintf(T("Chunk Size: %"PRIu32" bytes\n"), + info->chunk_size); tprintf(T("Part Number: %d/%d\n"), info->part_number, info->total_parts); tprintf(T("Boot Index: %d\n"), info->boot_index); tprintf(T("Size: %"PRIu64" bytes\n"), info->total_bytes); @@ -2761,25 +2884,33 @@ static int print_resource(const struct wimlib_resource_entry *resource, void *_ignore) { - - 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("Compressed size = %"PRIu64" bytes\n"), - resource->compressed_size); + tprintf(T("Raw offset in WIM = %"PRIu64" bytes\n"), + resource->raw_resource_offset_in_wim); - tprintf(T("Offset = %"PRIu64" bytes\n"), - resource->offset); + tprintf(T("Offset in raw = %"PRIu64" bytes\n"), + resource->offset); + } else { + tprintf(T("Compressed size = %"PRIu64" bytes\n"), + resource->compressed_size); + tprintf(T("Offset in WIM = %"PRIu64" bytes\n"), + resource->offset); + } - tprintf(T("Part Number = %u\n"), resource->part_number); - tprintf(T("Reference Count = %u\n"), resource->reference_count); + tprintf(T("Part Number = %u\n"), resource->part_number); + tprintf(T("Reference Count = %u\n"), resource->reference_count); - tprintf(T("Hash = 0x")); + tprintf(T("Hash = 0x")); print_byte_field(resource->sha1_hash, sizeof(resource->sha1_hash)); tputchar(T('\n')); - tprintf(T("Flags = ")); + tprintf(T("Flags = ")); if (resource->is_compressed) tprintf(T("WIM_RESHDR_FLAG_COMPRESSED ")); if (resource->is_metadata) @@ -2788,6 +2919,8 @@ print_resource(const struct wimlib_resource_entry *resource, tprintf(T("WIM_RESHDR_FLAG_FREE ")); if (resource->is_spanned) tprintf(T("WIM_RESHDR_FLAG_SPANNED ")); + if (resource->packed) + tprintf(T("WIM_RESHDR_FLAG_PACKED_STREAMS ")); tputchar(T('\n')); tputchar(T('\n')); return 0; @@ -3248,6 +3381,7 @@ imagex_optimize(int argc, tchar **argv, int cmd) int open_flags = WIMLIB_OPEN_FLAG_WRITE_ACCESS; int write_flags = WIMLIB_WRITE_FLAG_REBUILD; int compression_type = WIMLIB_COMPRESSION_TYPE_INVALID; + uint32_t chunk_size = UINT32_MAX; int ret; WIMStruct *wim; const tchar *wimfile; @@ -3280,6 +3414,15 @@ imagex_optimize(int argc, tchar **argv, int cmd) if (ret) goto out_err; break; + case IMAGEX_CHUNK_SIZE_OPTION: + chunk_size = parse_chunk_size(optarg); + if (chunk_size == UINT32_MAX) + goto out_err; + break; + case IMAGEX_PACK_STREAMS_OPTION: + write_flags |= WIMLIB_WRITE_FLAG_PACK_STREAMS; + write_flags |= WIMLIB_WRITE_FLAG_RECOMPRESS; + break; case IMAGEX_THREADS_OPTION: num_threads = parse_num_threads(optarg); if (num_threads == UINT_MAX) @@ -3308,11 +3451,19 @@ imagex_optimize(int argc, tchar **argv, int cmd) goto out; if (compression_type != WIMLIB_COMPRESSION_TYPE_INVALID) { + /* Change compression type. */ ret = wimlib_set_output_compression_type(wim, compression_type); if (ret) goto out_wimlib_free; } + if (chunk_size != UINT32_MAX) { + /* Change chunk size. */ + ret = wimlib_set_output_chunk_size(wim, chunk_size); + if (ret) + goto out_wimlib_free; + } + old_size = file_get_size(wimfile); tprintf(T("\"%"TS"\" original size: "), wimfile); if (old_size == -1) @@ -3464,7 +3615,8 @@ imagex_update(int argc, tchar **argv, int cmd) int open_flags = WIMLIB_OPEN_FLAG_WRITE_ACCESS; int write_flags = 0; int update_flags = WIMLIB_UPDATE_FLAG_SEND_PROGRESS; - int default_add_flags = WIMLIB_ADD_FLAG_EXCLUDE_VERBOSE; + int default_add_flags = WIMLIB_ADD_FLAG_EXCLUDE_VERBOSE | + WIMLIB_ADD_FLAG_VERBOSE; int default_delete_flags = 0; unsigned num_threads = 0; int c; @@ -3523,7 +3675,7 @@ imagex_update(int argc, tchar **argv, int cmd) /* Default add options */ case IMAGEX_VERBOSE_OPTION: - default_add_flags |= WIMLIB_ADD_FLAG_VERBOSE; + /* No longer does anything. */ break; case IMAGEX_DEREFERENCE_OPTION: default_add_flags |= WIMLIB_ADD_FLAG_DEREFERENCE; @@ -3699,36 +3851,33 @@ static const tchar *usage_strings[] = { [CMD_APPEND] = T( " %"TS" (DIRECTORY | NTFS_VOLUME) WIMFILE\n" -" [IMAGE_NAME [IMAGE_DESCRIPTION]] [--boot]\n" -" [--check] [--nocheck] [--flags EDITION_ID] [--verbose]\n" -" [--dereference] [--config=FILE] [--threads=NUM_THREADS]\n" -" [--source-list] [--no-acls] [--strict-acls] [--rpfix]\n" -" [--norpfix] [--unix-data] [--pipable]\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" ), [CMD_APPLY] = T( " %"TS" WIMFILE [(IMAGE_NUM | IMAGE_NAME | all)]\n" -" (DIRECTORY | NTFS_VOLUME) [--check] [--hardlink]\n" -" [--symlink] [--verbose] [--ref=\"GLOB\"] [--unix-data]\n" +" (DIRECTORY | NTFS_VOLUME) [--check] [--ref=\"GLOB\"]\n" " [--no-acls] [--strict-acls] [--rpfix] [--norpfix]\n" -" [--include-invalid-names]\n" +" [--hardlink] [--symlink] [--include-invalid-names]\n" ), [CMD_CAPTURE] = T( " %"TS" (DIRECTORY | NTFS_VOLUME) WIMFILE\n" -" [IMAGE_NAME [IMAGE_DESCRIPTION]] [--boot]\n" -" [--check] [--nocheck] [--compress=TYPE]\n" -" [--flags EDITION_ID] [--verbose] [--dereference]\n" -" [--config=FILE] [--threads=NUM_THREADS] [--source-list]\n" -" [--no-acls] [--strict-acls] [--rpfix] [--norpfix]\n" -" [--unix-data] [--pipable] [--update-of=[WIMFILE:]IMAGE]\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" ), [CMD_DELETE] = T( -" %"TS" WIMFILE (IMAGE_NUM | IMAGE_NAME | all) [--check]\n" -" [--soft]\n" +" %"TS" WIMFILE (IMAGE_NUM | IMAGE_NAME | all)\n" +" [--check] [--soft]\n" ), [CMD_DIR] = T( @@ -3740,21 +3889,19 @@ T( " DEST_WIMFILE [DEST_IMAGE_NAME [DEST_IMAGE_DESCRIPTION]]\n" " [--boot] [--check] [--nocheck] [--compress=TYPE]\n" " [--ref=\"GLOB\"] [--threads=NUM_THREADS] [--rebuild]\n" -" [--pipable] [--not-pipable]\n" ), [CMD_EXTRACT] = T( -" %"TS" WIMFILE (IMAGE_NUM | IMAGE_NAME) [PATH...]\n" -" [--check] [--ref=\"GLOB\"] [--verbose] [--unix-data]\n" -" [--no-acls] [--strict-acls] [--to-stdout]\n" -" [--dest-dir=CMD_DIR] [--include-invalid-names]\n" +" %"TS" WIMFILE (IMAGE_NUM | IMAGE_NAME) ([PATH...] | @LISTFILE)\n" +" [--check] [--ref=\"GLOB\"] [--no-acls] [--strict-acls]\n" +" [--to-stdout] [--dest-dir=CMD_DIR]\n" +" [--include-invalid-names]\n" ), [CMD_INFO] = T( " %"TS" WIMFILE [(IMAGE_NUM | IMAGE_NAME) [NEW_NAME\n" -" [NEW_DESC]]] [--boot] [--check] [--nocheck] [--header]\n" -" [--lookup-table] [--xml] [--extract-xml FILE]\n" -" [--metadata]\n" +" [NEW_DESC]]] [--boot] [--check] [--nocheck] [--xml]\n" +" [--extract-xml FILE] [--header] [--lookup-table]\n" ), [CMD_JOIN] = T( @@ -3764,21 +3911,21 @@ T( [CMD_MOUNT] = T( " %"TS" WIMFILE [(IMAGE_NUM | IMAGE_NAME)] DIRECTORY\n" -" [--check] [--debug] [--streams-interface=INTERFACE]\n" -" [--ref=\"GLOB\"] [--unix-data] [--allow-other]\n" +" [--check] [--streams-interface=INTERFACE]\n" +" [--ref=\"GLOB\"] [--allow-other]\n" ), [CMD_MOUNTRW] = T( " %"TS" WIMFILE [(IMAGE_NUM | IMAGE_NAME)] DIRECTORY\n" -" [--check] [--debug] [--streams-interface=INTERFACE]\n" -" [--staging-dir=CMD_DIR] [--unix-data] [--allow-other]\n" +" [--check] [--streams-interface=INTERFACE]\n" +" [--staging-dir=CMD_DIR] [--allow-other]\n" ), #endif [CMD_OPTIMIZE] = T( " %"TS" WIMFILE [--check] [--nocheck] [--recompress]\n" " [--recompress-slow] [--compress=TYPE]\n" -" [--threads=NUM_THREADS] [--pipable] [--not-pipable]\n" +" [--threads=NUM_THREADS]\n" ), [CMD_SPLIT] = T( @@ -3872,9 +4019,11 @@ recommend_man_page(int cmd, FILE *fp) { const tchar *format_str; #ifdef __WIN32__ - format_str = T("See %"TS".pdf in the doc directory for more details.\n"); + format_str = T("Uncommon options are not listed;\n" + "See %"TS".pdf in the doc directory for more details.\n"); #else - format_str = T("Try `man %"TS"' for more details.\n"); + format_str = T("Uncommon options are not listed;\n" + "Try `man %"TS"' for more details.\n"); #endif tfprintf(fp, format_str, get_cmd_string(cmd, true)); } @@ -3948,8 +4097,26 @@ main(int argc, char **argv) } } + #endif /* !__WIN32__ */ + { + tchar *igcase = tgetenv(T("WIMLIB_IMAGEX_IGNORE_CASE")); + if (igcase != NULL) { + if (!tstrcmp(igcase, T("no")) || + !tstrcmp(igcase, T("0"))) + init_flags |= WIMLIB_INIT_FLAG_DEFAULT_CASE_SENSITIVE; + else if (!tstrcmp(igcase, T("yes")) || + !tstrcmp(igcase, T("1"))) + init_flags |= WIMLIB_INIT_FLAG_DEFAULT_CASE_INSENSITIVE; + else { + fprintf(stderr, + "WARNING: Ignoring unknown setting of " + "WIMLIB_IMAGEX_IGNORE_CASE\n"); + } + } + } + /* Allow being invoked as wimCOMMAND (e.g. wimapply). */ cmd = CMD_NONE; if (!tstrncmp(invocation_name, T("wim"), 3) &&