diff options
| author | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2015-03-14 03:23:56 +0000 |
|---|---|---|
| committer | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2015-03-14 03:23:56 +0000 |
| commit | 00f7db376cb3b0176de738d9f9c172397771fbd8 (patch) | |
| tree | 9766226a065ac37bcaceeb5fe6bd23353862a6a4 /win32/win32.c | |
| parent | b48ef1382f57e4a89a28382f60d09236d328fece (diff) | |
| download | ruby-00f7db376cb3b0176de738d9f9c172397771fbd8.tar.gz | |
dir.h: direct::d_type
* dir.c (glob_helper): use d_type to reduce lstat system calls.
* win32/dir.h (struct direct): add d_type instead of d_isdir and
d_isrep. SYMLINKD is unreliable, since the target can be
replaced after a link was created.
* win32/win32.c (readdir_internal): set d_type.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@49966 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'win32/win32.c')
| -rw-r--r-- | win32/win32.c | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/win32/win32.c b/win32/win32.c index 73163f6171..d2fde0751e 100644 --- a/win32/win32.c +++ b/win32/win32.c @@ -2139,8 +2139,13 @@ readdir_internal(DIR *dirp, BOOL (*conv)(const WCHAR *, const WCHAR *, struct di // // Attributes // - dirp->dirstr.d_isdir = GetBit(dirp->bits, BitOfIsDir(dirp->loc)); - dirp->dirstr.d_isrep = GetBit(dirp->bits, BitOfIsRep(dirp->loc)); + /* ignore FILE_ATTRIBUTE_DIRECTORY as unreliable for reparse points */ + if (GetBit(dirp->bits, BitOfIsRep(dirp->loc))) + dirp->dirstr.d_type = DT_LNK; + else if (GetBit(dirp->bits, BitOfIsDir(dirp->loc))) + dirp->dirstr.d_type = DT_DIR; + else + dirp->dirstr.d_type = DT_REG; // // Now set up for the next call to readdir |