From 27ddbc597231c70467f2ced4f6e60f44bae6468a Mon Sep 17 00:00:00 2001 From: nahi Date: Sun, 22 May 2011 12:52:18 +0000 Subject: * 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 --- load.c | 25 ++++++++----------------- 1 file changed, 8 insertions(+), 17 deletions(-) (limited to 'load.c') 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); -- cgit v1.2.3