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

* file.c (file_expand_path): fix wrong behavior for root file.

Browse Source 
expand_path("..", "//machine/share") => "//machine/share"
  expand_path("..", "c:/a") => "c:/"
  expand_path("..", "/a") => "/"


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@3513 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nobu 2003-02-20 09:44:54 +00:00
parent 42de8af413
commit 79d91e3608
2 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
ChangeLog
View File

@ -1,3 +1,10 @@
Thu Feb 20 18:44:51 2003 Nobuyoshi Nakada <nobu.nokada@softhome.net>
* file.c (file_expand_path): fix wrong behavior for root file.
expand_path("..", "//machine/share") => "//machine/share"
expand_path("..", "c:/a") => "c:/"
expand_path("..", "/a") => "/"
Thu Feb 20 18:11:01 2003 Nobuyoshi Nakada <nobu.nokada@softhome.net> Thu Feb 20 18:11:01 2003 Nobuyoshi Nakada <nobu.nokada@softhome.net>
* file.c (file_expand_path): should not upward beyond share name. * file.c (file_expand_path): should not upward beyond share name.

6
file.c
View File

@ -1434,7 +1434,7 @@ nextdirsep(s)
return (char *)s; return (char *)s;
} }
#if defined(DOSISH_UNC) || defined(DOSISH_DRIVE_LETTER)
static inline char * static inline char *
skipprefix(path) skipprefix(path)
const char *path; const char *path;
@ -1450,9 +1450,11 @@ skipprefix(path)
if (has_drive_letter(path)) if (has_drive_letter(path))
return (char *)(path + 2); return (char *)(path + 2);
#endif #endif
while (isdirsep(*path)) path++;
return (char *)path; return (char *)path;
} }
#else
#define skipprefix(path) (path)
#endif
static char * static char *
strrdirsep(path) strrdirsep(path)