X-Git-Url: https://wimlib.net/git/?p=wimlib;a=blobdiff_plain;f=programs%2Fimagex.c;h=977f21be48c2cb714e8d3191f0b9a0400c0e6823;hp=aa3cbbf4e7e1232f9dd93db50a5665b333a035e1;hb=773fafce334bd429d35365adfd377a0b63c66953;hpb=dfe9023318cd8f4ea1ff2279c469ee1d5cb71e67 diff --git a/programs/imagex.c b/programs/imagex.c index aa3cbbf4..977f21be 100644 --- a/programs/imagex.c +++ b/programs/imagex.c @@ -60,144 +60,61 @@ # define tglob glob # define OS_PREFERRED_PATH_SEPARATOR '/' # define OS_PREFERRED_PATH_SEPARATOR_STRING "/" +static inline void set_fd_to_binary_mode(int fd) +{ +} #endif /* !__WIN32 */ +/* Don't confuse the user by presenting the mounting commands on Windows when + * they will never work. However on UNIX-like systems we always present them, + * even if WITH_FUSE is not defined at this point, as to not tie the build of + * wimlib-imagex to a specific build of wimlib. */ +#ifdef __WIN32__ +# define WIM_MOUNTING_SUPPORTED 0 +#else +# define WIM_MOUNTING_SUPPORTED 1 +#endif #define ARRAY_LEN(array) (sizeof(array) / sizeof(array[0])) #define for_opt(c, opts) while ((c = getopt_long_only(argc, (tchar**)argv, T(""), \ opts, NULL)) != -1) -enum imagex_op_type { - APPEND = 0, - APPLY, - CAPTURE, - DELETE, - DIR, - EXPORT, - EXTRACT, - INFO, - JOIN, - MOUNT, - MOUNTRW, - OPTIMIZE, - SPLIT, - UNMOUNT, - UPDATE, + +enum { + CMD_NONE = -1, + CMD_APPEND = 0, + CMD_APPLY, + CMD_CAPTURE, + CMD_DELETE, + CMD_DIR, + CMD_EXPORT, + CMD_EXTRACT, + CMD_INFO, + CMD_JOIN, +#if WIM_MOUNTING_SUPPORTED + CMD_MOUNT, + CMD_MOUNTRW, +#endif + CMD_OPTIMIZE, + CMD_SPLIT, +#if WIM_MOUNTING_SUPPORTED + CMD_UNMOUNT, +#endif + CMD_UPDATE, + CMD_MAX, }; -static void usage(int cmd_type); -static void usage_all(void); +static void usage(int cmd, FILE *fp); +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 bool imagex_be_quiet = false; +static FILE *imagex_info_file; - -static const tchar *usage_strings[] = { -[APPEND] = -T( -IMAGEX_PROGNAME" append (DIRECTORY | NTFS_VOLUME) WIMFILE [IMAGE_NAME]\n" -" [DESCRIPTION] [--boot] [--check] [--flags EDITION_ID]\n" -" [--verbose] [--dereference] [--config=FILE]\n" -" [--threads=NUM_THREADS] [--rebuild] [--unix-data]\n" -" [--source-list] [--no-acls] [--strict-acls]\n" -" [--rpfix] [--norpfix]\n" -), -[APPLY] = -T( -IMAGEX_PROGNAME" apply WIMFILE [IMAGE_NUM | IMAGE_NAME | all]\n" -" (DIRECTORY | NTFS_VOLUME) [--check] [--hardlink]\n" -" [--symlink] [--verbose] [--ref=\"GLOB\"] [--unix-data]\n" -" [--no-acls] [--strict-acls] [--rpfix] [--norpfix]\n" -" [--include-invalid-names]\n" -), -[CAPTURE] = -T( -IMAGEX_PROGNAME" capture (DIRECTORY | NTFS_VOLUME) WIMFILE [IMAGE_NAME]\n" -" [DESCRIPTION] [--boot] [--check] [--compress=TYPE]\n" -" [--flags EDITION_ID] [--verbose] [--dereference]\n" -" [--config=FILE] [--threads=NUM_THREADS] [--unix-data]\n" -" [--source-list] [--no-acls] [--strict-acls]\n" -" [--rpfix] [--norpfix]\n" -), -[DELETE] = -T( -IMAGEX_PROGNAME" delete WIMFILE (IMAGE_NUM | IMAGE_NAME | all) [--check] [--soft]\n" -), -[DIR] = -T( -IMAGEX_PROGNAME" dir WIMFILE (IMAGE_NUM | IMAGE_NAME | all) [--path=PATH]\n" -), -[EXPORT] = -T( -IMAGEX_PROGNAME" export SRC_WIMFILE (SRC_IMAGE_NUM | SRC_IMAGE_NAME | all ) \n" -" DEST_WIMFILE [DEST_IMAGE_NAME] [DEST_IMAGE_DESCRIPTION]\n" -" [--boot] [--check] [--compress=TYPE] [--ref=\"GLOB\"]\n" -" [--threads=NUM_THREADS] [--rebuild]\n" -), -[EXTRACT] = -T( -IMAGEX_PROGNAME" extract WIMFILE (IMAGE_NUM | IMAGE_NAME) [PATH...]\n" -" [--check] [--ref=\"GLOB\"] [--verbose] [--unix-data]\n" -" [--no-acls] [--strict-acls] [--to-stdout] [--dest-dir=DIR]\n" -" [--include-invalid-names]\n" -), -[INFO] = -T( -IMAGEX_PROGNAME" info WIMFILE [IMAGE_NUM | IMAGE_NAME] [NEW_NAME]\n" -" [NEW_DESC] [--boot] [--check] [--header] [--lookup-table]\n" -" [--xml] [--extract-xml FILE] [--metadata]\n" -), -[JOIN] = -T( -IMAGEX_PROGNAME" join [--check] WIMFILE SPLIT_WIM...\n" -), -[MOUNT] = -T( -IMAGEX_PROGNAME" mount WIMFILE (IMAGE_NUM | IMAGE_NAME) DIRECTORY\n" -" [--check] [--debug] [--streams-interface=INTERFACE]\n" -" [--ref=\"GLOB\"] [--unix-data] [--allow-other]\n" -), -[MOUNTRW] = -T( -IMAGEX_PROGNAME" mountrw WIMFILE [IMAGE_NUM | IMAGE_NAME] DIRECTORY\n" -" [--check] [--debug] [--streams-interface=INTERFACE]\n" -" [--staging-dir=DIR] [--unix-data] [--allow-other]\n" -), -[OPTIMIZE] = -T( -IMAGEX_PROGNAME" optimize WIMFILE [--check] [--recompress]\n" -" [--threads=NUM_THREADS]\n" -), -[SPLIT] = -T( -IMAGEX_PROGNAME" split WIMFILE SPLIT_WIMFILE PART_SIZE_MB [--check]\n" -), -[UNMOUNT] = -T( -IMAGEX_PROGNAME" unmount DIRECTORY [--commit] [--check] [--rebuild] [--lazy]\n" -), -[UPDATE] = -T( -IMAGEX_PROGNAME" update WIMFILE [IMAGE_NUM | IMAGE_NAME] [--check] [--rebuild]\n" -" [--threads=NUM_THREADS] [DEFAULT_ADD_OPTIONS]\n" -" [DEFAULT_DELETE_OPTIONS] [--command=STRING] [< CMDFILE]\n" -), -}; - - -static void -recommend_man_page(const tchar *cmd_name) -{ - const tchar *format_str; -#ifdef __WIN32__ - format_str = T("See "IMAGEX_PROGNAME"%"TS"%"TS".pdf in the " - "doc directory for more details.\n"); -#else - format_str = T("Try `man "IMAGEX_PROGNAME"%"TS"%"TS"' " - "for more details.\n"); -#endif - tprintf(format_str, *cmd_name ? T("-") : T(""), cmd_name); -} +#define imagex_printf(format, ...) \ + tfprintf(imagex_info_file, format, ##__VA_ARGS__) enum { IMAGEX_ALLOW_OTHER_OPTION, @@ -220,12 +137,16 @@ enum { IMAGEX_LOOKUP_TABLE_OPTION, IMAGEX_METADATA_OPTION, IMAGEX_NORPFIX_OPTION, + IMAGEX_NOCHECK_OPTION, IMAGEX_NO_ACLS_OPTION, + IMAGEX_NOT_PIPABLE_OPTION, IMAGEX_PATH_OPTION, + IMAGEX_PIPABLE_OPTION, IMAGEX_REBUILD_OPTION, IMAGEX_RECOMPRESS_OPTION, IMAGEX_RECURSIVE_OPTION, IMAGEX_REF_OPTION, + IMAGEX_RESUME_OPTION, IMAGEX_RPFIX_OPTION, IMAGEX_SOFT_OPTION, IMAGEX_SOURCE_LIST_OPTION, @@ -253,11 +174,15 @@ static const struct option apply_options[] = { {T("rpfix"), no_argument, NULL, IMAGEX_RPFIX_OPTION}, {T("norpfix"), no_argument, NULL, IMAGEX_NORPFIX_OPTION}, {T("include-invalid-names"), no_argument, NULL, IMAGEX_INCLUDE_INVALID_NAMES_OPTION}, + {T("resume"), no_argument, NULL, IMAGEX_RESUME_OPTION}, {NULL, 0, NULL, 0}, }; + static const struct option capture_or_append_options[] = { {T("boot"), no_argument, NULL, IMAGEX_BOOT_OPTION}, {T("check"), no_argument, NULL, IMAGEX_CHECK_OPTION}, + {T("no-check"), no_argument, NULL, IMAGEX_NOCHECK_OPTION}, + {T("nocheck"), no_argument, NULL, IMAGEX_NOCHECK_OPTION}, {T("compress"), required_argument, NULL, IMAGEX_COMPRESS_OPTION}, {T("config"), required_argument, NULL, IMAGEX_CONFIG_OPTION}, {T("dereference"), no_argument, NULL, IMAGEX_DEREFERENCE_OPTION}, @@ -272,8 +197,11 @@ static const struct option capture_or_append_options[] = { {T("strict-acls"), no_argument, NULL, IMAGEX_STRICT_ACLS_OPTION}, {T("rpfix"), no_argument, NULL, IMAGEX_RPFIX_OPTION}, {T("norpfix"), no_argument, NULL, IMAGEX_NORPFIX_OPTION}, + {T("pipable"), no_argument, NULL, IMAGEX_PIPABLE_OPTION}, + {T("not-pipable"), no_argument, NULL, IMAGEX_NOT_PIPABLE_OPTION}, {NULL, 0, NULL, 0}, }; + static const struct option delete_options[] = { {T("check"), no_argument, NULL, IMAGEX_CHECK_OPTION}, {T("soft"), no_argument, NULL, IMAGEX_SOFT_OPTION}, @@ -286,12 +214,16 @@ static const struct option dir_options[] = { }; static const struct option export_options[] = { - {T("boot"), no_argument, NULL, IMAGEX_BOOT_OPTION}, - {T("check"), no_argument, NULL, IMAGEX_CHECK_OPTION}, - {T("compress"), required_argument, NULL, IMAGEX_COMPRESS_OPTION}, - {T("ref"), required_argument, NULL, IMAGEX_REF_OPTION}, - {T("threads"), required_argument, NULL, IMAGEX_THREADS_OPTION}, - {T("rebuild"), no_argument, NULL, IMAGEX_REBUILD_OPTION}, + {T("boot"), no_argument, NULL, IMAGEX_BOOT_OPTION}, + {T("check"), no_argument, NULL, IMAGEX_CHECK_OPTION}, + {T("nocheck"), no_argument, NULL, IMAGEX_NOCHECK_OPTION}, + {T("no-check"), no_argument, NULL, IMAGEX_NOCHECK_OPTION}, + {T("compress"), required_argument, NULL, IMAGEX_COMPRESS_OPTION}, + {T("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}, {NULL, 0, NULL, 0}, }; @@ -312,6 +244,8 @@ static const struct option extract_options[] = { static const struct option info_options[] = { {T("boot"), no_argument, NULL, IMAGEX_BOOT_OPTION}, {T("check"), no_argument, NULL, IMAGEX_CHECK_OPTION}, + {T("nocheck"), no_argument, NULL, IMAGEX_NOCHECK_OPTION}, + {T("no-check"), no_argument, NULL, IMAGEX_NOCHECK_OPTION}, {T("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}, @@ -337,9 +271,13 @@ static const struct option mount_options[] = { }; static const struct option optimize_options[] = { - {T("check"), no_argument, NULL, IMAGEX_CHECK_OPTION}, - {T("recompress"), no_argument, NULL, IMAGEX_RECOMPRESS_OPTION}, - {T("threads"), required_argument, NULL, IMAGEX_THREADS_OPTION}, + {T("check"), no_argument, NULL, IMAGEX_CHECK_OPTION}, + {T("nocheck"), no_argument, NULL, IMAGEX_NOCHECK_OPTION}, + {T("no-check"), no_argument, NULL, IMAGEX_NOCHECK_OPTION}, + {T("recompress"), no_argument, NULL, IMAGEX_RECOMPRESS_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}, {NULL, 0, NULL, 0}, }; @@ -384,8 +322,15 @@ static const struct option update_options[] = { {NULL, 0, NULL, 0}, }; +#if 0 +# define _format_attribute(type, format_str, args_start) \ + __attribute__((format(type, format_str, args_start))) +#else +# define _format_attribute(type, format_str, args_start) +#endif + /* Print formatted error message to stderr. */ -static void +static void _format_attribute(printf, 1, 2) imagex_error(const tchar *format, ...) { va_list va; @@ -397,7 +342,7 @@ imagex_error(const tchar *format, ...) } /* Print formatted error message to stderr. */ -static void +static void _format_attribute(printf, 1, 2) imagex_error_with_errno(const tchar *format, ...) { int errno_save = errno; @@ -416,9 +361,9 @@ verify_image_exists(int image, const tchar *image_name, const tchar *wim_name) imagex_error(T("\"%"TS"\" is not a valid image in \"%"TS"\"!\n" " Please specify a 1-based image index or " "image name.\n" - " You may use `"IMAGEX_PROGNAME" info' to list the images " + " You may use `%"TS"' to list the images " "contained in a WIM."), - image_name, wim_name); + image_name, wim_name, get_cmd_string(CMD_INFO, false)); return -1; } return 0; @@ -492,7 +437,7 @@ tchar *default_pats[] = { static struct wimlib_capture_config default_capture_config = { .exclusion_pats = { - .num_pats = sizeof(default_pats) / sizeof(*default_pats), + .num_pats = sizeof(default_pats) / sizeof(default_pats[0]), .pats = default_pats, }, }; @@ -861,7 +806,7 @@ file_get_contents(const tchar *filename, size_t *len_ret) goto out; } - buf = malloc(len); + buf = malloc(len ? len : 1); if (!buf) { imagex_error(T("Failed to allocate buffer of %zu bytes to hold " "contents of file \"%"TS"\""), len, filename); @@ -1042,47 +987,61 @@ imagex_progress_func(enum wimlib_progress_msg msg, unit_shift = get_unit(info->write_streams.total_bytes, &unit_name); percent_done = TO_PERCENT(info->write_streams.completed_bytes, info->write_streams.total_bytes); + if (info->write_streams.completed_streams == 0) { const tchar *data_type; data_type = get_data_type(info->write_streams.compression_type); - tprintf(T("Writing %"TS" data using %u thread%"TS"\n"), + imagex_printf(T("Writing %"TS" data using %u thread%"TS"\n"), data_type, info->write_streams.num_threads, (info->write_streams.num_threads == 1) ? T("") : T("s")); } - tprintf(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.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); + } if (info->write_streams.completed_bytes >= info->write_streams.total_bytes) - tputchar(T('\n')); + imagex_printf(T("\n")); break; case WIMLIB_PROGRESS_MSG_SCAN_BEGIN: - tprintf(T("Scanning \"%"TS"\""), info->scan.source); + imagex_printf(T("Scanning \"%"TS"\""), info->scan.source); if (*info->scan.wim_target_path) { - tprintf(T(" (loading as WIM path: " + imagex_printf(T(" (loading as WIM path: " "\""WIMLIB_WIM_PATH_SEPARATOR_STRING"%"TS"\")...\n"), info->scan.wim_target_path); } else { - tprintf(T(" (loading as root of WIM image)...\n")); + imagex_printf(T(" (loading as root of WIM image)...\n")); } break; case WIMLIB_PROGRESS_MSG_SCAN_DENTRY: if (info->scan.excluded) - tprintf(T("Excluding \"%"TS"\" from capture\n"), info->scan.cur_path); + imagex_printf(T("Excluding \"%"TS"\" from capture\n"), info->scan.cur_path); else - tprintf(T("Scanning \"%"TS"\"\n"), info->scan.cur_path); + imagex_printf(T("Scanning \"%"TS"\"\n"), info->scan.cur_path); break; - /*case WIMLIB_PROGRESS_MSG_SCAN_END:*/ - /*break;*/ case WIMLIB_PROGRESS_MSG_VERIFY_INTEGRITY: unit_shift = get_unit(info->integrity.total_bytes, &unit_name); percent_done = TO_PERCENT(info->integrity.completed_bytes, info->integrity.total_bytes); - tprintf(T("\rVerifying integrity of \"%"TS"\": %"PRIu64" %"TS" " + imagex_printf(T("\rVerifying integrity of \"%"TS"\": %"PRIu64" %"TS" " "of %"PRIu64" %"TS" (%u%%) done"), info->integrity.filename, info->integrity.completed_bytes >> unit_shift, @@ -1091,13 +1050,13 @@ imagex_progress_func(enum wimlib_progress_msg msg, unit_name, percent_done); if (info->integrity.completed_bytes == info->integrity.total_bytes) - tputchar(T('\n')); + imagex_printf(T("\n")); break; case WIMLIB_PROGRESS_MSG_CALC_INTEGRITY: unit_shift = get_unit(info->integrity.total_bytes, &unit_name); percent_done = TO_PERCENT(info->integrity.completed_bytes, info->integrity.total_bytes); - tprintf(T("\rCalculating integrity table for WIM: %"PRIu64" %"TS" " + imagex_printf(T("\rCalculating integrity table for WIM: %"PRIu64" %"TS" " "of %"PRIu64" %"TS" (%u%%) done"), info->integrity.completed_bytes >> unit_shift, unit_name, @@ -1105,10 +1064,10 @@ imagex_progress_func(enum wimlib_progress_msg msg, unit_name, percent_done); if (info->integrity.completed_bytes == info->integrity.total_bytes) - tputchar(T('\n')); + imagex_printf(T("\n")); break; case WIMLIB_PROGRESS_MSG_EXTRACT_IMAGE_BEGIN: - tprintf(T("Applying image %d (\"%"TS"\") from \"%"TS"\" " + imagex_printf(T("Applying image %d (\"%"TS"\") from \"%"TS"\" " "to %"TS" \"%"TS"\"\n"), info->extract.image, info->extract.image_name, @@ -1118,7 +1077,7 @@ imagex_progress_func(enum wimlib_progress_msg msg, info->extract.target); break; case WIMLIB_PROGRESS_MSG_EXTRACT_TREE_BEGIN: - tprintf(T("Extracting " + 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, @@ -1127,15 +1086,11 @@ imagex_progress_func(enum wimlib_progress_msg msg, info->extract.wimfile_name, info->extract.target); break; - /*case WIMLIB_PROGRESS_MSG_EXTRACT_DIR_STRUCTURE_BEGIN:*/ - /*tprintf(T("Applying directory structure to %"TS"\n"),*/ - /*info->extract.target);*/ - /*break;*/ case WIMLIB_PROGRESS_MSG_EXTRACT_STREAMS: percent_done = TO_PERCENT(info->extract.completed_bytes, info->extract.total_bytes); unit_shift = get_unit(info->extract.total_bytes, &unit_name); - tprintf(T("\rExtracting files: " + imagex_printf(T("\rExtracting files: " "%"PRIu64" %"TS" of %"PRIu64" %"TS" (%u%%) done"), info->extract.completed_bytes >> unit_shift, unit_name, @@ -1143,43 +1098,27 @@ imagex_progress_func(enum wimlib_progress_msg msg, unit_name, percent_done); if (info->extract.completed_bytes >= info->extract.total_bytes) - tputchar(T('\n')); - break; - case WIMLIB_PROGRESS_MSG_EXTRACT_DENTRY: - tprintf(T("%"TS"\n"), info->extract.cur_path); + imagex_printf(T("\n")); break; case WIMLIB_PROGRESS_MSG_APPLY_TIMESTAMPS: if (info->extract.extract_root_wim_source_path[0] == T('\0')) - tprintf(T("Setting timestamps on all extracted files...\n")); + 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) { - tprintf(T("Unmounting NTFS volume \"%"TS"\"...\n"), + imagex_printf(T("Unmounting NTFS volume \"%"TS"\"...\n"), info->extract.target); } break; - case WIMLIB_PROGRESS_MSG_JOIN_STREAMS: - percent_done = TO_PERCENT(info->join.completed_bytes, - info->join.total_bytes); - unit_shift = get_unit(info->join.total_bytes, &unit_name); - tprintf(T("Writing resources from part %u of %u: " - "%"PRIu64 " %"TS" of %"PRIu64" %"TS" (%u%%) written\n"), - (info->join.completed_parts == info->join.total_parts) ? - info->join.completed_parts : info->join.completed_parts + 1, - info->join.total_parts, - info->join.completed_bytes >> unit_shift, - unit_name, - info->join.total_bytes >> unit_shift, - unit_name, - percent_done); - break; case WIMLIB_PROGRESS_MSG_SPLIT_BEGIN_PART: percent_done = TO_PERCENT(info->split.completed_bytes, info->split.total_bytes); unit_shift = get_unit(info->split.total_bytes, &unit_name); - tprintf(T("Writing \"%"TS"\": %"PRIu64" %"TS" of " + imagex_printf(T("Writing \"%"TS"\" (part %u of %u): %"PRIu64" %"TS" of " "%"PRIu64" %"TS" (%u%%) written\n"), info->split.part_name, + info->split.cur_part_number, + info->split.total_parts, info->split.completed_bytes >> unit_shift, unit_name, info->split.total_bytes >> unit_shift, @@ -1188,19 +1127,20 @@ imagex_progress_func(enum wimlib_progress_msg msg, break; case WIMLIB_PROGRESS_MSG_SPLIT_END_PART: if (info->split.completed_bytes == info->split.total_bytes) { - tprintf(T("Finished writing %u split WIM parts\n"), - info->split.cur_part_number); + imagex_printf(T("Finished writing part %u of %u WIM parts\n"), + info->split.cur_part_number, + info->split.total_parts); } break; case WIMLIB_PROGRESS_MSG_UPDATE_END_COMMAND: switch (info->update.command->op) { case WIMLIB_UPDATE_OP_DELETE: - tprintf(T("Deleted WIM path " + imagex_printf(T("Deleted WIM path " "\""WIMLIB_WIM_PATH_SEPARATOR_STRING "%"TS"\"\n"), info->update.command->delete.wim_path); break; case WIMLIB_UPDATE_OP_RENAME: - tprintf(T("Renamed WIM path " + imagex_printf(T("Renamed WIM path " "\""WIMLIB_WIM_PATH_SEPARATOR_STRING "%"TS"\" => " "\""WIMLIB_WIM_PATH_SEPARATOR_STRING "%"TS"\"\n"), info->update.command->rename.wim_source_path, @@ -1214,7 +1154,7 @@ imagex_progress_func(enum wimlib_progress_msg msg, default: break; } - fflush(stdout); + fflush(imagex_info_file); return 0; } @@ -1236,7 +1176,7 @@ open_swms_from_glob(const tchar *swm_glob, /* Warning: glob() is replaced in Windows native builds */ ret = tglob(swm_glob, GLOB_ERR | GLOB_NOSORT, NULL, &globbuf); - if (ret != 0) { + if (ret) { if (ret == GLOB_NOMATCH) { imagex_error(T("Found no files for glob \"%"TS"\""), swm_glob); @@ -1264,7 +1204,7 @@ open_swms_from_glob(const tchar *swm_glob, open_flags | WIMLIB_OPEN_FLAG_SPLIT_OK, &additional_swms[i - offset], imagex_progress_func); - if (ret != 0) + if (ret) goto out_close_swms; } *additional_swms_ret = additional_swms; @@ -1443,7 +1383,7 @@ parse_update_command(tchar *line, size_t len, imagex_error(T("Unexpected argument \"%"TS"\" in " "update command on line %zu\n" " (The \"%"TS"\" command only " - "takes %u nonoption arguments!)\n"), + "takes %zu nonoption arguments!)\n"), next_string, line_number, command_name, num_nonoptions); return false; @@ -1504,15 +1444,14 @@ parse_update_command_file(tchar **cmd_file_contents_p, size_t cmd_file_nchars, } /* Apply one image, or all images, from a WIM file into a directory, OR apply - * one image from a WIM file to a NTFS volume. */ + * one image from a WIM file to a NTFS volume. */ static int -imagex_apply(int argc, tchar **argv) +imagex_apply(int argc, tchar **argv, int cmd) { int c; int open_flags = WIMLIB_OPEN_FLAG_SPLIT_OK; int image; - int num_images; - WIMStruct *w; + WIMStruct *wim; int ret; const tchar *wimfile; const tchar *target; @@ -1520,8 +1459,8 @@ imagex_apply(int argc, tchar **argv) int extract_flags = WIMLIB_EXTRACT_FLAG_SEQUENTIAL; const tchar *swm_glob = NULL; - WIMStruct **additional_swms = NULL; - unsigned num_additional_swms = 0; + WIMStruct **additional_swms; + unsigned num_additional_swms; for_opt(c, apply_options) { switch (c) { @@ -1559,87 +1498,121 @@ imagex_apply(int argc, tchar **argv) extract_flags |= WIMLIB_EXTRACT_FLAG_REPLACE_INVALID_FILENAMES; extract_flags |= WIMLIB_EXTRACT_FLAG_ALL_CASE_CONFLICTS; break; + case IMAGEX_RESUME_OPTION: + extract_flags |= WIMLIB_EXTRACT_FLAG_RESUME; + break; default: - usage(APPLY); - return -1; + goto out_usage; } } argc -= optind; argv += optind; - if (argc != 2 && argc != 3) { - usage(APPLY); - return -1; - } + if (argc != 2 && argc != 3) + goto out_usage; wimfile = argv[0]; - if (argc == 2) { - image_num_or_name = T("1"); - target = argv[1]; - } else { - image_num_or_name = argv[1]; - target = argv[2]; - } - ret = wimlib_open_wim(wimfile, open_flags, &w, imagex_progress_func); - if (ret != 0) - return ret; - - image = wimlib_resolve_image(w, image_num_or_name); - ret = verify_image_exists(image, image_num_or_name, wimfile); - if (ret != 0) - goto out; + if (!tstrcmp(wimfile, T("-"))) { + /* Attempt to apply pipable WIM from standard input. */ + if (argc == 2) { + image_num_or_name = NULL; + target = argv[1]; + } else { + image_num_or_name = argv[1]; + target = argv[2]; + } + wim = NULL; + num_additional_swms = 0; + additional_swms = NULL; + } else { + ret = wimlib_open_wim(wimfile, open_flags, &wim, + imagex_progress_func); + if (ret) + goto out; - num_images = wimlib_get_num_images(w); - if (argc == 2 && num_images != 1) { - imagex_error(T("\"%"TS"\" contains %d images; Please select one " - "(or all)."), wimfile, num_images); - usage(APPLY); - ret = -1; - goto out; - } + if (argc >= 3) { + /* Image explicitly specified. */ + image_num_or_name = argv[1]; + image = wimlib_resolve_image(wim, image_num_or_name); + ret = verify_image_exists(image, image_num_or_name, wimfile); + if (ret) + goto out_wimlib_free; + target = argv[2]; + } else { + /* No image specified; default to image 1, but only if the WIM + * contains exactly one image. */ + struct wimlib_wim_info info; + + wimlib_get_wim_info(wim, &info); + if (info.image_count != 1) { + imagex_error(T("\"%"TS"\" contains %d images; " + "Please select one (or all)."), + wimfile, info.image_count); + wimlib_free(wim); + goto out_usage; + } + image = 1; + target = argv[1]; + } - if (swm_glob) { - ret = open_swms_from_glob(swm_glob, wimfile, open_flags, - &additional_swms, - &num_additional_swms); - if (ret != 0) - goto out; + if (swm_glob) { + ret = open_swms_from_glob(swm_glob, wimfile, open_flags, + &additional_swms, + &num_additional_swms); + if (ret) + goto out_wimlib_free; + } else { + additional_swms = NULL; + num_additional_swms = 0; + } } - struct stat stbuf; +#ifndef __WIN32__ + { + /* Interpret a regular file or block device target as a NTFS + * volume. */ + struct stat stbuf; - ret = tstat(target, &stbuf); - if (ret == 0) { - if (S_ISBLK(stbuf.st_mode) || S_ISREG(stbuf.st_mode)) - extract_flags |= WIMLIB_EXTRACT_FLAG_NTFS; - } else { - if (errno != ENOENT) { - imagex_error_with_errno(T("Failed to stat \"%"TS"\""), - target); - ret = -1; - goto out; + if (tstat(target, &stbuf)) { + if (errno != ENOENT) { + imagex_error_with_errno(T("Failed to stat \"%"TS"\""), + target); + ret = -1; + goto out_free_swms; + } + } else { + if (S_ISBLK(stbuf.st_mode) || S_ISREG(stbuf.st_mode)) + extract_flags |= WIMLIB_EXTRACT_FLAG_NTFS; } } - -#ifdef __WIN32__ - win32_acquire_restore_privileges(); #endif - ret = wimlib_extract_image(w, image, target, extract_flags, - additional_swms, num_additional_swms, - imagex_progress_func); + + if (wim) { + ret = wimlib_extract_image(wim, image, target, extract_flags, + additional_swms, num_additional_swms, + imagex_progress_func); + } 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); + } if (ret == 0) - tprintf(T("Done applying WIM image.\n")); -#ifdef __WIN32__ - win32_release_restore_privileges(); -#endif + imagex_printf(T("Done applying WIM image.\n")); +out_free_swms: + for (unsigned i = 0; i < num_additional_swms; i++) + wimlib_free(additional_swms[i]); + free(additional_swms); +out_wimlib_free: + wimlib_free(wim); out: - wimlib_free(w); - if (additional_swms) { - for (unsigned i = 0; i < num_additional_swms; i++) - wimlib_free(additional_swms[i]); - free(additional_swms); - } return ret; + +out_usage: + usage(CMD_APPLY, stderr); + ret = -1; + goto out; } /* Create a WIM image from a directory tree, NTFS volume, or multiple files or @@ -1647,30 +1620,28 @@ out: * the desired image. 'wimlib-imagex append': add a new image to an existing * WIM file. */ static int -imagex_capture_or_append(int argc, tchar **argv) +imagex_capture_or_append(int argc, tchar **argv, int cmd) { int c; int open_flags = WIMLIB_OPEN_FLAG_WRITE_ACCESS; int add_image_flags = WIMLIB_ADD_IMAGE_FLAG_EXCLUDE_VERBOSE; int write_flags = 0; - int compression_type = WIMLIB_COMPRESSION_TYPE_XPRESS; + int compression_type = WIMLIB_COMPRESSION_TYPE_LZX; const tchar *wimfile; + int wim_fd; const tchar *name; const tchar *desc; const tchar *flags_element = NULL; - WIMStruct *w; + WIMStruct *wim; int ret; - int cur_image; - int cmd = tstrcmp(argv[0], T("append")) ? CAPTURE : APPEND; unsigned num_threads = 0; tchar *source; - size_t source_name_len; tchar *source_copy; const tchar *config_file = NULL; tchar *config_str; - struct wimlib_capture_config *config = NULL; + struct wimlib_capture_config *config; bool source_list = false; size_t source_list_nchars; @@ -1689,13 +1660,16 @@ imagex_capture_or_append(int argc, tchar **argv) open_flags |= WIMLIB_OPEN_FLAG_CHECK_INTEGRITY; write_flags |= WIMLIB_WRITE_FLAG_CHECK_INTEGRITY; break; + case IMAGEX_NOCHECK_OPTION: + write_flags |= WIMLIB_WRITE_FLAG_NO_CHECK_INTEGRITY; + break; case IMAGEX_CONFIG_OPTION: config_file = optarg; break; case IMAGEX_COMPRESS_OPTION: compression_type = get_compression_type(optarg); if (compression_type == WIMLIB_COMPRESSION_TYPE_INVALID) - return -1; + goto out_err; break; case IMAGEX_FLAGS_OPTION: flags_element = optarg; @@ -1709,7 +1683,7 @@ imagex_capture_or_append(int argc, tchar **argv) case IMAGEX_THREADS_OPTION: num_threads = parse_num_threads(optarg); if (num_threads == UINT_MAX) - return -1; + goto out_err; break; case IMAGEX_REBUILD_OPTION: write_flags |= WIMLIB_WRITE_FLAG_REBUILD; @@ -1732,22 +1706,47 @@ imagex_capture_or_append(int argc, tchar **argv) case IMAGEX_NORPFIX_OPTION: add_image_flags |= WIMLIB_ADD_IMAGE_FLAG_NORPFIX; break; + case IMAGEX_PIPABLE_OPTION: + write_flags |= WIMLIB_WRITE_FLAG_PIPABLE; + break; + case IMAGEX_NOT_PIPABLE_OPTION: + write_flags |= WIMLIB_WRITE_FLAG_NOT_PIPABLE; + break; default: - usage(cmd); - return -1; + goto out_usage; } } argc -= optind; argv += optind; - if (argc < 2 || argc > 4) { - usage(cmd); - return -1; - } + if (argc < 2 || argc > 4) + goto out_usage; source = argv[0]; wimfile = argv[1]; + if (!tstrcmp(wimfile, T("-"))) { + #if 0 + if (!(write_flags & WIMLIB_WRITE_FLAG_PIPABLE)) { + imagex_error("Can't write a non-pipable WIM to " + "standard output! Specify --pipable\n" + " if you want to create a pipable WIM " + "(but read the docs first)."); + goto out_err; + } + #else + write_flags |= WIMLIB_WRITE_FLAG_PIPABLE; + #endif + if (cmd == CMD_APPEND) { + imagex_error(T("Using standard output for append does " + "not make sense.")); + goto out_err; + } + wim_fd = STDOUT_FILENO; + wimfile = NULL; + imagex_info_file = stderr; + } + if (argc >= 3) { name = argv[2]; name_defaulted = false; @@ -1756,13 +1755,18 @@ imagex_capture_or_append(int argc, tchar **argv) * prefixes and trailing slashes. This requires making a copy * of @source. Leave some free characters at the end in case we * append a number to keep the name unique. */ + size_t source_name_len; + source_name_len = tstrlen(source); source_copy = alloca((source_name_len + 1 + 25) * sizeof(tchar)); name = tbasename(tstrcpy(source_copy, source)); name_defaulted = true; } /* Image description defaults to NULL if not given. */ - desc = (argc >= 4) ? argv[3] : NULL; + if (argc >= 4) + desc = argv[3]; + else + desc = NULL; if (source_list) { /* Set up capture sources in source list mode */ @@ -1773,7 +1777,7 @@ imagex_capture_or_append(int argc, tchar **argv) &source_list_nchars); } if (!source_list_contents) - return -1; + goto out_err; capture_sources = parse_source_list(&source_list_contents, source_list_nchars, @@ -1812,20 +1816,21 @@ imagex_capture_or_append(int argc, tchar **argv) config = &default_capture_config; } - if (cmd == APPEND) - ret = wimlib_open_wim(wimfile, open_flags, &w, + if (cmd == CMD_APPEND) + ret = wimlib_open_wim(wimfile, open_flags, &wim, imagex_progress_func); else - ret = wimlib_create_new_wim(compression_type, &w); + ret = wimlib_create_new_wim(compression_type, &wim); if (ret) goto out_free_config; +#ifndef __WIN32__ if (!source_list) { struct stat stbuf; - ret = tstat(source, &stbuf); - if (ret == 0) { + + if (tstat(source, &stbuf) == 0) { if (S_ISBLK(stbuf.st_mode) || S_ISREG(stbuf.st_mode)) { - tprintf(T("Capturing WIM image from NTFS " + imagex_printf(T("Capturing WIM image from NTFS " "filesystem on \"%"TS"\"\n"), source); add_image_flags |= WIMLIB_ADD_IMAGE_FLAG_NTFS; } @@ -1838,62 +1843,73 @@ imagex_capture_or_append(int argc, tchar **argv) } } } +#endif - if (cmd == APPEND && name_defaulted) { + if (cmd == CMD_APPEND && name_defaulted) { /* If the user did not specify an image name, and the basename * of the source already exists as an image name in the WIM * file, append a suffix to make it unique. */ unsigned long conflict_idx; tchar *name_end = tstrchr(name, T('\0')); for (conflict_idx = 1; - wimlib_image_name_in_use(w, name); + wimlib_image_name_in_use(wim, name); conflict_idx++) { tsprintf(name_end, T(" (%lu)"), conflict_idx); } } -#ifdef __WIN32__ - win32_acquire_capture_privileges(); -#endif - - ret = wimlib_add_image_multisource(w, + ret = wimlib_add_image_multisource(wim, capture_sources, num_sources, name, config, add_image_flags, imagex_progress_func); - if (ret != 0) - goto out_release_privs; - cur_image = wimlib_get_num_images(w); - if (desc) { - ret = wimlib_set_image_descripton(w, cur_image, desc); - if (ret != 0) - goto out_release_privs; - } - if (flags_element) { - ret = wimlib_set_image_flags(w, cur_image, flags_element); - if (ret != 0) - goto out_release_privs; - } - if (cmd == APPEND) { - ret = wimlib_overwrite(w, write_flags, num_threads, + if (ret) + goto out_wimlib_free; + + if (desc || flags_element) { + /* User provided or element. Get the + * index of the image we just added, then use it to call the + * appropriate functions. */ + struct wimlib_wim_info info; + + wimlib_get_wim_info(wim, &info); + + if (desc) { + ret = wimlib_set_image_descripton(wim, + info.image_count, + desc); + if (ret) + goto out_wimlib_free; + } + + if (flags_element) { + ret = wimlib_set_image_flags(wim, info.image_count, + flags_element); + if (ret) + goto out_wimlib_free; + } + } + + /* 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); + } else if (wimfile) { + ret = wimlib_write(wim, wimfile, WIMLIB_ALL_IMAGES, + write_flags, num_threads, + imagex_progress_func); } else { - ret = wimlib_write(w, wimfile, WIMLIB_ALL_IMAGES, write_flags, - num_threads, imagex_progress_func); + ret = wimlib_write_to_fd(wim, wim_fd, WIMLIB_ALL_IMAGES, + write_flags, num_threads, + imagex_progress_func); } - if (ret != 0) - imagex_error(T("Failed to write the WIM file \"%"TS"\""), - wimfile); -out_release_privs: -#ifdef __WIN32__ - win32_release_capture_privileges(); -#endif out_wimlib_free: - wimlib_free(w); + wimlib_free(wim); out_free_config: - if (config != NULL && config != &default_capture_config) { + if (config != &default_capture_config) { free(config->exclusion_pats.pats); free(config->exclusion_exception_pats.pats); free(config_str); @@ -1903,12 +1919,19 @@ out_free_capture_sources: free(capture_sources); out_free_source_list_contents: free(source_list_contents); +out: return ret; + +out_usage: + usage(cmd, stderr); +out_err: + ret = -1; + goto out; } /* Remove image(s) from a WIM. */ static int -imagex_delete(int argc, tchar **argv) +imagex_delete(int argc, tchar **argv, int cmd) { int c; int open_flags = WIMLIB_OPEN_FLAG_WRITE_ACCESS; @@ -1972,8 +1995,9 @@ out_wimlib_free: wimlib_free(wim); out: return ret; + out_usage: - usage(DELETE); + usage(CMD_DELETE, stderr); ret = -1; goto out; } @@ -1987,7 +2011,7 @@ print_full_path(const struct wimlib_dir_entry *wdentry, void *_ignore) /* Print the files contained in an image(s) in a WIM file. */ static int -imagex_dir(int argc, tchar **argv) +imagex_dir(int argc, tchar **argv, int cmd) { const tchar *wimfile; WIMStruct *wim = NULL; @@ -2023,18 +2047,22 @@ imagex_dir(int argc, tchar **argv) if (ret) goto out; - if (argc == 2) { + if (argc >= 2) { image = wimlib_resolve_image(wim, argv[1]); ret = verify_image_exists(image, argv[1], wimfile); if (ret) goto out_wimlib_free; } else { - /* Image was not specified. If the WIM only contains one image, - * choose that one; otherwise, print an error. */ - int num_images = wimlib_get_num_images(wim); - if (num_images != 1) { + /* No image specified; default to image 1, but only if the WIM + * contains exactly one image. */ + + struct wimlib_wim_info info; + + wimlib_get_wim_info(wim, &info); + if (info.image_count != 1) { imagex_error(T("\"%"TS"\" contains %d images; Please " - "select one."), wimfile, num_images); + "select one (or all)."), + wimfile, info.image_count); wimlib_free(wim); goto out_usage; } @@ -2048,8 +2076,9 @@ out_wimlib_free: wimlib_free(wim); out: return ret; + out_usage: - usage(DIR); + usage(CMD_DIR, stderr); ret = -1; goto out; } @@ -2057,17 +2086,17 @@ out_usage: /* Exports one, or all, images from a WIM file to a new WIM file or an existing * WIM file. */ static int -imagex_export(int argc, tchar **argv) +imagex_export(int argc, tchar **argv, int cmd) { int c; int open_flags = 0; int export_flags = 0; int write_flags = 0; - int compression_type = WIMLIB_COMPRESSION_TYPE_NONE; - bool compression_type_specified = false; + int compression_type = WIMLIB_COMPRESSION_TYPE_INVALID; const tchar *src_wimfile; const tchar *src_image_num_or_name; const tchar *dest_wimfile; + int dest_wim_fd; const tchar *dest_name; const tchar *dest_desc; WIMStruct *src_wim; @@ -2077,8 +2106,8 @@ imagex_export(int argc, tchar **argv) struct stat stbuf; bool wim_is_new; const tchar *swm_glob = NULL; - WIMStruct **additional_swms = NULL; - unsigned num_additional_swms = 0; + WIMStruct **additional_swms; + unsigned num_additional_swms; unsigned num_threads = 0; for_opt(c, export_options) { @@ -2090,11 +2119,13 @@ imagex_export(int argc, tchar **argv) open_flags |= WIMLIB_OPEN_FLAG_CHECK_INTEGRITY; write_flags |= WIMLIB_WRITE_FLAG_CHECK_INTEGRITY; break; + case IMAGEX_NOCHECK_OPTION: + write_flags |= WIMLIB_WRITE_FLAG_NO_CHECK_INTEGRITY; + break; case IMAGEX_COMPRESS_OPTION: compression_type = get_compression_type(optarg); if (compression_type == WIMLIB_COMPRESSION_TYPE_INVALID) goto out_err; - compression_type_specified = true; break; case IMAGEX_REF_OPTION: swm_glob = optarg; @@ -2107,6 +2138,12 @@ imagex_export(int argc, tchar **argv) case IMAGEX_REBUILD_OPTION: write_flags |= WIMLIB_WRITE_FLAG_REBUILD; break; + case IMAGEX_PIPABLE_OPTION: + write_flags |= WIMLIB_WRITE_FLAG_PIPABLE; + break; + case IMAGEX_NOT_PIPABLE_OPTION: + write_flags |= WIMLIB_WRITE_FLAG_NOT_PIPABLE; + break; default: goto out_usage; } @@ -2126,12 +2163,30 @@ imagex_export(int argc, tchar **argv) if (ret) goto out; - /* Determine if the destination is an existing file or not. - * If so, we try to append the exported image(s) to it; otherwise, we - * create a new WIM containing the exported image(s). */ - if (tstat(dest_wimfile, &stbuf) == 0) { - int dest_ctype; - + /* Determine if the destination is an existing file or not. If so, we + * try to append the exported image(s) to it; otherwise, we create a new + * WIM containing the exported image(s). Furthermore, determine if we + * need to write a pipable WIM directly to standard output. */ + + if (tstrcmp(dest_wimfile, T("-")) == 0) { + #if 0 + if (!(write_flags & WIMLIB_WRITE_FLAG_PIPABLE)) { + imagex_error("Can't write a non-pipable WIM to " + "standard output! Specify --pipable\n" + " if you want to create a pipable WIM " + "(but read the docs first)."); + ret = -1; + goto out_free_src_wim; + } + #else + write_flags |= WIMLIB_WRITE_FLAG_PIPABLE; + #endif + dest_wimfile = NULL; + dest_wim_fd = STDOUT_FILENO; + imagex_info_file = stderr; + } + errno = ENOENT; + if (dest_wimfile != NULL && tstat(dest_wimfile, &stbuf) == 0) { wim_is_new = false; /* Destination file exists. */ @@ -2146,29 +2201,46 @@ imagex_export(int argc, tchar **argv) if (ret) goto out_free_src_wim; - dest_ctype = wimlib_get_compression_type(dest_wim); - if (compression_type_specified && compression_type != dest_ctype) { - imagex_error(T("Cannot specify a compression type that is " - "not the same as that used in the " - "destination WIM")); - ret = -1; - goto out_free_dest_wim; + if (compression_type != WIMLIB_COMPRESSION_TYPE_INVALID) { + /* The user specified a compression type, but we're + * exporting to an existing WIM. Make sure the + * specified compression type is the same as the + * compression type of the existing destination WIM. */ + struct wimlib_wim_info dest_info; + + wimlib_get_wim_info(dest_wim, &dest_info); + if (compression_type != dest_info.compression_type) { + imagex_error(T("Cannot specify a compression type that is " + "not the same as that used in the " + "destination WIM")); + ret = -1; + goto out_free_dest_wim; + } } } else { - /* dest_wimfile is not an existing file, so create a new WIM. */ - if (errno == ENOENT) { - wim_is_new = true; - if (!compression_type_specified) - compression_type = wimlib_get_compression_type(src_wim); - ret = wimlib_create_new_wim(compression_type, &dest_wim); - if (ret) - goto out_free_src_wim; - } else { + wim_is_new = true; + + if (errno != ENOENT) { imagex_error_with_errno(T("Cannot stat file \"%"TS"\""), dest_wimfile); ret = -1; goto out_free_src_wim; } + + /* dest_wimfile is not an existing file, so create a new WIM. */ + + if (compression_type == WIMLIB_COMPRESSION_TYPE_INVALID) { + /* The user did not specify a compression type; default + * to that of the source WIM. */ + + struct wimlib_wim_info src_info; + + wimlib_get_wim_info(src_wim, &src_info); + compression_type = src_info.compression_type; + } + ret = wimlib_create_new_wim(compression_type, &dest_wim); + if (ret) + goto out_free_src_wim; } image = wimlib_resolve_image(src_wim, src_image_num_or_name); @@ -2182,28 +2254,34 @@ imagex_export(int argc, tchar **argv) &num_additional_swms); if (ret) goto out_free_dest_wim; + } else { + additional_swms = NULL; + num_additional_swms = 0; } - ret = wimlib_export_image(src_wim, image, dest_wim, dest_name, dest_desc, - export_flags, additional_swms, + ret = wimlib_export_image(src_wim, image, dest_wim, dest_name, + dest_desc, export_flags, additional_swms, num_additional_swms, imagex_progress_func); if (ret) goto out_free_swms; - - if (wim_is_new) + if (!wim_is_new) + ret = wimlib_overwrite(dest_wim, write_flags, num_threads, + imagex_progress_func); + else if (dest_wimfile) ret = wimlib_write(dest_wim, dest_wimfile, WIMLIB_ALL_IMAGES, write_flags, num_threads, imagex_progress_func); else - ret = wimlib_overwrite(dest_wim, write_flags, num_threads, - imagex_progress_func); + ret = wimlib_write_to_fd(dest_wim, dest_wim_fd, + WIMLIB_ALL_IMAGES, write_flags, + num_threads, imagex_progress_func); + if (ret) + imagex_error(T("Export failed.")); out_free_swms: - if (additional_swms) { - for (unsigned i = 0; i < num_additional_swms; i++) - wimlib_free(additional_swms[i]); - free(additional_swms); - } + for (unsigned i = 0; i < num_additional_swms; i++) + wimlib_free(additional_swms[i]); + free(additional_swms); out_free_dest_wim: wimlib_free(dest_wim); out_free_src_wim: @@ -2212,7 +2290,7 @@ out: return ret; out_usage: - usage(EXPORT); + usage(CMD_EXPORT, stderr); out_err: ret = -1; goto out; @@ -2270,7 +2348,8 @@ prepare_extract_commands(tchar **paths, unsigned num_paths, free_extract_commands(cmds, num_cmds, dest_dir); return NULL; } - tsprintf(cmds[i].fs_dest_path, T("%"TS""OS_PREFERRED_PATH_SEPARATOR_STRING"%"TS), + tsprintf(cmds[i].fs_dest_path, + T("%"TS""OS_PREFERRED_PATH_SEPARATOR_STRING"%"TS), dest_dir, tbasename(paths[i])); } } @@ -2280,7 +2359,7 @@ prepare_extract_commands(tchar **paths, unsigned num_paths, /* Extract files or directories from a WIM image */ static int -imagex_extract(int argc, tchar **argv) +imagex_extract(int argc, tchar **argv, int cmd) { int c; int open_flags = WIMLIB_OPEN_FLAG_SPLIT_OK; @@ -2293,8 +2372,8 @@ imagex_extract(int argc, tchar **argv) int extract_flags = WIMLIB_EXTRACT_FLAG_SEQUENTIAL | WIMLIB_EXTRACT_FLAG_NORPFIX; const tchar *swm_glob = NULL; - WIMStruct **additional_swms = NULL; - unsigned num_additional_swms = 0; + WIMStruct **additional_swms; + unsigned num_additional_swms; struct wimlib_extract_command *cmds; size_t num_cmds; @@ -2324,6 +2403,7 @@ imagex_extract(int argc, tchar **argv) break; case IMAGEX_TO_STDOUT_OPTION: extract_flags |= WIMLIB_EXTRACT_FLAG_TO_STDOUT; + imagex_info_file = stderr; imagex_be_quiet = true; break; case IMAGEX_INCLUDE_INVALID_NAMES_OPTION: @@ -2348,10 +2428,8 @@ imagex_extract(int argc, tchar **argv) cmds = prepare_extract_commands(argv, argc, extract_flags, dest_dir, &num_cmds); - if (!cmds) { - ret = -1; - goto out; - } + if (!cmds) + goto out_err; ret = wimlib_open_wim(wimfile, open_flags, &wim, imagex_progress_func); if (ret) @@ -2370,39 +2448,36 @@ imagex_extract(int argc, tchar **argv) &num_additional_swms); if (ret) goto out_wimlib_free; + } else { + additional_swms = NULL; + num_additional_swms = 0; } -#ifdef __WIN32__ - win32_acquire_restore_privileges(); -#endif - ret = wimlib_extract_files(wim, image, cmds, num_cmds, 0, additional_swms, num_additional_swms, imagex_progress_func); if (ret == 0) { if (!imagex_be_quiet) - tprintf(T("Done extracting files.\n")); + imagex_printf(T("Done extracting files.\n")); } else if (ret == WIMLIB_ERR_PATH_DOES_NOT_EXIST) { - tfprintf(stderr, T("Note: You can use `"IMAGEX_PROGNAME" dir' to see what " + tfprintf(stderr, T("Note: You can use `%"TS"' to see what " "files and directories\n" - " are in the WIM image.\n")); - } -#ifdef __WIN32__ - win32_release_restore_privileges(); -#endif - if (additional_swms) { - for (unsigned i = 0; i < num_additional_swms; i++) - wimlib_free(additional_swms[i]); - free(additional_swms); + " are in the WIM image.\n"), + get_cmd_string(CMD_INFO, false)); } + for (unsigned i = 0; i < num_additional_swms; i++) + wimlib_free(additional_swms[i]); + free(additional_swms); out_wimlib_free: wimlib_free(wim); out_free_cmds: free_extract_commands(cmds, num_cmds, dest_dir); out: return ret; + out_usage: - usage(EXTRACT); + usage(CMD_EXTRACT, stderr); +out_err: ret = -1; goto out; } @@ -2432,6 +2507,8 @@ print_wim_information(const tchar *wimfile, const struct wimlib_wim_info *info) 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')); } @@ -2480,11 +2557,12 @@ print_lookup_table(WIMStruct *wim) /* Prints information about a WIM file; also can mark an image as bootable, * change the name of an image, or change the description of an image. */ static int -imagex_info(int argc, tchar **argv) +imagex_info(int argc, tchar **argv, int cmd) { int c; bool boot = false; bool check = false; + bool nocheck = false; bool header = false; bool lookup_table = false; bool xml = false; @@ -2492,11 +2570,10 @@ imagex_info(int argc, tchar **argv) bool short_header = true; const tchar *xml_out_file = NULL; const tchar *wimfile; - const tchar *image_num_or_name = T("all"); - const tchar *new_name = NULL; - const tchar *new_desc = NULL; - WIMStruct *w; - FILE *fp; + const tchar *image_num_or_name; + const tchar *new_name; + const tchar *new_desc; + WIMStruct *wim; int image; int ret; int open_flags = WIMLIB_OPEN_FLAG_SPLIT_OK; @@ -2510,6 +2587,9 @@ imagex_info(int argc, tchar **argv) case IMAGEX_CHECK_OPTION: check = true; break; + case IMAGEX_NOCHECK_OPTION: + nocheck = true; + break; case IMAGEX_HEADER_OPTION: header = true; short_header = false; @@ -2531,58 +2611,50 @@ imagex_info(int argc, tchar **argv) short_header = false; break; default: - usage(INFO); - return -1; + goto out_usage; } } argc -= optind; argv += optind; - if (argc == 0 || argc > 4) { - usage(INFO); - return -1; - } - wimfile = argv[0]; - if (argc > 1) { - image_num_or_name = argv[1]; - if (argc > 2) { - new_name = argv[2]; - if (argc > 3) { - new_desc = argv[3]; - } - } + if (argc < 1 || argc > 4) + goto out_usage; + + wimfile = argv[0]; + image_num_or_name = (argc >= 2) ? argv[1] : T("all"); + new_name = (argc >= 3) ? argv[2] : NULL; + new_desc = (argc >= 4) ? argv[3] : NULL; + + if (check && nocheck) { + imagex_error(T("Can't specify both --check and --nocheck")); + goto out_err; } if (check) open_flags |= WIMLIB_OPEN_FLAG_CHECK_INTEGRITY; - ret = wimlib_open_wim(wimfile, open_flags, &w, - imagex_progress_func); - if (ret != 0) - return ret; + ret = wimlib_open_wim(wimfile, open_flags, &wim, imagex_progress_func); + if (ret) + goto out; - wimlib_get_wim_info(w, &info); + wimlib_get_wim_info(wim, &info); - image = wimlib_resolve_image(w, image_num_or_name); + image = wimlib_resolve_image(wim, image_num_or_name); + ret = WIMLIB_ERR_INVALID_IMAGE; if (image == WIMLIB_NO_IMAGE && tstrcmp(image_num_or_name, T("0"))) { - imagex_error(T("The image \"%"TS"\" does not exist"), - image_num_or_name); + imagex_error(T("The image \"%"TS"\" does not exist in \"%"TS"\""), + image_num_or_name, wimfile); if (boot) { imagex_error(T("If you would like to set the boot " "index to 0, specify image \"0\" with " "the --boot flag.")); } - ret = WIMLIB_ERR_INVALID_IMAGE; - goto out; + goto out_wimlib_free; } - if (info.image_count == 0) { - if (boot) { - imagex_error(T("--boot is meaningless on a WIM with no " - "images")); - ret = WIMLIB_ERR_INVALID_IMAGE; - goto out; - } + if (boot && info.image_count == 0) { + imagex_error(T("--boot is meaningless on a WIM with no images")); + goto out_wimlib_free; } if (image == WIMLIB_ALL_IMAGES && info.image_count > 1) { @@ -2590,15 +2662,13 @@ imagex_info(int argc, tchar **argv) imagex_error(T("Cannot specify the --boot flag " "without specifying a specific " "image in a multi-image WIM")); - ret = WIMLIB_ERR_INVALID_IMAGE; - goto out; + goto out_wimlib_free; } if (new_name) { imagex_error(T("Cannot specify the NEW_NAME " "without specifying a specific " "image in a multi-image WIM")); - ret = WIMLIB_ERR_INVALID_IMAGE; - goto out; + goto out_wimlib_free; } } @@ -2609,17 +2679,16 @@ imagex_info(int argc, tchar **argv) /* Read-only operations */ if (image == WIMLIB_NO_IMAGE) { - imagex_error(T("\"%"TS"\" is not a valid image"), - image_num_or_name); - ret = WIMLIB_ERR_INVALID_IMAGE; - goto out; + imagex_error(T("\"%"TS"\" is not a valid image in \"%"TS"\""), + image_num_or_name, wimfile); + goto out_wimlib_free; } if (image == WIMLIB_ALL_IMAGES && short_header) print_wim_information(wimfile, &info); if (header) - wimlib_print_header(w); + wimlib_print_header(wim); if (lookup_table) { if (info.total_parts != 1) { @@ -2627,45 +2696,47 @@ imagex_info(int argc, tchar **argv) "for part %d of a %d-part WIM.\n"), info.part_number, info.total_parts); } - print_lookup_table(w); + print_lookup_table(wim); } if (xml) { - ret = wimlib_extract_xml_data(w, stdout); - if (ret != 0) - goto out; + ret = wimlib_extract_xml_data(wim, stdout); + if (ret) + goto out_wimlib_free; } if (xml_out_file) { + FILE *fp; + fp = tfopen(xml_out_file, T("wb")); if (!fp) { imagex_error_with_errno(T("Failed to open the " "file \"%"TS"\" for " - "writing "), + "writing"), xml_out_file); ret = -1; - goto out; + goto out_wimlib_free; } - ret = wimlib_extract_xml_data(w, fp); - if (fclose(fp) != 0) { + ret = wimlib_extract_xml_data(wim, fp); + if (fclose(fp)) { imagex_error(T("Failed to close the file " "\"%"TS"\""), xml_out_file); ret = -1; } - - if (ret != 0) - goto out; + if (ret) + goto out_wimlib_free; } if (short_header) - wimlib_print_available_images(w, image); + wimlib_print_available_images(wim, image); if (metadata) { - ret = wimlib_print_metadata(w, image); - if (ret != 0) - goto out; + ret = wimlib_print_metadata(wim, image); + if (ret) + goto out_wimlib_free; } + ret = 0; } else { /* Modification operations */ @@ -2677,84 +2748,97 @@ imagex_info(int argc, tchar **argv) imagex_error(T("Cannot specify new_name (\"%"TS"\") " "when using image 0"), new_name); ret = -1; - goto out; + goto out_wimlib_free; } if (boot) { - if (image == wimlib_get_boot_idx(w)) { - tprintf(T("Image %d is already marked as " + if (image == info.boot_index) { + imagex_printf(T("Image %d is already marked as " "bootable.\n"), image); boot = false; } else { - tprintf(T("Marking image %d as bootable.\n"), + imagex_printf(T("Marking image %d as bootable.\n"), image); info.boot_index = image; - ret = wimlib_set_wim_info(w, &info, WIMLIB_CHANGE_BOOT_INDEX); + ret = wimlib_set_wim_info(wim, &info, + WIMLIB_CHANGE_BOOT_INDEX); if (ret) - goto out; + goto out_wimlib_free; } } if (new_name) { - if (!tstrcmp(wimlib_get_image_name(w, image), new_name)) + if (!tstrcmp(wimlib_get_image_name(wim, image), new_name)) { - tprintf(T("Image %d is already named \"%"TS"\".\n"), + imagex_printf(T("Image %d is already named \"%"TS"\".\n"), image, new_name); new_name = NULL; } else { - tprintf(T("Changing the name of image %d to " + imagex_printf(T("Changing the name of image %d to " "\"%"TS"\".\n"), image, new_name); - ret = wimlib_set_image_name(w, image, new_name); - if (ret != 0) - goto out; + ret = wimlib_set_image_name(wim, image, new_name); + if (ret) + goto out_wimlib_free; } } if (new_desc) { const tchar *old_desc; - old_desc = wimlib_get_image_description(w, image); + old_desc = wimlib_get_image_description(wim, image); if (old_desc && !tstrcmp(old_desc, new_desc)) { - tprintf(T("The description of image %d is already " + imagex_printf(T("The description of image %d is already " "\"%"TS"\".\n"), image, new_desc); new_desc = NULL; } else { - tprintf(T("Changing the description of image %d " + imagex_printf(T("Changing the description of image %d " "to \"%"TS"\".\n"), image, new_desc); - ret = wimlib_set_image_descripton(w, image, + ret = wimlib_set_image_descripton(wim, image, new_desc); - if (ret != 0) - goto out; + if (ret) + goto out_wimlib_free; } } /* Only call wimlib_overwrite() if something actually needs to - * be changed. */ + * be changed. */ if (boot || new_name || new_desc || - (check && !wimlib_has_integrity_table(w))) + (check && !info.has_integrity_table) || + (nocheck && info.has_integrity_table)) { int write_flags = 0; if (check) write_flags |= WIMLIB_WRITE_FLAG_CHECK_INTEGRITY; - ret = wimlib_overwrite(w, write_flags, 1, + if (nocheck) + write_flags |= WIMLIB_WRITE_FLAG_NO_CHECK_INTEGRITY; + ret = wimlib_overwrite(wim, write_flags, 1, imagex_progress_func); } else { - tprintf(T("The file \"%"TS"\" was not modified because nothing " - "needed to be done.\n"), wimfile); + imagex_printf(T("The file \"%"TS"\" was not modified " + "because nothing needed to be done.\n"), + wimfile); ret = 0; } } +out_wimlib_free: + wimlib_free(wim); out: - wimlib_free(w); return ret; + +out_usage: + usage(CMD_INFO, stderr); +out_err: + ret = -1; + goto out; } /* Join split WIMs into one part WIM */ static int -imagex_join(int argc, tchar **argv) +imagex_join(int argc, tchar **argv, int cmd) { int c; int swm_open_flags = WIMLIB_OPEN_FLAG_SPLIT_OK; int wim_write_flags = 0; const tchar *output_path; + int ret; for_opt(c, join_options) { switch (c) { @@ -2763,7 +2847,7 @@ imagex_join(int argc, tchar **argv) wim_write_flags |= WIMLIB_WRITE_FLAG_CHECK_INTEGRITY; break; default: - goto err; + goto out_usage; } } argc -= optind; @@ -2772,39 +2856,44 @@ imagex_join(int argc, tchar **argv) if (argc < 2) { imagex_error(T("Must specify one or more split WIM (.swm) " "parts to join")); - goto err; + goto out_usage; } output_path = argv[0]; - return wimlib_join((const tchar * const *)++argv, - --argc, - output_path, - swm_open_flags, - wim_write_flags, - imagex_progress_func); -err: - usage(JOIN); - return -1; + ret = wimlib_join((const tchar * const *)++argv, + --argc, + output_path, + swm_open_flags, + wim_write_flags, + imagex_progress_func); +out: + return ret; + +out_usage: + usage(CMD_JOIN, stderr); + ret = -1; + goto out; } -/* Mounts an image using a FUSE mount. */ +#if WIM_MOUNTING_SUPPORTED + +/* Mounts a WIM image. */ static int -imagex_mount_rw_or_ro(int argc, tchar **argv) +imagex_mount_rw_or_ro(int argc, tchar **argv, int cmd) { int c; int mount_flags = 0; int open_flags = WIMLIB_OPEN_FLAG_SPLIT_OK; + const tchar *swm_glob = NULL; + const tchar *staging_dir = NULL; const tchar *wimfile; const tchar *dir; - WIMStruct *w; + WIMStruct *wim; int image; - int num_images; int ret; - const tchar *swm_glob = NULL; - WIMStruct **additional_swms = NULL; - unsigned num_additional_swms = 0; - const tchar *staging_dir = NULL; + WIMStruct **additional_swms; + unsigned num_additional_swms; - if (!tstrcmp(argv[0], T("mountrw"))) { + if (cmd == CMD_MOUNTRW) { mount_flags |= WIMLIB_MOUNT_FLAG_READWRITE; open_flags |= WIMLIB_OPEN_FLAG_WRITE_ACCESS; } @@ -2830,7 +2919,7 @@ imagex_mount_rw_or_ro(int argc, tchar **argv) else { imagex_error(T("Unknown stream interface \"%"TS"\""), optarg); - goto mount_usage; + goto out_usage; } break; case IMAGEX_REF_OPTION: @@ -2843,80 +2932,85 @@ imagex_mount_rw_or_ro(int argc, tchar **argv) mount_flags |= WIMLIB_MOUNT_FLAG_UNIX_DATA; break; default: - goto mount_usage; + goto out_usage; } } argc -= optind; argv += optind; if (argc != 2 && argc != 3) - goto mount_usage; + goto out_usage; wimfile = argv[0]; - ret = wimlib_open_wim(wimfile, open_flags, &w, - imagex_progress_func); - if (ret != 0) - return ret; + ret = wimlib_open_wim(wimfile, open_flags, &wim, imagex_progress_func); + if (ret) + goto out; - if (swm_glob) { - ret = open_swms_from_glob(swm_glob, wimfile, open_flags, - &additional_swms, - &num_additional_swms); - if (ret != 0) - goto out; - } + if (argc >= 3) { + /* Image explicitly specified. */ + image = wimlib_resolve_image(wim, argv[1]); + dir = argv[2]; + ret = verify_image_exists_and_is_single(image, argv[1], wimfile); + if (ret) + goto out_free_wim; + } else { + /* No image specified; default to image 1, but only if the WIM + * contains exactly one image. */ + struct wimlib_wim_info info; - if (argc == 2) { - image = 1; - num_images = wimlib_get_num_images(w); - if (num_images != 1) { + wimlib_get_wim_info(wim, &info); + if (info.image_count != 1) { imagex_error(T("\"%"TS"\" contains %d images; Please " - "select one."), wimfile, num_images); - usage((mount_flags & WIMLIB_MOUNT_FLAG_READWRITE) - ? MOUNTRW : MOUNT); - ret = -1; - goto out; + "select one."), wimfile, info.image_count); + wimlib_free(wim); + goto out_usage; } + image = 1; dir = argv[1]; + } + + if (swm_glob) { + ret = open_swms_from_glob(swm_glob, wimfile, open_flags, + &additional_swms, + &num_additional_swms); + if (ret) + goto out_free_wim; } else { - image = wimlib_resolve_image(w, argv[1]); - dir = argv[2]; - ret = verify_image_exists_and_is_single(image, argv[1], wimfile); - if (ret != 0) - goto out; + additional_swms = NULL; + num_additional_swms = 0; } - ret = wimlib_mount_image(w, image, dir, mount_flags, additional_swms, + ret = wimlib_mount_image(wim, image, dir, mount_flags, additional_swms, num_additional_swms, staging_dir); - if (ret != 0) { + if (ret) { imagex_error(T("Failed to mount image %d from \"%"TS"\" " "on \"%"TS"\""), image, wimfile, dir); - } + for (unsigned i = 0; i < num_additional_swms; i++) + wimlib_free(additional_swms[i]); + free(additional_swms); +out_free_wim: + wimlib_free(wim); out: - wimlib_free(w); - if (additional_swms) { - for (unsigned i = 0; i < num_additional_swms; i++) - wimlib_free(additional_swms[i]); - free(additional_swms); - } return ret; -mount_usage: - usage((mount_flags & WIMLIB_MOUNT_FLAG_READWRITE) - ? MOUNTRW : MOUNT); - return -1; + +out_usage: + usage(cmd, stderr); + ret = -1; + goto out; } +#endif /* WIM_MOUNTING_SUPPORTED */ /* Rebuild a WIM file */ static int -imagex_optimize(int argc, tchar **argv) +imagex_optimize(int argc, tchar **argv, int cmd) { int c; int open_flags = WIMLIB_OPEN_FLAG_WRITE_ACCESS; int write_flags = WIMLIB_WRITE_FLAG_REBUILD; int ret; - WIMStruct *w; + WIMStruct *wim; const tchar *wimfile; off_t old_size; off_t new_size; @@ -2928,76 +3022,91 @@ imagex_optimize(int argc, tchar **argv) open_flags |= WIMLIB_OPEN_FLAG_CHECK_INTEGRITY; write_flags |= WIMLIB_WRITE_FLAG_CHECK_INTEGRITY; break; + case IMAGEX_NOCHECK_OPTION: + write_flags |= WIMLIB_WRITE_FLAG_NO_CHECK_INTEGRITY; + break; case IMAGEX_RECOMPRESS_OPTION: write_flags |= WIMLIB_WRITE_FLAG_RECOMPRESS; break; case IMAGEX_THREADS_OPTION: num_threads = parse_num_threads(optarg); if (num_threads == UINT_MAX) - return -1; + goto out_err; + break; + case IMAGEX_PIPABLE_OPTION: + write_flags |= WIMLIB_WRITE_FLAG_PIPABLE; + break; + case IMAGEX_NOT_PIPABLE_OPTION: + write_flags |= WIMLIB_WRITE_FLAG_NOT_PIPABLE; break; default: - usage(OPTIMIZE); - return -1; + goto out_usage; } } argc -= optind; argv += optind; - if (argc != 1) { - usage(OPTIMIZE); - return -1; - } + if (argc != 1) + goto out_usage; wimfile = argv[0]; - ret = wimlib_open_wim(wimfile, open_flags, &w, - imagex_progress_func); + ret = wimlib_open_wim(wimfile, open_flags, &wim, imagex_progress_func); if (ret) - return ret; + goto out; - old_size = file_get_size(argv[0]); + old_size = file_get_size(wimfile); tprintf(T("\"%"TS"\" original size: "), wimfile); if (old_size == -1) - tfputs(T("Unknown\n"), stdout); + tputs(T("Unknown")); else tprintf(T("%"PRIu64" KiB\n"), old_size >> 10); - ret = wimlib_overwrite(w, write_flags, num_threads, + ret = wimlib_overwrite(wim, write_flags, num_threads, imagex_progress_func); + if (ret) { + imagex_error(T("Optimization of \"%"TS"\" failed."), wimfile); + goto out_wimlib_free; + } - if (ret == 0) { - new_size = file_get_size(argv[0]); - tprintf(T("\"%"TS"\" optimized size: "), wimfile); - if (new_size == -1) - tfputs(T("Unknown\n"), stdout); - else - tprintf(T("%"PRIu64" KiB\n"), new_size >> 10); + new_size = file_get_size(wimfile); + tprintf(T("\"%"TS"\" optimized size: "), wimfile); + if (new_size == -1) + tputs(T("Unknown")); + else + tprintf(T("%"PRIu64" KiB\n"), new_size >> 10); - tfputs(T("Space saved: "), stdout); - if (new_size != -1 && old_size != -1) { - tprintf(T("%lld KiB\n"), - ((long long)old_size - (long long)new_size) >> 10); - } else { - tfputs(T("Unknown\n"), stdout); - } + tfputs(T("Space saved: "), stdout); + if (new_size != -1 && old_size != -1) { + tprintf(T("%lld KiB\n"), + ((long long)old_size - (long long)new_size) >> 10); + } else { + tputs(T("Unknown")); } - - wimlib_free(w); + ret = 0; +out_wimlib_free: + wimlib_free(wim); +out: return ret; + +out_usage: + usage(CMD_OPTIMIZE, stderr); +out_err: + ret = -1; + goto out; } /* Split a WIM into a spanned set */ static int -imagex_split(int argc, tchar **argv) +imagex_split(int argc, tchar **argv, int cmd) { int c; - int open_flags = WIMLIB_OPEN_FLAG_SPLIT_OK; + int open_flags = 0; int write_flags = 0; unsigned long part_size; tchar *tmp; int ret; - WIMStruct *w; + WIMStruct *wim; for_opt(c, split_options) { switch (c) { @@ -3006,35 +3115,42 @@ imagex_split(int argc, tchar **argv) write_flags |= WIMLIB_WRITE_FLAG_CHECK_INTEGRITY; break; default: - usage(SPLIT); - return -1; + goto out_usage; } } argc -= optind; argv += optind; - if (argc != 3) { - usage(SPLIT); - return -1; - } + if (argc != 3) + goto out_usage; + part_size = tstrtod(argv[2], &tmp) * (1 << 20); if (tmp == argv[2] || *tmp) { imagex_error(T("Invalid part size \"%"TS"\""), argv[2]); imagex_error(T("The part size must be an integer or " "floating-point number of megabytes.")); - return -1; + goto out_err; } - ret = wimlib_open_wim(argv[0], open_flags, &w, imagex_progress_func); - if (ret != 0) - return ret; - ret = wimlib_split(w, argv[1], part_size, write_flags, imagex_progress_func); - wimlib_free(w); + ret = wimlib_open_wim(argv[0], open_flags, &wim, imagex_progress_func); + if (ret) + goto out; + + ret = wimlib_split(wim, argv[1], part_size, write_flags, imagex_progress_func); + wimlib_free(wim); +out: return ret; + +out_usage: + usage(CMD_SPLIT, stderr); +out_err: + ret = -1; + goto out; } +#if WIM_MOUNTING_SUPPORTED /* Unmounts a mounted WIM image. */ static int -imagex_unmount(int argc, tchar **argv) +imagex_unmount(int argc, tchar **argv, int cmd) { int c; int unmount_flags = 0; @@ -3055,32 +3171,35 @@ imagex_unmount(int argc, tchar **argv) unmount_flags |= WIMLIB_UNMOUNT_FLAG_LAZY; break; default: - usage(UNMOUNT); - return -1; + goto out_usage; } } argc -= optind; argv += optind; - if (argc != 1) { - usage(UNMOUNT); - return -1; - } + if (argc != 1) + goto out_usage; ret = wimlib_unmount_image(argv[0], unmount_flags, imagex_progress_func); - if (ret != 0) + if (ret) imagex_error(T("Failed to unmount \"%"TS"\""), argv[0]); +out: return ret; + +out_usage: + usage(CMD_UNMOUNT, stderr); + ret = -1; + goto out; } +#endif /* WIM_MOUNTING_SUPPORTED */ /* * Add, delete, or rename files in a WIM image. */ static int -imagex_update(int argc, tchar **argv) +imagex_update(int argc, tchar **argv, int cmd) { const tchar *wimfile; - const tchar *image_num_or_name; int image; WIMStruct *wim; int ret; @@ -3091,26 +3210,23 @@ imagex_update(int argc, tchar **argv) int default_delete_flags = 0; unsigned num_threads = 0; int c; - tchar *cmd_file_contents = NULL; + tchar *cmd_file_contents; size_t cmd_file_nchars; struct wimlib_update_command *cmds; size_t num_cmds; - int num_images; tchar *command_str = NULL; const tchar *config_file = NULL; tchar *config_str; - struct wimlib_capture_config *config = NULL; + struct wimlib_capture_config *config; for_opt(c, update_options) { switch (c) { /* Generic or write options */ case IMAGEX_THREADS_OPTION: num_threads = parse_num_threads(optarg); - if (num_threads == UINT_MAX) { - ret = -1; - goto out; - } + if (num_threads == UINT_MAX) + goto out_err; break; case IMAGEX_CHECK_OPTION: open_flags |= WIMLIB_OPEN_FLAG_CHECK_INTEGRITY; @@ -3125,14 +3241,12 @@ imagex_update(int argc, tchar **argv) "one time. Please provide\n" " the update commands " "on standard input instead.")); - ret = -1; - goto out; + goto out_err; } command_str = tstrdup(optarg); if (!command_str) { imagex_error(T("Out of memory!")); - ret = -1; - goto out; + goto out_err; } break; /* Default delete options */ @@ -3171,33 +3285,34 @@ imagex_update(int argc, tchar **argv) argv += optind; argc -= optind; - if (argc < 1 || argc > 2) + if (argc != 1 && argc != 2) goto out_usage; wimfile = argv[0]; ret = wimlib_open_wim(wimfile, open_flags, &wim, imagex_progress_func); if (ret) - goto out; - - if (argc == 2) - image_num_or_name = argv[1]; - else - image_num_or_name = T("1"); - - image = wimlib_resolve_image(wim, image_num_or_name); - - ret = verify_image_exists_and_is_single(image, image_num_or_name, - wimfile); - if (ret) - goto out_wimlib_free; + goto out_free_command_str; - num_images = wimlib_get_num_images(wim); - if (argc == 1 && num_images != 1) { - imagex_error(T("\"%"TS"\" contains %d images; Please select one."), - wimfile, num_images); - usage(UPDATE); - ret = -1; - goto out_wimlib_free; + if (argc >= 2) { + /* Image explicitly specified. */ + image = wimlib_resolve_image(wim, argv[1]); + ret = verify_image_exists_and_is_single(image, argv[1], + wimfile); + if (ret) + goto out_wimlib_free; + } else { + /* No image specified; default to image 1, but only if the WIM + * contains exactly one image. */ + struct wimlib_wim_info info; + + wimlib_get_wim_info(wim, &info); + if (info.image_count != 1) { + imagex_error(T("\"%"TS"\" contains %d images; Please select one."), + wimfile, info.image_count); + wimlib_free(wim); + goto out_usage; + } + image = 1; } /* Parse capture configuration file if specified */ @@ -3221,12 +3336,13 @@ imagex_update(int argc, tchar **argv) /* Read update commands from standard input, or the command string if * specified. */ if (command_str) { + cmd_file_contents = NULL; cmds = parse_update_command_file(&command_str, tstrlen(command_str), &num_cmds); } else { if (isatty(STDIN_FILENO)) { tputs(T("Reading update commands from standard input...")); - recommend_man_page(T("update")); + recommend_man_page(CMD_UPDATE, stdout); } cmd_file_contents = stdin_get_text_contents(&cmd_file_nchars); if (!cmd_file_contents) { @@ -3260,73 +3376,189 @@ imagex_update(int argc, tchar **argv) } } -#ifdef __WIN32__ - if (have_add_command) - win32_acquire_capture_privileges(); -#endif - /* Execute the update commands */ ret = wimlib_update_image(wim, image, cmds, num_cmds, update_flags, imagex_progress_func); if (ret) - goto out_release_privs; + goto out_free_cmds; /* Overwrite the updated WIM */ ret = wimlib_overwrite(wim, write_flags, num_threads, imagex_progress_func); -out_release_privs: -#ifdef __WIN32__ - if (have_add_command) - win32_release_capture_privileges(); -#endif +out_free_cmds: free(cmds); out_free_cmd_file_contents: free(cmd_file_contents); out_free_config: - if (config != NULL && config != &default_capture_config) { + if (config != &default_capture_config) { free(config->exclusion_pats.pats); free(config->exclusion_exception_pats.pats); free(config_str); } out_wimlib_free: wimlib_free(wim); -out: +out_free_command_str: free(command_str); return ret; + out_usage: - usage(UPDATE); + usage(CMD_UPDATE, stderr); +out_err: ret = -1; - goto out; + goto out_free_command_str; } + + struct imagex_command { const tchar *name; - int (*func)(int , tchar **); - int cmd; + int (*func)(int argc, tchar **argv, int cmd); }; - -#define for_imagex_command(p) for (p = &imagex_commands[0]; \ - p != &imagex_commands[ARRAY_LEN(imagex_commands)]; p++) - static const struct imagex_command imagex_commands[] = { - {T("append"), imagex_capture_or_append, APPEND}, - {T("apply"), imagex_apply, APPLY}, - {T("capture"), imagex_capture_or_append, CAPTURE}, - {T("delete"), imagex_delete, DELETE}, - {T("dir"), imagex_dir, DIR}, - {T("export"), imagex_export, EXPORT}, - {T("extract"), imagex_extract, EXTRACT}, - {T("info"), imagex_info, INFO}, - {T("join"), imagex_join, JOIN}, - {T("mount"), imagex_mount_rw_or_ro, MOUNT}, - {T("mountrw"), imagex_mount_rw_or_ro, MOUNTRW}, - {T("optimize"),imagex_optimize, OPTIMIZE}, - {T("split"), imagex_split, SPLIT}, - {T("unmount"), imagex_unmount, UNMOUNT}, - {T("update"), imagex_update, UPDATE}, + [CMD_APPEND] = {T("append"), imagex_capture_or_append}, + [CMD_APPLY] = {T("apply"), imagex_apply}, + [CMD_CAPTURE] = {T("capture"), imagex_capture_or_append}, + [CMD_DELETE] = {T("delete"), imagex_delete}, + [CMD_DIR ] = {T("dir"), imagex_dir}, + [CMD_EXPORT] = {T("export"), imagex_export}, + [CMD_EXTRACT] = {T("extract"), imagex_extract}, + [CMD_INFO] = {T("info"), imagex_info}, + [CMD_JOIN] = {T("join"), imagex_join}, +#if WIM_MOUNTING_SUPPORTED + [CMD_MOUNT] = {T("mount"), imagex_mount_rw_or_ro}, + [CMD_MOUNTRW] = {T("mountrw"), imagex_mount_rw_or_ro}, +#endif + [CMD_OPTIMIZE] = {T("optimize"), imagex_optimize}, + [CMD_SPLIT] = {T("split"), imagex_split}, +#if WIM_MOUNTING_SUPPORTED + [CMD_UNMOUNT] = {T("unmount"), imagex_unmount}, +#endif + [CMD_UPDATE] = {T("update"), imagex_update}, +}; + +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] [--verbose]\n" +" [--dereference] [--config=FILE] [--threads=NUM_THREADS]\n" +" [--rebuild] [--unix-data] [--source-list] [--no-acls]\n" +" [--strict-acls] [--rpfix] [--norpfix] [--pipable]\n" +" [--not-pipable]\n" +), +[CMD_APPLY] = +T( +" %"TS" WIMFILE [(IMAGE_NUM | IMAGE_NAME | all)]\n" +" (DIRECTORY | NTFS_VOLUME) [--check] [--hardlink]\n" +" [--symlink] [--verbose] [--ref=\"GLOB\"] [--unix-data]\n" +" [--no-acls] [--strict-acls] [--rpfix] [--norpfix]\n" +" [--include-invalid-names] [--resume]\n" +), +[CMD_CAPTURE] = +T( +" %"TS" (DIRECTORY | NTFS_VOLUME) WIMFILE\n" +" [IMAGE_NAME [IMAGE_DESCRIPTION]] [--boot] [--check]\n" +" [--nocheck] [--compress=TYPE] [--flags EDITION_ID]\n" +" [--verbose] [--dereference] [--config=FILE]\n" +" [--threads=NUM_THREADS] [--unix-data] [--source-list]\n" +" [--no-acls] [--strict-acls] [--rpfix] [--norpfix]\n" +" [--pipable] [--not-pipable]\n" +), +[CMD_DELETE] = +T( +" %"TS" WIMFILE (IMAGE_NUM | IMAGE_NAME | all) [--check]\n" +" [--soft]\n" +), +[CMD_DIR] = +T( +" %"TS" WIMFILE (IMAGE_NUM | IMAGE_NAME | all) [--path=PATH]\n" +), +[CMD_EXPORT] = +T( +" %"TS" SRC_WIMFILE (SRC_IMAGE_NUM | SRC_IMAGE_NAME | all ) \n" +" 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" +), +[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" +), +[CMD_JOIN] = +T( +" %"TS" OUT_WIMFILE SPLIT_WIM_PART... [--check]\n" +), +#if WIM_MOUNTING_SUPPORTED +[CMD_MOUNT] = +T( +" %"TS" WIMFILE [(IMAGE_NUM | IMAGE_NAME)] DIRECTORY\n" +" [--check] [--debug] [--streams-interface=INTERFACE]\n" +" [--ref=\"GLOB\"] [--unix-data] [--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" +), +#endif +[CMD_OPTIMIZE] = +T( +" %"TS" WIMFILE [--check] [--nocheck] [--recompress]\n" +" [--threads=NUM_THREADS] [--pipable] [--not-pipable]\n" +), +[CMD_SPLIT] = +T( +" %"TS" WIMFILE SPLIT_WIM_PART_1 PART_SIZE_MB [--check]\n" +), +#if WIM_MOUNTING_SUPPORTED +[CMD_UNMOUNT] = +T( +" %"TS" DIRECTORY [--commit] [--check] [--rebuild] [--lazy]\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" +), }; +static const tchar *invocation_name; +static bool using_cmd_from_invocation_name = false; + +static const tchar *get_cmd_string(int cmd, bool nospace) +{ + + if (using_cmd_from_invocation_name || cmd == CMD_NONE) { + return invocation_name; + } else { + const tchar *format; + static tchar buf[50]; + + if (nospace) + format = T("%"TS"-%"TS""); + else + format = T("%"TS" %"TS""); + tsprintf(buf, format, invocation_name, imagex_commands[cmd].name); + return buf; + } +} + static void version(void) { @@ -3345,67 +3577,74 @@ IMAGEX_PROGNAME " (" PACKAGE ") " PACKAGE_VERSION "\n" static void -help_or_version(int argc, tchar **argv) +help_or_version(int argc, tchar **argv, int cmd) { int i; const tchar *p; - const struct imagex_command *cmd; for (i = 1; i < argc; i++) { p = argv[i]; - if (*p == T('-')) - p++; - else - continue; - if (*p == T('-')) - p++; - if (!tstrcmp(p, T("help"))) { - for_imagex_command(cmd) { - if (!tstrcmp(cmd->name, argv[1])) { - usage(cmd->cmd); - exit(0); - } + if (p[0] == T('-') && p[1] == T('-')) { + p += 2; + if (!tstrcmp(p, T("help"))) { + if (cmd == CMD_NONE) + usage_all(stdout); + else + usage(cmd, stdout); + exit(0); + } else if (!tstrcmp(p, T("version"))) { + version(); + exit(0); } - usage_all(); - exit(0); - } - if (!tstrcmp(p, T("version"))) { - version(); - exit(0); } } } +static void +print_usage_string(int cmd, FILE *fp) +{ + tfprintf(fp, usage_strings[cmd], get_cmd_string(cmd, false)); +} static void -usage(int cmd_type) +recommend_man_page(int cmd, FILE *fp) { - const struct imagex_command *cmd; - tprintf(T("Usage:\n%"TS), usage_strings[cmd_type]); - for_imagex_command(cmd) { - if (cmd->cmd == cmd_type) { - tputc(T('\n'), stdout); - recommend_man_page(cmd->name); - } - } + const tchar *format_str; +#ifdef __WIN32__ + format_str = T("See %"TS".pdf in the doc directory for more details.\n"); +#else + format_str = T("Try `man %"TS"' for more details.\n"); +#endif + tfprintf(fp, format_str, get_cmd_string(cmd, true)); +} + +static void +usage(int cmd, FILE *fp) +{ + tfprintf(fp, T("Usage:\n")); + print_usage_string(cmd, fp); + tfprintf(fp, T("\n")); + recommend_man_page(cmd, fp); } static void -usage_all(void) +usage_all(FILE *fp) { - tfputs(T("Usage:\n"), stdout); - for (int i = 0; i < ARRAY_LEN(usage_strings); i++) - tprintf(T(" %"TS), usage_strings[i]); + tfprintf(fp, T("Usage:\n")); + for (int cmd = 0; cmd < CMD_MAX; cmd++) { + print_usage_string(cmd, fp); + tfprintf(fp, T("\n")); + } static const tchar *extra = T( -" "IMAGEX_PROGNAME" --help\n" -" "IMAGEX_PROGNAME" --version\n" +" %"TS" --help\n" +" %"TS" --version\n" "\n" " The compression TYPE may be \"maximum\", \"fast\", or \"none\".\n" "\n" ); - tfputs(extra, stdout); - recommend_man_page(T("")); + tfprintf(fp, extra, invocation_name, invocation_name); + recommend_man_page(CMD_NONE, fp); } /* Entry point for wimlib's ImageX implementation. On UNIX the command @@ -3419,9 +3658,12 @@ wmain(int argc, wchar_t **argv, wchar_t **envp) main(int argc, char **argv) #endif { - const struct imagex_command *cmd; int ret; int init_flags = 0; + int cmd; + + imagex_info_file = stdout; + invocation_name = tbasename(argv[0]); #ifndef __WIN32__ if (getenv("WIMLIB_IMAGEX_USE_UTF8")) { @@ -3436,67 +3678,89 @@ main(int argc, char **argv) !strstr(codeset, "utf-8") && !strstr(codeset, "utf8")) { - fputs( -"WARNING: Running "IMAGEX_PROGNAME" in a UTF-8 locale is recommended!\n" + fprintf(stderr, +"WARNING: Running %"TS" in a UTF-8 locale is recommended!\n" " Maybe try: `export LANG=en_US.UTF-8'?\n" " Alternatively, set the environmental variable WIMLIB_IMAGEX_USE_UTF8\n" " to any value to force wimlib to use UTF-8.\n", - stderr); + invocation_name); } } #endif /* !__WIN32__ */ - if (argc < 2) { - imagex_error(T("No command specified")); - usage_all(); - ret = 2; - goto out; + /* Allow being invoked as wimCOMMAND (e.g. wimapply). */ + cmd = CMD_NONE; + if (!tstrncmp(invocation_name, T("wim"), 3) && + tstrcmp(invocation_name, T(IMAGEX_PROGNAME))) { + for (int i = 0; i < CMD_MAX; i++) { + if (!tstrcmp(invocation_name + 3, + imagex_commands[i].name)) + { + using_cmd_from_invocation_name = true; + cmd = i; + break; + } + } + } + + /* Unless already known from the invocation name, determine which + * command was specified. */ + if (cmd == CMD_NONE) { + if (argc < 2) { + imagex_error(T("No command specified!\n")); + usage_all(stderr); + exit(2); + } + for (int i = 0; i < CMD_MAX; i++) { + if (!tstrcmp(argv[1], imagex_commands[i].name)) { + cmd = i; + break; + } + } + if (cmd != CMD_NONE) { + argc--; + argv++; + } } - /* Handle --help and --version for all commands. Note that this will - * not return if either of these arguments are present. */ - help_or_version(argc, argv); - argc--; - argv++; + /* Handle --help and --version. --help can be either for the program as + * a whole (cmd == CMD_NONE) or just for a specific command (cmd != + * CMD_NONE). Note: help_or_version() will not return if a --help or + * --version argument was found. */ + help_or_version(argc, argv, cmd); - /* The user may like to see more informative error messages. */ + /* Bail if a valid command was not specified. */ + if (cmd == CMD_NONE) { + imagex_error(T("Unrecognized command: `%"TS"'\n"), argv[1]); + usage_all(stderr); + exit(2); + } + + /* Enable warning and error messages in wimlib be more user-friendly. + * */ wimlib_set_print_errors(true); - /* Do any initializations that the library needs */ + /* Initialize wimlib. */ ret = wimlib_global_init(init_flags); if (ret) goto out_check_status; - /* Search for the function to handle the ImageX subcommand. */ - for_imagex_command(cmd) { - if (!tstrcmp(cmd->name, *argv)) { - ret = cmd->func(argc, argv); - goto out_check_write_error; - } - } - - imagex_error(T("Unrecognized command: `%"TS"'"), argv[0]); - usage_all(); - ret = 2; - goto out_cleanup; -out_check_write_error: - /* For 'wimlib-imagex info' and 'wimlib-imagex dir', data printed to - * standard output is part of the program's actual behavior and not just - * for informational purposes, so we should set a failure exit status if - * there was a write error. */ - if (cmd == &imagex_commands[INFO] || cmd == &imagex_commands[DIR]) { - if (ferror(stdout) || fclose(stdout)) { - imagex_error_with_errno(T("error writing to standard output")); - if (ret == 0) - ret = -1; - } + /* Call the command handler function. */ + ret = imagex_commands[cmd].func(argc, argv, cmd); + + /* Check for error writing to standard output, especially since for some + * commands, writing to standard output is part of the program's actual + * behavior and not just for informational purposes. */ + if (ferror(stdout) || fclose(stdout)) { + imagex_error_with_errno(T("error writing to standard output")); + if (ret == 0) + ret = -1; } out_check_status: /* Exit status (ret): -1 indicates an error found by 'wimlib-imagex' - * outside of the wimlib library code. 0 indicates success. > 0 - * indicates a wimlib error code from which an error message can be - * printed. */ + * itself (not by wimlib). 0 indicates success. > 0 indicates a wimlib + * error code from which an error message can be printed. */ if (ret > 0) { imagex_error(T("Exiting with error code %d:\n" " %"TS"."), ret, @@ -3504,10 +3768,8 @@ out_check_status: if (ret == WIMLIB_ERR_NTFS_3G && errno != 0) imagex_error_with_errno(T("errno")); } -out_cleanup: - /* Make the library free any resources it's holding (not strictly - * necessary because the process is ending anyway). */ + /* Make wimlib free any resources it's holding (although this is not + * strictly necessary because the process is ending anyway). */ wimlib_global_cleanup(); -out: return ret; }