summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authornobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2014-02-04 08:20:05 +0000
committernobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2014-02-04 08:20:05 +0000
commit8d9b300a72ec3de3b88aae973661be347df7a028 (patch)
tree37a7f79815daead701b5fe9bcaf8e1e0abea9de5
parent171a14b36cf61a1aae127d3b73b1aedd0657ab01 (diff)
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@44807 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog6
-rw-r--r--dir.c26
-rw-r--r--lib/mkmf.rb2
-rw-r--r--test/ruby/test_dir.rb21
4 files changed, 50 insertions, 5 deletions
diff --git a/ChangeLog b/ChangeLog
index 6141853..427c672 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Tue Feb 4 17:20:03 2014 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * dir.c (glob_helper): return the filename with actual cases on
+ the filesystem if it is case-insensitive. [ruby-core:42469]
+ [Feature #5994]
+
Tue Feb 4 16:16:58 2014 Koichi Sasada <ko1@atdot.net>
* string.c: use STR_SHARED instead of ELTS_SHARED.
diff --git a/dir.c b/dir.c
index 6eb8c9e..3e2ddbd 100644
--- a/dir.c
+++ b/dir.c
@@ -1210,10 +1210,10 @@ glob_make_pattern(const char *p, const char *e, int flags, rb_encoding *enc)
}
else {
const char *m = find_dirsep(p, e, flags, enc);
- const int magic = FNM_SYSCASE || HAVE_HFS || has_magic(p, m, flags, enc);
+ const int magic = has_magic(p, m, flags, enc);
char *buf;
- if (!magic && !recursive && *m) {
+ if (!(FNM_SYSCASE || HAVE_HFS || magic) && !recursive && *m) {
const char *m2;
while (!has_magic(m+1, m2 = find_dirsep(m+1, e, flags, enc), flags, enc) &&
*m2) {
@@ -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)
diff --git a/lib/mkmf.rb b/lib/mkmf.rb
index 3f88fe3..8808455 100644
--- a/lib/mkmf.rb
+++ b/lib/mkmf.rb
@@ -71,7 +71,7 @@ module MakeMakefile
# Extensions for files complied with a C++ compiler
CXX_EXT = %w[cc mm cxx cpp]
- if File::FNM_SYSCASE.zero?
+ unless File.exist?(File.join(*File.split(__FILE__).tap {|d, b| b.swapcase}))
CXX_EXT.concat(%w[C])
end
diff --git a/test/ruby/test_dir.rb b/test/ruby/test_dir.rb
index 6054b8f..b0d848c 100644
--- a/test/ruby/test_dir.rb
+++ b/test/ruby/test_dir.rb
@@ -228,6 +228,27 @@ class TestDir < Test::Unit::TestCase
assert_empty(Dir.glob(File.join(@root, "<")), bug8597)
end
+ def test_glob_cases
+ feature5994 = "[ruby-core:42469] [Feature #5994]"
+ feature5994 << "\nDir.glob should return the filename with actual cases on the filesystem"
+ Dir.chdir(File.join(@root, "a")) do
+ open("FileWithCases", "w") {}
+ return unless File.exist?("filewithcases")
+ assert_equal(%w"FileWithCases", Dir.glob("filewithcases"), feature5994)
+ end
+ Dir.chdir(File.join(@root, "c")) do
+ open("FileWithCases", "w") {}
+ mode = File.stat(".").mode
+ begin
+ File.chmod(mode & ~0444, ".")
+ return if mode == File.stat(".").mode
+ assert_equal(%w"filewithcases", Dir.glob("filewithcases"), feature5994)
+ ensure
+ File.chmod(mode, ".")
+ end
+ end
+ end
+
def test_home
env_home = ENV["HOME"]
env_logdir = ENV["LOGDIR"]