From: Eric Biggers Date: Wed, 30 Jan 2013 05:23:55 +0000 (-0600) Subject: ntfs capture: can no longer get DOS name from multi-linked files X-Git-Tag: v1.2.4~9 X-Git-Url: https://wimlib.net/git/?p=wimlib;a=commitdiff_plain;h=035df16cb7d3c3e0b06994ee9bda31ec21671bc7 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 d8dc92a2..df4685ad 100644 --- 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] -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 diff --git a/src/ntfs-capture.c b/src/ntfs-capture.c index ad56ba75..ac7648a3 100644 --- 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 ( #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; } - #endif } }