X-Git-Url: https://wimlib.net/git/?a=blobdiff_plain;f=src%2Fdentry.c;h=5b19f6f51af2ac59a4c63cff51e61c950c13c3ee;hb=78da4e026457e507e0d4fc930dcfe2855075dc11;hp=e9826b55d1e4f1ae9911e1b5dcdf0d793a1e0489;hpb=cf373e59a7f6ff7d1fd007c1f22defe508aa67d4;p=wimlib

diff --git a/src/dentry.c b/src/dentry.c
index e9826b55..5b19f6f5 100644
--- a/src/dentry.c
+++ b/src/dentry.c
@@ -275,7 +275,7 @@ for_dentry_in_tree_depth(struct wim_dentry *root,
 
 /* Calculate the full path of @dentry.  The full path of its parent must have
  * already been calculated, or it must be the root dentry. */
-int
+static int
 calculate_dentry_full_path(struct wim_dentry *dentry)
 {
 	tchar *full_path;
@@ -347,6 +347,18 @@ calculate_dentry_full_path(struct wim_dentry *dentry)
 	return 0;
 }
 
+static int
+do_calculate_dentry_full_path(struct wim_dentry *dentry, void *_ignore)
+{
+	return calculate_dentry_full_path(dentry);
+}
+
+int
+calculate_dentry_tree_full_paths(struct wim_dentry *root)
+{
+	return for_dentry_in_tree(root, do_calculate_dentry_full_path, NULL);
+}
+
 tchar *
 dentry_full_path(struct wim_dentry *dentry)
 {
@@ -577,9 +589,6 @@ print_dentry_full_path(struct wim_dentry *dentry, void *_ignore)
 	if (ret)
 		return ret;
 	tprintf(T("%"TS"\n"), dentry->_full_path);
-	FREE(dentry->_full_path);
-	dentry->_full_path = NULL;
-	dentry->full_path_nbytes = 0;
 	return 0;
 }
 
@@ -1199,6 +1208,29 @@ inode_set_unix_data(struct wim_inode *inode, uid_t uid, gid_t gid, mode_t mode,
 }
 #endif /* !__WIN32__ */
 
+static void
+replace_forbidden_characters(utf16lechar *name)
+{
+	utf16lechar *p;
+
+	for (p = name; *p; p++) {
+	#ifdef __WIN32__
+		if (wcschr(L"<>:\"/\\|?*", (wchar_t)*p))
+	#else
+		if (*p == '/') {
+	#endif
+			if (name) {
+				WARNING("File, directory, or stream name \"%"WS"\"\n"
+					"          contains forbidden characters; "
+					"replacing them with Unicode codepoint U+001A",
+					name);
+				name = NULL;
+			}
+			*p = 0x1a;
+		}
+	}
+}
+
 /*
  * Reads the alternate data stream entries of a WIM dentry.
  *
@@ -1326,6 +1358,7 @@ read_ads_entries(const u8 *p, struct wim_inode *inode, u64 remaining_size)
 			get_bytes(p, cur_entry->stream_name_nbytes,
 				  cur_entry->stream_name);
 			cur_entry->stream_name[cur_entry->stream_name_nbytes / 2] = 0;
+			replace_forbidden_characters(cur_entry->stream_name);
 		}
 		/* It's expected that the size of every ADS entry is a multiple
 		 * of 8.  However, to be safe, I'm allowing the possibility of
@@ -1499,6 +1532,7 @@ read_dentry(const u8 metadata_resource[], u64 metadata_resource_len,
 			WARNING("File name in WIM dentry \"%"WS"\" is not "
 				"null-terminated!", file_name);
 		}
+		replace_forbidden_characters(file_name);
 	}
 
 	/* Align the calculated size */
@@ -1549,6 +1583,7 @@ read_dentry(const u8 metadata_resource[], u64 metadata_resource_len,
 			WARNING("Short name in WIM dentry \"%"WS"\" is not "
 				"null-terminated!", file_name);
 		}
+		replace_forbidden_characters(short_name);
 	}
 
 	/*