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

diff --git a/src/dentry.h b/src/dentry.h
index dc80a14b..ac4454f9 100644
--- a/src/dentry.h
+++ b/src/dentry.h
@@ -2,10 +2,73 @@
 #define _WIMLIB_DENTRY_H
 
 #include "util.h"
+#include "config.h"
 #include <string.h>
 
 /* Size of the struct dentry up to and including the file_name_len. */
-#define WIM_DENTRY_DISK_SIZE 102
+#define WIM_DENTRY_DISK_SIZE    102
+
+#define WIM_ADS_ENTRY_DISK_SIZE 38
+
+#ifndef WITH_NTFS_3G
+/* 
+ * 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 FILE_ATTRIBUTE_READONLY            0x00000001
+#define FILE_ATTRIBUTE_HIDDEN              0x00000002
+#define FILE_ATTRIBUTE_SYSTEM              0x00000004
+#define FILE_ATTRIBUTE_DIRECTORY           0x00000010
+#define FILE_ATTRIBUTE_ARCHIVE             0x00000020
+#define FILE_ATTRIBUTE_DEVICE              0x00000040
+#define FILE_ATTRIBUTE_NORMAL              0x00000080
+#define FILE_ATTRIBUTE_TEMPORARY           0x00000100
+#define FILE_ATTRIBUTE_SPARSE_FILE         0x00000200
+#define FILE_ATTRIBUTE_REPARSE_POINT       0x00000400
+#define FILE_ATTRIBUTE_COMPRESSED          0x00000800
+#define FILE_ATTRIBUTE_OFFLINE             0x00001000
+#define FILE_ATTRIBUTE_NOT_CONTENT_INDEXED 0x00002000
+#define FILE_ATTRIBUTE_ENCRYPTED           0x00004000
+#define FILE_ATTRIBUTE_VIRTUAL             0x00010000
+
+/* Alternate data stream entry */
+struct ads_entry {
+	/* SHA-1 message digest of stream contents */
+	u8 hash[WIM_HASH_SIZE];
+
+	/* Length of stream name (UTF-16) */
+	u16 stream_name_len;
+
+	/* Length of stream name (UTF-8) */
+	u16 stream_name_len_utf8;
+
+	/* Stream name (UTF-16) */
+	char *stream_name;
+
+	/* Stream name (UTF-8) */
+	char *stream_name_utf8;
+};
+
+static inline u64 ads_entry_length(const struct ads_entry *entry)
+{
+	u64 len = WIM_ADS_ENTRY_DISK_SIZE + entry->stream_name_len + 2;
+	return (len + 7) & ~7;
+}
 
 /* In-memory structure for a directory entry.  There is a directory tree for
  * each image in the WIM.  */
@@ -36,17 +99,15 @@ struct dentry {
 	/* The index of the node in the security table that contains this file's
 	 * security information.  If -1, no security information exists for this
 	 * file.  */
-#ifdef ENABLE_SECURITY_DATA
 	int32_t security_id;
-#endif
 
 	/* The offset, from the start of the metadata section, of this directory
 	 * entry's child files.  0 if the directory entry has no children. */
 	u64 subdir_offset;
 
 	/* Reserved for future disuse.  Currently ignoring these fields. */
-	//u64 unused1;
-	//u64 unused2;
+	u64 unused1;
+	u64 unused2;
 
 	/* Timestamps for the entry.  The timestamps are the number of
 	 * 100-nanosecond intervals that have elapsed since 12:00 A.M., January
@@ -58,13 +119,16 @@ struct dentry {
 	/* A hash of the file's contents. */
 	u8 hash[WIM_HASH_SIZE];
 
-	/* Identity of a reparse point (whatever that is).  Currently ignoring
-	 * this field*/
-	//u32 reparse_tag;
+	/* Identity of a reparse point.  See
+	 * http://msdn.microsoft.com/en-us/library/windows/desktop/aa365503(v=vs.85).aspx
+	 * for what a reparse point is. */
+	u32 reparse_tag;
 
 	/* Although M$'s documentation does not tell you this, it seems that the
 	 * reparse_reserved field does not actually exist.  So the hard_link
-	 * field directly follows the reparse_tag on disk. */
+	 * field directly follows the reparse_tag on disk.  EXCEPT when the
+	 * dentry is actually a reparse point... well, just take a look at the
+	 * read_dentry() function. */
 	//u32 reparse_reserved;
 
 	/* If the reparse_reserved field existed, there would be a 4-byte gap
@@ -75,9 +139,8 @@ struct dentry {
 	 * the set will share the same value for this field. */
 	u64 hard_link;
 
-	/* Number of WIMStreamEntry structures that follow this struct dentry.
-	 * Currently ignoring this field. */
-	//u16 streams;
+	/* Number of alternate data streams associated with this file. */
+	u16 num_ads;
 
 	/* Length of short filename, in bytes, not including the terminating
 	 * zero wide-character. */
@@ -104,29 +167,15 @@ struct dentry {
 	char *full_path_utf8;
 	u32   full_path_utf8_len;
 
-	/* Stream entries for this dentry. Currently being ignored. */
-	//struct WIMStreamEntry *stream_entries;
+	/* Alternate stream entries for this dentry. */
+	struct ads_entry *ads_entries;
 
 	/* Number of references to the dentry tree itself, as in multiple
 	 * WIMStructs */
 	int refcnt;
 };
 
-#define WIM_FILE_ATTRIBUTE_READONLY            0x1
-#define WIM_FILE_ATTRIBUTE_HIDDEN              0x2
-#define WIM_FILE_ATTRIBUTE_SYSTEM              0x4
-#define WIM_FILE_ATTRIBUTE_DIRECTORY           0x10
-#define WIM_FILE_ATTRIBUTE_ARCHIVE             0x20
-#define WIM_FILE_ATTRIBUTE_DEVICE              0x40
-#define WIM_FILE_ATTRIBUTE_NORMAL              0x80
-#define WIM_FILE_ATTRIBUTE_TEMPORARY           0x100
-#define WIM_FILE_ATTRIBUTE_SPARSE_FILE         0x200
-#define WIM_FILE_ATTRIBUTE_REPARSE_POINT       0x400
-#define WIM_FILE_ATTRIBUTE_COMPRESSED          0x800
-#define WIM_FILE_ATTRIBUTE_OFFLINE             0x1000
-#define WIM_FILE_ATTRIBUTE_NOT_CONTENT_INDEXED 0x2000
-#define WIM_FILE_ATTRIBUTE_ENCRYPTED           0x4000
-#define WIM_FILE_ATTRIBUTE_VIRTUAL             0x10000
+extern u64 dentry_total_length(const struct dentry *dentry);
 
 extern void stbuf_to_dentry(const struct stat *stbuf, struct dentry *dentry);
 
@@ -160,9 +209,11 @@ extern void init_dentry(struct dentry *dentry, const char *name);
 extern struct dentry *new_dentry(const char *name);
 
 extern void free_dentry(struct dentry *dentry);
-extern void free_dentry_tree(struct dentry *root, struct lookup_table *lookup_table, 
-					bool decrement_refcnt);
+extern void free_dentry_tree(struct dentry *root,
+			     struct lookup_table *lookup_table, 
+			     bool lt_decrement_refcnt);
 extern int increment_dentry_refcnt(struct dentry *dentry, void *ignore);
+extern int decrement_dentry_refcnt(struct dentry *dentry, void *ignore);
 
 extern void calculate_dir_tree_statistics(struct dentry *root, 
 					  struct lookup_table *table, 
@@ -210,7 +261,7 @@ static inline bool dentry_is_only_child(const struct dentry *dentry)
 
 static inline bool dentry_is_directory(const struct dentry *dentry)
 {
-	return (dentry->attributes & WIM_FILE_ATTRIBUTE_DIRECTORY) != 0;
+	return (dentry->attributes & FILE_ATTRIBUTE_DIRECTORY) != 0;
 }
 
 static inline bool dentry_is_regular_file(const struct dentry *dentry)