* 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.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@31692 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

3 files changed, 16 insertions, 33 deletions

diff --git a/ChangeLog b/ChangeLog
index e066c2eddd..94709c7d6a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+Sun May 22 21:29:29 2011  Hiroshi Nakamura  <nahi@ruby-lang.org>
+
+	* 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@ruby-lang.org>
 
 	* ext/openssl/ossl_asn1.c(ossl_asn1_default_tag): avoid using RCLASS_SUPER
diff --git a/load.c b/load.c
index 5e6b9d0d55..547c115bfa 100644
--- a/load.c
+++ b/load.c
@@ -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 @@ 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 && (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 @@ 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 (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 @@ 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 =
-		(CASEFOLD_FILESYSTEM ? st_init_strcasetable() : st_init_strtable());
+	    GET_VM()->loading_table = loading_tbl = st_init_strtable();
 	}
 	/* partial state */
 	ftptr = ruby_strdup(ftptr);
diff --git a/test/ruby/test_require.rb b/test/ruby/test_require.rb
index d2ee9df30c..96b1551da2 100644
--- a/test/ruby/test_require.rb
+++ b/test/ruby/test_require.rb
@@ -339,20 +339,4 @@ 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