X-Git-Url: https://wimlib.net/git/?p=wimlib;a=blobdiff_plain;f=programs%2Fimagex.c;h=4efb7a22d525efb78e28f6a08a1b185d72222692;hp=da58a147f6cb61d733f671545d38e39c25b8054d;hb=5433aef3bf3efc14dd158129e392d5c298f8704a;hpb=4f754f1026513b5a17d2f455d306488ac1f7975a

diff --git a/programs/imagex.c b/programs/imagex.c
index da58a147..4efb7a22 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 <getopt.h>
 #  include <langinfo.h>
 #  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;
 
@@ -125,6 +125,7 @@ enum {
 	IMAGEX_COMPRESS_OPTION,
 	IMAGEX_CONFIG_OPTION,
 	IMAGEX_DEBUG_OPTION,
+	IMAGEX_DELTA_FROM_OPTION,
 	IMAGEX_DEREFERENCE_OPTION,
 	IMAGEX_DEST_DIR_OPTION,
 	IMAGEX_EXTRACT_XML_OPTION,
@@ -157,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,
 };
@@ -174,6 +176,8 @@ 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},
+
+	/* --resume is undocumented for now as it needs improvement.  */
 	{T("resume"),      no_argument,       NULL, IMAGEX_RESUME_OPTION},
 	{NULL, 0, NULL, 0},
 };
@@ -199,6 +203,8 @@ 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},
 };
 
@@ -360,11 +366,13 @@ verify_image_exists(int image, const tchar *image_name, const tchar *wim_name)
 	if (image == WIMLIB_NO_IMAGE) {
 		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 `%"TS"' to list the images "
-			     "contained in a WIM."),
-			     image_name, wim_name, get_cmd_string(CMD_INFO, false));
-		return -1;
+			     "image name.  To list the images\n"
+			     "       contained in the WIM archive, run\n"
+			     "\n"
+			     "           %"TS" \"%"TS"\"\n"),
+			     image_name, wim_name,
+			     get_cmd_string(CMD_INFO, false), wim_name);
+		return WIMLIB_ERR_INVALID_IMAGE;
 	}
 	return 0;
 }
@@ -374,7 +382,7 @@ verify_image_is_single(int image)
 {
 	if (image == WIMLIB_ALL_IMAGES) {
 		imagex_error(T("Cannot specify all images for this action!"));
-		return -1;
+		return WIMLIB_ERR_INVALID_IMAGE;
 	}
 	return 0;
 }
@@ -407,6 +415,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
@@ -419,29 +496,6 @@ file_get_size(const tchar *filename)
 		return (off_t)-1;
 }
 
-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[0]),
-		.pats = default_pats,
-	},
-};
-
 enum {
 	PARSE_STRING_SUCCESS = 0,
 	PARSE_STRING_FAILURE = 1,
@@ -1109,9 +1163,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'))
@@ -1150,7 +1206,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 "
@@ -1171,70 +1227,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)
 {
@@ -1269,23 +1261,23 @@ update_command_add_option(int op, const tchar *option,
 	switch (op) {
 	case WIMLIB_UPDATE_OP_ADD:
 		if (!tstrcmp(option, T("--verbose")))
-			cmd->add.add_flags |= WIMLIB_ADD_IMAGE_FLAG_VERBOSE;
+			cmd->add.add_flags |= WIMLIB_ADD_FLAG_VERBOSE;
 		else if (!tstrcmp(option, T("--unix-data")))
-			cmd->add.add_flags |= WIMLIB_ADD_IMAGE_FLAG_UNIX_DATA;
+			cmd->add.add_flags |= WIMLIB_ADD_FLAG_UNIX_DATA;
 		else if (!tstrcmp(option, T("--no-acls")) || !tstrcmp(option, T("--noacls")))
-			cmd->add.add_flags |= WIMLIB_ADD_IMAGE_FLAG_NO_ACLS;
+			cmd->add.add_flags |= WIMLIB_ADD_FLAG_NO_ACLS;
 		else if (!tstrcmp(option, T("--strict-acls")))
-			cmd->add.add_flags |= WIMLIB_ADD_IMAGE_FLAG_STRICT_ACLS;
+			cmd->add.add_flags |= WIMLIB_ADD_FLAG_STRICT_ACLS;
 		else if (!tstrcmp(option, T("--dereference")))
-			cmd->add.add_flags |= WIMLIB_ADD_IMAGE_FLAG_DEREFERENCE;
+			cmd->add.add_flags |= WIMLIB_ADD_FLAG_DEREFERENCE;
 		else
 			recognized = false;
 		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;
@@ -1316,7 +1308,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)
@@ -1463,17 +1455,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) {
@@ -1490,7 +1481,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;
@@ -1535,13 +1528,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.  */
@@ -1554,9 +1547,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)."),
@@ -1567,17 +1558,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__
@@ -1591,7 +1582,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))
@@ -1602,7 +1593,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);
@@ -1611,21 +1601,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
@@ -1637,7 +1634,8 @@ 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 add_image_flags = WIMLIB_ADD_IMAGE_FLAG_EXCLUDE_VERBOSE |
+			      WIMLIB_ADD_IMAGE_FLAG_WINCONFIG;
 	int write_flags = 0;
 	int compression_type = WIMLIB_COMPRESSION_TYPE_LZX;
 	const tchar *wimfile;
@@ -1645,7 +1643,15 @@ imagex_capture_or_append(int argc, tchar **argv, int cmd)
 	const tchar *name;
 	const tchar *desc;
 	const tchar *flags_element = NULL;
+
 	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;
 
@@ -1657,7 +1663,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;
@@ -1678,6 +1684,7 @@ imagex_capture_or_append(int argc, tchar **argv, int cmd)
 			break;
 		case IMAGEX_CONFIG_OPTION:
 			config_file = optarg;
+			add_image_flags &= ~WIMLIB_ADD_IMAGE_FLAG_WINCONFIG;
 			break;
 		case IMAGEX_COMPRESS_OPTION:
 			compression_type = get_compression_type(optarg);
@@ -1725,6 +1732,39 @@ 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' is only "
+					       "valid for capture!"));
+				goto out_usage;
+			}
+			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;
 		}
@@ -1739,6 +1779,7 @@ imagex_capture_or_append(int argc, tchar **argv, int cmd)
 	wimfile = argv[1];
 
 	if (!tstrcmp(wimfile, T("-"))) {
+		/* Writing captured WIM to standard output.  */
 	#if 0
 		if (!(write_flags & WIMLIB_WRITE_FLAG_PIPABLE)) {
 			imagex_error("Can't write a non-pipable WIM to "
@@ -1758,6 +1799,27 @@ imagex_capture_or_append(int argc, tchar **argv, int cmd)
 		wim_fd = STDOUT_FILENO;
 		wimfile = NULL;
 		imagex_info_file = stderr;
+		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) {
@@ -1801,8 +1863,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;
@@ -1813,6 +1874,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);
@@ -1826,9 +1888,13 @@ imagex_capture_or_append(int argc, tchar **argv, int cmd)
 		if (ret)
 			goto out_free_config;
 	} else {
-		config = &default_capture_config;
+		/* 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);
@@ -1838,6 +1904,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;
 
@@ -1852,16 +1920,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;
@@ -1871,6 +1939,67 @@ imagex_capture_or_append(int argc, tchar **argv, int cmd)
 			tsprintf(name_end, T(" (%lu)"), conflict_idx);
 		}
 	}
+
+	/* 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) {
+
+
+		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;
+			struct wimlib_wim_info info;
+
+			wimlib_get_wim_info(wim, &info);
+			n = tstrtoul(template_image_name_or_num + 1, &tmp, 10);
+			if (n >= 1 && n <= info.image_count &&
+			    *tmp == T('\0') &&
+			    tmp != template_image_name_or_num + 1)
+			{
+				template_image = info.image_count - (n - 1);
+			}
+		}
+		ret = verify_image_exists_and_is_single(template_image,
+							template_image_name_or_num,
+							template_wimfile);
+		if (ret)
+			goto out_free_template_wim;
+	} else {
+		template_wim = NULL;
+	}
+
 	ret = wimlib_add_image_multisource(wim,
 					   capture_sources,
 					   num_sources,
@@ -1879,12 +2008,13 @@ 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) {
-		/* User provided <DESCRIPTION> or <FLAGS> element.  Get the
-		 * index of the image we just added, then use it to call the
-		 * appropriate functions.  */
+	if (desc || flags_element || template_image_name_or_num) {
+		/* User provided <DESCRIPTION> or <FLAGS> element, or an image
+		 * on which the added one is to be based has been specified with
+		 * --update-of.  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);
@@ -1894,14 +2024,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_free_template_wim;
 		}
 	}
 
@@ -1919,10 +2063,16 @@ 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 != &default_capture_config) {
+	if (config) {
 		free(config->exclusion_pats.pats);
 		free(config->exclusion_exception_pats.pats);
 		free(config_str);
@@ -2113,14 +2263,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) {
@@ -2141,7 +2290,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);
@@ -2174,7 +2325,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
@@ -2197,6 +2350,7 @@ imagex_export(int argc, tchar **argv, int cmd)
 		dest_wimfile = NULL;
 		dest_wim_fd = STDOUT_FILENO;
 		imagex_info_file = stderr;
+		set_fd_to_binary_mode(dest_wim_fd);
 	}
 	errno = ENOENT;
 	if (dest_wimfile != NULL && tstat(dest_wimfile, &stbuf) == 0) {
@@ -2246,9 +2400,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);
@@ -2261,22 +2412,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,
@@ -2289,24 +2448,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
@@ -2384,9 +2538,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;
@@ -2400,7 +2552,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;
@@ -2455,19 +2609,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)
@@ -2477,22 +2625,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)
@@ -2655,8 +2806,7 @@ imagex_info(int argc, tchar **argv, int cmd)
 	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 in \"%"TS"\""),
-			     image_num_or_name, wimfile);
+		verify_image_exists(image, 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 "
@@ -2896,15 +3046,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;
@@ -2936,7 +3086,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;
@@ -2957,7 +3109,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.  */
@@ -2969,9 +3123,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);
@@ -2982,36 +3134,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 */
 
@@ -3219,7 +3363,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_IMAGE_FLAG_EXCLUDE_VERBOSE;
+	int default_add_flags = WIMLIB_ADD_FLAG_EXCLUDE_VERBOSE;
 	int default_delete_flags = 0;
 	unsigned num_threads = 0;
 	int c;
@@ -3272,24 +3416,25 @@ imagex_update(int argc, tchar **argv, int cmd)
 
 		/* Global add option */
 		case IMAGEX_CONFIG_OPTION:
+			default_add_flags &= ~WIMLIB_ADD_FLAG_WINCONFIG;
 			config_file = optarg;
 			break;
 
 		/* Default add options */
 		case IMAGEX_VERBOSE_OPTION:
-			default_add_flags |= WIMLIB_ADD_IMAGE_FLAG_VERBOSE;
+			default_add_flags |= WIMLIB_ADD_FLAG_VERBOSE;
 			break;
 		case IMAGEX_DEREFERENCE_OPTION:
-			default_add_flags |= WIMLIB_ADD_IMAGE_FLAG_DEREFERENCE;
+			default_add_flags |= WIMLIB_ADD_FLAG_DEREFERENCE;
 			break;
 		case IMAGEX_UNIX_DATA_OPTION:
-			default_add_flags |= WIMLIB_ADD_IMAGE_FLAG_UNIX_DATA;
+			default_add_flags |= WIMLIB_ADD_FLAG_UNIX_DATA;
 			break;
 		case IMAGEX_NO_ACLS_OPTION:
-			default_add_flags |= WIMLIB_ADD_IMAGE_FLAG_NO_ACLS;
+			default_add_flags |= WIMLIB_ADD_FLAG_NO_ACLS;
 			break;
 		case IMAGEX_STRICT_ACLS_OPTION:
-			default_add_flags |= WIMLIB_ADD_IMAGE_FLAG_STRICT_ACLS;
+			default_add_flags |= WIMLIB_ADD_FLAG_STRICT_ACLS;
 			break;
 		default:
 			goto out_usage;
@@ -3343,7 +3488,8 @@ imagex_update(int argc, tchar **argv, int cmd)
 		if (ret)
 			goto out_free_config;
 	} else {
-		config = &default_capture_config;
+		config = NULL;
+		default_add_flags |= WIMLIB_ADD_FLAG_WINCONFIG;
 	}
 
 	/* Read update commands from standard input, or the command string if
@@ -3380,7 +3526,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;
@@ -3401,7 +3547,7 @@ out_free_cmds:
 out_free_cmd_file_contents:
 	free(cmd_file_contents);
 out_free_config:
-	if (config != &default_capture_config) {
+	if (config) {
 		free(config->exclusion_pats.pats);
 		free(config->exclusion_exception_pats.pats);
 		free(config_str);
@@ -3457,7 +3603,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]\n"
+"                    [--not-pipable] [--update-of=[WIMFILE:]IMAGE]\n"
 ),
 [CMD_APPLY] =
 T(
@@ -3465,7 +3611,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] [--resume]\n"
+"                    [--include-invalid-names]\n"
 ),
 [CMD_CAPTURE] =
 T(
@@ -3474,8 +3620,8 @@ T(
 "                    [--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"
+"                    [--no-acls] [--strict-acls] [--norpfix] [--pipable]\n"
+"                    [--update-of=[WIMFILE:]IMAGE] [--delta-from=WIMFILE]\n"
 ),
 [CMD_DELETE] =
 T(
@@ -3550,24 +3696,25 @@ T(
 };
 
 static const tchar *invocation_name;
-static bool using_cmd_from_invocation_name = false;
+static int invocation_cmd = CMD_NONE;
 
 static const tchar *get_cmd_string(int cmd, bool nospace)
 {
-
-	if (using_cmd_from_invocation_name || cmd == CMD_NONE) {
-		return invocation_name;
+	static tchar buf[50];
+	if (cmd == CMD_NONE) {
+		tsprintf(buf, T("%"TS), T(IMAGEX_PROGNAME));
+	} else if (invocation_cmd != CMD_NONE) {
+		tsprintf(buf, T("wim%"TS), imagex_commands[cmd].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;
 	}
+	return buf;
 }
 
 static void
@@ -3708,7 +3855,7 @@ main(int argc, char **argv)
 			if (!tstrcmp(invocation_name + 3,
 				     imagex_commands[i].name))
 			{
-				using_cmd_from_invocation_name = true;
+				invocation_cmd = i;
 				cmd = i;
 				break;
 			}