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

diff --git a/programs/imagex.c b/programs/imagex.c
index 556006f6..b7ff47ef 100644
--- a/programs/imagex.c
+++ b/programs/imagex.c
@@ -194,6 +194,7 @@ enum {
 	IMAGEX_THREADS_OPTION,
 	IMAGEX_TO_STDOUT_OPTION,
 	IMAGEX_UNIX_DATA_OPTION,
+	IMAGEX_UNSAFE_COMPACT_OPTION,
 	IMAGEX_UPDATE_OF_OPTION,
 	IMAGEX_VERBOSE_OPTION,
 	IMAGEX_WIMBOOT_CONFIG_OPTION,
@@ -254,12 +255,14 @@ static const struct option capture_or_append_options[] = {
 	{T("update-of"),   required_argument, NULL, IMAGEX_UPDATE_OF_OPTION},
 	{T("delta-from"),  required_argument, NULL, IMAGEX_DELTA_FROM_OPTION},
 	{T("wimboot"),     no_argument,       NULL, IMAGEX_WIMBOOT_OPTION},
+	{T("unsafe-compact"), no_argument,    NULL, IMAGEX_UNSAFE_COMPACT_OPTION},
 	{NULL, 0, NULL, 0},
 };
 
 static const struct option delete_options[] = {
 	{T("check"), no_argument, NULL, IMAGEX_CHECK_OPTION},
 	{T("soft"),  no_argument, NULL, IMAGEX_SOFT_OPTION},
+	{T("unsafe-compact"), no_argument, NULL, IMAGEX_UNSAFE_COMPACT_OPTION},
 	{NULL, 0, NULL, 0},
 };
 
@@ -267,6 +270,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},
 };
 
@@ -292,6 +296,7 @@ static const struct option export_options[] = {
 	{T("pipable"),     no_argument,       NULL, IMAGEX_PIPABLE_OPTION},
 	{T("not-pipable"), no_argument,       NULL, IMAGEX_NOT_PIPABLE_OPTION},
 	{T("wimboot"),     no_argument,       NULL, IMAGEX_WIMBOOT_OPTION},
+	{T("unsafe-compact"), no_argument,    NULL, IMAGEX_UNSAFE_COMPACT_OPTION},
 	{NULL, 0, NULL, 0},
 };
 
@@ -365,6 +370,7 @@ static const struct option optimize_options[] = {
 	{T("threads"),     required_argument, NULL, IMAGEX_THREADS_OPTION},
 	{T("pipable"),     no_argument,       NULL, IMAGEX_PIPABLE_OPTION},
 	{T("not-pipable"), no_argument,       NULL, IMAGEX_NOT_PIPABLE_OPTION},
+	{T("unsafe-compact"), no_argument,    NULL, IMAGEX_UNSAFE_COMPACT_OPTION},
 	{NULL, 0, NULL, 0},
 };
 
@@ -409,6 +415,7 @@ static const struct option update_options[] = {
 	{T("no-acls"),     no_argument,       NULL, IMAGEX_NO_ACLS_OPTION},
 	{T("strict-acls"), no_argument,       NULL, IMAGEX_STRICT_ACLS_OPTION},
 	{T("no-replace"),  no_argument,       NULL, IMAGEX_NO_REPLACE_OPTION},
+	{T("unsafe-compact"), no_argument,    NULL, IMAGEX_UNSAFE_COMPACT_OPTION},
 
 	{NULL, 0, NULL, 0},
 };
@@ -661,6 +668,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 +1775,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 && wim) {
+		do_metadata_not_found_warning(wimfile, &info);
 	}
 out_wimlib_free:
 	wimlib_free(wim);
@@ -1937,6 +1957,14 @@ imagex_capture_or_append(int argc, tchar **argv, int cmd)
 		case IMAGEX_WIMBOOT_OPTION:
 			add_flags |= WIMLIB_ADD_FLAG_WIMBOOT;
 			break;
+		case IMAGEX_UNSAFE_COMPACT_OPTION:
+			if (cmd != CMD_APPEND) {
+				imagex_error(T("'--unsafe-compact' is only "
+					       "valid for append!"));
+				goto out_err;
+			}
+			write_flags |= WIMLIB_WRITE_FLAG_UNSAFE_COMPACT;
+			break;
 		default:
 			goto out_usage;
 		}
@@ -2094,11 +2122,21 @@ imagex_capture_or_append(int argc, tchar **argv, int cmd)
 		ret = wimlib_set_output_chunk_size(wim, chunk_size);
 		if (ret)
 			goto out_free_wim;
-	} else if ((add_flags & WIMLIB_ADD_FLAG_WIMBOOT) &&
-		   compression_type == WIMLIB_COMPRESSION_TYPE_XPRESS) {
-		ret = wimlib_set_output_chunk_size(wim, 4096);
-		if (ret)
-			goto out_free_wim;
+	} else if ((add_flags & WIMLIB_ADD_FLAG_WIMBOOT)) {
+
+		int ctype = compression_type;
+
+		if (cmd == CMD_APPEND) {
+			struct wimlib_wim_info info;
+			wimlib_get_wim_info(wim, &info);
+			ctype = info.compression_type;
+		}
+
+		if (ctype == WIMLIB_COMPRESSION_TYPE_XPRESS) {
+			ret = wimlib_set_output_chunk_size(wim, 4096);
+			if (ret)
+				goto out_free_wim;
+		}
 	}
 	if (solid_ctype != WIMLIB_COMPRESSION_TYPE_INVALID) {
 		ret = wimlib_set_output_pack_compression_type(wim, solid_ctype);
@@ -2339,6 +2377,9 @@ imagex_delete(int argc, tchar **argv, int cmd)
 		case IMAGEX_SOFT_OPTION:
 			write_flags |= WIMLIB_WRITE_FLAG_SOFT_DELETE;
 			break;
+		case IMAGEX_UNSAFE_COMPACT_OPTION:
+			write_flags |= WIMLIB_WRITE_FLAG_UNSAFE_COMPACT;
+			break;
 		default:
 			goto out_usage;
 		}
@@ -2639,6 +2680,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 +2693,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 +2718,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 +2742,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
@@ -2803,6 +2864,9 @@ imagex_export(int argc, tchar **argv, int cmd)
 		case IMAGEX_WIMBOOT_OPTION:
 			export_flags |= WIMLIB_EXPORT_FLAG_WIMBOOT;
 			break;
+		case IMAGEX_UNSAFE_COMPACT_OPTION:
+			write_flags |= WIMLIB_WRITE_FLAG_UNSAFE_COMPACT;
+			break;
 		default:
 			goto out_usage;
 		}
@@ -2892,6 +2956,13 @@ imagex_export(int argc, tchar **argv, int cmd)
 			goto out_free_src_wim;
 		}
 
+		if (write_flags & WIMLIB_WRITE_FLAG_UNSAFE_COMPACT) {
+			imagex_error(T("'--unsafe-compact' is only valid when "
+				       "exporting to an existing WIM file!"));
+			ret = -1;
+			goto out_free_src_wim;
+		}
+
 		/* dest_wimfile is not an existing file, so create a new WIM. */
 
 		if (compression_type == WIMLIB_COMPRESSION_TYPE_INVALID) {
@@ -2969,6 +3040,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 +3239,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 +3678,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);
@@ -3690,6 +3772,9 @@ imagex_optimize(int argc, tchar **argv, int cmd)
 		case IMAGEX_NOT_PIPABLE_OPTION:
 			write_flags |= WIMLIB_WRITE_FLAG_NOT_PIPABLE;
 			break;
+		case IMAGEX_UNSAFE_COMPACT_OPTION:
+			write_flags |= WIMLIB_WRITE_FLAG_UNSAFE_COMPACT;
+			break;
 		default:
 			goto out_usage;
 		}
@@ -3987,6 +4072,9 @@ imagex_update(int argc, tchar **argv, int cmd)
 		case IMAGEX_NO_REPLACE_OPTION:
 			default_add_flags |= WIMLIB_ADD_FLAG_NO_REPLACE;
 			break;
+		case IMAGEX_UNSAFE_COMPACT_OPTION:
+			write_flags |= WIMLIB_WRITE_FLAG_UNSAFE_COMPACT;
+			break;
 		default:
 			goto out_usage;
 		}