X-Git-Url: https://wimlib.net/git/?p=wimlib;a=blobdiff_plain;f=src%2Fdentry.h;h=469946f8019b812b4db66d0837b8ebb390bd201a;hp=ac4454f9e442bc014232468a42c6ba03c050bc92;hb=72cc9a31b518ca830fcc7a2ed74a20415d6e13ec;hpb=868d370b126b2ab1f4c14fddb79d2b5ef8698964

diff --git a/src/dentry.h b/src/dentry.h
index ac4454f9..469946f8 100644
--- a/src/dentry.h
+++ b/src/dentry.h
@@ -3,32 +3,38 @@
 
 #include "util.h"
 #include "config.h"
+#include "list.h"
 #include <string.h>
 
+
+struct stat;
+struct lookup_table;
+typedef struct WIMStruct WIMStruct;
+
 /* Size of the struct dentry up to and including the file_name_len. */
 #define WIM_DENTRY_DISK_SIZE    102
 
 #define WIM_ADS_ENTRY_DISK_SIZE 38
 
-#ifndef WITH_NTFS_3G
+#ifndef WIM_HASH_SIZE
+#define WIM_HASH_SIZE 20
+#endif
+
 /* 
  * Reparse tags documented at 
  * http://msdn.microsoft.com/en-us/library/dd541667(v=prot.10).aspx
- *
- * IO_REPARSE_TAG_SYMLINK is the only one we really care about.
  */
-#define IO_REPARSE_TAG_RESERVED_ZERO	0x00000000
-#define IO_REPARSE_TAG_RESERVED_ONE	0x00000001
-#define IO_REPARSE_TAG_MOUNT_POINT	0xA0000003
-#define IO_REPARSE_TAG_HSM		0xC0000004
-#define IO_REPARSE_TAG_HSM2		0x80000006
-#define IO_REPARSE_TAG_DRIVER_EXTENDER	0x80000005
-#define IO_REPARSE_TAG_SIS		0x80000007
-#define IO_REPARSE_TAG_DFS		0x8000000A
-#define IO_REPARSE_TAG_DFSR		0x80000012
-#define IO_REPARSE_TAG_FILTER_MANAGER	0x8000000B
-#define IO_REPARSE_TAG_SYMLINK		0xA000000C
-#endif /* !WITH_NTFS_3G */
+#define WIM_IO_REPARSE_TAG_RESERVED_ZERO	0x00000000
+#define WIM_IO_REPARSE_TAG_RESERVED_ONE		0x00000001
+#define WIM_IO_REPARSE_TAG_MOUNT_POINT		0xA0000003
+#define WIM_IO_REPARSE_TAG_HSM			0xC0000004
+#define WIM_IO_REPARSE_TAG_HSM2			0x80000006
+#define WIM_IO_REPARSE_TAG_DRIVER_EXTENDER	0x80000005
+#define WIM_IO_REPARSE_TAG_SIS			0x80000007
+#define WIM_IO_REPARSE_TAG_DFS			0x8000000A
+#define WIM_IO_REPARSE_TAG_DFSR			0x80000012
+#define WIM_IO_REPARSE_TAG_FILTER_MANAGER	0x8000000B
+#define WIM_IO_REPARSE_TAG_SYMLINK		0xA000000C
 
 #define FILE_ATTRIBUTE_READONLY            0x00000001
 #define FILE_ATTRIBUTE_HIDDEN              0x00000002
@@ -55,7 +61,7 @@ struct ads_entry {
 	u16 stream_name_len;
 
 	/* Length of stream name (UTF-8) */
-	u16 stream_name_len_utf8;
+	u16 stream_name_utf8_len;
 
 	/* Stream name (UTF-16) */
 	char *stream_name;
@@ -70,6 +76,22 @@ static inline u64 ads_entry_length(const struct ads_entry *entry)
 	return (len + 7) & ~7;
 }
 
+static inline void destroy_ads_entry(struct ads_entry *entry)
+{
+	FREE(entry->stream_name);
+	FREE(entry->stream_name_utf8);
+	memset(entry, 0, sizeof(entry));
+}
+
+static inline bool ads_entry_has_name(const struct ads_entry *entry,
+				      const char *name, size_t name_len)
+{
+	if (entry->stream_name_utf8_len != name_len)
+		return false;
+	return memcmp(entry->stream_name_utf8, name, name_len) == 0;
+}
+
+
 /* In-memory structure for a directory entry.  There is a directory tree for
  * each image in the WIM.  */
 struct dentry {
@@ -173,8 +195,45 @@ struct dentry {
 	/* Number of references to the dentry tree itself, as in multiple
 	 * WIMStructs */
 	int refcnt;
+
+	/* List of dentries in the hard link set */
+	struct list_head link_group_list;
 };
 
+/* Return hash of the "unnamed" (default) data stream. */
+static inline const u8 *dentry_hash(const struct dentry *dentry)
+{
+	/* If there are alternate data streams, the dentry hash field is zeroed
+	 * out, and we need to find the hash in the un-named data stream (should
+	 * be the first one, but check them in order just in case, and fall back
+	 * to the dentry hash field if we can't find an unnamed data stream). */
+	for (u16 i = 0; i < dentry->num_ads; i++)
+		if (dentry->ads_entries[i].stream_name_len == 0)
+			return dentry->ads_entries[i].hash;
+	return dentry->hash;
+}
+
+static inline size_t dentry_link_group_size(const struct dentry *dentry)
+{
+	size_t size = 0;
+	struct list_head *list;
+	list_for_each(list, &dentry->link_group_list)
+		size++;
+	if (size == 0)
+		size = 1;
+	return size;
+}
+
+extern struct ads_entry *dentry_get_ads_entry(struct dentry *dentry,
+					      const char *stream_name);
+
+extern struct ads_entry *dentry_add_ads(struct dentry *dentry,
+					const char *stream_name);
+
+extern void dentry_remove_ads(struct dentry *dentry, struct ads_entry *entry);
+
+extern const char *path_stream_name(const char *path);
+
 extern u64 dentry_total_length(const struct dentry *dentry);
 
 extern void stbuf_to_dentry(const struct stat *stbuf, struct dentry *dentry);
@@ -193,6 +252,7 @@ extern int for_dentry_in_tree_depth(struct dentry *root,
 extern int calculate_dentry_full_path(struct dentry *dentry, void *ignore);
 extern void calculate_subdir_offsets(struct dentry *dentry, u64 *subdir_offset_p);
 extern int change_dentry_name(struct dentry *dentry, const char *new_name);
+extern int change_ads_name(struct ads_entry *entry, const char *new_name);
 
 extern void unlink_dentry(struct dentry *dentry);
 extern void link_dentry(struct dentry *dentry, struct dentry *parent);
@@ -230,19 +290,11 @@ extern int read_dentry_tree(const u8 metadata_resource[],
 
 extern u8 *write_dentry_tree(const struct dentry *tree, u8 *p);
 
+extern int dentry_set_symlink_buf(struct dentry *dentry,
+				  const u8 symlink_buf_hash[]);
+
 /* Inline utility functions for WIMDentries */
 
-/*
- * Returns true if @dentry has the UTF-8 file name @name that has length
- * @name_len.
- */
-static inline bool dentry_has_name(const struct dentry *dentry, const char *name, 
-				   size_t name_len)
-{
-	if (dentry->file_name_utf8_len != name_len)
-		return false;
-	return memcmp(dentry->file_name_utf8, name, name_len) == 0;
-}
 
 static inline bool dentry_is_root(const struct dentry *dentry)
 {
@@ -261,12 +313,22 @@ static inline bool dentry_is_only_child(const struct dentry *dentry)
 
 static inline bool dentry_is_directory(const struct dentry *dentry)
 {
-	return (dentry->attributes & FILE_ATTRIBUTE_DIRECTORY) != 0;
+	return (dentry->attributes & FILE_ATTRIBUTE_DIRECTORY)
+		&& !(dentry->attributes & FILE_ATTRIBUTE_REPARSE_POINT);
+}
+
+/* For our purposes, we consider "real" symlinks and "junction points" to both
+ * be symlinks. */
+static inline bool dentry_is_symlink(const struct dentry *dentry)
+{
+	return (dentry->attributes & FILE_ATTRIBUTE_REPARSE_POINT)
+		&& ((dentry->reparse_tag == WIM_IO_REPARSE_TAG_SYMLINK) ||
+		     dentry->reparse_tag == WIM_IO_REPARSE_TAG_MOUNT_POINT);
 }
 
 static inline bool dentry_is_regular_file(const struct dentry *dentry)
 {
-	return !dentry_is_directory(dentry);
+	return !dentry_is_directory(dentry) && !dentry_is_symlink(dentry);
 }
 
 static inline bool dentry_is_empty_directory(const struct dentry *dentry)