knu	2008-06-17 15:10:23 +0900 (Tue, 17 Jun 2008)

  New Revision: 17375

  Modified files:
    branches/ruby_1_8_7/ChangeLog
    branches/ruby_1_8_7/file.c
    branches/ruby_1_8_7/version.h

  Log:
    * file.c (file_expand_path): no need to expand root path which has no
      short file name.  [ruby-dev:35095]


  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/branches/ruby_1_8_7/ChangeLog?r1=17375&r2=17374&diff_format=u
  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/branches/ruby_1_8_7/file.c?r1=17375&r2=17374&diff_format=u
  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/branches/ruby_1_8_7/version.h?r1=17375&r2=17374&diff_format=u

Index: ruby_1_8_7/ChangeLog
===================================================================
--- ruby_1_8_7/ChangeLog	(revision 17374)
+++ ruby_1_8_7/ChangeLog	(revision 17375)
@@ -1,3 +1,8 @@
+Tue Jun 17 15:09:46 2008  Nobuyoshi Nakada  <nobu@r...>
+
+	* file.c (file_expand_path): no need to expand root path which has no
+	  short file name.  [ruby-dev:35095]
+
 Sun Jun 15 19:27:40 2008  Akinori MUSHA  <knu@i...>
 
 	* configure.in: Fix $LOAD_PATH.  Properly expand vendor_ruby
Index: ruby_1_8_7/version.h
===================================================================
--- ruby_1_8_7/version.h	(revision 17374)
+++ ruby_1_8_7/version.h	(revision 17375)
@@ -1,15 +1,15 @@
 #define RUBY_VERSION "1.8.7"
-#define RUBY_RELEASE_DATE "2008-06-15"
+#define RUBY_RELEASE_DATE "2008-06-17"
 #define RUBY_VERSION_CODE 187
-#define RUBY_RELEASE_CODE 20080615
-#define RUBY_PATCHLEVEL 18
+#define RUBY_RELEASE_CODE 20080617
+#define RUBY_PATCHLEVEL 19
 
 #define RUBY_VERSION_MAJOR 1
 #define RUBY_VERSION_MINOR 8
 #define RUBY_VERSION_TEENY 7
 #define RUBY_RELEASE_YEAR 2008
 #define RUBY_RELEASE_MONTH 6
-#define RUBY_RELEASE_DAY 15
+#define RUBY_RELEASE_DAY 17
 
 #ifdef RUBY_EXTERN
 RUBY_EXTERN const char ruby_version[];
Index: ruby_1_8_7/file.c
===================================================================
--- ruby_1_8_7/file.c	(revision 17374)
+++ ruby_1_8_7/file.c	(revision 17375)
@@ -2746,14 +2746,14 @@
 
 #if USE_NTFS
     *p = '\0';
-    if (*(s = skipprefix(b = buf)) && !strpbrk(s, "*?")) {
+    if ((s = strrdirsep(b = buf)) != 0 && !strpbrk(s, "*?")) {
 	size_t len;
 	WIN32_FIND_DATA wfd;
 #ifdef __CYGWIN__
 	int lnk_added = 0, is_symlink = 0;
 	struct stat st;
 	char w32buf[MAXPATHLEN];
-	p = strrdirsep(s);
+	p = (char *)s;
 	if (lstat(buf, &st) == 0 && S_ISLNK(st.st_mode)) {
 	    is_symlink = 1;
 	    *p = '\0';
@@ -2782,7 +2782,7 @@
 		wfd.cFileName[len -= 4] = '\0';
 	    }
 #else
-	    p = strrdirsep(s);
+	    p = (char *)s;
 #endif
 	    ++p;
 	    BUFCHECK(bdiff + len >= buflen);

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