From: Eric Biggers <ebiggers3@gmail.com>
Date: Tue, 21 May 2013 17:03:43 +0000 (-0500)
Subject: wimlib-imagex append: Generate unique name if default name conflicts
X-Git-Tag: v1.4.1~62
X-Git-Url: https://wimlib.net/git/?p=wimlib;a=commitdiff_plain;h=f69ae15310f292995d2f0838c91ee61b721c356c

wimlib-imagex append: Generate unique name if default name conflicts
---

diff --git a/programs/imagex.c b/programs/imagex.c
index e5241358..1a3cbbd5 100644
--- a/programs/imagex.c
+++ b/programs/imagex.c
@@ -1659,6 +1659,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) {
@@ -1730,13 +1731,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;
@@ -1815,6 +1819,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