From 00eb7c80420cc05b4750eaa7529d762cf89f0fbd Mon Sep 17 00:00:00 2001 From: eban Date: Wed, 23 Jul 2003 14:09:52 +0000 Subject: * file.c (DOSISH): better Cygwin support. git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@4126 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 4 ++++ file.c | 8 ++++---- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index 716f92331..6c3c11104 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +Wed Jul 23 23:06:59 2003 WATANABE Hirofumi + + * file.c (DOSISH): better Cygwin support. + Wed Jul 23 18:43:00 2003 Masatoshi SEKI * lib/erb.rb: import erb-2.0.4b1. diff --git a/file.c b/file.c index 1ef799c31..f5fb2311d 100644 --- a/file.c +++ b/file.c @@ -1549,7 +1549,7 @@ file_expand_path(fname, dname, result) } BUFCHECK(strlen(dir) > buflen); strcpy(buf, dir); -#ifdef DOSISH +#if defined DOSISH || defined __CYGWIN__ for (p = buf; *p; p = CharNext(p)) { if (*p == '\\') { *p = '/'; @@ -1629,7 +1629,7 @@ file_expand_path(fname, dname, result) strcpy(buf, dir); free(dir); } -#ifdef DOSISH +#if defined DOSISH || defined __CYGWIN__ if (isdirsep(*s)) { /* specified full path, but not drive letter nor UNC */ /* we need to get the drive letter or UNC share name */ @@ -1677,7 +1677,7 @@ file_expand_path(fname, dname, result) } break; case '/': -#if defined DOSISH +#if defined DOSISH || defined __CYGWIN__ case '\\': #endif b = ++s; @@ -1689,7 +1689,7 @@ file_expand_path(fname, dname, result) } break; case '/': -#if defined DOSISH +#if defined DOSISH || defined __CYGWIN__ case '\\': #endif if (s > b) { -- cgit