summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorusa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2003-11-25 12:44:26 +0000
committerusa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2003-11-25 12:44:26 +0000
commit230785ef92c999c99e167db1dba46a30fb02fa04 (patch)
tree836c23d67f1975b48e3d02c67a6567a7b313116a
parent360fead27bf83ab7746be2e88ed800263392e8a0 (diff)
downloadruby-230785ef92c999c99e167db1dba46a30fb02fa04.tar.gz
ruby-230785ef92c999c99e167db1dba46a30fb02fa04.tar.xz
ruby-230785ef92c999c99e167db1dba46a30fb02fa04.zip
* defines.h (ENV_IGNORECASE): should define when DOSISH without
human68k. * hash.c (env_has_value, env_index): don't ignore case of value. git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@5029 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog7
-rw-r--r--defines.h2
-rw-r--r--hash.c8
3 files changed, 8 insertions, 9 deletions
diff --git a/ChangeLog b/ChangeLog
index 9db278920..ffbd282a8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+Tue Nov 25 21:41:35 2003 NAKAMURA Usaku <usa@ruby-lang.org>
+
+ * defines.h (ENV_IGNORECASE): should define when DOSISH without
+ human68k.
+
+ * hash.c (env_has_value, env_index): don't ignore case of value.
+
Tue Nov 25 20:02:14 2003 Minero Aoki <aamine@loveruby.net>
* test/fileutils/test_fileutils.rb: do test in more deep
diff --git a/defines.h b/defines.h
index 0e2c9b36a..ca7cd8e1e 100644
--- a/defines.h
+++ b/defines.h
@@ -180,7 +180,7 @@ flush_register_windows(void)
#define PATH_ENV "PATH"
#endif
-#if defined(DOSISH) || !defined(__human68k__)
+#if defined(DOSISH) && !defined(__human68k__)
#define ENV_IGNORECASE
#endif
diff --git a/hash.c b/hash.c
index 75c07797d..5fe1dbc6a 100644
--- a/hash.c
+++ b/hash.c
@@ -1598,11 +1598,7 @@ env_has_value(dmy, value)
while (*env) {
char *s = strchr(*env, '=');
if (s++) {
-#ifdef ENV_IGNORECASE
- if (strncasecmp(s, RSTRING(value)->ptr, strlen(s)) == 0) {
-#else
if (strncmp(s, RSTRING(value)->ptr, strlen(s)) == 0) {
-#endif
FREE_ENVIRON(environ);
return Qtrue;
}
@@ -1625,11 +1621,7 @@ env_index(dmy, value)
while (*env) {
char *s = strchr(*env, '=');
if (s++) {
-#ifdef ENV_IGNORECASE
- if (strncasecmp(s, RSTRING(value)->ptr, strlen(s)) == 0) {
-#else
if (strncmp(s, RSTRING(value)->ptr, strlen(s)) == 0) {
-#endif
str = env_str_new(*env, s-*env-1);
FREE_ENVIRON(environ);
return str;