summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authornobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2014-02-04 03:45:17 +0000
committernobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2014-02-04 03:45:17 +0000
commit5b92c0bea3dc23b0c2be356bedafdd4e7f9110d7 (patch)
tree37a5315f1b5df1e358c9f426605147d3895b22f4
parent859ae7764c69e6418945c96c596e55924d5dd8b8 (diff)
dir.c: glob cases on case-insensitive system
* dir.c (glob_make_pattern): all alphabets are magic characters on case-insensitive filesystems. [ruby-core:42469] [Feature #5994] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@44802 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog5
-rw-r--r--dir.c2
2 files changed, 6 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index a571b56d58..aa0e7e124f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Tue Feb 4 12:45:15 2014 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * dir.c (glob_make_pattern): all alphabets are magic characters on
+ case-insensitive filesystems. [ruby-core:42469] [Feature #5994]
+
Tue Feb 4 09:47:57 2014 Eric Hodel <drbrain@segment7.net>
* lib/rubygems: Update to RubyGems 2.2.2 prerelease to check fixes to
diff --git a/dir.c b/dir.c
index 4fe2c8832f..6eb8c9ef1c 100644
--- a/dir.c
+++ b/dir.c
@@ -1210,7 +1210,7 @@ glob_make_pattern(const char *p, const char *e, int flags, rb_encoding *enc)
}
else {
const char *m = find_dirsep(p, e, flags, enc);
- int magic = has_magic(p, m, flags, enc);
+ const int magic = FNM_SYSCASE || HAVE_HFS || has_magic(p, m, flags, enc);
char *buf;
if (!magic && !recursive && *m) {