ruby-changes:4958
From: ko1@a...
Date: Sun, 18 May 2008 01:58:12 +0900 (JST)
Subject: [ruby-changes:4958] nobu - Ruby:r16451 (ruby_1_8_6, ruby_1_8_5): * file.c (isdirsep): backslash is valid path separator on cygwin too.
nobu 2008-05-18 01:57:53 +0900 (Sun, 18 May 2008)
New Revision: 16451
Modified files:
branches/ruby_1_8_5/ChangeLog
branches/ruby_1_8_5/file.c
branches/ruby_1_8_5/version.h
branches/ruby_1_8_6/ChangeLog
branches/ruby_1_8_6/file.c
branches/ruby_1_8_6/version.h
Log:
* file.c (isdirsep): backslash is valid path separator on cygwin too.
backported from 1.8 HEAD.
http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/branches/ruby_1_8_6/ChangeLog?r1=16451&r2=16450&diff_format=u
http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/branches/ruby_1_8_6/version.h?r1=16451&r2=16450&diff_format=u
http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/branches/ruby_1_8_6/file.c?r1=16451&r2=16450&diff_format=u
http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/branches/ruby_1_8_5/version.h?r1=16451&r2=16450&diff_format=u
http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/branches/ruby_1_8_5/ChangeLog?r1=16451&r2=16450&diff_format=u
http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/branches/ruby_1_8_5/file.c?r1=16451&r2=16450&diff_format=u
Index: ruby_1_8_5/ChangeLog
===================================================================
--- ruby_1_8_5/ChangeLog (revision 16450)
+++ ruby_1_8_5/ChangeLog (revision 16451)
@@ -1,3 +1,8 @@
+Sun May 18 01:57:44 2008 Nobuyoshi Nakada <nobu@r...>
+
+ * file.c (isdirsep): backslash is valid path separator on cygwin too.
+ backported from 1.8 HEAD.
+
Sat May 17 23:53:57 2008 Nobuyoshi Nakada <nobu@r...>
* file.c (file_expand_path): fix for short file name on Cygwin.
Index: ruby_1_8_5/version.h
===================================================================
--- ruby_1_8_5/version.h (revision 16450)
+++ ruby_1_8_5/version.h (revision 16451)
@@ -1,15 +1,15 @@
#define RUBY_VERSION "1.8.5"
-#define RUBY_RELEASE_DATE "2008-05-17"
+#define RUBY_RELEASE_DATE "2008-05-18"
#define RUBY_VERSION_CODE 185
-#define RUBY_RELEASE_CODE 20080517
-#define RUBY_PATCHLEVEL 118
+#define RUBY_RELEASE_CODE 20080518
+#define RUBY_PATCHLEVEL 119
#define RUBY_VERSION_MAJOR 1
#define RUBY_VERSION_MINOR 8
#define RUBY_VERSION_TEENY 5
#define RUBY_RELEASE_YEAR 2008
#define RUBY_RELEASE_MONTH 5
-#define RUBY_RELEASE_DAY 17
+#define RUBY_RELEASE_DAY 18
#ifdef RUBY_EXTERN
RUBY_EXTERN const char ruby_version[];
Index: ruby_1_8_5/file.c
===================================================================
--- ruby_1_8_5/file.c (revision 16450)
+++ ruby_1_8_5/file.c (revision 16451)
@@ -2298,12 +2298,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))
@@ -2324,12 +2329,6 @@
#define istrailinggabage(x) 0
#endif
-#ifdef __CYGWIN__
-#undef DOSISH
-#define DOSISH_UNC
-#define DOSISH_DRIVE_LETTER
-#endif
-
#ifdef DOSISH_DRIVE_LETTER
static inline int
has_drive_letter(buf)
Index: ruby_1_8_6/ChangeLog
===================================================================
--- ruby_1_8_6/ChangeLog (revision 16450)
+++ ruby_1_8_6/ChangeLog (revision 16451)
@@ -1,3 +1,8 @@
+Sun May 18 01:57:44 2008 Nobuyoshi Nakada <nobu@r...>
+
+ * file.c (isdirsep): backslash is valid path separator on cygwin too.
+ backported from 1.8 HEAD.
+
Sat May 17 23:53:57 2008 Nobuyoshi Nakada <nobu@r...>
* file.c (file_expand_path): fix for short file name on Cygwin.
Index: ruby_1_8_6/version.h
===================================================================
--- ruby_1_8_6/version.h (revision 16450)
+++ ruby_1_8_6/version.h (revision 16451)
@@ -1,15 +1,15 @@
#define RUBY_VERSION "1.8.6"
-#define RUBY_RELEASE_DATE "2008-05-17"
+#define RUBY_RELEASE_DATE "2008-05-18"
#define RUBY_VERSION_CODE 186
-#define RUBY_RELEASE_CODE 20080517
-#define RUBY_PATCHLEVEL 117
+#define RUBY_RELEASE_CODE 20080518
+#define RUBY_PATCHLEVEL 118
#define RUBY_VERSION_MAJOR 1
#define RUBY_VERSION_MINOR 8
#define RUBY_VERSION_TEENY 6
#define RUBY_RELEASE_YEAR 2008
#define RUBY_RELEASE_MONTH 5
-#define RUBY_RELEASE_DAY 17
+#define RUBY_RELEASE_DAY 18
#ifdef RUBY_EXTERN
RUBY_EXTERN const char ruby_version[];
Index: ruby_1_8_6/file.c
===================================================================
--- ruby_1_8_6/file.c (revision 16450)
+++ ruby_1_8_6/file.c (revision 16451)
@@ -2304,12 +2304,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))
@@ -2330,12 +2335,6 @@
#define istrailinggabage(x) 0
#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/