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

diff --git a/src/dentry.c b/src/dentry.c
index 16d9b416..5b19f6f5 100644
--- a/src/dentry.c
+++ b/src/dentry.c
@@ -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)
 {
@@ -573,13 +585,10 @@ get_parent_dentry(WIMStruct *w, const tchar *path)
 int
 print_dentry_full_path(struct wim_dentry *dentry, void *_ignore)
 {
-	tchar *full_path = dentry_full_path(dentry);
-	if (!full_path)
-		return WIMLIB_ERR_NOMEM;
-	tprintf(T("%"TS"\n"), full_path);
-	FREE(full_path);
-	dentry->_full_path = 0;
-	dentry->full_path_nbytes = 0;
+	int ret = calculate_dentry_full_path(dentry);
+	if (ret)
+		return ret;
+	tprintf(T("%"TS"\n"), dentry->_full_path);
 	return 0;
 }
 
@@ -692,8 +701,8 @@ new_timeless_inode()
 	if (inode) {
 		inode->i_security_id = -1;
 		inode->i_nlink = 1;
-	#ifdef WITH_FUSE
 		inode->i_next_stream_id = 1;
+	#ifdef WITH_FUSE
 		if (pthread_mutex_init(&inode->i_mutex, NULL) != 0) {
 			ERROR_WITH_ERRNO("Error initializing mutex");
 			FREE(inode);
@@ -1025,9 +1034,7 @@ do_inode_add_ads(struct wim_inode *inode, const void *stream_name,
 	new_entry = &inode->i_ads_entries[num_ads - 1];
 	if (init_ads_entry(new_entry, stream_name, stream_name_nbytes, is_utf16le))
 		return NULL;
-#ifdef WITH_FUSE
 	new_entry->stream_id = inode->i_next_stream_id++;
-#endif
 	inode->i_num_ads = num_ads;
 	return new_entry;
 }
@@ -1201,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.
  *
@@ -1328,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
@@ -1445,19 +1476,16 @@ read_dentry(const u8 metadata_resource[], u64 metadata_resource_len,
 
 	p = get_bytes(p, SHA1_HASH_SIZE, inode->i_hash);
 
-	/*
-	 * I don't know what's going on here.  It seems like M$ screwed up the
+	/* I don't know what's going on here.  It seems like M$ screwed up the
 	 * reparse points, then put the fields in the same place and didn't
-	 * document it.  The WIM_HDR_FLAG_RP_FIX flag in the WIM header might
-	 * have something to do with this, but it's not documented.
-	 */
+	 * document it.  */
 	if (inode->i_attributes & FILE_ATTRIBUTE_REPARSE_POINT) {
-		/* ??? */
 		p += 4;
 		p = get_u32(p, &inode->i_reparse_tag);
 		p += 4;
 	} else {
-		p = get_u32(p, &inode->i_reparse_tag);
+		p += 4;
+		/* i_reparse_tag is irrelevant; just leave it at 0. */
 		p = get_u64(p, &inode->i_ino);
 	}
 
@@ -1504,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 */
@@ -1554,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);
 	}
 
 	/*