From 0f9da4228d3a73de6faa5b42b86b0dbf1da7f5f2 Mon Sep 17 00:00:00 2001 From: nobu Date: Mon, 3 Feb 2014 01:49:50 +0000 Subject: dir.c: glob cases on case-insensitive system * dir.c (glob_helper): return the filename with actual cases on the filesystem if it is case-insensitive. [ruby-core:42469] [Feature #5994] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@44796 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- dir.c | 22 ++++++++++++++++++++-- 1 file changed, 20 insertions(+), 2 deletions(-) (limited to 'dir.c') diff --git a/dir.c b/dir.c index 4fe2c8832f..d28037a2d0 100644 --- a/dir.c +++ b/dir.c @@ -1397,14 +1397,29 @@ glob_helper( if (exist == NO || isdir == NO) return 0; - if (magical || recursive) { + if (magical || recursive || ((FNM_SYSCASE || HAVE_HFS) && plain)) { struct dirent *dp; DIR *dirp; IF_HAVE_HFS(int hfs_p); dirp = do_opendir(*path ? path : ".", flags, enc); - if (dirp == NULL) return 0; + if (dirp == NULL) { +# if FNM_SYSCASE || HAVE_HFS + if (!(magical || recursive) && (errno == EACCES)) { + /* no read permission, fallback */ + goto literally; + } +# endif + return 0; + } IF_HAVE_HFS(hfs_p = is_hfs(dirp)); +# if HAVE_HFS + if (!(hfs_p || magical || recursive)) { + closedir(dirp); + goto literally; + } + flags |= FNM_CASEFOLD; +# endif while ((dp = READDIR(dirp, enc)) != NULL) { char *buf; enum answer new_isdir = UNKNOWN; @@ -1486,6 +1501,9 @@ glob_helper( else if (plain) { struct glob_pattern **copy_beg, **copy_end, **cur2; +# if FNM_SYSCASE || HAVE_HFS + literally: +# endif copy_beg = copy_end = GLOB_ALLOC_N(struct glob_pattern *, end - beg); if (!copy_beg) return -1; for (cur = beg; cur < end; ++cur) -- cgit v1.2.3