X-Git-Url: https://wimlib.net/git/?a=blobdiff_plain;f=programs%2Fimagex.c;h=92e64ee775d0b815567e1eb99a566a55b45741c1;hb=13fc8902399d2f15819b6fc7a01c3d20494e943a;hp=33274616d6604700058f396c5d9f239aea898cec;hpb=883833a4b3dabec325edf1ca938000f91d587c00;p=wimlib diff --git a/programs/imagex.c b/programs/imagex.c index 33274616..92e64ee7 100644 --- a/programs/imagex.c +++ b/programs/imagex.c @@ -142,7 +142,7 @@ enum { IMAGEX_NORPFIX_OPTION, IMAGEX_NOCHECK_OPTION, IMAGEX_NO_ACLS_OPTION, - IMAGEX_NO_PACK_STREAMS_OPTION, + IMAGEX_NO_WILDCARDS_OPTION, IMAGEX_NOT_PIPABLE_OPTION, IMAGEX_PACK_STREAMS_OPTION, IMAGEX_PATH_OPTION, @@ -158,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, @@ -232,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}, @@ -251,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}, }; @@ -293,7 +298,6 @@ static const struct option optimize_options[] = { {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("no-pack-streams"), no_argument, NULL, IMAGEX_NO_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}, @@ -2412,6 +2416,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) { @@ -2430,6 +2435,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) @@ -2547,7 +2560,17 @@ imagex_export(int argc, tchar **argv, int cmd) if (ret) goto out_free_src_wim; - wimlib_set_output_chunk_size(dest_wim, src_info.chunk_size); + /* 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); @@ -2678,8 +2701,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 listfile_extract_flags = WIMLIB_EXTRACT_FLAG_GLOB_PATHS; STRING_SET(refglobs); @@ -2720,6 +2745,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; } @@ -2736,10 +2767,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) @@ -2758,8 +2796,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")); @@ -2767,7 +2814,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; @@ -3365,9 +3412,6 @@ imagex_optimize(int argc, tchar **argv, int cmd) write_flags |= WIMLIB_WRITE_FLAG_PACK_STREAMS; write_flags |= WIMLIB_WRITE_FLAG_RECOMPRESS; break; - case IMAGEX_NO_PACK_STREAMS_OPTION: - write_flags |= WIMLIB_WRITE_FLAG_NO_PACK_STREAMS; - break; case IMAGEX_THREADS_OPTION: num_threads = parse_num_threads(optarg); if (num_threads == UINT_MAX) @@ -3796,36 +3840,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]\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] [--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] [--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( @@ -3837,21 +3878,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\"] [--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( @@ -3861,21 +3900,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( @@ -3969,9 +4008,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)); } @@ -4045,8 +4086,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) &&