X-Git-Url: https://wimlib.net/git/?p=wimlib;a=blobdiff_plain;f=programs%2Fimagex.c;h=eeb7093cb806e4e2a5927ddf28eabc044bb36cfa;hp=fb2f08b7576338fc689e91ca9bda496d0028645b;hb=c78bad31163cdefdf3f97e199c4f19bd8a9ad0a2;hpb=e5c13f94058aedcea95236a9728093fa283d49b3

diff --git a/programs/imagex.c b/programs/imagex.c
index fb2f08b7..eeb7093c 100644
--- a/programs/imagex.c
+++ b/programs/imagex.c
@@ -22,7 +22,10 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "config.h"
+#ifdef HAVE_CONFIG_H
+#  include "config.h" /* Need for PACKAGE_VERSION, etc. */
+#endif
+
 #include "wimlib.h"
 #include "wimlib_tchar.h"
 
@@ -40,19 +43,23 @@
 #include <locale.h>
 
 #ifdef HAVE_ALLOCA_H
-#include <alloca.h>
+#  include <alloca.h>
 #endif
 
 #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__ */
 #  include <glob.h>
 #  include <getopt.h>
 #  include <langinfo.h>
 #  define tbasename	basename
 #  define tglob		glob
+#  define OS_PREFERRED_PATH_SEPARATOR '/'
+#  define OS_PREFERRED_PATH_SEPARATOR_STRING "/"
 #endif /* !__WIN32 */
 
 
@@ -76,10 +83,11 @@ enum imagex_op_type {
 	OPTIMIZE,
 	SPLIT,
 	UNMOUNT,
+	UPDATE,
 };
 
 static void usage(int cmd_type);
-static void usage_all();
+static void usage_all(void);
 
 static bool imagex_be_quiet = false;
 
@@ -100,6 +108,7 @@ IMAGEX_PROGNAME" apply WIMFILE [IMAGE_NUM | IMAGE_NAME | all]\n"
 "                    (DIRECTORY | NTFS_VOLUME) [--check] [--hardlink]\n"
 "                    [--symlink] [--verbose] [--ref=\"GLOB\"] [--unix-data]\n"
 "                    [--no-acls] [--strict-acls] [--rpfix] [--norpfix]\n"
+"                    [--include-invalid-names]\n"
 ),
 [CAPTURE] =
 T(
@@ -116,7 +125,7 @@ IMAGEX_PROGNAME" delete WIMFILE (IMAGE_NUM | IMAGE_NAME | all) [--check] [--soft
 ),
 [DIR] =
 T(
-IMAGEX_PROGNAME" dir WIMFILE (IMAGE_NUM | IMAGE_NAME | all)\n"
+IMAGEX_PROGNAME" dir WIMFILE (IMAGE_NUM | IMAGE_NAME | all) [--path=PATH]\n"
 ),
 [EXPORT] =
 T(
@@ -127,9 +136,10 @@ IMAGEX_PROGNAME" export SRC_WIMFILE (SRC_IMAGE_NUM | SRC_IMAGE_NAME | all ) \n"
 ),
 [EXTRACT] =
 T(
-IMAGEX_PROGNAME" extract SRC_WIMFILE (SRC_IMAGE_NUM | SRC_IMAGE_NAME) [PATH...]\n"
-"              [--check] [--ref=\"GLOB\"] [--verbose] [--unix-data] [--no-acls]\n"
-"              [--strict-acls] [--to-stdout] [--dest-dir=DIR]\n"
+IMAGEX_PROGNAME" extract WIMFILE (IMAGE_NUM | IMAGE_NAME) [PATH...]\n"
+"              [--check] [--ref=\"GLOB\"] [--verbose] [--unix-data]\n"
+"              [--no-acls] [--strict-acls] [--to-stdout] [--dest-dir=DIR]\n"
+"              [--include-invalid-names]\n"
 ),
 [INFO] =
 T(
@@ -164,14 +174,36 @@ IMAGEX_PROGNAME" split WIMFILE SPLIT_WIMFILE PART_SIZE_MB [--check]\n"
 ),
 [UNMOUNT] =
 T(
-IMAGEX_PROGNAME" unmount DIRECTORY [--commit] [--check] [--rebuild]\n"
+IMAGEX_PROGNAME" unmount DIRECTORY [--commit] [--check] [--rebuild] [--lazy]\n"
+),
+[UPDATE] =
+T(
+IMAGEX_PROGNAME" update WIMFILE [IMAGE_NUM | IMAGE_NAME] [--check] [--rebuild]\n"
+"                       [--threads=NUM_THREADS] [DEFAULT_ADD_OPTIONS]\n"
+"                       [DEFAULT_DELETE_OPTIONS] [--command=STRING] [< CMDFILE]\n"
 ),
 };
 
+
+static void
+recommend_man_page(const tchar *cmd_name)
+{
+	const tchar *format_str;
+#ifdef __WIN32__
+	format_str = T("See "IMAGEX_PROGNAME"%"TS"%"TS".pdf in the "
+		       "doc directory for more details.\n");
+#else
+	format_str = T("Try `man "IMAGEX_PROGNAME"%"TS"%"TS"' "
+		       "for more details.\n");
+#endif
+	tprintf(format_str, *cmd_name ? T("-") : T(""), cmd_name);
+}
+
 enum {
 	IMAGEX_ALLOW_OTHER_OPTION,
 	IMAGEX_BOOT_OPTION,
 	IMAGEX_CHECK_OPTION,
+	IMAGEX_COMMAND_OPTION,
 	IMAGEX_COMMIT_OPTION,
 	IMAGEX_COMPRESS_OPTION,
 	IMAGEX_CONFIG_OPTION,
@@ -180,14 +212,19 @@ enum {
 	IMAGEX_DEST_DIR_OPTION,
 	IMAGEX_EXTRACT_XML_OPTION,
 	IMAGEX_FLAGS_OPTION,
+	IMAGEX_FORCE_OPTION,
 	IMAGEX_HARDLINK_OPTION,
 	IMAGEX_HEADER_OPTION,
+	IMAGEX_INCLUDE_INVALID_NAMES_OPTION,
+	IMAGEX_LAZY_OPTION,
 	IMAGEX_LOOKUP_TABLE_OPTION,
 	IMAGEX_METADATA_OPTION,
 	IMAGEX_NORPFIX_OPTION,
 	IMAGEX_NO_ACLS_OPTION,
-	IMAGEX_REBULID_OPTION,
+	IMAGEX_PATH_OPTION,
+	IMAGEX_REBUILD_OPTION,
 	IMAGEX_RECOMPRESS_OPTION,
+	IMAGEX_RECURSIVE_OPTION,
 	IMAGEX_REF_OPTION,
 	IMAGEX_RPFIX_OPTION,
 	IMAGEX_SOFT_OPTION,
@@ -215,6 +252,7 @@ static const struct option apply_options[] = {
 	{T("strict-acls"), no_argument,       NULL, IMAGEX_STRICT_ACLS_OPTION},
 	{T("rpfix"),       no_argument,       NULL, IMAGEX_RPFIX_OPTION},
 	{T("norpfix"),     no_argument,       NULL, IMAGEX_NORPFIX_OPTION},
+	{T("include-invalid-names"), no_argument,       NULL, IMAGEX_INCLUDE_INVALID_NAMES_OPTION},
 	{NULL, 0, NULL, 0},
 };
 static const struct option capture_or_append_options[] = {
@@ -226,7 +264,7 @@ 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},
@@ -242,13 +280,18 @@ static const struct option delete_options[] = {
 	{NULL, 0, NULL, 0},
 };
 
+static const struct option dir_options[] = {
+	{T("path"), required_argument, NULL, IMAGEX_PATH_OPTION},
+	{NULL, 0, NULL, 0},
+};
+
 static const struct option export_options[] = {
 	{T("boot"),       no_argument,       NULL, IMAGEX_BOOT_OPTION},
 	{T("check"),      no_argument,       NULL, IMAGEX_CHECK_OPTION},
 	{T("compress"),   required_argument, NULL, IMAGEX_COMPRESS_OPTION},
 	{T("ref"),        required_argument, NULL, IMAGEX_REF_OPTION},
 	{T("threads"),    required_argument, NULL, IMAGEX_THREADS_OPTION},
-	{T("rebuild"),    no_argument,       NULL, IMAGEX_REBULID_OPTION},
+	{T("rebuild"),    no_argument,       NULL, IMAGEX_REBUILD_OPTION},
 	{NULL, 0, NULL, 0},
 };
 
@@ -262,6 +305,7 @@ static const struct option extract_options[] = {
 	{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},
+	{T("include-invalid-names"), no_argument, NULL, IMAGEX_INCLUDE_INVALID_NAMES_OPTION},
 	{NULL, 0, NULL, 0},
 };
 
@@ -307,11 +351,38 @@ 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},
+	{T("lazy"),    no_argument, NULL, IMAGEX_LAZY_OPTION},
 	{NULL, 0, NULL, 0},
 };
 
+static const struct option update_options[] = {
+	/* Careful: some of the options here set the defaults for update
+	 * commands, but the flags given to an actual update command (and not to
+	 * `imagex update' itself are also handled in
+	 * update_command_add_option().  */
+	{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("command"),     required_argument, NULL, IMAGEX_COMMAND_OPTION},
+
+	/* Default delete options */
+	{T("force"),       no_argument,       NULL, IMAGEX_FORCE_OPTION},
+	{T("recursive"),   no_argument,       NULL, IMAGEX_RECURSIVE_OPTION},
+
+	/* Global add option */
+	{T("config"),      required_argument, NULL, IMAGEX_CONFIG_OPTION},
+
+	/* Default add options */
+	{T("verbose"),     no_argument,       NULL, IMAGEX_VERBOSE_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
@@ -427,36 +498,35 @@ static struct wimlib_capture_config default_capture_config = {
 };
 
 enum {
-	PARSE_FILENAME_SUCCESS = 0,
-	PARSE_FILENAME_FAILURE = 1,
-	PARSE_FILENAME_NONE = 2,
+	PARSE_STRING_SUCCESS = 0,
+	PARSE_STRING_FAILURE = 1,
+	PARSE_STRING_NONE = 2,
 };
 
 /*
- * Parses a filename in the source list file format.  (See the man page for
- * 'wimlib-imagex capture' for details on this format and the meaning.)
- * Accepted formats for filenames are an unquoted string (whitespace-delimited),
- * or a double or single-quoted string.
+ * Parses a string token from an array of characters.
+ *
+ * Tokens are either whitespace-delimited, or double or single-quoted.
  *
  * @line_p:  Pointer to the pointer to the line of data.  Will be updated
- *           to point past the filename iff the return value is
- *           PARSE_FILENAME_SUCCESS.  If *len_p > 0, (*line_p)[*len_p - 1] must
+ *           to point past the string token iff the return value is
+ *           PARSE_STRING_SUCCESS.  If *len_p > 0, (*line_p)[*len_p - 1] must
  *           be '\0'.
  *
  * @len_p:   @len_p initially stores the length of the line of data, which may
  *           be 0, and it will be updated to the number of bytes remaining in
- *           the line iff the return value is PARSE_FILENAME_SUCCESS.
+ *           the line iff the return value is PARSE_STRING_SUCCESS.
  *
- * @fn_ret:  Iff the return value is PARSE_FILENAME_SUCCESS, a pointer to the
- *           parsed filename will be returned here.
+ * @fn_ret:  Iff the return value is PARSE_STRING_SUCCESS, a pointer to the
+ *           parsed string token will be returned here.
  *
- * Returns: PARSE_FILENAME_SUCCESS if a filename was successfully parsed; or
- *          PARSE_FILENAME_FAILURE if the data was invalid due to a missing
- *          closing quote; or PARSE_FILENAME_NONE if the line ended before the
- *          beginning of a filename was found.
+ * Returns: PARSE_STRING_SUCCESS if a string token was successfully parsed; or
+ *          PARSE_STRING_FAILURE if the data was invalid due to a missing
+ *          closing quote; or PARSE_STRING_NONE if the line ended before the
+ *          beginning of a string token was found.
  */
 static int
-parse_filename(tchar **line_p, size_t *len_p, tchar **fn_ret)
+parse_string(tchar **line_p, size_t *len_p, tchar **fn_ret)
 {
 	size_t len = *len_p;
 	tchar *line = *line_p;
@@ -466,7 +536,7 @@ parse_filename(tchar **line_p, size_t *len_p, tchar **fn_ret)
 	/* Skip leading whitespace */
 	for (;;) {
 		if (len == 0)
-			return PARSE_FILENAME_NONE;
+			return PARSE_STRING_NONE;
 		if (!istspace(*line) && *line != T('\0'))
 			break;
 		line++;
@@ -474,17 +544,17 @@ parse_filename(tchar **line_p, size_t *len_p, tchar **fn_ret)
 	}
 	quote_char = *line;
 	if (quote_char == T('"') || quote_char == T('\'')) {
-		/* Quoted filename */
+		/* Quoted string */
 		line++;
 		len--;
 		fn = line;
 		line = tmemchr(line, quote_char, len);
 		if (!line) {
 			imagex_error(T("Missing closing quote: %"TS), fn - 1);
-			return PARSE_FILENAME_FAILURE;
+			return PARSE_STRING_FAILURE;
 		}
 	} else {
-		/* Unquoted filename.  Go until whitespace.  Line is terminated
+		/* Unquoted string.  Go until whitespace.  Line is terminated
 		 * by '\0', so no need to check 'len'. */
 		fn = line;
 		do {
@@ -496,7 +566,7 @@ parse_filename(tchar **line_p, size_t *len_p, tchar **fn_ret)
 	*len_p = len;
 	*line_p = line;
 	*fn_ret = fn;
-	return PARSE_FILENAME_SUCCESS;
+	return PARSE_STRING_SUCCESS;
 }
 
 /* Parses a line of data (not an empty line or comment) in the source list file
@@ -519,13 +589,13 @@ parse_source_list_line(tchar *line, size_t len,
 {
 	/* SOURCE [DEST] */
 	int ret;
-	ret = parse_filename(&line, &len, &source->fs_source_path);
-	if (ret != PARSE_FILENAME_SUCCESS)
+	ret = parse_string(&line, &len, &source->fs_source_path);
+	if (ret != PARSE_STRING_SUCCESS)
 		return false;
-	ret = parse_filename(&line, &len, &source->wim_target_path);
-	if (ret == PARSE_FILENAME_NONE)
+	ret = parse_string(&line, &len, &source->wim_target_path);
+	if (ret == PARSE_STRING_NONE)
 		source->wim_target_path = source->fs_source_path;
-	return ret != PARSE_FILENAME_FAILURE;
+	return ret != PARSE_STRING_FAILURE;
 }
 
 /* Returns %true if the given line of length @len > 0 is a comment or empty line
@@ -725,12 +795,12 @@ parse_capture_config_line(tchar *line, size_t len,
 			       "(such as [ExclusionList]"), line);
 		return false;
 	case CAPTURE_CONFIG_EXCLUSION_SECTION:
-		if (parse_filename(&line, &len, &filename) != PARSE_FILENAME_SUCCESS)
+		if (parse_string(&line, &len, &filename) != PARSE_STRING_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)
+		if (parse_string(&line, &len, &filename) != PARSE_STRING_SUCCESS)
 			return false;
 		return pattern_list_add_pattern(&config->exclusion_exception_pats,
 						filename);
@@ -855,8 +925,7 @@ stdin_get_contents(size_t *len_ret)
 
 
 static tchar *
-translate_text_to_tstr(char *text, size_t num_bytes,
-		       size_t *num_tchars_ret)
+translate_text_to_tstr(char *text, size_t num_bytes, size_t *num_tchars_ret)
 {
 #ifndef __WIN32__
 	/* On non-Windows, assume an ASCII-compatible encoding, such as UTF-8.
@@ -917,18 +986,6 @@ stdin_get_text_contents(size_t *num_tchars_ret)
 	return translate_text_to_tstr(contents, num_bytes, num_tchars_ret);
 }
 
-/* Return 0 if a path names a file to which the current user has write access;
- * -1 otherwise (and print an error message). */
-static int
-file_writable(const tchar *path)
-{
-	int ret;
-	ret = taccess(path, W_OK);
-	if (ret != 0)
-		imagex_error_with_errno(T("Can't modify \"%"TS"\""), path);
-	return ret;
-}
-
 #define TO_PERCENT(numerator, denominator) \
 	(((denominator) == 0) ? 0 : ((numerator) * 100 / (denominator)))
 
@@ -948,16 +1005,41 @@ get_data_type(int ctype)
 	return NULL;
 }
 
+#define GIBIBYTE_MIN_NBYTES 10000000000ULL
+#define MEBIBYTE_MIN_NBYTES 10000000ULL
+#define KIBIBYTE_MIN_NBYTES 10000ULL
+
+static unsigned
+get_unit(uint64_t total_bytes, const tchar **name_ret)
+{
+	if (total_bytes >= GIBIBYTE_MIN_NBYTES) {
+		*name_ret = T("GiB");
+		return 30;
+	} else if (total_bytes >= MEBIBYTE_MIN_NBYTES) {
+		*name_ret = T("MiB");
+		return 20;
+	} else if (total_bytes >= KIBIBYTE_MIN_NBYTES) {
+		*name_ret = T("KiB");
+		return 10;
+	} else {
+		*name_ret = T("bytes");
+		return 0;
+	}
+}
+
 /* Progress callback function passed to various wimlib functions. */
 static int
 imagex_progress_func(enum wimlib_progress_msg msg,
 		     const union wimlib_progress_info *info)
 {
 	unsigned percent_done;
+	unsigned unit_shift;
+	const tchar *unit_name;
 	if (imagex_be_quiet)
 		return 0;
 	switch (msg) {
 	case WIMLIB_PROGRESS_MSG_WRITE_STREAMS:
+		unit_shift = get_unit(info->write_streams.total_bytes, &unit_name);
 		percent_done = TO_PERCENT(info->write_streams.completed_bytes,
 					  info->write_streams.total_bytes);
 		if (info->write_streams.completed_streams == 0) {
@@ -968,10 +1050,12 @@ imagex_progress_func(enum wimlib_progress_msg msg,
 				data_type, info->write_streams.num_threads,
 				(info->write_streams.num_threads == 1) ? T("") : T("s"));
 		}
-		tprintf(T("\r%"PRIu64" MiB of %"PRIu64" MiB (uncompressed) "
+		tprintf(T("\r%"PRIu64" %"TS" of %"PRIu64" %"TS" (uncompressed) "
 			"written (%u%% done)"),
-			info->write_streams.completed_bytes >> 20,
-			info->write_streams.total_bytes >> 20,
+			info->write_streams.completed_bytes >> unit_shift,
+			unit_name,
+			info->write_streams.total_bytes >> unit_shift,
+			unit_name,
 			percent_done);
 		if (info->write_streams.completed_bytes >= info->write_streams.total_bytes)
 			tputchar(T('\n'));
@@ -979,7 +1063,8 @@ imagex_progress_func(enum wimlib_progress_msg msg,
 	case WIMLIB_PROGRESS_MSG_SCAN_BEGIN:
 		tprintf(T("Scanning \"%"TS"\""), info->scan.source);
 		if (*info->scan.wim_target_path) {
-			tprintf(T(" (loading as WIM path: \"/%"TS"\")...\n"),
+			tprintf(T(" (loading as WIM path: "
+				  "\""WIMLIB_WIM_PATH_SEPARATOR_STRING"%"TS"\")...\n"),
 			       info->scan.wim_target_path);
 		} else {
 			tprintf(T(" (loading as root of WIM image)...\n"));
@@ -994,24 +1079,30 @@ imagex_progress_func(enum wimlib_progress_msg msg,
 	/*case WIMLIB_PROGRESS_MSG_SCAN_END:*/
 		/*break;*/
 	case WIMLIB_PROGRESS_MSG_VERIFY_INTEGRITY:
+		unit_shift = get_unit(info->integrity.total_bytes, &unit_name);
 		percent_done = TO_PERCENT(info->integrity.completed_bytes,
 					  info->integrity.total_bytes);
-		tprintf(T("\rVerifying integrity of \"%"TS"\": %"PRIu64" MiB "
-			"of %"PRIu64" MiB (%u%%) done"),
+		tprintf(T("\rVerifying integrity of \"%"TS"\": %"PRIu64" %"TS" "
+			"of %"PRIu64" %"TS" (%u%%) done"),
 			info->integrity.filename,
-			info->integrity.completed_bytes >> 20,
-			info->integrity.total_bytes >> 20,
+			info->integrity.completed_bytes >> unit_shift,
+			unit_name,
+			info->integrity.total_bytes >> unit_shift,
+			unit_name,
 			percent_done);
 		if (info->integrity.completed_bytes == info->integrity.total_bytes)
 			tputchar(T('\n'));
 		break;
 	case WIMLIB_PROGRESS_MSG_CALC_INTEGRITY:
+		unit_shift = get_unit(info->integrity.total_bytes, &unit_name);
 		percent_done = TO_PERCENT(info->integrity.completed_bytes,
 					  info->integrity.total_bytes);
-		tprintf(T("\rCalculating integrity table for WIM: %"PRIu64" MiB "
-			  "of %"PRIu64" MiB (%u%%) done"),
-			info->integrity.completed_bytes >> 20,
-			info->integrity.total_bytes >> 20,
+		tprintf(T("\rCalculating integrity table for WIM: %"PRIu64" %"TS" "
+			  "of %"PRIu64" %"TS" (%u%%) done"),
+			info->integrity.completed_bytes >> unit_shift,
+			unit_name,
+			info->integrity.total_bytes >> unit_shift,
+			unit_name,
 			percent_done);
 		if (info->integrity.completed_bytes == info->integrity.total_bytes)
 			tputchar(T('\n'));
@@ -1027,7 +1118,8 @@ imagex_progress_func(enum wimlib_progress_msg msg,
 			info->extract.target);
 		break;
 	case WIMLIB_PROGRESS_MSG_EXTRACT_TREE_BEGIN:
-		tprintf(T("Extracting \"%"TS"\" from image %d (\"%"TS"\") "
+		tprintf(T("Extracting "
+			  "\""WIMLIB_WIM_PATH_SEPARATOR_STRING"%"TS"\" from image %d (\"%"TS"\") "
 			  "in \"%"TS"\" to \"%"TS"\"\n"),
 			info->extract.extract_root_wim_source_path,
 			info->extract.image,
@@ -1042,10 +1134,13 @@ imagex_progress_func(enum wimlib_progress_msg msg,
 	case WIMLIB_PROGRESS_MSG_EXTRACT_STREAMS:
 		percent_done = TO_PERCENT(info->extract.completed_bytes,
 					  info->extract.total_bytes);
+		unit_shift = get_unit(info->extract.total_bytes, &unit_name);
 		tprintf(T("\rExtracting files: "
-			  "%"PRIu64" MiB of %"PRIu64" MiB (%u%%) done"),
-			info->extract.completed_bytes >> 20,
-			info->extract.total_bytes >> 20,
+			  "%"PRIu64" %"TS" of %"PRIu64" %"TS" (%u%%) done"),
+			info->extract.completed_bytes >> unit_shift,
+			unit_name,
+			info->extract.total_bytes >> unit_shift,
+			unit_name,
 			percent_done);
 		if (info->extract.completed_bytes >= info->extract.total_bytes)
 			tputchar(T('\n'));
@@ -1066,23 +1161,29 @@ imagex_progress_func(enum wimlib_progress_msg msg,
 	case WIMLIB_PROGRESS_MSG_JOIN_STREAMS:
 		percent_done = TO_PERCENT(info->join.completed_bytes,
 					  info->join.total_bytes);
+		unit_shift = get_unit(info->join.total_bytes, &unit_name);
 		tprintf(T("Writing resources from part %u of %u: "
-			  "%"PRIu64 " MiB of %"PRIu64" MiB (%u%%) written\n"),
+			  "%"PRIu64 " %"TS" of %"PRIu64" %"TS" (%u%%) written\n"),
 			(info->join.completed_parts == info->join.total_parts) ?
 			info->join.completed_parts : info->join.completed_parts + 1,
 			info->join.total_parts,
-			info->join.completed_bytes >> 20,
-			info->join.total_bytes >> 20,
+			info->join.completed_bytes >> unit_shift,
+			unit_name,
+			info->join.total_bytes >> unit_shift,
+			unit_name,
 			percent_done);
 		break;
 	case WIMLIB_PROGRESS_MSG_SPLIT_BEGIN_PART:
 		percent_done = TO_PERCENT(info->split.completed_bytes,
 					  info->split.total_bytes);
-		tprintf(T("Writing \"%"TS"\": %"PRIu64" MiB of "
-			  "%"PRIu64" MiB (%u%%) written\n"),
+		unit_shift = get_unit(info->split.total_bytes, &unit_name);
+		tprintf(T("Writing \"%"TS"\": %"PRIu64" %"TS" of "
+			  "%"PRIu64" %"TS" (%u%%) written\n"),
 			info->split.part_name,
-			info->split.completed_bytes >> 20,
-			info->split.total_bytes >> 20,
+			info->split.completed_bytes >> unit_shift,
+			unit_name,
+			info->split.total_bytes >> unit_shift,
+			unit_name,
 			percent_done);
 		break;
 	case WIMLIB_PROGRESS_MSG_SPLIT_END_PART:
@@ -1091,6 +1192,25 @@ imagex_progress_func(enum wimlib_progress_msg msg,
 				info->split.cur_part_number);
 		}
 		break;
+	case WIMLIB_PROGRESS_MSG_UPDATE_END_COMMAND:
+		switch (info->update.command->op) {
+		case WIMLIB_UPDATE_OP_DELETE:
+			tprintf(T("Deleted WIM path "
+				  "\""WIMLIB_WIM_PATH_SEPARATOR_STRING "%"TS"\"\n"),
+				info->update.command->delete.wim_path);
+			break;
+		case WIMLIB_UPDATE_OP_RENAME:
+			tprintf(T("Renamed WIM path "
+				  "\""WIMLIB_WIM_PATH_SEPARATOR_STRING "%"TS"\" => "
+				  "\""WIMLIB_WIM_PATH_SEPARATOR_STRING "%"TS"\"\n"),
+				info->update.command->rename.wim_source_path,
+				info->update.command->rename.wim_target_path);
+			break;
+		case WIMLIB_UPDATE_OP_ADD:
+		default:
+			break;
+		}
+		break;
 	default:
 		break;
 	}
@@ -1175,6 +1295,213 @@ parse_num_threads(const tchar *optarg)
 	}
 }
 
+/*
+ * Parse an option passed to an update command.
+ *
+ * @op:		One of WIMLIB_UPDATE_OP_* that indicates the command being
+ *		parsed.
+ *
+ * @option:	Text string for the option (beginning with --)
+ *
+ * @cmd:	`struct wimlib_update_command' that is being constructed for
+ *		this command.
+ *
+ * Returns true if the option was recognized; false if not.
+ */
+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("--verbose")))
+			cmd->add.add_flags |= WIMLIB_ADD_IMAGE_FLAG_VERBOSE;
+		else 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;
+	default:
+		recognized = false;
+		break;
+	}
+	return recognized;
+}
+
+/* How many nonoption arguments each `imagex update' command expects */
+static const unsigned update_command_num_nonoptions[] = {
+	[WIMLIB_UPDATE_OP_ADD] = 2,
+	[WIMLIB_UPDATE_OP_DELETE] = 1,
+	[WIMLIB_UPDATE_OP_RENAME] = 2,
+};
+
+static void
+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;
+	}
+}
+
+/*
+ * Parse a command passed on stdin to `imagex update'.
+ *
+ * @line:	Text of the command.
+ * @len:	Length of the line, including a null terminator
+ *		at line[len - 1].
+ *
+ * @command:	A `struct wimlib_update_command' to fill in from the parsed
+ *		line.
+ *
+ * @line_number: Line number of the command, for diagnostics.
+ *
+ * Returns true on success; returns false on parse error.
+ */
+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;
+
+	/* Get the command name ("add", "delete", "rename") */
+	ret = parse_string(&line, &len, &command_name);
+	if (ret != PARSE_STRING_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;
+
+	/* Parse additional options and non-options as needed */
+	num_nonoptions = 0;
+	for (;;) {
+		tchar *next_string;
+
+		ret = parse_string(&line, &len, &next_string);
+		if (ret == PARSE_STRING_NONE) /* End of line */
+			break;
+		else if (ret != PARSE_STRING_SUCCESS) /* Parse failure */
+			return false;
+		if (next_string[0] == T('-') && next_string[1] == T('-')) {
+			/* Option */
+			if (!update_command_add_option(op, next_string, command))
+			{
+				imagex_error(T("Unrecognized option \"%"TS"\" to "
+					       "update command \"%"TS"\" on line %zu"),
+					     next_string, command_name, line_number);
+
+				return false;
+			}
+		} else {
+			/* Nonoption */
+			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;
+			}
+			update_command_add_nonoption(op, next_string,
+						     command, num_nonoptions);
+			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. */
@@ -1228,6 +1555,10 @@ imagex_apply(int argc, tchar **argv)
 		case IMAGEX_RPFIX_OPTION:
 			extract_flags |= WIMLIB_EXTRACT_FLAG_RPFIX;
 			break;
+		case IMAGEX_INCLUDE_INVALID_NAMES_OPTION:
+			extract_flags |= WIMLIB_EXTRACT_FLAG_REPLACE_INVALID_FILENAMES;
+			extract_flags |= WIMLIB_EXTRACT_FLAG_ALL_CASE_CONFLICTS;
+			break;
 		default:
 			usage(APPLY);
 			return -1;
@@ -1261,7 +1592,7 @@ imagex_apply(int argc, tchar **argv)
 	num_images = wimlib_get_num_images(w);
 	if (argc == 2 && num_images != 1) {
 		imagex_error(T("\"%"TS"\" contains %d images; Please select one "
-			       "(or all)"), wimfile, num_images);
+			       "(or all)."), wimfile, num_images);
 		usage(APPLY);
 		ret = -1;
 		goto out;
@@ -1319,7 +1650,7 @@ static int
 imagex_capture_or_append(int argc, tchar **argv)
 {
 	int c;
-	int open_flags = 0;
+	int open_flags = WIMLIB_OPEN_FLAG_WRITE_ACCESS;
 	int add_image_flags = WIMLIB_ADD_IMAGE_FLAG_EXCLUDE_VERBOSE;
 	int write_flags = 0;
 	int compression_type = WIMLIB_COMPRESSION_TYPE_XPRESS;
@@ -1347,6 +1678,7 @@ imagex_capture_or_append(int argc, tchar **argv)
 	bool capture_sources_malloced;
 	struct wimlib_capture_source *capture_sources;
 	size_t num_sources;
+	bool name_defaulted;
 
 	for_opt(c, capture_or_append_options) {
 		switch (c) {
@@ -1379,7 +1711,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:
@@ -1418,13 +1750,16 @@ imagex_capture_or_append(int argc, tchar **argv)
 
 	if (argc >= 3) {
 		name = argv[2];
+		name_defaulted = false;
 	} else {
 		/* Set default name to SOURCE argument, omitting any directory
 		 * prefixes and trailing slashes.  This requires making a copy
-		 * of @source. */
+		 * of @source.  Leave some free characters at the end in case we
+		 * append a number to keep the name unique. */
 		source_name_len = tstrlen(source);
-		source_copy = alloca((source_name_len + 1) * sizeof(tchar));
+		source_copy = alloca((source_name_len + 1 + 25) * sizeof(tchar));
 		name = tbasename(tstrcpy(source_copy, source));
+		name_defaulted = true;
 	}
 	/* Image description defaults to NULL if not given. */
 	desc = (argc >= 4) ? argv[3] : NULL;
@@ -1503,6 +1838,20 @@ imagex_capture_or_append(int argc, tchar **argv)
 			}
 		}
 	}
+
+	if (cmd == APPEND && name_defaulted) {
+		/* If the user did not specify an image name, and the basename
+		 * of the source already exists as an image name in the WIM
+		 * file, append a suffix to make it unique. */
+		unsigned long conflict_idx;
+		tchar *name_end = tstrchr(name, T('\0'));
+		for (conflict_idx = 1;
+		     wimlib_image_name_in_use(w, name);
+		     conflict_idx++)
+		{
+			tsprintf(name_end, T(" (%lu)"), conflict_idx);
+		}
+	}
 #ifdef __WIN32__
 	win32_acquire_capture_privileges();
 #endif
@@ -1534,8 +1883,6 @@ imagex_capture_or_append(int argc, tchar **argv)
 		ret = wimlib_write(w, wimfile, WIMLIB_ALL_IMAGES, write_flags,
 				   num_threads, imagex_progress_func);
 	}
-	if (ret == WIMLIB_ERR_REOPEN)
-		ret = 0;
 	if (ret != 0)
 		imagex_error(T("Failed to write the WIM file \"%"TS"\""),
 			     wimfile);
@@ -1564,7 +1911,7 @@ static int
 imagex_delete(int argc, tchar **argv)
 {
 	int c;
-	int open_flags = 0;
+	int open_flags = WIMLIB_OPEN_FLAG_WRITE_ACCESS;
 	int write_flags = 0;
 	const tchar *wimfile;
 	const tchar *image_num_or_name;
@@ -1600,10 +1947,6 @@ imagex_delete(int argc, tchar **argv)
 	wimfile = argv[0];
 	image_num_or_name = argv[1];
 
-	ret = file_writable(wimfile);
-	if (ret != 0)
-		return ret;
-
 	ret = wimlib_open_wim(wimfile, open_flags, &w,
 			      imagex_progress_func);
 	if (ret != 0)
@@ -1622,8 +1965,6 @@ imagex_delete(int argc, tchar **argv)
 	}
 
 	ret = wimlib_overwrite(w, write_flags, 0, imagex_progress_func);
-	if (ret == WIMLIB_ERR_REOPEN)
-		ret = 0;
 	if (ret != 0) {
 		imagex_error(T("Failed to write the file \"%"TS"\" with image "
 			       "deleted"), wimfile);
@@ -1633,56 +1974,80 @@ out:
 	return ret;
 }
 
+static int
+print_full_path(const struct wimlib_dir_entry *wdentry, void *_ignore)
+{
+	int ret = tprintf(T("%"TS"\n"), wdentry->full_path);
+	return (ret >= 0) ? 0 : -1;
+}
+
 /* Print the files contained in an image(s) in a WIM file. */
 static int
 imagex_dir(int argc, tchar **argv)
 {
 	const tchar *wimfile;
-	WIMStruct *w;
+	WIMStruct *wim = NULL;
 	int image;
 	int ret;
-	int num_images;
+	const tchar *path = T("");
+	int c;
 
-	if (argc < 2) {
+	for_opt(c, dir_options) {
+		switch (c) {
+		case IMAGEX_PATH_OPTION:
+			path = optarg;
+			break;
+		default:
+			goto out_usage;
+		}
+	}
+	argc -= optind;
+	argv += optind;
+
+	if (argc < 1) {
 		imagex_error(T("Must specify a WIM file"));
-		usage(DIR);
-		return -1;
+		goto out_usage;
 	}
-	if (argc > 3) {
+	if (argc > 2) {
 		imagex_error(T("Too many arguments"));
-		usage(DIR);
-		return -1;
+		goto out_usage;
 	}
 
-	wimfile = argv[1];
-	ret = wimlib_open_wim(wimfile, WIMLIB_OPEN_FLAG_SPLIT_OK, &w,
+	wimfile = argv[0];
+	ret = wimlib_open_wim(wimfile, WIMLIB_OPEN_FLAG_SPLIT_OK, &wim,
 			      imagex_progress_func);
-	if (ret != 0)
-		return ret;
+	if (ret)
+		goto out;
 
-	if (argc == 3) {
-		image = wimlib_resolve_image(w, argv[2]);
-		ret = verify_image_exists(image, argv[2], wimfile);
-		if (ret != 0)
-			goto out;
+	if (argc == 2) {
+		image = wimlib_resolve_image(wim, argv[1]);
+		ret = verify_image_exists(image, argv[1], wimfile);
+		if (ret)
+			goto out_wimlib_free;
 	} else {
 		/* Image was not specified.  If the WIM only contains one image,
 		 * choose that one; otherwise, print an error. */
-		num_images = wimlib_get_num_images(w);
+		int num_images = wimlib_get_num_images(wim);
 		if (num_images != 1) {
-			imagex_error(T("The file \"%"TS"\" contains %d images; Please "
+			imagex_error(T("\"%"TS"\" contains %d images; Please "
 				       "select one."), wimfile, num_images);
-			usage(DIR);
-			ret = -1;
-			goto out;
+			wimlib_free(wim);
+			goto out_usage;
 		}
 		image = 1;
 	}
 
-	ret = wimlib_print_files(w, image);
+	ret = wimlib_iterate_dir_tree(wim, image, path,
+				      WIMLIB_ITERATE_DIR_TREE_FLAG_RECURSIVE,
+				      print_full_path, NULL);
+out_wimlib_free:
+	wimlib_free(wim);
 out:
-	wimlib_free(w);
 	return ret;
+out_usage:
+	usage(DIR);
+	ret = -1;
+	goto out;
 }
 
 /* Exports one, or all, images from a WIM file to a new WIM file or an existing
@@ -1735,7 +2100,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:
@@ -1775,12 +2140,8 @@ imagex_export(int argc, tchar **argv)
 			ret = -1;
 			goto out;
 		}
-		ret = wimlib_open_wim(dest_wimfile, open_flags, &dest_w,
-				      imagex_progress_func);
-		if (ret != 0)
-			goto out;
-
-		ret = file_writable(dest_wimfile);
+		ret = wimlib_open_wim(dest_wimfile, open_flags | WIMLIB_OPEN_FLAG_WRITE_ACCESS,
+				      &dest_w, imagex_progress_func);
 		if (ret != 0)
 			goto out;
 
@@ -1795,11 +2156,11 @@ imagex_export(int argc, tchar **argv)
 			goto out;
 		}
 	} else {
-		wim_is_new = true;
 		/* dest_wimfile is not an existing file, so create a new WIM. */
-		if (!compression_type_specified)
-			compression_type = wimlib_get_compression_type(src_w);
 		if (errno == ENOENT) {
+			wim_is_new = true;
+			if (!compression_type_specified)
+				compression_type = wimlib_get_compression_type(src_w);
 			ret = wimlib_create_new_wim(compression_type, &dest_w);
 			if (ret != 0)
 				goto out;
@@ -1839,8 +2200,6 @@ imagex_export(int argc, tchar **argv)
 		ret = wimlib_overwrite(dest_w, write_flags, num_threads,
 				       imagex_progress_func);
 out:
-	if (ret == WIMLIB_ERR_REOPEN)
-		ret = 0;
 	wimlib_free(src_w);
 	wimlib_free(dest_w);
 	if (additional_swms) {
@@ -1872,18 +2231,19 @@ free_extract_commands(struct wimlib_extract_command *cmds, size_t num_cmds,
 }
 
 static struct wimlib_extract_command *
-prepare_extract_commands(tchar **argv, int argc, int extract_flags,
-			 tchar *dest_dir, size_t *num_cmds_ret)
+prepare_extract_commands(tchar **paths, unsigned num_paths,
+			 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;
+	if (num_paths == 0) {
+		num_paths = 1;
+		paths = &emptystr;
 	}
-	num_cmds = argc;
+	num_cmds = num_paths;
 	cmds = calloc(num_cmds, sizeof(cmds[0]));
 	if (!cmds) {
 		imagex_error(T("Out of memory!"));
@@ -1892,18 +2252,18 @@ prepare_extract_commands(tchar **argv, int argc, int extract_flags,
 
 	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].wim_source_path = paths[i];
+		if (is_root_wim_path(paths[i])) {
 			cmds[i].fs_dest_path = dest_dir;
 		} else {
-			size_t len = tstrlen(dest_dir) + 1 + tstrlen(argv[i]);
+			size_t len = tstrlen(dest_dir) + 1 + tstrlen(paths[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]));
+			tsprintf(cmds[i].fs_dest_path, T("%"TS""OS_PREFERRED_PATH_SEPARATOR_STRING"%"TS),
+				 dest_dir, tbasename(paths[i]));
 		}
 	}
 	*num_cmds_ret = num_cmds;
@@ -1922,7 +2282,7 @@ imagex_extract(int argc, tchar **argv)
 	const tchar *wimfile;
 	const tchar *image_num_or_name;
 	tchar *dest_dir = T(".");
-	int extract_flags = WIMLIB_EXTRACT_FLAG_SEQUENTIAL;
+	int extract_flags = WIMLIB_EXTRACT_FLAG_SEQUENTIAL | WIMLIB_EXTRACT_FLAG_NORPFIX;
 
 	const tchar *swm_glob = NULL;
 	WIMStruct **additional_swms = NULL;
@@ -1958,20 +2318,20 @@ imagex_extract(int argc, tchar **argv)
 			extract_flags |= WIMLIB_EXTRACT_FLAG_TO_STDOUT;
 			imagex_be_quiet = true;
 			break;
+		case IMAGEX_INCLUDE_INVALID_NAMES_OPTION:
+			extract_flags |= WIMLIB_EXTRACT_FLAG_REPLACE_INVALID_FILENAMES;
+			extract_flags |= WIMLIB_EXTRACT_FLAG_ALL_CASE_CONFLICTS;
+			break;
 		default:
-			usage(EXTRACT);
-			ret = -1;
-			goto out;
+			goto out_usage;
 		}
 	}
 	argc -= optind;
 	argv += optind;
 
-	if (argc < 2) {
-		usage(EXTRACT);
-		ret = -1;
-		goto out;
-	}
+	if (argc < 2)
+		goto out_usage;
+
 	wimfile = argv[0];
 	image_num_or_name = argv[1];
 
@@ -2008,7 +2368,7 @@ imagex_extract(int argc, tchar **argv)
 	win32_acquire_restore_privileges();
 #endif
 
-	ret = wimlib_extract_files(wim, image, 0, cmds, num_cmds,
+	ret = wimlib_extract_files(wim, image, cmds, num_cmds, 0,
 				   additional_swms, num_additional_swms,
 				   imagex_progress_func);
 	if (ret == 0) {
@@ -2033,6 +2393,80 @@ out_free_cmds:
 	free_extract_commands(cmds, num_cmds, dest_dir);
 out:
 	return ret;
+out_usage:
+	usage(EXTRACT);
+	ret = -1;
+	goto out;
+}
+
+static void print_byte_field(const uint8_t field[], size_t len)
+{
+	while (len--)
+		tprintf(T("%02hhx"), *field++);
+}
+
+static void
+print_wim_information(const tchar *wimfile, const struct wimlib_wim_info *info)
+{
+	tputs(T("WIM Information:"));
+	tputs(T("----------------"));
+	tprintf(T("Path:           %"TS"\n"), wimfile);
+	tprintf(T("GUID:           0x"));
+	print_byte_field(info->guid, sizeof(info->guid));
+	tputchar(T('\n'));
+	tprintf(T("Image Count:    %d\n"), info->image_count);
+	tprintf(T("Compression:    %"TS"\n"),
+		wimlib_get_compression_type_string(info->compression_type));
+	tprintf(T("Part Number:    %d/%d\n"), info->part_number, info->total_parts);
+	tprintf(T("Boot Index:     %d\n"), info->boot_index);
+	tprintf(T("Size:           %"PRIu64" bytes\n"), info->total_bytes);
+	tprintf(T("Integrity Info: %"TS"\n"),
+		info->has_integrity_table ? T("yes") : T("no"));
+	tprintf(T("Relative path junction: %"TS"\n"),
+		info->has_rpfix ? T("yes") : T("no"));
+	tputchar(T('\n'));
+}
+
+static int
+print_resource(const struct wimlib_resource_entry *resource,
+	       void *_ignore)
+{
+
+	tprintf(T("Uncompressed size   = %"PRIu64" bytes\n"),
+		resource->uncompressed_size);
+
+	tprintf(T("Compressed size     = %"PRIu64" bytes\n"),
+		resource->compressed_size);
+
+	tprintf(T("Offset              = %"PRIu64" bytes\n"),
+		resource->offset);
+
+
+	tprintf(T("Part Number         = %u\n"), resource->part_number);
+	tprintf(T("Reference Count     = %u\n"), resource->reference_count);
+
+	tprintf(T("Hash                = 0x"));
+	print_byte_field(resource->sha1_hash, sizeof(resource->sha1_hash));
+	tputchar(T('\n'));
+
+	tprintf(T("Flags               = "));
+	if (resource->is_compressed)
+		tprintf(T("WIM_RESHDR_FLAG_COMPRESSED  "));
+	if (resource->is_metadata)
+		tprintf(T("WIM_RESHDR_FLAG_METADATA  "));
+	if (resource->is_free)
+		tprintf(T("WIM_RESHDR_FLAG_FREE  "));
+	if (resource->is_spanned)
+		tprintf(T("WIM_RESHDR_FLAG_SPANNED  "));
+	tputchar(T('\n'));
+	tputchar(T('\n'));
+	return 0;
+}
+
+static void
+print_lookup_table(WIMStruct *wim)
+{
+	wimlib_iterate_lookup_table(wim, 0, print_resource, NULL);
 }
 
 /* Prints information about a WIM file; also can mark an image as bootable,
@@ -2058,9 +2492,7 @@ imagex_info(int argc, tchar **argv)
 	int image;
 	int ret;
 	int open_flags = WIMLIB_OPEN_FLAG_SPLIT_OK;
-	int part_number;
-	int total_parts;
-	int num_images;
+	struct wimlib_wim_info info;
 
 	for_opt(c, info_options) {
 		switch (c) {
@@ -2121,7 +2553,7 @@ imagex_info(int argc, tchar **argv)
 	if (ret != 0)
 		return ret;
 
-	part_number = wimlib_get_part_number(w, &total_parts);
+	wimlib_get_wim_info(w, &info);
 
 	image = wimlib_resolve_image(w, image_num_or_name);
 	if (image == WIMLIB_NO_IMAGE && tstrcmp(image_num_or_name, T("0"))) {
@@ -2136,9 +2568,7 @@ imagex_info(int argc, tchar **argv)
 		goto out;
 	}
 
-	num_images = wimlib_get_num_images(w);
-
-	if (num_images == 0) {
+	if (info.image_count == 0) {
 		if (boot) {
 			imagex_error(T("--boot is meaningless on a WIM with no "
 				       "images"));
@@ -2147,7 +2577,7 @@ imagex_info(int argc, tchar **argv)
 		}
 	}
 
-	if (image == WIMLIB_ALL_IMAGES && num_images > 1) {
+	if (image == WIMLIB_ALL_IMAGES && info.image_count > 1) {
 		if (boot) {
 			imagex_error(T("Cannot specify the --boot flag "
 				       "without specifying a specific "
@@ -2178,18 +2608,18 @@ imagex_info(int argc, tchar **argv)
 		}
 
 		if (image == WIMLIB_ALL_IMAGES && short_header)
-			wimlib_print_wim_information(w);
+			print_wim_information(wimfile, &info);
 
 		if (header)
 			wimlib_print_header(w);
 
 		if (lookup_table) {
-			if (total_parts != 1) {
-				tprintf(T("Warning: Only showing the lookup table "
-					  "for part %d of a %d-part WIM.\n"),
-					part_number, total_parts);
+			if (info.total_parts != 1) {
+				tfprintf(stderr, T("Warning: Only showing the lookup table "
+						   "for part %d of a %d-part WIM.\n"),
+					 info.part_number, info.total_parts);
 			}
-			wimlib_print_lookup_table(w);
+			print_lookup_table(w);
 		}
 
 		if (xml) {
@@ -2231,11 +2661,7 @@ imagex_info(int argc, tchar **argv)
 	} else {
 
 		/* Modification operations */
-		if (total_parts != 1) {
-			imagex_error(T("Modifying a split WIM is not supported."));
-			ret = -1;
-			goto out;
-		}
+
 		if (image == WIMLIB_ALL_IMAGES)
 			image = 1;
 
@@ -2254,7 +2680,10 @@ imagex_info(int argc, tchar **argv)
 			} else {
 				tprintf(T("Marking image %d as bootable.\n"),
 					image);
-				wimlib_set_boot_idx(w, image);
+				info.boot_index = image;
+				ret = wimlib_set_wim_info(w, &info, WIMLIB_CHANGE_BOOT_INDEX);
+				if (ret)
+					goto out;
 			}
 		}
 		if (new_name) {
@@ -2293,21 +2722,12 @@ imagex_info(int argc, tchar **argv)
 		if (boot || new_name || new_desc ||
 		    (check && !wimlib_has_integrity_table(w)))
 		{
-			int write_flags;
-
-			ret = file_writable(wimfile);
-			if (ret != 0)
-				goto out;
+			int write_flags = 0;
 
 			if (check)
-				write_flags = WIMLIB_WRITE_FLAG_CHECK_INTEGRITY;
-			else
-				write_flags = 0;
-
+				write_flags |= WIMLIB_WRITE_FLAG_CHECK_INTEGRITY;
 			ret = wimlib_overwrite(w, write_flags, 1,
 					       imagex_progress_func);
-			if (ret == WIMLIB_ERR_REOPEN)
-				ret = 0;
 		} else {
 			tprintf(T("The file \"%"TS"\" was not modified because nothing "
 				  "needed to be done.\n"), wimfile);
@@ -2376,8 +2796,10 @@ imagex_mount_rw_or_ro(int argc, tchar **argv)
 	unsigned num_additional_swms = 0;
 	const tchar *staging_dir = NULL;
 
-	if (!tstrcmp(argv[0], T("mountrw")))
+	if (!tstrcmp(argv[0], T("mountrw"))) {
 		mount_flags |= WIMLIB_MOUNT_FLAG_READWRITE;
+		open_flags |= WIMLIB_OPEN_FLAG_WRITE_ACCESS;
+	}
 
 	for_opt(c, mount_options) {
 		switch (c) {
@@ -2440,7 +2862,7 @@ imagex_mount_rw_or_ro(int argc, tchar **argv)
 		image = 1;
 		num_images = wimlib_get_num_images(w);
 		if (num_images != 1) {
-			imagex_error(T("The file \"%"TS"\" contains %d images; Please "
+			imagex_error(T("\"%"TS"\" contains %d images; Please "
 				       "select one."), wimfile, num_images);
 			usage((mount_flags & WIMLIB_MOUNT_FLAG_READWRITE)
 					? MOUNTRW : MOUNT);
@@ -2456,12 +2878,6 @@ imagex_mount_rw_or_ro(int argc, tchar **argv)
 			goto out;
 	}
 
-	if (mount_flags & WIMLIB_MOUNT_FLAG_READWRITE) {
-		ret = file_writable(wimfile);
-		if (ret != 0)
-			goto out;
-	}
-
 	ret = wimlib_mount_image(w, image, dir, mount_flags, additional_swms,
 				 num_additional_swms, staging_dir);
 	if (ret != 0) {
@@ -2489,7 +2905,7 @@ static int
 imagex_optimize(int argc, tchar **argv)
 {
 	int c;
-	int open_flags = 0;
+	int open_flags = WIMLIB_OPEN_FLAG_WRITE_ACCESS;
 	int write_flags = WIMLIB_WRITE_FLAG_REBUILD;
 	int ret;
 	WIMStruct *w;
@@ -2529,7 +2945,7 @@ imagex_optimize(int argc, tchar **argv)
 
 	ret = wimlib_open_wim(wimfile, open_flags, &w,
 			      imagex_progress_func);
-	if (ret != 0)
+	if (ret)
 		return ret;
 
 	old_size = file_get_size(argv[0]);
@@ -2624,9 +3040,12 @@ 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;
+		case IMAGEX_LAZY_OPTION:
+			unmount_flags |= WIMLIB_UNMOUNT_FLAG_LAZY;
+			break;
 		default:
 			usage(UNMOUNT);
 			return -1;
@@ -2646,6 +3065,232 @@ imagex_unmount(int argc, tchar **argv)
 	return ret;
 }
 
+/*
+ * Add, delete, or rename files in a WIM image.
+ */
+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 = 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_delete_flags = 0;
+	unsigned num_threads = 0;
+	int c;
+	tchar *cmd_file_contents = NULL;
+	size_t cmd_file_nchars;
+	struct wimlib_update_command *cmds;
+	size_t num_cmds;
+	int num_images;
+	tchar *command_str = NULL;
+
+	const tchar *config_file = NULL;
+	tchar *config_str;
+	struct wimlib_capture_config *config = NULL;
+
+	for_opt(c, update_options) {
+		switch (c) {
+		/* Generic or write options */
+		case IMAGEX_THREADS_OPTION:
+			num_threads = parse_num_threads(optarg);
+			if (num_threads == UINT_MAX) {
+				ret = -1;
+				goto out;
+			}
+			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_COMMAND_OPTION:
+			if (command_str) {
+				imagex_error(T("--command may only be specified "
+					       "one time.  Please provide\n"
+					       "       the update commands "
+					       "on standard input instead."));
+				ret = -1;
+				goto out;
+			}
+			command_str = tstrdup(optarg);
+			if (!command_str) {
+				imagex_error(T("Out of memory!"));
+				ret = -1;
+				goto out;
+			}
+			break;
+		/* Default delete options */
+		case IMAGEX_FORCE_OPTION:
+			default_delete_flags |= WIMLIB_DELETE_FLAG_FORCE;
+			break;
+		case IMAGEX_RECURSIVE_OPTION:
+			default_delete_flags |= WIMLIB_DELETE_FLAG_RECURSIVE;
+			break;
+
+		/* Global add option */
+		case IMAGEX_CONFIG_OPTION:
+			config_file = optarg;
+			break;
+
+		/* Default add options */
+		case IMAGEX_VERBOSE_OPTION:
+			default_add_flags |= WIMLIB_ADD_IMAGE_FLAG_VERBOSE;
+			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;
+
+	num_images = wimlib_get_num_images(wim);
+	if (argc == 1 && num_images != 1) {
+		imagex_error(T("\"%"TS"\" contains %d images; Please select one."),
+			     wimfile, num_images);
+		usage(UPDATE);
+		ret = -1;
+		goto out_wimlib_free;
+	}
+
+	/* Parse capture configuration file if specified */
+	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;
+	}
+
+	/* Read update commands from standard input, or the command string if
+	 * specified.  */
+	if (command_str) {
+		cmds = parse_update_command_file(&command_str, tstrlen(command_str),
+						 &num_cmds);
+	} else {
+		if (isatty(STDIN_FILENO)) {
+			tputs(T("Reading update commands from standard input..."));
+			recommend_man_page(T("update"));
+		}
+		cmd_file_contents = stdin_get_text_contents(&cmd_file_nchars);
+		if (!cmd_file_contents) {
+			ret = -1;
+			goto out_free_config;
+		}
+
+		/* Parse the update commands */
+		cmds = parse_update_command_file(&cmd_file_contents, cmd_file_nchars,
+						 &num_cmds);
+	}
+	if (!cmds) {
+		ret = -1;
+		goto out_free_cmd_file_contents;
+	}
+
+	/* Set default flags and capture config on the update commands */
+	bool have_add_command = false;
+	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;
+			have_add_command = true;
+			break;
+		case WIMLIB_UPDATE_OP_DELETE:
+			cmds[i].delete.delete_flags |= default_delete_flags;
+			break;
+		default:
+			break;
+		}
+	}
+
+#ifdef __WIN32__
+	if (have_add_command)
+		win32_acquire_capture_privileges();
+#endif
+
+	/* Execute the update commands */
+	ret = wimlib_update_image(wim, image, cmds, num_cmds, update_flags,
+				  imagex_progress_func);
+	if (ret)
+		goto out_release_privs;
+
+	/* Overwrite the updated WIM */
+	ret = wimlib_overwrite(wim, write_flags, num_threads,
+			       imagex_progress_func);
+out_release_privs:
+#ifdef __WIN32__
+	if (have_add_command)
+		win32_release_capture_privileges();
+#endif
+	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:
+	free(command_str);
+	return ret;
+out_usage:
+	usage(UPDATE);
+	ret = -1;
+	goto out;
+}
+
 struct imagex_command {
 	const tchar *name;
 	int (*func)(int , tchar **);
@@ -2671,10 +3316,11 @@ 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
-version()
+version(void)
 {
 	static const tchar *s =
 	T(
@@ -2730,14 +3376,14 @@ usage(int cmd_type)
 	tprintf(T("Usage:\n%"TS), usage_strings[cmd_type]);
 	for_imagex_command(cmd) {
 		if (cmd->cmd == cmd_type) {
-			tprintf(T("\nTry `man "IMAGEX_PROGNAME"-%"TS"' "
-				  "for more details.\n"), cmd->name);
+			tputc(T('\n'), stdout);
+			recommend_man_page(cmd->name);
 		}
 	}
 }
 
 static void
-usage_all()
+usage_all(void)
 {
 	tfputs(T("Usage:\n"), stdout);
 	for (int i = 0; i < ARRAY_LEN(usage_strings); i++)
@@ -2749,9 +3395,9 @@ usage_all()
 "\n"
 "    The compression TYPE may be \"maximum\", \"fast\", or \"none\".\n"
 "\n"
-"    Try `man "IMAGEX_PROGNAME"' for more information.\n"
 	);
 	tfputs(extra, stdout);
+	recommend_man_page(T(""));
 }
 
 /* Entry point for wimlib's ImageX implementation.  On UNIX the command