X-Git-Url: https://wimlib.net/git/?a=blobdiff_plain;f=programs%2Fimagex.c;h=60b533c3984597b21fdf483d85207ce367875df7;hb=af272527f1ecb860907ede7ca33ce667701c571b;hp=6dd8bdbb03df7b4f9b125cc9e9c328dd227a5839;hpb=4dd45340f9fe3a533e0f1a9d6b79f8118e45ca2a;p=wimlib

diff --git a/programs/imagex.c b/programs/imagex.c
index 6dd8bdbb..60b533c3 100644
--- a/programs/imagex.c
+++ b/programs/imagex.c
@@ -124,6 +124,7 @@ enum {
 	CMD_UNMOUNT,
 #endif
 	CMD_UPDATE,
+	CMD_VERIFY,
 	CMD_MAX,
 };
 
@@ -404,6 +405,12 @@ static const struct option update_options[] = {
 	{NULL, 0, NULL, 0},
 };
 
+static const struct option verify_options[] = {
+	{T("ref"), required_argument, NULL, IMAGEX_REF_OPTION},
+
+	{NULL, 0, NULL, 0},
+};
+
 #if 0
 #	define _format_attribute(type, format_str, args_start) \
 			__attribute__((format(type, format_str, args_start)))
@@ -1234,6 +1241,25 @@ imagex_progress_func(enum wimlib_progress_msg msg,
 			}
 		}
 		break;
+	case WIMLIB_PROGRESS_MSG_BEGIN_VERIFY_IMAGE:
+		imagex_printf(T("Verifying metadata for image %"PRIu32" of %"PRIu32"\n"),
+			      info->verify_image.current_image,
+			      info->verify_image.total_images);
+		break;
+	case WIMLIB_PROGRESS_MSG_VERIFY_STREAMS:
+		percent_done = TO_PERCENT(info->verify_streams.completed_bytes,
+					  info->verify_streams.total_bytes);
+		unit_shift = get_unit(info->verify_streams.total_bytes, &unit_name);
+		imagex_printf(T("\rVerifying streams: "
+			  "%"PRIu64" %"TS" of %"PRIu64" %"TS" (%u%%) done"),
+			info->verify_streams.completed_bytes >> unit_shift,
+			unit_name,
+			info->verify_streams.total_bytes >> unit_shift,
+			unit_name,
+			percent_done);
+		if (info->verify_streams.completed_bytes == info->verify_streams.total_bytes)
+			imagex_printf(T("\n"));
+		break;
 	default:
 		break;
 	}
@@ -3959,7 +3985,82 @@ out_err:
 	goto out_free_command_str;
 }
 
+/* Verify a WIM file.  */
+static int
+imagex_verify(int argc, tchar **argv, int cmd)
+{
+	int ret;
+	const tchar *wimfile;
+	WIMStruct *wim;
+	int open_flags = WIMLIB_OPEN_FLAG_CHECK_INTEGRITY;
+	int verify_flags = 0;
+	STRING_SET(refglobs);
+	int c;
+
+	for_opt(c, verify_options) {
+		switch (c) {
+		case IMAGEX_REF_OPTION:
+			ret = string_set_append(&refglobs, optarg);
+			if (ret)
+				goto out_free_refglobs;
+			break;
+		default:
+			goto out_usage;
+		}
+	}
 
+	argv += optind;
+	argc -= optind;
+
+	if (argc != 1) {
+		if (argc == 0)
+			imagex_error(T("Must specify a WIM file!"));
+		else
+			imagex_error(T("At most one WIM file can be specified!"));
+		goto out_usage;
+	}
+
+	wimfile = argv[0];
+
+	ret = wimlib_open_wim_with_progress(wimfile,
+					    open_flags,
+					    &wim,
+					    imagex_progress_func,
+					    NULL);
+	if (ret)
+		goto out_free_refglobs;
+
+	ret = wim_reference_globs(wim, &refglobs, open_flags);
+	if (ret)
+		goto out_wimlib_free;
+
+	ret = wimlib_verify_wim(wim, verify_flags);
+	if (ret) {
+		tputc(T('\n'), stderr);
+		imagex_error(T("\"%"TS"\" failed verification!"),
+			     wimfile);
+		if (ret == WIMLIB_ERR_RESOURCE_NOT_FOUND &&
+		    refglobs.num_strings == 0)
+		{
+			imagex_printf(T("Note: if this WIM file is not standalone, "
+					"use the --ref option to specify the other parts.\n"));
+		}
+	} else {
+		imagex_printf(T("\n\"%"TS"\" was successfully verified.\n"),
+			      wimfile);
+	}
+
+out_wimlib_free:
+	wimlib_free(wim);
+out_free_refglobs:
+	string_set_destroy(&refglobs);
+	return ret;
+
+out_usage:
+	usage(CMD_VERIFY, stderr);
+	ret = -1;
+	goto out_free_refglobs;
+}
 
 struct imagex_command {
 	const tchar *name;
@@ -3986,6 +4087,7 @@ static const struct imagex_command imagex_commands[] = {
 	[CMD_UNMOUNT]  = {T("unmount"),  imagex_unmount},
 #endif
 	[CMD_UPDATE]   = {T("update"),   imagex_update},
+	[CMD_VERIFY]   = {T("verify"),   imagex_verify},
 };
 
 #ifdef __WIN32__
@@ -4105,6 +4207,10 @@ T(
 "                    [--command=STRING] [--wimboot-config=FILE]\n"
 "                    [< CMDFILE]\n"
 ),
+[CMD_VERIFY] =
+T(
+"    %"TS" WIMFILE [--ref=\"GLOB\"]\n"
+),
 };
 
 static const tchar *invocation_name;