Adjust full path calculations

[wimlib] / src / dentry.c

diff --git a/src/dentry.c b/src/dentry.c
index 16d9b416e8da2cdaa03cb6e921debe609810f3c0..b0ebf64dab19a10d81350c10f3f0386eb849aa2c 100644 (file)
--- 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,12 +585,12 @@ 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;
+       int ret = calculate_dentry_full_path(dentry);
+       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;
 }
@@ -692,8 +704,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 +1037,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;
 }
@@ -1445,19 +1455,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);
        }