diff options
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | file.c | 6 | ||||
| -rw-r--r-- | version.h | 8 |
3 files changed, 12 insertions, 7 deletions
@@ -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 @@ -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); @@ -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[]; |