]> wimlib.net Git - wimlib/commitdiff
ntfs-3g_capture.c: Allow multiple empty unnamed streams
authorEric Biggers <ebiggers3@gmail.com>
Tue, 21 May 2013 05:26:08 +0000 (00:26 -0500)
committerEric Biggers <ebiggers3@gmail.com>
Tue, 21 May 2013 05:26:08 +0000 (00:26 -0500)
src/ntfs-3g_capture.c

index 757c9d3ee42a04c94037344525b91e714449fff5..978c2b49d8a8ee16d165b6fb4ea5fb462e5eec67 100644 (file)
@@ -267,13 +267,18 @@ capture_ntfs_streams(struct wim_inode *inode,
                        /* Unnamed data stream.  Put the reference to it in the
                         * dentry's inode. */
                        if (inode->i_lte) {
-                               ERROR("Found two un-named data streams for `%s'",
-                                     path);
-                               ret = WIMLIB_ERR_NTFS_3G;
-                               goto out_free_lte;
+                               if (lte) {
+                                       ERROR("Found two un-named data streams for \"%s\" "
+                                             "(sizes = %"PRIu64", %"PRIu64")",
+                                             path, wim_resource_size(inode->i_lte),
+                                             wim_resource_size(lte));
+                                       ret = WIMLIB_ERR_NTFS_3G;
+                                       goto out_free_lte;
+                               }
+                       } else {
+                               stream_id = 0;
+                               inode->i_lte = lte;
                        }
-                       stream_id = 0;
-                       inode->i_lte = lte;
                } else {
                        /* Named data stream.  Put the reference to it in the
                         * alternate data stream entries */