ruby-changes:19647
From: nahi <ko1@a...>
Date: Sun, 22 May 2011 21:52:28 +0900 (JST)
Subject: [ruby-changes:19647] nahi:r31692 (trunk): * include/ruby/defines.h (CASEFOLD_FILESYSTEM): Revert r30508. See #4255.
nahi 2011-05-22 21:52:18 +0900 (Sun, 22 May 2011) New Revision: 31692 http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=31692 Log: * include/ruby/defines.h (CASEFOLD_FILESYSTEM): Revert r30508. See #4255. Now __APPLE__ is not CASEFOLD_FILESYSTEM again. * load.c (loaded_feature_path, rb_feature_p, load_lock): Revert r30508. See #4255. Make $LOADED_FEATURES scanning case-sensitive again. Modified files: trunk/ChangeLog trunk/load.c trunk/test/ruby/test_require.rb Index: ChangeLog =================================================================== --- ChangeLog (revision 31691) +++ ChangeLog (revision 31692) @@ -1,3 +1,11 @@ +Sun May 22 21:29:29 2011 Hiroshi Nakamura <nahi@r...> + + * include/ruby/defines.h (CASEFOLD_FILESYSTEM): Revert r30508. See #4255. + Now __APPLE__ is not CASEFOLD_FILESYSTEM again. + + * load.c (loaded_feature_path, rb_feature_p, load_lock): Revert r30508. + See #4255. Make $LOADED_FEATURES scanning case-sensitive again. + Sun May 22 18:59:27 2011 Hiroshi Nakamura <nahi@r...> * ext/openssl/ossl_asn1.c(ossl_asn1_default_tag): avoid using RCLASS_SUPER Index: load.c =================================================================== --- load.c (revision 31691) +++ load.c (revision 31692) @@ -9,20 +9,12 @@ VALUE ruby_dln_librefs; -#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) +#define IS_RBEXT(e) (strcmp((e), ".rb") == 0) +#define IS_SOEXT(e) (strcmp((e), ".so") == 0 || strcmp((e), ".o") == 0) #ifdef DLEXT2 -#define IS_DLEXT(e) (fncomp((e), DLEXT) == 0 || fncomp((e), DLEXT2) == 0) +#define IS_DLEXT(e) (strcmp((e), DLEXT) == 0 || strcmp((e), DLEXT2) == 0) #else -#define IS_DLEXT(e) (fncomp((e), DLEXT) == 0) +#define IS_DLEXT(e) (strcmp((e), DLEXT) == 0) #endif @@ -88,8 +80,8 @@ long n = RSTRING_LEN(p); if (vlen < n + len + 1) continue; - if (n && (fnncomp(name, s, n) || name[n] != '/')) continue; - if (fnncomp(name + n + 1, feature, len)) continue; + if (n && (strncmp(name, s, n) || name[n] != '/')) continue; + if (strncmp(name + n + 1, feature, len)) continue; if (name[n+len+1] && name[n+len+1] != '.') continue; switch (type) { case 's': @@ -151,7 +143,7 @@ v = RARRAY_PTR(features)[i]; f = StringValuePtr(v); if ((n = RSTRING_LEN(v)) < len) continue; - if (fnncomp(f, feature, len) != 0) { + if (strncmp(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,8 +382,7 @@ 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 = - (CASEFOLD_FILESYSTEM ? st_init_strcasetable() : st_init_strtable()); + GET_VM()->loading_table = loading_tbl = st_init_strtable(); } /* partial state */ ftptr = ruby_strdup(ftptr); Index: test/ruby/test_require.rb =================================================================== --- test/ruby/test_require.rb (revision 31691) +++ test/ruby/test_require.rb (revision 31692) @@ -339,20 +339,4 @@ [], /\$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 -- ML: ruby-changes@q... Info: http://www.atdot.net/~ko1/quickml/