* file.c (isdirsep): backslash is valid path separator on cygwin too.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@15732 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nobu 2008-03-08 09:51:00 +00:00
parent a39feece85
commit 31b604a3f3
2 changed files with 10 additions and 7 deletions

View File

@ -1,3 +1,7 @@
Sat Mar 8 18:50:57 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
* file.c (isdirsep): backslash is valid path separator on cygwin too.
Sat Mar 8 06:53:48 2008 NARUSE, Yui <naruse@ruby-lang.org>
* string.c (search_nonascii): Use VALUE instead of unsigned long

13
file.c
View File

@ -2388,12 +2388,17 @@ rb_file_s_umask(int argc, VALUE *argv)
return INT2FIX(omask);
}
#if defined DOSISH
#ifdef __CYGWIN__
#undef DOSISH
#endif
#if defined __CYGWIN__ || defined DOSISH
#define DOSISH_UNC
#define DOSISH_DRIVE_LETTER
#define isdirsep(x) ((x) == '/' || (x) == '\\')
#else
#define isdirsep(x) ((x) == '/')
#endif
#ifndef CharNext /* defined as CharNext[AW] on Windows. */
# if defined(DJGPP)
# define CharNext(p) ((p) + mblen(p, RUBY_MBCHAR_MAXSIZE))
@ -2402,12 +2407,6 @@ rb_file_s_umask(int argc, VALUE *argv)
# endif
#endif
#ifdef __CYGWIN__
#undef DOSISH
#define DOSISH_UNC
#define DOSISH_DRIVE_LETTER
#endif
#ifdef DOSISH_DRIVE_LETTER
static inline int
has_drive_letter(const char *buf)