summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorknu <knu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2008-06-17 06:10:23 +0000
committerknu <knu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2008-06-17 06:10:23 +0000
commitd15312360e11332ada78a0dc9822181fd3abfaab (patch)
tree093b8696e40f46cf1318a34c8f1c2bc4043852e0
parent54f5ab713001fe2b12c32d629b37147066d1f7b3 (diff)
* file.c (file_expand_path): no need to expand root path which has no
short file name. [ruby-dev:35095] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8_7@17375 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog5
-rw-r--r--file.c6
-rw-r--r--version.h8
3 files changed, 12 insertions, 7 deletions
diff --git a/ChangeLog b/ChangeLog
index 8584c19..d16a492 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Tue Jun 17 15:09:46 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * 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@iDaemons.org>
* configure.in: Fix $LOAD_PATH. Properly expand vendor_ruby
diff --git a/file.c b/file.c
index 60d5a94..ba490c0 100644
--- a/file.c
+++ b/file.c
@@ -2746,14 +2746,14 @@ file_expand_path(fname, dname, result)
#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 @@ file_expand_path(fname, dname, result)
wfd.cFileName[len -= 4] = '\0';
}
#else
- p = strrdirsep(s);
+ p = (char *)s;
#endif
++p;
BUFCHECK(bdiff + len >= buflen);
diff --git a/version.h b/version.h
index 0f2ec3f..9784655 100644
--- a/version.h
+++ b/version.h
@@ -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[];