capture_ntfs_streams(): Warn, not error, if multiple unnamed streams
authorEric Biggers <ebiggers3@gmail.com>
Wed, 6 Feb 2013 01:38:30 +0000 (19:38 -0600)
committerEric Biggers <ebiggers3@gmail.com>
Wed, 6 Feb 2013 01:38:30 +0000 (19:38 -0600)
src/ntfs-capture.c

index dcff1fe4e720f31bf4590e13c7cf604a5afbac9d..b3f79eb4f4ce43139f234ad49582b52161c0240b 100644 (file)
@@ -349,6 +349,7 @@ static int capture_ntfs_streams(struct wim_dentry *dentry, ntfs_inode *ni,
                if (name_length == 0) {
                        /* Unnamed data stream.  Put the reference to it in the
                         * dentry's inode. */
+               #if 0
                        if (dentry->d_inode->i_lte) {
                                ERROR("Found two un-named data streams for "
                                      "`%s'", path);
@@ -356,6 +357,15 @@ static int capture_ntfs_streams(struct wim_dentry *dentry, ntfs_inode *ni,
                                goto out_free_lte;
                        }
                        dentry->d_inode->i_lte = lte;
+               #else
+                       if (dentry->d_inode->i_lte) {
+                               WARNING("Found two un-named data streams for "
+                                       "`%s'", path);
+                               free_lookup_table_entry(lte);
+                       } else {
+                               dentry->d_inode->i_lte = lte;
+                       }
+               #endif
                } else {
                        /* Named data stream.  Put the reference to it in the
                         * alternate data stream entries */