X-Git-Url: https://wimlib.net/git/?p=wimlib;a=blobdiff_plain;f=programs%2Fimagex.c;h=84f7b8e0ff7202c2d5757f6ced71710a1726307e;hp=556006f6e82b4ea61551c805aa6b2bd9b0919c48;hb=d31b2fee211b1c31420bafe1c2379f6f89bd92fe;hpb=8b709192cd2811b83c248fbe61ca4f11ee9de797

diff --git a/programs/imagex.c b/programs/imagex.c
index 556006f6..84f7b8e0 100644
--- a/programs/imagex.c
+++ b/programs/imagex.c
@@ -267,6 +267,7 @@ static const struct option dir_options[] = {
 	{T("path"),     required_argument, NULL, IMAGEX_PATH_OPTION},
 	{T("detailed"), no_argument,       NULL, IMAGEX_DETAILED_OPTION},
 	{T("one-file-only"), no_argument,  NULL, IMAGEX_ONE_FILE_ONLY_OPTION},
+	{T("ref"),      required_argument, NULL, IMAGEX_REF_OPTION},
 	{NULL, 0, NULL, 0},
 };
 
@@ -661,6 +662,17 @@ do_resource_not_found_warning(const tchar *wimfile,
 	}
 }
 
+static void
+do_metadata_not_found_warning(const tchar *wimfile,
+			      const struct wimlib_wim_info *info)
+{
+	if (info->part_number != 1) {
+		imagex_error(T("\"%"TS"\" is not the first part of the split WIM.\n"
+			       "       You must specify the first part."),
+			       wimfile);
+	}
+}
+
 /* 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
@@ -1757,6 +1769,8 @@ imagex_apply(int argc, tchar **argv, int cmd)
 				       "       make sure you have "
 				       "concatenated together all parts."));
 		}
+	} else if (ret == WIMLIB_ERR_METADATA_NOT_FOUND) {
+		do_metadata_not_found_warning(wimfile, &info);
 	}
 out_wimlib_free:
 	wimlib_free(wim);
@@ -2639,6 +2653,8 @@ imagex_dir(int argc, tchar **argv, int cmd)
 	};
 	int iterate_flags = WIMLIB_ITERATE_DIR_TREE_FLAG_RECURSIVE;
 
+	STRING_SET(refglobs);
+
 	for_opt(c, dir_options) {
 		switch (c) {
 		case IMAGEX_PATH_OPTION:
@@ -2650,6 +2666,11 @@ imagex_dir(int argc, tchar **argv, int cmd)
 		case IMAGEX_ONE_FILE_ONLY_OPTION:
 			iterate_flags &= ~WIMLIB_ITERATE_DIR_TREE_FLAG_RECURSIVE;
 			break;
+		case IMAGEX_REF_OPTION:
+			ret = string_set_append(&refglobs, optarg);
+			if (ret)
+				goto out_free_refglobs;
+			break;
 		default:
 			goto out_usage;
 		}
@@ -2670,7 +2691,7 @@ imagex_dir(int argc, tchar **argv, int cmd)
 	ret = wimlib_open_wim_with_progress(wimfile, 0, &wim,
 					    imagex_progress_func, NULL);
 	if (ret)
-		goto out;
+		goto out_free_refglobs;
 
 	if (argc >= 2) {
 		image = wimlib_resolve_image(wim, argv[1]);
@@ -2694,17 +2715,30 @@ imagex_dir(int argc, tchar **argv, int cmd)
 		image = 1;
 	}
 
+	if (refglobs.num_strings) {
+		ret = wim_reference_globs(wim, &refglobs, 0);
+		if (ret)
+			goto out_wimlib_free;
+	}
+
 	ret = wimlib_iterate_dir_tree(wim, image, path, iterate_flags,
 				      print_dentry, &options);
+	if (ret == WIMLIB_ERR_METADATA_NOT_FOUND) {
+		struct wimlib_wim_info info;
+
+		wimlib_get_wim_info(wim, &info);
+		do_metadata_not_found_warning(wimfile, &info);
+	}
 out_wimlib_free:
 	wimlib_free(wim);
-out:
+out_free_refglobs:
+	string_set_destroy(&refglobs);
 	return ret;
 
 out_usage:
 	usage(CMD_DIR, stderr);
 	ret = -1;
-	goto out;
+	goto out_free_refglobs;
 }
 
 /* Exports one, or all, images from a WIM file to a new WIM file or an existing
@@ -2969,6 +3003,8 @@ imagex_export(int argc, tchar **argv, int cmd)
 		if (ret == WIMLIB_ERR_RESOURCE_NOT_FOUND) {
 			do_resource_not_found_warning(src_wimfile,
 						      &src_info, &refglobs);
+		} else if (ret == WIMLIB_ERR_METADATA_NOT_FOUND) {
+			do_metadata_not_found_warning(src_wimfile, &src_info);
 		}
 		goto out_free_dest_wim;
 	}
@@ -3166,6 +3202,11 @@ imagex_extract(int argc, tchar **argv, int cmd)
 
 		wimlib_get_wim_info(wim, &info);
 		do_resource_not_found_warning(wimfile, &info, &refglobs);
+	} else if (ret == WIMLIB_ERR_METADATA_NOT_FOUND) {
+		struct wimlib_wim_info info;
+
+		wimlib_get_wim_info(wim, &info);
+		do_metadata_not_found_warning(wimfile, &info);
 	}
 out_wimlib_free:
 	wimlib_free(wim);
@@ -3600,9 +3641,13 @@ imagex_mount_rw_or_ro(int argc, tchar **argv, int cmd)
 
 	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);
+		if (ret == WIMLIB_ERR_METADATA_NOT_FOUND) {
+			do_metadata_not_found_warning(wimfile, &info);
+		} else {
+			imagex_error(T("Failed to mount image %d from \"%"TS"\" "
+				       "on \"%"TS"\""),
+				     image, wimfile, dir);
+		}
 	}
 out_free_wim:
 	wimlib_free(wim);