summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rw-r--r--file.c14
2 files changed, 16 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index f554175..b7ba9ed 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]
+
Wed Sep 06 12:05:19 2006 NARUSE, Yui <naruse@ruby-lang.org>
* ext/nkf/lib/kconv.rb (Kconv::RegexpEucjp): fix regexp for euc-jp
diff --git a/file.c b/file.c
index a2726d1..e83b1bc 100644
--- a/file.c
+++ b/file.c
@@ -4097,7 +4097,15 @@ is_absolute_path(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(fpath, execpath)
VALUE fpath;
@@ -4145,7 +4153,7 @@ static int
fpath_check(path)
char *path;
{
-#ifndef DOSISH
+#if ENABLE_PATH_CHECK
return path_check_0(rb_str_new2(path), Qfalse);
#else
return 1;
@@ -4156,7 +4164,7 @@ int
rb_path_check(path)
char *path;
{
-#ifndef DOSISH
+#if ENABLE_PATH_CHECK
char *p0, *p, *pend;
const char sep = PATH_SEP_CHAR;