Remove dentry.dos_name_invalid

This flag is no longer used.  The extraction code just extracts the DOS
names it finds, which is the best we can do.

diff --git a/include/wimlib/dentry.h b/include/wimlib/dentry.h
index b1fba029233396cf69eb1a4640c4482a08430c89..0466fb5ad17862ac45edb5d9061859a78264a6d2 100644 (file)
--- a/include/wimlib/dentry.h
+++ b/include/wimlib/dentry.h
@@ -97,13 +97,6 @@ struct wim_dentry {
         * always be 0.  */
        u8 is_win32_name : 1;
 
-       /* When verifying the dentry tree after reading it into memory, this
-        * flag will be set on all dentries in a hard link group that have a
-        * nonempty DOS name except one.  This is because it is supposed to be
-        * illegal (on NTFS, at least) for a single inode to have multiple DOS
-        * names.  */
-       u8 dos_name_invalid : 1;
-
        u8 tmp_flag : 1;
 
        u8 was_hardlinked : 1;

diff --git a/src/inode.c b/src/inode.c
index 539d5667b5949952a3ea65b9b78444f719fef44e..34508659fa6724d56142552960a659df273a69ea 100644 (file)
--- a/src/inode.c
+++ b/src/inode.c
@@ -825,30 +825,6 @@ verify_inode(struct wim_inode *inode, const struct wim_security_data *sd)
                        inode_first_full_path(inode), num_unnamed_streams);
        }
 
-       /* Files cannot have multiple DOS names, even if they have multiple
-        * names in multiple directories (i.e. hard links).
-        * Source: NTFS-3g authors. */
-       struct wim_dentry *dentry_with_dos_name = NULL;
-       inode_for_each_dentry(dentry, inode) {
-               if (dentry_has_short_name(dentry)) {
-                       if (dentry_with_dos_name) {
-                               /* This was previously an error, but if we
-                                * capture a WIM from UDF on Windows, hard links
-                                * are supported but DOS names are automatically
-                                * generated for all names for an inode.  */
-                       #if 0
-                               ERROR("Hard-linked file has a DOS name at "
-                                     "both `%"TS"' and `%"TS"'",
-                                     dentry_full_path(dentry_with_dos_name),
-                                     dentry_full_path(dentry));
-                               return WIMLIB_ERR_INVALID_METADATA_RESOURCE;
-                       #else
-                               dentry->dos_name_invalid = 1;
-                       #endif
-                       }
-                       dentry_with_dos_name = dentry;
-               }
-       }
        return 0;
 }