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

*** empty log message ***

Browse Source 
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@3498 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nobu 2003-02-17 04:27:45 +00:00
parent d0d70d648d
commit 8fe2085eb7
1 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
file.c
View File

@ -1591,7 +1591,6 @@ file_expand_path(fname, dname, result)
strcpy(buf, dir); strcpy(buf, dir);
free(dir); free(dir);
} }
p = skiproot(buf);
#ifdef DOSISH #ifdef DOSISH
if (isdirsep(*s)) { if (isdirsep(*s)) {
/* specified full path, but not drive letter nor UNC */ /* specified full path, but not drive letter nor UNC */
@ -1601,24 +1600,24 @@ file_expand_path(fname, dname, result)
} }
else if (isdirsep(buf[0]) && isdirsep(buf[1])) { else if (isdirsep(buf[0]) && isdirsep(buf[1])) {
/* or UNC share name */ /* or UNC share name */
if (*(p = nextdirsep(p))) p = nextdirsep(p + 1); if (*(p = nextdirsep(buf + 2))) p = nextdirsep(p + 1);
} }
} }
else else
#endif #endif
if (*p) p = chompdirsep(skiproot(buf));
p = chompdirsep(p);
else if (p > buf)
--p;
} }
else { else {
b = s; b = s;
do s++; while (isdirsep(*s)); do s++; while (isdirsep(*s));
p = buf + (s - b) - 1; p = buf + (s - b);
BUFCHECK(p >= pend); BUFCHECK(p >= pend);
memset(buf, '/', p - buf); memset(buf, '/', p - buf);
} }
*p = '/'; if (p > buf && p[-1] == '/')
--p;
else
*p = '/';
b = s; b = s;
while (*s) { while (*s) {