1berry/ruby
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

* file.c (file_expand_path): no need to expand root path which has no

Browse Source 
short file name.  [ruby-dev:35095]


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@17160 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nobu 2008-06-14 07:56:06 +00:00
parent fc3c60f608
commit 1df1cb307e
2 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -1,3 +1,8 @@
Sat Jun 14 16:55: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]
Sat Jun 14 11:59:17 2008 Nobuyoshi Nakada <nobu@ruby-lang.org> Sat Jun 14 11:59:17 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
* gc.h (STACK_UPPER): moved from gc.c * gc.h (STACK_UPPER): moved from gc.c

6
file.c
View File

@ -2829,14 +2829,14 @@ file_expand_path(VALUE fname, VALUE dname, VALUE result)
#if USE_NTFS #if USE_NTFS
*p = '\0'; *p = '\0';
if (*(s = skipprefix(b = buf)) && !strpbrk(s, "*?")) { if ((s = strrdirsep(b = buf)) != 0 && !strpbrk(s, "*?")) {
size_t len; size_t len;
WIN32_FIND_DATA wfd; WIN32_FIND_DATA wfd;
#ifdef __CYGWIN__ #ifdef __CYGWIN__
int lnk_added = 0, is_symlink = 0; int lnk_added = 0, is_symlink = 0;
struct stat st; struct stat st;
char w32buf[MAXPATHLEN]; char w32buf[MAXPATHLEN];
p = strrdirsep(s); p = (char *)s;
if (lstat(buf, &st) == 0 && S_ISLNK(st.st_mode)) { if (lstat(buf, &st) == 0 && S_ISLNK(st.st_mode)) {
is_symlink = 1; is_symlink = 1;
*p = '\0'; *p = '\0';
@ -2865,7 +2865,7 @@ file_expand_path(VALUE fname, VALUE dname, VALUE result)
wfd.cFileName[len -= 4] = '\0'; wfd.cFileName[len -= 4] = '\0';
} }
#else #else
p = strrdirsep(s); p = (char *)s;
#endif #endif
++p; ++p;
BUFCHECK(bdiff + len >= buflen); BUFCHECK(bdiff + len >= buflen);