X-Git-Url: https://wimlib.net/git/?p=wimlib;a=blobdiff_plain;f=programs%2Fimagex.c;h=ae463ba170ee073f7e40d017da40263226c5b04c;hp=be4b910eb024c55bd8917c27b265eda56c3456f0;hb=82bfc7bdc6a85406dff3fa4f9fcc7b9fc0ae5de5;hpb=41ae41d4dbe9a5c8413304b5e9ae02eec76d69b1 diff --git a/programs/imagex.c b/programs/imagex.c index be4b910e..ae463ba1 100644 --- a/programs/imagex.c +++ b/programs/imagex.c @@ -49,7 +49,6 @@ #ifdef __WIN32__ # include "imagex-win32.h" # define tbasename win32_wbasename -# define tglob win32_wglob # define OS_PREFERRED_PATH_SEPARATOR L'\\' # define OS_PREFERRED_PATH_SEPARATOR_STRING L"\\" #else /* __WIN32__ */ @@ -57,7 +56,6 @@ # include # include # define tbasename basename -# define tglob glob # define OS_PREFERRED_PATH_SEPARATOR '/' # define OS_PREFERRED_PATH_SEPARATOR_STRING "/" static inline void set_fd_to_binary_mode(int fd) @@ -80,7 +78,6 @@ static inline void set_fd_to_binary_mode(int fd) #define for_opt(c, opts) while ((c = getopt_long_only(argc, (tchar**)argv, T(""), \ opts, NULL)) != -1) - enum { CMD_NONE = -1, CMD_APPEND = 0, @@ -110,6 +107,9 @@ 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 int imagex_progress_func(enum wimlib_progress_msg msg, + const union wimlib_progress_info *info); + static bool imagex_be_quiet = false; static FILE *imagex_info_file; @@ -158,6 +158,7 @@ enum { IMAGEX_THREADS_OPTION, IMAGEX_TO_STDOUT_OPTION, IMAGEX_UNIX_DATA_OPTION, + IMAGEX_UPDATE_OF_OPTION, IMAGEX_VERBOSE_OPTION, IMAGEX_XML_OPTION, }; @@ -202,6 +203,7 @@ static const struct option capture_or_append_options[] = { {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}, + {T("update-of"), required_argument, NULL, IMAGEX_UPDATE_OF_OPTION}, {T("delta-from"), required_argument, NULL, IMAGEX_DELTA_FROM_OPTION}, {NULL, 0, NULL, 0}, }; @@ -411,6 +413,75 @@ get_compression_type(const tchar *optarg) } } +struct refglob_set { + const tchar **globs; + unsigned num_globs; + unsigned num_alloc_globs; +}; + +#define REFGLOB_SET_INITIALIZER \ + { .globs = NULL, .num_globs = 0, .num_alloc_globs = 0, } + +#define REFGLOB_SET(_refglobs) \ + struct refglob_set _refglobs = REFGLOB_SET_INITIALIZER + +static int +refglob_set_append(struct refglob_set *set, const tchar *glob) +{ + unsigned num_alloc_globs = set->num_alloc_globs; + + if (set->num_globs == num_alloc_globs) { + const tchar **new_globs; + + num_alloc_globs += 4; + new_globs = realloc(set->globs, sizeof(set->globs[0]) * num_alloc_globs); + if (!new_globs) { + imagex_error(T("Out of memory!")); + return -1; + } + set->globs = new_globs; + set->num_alloc_globs = num_alloc_globs; + } + set->globs[set->num_globs++] = glob; + return 0; +} + +static int +wim_reference_globs(WIMStruct *wim, struct refglob_set *set, int open_flags) +{ + return wimlib_reference_resource_files(wim, set->globs, set->num_globs, + WIMLIB_REF_FLAG_GLOB_ENABLE, + open_flags, + imagex_progress_func); +} + +static void +refglob_set_destroy(struct refglob_set *set) +{ + free(set->globs); +} + +static void +do_resource_not_found_warning(const tchar *wimfile, + const struct wimlib_wim_info *info, + const struct refglob_set *refglobs) +{ + if (info->total_parts > 1) { + if (refglobs->num_globs == 0) { + imagex_error(T("\"%"TS"\" is part of a split WIM. " + "Use --ref to specify the other parts."), + wimfile); + } else { + imagex_error(T("Perhaps the '--ref' argument did not " + "specify all other parts of the split " + "WIM?")); + } + } else { + imagex_error(T("If this is a delta WIM, use the --ref argument " + "to specify the WIM on which it is based.")); + } +} + /* Returns the size of a file given its name, or -1 if the file does not exist * or its size cannot be determined. */ static off_t @@ -1090,9 +1161,11 @@ imagex_progress_func(enum wimlib_progress_msg msg, imagex_printf(T("\n")); break; case WIMLIB_PROGRESS_MSG_EXTRACT_SPWM_PART_BEGIN: - imagex_printf(T("\nReading split pipable WIM part %u of %u\n"), - info->extract.part_number, - info->extract.total_parts); + if (info->extract.total_parts != 1) { + imagex_printf(T("\nReading split pipable WIM part %u of %u\n"), + info->extract.part_number, + info->extract.total_parts); + } break; case WIMLIB_PROGRESS_MSG_APPLY_TIMESTAMPS: if (info->extract.extract_root_wim_source_path[0] == T('\0')) @@ -1131,7 +1204,7 @@ imagex_progress_func(enum wimlib_progress_msg msg, case WIMLIB_UPDATE_OP_DELETE: imagex_printf(T("Deleted WIM path " "\""WIMLIB_WIM_PATH_SEPARATOR_STRING "%"TS"\"\n"), - info->update.command->delete.wim_path); + info->update.command->delete_.wim_path); break; case WIMLIB_UPDATE_OP_RENAME: imagex_printf(T("Renamed WIM path " @@ -1152,70 +1225,6 @@ imagex_progress_func(enum wimlib_progress_msg msg, return 0; } -/* Open all the split WIM parts that correspond to a file glob. - * - * @first_part specifies the first part of the split WIM and it may be either - * included or omitted from the glob. */ -static int -open_swms_from_glob(const tchar *swm_glob, - const tchar *first_part, - int open_flags, - WIMStruct ***additional_swms_ret, - unsigned *num_additional_swms_ret) -{ - unsigned num_additional_swms = 0; - WIMStruct **additional_swms = NULL; - glob_t globbuf; - int ret; - - /* Warning: glob() is replaced in Windows native builds */ - ret = tglob(swm_glob, GLOB_ERR | GLOB_NOSORT, NULL, &globbuf); - if (ret) { - if (ret == GLOB_NOMATCH) { - imagex_error(T("Found no files for glob \"%"TS"\""), - swm_glob); - } else { - imagex_error_with_errno(T("Failed to process glob \"%"TS"\""), - swm_glob); - } - ret = -1; - goto out; - } - num_additional_swms = globbuf.gl_pathc; - additional_swms = calloc(num_additional_swms, sizeof(additional_swms[0])); - if (!additional_swms) { - imagex_error(T("Out of memory")); - ret = -1; - goto out_globfree; - } - unsigned offset = 0; - for (unsigned i = 0; i < num_additional_swms; i++) { - if (tstrcmp(globbuf.gl_pathv[i], first_part) == 0) { - offset++; - continue; - } - ret = wimlib_open_wim(globbuf.gl_pathv[i], - open_flags | WIMLIB_OPEN_FLAG_SPLIT_OK, - &additional_swms[i - offset], - imagex_progress_func); - if (ret) - goto out_close_swms; - } - *additional_swms_ret = additional_swms; - *num_additional_swms_ret = num_additional_swms - offset; - ret = 0; - goto out_globfree; -out_close_swms: - for (unsigned i = 0; i < num_additional_swms; i++) - wimlib_free(additional_swms[i]); - free(additional_swms); -out_globfree: - globfree(&globbuf); -out: - return ret; -} - - static unsigned parse_num_threads(const tchar *optarg) { @@ -1264,9 +1273,9 @@ update_command_add_option(int op, const tchar *option, break; case WIMLIB_UPDATE_OP_DELETE: if (!tstrcmp(option, T("--force"))) - cmd->delete.delete_flags |= WIMLIB_DELETE_FLAG_FORCE; + cmd->delete_.delete_flags |= WIMLIB_DELETE_FLAG_FORCE; else if (!tstrcmp(option, T("--recursive"))) - cmd->delete.delete_flags |= WIMLIB_DELETE_FLAG_RECURSIVE; + cmd->delete_.delete_flags |= WIMLIB_DELETE_FLAG_RECURSIVE; else recognized = false; break; @@ -1297,7 +1306,7 @@ update_command_add_nonoption(int op, const tchar *nonoption, cmd->add.wim_target_path = (tchar*)nonoption; break; case WIMLIB_UPDATE_OP_DELETE: - cmd->delete.wim_path = (tchar*)nonoption; + cmd->delete_.wim_path = (tchar*)nonoption; break; case WIMLIB_UPDATE_OP_RENAME: if (num_nonoptions == 0) @@ -1444,17 +1453,16 @@ imagex_apply(int argc, tchar **argv, int cmd) { int c; int open_flags = WIMLIB_OPEN_FLAG_SPLIT_OK; - int image; + int image = WIMLIB_NO_IMAGE; WIMStruct *wim; + struct wimlib_wim_info info; int ret; const tchar *wimfile; const tchar *target; - const tchar *image_num_or_name; + const tchar *image_num_or_name = NULL; int extract_flags = WIMLIB_EXTRACT_FLAG_SEQUENTIAL; - const tchar *swm_glob = NULL; - WIMStruct **additional_swms; - unsigned num_additional_swms; + REFGLOB_SET(refglobs); for_opt(c, apply_options) { switch (c) { @@ -1471,7 +1479,9 @@ imagex_apply(int argc, tchar **argv, int cmd) extract_flags |= WIMLIB_EXTRACT_FLAG_VERBOSE; break; case IMAGEX_REF_OPTION: - swm_glob = optarg; + ret = refglob_set_append(&refglobs, optarg); + if (ret) + goto out_free_refglobs; break; case IMAGEX_UNIX_DATA_OPTION: extract_flags |= WIMLIB_EXTRACT_FLAG_UNIX_DATA; @@ -1516,13 +1526,13 @@ imagex_apply(int argc, tchar **argv, int cmd) 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; + goto out_free_refglobs; + + wimlib_get_wim_info(wim, &info); if (argc >= 3) { /* Image explicitly specified. */ @@ -1535,9 +1545,7 @@ imagex_apply(int argc, tchar **argv, int cmd) } 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)."), @@ -1548,17 +1556,17 @@ imagex_apply(int argc, tchar **argv, int cmd) 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) - goto out_wimlib_free; - } else { - additional_swms = NULL; - num_additional_swms = 0; + if (refglobs.num_globs) { + if (wim == NULL) { + imagex_error(T("Can't specify --ref when applying from stdin!")); + ret = -1; + goto out_wimlib_free; } + ret = wim_reference_globs(wim, &refglobs, open_flags); + if (ret) + goto out_wimlib_free; } #ifndef __WIN32__ @@ -1572,7 +1580,7 @@ imagex_apply(int argc, tchar **argv, int cmd) imagex_error_with_errno(T("Failed to stat \"%"TS"\""), target); ret = -1; - goto out_free_swms; + goto out_wimlib_free; } } else { if (S_ISBLK(stbuf.st_mode) || S_ISREG(stbuf.st_mode)) @@ -1583,7 +1591,6 @@ imagex_apply(int argc, tchar **argv, int cmd) 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); @@ -1592,21 +1599,28 @@ imagex_apply(int argc, tchar **argv, int cmd) target, extract_flags, imagex_progress_func); } - if (ret == 0) + if (ret == 0) { 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); + } else if (ret == WIMLIB_ERR_RESOURCE_NOT_FOUND) { + if (wim) { + do_resource_not_found_warning(wimfile, &info, &refglobs); + } else { + imagex_error(T( "If you are applying an image " + "from a split pipable WIM,\n" + " make sure you have " + "concatenated together all parts.")); + } + } out_wimlib_free: wimlib_free(wim); -out: +out_free_refglobs: + refglob_set_destroy(&refglobs); return ret; out_usage: usage(CMD_APPLY, stderr); ret = -1; - goto out; + goto out_free_refglobs; } /* Create a WIM image from a directory tree, NTFS volume, or multiple files or @@ -1627,9 +1641,15 @@ imagex_capture_or_append(int argc, tchar **argv, int cmd) const tchar *name; const tchar *desc; const tchar *flags_element = NULL; - const tchar *template_image_name_or_num = NULL; - int template_image; + WIMStruct *wim; + WIMStruct *base_wim; + const tchar *base_wimfile = NULL; + WIMStruct *template_wim; + const tchar *template_wimfile = NULL; + const tchar *template_image_name_or_num = NULL; + int template_image = WIMLIB_NO_IMAGE; + int ret; unsigned num_threads = 0; @@ -1641,7 +1661,7 @@ imagex_capture_or_append(int argc, tchar **argv, int cmd) struct wimlib_capture_config *config; bool source_list = false; - size_t source_list_nchars; + size_t source_list_nchars = 0; tchar *source_list_contents; bool capture_sources_malloced; struct wimlib_capture_source *capture_sources; @@ -1710,13 +1730,38 @@ imagex_capture_or_append(int argc, tchar **argv, int cmd) case IMAGEX_NOT_PIPABLE_OPTION: write_flags |= WIMLIB_WRITE_FLAG_NOT_PIPABLE; break; + case IMAGEX_UPDATE_OF_OPTION: + if (template_image_name_or_num) { + imagex_error(T("'--update-of' can only be " + "specified one time!")); + goto out_err; + } else { + tchar *colon; + colon = tstrrchr(optarg, T(':')); + + if (colon) { + template_wimfile = optarg; + *colon = T('\0'); + template_image_name_or_num = colon + 1; + } else { + template_wimfile = NULL; + template_image_name_or_num = optarg; + } + } + break; case IMAGEX_DELTA_FROM_OPTION: - if (cmd == CMD_CAPTURE) { - imagex_error(T("--delta-from=IMAGE is only " - "valid for append.")); + if (cmd != CMD_CAPTURE) { + imagex_error(T("'--delta-from' is only " + "valid for capture!")); goto out_usage; } - template_image_name_or_num = optarg; + if (base_wimfile) { + imagex_error(T("'--delta-from' can only be " + "specified one time!")); + goto out_err; + } + base_wimfile = optarg; + write_flags |= WIMLIB_WRITE_FLAG_SKIP_EXTERNAL_WIMS; break; default: goto out_usage; @@ -1755,6 +1800,26 @@ imagex_capture_or_append(int argc, tchar **argv, int cmd) set_fd_to_binary_mode(wim_fd); } + /* If template image was specified using --update-of=IMAGE rather + * than --update-of=WIMFILE:IMAGE, set the default WIMFILE. */ + if (template_image_name_or_num && !template_wimfile) { + if (base_wimfile) { + /* Capturing delta WIM: default to base WIM. */ + template_wimfile = base_wimfile; + } else if (cmd == CMD_APPEND) { + /* Appending to WIM: default to WIM being appended to. + */ + template_wimfile = wimfile; + } else { + /* Capturing a normal (non-delta) WIM, so the WIM file + * *must* be explicitly specified. */ + imagex_error(T("For capture of non-delta WIM, " + "'--update-of' must specify " + "WIMFILE:IMAGE!")); + goto out_usage; + } + } + if (argc >= 3) { name = argv[2]; name_defaulted = false; @@ -1796,8 +1861,7 @@ imagex_capture_or_append(int argc, tchar **argv, int cmd) } capture_sources_malloced = true; } else { - /* Set up capture source in non-source-list mode (could be - * either "normal" mode or "NTFS mode"--- see the man page). */ + /* Set up capture source in non-source-list mode. */ capture_sources = alloca(sizeof(struct wimlib_capture_source)); capture_sources[0].fs_source_path = source; capture_sources[0].wim_target_path = NULL; @@ -1808,6 +1872,7 @@ imagex_capture_or_append(int argc, tchar **argv, int cmd) } if (config_file) { + /* Read and parse capture configuration file. */ size_t config_len; config_str = file_get_text_contents(config_file, &config_len); @@ -1821,9 +1886,13 @@ imagex_capture_or_append(int argc, tchar **argv, int cmd) if (ret) goto out_free_config; } else { + /* No capture configuration file specified; use default + * configuration for capturing Windows operating systems. */ config = NULL; + add_image_flags |= WIMLIB_ADD_FLAG_WINCONFIG; } + /* Open the existing WIM, or create a new one. */ if (cmd == CMD_APPEND) ret = wimlib_open_wim(wimfile, open_flags, &wim, imagex_progress_func); @@ -1833,6 +1902,8 @@ imagex_capture_or_append(int argc, tchar **argv, int cmd) goto out_free_config; #ifndef __WIN32__ + /* Detect if source is regular file or block device and set NTFS volume + * capture mode. */ if (!source_list) { struct stat stbuf; @@ -1847,16 +1918,16 @@ imagex_capture_or_append(int argc, tchar **argv, int cmd) imagex_error_with_errno(T("Failed to stat " "\"%"TS"\""), source); ret = -1; - goto out_wimlib_free; + goto out_free_wim; } } } #endif + /* 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. */ 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; @@ -1867,8 +1938,43 @@ imagex_capture_or_append(int argc, tchar **argv, int cmd) } } + /* If capturing a delta WIM, reference resources from the base WIM + * before adding the new image. */ + if (base_wimfile) { + ret = wimlib_open_wim(base_wimfile, open_flags, + &base_wim, imagex_progress_func); + if (ret) + goto out_free_wim; + + imagex_printf(T("Capturing delta WIM based on \"%"TS"\"\n"), + base_wimfile); + + ret = wimlib_reference_resources(wim, &base_wim, 1, 0); + if (ret) + goto out_free_base_wim; + } else { + base_wim = NULL; + } + + /* If capturing or appending as an update of an existing (template) image, + * open the WIM if needed and parse the image index. */ if (template_image_name_or_num) { - template_image = wimlib_resolve_image(wim, template_image_name_or_num); + + + if (template_wimfile == base_wimfile) { + template_wim = base_wim; + } else if (template_wimfile == wimfile) { + template_wim = wim; + } else { + ret = wimlib_open_wim(template_wimfile, open_flags, + &template_wim, imagex_progress_func); + if (ret) + goto out_free_base_wim; + } + + template_image = wimlib_resolve_image(template_wim, + template_image_name_or_num); + if (template_image_name_or_num[0] == T('-')) { tchar *tmp; unsigned long n; @@ -1885,9 +1991,11 @@ imagex_capture_or_append(int argc, tchar **argv, int cmd) } ret = verify_image_exists_and_is_single(template_image, template_image_name_or_num, - wimfile); + template_wimfile); if (ret) - goto out_wimlib_free; + goto out_free_template_wim; + } else { + template_wim = NULL; } ret = wimlib_add_image_multisource(wim, @@ -1898,12 +2006,12 @@ imagex_capture_or_append(int argc, tchar **argv, int cmd) add_image_flags, imagex_progress_func); if (ret) - goto out_wimlib_free; + goto out_free_template_wim; if (desc || flags_element || template_image_name_or_num) { /* User provided or element, or an image * on which the added one is to be based has been specified with - * --delta-from=IMAGE. Get the index of the image we just + * --update-of. Get the index of the image we just * added, then use it to call the appropriate functions. */ struct wimlib_wim_info info; @@ -1914,23 +2022,28 @@ imagex_capture_or_append(int argc, tchar **argv, int cmd) info.image_count, desc); if (ret) - goto out_wimlib_free; + goto out_free_template_wim; } if (flags_element) { ret = wimlib_set_image_flags(wim, info.image_count, flags_element); if (ret) - goto out_wimlib_free; + goto out_free_template_wim; } + /* Reference template image if the user provided one. */ if (template_image_name_or_num) { + imagex_printf(T("Using image %d " + "from \"%"TS"\" as template\n"), + template_image, template_wimfile); ret = wimlib_reference_template_image(wim, info.image_count, + template_wim, template_image, 0, NULL); if (ret) - goto out_wimlib_free; + goto out_free_template_wim; } } @@ -1948,7 +2061,13 @@ imagex_capture_or_append(int argc, tchar **argv, int cmd) write_flags, num_threads, imagex_progress_func); } -out_wimlib_free: +out_free_template_wim: + /* template_wim may alias base_wim or wim. */ + if (template_wim != base_wim && template_wim != wim) + wimlib_free(template_wim); +out_free_base_wim: + wimlib_free(base_wim); +out_free_wim: wimlib_free(wim); out_free_config: if (config) { @@ -2142,14 +2261,13 @@ imagex_export(int argc, tchar **argv, int cmd) const tchar *dest_name; const tchar *dest_desc; WIMStruct *src_wim; + struct wimlib_wim_info src_info; WIMStruct *dest_wim; int ret; int image; struct stat stbuf; bool wim_is_new; - const tchar *swm_glob = NULL; - WIMStruct **additional_swms; - unsigned num_additional_swms; + REFGLOB_SET(refglobs); unsigned num_threads = 0; for_opt(c, export_options) { @@ -2170,7 +2288,9 @@ imagex_export(int argc, tchar **argv, int cmd) goto out_err; break; case IMAGEX_REF_OPTION: - swm_glob = optarg; + ret = refglob_set_append(&refglobs, optarg); + if (ret) + goto out_free_refglobs; break; case IMAGEX_THREADS_OPTION: num_threads = parse_num_threads(optarg); @@ -2203,7 +2323,9 @@ imagex_export(int argc, tchar **argv, int cmd) open_flags | WIMLIB_OPEN_FLAG_SPLIT_OK, &src_wim, imagex_progress_func); if (ret) - goto out; + goto out_free_refglobs; + + wimlib_get_wim_info(src_wim, &src_info); /* 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 @@ -2276,9 +2398,6 @@ imagex_export(int argc, tchar **argv, int cmd) /* 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); @@ -2291,22 +2410,30 @@ imagex_export(int argc, tchar **argv, int cmd) if (ret) goto out_free_dest_wim; - if (swm_glob) { - ret = open_swms_from_glob(swm_glob, src_wimfile, open_flags, - &additional_swms, - &num_additional_swms); + if (refglobs.num_globs) { + ret = wim_reference_globs(src_wim, &refglobs, open_flags); if (ret) goto out_free_dest_wim; - } else { - additional_swms = NULL; - num_additional_swms = 0; + } + + if ((export_flags & WIMLIB_EXPORT_FLAG_BOOT) && + image == WIMLIB_ALL_IMAGES && src_info.boot_index == 0) + { + imagex_error(T("--boot specified for all-images export, but source WIM " + "has no bootable image.")); + ret = -1; + goto out_free_dest_wim; } 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; + dest_desc, export_flags, imagex_progress_func); + if (ret) { + if (ret == WIMLIB_ERR_RESOURCE_NOT_FOUND) { + do_resource_not_found_warning(src_wimfile, + &src_info, &refglobs); + } + goto out_free_dest_wim; + } if (!wim_is_new) ret = wimlib_overwrite(dest_wim, write_flags, num_threads, @@ -2319,24 +2446,19 @@ imagex_export(int argc, tchar **argv, int cmd) 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: - 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: wimlib_free(src_wim); -out: +out_free_refglobs: + refglob_set_destroy(&refglobs); return ret; out_usage: usage(CMD_EXPORT, stderr); out_err: ret = -1; - goto out; + goto out_free_refglobs; } static bool @@ -2414,9 +2536,7 @@ imagex_extract(int argc, tchar **argv, int cmd) tchar *dest_dir = T("."); int extract_flags = WIMLIB_EXTRACT_FLAG_SEQUENTIAL | WIMLIB_EXTRACT_FLAG_NORPFIX; - const tchar *swm_glob = NULL; - WIMStruct **additional_swms; - unsigned num_additional_swms; + REFGLOB_SET(refglobs); struct wimlib_extract_command *cmds; size_t num_cmds; @@ -2430,7 +2550,9 @@ imagex_extract(int argc, tchar **argv, int cmd) extract_flags |= WIMLIB_EXTRACT_FLAG_VERBOSE; break; case IMAGEX_REF_OPTION: - swm_glob = optarg; + ret = refglob_set_append(&refglobs, optarg); + if (ret) + goto out_free_refglobs; break; case IMAGEX_UNIX_DATA_OPTION: extract_flags |= WIMLIB_EXTRACT_FLAG_UNIX_DATA; @@ -2485,19 +2607,13 @@ imagex_extract(int argc, tchar **argv, int cmd) 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 (refglobs.num_globs) { + ret = wim_reference_globs(wim, &refglobs, open_flags); if (ret) goto out_wimlib_free; - } else { - additional_swms = NULL; - num_additional_swms = 0; } 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) @@ -2507,22 +2623,25 @@ imagex_extract(int argc, tchar **argv, int cmd) "files and directories\n" " are in the WIM image.\n"), get_cmd_string(CMD_INFO, false)); + } else if (ret == WIMLIB_ERR_RESOURCE_NOT_FOUND) { + struct wimlib_wim_info info; + + wimlib_get_wim_info(wim, &info); + do_resource_not_found_warning(wimfile, &info, &refglobs); } - 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: +out_free_refglobs: + refglob_set_destroy(&refglobs); return ret; out_usage: usage(CMD_EXTRACT, stderr); out_err: ret = -1; - goto out; + goto out_free_refglobs; } static void print_byte_field(const uint8_t field[], size_t len) @@ -2926,15 +3045,15 @@ 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 *wim; + struct wimlib_wim_info info; int image; int ret; - WIMStruct **additional_swms; - unsigned num_additional_swms; + + REFGLOB_SET(refglobs); if (cmd == CMD_MOUNTRW) { mount_flags |= WIMLIB_MOUNT_FLAG_READWRITE; @@ -2966,7 +3085,9 @@ imagex_mount_rw_or_ro(int argc, tchar **argv, int cmd) } break; case IMAGEX_REF_OPTION: - swm_glob = optarg; + ret = refglob_set_append(&refglobs, optarg); + if (ret) + goto out_free_refglobs; break; case IMAGEX_STAGING_DIR_OPTION: staging_dir = optarg; @@ -2987,7 +3108,9 @@ imagex_mount_rw_or_ro(int argc, tchar **argv, int cmd) ret = wimlib_open_wim(wimfile, open_flags, &wim, imagex_progress_func); if (ret) - goto out; + goto out_free_refglobs; + + wimlib_get_wim_info(wim, &info); if (argc >= 3) { /* Image explicitly specified. */ @@ -2999,9 +3122,7 @@ imagex_mount_rw_or_ro(int argc, tchar **argv, int cmd) } 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); @@ -3012,36 +3133,28 @@ imagex_mount_rw_or_ro(int argc, tchar **argv, int cmd) dir = argv[1]; } - if (swm_glob) { - ret = open_swms_from_glob(swm_glob, wimfile, open_flags, - &additional_swms, - &num_additional_swms); + if (refglobs.num_globs) { + ret = wim_reference_globs(wim, &refglobs, open_flags); if (ret) goto out_free_wim; - } else { - additional_swms = NULL; - num_additional_swms = 0; } - ret = wimlib_mount_image(wim, image, dir, mount_flags, additional_swms, - num_additional_swms, staging_dir); + ret = wimlib_mount_image(wim, image, dir, mount_flags, staging_dir); 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: +out_free_refglobs: + refglob_set_destroy(&refglobs); return ret; out_usage: usage(cmd, stderr); ret = -1; - goto out; + goto out_free_refglobs; } #endif /* WIM_MOUNTING_SUPPORTED */ @@ -3249,8 +3362,7 @@ imagex_update(int argc, tchar **argv, int cmd) int open_flags = WIMLIB_OPEN_FLAG_WRITE_ACCESS; int write_flags = 0; int update_flags = WIMLIB_UPDATE_FLAG_SEND_PROGRESS; - int default_add_flags = WIMLIB_ADD_FLAG_EXCLUDE_VERBOSE | - WIMLIB_ADD_FLAG_WINCONFIG; + int default_add_flags = WIMLIB_ADD_FLAG_EXCLUDE_VERBOSE; int default_delete_flags = 0; unsigned num_threads = 0; int c; @@ -3376,6 +3488,7 @@ imagex_update(int argc, tchar **argv, int cmd) goto out_free_config; } else { config = NULL; + default_add_flags |= WIMLIB_ADD_FLAG_WINCONFIG; } /* Read update commands from standard input, or the command string if @@ -3412,7 +3525,7 @@ imagex_update(int argc, tchar **argv, int cmd) cmds[i].add.config = config; break; case WIMLIB_UPDATE_OP_DELETE: - cmds[i].delete.delete_flags |= default_delete_flags; + cmds[i].delete_.delete_flags |= default_delete_flags; break; default: break; @@ -3489,7 +3602,7 @@ T( " [--dereference] [--config=FILE] [--threads=NUM_THREADS]\n" " [--rebuild] [--unix-data] [--source-list] [--no-acls]\n" " [--strict-acls] [--rpfix] [--norpfix] [--pipable]\n" -" [--not-pipable] [--delta-from=IMAGE]\n" +" [--not-pipable] [--update-of=[WIMFILE:]IMAGE]\n" ), [CMD_APPLY] = T( @@ -3507,6 +3620,7 @@ T( " [--verbose] [--dereference] [--config=FILE]\n" " [--threads=NUM_THREADS] [--unix-data] [--source-list]\n" " [--no-acls] [--strict-acls] [--norpfix] [--pipable]\n" +" [--update-of=[WIMFILE:]IMAGE] [--delta-from=WIMFILE]\n" ), [CMD_DELETE] = T(