nobu	2008-03-08 18:51:00 +0900 (Sat, 08 Mar 2008)

  New Revision: 15732

  Modified files:
    branches/ruby_1_8/ChangeLog
    branches/ruby_1_8/file.c
    branches/ruby_1_8/version.h
    trunk/ChangeLog
    trunk/file.c

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


  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/trunk/file.c?r1=15732&r2=15731&diff_format=u
  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/branches/ruby_1_8/ChangeLog?r1=15732&r2=15731&diff_format=u
  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/trunk/ChangeLog?r1=15732&r2=15731&diff_format=u
  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/branches/ruby_1_8/file.c?r1=15732&r2=15731&diff_format=u
  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/branches/ruby_1_8/version.h?r1=15732&r2=15731&diff_format=u

Index: ChangeLog
===================================================================
--- ChangeLog	(revision 15731)
+++ ChangeLog	(revision 15732)
@@ -1,3 +1,7 @@
+Sat Mar  8 18:50:57 2008  Nobuyoshi Nakada  <nobu@r...>
+
+	* file.c (isdirsep): backslash is valid path separator on cygwin too.
+
 Sat Mar  8 06:53:48 2008  NARUSE, Yui  <naruse@r...>
 
 	* string.c (search_nonascii): Use VALUE instead of unsigned long
Index: file.c
===================================================================
--- file.c	(revision 15731)
+++ file.c	(revision 15732)
@@ -2388,12 +2388,17 @@
     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 @@
 # 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)
Index: ruby_1_8/ChangeLog
===================================================================
--- ruby_1_8/ChangeLog	(revision 15731)
+++ ruby_1_8/ChangeLog	(revision 15732)
@@ -1,3 +1,7 @@
+Sat Mar  8 18:50:57 2008  Nobuyoshi Nakada  <nobu@r...>
+
+	* file.c (isdirsep): backslash is valid path separator on cygwin too.
+
 Fri Mar  7 19:56:10 2008  Nobuyoshi Nakada  <nobu@r...>
 
 	* lib/mkmf.rb: rdoc added.  [ruby-Patches-9762]
Index: ruby_1_8/version.h
===================================================================
--- ruby_1_8/version.h	(revision 15731)
+++ ruby_1_8/version.h	(revision 15732)
@@ -1,7 +1,7 @@
 #define RUBY_VERSION "1.8.6"
-#define RUBY_RELEASE_DATE "2008-03-07"
+#define RUBY_RELEASE_DATE "2008-03-08"
 #define RUBY_VERSION_CODE 186
-#define RUBY_RELEASE_CODE 20080307
+#define RUBY_RELEASE_CODE 20080308
 #define RUBY_PATCHLEVEL 5000
 
 #define RUBY_VERSION_MAJOR 1
@@ -9,7 +9,7 @@
 #define RUBY_VERSION_TEENY 6
 #define RUBY_RELEASE_YEAR 2008
 #define RUBY_RELEASE_MONTH 3
-#define RUBY_RELEASE_DAY 7
+#define RUBY_RELEASE_DAY 8
 
 #ifdef RUBY_EXTERN
 RUBY_EXTERN const char ruby_version[];
Index: ruby_1_8/file.c
===================================================================
--- ruby_1_8/file.c	(revision 15731)
+++ ruby_1_8/file.c	(revision 15732)
@@ -2299,12 +2299,17 @@
     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, MB_CUR_MAX))
@@ -2313,12 +2318,6 @@
 # endif
 #endif
 
-#ifdef __CYGWIN__
-#undef DOSISH
-#define DOSISH_UNC
-#define DOSISH_DRIVE_LETTER
-#endif
-
 #ifdef DOSISH_DRIVE_LETTER
 static inline int
 has_drive_letter(buf)

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/