X-Git-Url: https://wimlib.net/git/?p=wimlib;a=blobdiff_plain;f=programs%2Fimagex.c;h=977f21be48c2cb714e8d3191f0b9a0400c0e6823;hp=8947c56dfb1674857c9728d4a585c93beffabe36;hb=773fafce334bd429d35365adfd377a0b63c66953;hpb=2b04e3ff551654916caba6f6fad50908de67b0fd diff --git a/programs/imagex.c b/programs/imagex.c index 8947c56d..977f21be 100644 --- a/programs/imagex.c +++ b/programs/imagex.c @@ -146,6 +146,7 @@ enum { IMAGEX_RECOMPRESS_OPTION, IMAGEX_RECURSIVE_OPTION, IMAGEX_REF_OPTION, + IMAGEX_RESUME_OPTION, IMAGEX_RPFIX_OPTION, IMAGEX_SOFT_OPTION, IMAGEX_SOURCE_LIST_OPTION, @@ -173,6 +174,7 @@ 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}, }; @@ -985,6 +987,7 @@ 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; @@ -993,13 +996,28 @@ imagex_progress_func(enum wimlib_progress_msg msg, data_type, info->write_streams.num_threads, (info->write_streams.num_threads == 1) ? T("") : T("s")); } - imagex_printf(T("\r%"PRIu64" %"TS" of %"PRIu64" %"TS" (uncompressed) " - "written (%u%% done)"), - info->write_streams.completed_bytes >> unit_shift, - unit_name, - info->write_streams.total_bytes >> unit_shift, - unit_name, - percent_done); + if (info->write_streams.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) imagex_printf(T("\n")); break; @@ -1019,8 +1037,6 @@ imagex_progress_func(enum wimlib_progress_msg msg, else 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, @@ -1070,10 +1086,6 @@ imagex_progress_func(enum wimlib_progress_msg msg, info->extract.wimfile_name, info->extract.target); break; - /*case WIMLIB_PROGRESS_MSG_EXTRACT_DIR_STRUCTURE_BEGIN:*/ - /*imagex_printf(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); @@ -1098,21 +1110,6 @@ imagex_progress_func(enum wimlib_progress_msg msg, 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); - imagex_printf(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); @@ -1501,6 +1498,9 @@ imagex_apply(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_RESUME_OPTION: + extract_flags |= WIMLIB_EXTRACT_FLAG_RESUME; + break; default: goto out_usage; } @@ -1587,9 +1587,6 @@ imagex_apply(int argc, tchar **argv, int cmd) } #endif -#ifdef __WIN32__ - win32_acquire_restore_privileges(); -#endif if (wim) { ret = wimlib_extract_image(wim, image, target, extract_flags, additional_swms, num_additional_swms, @@ -1603,9 +1600,6 @@ imagex_apply(int argc, tchar **argv, int cmd) } if (ret == 0) imagex_printf(T("Done applying WIM image.\n")); -#ifdef __WIN32__ - win32_release_restore_privileges(); -#endif out_free_swms: for (unsigned i = 0; i < num_additional_swms; i++) wimlib_free(additional_swms[i]); @@ -1864,10 +1858,6 @@ imagex_capture_or_append(int argc, tchar **argv, int cmd) tsprintf(name_end, T(" (%lu)"), conflict_idx); } } -#ifdef __WIN32__ - win32_acquire_capture_privileges(); -#endif - ret = wimlib_add_image_multisource(wim, capture_sources, num_sources, @@ -1876,7 +1866,7 @@ imagex_capture_or_append(int argc, tchar **argv, int cmd) add_image_flags, imagex_progress_func); if (ret) - goto out_release_privs; + goto out_wimlib_free; if (desc || flags_element) { /* User provided or element. Get the @@ -1891,14 +1881,14 @@ imagex_capture_or_append(int argc, tchar **argv, int cmd) info.image_count, desc); if (ret) - goto out_release_privs; + goto out_wimlib_free; } if (flags_element) { ret = wimlib_set_image_flags(wim, info.image_count, flags_element); if (ret) - goto out_release_privs; + goto out_wimlib_free; } } @@ -1916,10 +1906,6 @@ imagex_capture_or_append(int argc, tchar **argv, int cmd) write_flags, num_threads, imagex_progress_func); } -out_release_privs: -#ifdef __WIN32__ - win32_release_capture_privileges(); -#endif out_wimlib_free: wimlib_free(wim); out_free_config: @@ -2467,10 +2453,6 @@ imagex_extract(int argc, tchar **argv, int cmd) 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); @@ -2483,9 +2465,6 @@ imagex_extract(int argc, tchar **argv, int cmd) " are in the WIM image.\n"), get_cmd_string(CMD_INFO, false)); } -#ifdef __WIN32__ - win32_release_restore_privileges(); -#endif for (unsigned i = 0; i < num_additional_swms; i++) wimlib_free(additional_swms[i]); free(additional_swms); @@ -3397,25 +3376,16 @@ imagex_update(int argc, tchar **argv, int cmd) } } -#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); @@ -3484,7 +3454,7 @@ T( " (DIRECTORY | NTFS_VOLUME) [--check] [--hardlink]\n" " [--symlink] [--verbose] [--ref=\"GLOB\"] [--unix-data]\n" " [--no-acls] [--strict-acls] [--rpfix] [--norpfix]\n" -" [--include-invalid-names]\n" +" [--include-invalid-names] [--resume]\n" ), [CMD_CAPTURE] = T( @@ -3592,9 +3562,9 @@ static const tchar *get_cmd_string(int cmd, bool nospace) static void version(void) { - static const tchar *format = + static const tchar *s = T( -"%"TS" (" PACKAGE ") " PACKAGE_VERSION "\n" +IMAGEX_PROGNAME " (" PACKAGE ") " PACKAGE_VERSION "\n" "Copyright (C) 2012, 2013 Eric Biggers\n" "License GPLv3+; GNU GPL version 3 or later .\n" "This is free software: you are free to change and redistribute it.\n" @@ -3602,7 +3572,7 @@ version(void) "\n" "Report bugs to "PACKAGE_BUGREPORT".\n" ); - tprintf(format, invocation_name); + tfputs(s, stdout); } @@ -3734,8 +3704,8 @@ main(int argc, char **argv) } } - /* Unless already known from the invocation name, search for the - * function to handle the specified subcommand. */ + /* 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")); @@ -3754,20 +3724,24 @@ main(int argc, char **argv) } } - /* Handle --help and --version for all commands. Note that this will - * not return if either of these arguments are present. */ + /* 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); + /* 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); } - /* The user may like to see more informative error messages. */ + /* Enable warning and error messages in wimlib be more user-friendly. + * */ wimlib_set_print_errors(true); - /* Initialize the library. */ + /* Initialize wimlib. */ ret = wimlib_global_init(init_flags); if (ret) goto out_check_status; @@ -3785,9 +3759,8 @@ main(int argc, char **argv) } 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, @@ -3795,8 +3768,8 @@ out_check_status: if (ret == WIMLIB_ERR_NTFS_3G && errno != 0) imagex_error_with_errno(T("errno")); } - /* 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(); return ret; }