diff options
author | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2003-02-20 09:44:54 +0000 |
---|---|---|
committer | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2003-02-20 09:44:54 +0000 |
commit | 79d91e36081423ef090c84825b3c5e6ace87d44b (patch) | |
tree | 009e5492a79483162fd33986fbb2cce714851bdc | |
parent | 42de8af413596a544c5438222260d3a16483be8e (diff) |
* 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") => "/"
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@3513 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r-- | ChangeLog | 7 | ||||
-rw-r--r-- | file.c | 6 |
2 files changed, 11 insertions, 2 deletions
@@ -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> * file.c (file_expand_path): should not upward beyond share name. @@ -1434,7 +1434,7 @@ nextdirsep(s) return (char *)s; } - +#if defined(DOSISH_UNC) || defined(DOSISH_DRIVE_LETTER) static inline char * skipprefix(path) const char *path; @@ -1450,9 +1450,11 @@ skipprefix(path) if (has_drive_letter(path)) return (char *)(path + 2); #endif - while (isdirsep(*path)) path++; return (char *)path; } +#else +#define skipprefix(path) (path) +#endif static char * strrdirsep(path) |