diff options
| -rw-r--r-- | ChangeLog | 9 | ||||
| -rw-r--r-- | include/ruby/defines.h | 2 | ||||
| -rw-r--r-- | load.c | 25 | ||||
| -rw-r--r-- | test/ruby/test_require.rb | 16 |
4 files changed, 43 insertions, 9 deletions
@@ -1,3 +1,12 @@ +Mon Jan 10 22:46:43 2011 Nobuyoshi Nakada <nobu@ruby-lang.org> + + * include/ruby/defines.h (CASEFOLD_FILESYSTEM): HFS+ is case + insensitive. + + * load.c (loaded_feature_path, rb_feature_p, load_lock): on a + case-insensitive filesystem, loaded features search should + ignore case. [ruby-core:34297] + Mon Jan 10 21:34:12 2011 Nobuyoshi Nakada <nobu@ruby-lang.org> * common.mk (showflags): show LD commands. diff --git a/include/ruby/defines.h b/include/ruby/defines.h index 45841dad74..ef2dbfeff1 100644 --- a/include/ruby/defines.h +++ b/include/ruby/defines.h @@ -296,7 +296,7 @@ void rb_ia64_flushrs(void); #endif #ifndef CASEFOLD_FILESYSTEM -# if defined DOSISH +# if defined DOSISH || defined __APPLE__ # define CASEFOLD_FILESYSTEM 1 # else # define CASEFOLD_FILESYSTEM 0 @@ -9,12 +9,20 @@ VALUE ruby_dln_librefs; -#define IS_RBEXT(e) (strcmp((e), ".rb") == 0) -#define IS_SOEXT(e) (strcmp((e), ".so") == 0 || strcmp((e), ".o") == 0) +#if CASEFOLD_FILESYSTEM +#define fncomp strcasecmp +#define fnncomp strncasecmp +#else +#define fncomp strcmp +#define fnncomp strncmp +#endif + +#define IS_RBEXT(e) (fncomp((e), ".rb") == 0) +#define IS_SOEXT(e) (fncomp((e), ".so") == 0 || fncomp((e), ".o") == 0) #ifdef DLEXT2 -#define IS_DLEXT(e) (strcmp((e), DLEXT) == 0 || strcmp((e), DLEXT2) == 0) +#define IS_DLEXT(e) (fncomp((e), DLEXT) == 0 || fncomp((e), DLEXT2) == 0) #else -#define IS_DLEXT(e) (strcmp((e), DLEXT) == 0) +#define IS_DLEXT(e) (fncomp((e), DLEXT) == 0) #endif @@ -88,8 +96,8 @@ loaded_feature_path(const char *name, long vlen, const char *feature, long len, long n = RSTRING_LEN(p); if (vlen < n + len + 1) continue; - if (n && (strncmp(name, s, n) || name[n] != '/')) continue; - if (strncmp(name + n + 1, feature, len)) continue; + if (n && (fnncomp(name, s, n) || name[n] != '/')) continue; + if (fnncomp(name + n + 1, feature, len)) continue; if (name[n+len+1] && name[n+len+1] != '.') continue; switch (type) { case 's': @@ -151,7 +159,7 @@ rb_feature_p(const char *feature, const char *ext, int rb, int expanded, const c v = RARRAY_PTR(features)[i]; f = StringValuePtr(v); if ((n = RSTRING_LEN(v)) < len) continue; - if (strncmp(f, feature, len) != 0) { + if (fnncomp(f, feature, len) != 0) { if (expanded) continue; if (!load_path) load_path = rb_get_expanded_load_path(); if (!(p = loaded_feature_path(f, n, feature, len, type, load_path))) @@ -390,7 +398,8 @@ load_lock(const char *ftptr) if (!loading_tbl || !st_lookup(loading_tbl, (st_data_t)ftptr, &data)) { /* loading ruby library should be serialized. */ if (!loading_tbl) { - GET_VM()->loading_table = loading_tbl = st_init_strtable(); + GET_VM()->loading_table = loading_tbl = + (CASEFOLD_FILESYSTEM ? st_init_strcasetable() : st_init_strtable()); } /* partial state */ ftptr = ruby_strdup(ftptr); diff --git a/test/ruby/test_require.rb b/test/ruby/test_require.rb index aef7f7b527..1d61a83e86 100644 --- a/test/ruby/test_require.rb +++ b/test/ruby/test_require.rb @@ -322,4 +322,20 @@ class TestRequire < Test::Unit::TestCase [], /\$LOADED_FEATURES is frozen; cannot append feature \(RuntimeError\)$/, bug3756) end + + def test_case_insensitive + load_path = $:.dup + loaded = $".dup + path = File.expand_path(__FILE__) + $:.unshift(File.dirname(path)) + $".push(path) unless $".include?(path) + bug4255 = '[ruby-core:34297]' + assert_equal(false, $bug4255 ||= false, bug4255) + $bug4255 = true + f = File.basename(__FILE__, ".*").upcase + assert_equal(false, require(f)) + ensure + $:.replace(load_path) + $".replace(loaded) + end if File.identical?(__FILE__, __FILE__.upcase) end |