ntfs capture: can no longer get DOS name from multi-linked files

diff --git a/doc/imagex-capture.1.in b/doc/imagex-capture.1.in
index d8dc92a2dd816fa809aa67658fbe61054111af03..df4685adfbd414f39be93f033a700f37f9d75436 100644 (file)
--- a/doc/imagex-capture.1.in
+++ b/doc/imagex-capture.1.in
@@ -91,8 +91,9 @@ The security descriptor for each NTFS inode.
 .IP \[bu]
 File attribute flags.
 .IP \[bu]
 .IP \[bu]
 File attribute flags.
 .IP \[bu]

-All names of all files, including names in the Win32 namespace, DOS namespace,
-Win32+DOS namespace, and POSIX namespace.  This includes hard links.
+All names of all singly-linked files, including names in the Win32 namespace,
+DOS namespace, Win32+DOS namespace, and POSIX namespace; all names of all
+multi-linked files except DOS names.

 
 .SH OPTIONS
 .TP 6
 
 .SH OPTIONS
 .TP 6

diff --git a/src/ntfs-capture.c b/src/ntfs-capture.c
index ad56ba75b63afba455328676b8af21f53e495c58..ac7648a372e0e6e3d7561544b71dcb92ea86aaed 100644 (file)
--- a/src/ntfs-capture.c
+++ b/src/ntfs-capture.c
@@ -575,13 +575,16 @@ static int build_dentry_tree_ntfs_recursive(struct wim_dentry **root_p,
                        if (ret != 0)
                                return ret;
                } else {
                        if (ret != 0)
                                return ret;
                } else {

+                       if (

                #ifdef ENODATA
                #ifdef ENODATA

-                       if (errno != ENODATA) {
+                           errno != ENODATA &&
+               #endif
+                           errno != EMLINK
+                           ) {

                                ERROR_WITH_ERRNO("Error getting DOS name "
                                                 "of `%s'", path);
                                return WIMLIB_ERR_NTFS_3G;
                        }
                                ERROR_WITH_ERRNO("Error getting DOS name "
                                                 "of `%s'", path);
                                return WIMLIB_ERR_NTFS_3G;
                        }

-               #endif

                }
        }
 
                }
        }