X-Git-Url: https://wimlib.net/git/?p=wimlib;a=blobdiff_plain;f=programs%2Fimagex.c;h=4735f1aa2dd6614e0a0998dfdca27c19ab83c886;hp=dd1a1243900cff33ebf44859139da74fa083c8fa;hb=161d3898359e3feb8c96ae220b376ef33c72a1d6;hpb=590fbf5626965d44f924be5cc8b04eb489f69f25 diff --git a/programs/imagex.c b/programs/imagex.c index dd1a1243..4735f1aa 100644 --- a/programs/imagex.c +++ b/programs/imagex.c @@ -23,8 +23,8 @@ */ #include "config.h" -#include "wimlib_tchar.h" #include "wimlib.h" +#include "wimlib_tchar.h" #include #include @@ -68,6 +68,7 @@ enum imagex_op_type { DELETE, DIR, EXPORT, + EXTRACT, INFO, JOIN, MOUNT, @@ -75,11 +76,14 @@ enum imagex_op_type { OPTIMIZE, SPLIT, UNMOUNT, + UPDATE, }; static void usage(int cmd_type); static void usage_all(); +static bool imagex_be_quiet = false; + static const tchar *usage_strings[] = { [APPEND] = @@ -89,13 +93,14 @@ IMAGEX_PROGNAME" append (DIRECTORY | NTFS_VOLUME) WIMFILE [IMAGE_NAME]\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]\n" +" [--no-acls] [--strict-acls] [--rpfix] [--norpfix]\n" ), [CAPTURE] = T( @@ -104,6 +109,7 @@ IMAGEX_PROGNAME" capture (DIRECTORY | NTFS_VOLUME) WIMFILE [IMAGE_NAME]\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( @@ -120,6 +126,12 @@ IMAGEX_PROGNAME" export SRC_WIMFILE (SRC_IMAGE_NUM | SRC_IMAGE_NAME | all ) \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" +), [INFO] = T( IMAGEX_PROGNAME" info WIMFILE [IMAGE_NUM | IMAGE_NAME] [NEW_NAME]\n" @@ -145,6 +157,7 @@ IMAGEX_PROGNAME" mountrw WIMFILE [IMAGE_NUM | IMAGE_NAME] DIRECTORY\n" [OPTIMIZE] = T( IMAGEX_PROGNAME" optimize WIMFILE [--check] [--recompress]\n" +" [--threads=NUM_THREADS]\n" ), [SPLIT] = T( @@ -154,6 +167,17 @@ IMAGEX_PROGNAME" split WIMFILE SPLIT_WIMFILE PART_SIZE_MB [--check]\n" T( IMAGEX_PROGNAME" unmount DIRECTORY [--commit] [--check] [--rebuild]\n" ), +[UPDATE] = +T( +IMAGEX_PROGNAME" update WIMFILE IMAGE [--check] [--rebuild]\n" +" [--threads=NUM_THREADS] [DEFAULT_ADD_OPTIONS]\n" +" [DEFAULT_DELETE_OPTIONS] [< CMDFILE]\n" +" ... where each CMD is:\n" +" add [--unix-data] [--no-acls] [--strict-acls] [--dereference]\n" +" [--verbose] FILE_OR_DIRECTORY DEST_WIM_PATH\n" +" delete [--force] [--recursive] WIM_PATH\n" +" rename SRC_PATH_IN_WIM DEST_PATH_IN_WIM\n" +), }; enum { @@ -165,16 +189,21 @@ enum { IMAGEX_CONFIG_OPTION, IMAGEX_DEBUG_OPTION, IMAGEX_DEREFERENCE_OPTION, + IMAGEX_DEST_DIR_OPTION, IMAGEX_EXTRACT_XML_OPTION, IMAGEX_FLAGS_OPTION, + IMAGEX_FORCE_OPTION, IMAGEX_HARDLINK_OPTION, IMAGEX_HEADER_OPTION, IMAGEX_LOOKUP_TABLE_OPTION, IMAGEX_METADATA_OPTION, + IMAGEX_NORPFIX_OPTION, IMAGEX_NO_ACLS_OPTION, - IMAGEX_REBULID_OPTION, + IMAGEX_REBUILD_OPTION, IMAGEX_RECOMPRESS_OPTION, + IMAGEX_RECURSIVE_OPTION, IMAGEX_REF_OPTION, + IMAGEX_RPFIX_OPTION, IMAGEX_SOFT_OPTION, IMAGEX_SOURCE_LIST_OPTION, IMAGEX_STAGING_DIR_OPTION, @@ -182,6 +211,7 @@ enum { IMAGEX_STRICT_ACLS_OPTION, IMAGEX_SYMLINK_OPTION, IMAGEX_THREADS_OPTION, + IMAGEX_TO_STDOUT_OPTION, IMAGEX_UNIX_DATA_OPTION, IMAGEX_VERBOSE_OPTION, IMAGEX_XML_OPTION, @@ -197,6 +227,8 @@ static const struct option apply_options[] = { {T("noacls"), no_argument, NULL, IMAGEX_NO_ACLS_OPTION}, {T("no-acls"), no_argument, NULL, IMAGEX_NO_ACLS_OPTION}, {T("strict-acls"), no_argument, NULL, IMAGEX_STRICT_ACLS_OPTION}, + {T("rpfix"), no_argument, NULL, IMAGEX_RPFIX_OPTION}, + {T("norpfix"), no_argument, NULL, IMAGEX_NORPFIX_OPTION}, {NULL, 0, NULL, 0}, }; static const struct option capture_or_append_options[] = { @@ -208,12 +240,14 @@ static const struct option capture_or_append_options[] = { {T("flags"), required_argument, NULL, IMAGEX_FLAGS_OPTION}, {T("verbose"), no_argument, NULL, IMAGEX_VERBOSE_OPTION}, {T("threads"), required_argument, NULL, IMAGEX_THREADS_OPTION}, - {T("rebuild"), no_argument, NULL, IMAGEX_REBULID_OPTION}, + {T("rebuild"), no_argument, NULL, IMAGEX_REBUILD_OPTION}, {T("unix-data"), no_argument, NULL, IMAGEX_UNIX_DATA_OPTION}, {T("source-list"), no_argument, NULL, IMAGEX_SOURCE_LIST_OPTION}, {T("noacls"), no_argument, NULL, IMAGEX_NO_ACLS_OPTION}, {T("no-acls"), no_argument, NULL, IMAGEX_NO_ACLS_OPTION}, {T("strict-acls"), no_argument, NULL, IMAGEX_STRICT_ACLS_OPTION}, + {T("rpfix"), no_argument, NULL, IMAGEX_RPFIX_OPTION}, + {T("norpfix"), no_argument, NULL, IMAGEX_NORPFIX_OPTION}, {NULL, 0, NULL, 0}, }; static const struct option delete_options[] = { @@ -228,7 +262,20 @@ static const struct option export_options[] = { {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_REBULID_OPTION}, + {T("rebuild"), no_argument, NULL, IMAGEX_REBUILD_OPTION}, + {NULL, 0, NULL, 0}, +}; + +static const struct option extract_options[] = { + {T("check"), no_argument, NULL, IMAGEX_CHECK_OPTION}, + {T("verbose"), no_argument, NULL, IMAGEX_VERBOSE_OPTION}, + {T("ref"), required_argument, NULL, IMAGEX_REF_OPTION}, + {T("unix-data"), no_argument, NULL, IMAGEX_UNIX_DATA_OPTION}, + {T("noacls"), no_argument, NULL, IMAGEX_NO_ACLS_OPTION}, + {T("no-acls"), no_argument, NULL, IMAGEX_NO_ACLS_OPTION}, + {T("strict-acls"), no_argument, NULL, IMAGEX_STRICT_ACLS_OPTION}, + {T("dest-dir"), required_argument, NULL, IMAGEX_DEST_DIR_OPTION}, + {T("to-stdout"), no_argument, NULL, IMAGEX_TO_STDOUT_OPTION}, {NULL, 0, NULL, 0}, }; @@ -262,6 +309,7 @@ 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}, {NULL, 0, NULL, 0}, }; @@ -273,11 +321,24 @@ static const struct option split_options[] = { static const struct option unmount_options[] = { {T("commit"), no_argument, NULL, IMAGEX_COMMIT_OPTION}, {T("check"), no_argument, NULL, IMAGEX_CHECK_OPTION}, - {T("rebuild"), no_argument, NULL, IMAGEX_REBULID_OPTION}, + {T("rebuild"), no_argument, NULL, IMAGEX_REBUILD_OPTION}, {NULL, 0, NULL, 0}, }; - +static const struct option update_options[] = { + {T("threads"), required_argument, NULL, IMAGEX_THREADS_OPTION}, + {T("check"), no_argument, NULL, IMAGEX_CHECK_OPTION}, + {T("rebuild"), no_argument, NULL, IMAGEX_REBUILD_OPTION}, + {T("force"), no_argument, NULL, IMAGEX_FORCE_OPTION}, + {T("recursive"), no_argument, NULL, IMAGEX_RECURSIVE_OPTION}, + {T("config"), required_argument, NULL, IMAGEX_CONFIG_OPTION}, + {T("dereference"), no_argument, NULL, IMAGEX_DEREFERENCE_OPTION}, + {T("unix-data"), no_argument, NULL, IMAGEX_UNIX_DATA_OPTION}, + {T("noacls"), no_argument, NULL, IMAGEX_NO_ACLS_OPTION}, + {T("no-acls"), no_argument, NULL, IMAGEX_NO_ACLS_OPTION}, + {T("strict-acls"), no_argument, NULL, IMAGEX_STRICT_ACLS_OPTION}, + {NULL, 0, NULL, 0}, +}; /* Print formatted error message to stderr. */ static void @@ -369,22 +430,28 @@ file_get_size(const tchar *filename) return (off_t)-1; } -static const tchar *default_capture_config = -T( -"[ExclusionList]\n" -"\\$ntfs.log\n" -"\\hiberfil.sys\n" -"\\pagefile.sys\n" -"\\System Volume Information\n" -"\\RECYCLER\n" -"\\Windows\\CSC\n" -"\n" -"[CompressionExclusionList]\n" -"*.mp3\n" -"*.zip\n" -"*.cab\n" -"\\WINDOWS\\inf\\*.pnf\n" -); +tchar pat_ntfs_log[] = T("/$ntfs.log"); +tchar pat_hiberfil_sys[] = T("/hiberfil.sys"); +tchar pat_pagefile_sys[] = T("/pagefile.sys"); +tchar pat_system_volume_information[] = T("/System Volume Information"); +tchar pat_recycler[] = T("/RECYCLER"); +tchar pat_windows_csc[] = T("/Windows/CSC"); + +tchar *default_pats[] = { + pat_ntfs_log, + pat_hiberfil_sys, + pat_pagefile_sys, + pat_system_volume_information, + pat_recycler, + pat_windows_csc, +}; + +static struct wimlib_capture_config default_capture_config = { + .exclusion_pats = { + .num_pats = sizeof(default_pats) / sizeof(*default_pats), + .pats = default_pats, + }, +}; enum { PARSE_FILENAME_SUCCESS = 0, @@ -505,6 +572,34 @@ is_comment_line(const tchar *line, size_t len) } } +static ssize_t +text_file_count_lines(tchar **contents_p, size_t *nchars_p) +{ + ssize_t nlines = 0; + tchar *contents = *contents_p; + size_t nchars = *nchars_p; + size_t i; + + for (i = 0; i < nchars; i++) + if (contents[i] == T('\n')) + nlines++; + + /* Handle last line not terminated by a newline */ + if (nchars != 0 && contents[nchars - 1] != T('\n')) { + contents = realloc(contents, (nchars + 1) * sizeof(tchar)); + if (!contents) { + imagex_error(T("Out of memory!")); + return -1; + } + contents[nchars] = T('\n'); + *contents_p = contents; + nchars++; + nlines++; + } + *nchars_p = nchars; + return nlines; +} + /* Parses a file in the source list format. (See the man page for * 'wimlib-imagex capture' for details on this format and the meaning.) * @@ -526,37 +621,24 @@ static struct wimlib_capture_source * parse_source_list(tchar **source_list_contents_p, size_t source_list_nchars, size_t *nsources_ret) { - size_t nlines; + ssize_t nlines; tchar *p; struct wimlib_capture_source *sources; size_t i, j; - tchar *source_list_contents = *source_list_contents_p; - nlines = 0; - for (i = 0; i < source_list_nchars; i++) - if (source_list_contents[i] == T('\n')) - nlines++; - - /* Handle last line not terminated by a newline */ - if (source_list_nchars != 0 && - source_list_contents[source_list_nchars - 1] != T('\n')) - { - source_list_contents = realloc(source_list_contents, - (source_list_nchars + 1) * sizeof(tchar)); - if (!source_list_contents) - goto oom; - source_list_contents[source_list_nchars] = T('\n'); - *source_list_contents_p = source_list_contents; - source_list_nchars++; - nlines++; - } + nlines = text_file_count_lines(source_list_contents_p, + &source_list_nchars); + if (nlines < 0) + return NULL; /* Always allocate at least 1 slot, just in case the implementation of * calloc() returns NULL if 0 bytes are requested. */ sources = calloc(nlines ?: 1, sizeof(*sources)); - if (!sources) - goto oom; - p = source_list_contents; + if (!sources) { + imagex_error(T("out of memory")); + return NULL; + } + p = *source_list_contents_p; j = 0; for (i = 0; i < nlines; i++) { /* XXX: Could use rawmemchr() here instead, but it may not be @@ -575,9 +657,144 @@ parse_source_list(tchar **source_list_contents_p, size_t source_list_nchars, } *nsources_ret = j; return sources; -oom: - imagex_error(T("out of memory")); - return NULL; +} + + +enum capture_config_section { + CAPTURE_CONFIG_NO_SECTION, + CAPTURE_CONFIG_EXCLUSION_SECTION, + CAPTURE_CONFIG_EXCLUSION_EXCEPTION_SECTION, + CAPTURE_CONFIG_IGNORE_SECTION, +}; + +enum { + CAPTURE_CONFIG_INVALID_SECTION, + CAPTURE_CONFIG_CHANGED_SECTION, + CAPTURE_CONFIG_SAME_SECTION, +}; + +static int +check_config_section(tchar *line, size_t len, + enum capture_config_section *cur_section) +{ + while (istspace(*line)) + line++; + + if (*line != T('[')) + return CAPTURE_CONFIG_SAME_SECTION; + + line++; + tchar *endbrace = tstrrchr(line, T(']')); + if (!endbrace) + return CAPTURE_CONFIG_SAME_SECTION; + + if (!tmemcmp(line, T("ExclusionList"), endbrace - line)) { + *cur_section = CAPTURE_CONFIG_EXCLUSION_SECTION; + } else if (!tmemcmp(line, T("ExclusionException"), endbrace - line)) { + *cur_section = CAPTURE_CONFIG_EXCLUSION_EXCEPTION_SECTION; + } else if (!tmemcmp(line, T("CompressionExclusionList"), endbrace - line)) { + *cur_section = CAPTURE_CONFIG_IGNORE_SECTION; + tfputs(T("WARNING: Ignoring [CompressionExclusionList] section " + "of capture config file\n"), + stderr); + } else if (!tmemcmp(line, T("AlignmentList"), endbrace - line)) { + *cur_section = CAPTURE_CONFIG_IGNORE_SECTION; + tfputs(T("WARNING: Ignoring [AlignmentList] section " + "of capture config file\n"), + stderr); + } else { + imagex_error(T("Invalid capture config file section \"%"TS"\""), + line - 1); + return CAPTURE_CONFIG_INVALID_SECTION; + } + return CAPTURE_CONFIG_CHANGED_SECTION; +} + + +static bool +pattern_list_add_pattern(struct wimlib_pattern_list *pat_list, + tchar *pat) +{ + if (pat_list->num_pats == pat_list->num_allocated_pats) { + tchar **pats; + size_t num_allocated_pats = pat_list->num_pats + 8; + + pats = realloc(pat_list->pats, + num_allocated_pats * sizeof(pat_list->pats[0])); + if (!pats) { + imagex_error(T("Out of memory!")); + return false; + } + pat_list->pats = pats; + pat_list->num_allocated_pats = num_allocated_pats; + } + pat_list->pats[pat_list->num_pats++] = pat; + return true; +} + +static bool +parse_capture_config_line(tchar *line, size_t len, + enum capture_config_section *cur_section, + struct wimlib_capture_config *config) +{ + tchar *filename; + int ret; + + ret = check_config_section(line, len, cur_section); + if (ret == CAPTURE_CONFIG_INVALID_SECTION) + return false; + if (ret == CAPTURE_CONFIG_CHANGED_SECTION) + return true; + + switch (*cur_section) { + case CAPTURE_CONFIG_NO_SECTION: + imagex_error(T("Line \"%"TS"\" is not in a section " + "(such as [ExclusionList]"), line); + return false; + case CAPTURE_CONFIG_EXCLUSION_SECTION: + if (parse_filename(&line, &len, &filename) != PARSE_FILENAME_SUCCESS) + return false; + return pattern_list_add_pattern(&config->exclusion_pats, + filename); + case CAPTURE_CONFIG_EXCLUSION_EXCEPTION_SECTION: + if (parse_filename(&line, &len, &filename) != PARSE_FILENAME_SUCCESS) + return false; + return pattern_list_add_pattern(&config->exclusion_exception_pats, + filename); + case CAPTURE_CONFIG_IGNORE_SECTION: + return true; + } + return false; +} + +static int +parse_capture_config(tchar **contents_p, size_t nchars, + struct wimlib_capture_config *config) +{ + ssize_t nlines; + tchar *p; + size_t i; + enum capture_config_section cur_section; + + memset(config, 0, sizeof(*config)); + + nlines = text_file_count_lines(contents_p, &nchars); + if (nlines < 0) + return -1; + + cur_section = CAPTURE_CONFIG_NO_SECTION; + p = *contents_p; + for (i = 0; i < nlines; i++) { + tchar *endp = tmemchr(p, T('\n'), nchars); + size_t len = endp - p + 1; + *endp = T('\0'); + if (!is_comment_line(p, len)) + if (!parse_capture_config_line(p, len, &cur_section, config)) + return -1; + p = endp + 1; + + } + return 0; } /* Reads the contents of a file into memory. */ @@ -764,6 +981,8 @@ imagex_progress_func(enum wimlib_progress_msg msg, const union wimlib_progress_info *info) { unsigned percent_done; + if (imagex_be_quiet) + return 0; switch (msg) { case WIMLIB_PROGRESS_MSG_WRITE_STREAMS: percent_done = TO_PERCENT(info->write_streams.completed_bytes, @@ -825,7 +1044,7 @@ imagex_progress_func(enum wimlib_progress_msg msg, tputchar(T('\n')); break; case WIMLIB_PROGRESS_MSG_EXTRACT_IMAGE_BEGIN: - tprintf(T("Applying image %d (%"TS") from \"%"TS"\" " + tprintf(T("Applying image %d (\"%"TS"\") from \"%"TS"\" " "to %"TS" \"%"TS"\"\n"), info->extract.image, info->extract.image_name, @@ -834,6 +1053,15 @@ imagex_progress_func(enum wimlib_progress_msg msg, T("NTFS volume") : T("directory")), info->extract.target); break; + case WIMLIB_PROGRESS_MSG_EXTRACT_TREE_BEGIN: + tprintf(T("Extracting \"%"TS"\" from image %d (\"%"TS"\") " + "in \"%"TS"\" to \"%"TS"\"\n"), + info->extract.extract_root_wim_source_path, + info->extract.image, + info->extract.image_name, + info->extract.wimfile_name, + info->extract.target); + break; /*case WIMLIB_PROGRESS_MSG_EXTRACT_DIR_STRUCTURE_BEGIN:*/ /*tprintf(T("Applying directory structure to %"TS"\n"),*/ /*info->extract.target);*/ @@ -853,7 +1081,8 @@ imagex_progress_func(enum wimlib_progress_msg msg, tprintf(T("%"TS"\n"), info->extract.cur_path); break; case WIMLIB_PROGRESS_MSG_APPLY_TIMESTAMPS: - tprintf(T("Setting timestamps on all extracted files...\n")); + if (info->extract.extract_root_wim_source_path[0] == T('\0')) + tprintf(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) { @@ -973,6 +1202,180 @@ parse_num_threads(const tchar *optarg) } } +static bool +update_command_add_option(int op, const tchar *option, + struct wimlib_update_command *cmd) +{ + bool recognized = true; + switch (op) { + case WIMLIB_UPDATE_OP_ADD: + if (!tstrcmp(option, T("--unix-data"))) + cmd->add.add_flags |= WIMLIB_ADD_IMAGE_FLAG_UNIX_DATA; + else if (!tstrcmp(option, T("--no-acls")) || !tstrcmp(option, T("--noacls"))) + cmd->add.add_flags |= WIMLIB_ADD_IMAGE_FLAG_NO_ACLS; + else if (!tstrcmp(option, T("--strict-acls"))) + cmd->add.add_flags |= WIMLIB_ADD_IMAGE_FLAG_STRICT_ACLS; + else if (!tstrcmp(option, T("--dereference"))) + cmd->add.add_flags |= WIMLIB_ADD_IMAGE_FLAG_DEREFERENCE; + else + recognized = false; + break; + case WIMLIB_UPDATE_OP_DELETE: + if (!tstrcmp(option, T("--force"))) + cmd->delete.delete_flags |= WIMLIB_DELETE_FLAG_FORCE; + else if (!tstrcmp(option, T("--recursive"))) + cmd->delete.delete_flags |= WIMLIB_DELETE_FLAG_RECURSIVE; + else + recognized = false; + break; + case WIMLIB_UPDATE_OP_RENAME: + recognized = false; + break; + } + return recognized; +} + +static const unsigned update_command_num_nonoptions[] = { + [WIMLIB_UPDATE_OP_ADD] = 2, + [WIMLIB_UPDATE_OP_DELETE] = 1, + [WIMLIB_UPDATE_OP_RENAME] = 2, +}; + +static bool +update_command_add_nonoption(int op, const tchar *nonoption, + struct wimlib_update_command *cmd, + unsigned num_nonoptions) +{ + switch (op) { + case WIMLIB_UPDATE_OP_ADD: + if (num_nonoptions == 0) + cmd->add.fs_source_path = (tchar*)nonoption; + else + cmd->add.wim_target_path = (tchar*)nonoption; + break; + case WIMLIB_UPDATE_OP_DELETE: + cmd->delete.wim_path = (tchar*)nonoption; + break; + case WIMLIB_UPDATE_OP_RENAME: + if (num_nonoptions == 0) + cmd->rename.wim_source_path = (tchar*)nonoption; + else + cmd->rename.wim_target_path = (tchar*)nonoption; + break; + } + return true; +} + +static bool +parse_update_command(tchar *line, size_t len, + struct wimlib_update_command *command, + size_t line_number) +{ + int ret; + tchar *command_name; + int op; + size_t num_nonoptions; + + ret = parse_filename(&line, &len, &command_name); + if (ret != PARSE_FILENAME_SUCCESS) + return false; + + if (!tstrcasecmp(command_name, T("add"))) { + op = WIMLIB_UPDATE_OP_ADD; + } else if (!tstrcasecmp(command_name, T("delete"))) { + op = WIMLIB_UPDATE_OP_DELETE; + } else if (!tstrcasecmp(command_name, T("rename"))) { + op = WIMLIB_UPDATE_OP_RENAME; + } else { + imagex_error(T("Unknown update command \"%"TS"\" on line %zu"), + command_name, line_number); + return false; + } + command->op = op; + num_nonoptions = 0; + for (;;) { + tchar *next_string; + + ret = parse_filename(&line, &len, &next_string); + if (ret == PARSE_FILENAME_NONE) + break; + else if (ret != PARSE_FILENAME_SUCCESS) + return false; + if (next_string[0] == T('-') && next_string[1] == T('-')) { + if (!update_command_add_option(op, next_string, command)) + { + imagex_error(T("Unrecognized option \"%"TS"\" to " + "update command on line %zu"), + next_string, line_number); + + return false; + } + } else { + if (num_nonoptions == update_command_num_nonoptions[op]) + { + imagex_error(T("Unexpected argument \"%"TS"\" in " + "update command on line %zu\n" + " (The \"%"TS"\" command only " + "takes %u nonoption arguments!)\n"), + next_string, line_number, + command_name, num_nonoptions); + return false; + } + if (!update_command_add_nonoption(op, next_string, + command, num_nonoptions)) + return false; + num_nonoptions++; + } + } + + if (num_nonoptions != update_command_num_nonoptions[op]) { + imagex_error(T("Not enough arguments to update command " + "\"%"TS"\" on line %zu"), command_name, line_number); + return false; + } + return true; +} + +static struct wimlib_update_command * +parse_update_command_file(tchar **cmd_file_contents_p, size_t cmd_file_nchars, + size_t *num_cmds_ret) +{ + ssize_t nlines; + tchar *p; + struct wimlib_update_command *cmds; + size_t i, j; + + nlines = text_file_count_lines(cmd_file_contents_p, + &cmd_file_nchars); + if (nlines < 0) + return NULL; + + /* Always allocate at least 1 slot, just in case the implementation of + * calloc() returns NULL if 0 bytes are requested. */ + cmds = calloc(nlines ?: 1, sizeof(struct wimlib_update_command)); + if (!cmds) { + imagex_error(T("out of memory")); + return NULL; + } + p = *cmd_file_contents_p; + j = 0; + for (i = 0; i < nlines; i++) { + /* XXX: Could use rawmemchr() here instead, but it may not be + * available on all platforms. */ + tchar *endp = tmemchr(p, T('\n'), cmd_file_nchars); + size_t len = endp - p + 1; + *endp = T('\0'); + if (!is_comment_line(p, len)) { + if (!parse_update_command(p, len, &cmds[j++], i + 1)) { + free(cmds); + return NULL; + } + } + p = endp + 1; + } + *num_cmds_ret = j; + return cmds; +} /* 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. */ @@ -1020,6 +1423,12 @@ imagex_apply(int argc, tchar **argv) case IMAGEX_STRICT_ACLS_OPTION: extract_flags |= WIMLIB_EXTRACT_FLAG_STRICT_ACLS; break; + case IMAGEX_NORPFIX_OPTION: + extract_flags |= WIMLIB_EXTRACT_FLAG_NORPFIX; + break; + case IMAGEX_RPFIX_OPTION: + extract_flags |= WIMLIB_EXTRACT_FLAG_RPFIX; + break; default: usage(APPLY); return -1; @@ -1112,14 +1521,14 @@ imagex_capture_or_append(int argc, tchar **argv) { int c; int open_flags = 0; - int add_image_flags = 0; + int add_image_flags = WIMLIB_ADD_IMAGE_FLAG_EXCLUDE_VERBOSE; int write_flags = 0; int compression_type = WIMLIB_COMPRESSION_TYPE_XPRESS; const tchar *wimfile; const tchar *name; const tchar *desc; const tchar *flags_element = NULL; - WIMStruct *w = NULL; + WIMStruct *w; int ret; int cur_image; int cmd = tstrcmp(argv[0], T("append")) ? CAPTURE : APPEND; @@ -1130,13 +1539,13 @@ imagex_capture_or_append(int argc, tchar **argv) tchar *source_copy; const tchar *config_file = NULL; - tchar *config_str = NULL; - size_t config_len; + tchar *config_str; + struct wimlib_capture_config *config = NULL; bool source_list = false; size_t source_list_nchars; - tchar *source_list_contents = NULL; - bool capture_sources_malloced = false; + tchar *source_list_contents; + bool capture_sources_malloced; struct wimlib_capture_source *capture_sources; size_t num_sources; @@ -1171,7 +1580,7 @@ imagex_capture_or_append(int argc, tchar **argv) if (num_threads == UINT_MAX) return -1; break; - case IMAGEX_REBULID_OPTION: + case IMAGEX_REBUILD_OPTION: write_flags |= WIMLIB_WRITE_FLAG_REBUILD; break; case IMAGEX_UNIX_DATA_OPTION: @@ -1186,6 +1595,12 @@ imagex_capture_or_append(int argc, tchar **argv) case IMAGEX_STRICT_ACLS_OPTION: add_image_flags |= WIMLIB_ADD_IMAGE_FLAG_STRICT_ACLS; break; + case IMAGEX_RPFIX_OPTION: + add_image_flags |= WIMLIB_ADD_IMAGE_FLAG_RPFIX; + break; + case IMAGEX_NORPFIX_OPTION: + add_image_flags |= WIMLIB_ADD_IMAGE_FLAG_NORPFIX; + break; default: usage(cmd); return -1; @@ -1231,7 +1646,7 @@ imagex_capture_or_append(int argc, tchar **argv) &num_sources); if (!capture_sources) { ret = -1; - goto out; + goto out_free_source_list_contents; } capture_sources_malloced = true; } else { @@ -1242,14 +1657,25 @@ imagex_capture_or_append(int argc, tchar **argv) capture_sources[0].wim_target_path = NULL; capture_sources[0].reserved = 0; num_sources = 1; + capture_sources_malloced = false; + source_list_contents = NULL; } if (config_file) { + size_t config_len; + config_str = file_get_text_contents(config_file, &config_len); if (!config_str) { ret = -1; - goto out; + goto out_free_capture_sources; } + + config = alloca(sizeof(*config)); + ret = parse_capture_config(&config_str, config_len, config); + if (ret) + goto out_free_config; + } else { + config = &default_capture_config; } if (cmd == APPEND) @@ -1257,8 +1683,8 @@ imagex_capture_or_append(int argc, tchar **argv) imagex_progress_func); else ret = wimlib_create_new_wim(compression_type, &w); - if (ret != 0) - goto out; + if (ret) + goto out_free_config; if (!source_list) { struct stat stbuf; @@ -1274,7 +1700,7 @@ imagex_capture_or_append(int argc, tchar **argv) imagex_error_with_errno(T("Failed to stat " "\"%"TS"\""), source); ret = -1; - goto out; + goto out_wimlib_free; } } } @@ -1282,12 +1708,11 @@ imagex_capture_or_append(int argc, tchar **argv) win32_acquire_capture_privileges(); #endif - ret = wimlib_add_image_multisource(w, capture_sources, - num_sources, name, - (config_str ? config_str : - default_capture_config), - (config_str ? config_len : - tstrlen(default_capture_config)), + ret = wimlib_add_image_multisource(w, + capture_sources, + num_sources, + name, + config, add_image_flags, imagex_progress_func); if (ret != 0) @@ -1319,12 +1744,19 @@ out_release_privs: #ifdef __WIN32__ win32_release_capture_privileges(); #endif -out: +out_wimlib_free: wimlib_free(w); - free(config_str); - free(source_list_contents); +out_free_config: + if (config != NULL && config != &default_capture_config) { + free(config->exclusion_pats.pats); + free(config->exclusion_exception_pats.pats); + free(config_str); + } +out_free_capture_sources: if (capture_sources_malloced) free(capture_sources); +out_free_source_list_contents: + free(source_list_contents); return ret; } @@ -1504,7 +1936,7 @@ imagex_export(int argc, tchar **argv) if (num_threads == UINT_MAX) return -1; break; - case IMAGEX_REBULID_OPTION: + case IMAGEX_REBUILD_OPTION: write_flags |= WIMLIB_WRITE_FLAG_REBUILD; break; default: @@ -1620,6 +2052,190 @@ out: return ret; } +static bool +is_root_wim_path(const tchar *path) +{ + const tchar *p; + for (p = path; *p; p++) + if (*p != T('\\') && *p != T('/')) + return false; + return true; +} + +static void +free_extract_commands(struct wimlib_extract_command *cmds, size_t num_cmds, + const tchar *dest_dir) +{ + for (size_t i = 0; i < num_cmds; i++) + if (cmds[i].fs_dest_path != dest_dir) + free(cmds[i].fs_dest_path); + free(cmds); +} + +static struct wimlib_extract_command * +prepare_extract_commands(tchar **argv, int argc, int extract_flags, + tchar *dest_dir, size_t *num_cmds_ret) +{ + struct wimlib_extract_command *cmds; + size_t num_cmds; + tchar *emptystr = T(""); + + if (argc == 0) { + argc = 1; + argv = &emptystr; + } + num_cmds = argc; + cmds = calloc(num_cmds, sizeof(cmds[0])); + if (!cmds) { + imagex_error(T("Out of memory!")); + return NULL; + } + + for (size_t i = 0; i < num_cmds; i++) { + cmds[i].extract_flags = extract_flags; + cmds[i].wim_source_path = argv[i]; + if (is_root_wim_path(argv[i])) { + cmds[i].fs_dest_path = dest_dir; + } else { + size_t len = tstrlen(dest_dir) + 1 + tstrlen(argv[i]); + cmds[i].fs_dest_path = malloc((len + 1) * sizeof(tchar)); + if (!cmds[i].fs_dest_path) { + free_extract_commands(cmds, num_cmds, dest_dir); + return NULL; + } + tsprintf(cmds[i].fs_dest_path, T("%"TS"/%"TS), dest_dir, + tbasename(argv[i])); + } + } + *num_cmds_ret = num_cmds; + return cmds; +} + +/* Extract files or directories from a WIM image */ +static int +imagex_extract(int argc, tchar **argv) +{ + int c; + int open_flags = WIMLIB_OPEN_FLAG_SPLIT_OK; + int image; + WIMStruct *wim; + int ret; + const tchar *wimfile; + const tchar *image_num_or_name; + tchar *dest_dir = T("."); + 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; + + struct wimlib_extract_command *cmds; + size_t num_cmds; + + for_opt(c, extract_options) { + switch (c) { + case IMAGEX_CHECK_OPTION: + open_flags |= WIMLIB_OPEN_FLAG_CHECK_INTEGRITY; + break; + case IMAGEX_VERBOSE_OPTION: + extract_flags |= WIMLIB_EXTRACT_FLAG_VERBOSE; + break; + case IMAGEX_REF_OPTION: + swm_glob = optarg; + break; + case IMAGEX_UNIX_DATA_OPTION: + extract_flags |= WIMLIB_EXTRACT_FLAG_UNIX_DATA; + break; + case IMAGEX_NO_ACLS_OPTION: + extract_flags |= WIMLIB_EXTRACT_FLAG_NO_ACLS; + break; + case IMAGEX_STRICT_ACLS_OPTION: + extract_flags |= WIMLIB_EXTRACT_FLAG_STRICT_ACLS; + break; + case IMAGEX_DEST_DIR_OPTION: + dest_dir = optarg; + break; + case IMAGEX_TO_STDOUT_OPTION: + extract_flags |= WIMLIB_EXTRACT_FLAG_TO_STDOUT; + imagex_be_quiet = true; + break; + default: + usage(EXTRACT); + ret = -1; + goto out; + } + } + argc -= optind; + argv += optind; + + if (argc < 2) { + usage(EXTRACT); + ret = -1; + goto out; + } + wimfile = argv[0]; + image_num_or_name = argv[1]; + + argc -= 2; + argv += 2; + + cmds = prepare_extract_commands(argv, argc, extract_flags, dest_dir, + &num_cmds); + if (!cmds) { + ret = -1; + goto out; + } + + ret = wimlib_open_wim(wimfile, open_flags, &wim, imagex_progress_func); + if (ret) + goto out_free_cmds; + + 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; + + if (swm_glob) { + ret = open_swms_from_glob(swm_glob, wimfile, open_flags, + &additional_swms, + &num_additional_swms); + if (ret) + goto out_wimlib_free; + } + +#ifdef __WIN32__ + win32_acquire_restore_privileges(); +#endif + + ret = wimlib_extract_files(wim, image, 0, cmds, num_cmds, + additional_swms, num_additional_swms, + imagex_progress_func); + if (ret == 0) { + if (!imagex_be_quiet) + tprintf(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 " + "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); + } +out_wimlib_free: + wimlib_free(wim); +out_free_cmds: + free_extract_commands(cmds, num_cmds, dest_dir); +out: + return ret; +} + /* 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 @@ -1882,7 +2498,7 @@ imagex_info(int argc, tchar **argv) ret = file_writable(wimfile); if (ret != 0) - return ret; + goto out; if (check) write_flags = WIMLIB_WRITE_FLAG_CHECK_INTEGRITY; @@ -2081,6 +2697,7 @@ imagex_optimize(int argc, tchar **argv) const tchar *wimfile; off_t old_size; off_t new_size; + unsigned num_threads = 0; for_opt(c, optimize_options) { switch (c) { @@ -2091,6 +2708,11 @@ imagex_optimize(int argc, tchar **argv) 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; + break; default: usage(OPTIMIZE); return -1; @@ -2118,7 +2740,8 @@ imagex_optimize(int argc, tchar **argv) else tprintf(T("%"PRIu64" KiB\n"), old_size >> 10); - ret = wimlib_overwrite(w, write_flags, 0, imagex_progress_func); + ret = wimlib_overwrite(w, write_flags, num_threads, + imagex_progress_func); if (ret == 0) { new_size = file_get_size(argv[0]); @@ -2202,7 +2825,7 @@ imagex_unmount(int argc, tchar **argv) case IMAGEX_CHECK_OPTION: unmount_flags |= WIMLIB_UNMOUNT_FLAG_CHECK_INTEGRITY; break; - case IMAGEX_REBULID_OPTION: + case IMAGEX_REBUILD_OPTION: unmount_flags |= WIMLIB_UNMOUNT_FLAG_REBUILD; break; default: @@ -2224,6 +2847,164 @@ imagex_unmount(int argc, tchar **argv) return ret; } +static int +imagex_update(int argc, tchar **argv) +{ + const tchar *wimfile; + const tchar *image_num_or_name; + int image; + WIMStruct *wim; + int ret; + int open_flags = 0; + int write_flags = WIMLIB_WRITE_FLAG_SOFT_DELETE; + int update_flags = 0; + int default_add_flags = 0; + int default_delete_flags = 0; + unsigned num_threads = 0; + int c; + tchar *cmd_file_contents; + size_t cmd_file_nchars; + struct wimlib_update_command *cmds; + size_t num_cmds; + + const tchar *config_file = NULL; + tchar *config_str; + struct wimlib_capture_config *config = NULL; + + for_opt(c, update_options) { + switch (c) { + case IMAGEX_THREADS_OPTION: + num_threads = parse_num_threads(optarg); + if (num_threads == UINT_MAX) { + ret = -1; + goto out; + } + break; + case IMAGEX_CHECK_OPTION: + open_flags |= WIMLIB_OPEN_FLAG_CHECK_INTEGRITY; + write_flags |= WIMLIB_WRITE_FLAG_CHECK_INTEGRITY; + break; + case IMAGEX_REBUILD_OPTION: + write_flags |= WIMLIB_WRITE_FLAG_REBUILD; + break; + case IMAGEX_FORCE_OPTION: + default_delete_flags |= WIMLIB_DELETE_FLAG_FORCE; + break; + case IMAGEX_RECURSIVE_OPTION: + default_delete_flags |= WIMLIB_DELETE_FLAG_RECURSIVE; + break; + case IMAGEX_CONFIG_OPTION: + config_file = optarg; + break; + case IMAGEX_DEREFERENCE_OPTION: + default_add_flags |= WIMLIB_ADD_IMAGE_FLAG_DEREFERENCE; + break; + case IMAGEX_UNIX_DATA_OPTION: + default_add_flags |= WIMLIB_ADD_IMAGE_FLAG_UNIX_DATA; + break; + case IMAGEX_NO_ACLS_OPTION: + default_add_flags |= WIMLIB_ADD_IMAGE_FLAG_NO_ACLS; + break; + case IMAGEX_STRICT_ACLS_OPTION: + default_add_flags |= WIMLIB_ADD_IMAGE_FLAG_STRICT_ACLS; + break; + default: + goto out_usage; + } + } + argv += optind; + argc -= optind; + + 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; + + if (config_file) { + size_t config_len; + + config_str = file_get_text_contents(config_file, &config_len); + if (!config_str) { + ret = -1; + goto out_wimlib_free; + } + + config = alloca(sizeof(*config)); + ret = parse_capture_config(&config_str, config_len, config); + if (ret) + goto out_free_config; + } else { + config = &default_capture_config; + } + + cmd_file_contents = stdin_get_text_contents(&cmd_file_nchars); + if (!cmd_file_contents) { + ret = -1; + goto out_free_config; + } + + cmds = parse_update_command_file(&cmd_file_contents, cmd_file_nchars, + &num_cmds); + if (!cmds) { + ret = -1; + goto out_free_cmd_file_contents; + } + + for (size_t i = 0; i < num_cmds; i++) { + switch (cmds[i].op) { + case WIMLIB_UPDATE_OP_ADD: + cmds[i].add.add_flags |= default_add_flags; + cmds[i].add.config = config; + break; + case WIMLIB_UPDATE_OP_DELETE: + cmds[i].delete.delete_flags |= default_delete_flags; + break; + default: + break; + } + } + + ret = wimlib_update_image(wim, image, cmds, num_cmds, update_flags, + imagex_progress_func); + if (ret) + goto out_free_cmds; + + ret = wimlib_overwrite(wim, write_flags, num_threads, + imagex_progress_func); +out_free_cmds: + free(cmds); +out_free_cmd_file_contents: + free(cmd_file_contents); +out_free_config: + if (config != NULL && 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: + return ret; +out_usage: + usage(UPDATE); + ret = -1; + goto out; +} + struct imagex_command { const tchar *name; int (*func)(int , tchar **); @@ -2241,6 +3022,7 @@ static const struct imagex_command imagex_commands[] = { {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}, @@ -2248,6 +3030,7 @@ static const struct imagex_command imagex_commands[] = { {T("optimize"),imagex_optimize, OPTIMIZE}, {T("split"), imagex_split, SPLIT}, {T("unmount"), imagex_unmount, UNMOUNT}, + {T("update"), imagex_update, UPDATE}, }; static void @@ -2344,11 +3127,16 @@ main(int argc, char **argv) { const struct imagex_command *cmd; int ret; + int init_flags = 0; #ifndef __WIN32__ - setlocale(LC_ALL, ""); - { - char *codeset = nl_langinfo(CODESET); + if (getenv("WIMLIB_IMAGEX_USE_UTF8")) { + init_flags |= WIMLIB_INIT_FLAG_ASSUME_UTF8; + } else { + char *codeset; + + setlocale(LC_ALL, ""); + codeset = nl_langinfo(CODESET); if (!strstr(codeset, "UTF-8") && !strstr(codeset, "UTF8") && !strstr(codeset, "utf-8") && @@ -2356,7 +3144,10 @@ main(int argc, char **argv) { fputs( "WARNING: Running "IMAGEX_PROGNAME" in a UTF-8 locale is recommended!\n" -" (Maybe try: `export LANG=en_US.UTF-8'?\n", stderr); +" 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); } } @@ -2379,7 +3170,7 @@ main(int argc, char **argv) wimlib_set_print_errors(true); /* Do any initializations that the library needs */ - ret = wimlib_global_init(); + ret = wimlib_global_init(init_flags); if (ret) goto out_check_status;