ntfs-3g_apply.c: fix inode reuse

[wimlib] / src / dentry.c

diff --git a/src/dentry.c b/src/dentry.c
index 01945b2a33062b80b8a53f1c830ab8441d30795e..8b00da14029815122dcb30d4076a676aaa48f21a 100644 (file)
--- a/src/dentry.c
+++ b/src/dentry.c
@@ -1227,6 +1227,12 @@ assign_stream_types_encrypted(struct wim_inode *inode)
  * There will be an unnamed data stream, a reparse point stream, or both an
  * unnamed data stream and a reparse point stream.  In addition, there may be
  * named data streams.
+ *
+ * NOTE: if the file has a reparse point stream or at least one named data
+ * stream, then WIMGAPI puts *all* streams in the extra stream entries and
+ * leaves the default stream hash zeroed.  wimlib now does the same.  However,
+ * for input we still support the default hash field being used, since wimlib
+ * used to use it and MS software is somewhat accepting of it as well.
  */
 static void
 assign_stream_types_unencrypted(struct wim_inode *inode)
@@ -1241,7 +1247,10 @@ assign_stream_types_unencrypted(struct wim_inode *inode)
                if (stream_is_named(strm)) {
                        /* Named data stream  */
                        strm->stream_type = STREAM_TYPE_DATA;
-               } else if (!is_zero_hash(strm->_stream_hash)) {
+               } else if (i != 0 || !is_zero_hash(strm->_stream_hash)) {
+                       /* Unnamed stream in the extra stream entries, OR the
+                        * default stream in the dentry provided that it has a
+                        * nonzero hash.  */
                        if ((inode->i_attributes & FILE_ATTRIBUTE_REPARSE_POINT) &&
                            !found_reparse_point_stream) {
                                found_reparse_point_stream = true;
@@ -1250,17 +1259,21 @@ assign_stream_types_unencrypted(struct wim_inode *inode)
                                found_unnamed_data_stream = true;
                                strm->stream_type = STREAM_TYPE_DATA;
                        }
-               } else {
-                       /* If no stream name is specified and the hash is zero,
-                        * then remember this stream for later so that we can
-                        * assign it to the unnamed data stream if we don't find
-                        * a better candidate.  */
+               } else if (!unnamed_stream_with_zero_hash) {
                        unnamed_stream_with_zero_hash = strm;
                }
        }
 
-       if (!found_unnamed_data_stream && unnamed_stream_with_zero_hash != NULL)
-               unnamed_stream_with_zero_hash->stream_type = STREAM_TYPE_DATA;
+       if (unnamed_stream_with_zero_hash) {
+               int type = STREAM_TYPE_UNKNOWN;
+               if ((inode->i_attributes & FILE_ATTRIBUTE_REPARSE_POINT) &&
+                   !found_reparse_point_stream) {
+                       type = STREAM_TYPE_REPARSE_POINT;
+               } else if (!found_unnamed_data_stream) {
+                       type = STREAM_TYPE_DATA;
+               }
+               unnamed_stream_with_zero_hash->stream_type = type;
+       }
 }
 
 /*
@@ -1642,8 +1655,6 @@ read_dentry_tree(const u8 *buf, size_t buf_len,
        int ret;
        struct wim_dentry *root;
 
-       DEBUG("Reading dentry tree (root_offset=%"PRIu64")", root_offset);
-
        ret = read_dentry(buf, buf_len, &root_offset, &root);
        if (ret)
                return ret;
@@ -1890,10 +1901,6 @@ write_dir_dentries(struct wim_dentry *dir, void *_pp)
 u8 *
 write_dentry_tree(struct wim_dentry *root, u8 *p)
 {
-       DEBUG("Writing dentry tree.");
-
-       wimlib_assert(root != NULL);
-
        /* write root dentry and end-of-directory entry following it */
        p = write_dentry(root, p);
        *(u64*)p = 0;