dentry_to_stbuf() fix

[wimlib] / src / dentry.h

diff --git a/src/dentry.h b/src/dentry.h
index 6c260fc2538f37f305b84c49f2d022156ada4938..469946f8019b812b4db66d0837b8ebb390bd201a 100644 (file)
--- a/src/dentry.h
+++ b/src/dentry.h
@@ -3,18 +3,26 @@
 
 #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 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 WIM_IO_REPARSE_TAG_RESERVED_ZERO       0x00000000
 #define WIM_IO_REPARSE_TAG_RESERVED_ONE                0x00000001
@@ -53,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;
@@ -68,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 {
@@ -171,6 +195,9 @@ 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. */
@@ -186,6 +213,27 @@ static inline const u8 *dentry_hash(const struct dentry *dentry)
        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);
@@ -204,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);
@@ -241,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)
 {
@@ -272,18 +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_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)