summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authornobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2006-09-07 14:28:36 +0000
committernobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2006-09-07 14:28:36 +0000
commit585c61691e9877bae84bb71acf0e2f3d1377ce52 (patch)
treecea118a1fe54ab97521d87effcbbb2c2958495de
parentc390e61a865910d0c23524da7acc722779e19011 (diff)
* file.c (path_check_0, fpath_check): disable path check on cygwin.
[ruby-talk:213074] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@10874 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog5
-rw-r--r--file.c14
2 files changed, 16 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index e62f4a41e0..171be67d98 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Thu Sep 7 23:27:05 2006 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * file.c (path_check_0, fpath_check): disable path check on cygwin.
+ [ruby-talk:213074]
+
Thu Sep 7 01:54:22 2006 Yukihiro Matsumoto <matz@ruby-lang.org>
* string.c (sym_equal): override. check equivalence.
diff --git a/file.c b/file.c
index 46481980d6..d5f005aa76 100644
--- a/file.c
+++ b/file.c
@@ -4044,7 +4044,15 @@ is_absolute_path(const char *path)
return 0;
}
-#ifndef DOSISH
+#ifndef ENABLE_PATH_CHECK
+# if defined DOSISH || defined __CYGWIN__
+# define ENABLE_PATH_CHECK 0
+# else
+# define ENABLE_PATH_CHECK 1
+# endif
+#endif
+
+#if ENABLE_PATH_CHECK
static int
path_check_0(VALUE path, int execpath)
{
@@ -4089,7 +4097,7 @@ path_check_0(VALUE path, int execpath)
static int
fpath_check(const char *path)
{
-#ifndef DOSISH
+#if ENABLE_PATH_CHECK
return path_check_0(rb_str_new2(path), Qfalse);
#else
return 1;
@@ -4099,7 +4107,7 @@ fpath_check(const char *path)
int
rb_path_check(const char *path)
{
-#ifndef DOSISH
+#if ENABLE_PATH_CHECK
const char *p0, *p, *pend;
const char sep = PATH_SEP_CHAR;