dir.c: glob cases on case-insensitive system

nobu · nobu · commit cce300cae555 · 2014-02-04T03:45:17.000Z
* dir.c (glob_make_pattern): all alphabets are magic characters on case-insensitive filesystems. [ruby-core:42469] [Feature ruby#5994] git-svn-id: svn+ssh://svn.ruby-lang.org/ruby/trunk@44802 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
diff --git 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
@@ -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) {

-Original file line number
+Diff line change
@@ @@ -1,3 +1,8 @@ @@
 +Tue Feb  4 12:45:15 2014  Nobuyoshi Nakada  <[email protected]>
++
 +	* 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  <[email protected]>
 	* lib/rubygems:  Update to RubyGems 2.2.2 prerelease to check fixes to
Original file line number	Diff line number	Diff line change
`@@ -1210,7 +1210,7 @@ glob_make_pattern(const char p, const char e, int flags, rb_encoding *enc)`
`1210`	`1210`	`}`
`1211`	`1211`	`else {`
`1212`	`1212`	`const char *m = find_dirsep(p, e, flags, enc);`
`1213`		`- int magic = has_magic(p, m, flags, enc);`
	`1213`	`+ const int magic = FNM_SYSCASE \|\| HAVE_HFS \|\| has_magic(p, m, flags, enc);`
`1214`	`1214`	`char *buf;`
`1215`	`1215`
`1216`	`1216`	`if (!magic && !recursive && *m) {`