summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorYukihiro "Matz" Matsumoto <[email protected]>2020-03-07 17:58:26 +0900
committerGitHub <[email protected]>2020-03-07 17:58:26 +0900
commitf45549edbfd2131e40363af93ee14e73694f3d20 (patch)
tree23306a8df125af59f86efdb3402098151882a4ad
parent4687f8790c64b6ebfad179b41e30a02c2a4800ba (diff)
parent5a4b9fd8772a7bd34c8866716a7622237fed5e7b (diff)
downloadmruby-f45549edbfd2131e40363af93ee14e73694f3d20.tar.gz
mruby-f45549edbfd2131e40363af93ee14e73694f3d20.zip
Merge pull request #4951 from Reckordp/master
Fix unfinished changes
-rw-r--r--mrbgems/mruby-io/src/file.c8
1 files changed, 5 insertions, 3 deletions
diff --git a/mrbgems/mruby-io/src/file.c b/mrbgems/mruby-io/src/file.c
index b94649534..ffce0ddcb 100644
--- a/mrbgems/mruby-io/src/file.c
+++ b/mrbgems/mruby-io/src/file.c
@@ -283,9 +283,11 @@ static int
mrb_file_is_absolute_path(const char *path)
{
#ifdef _WIN32
-#define IS_PATHSEP(x) (x == '/' || x == '\')
- if (strlen(path) < 3) return 0;
- return (isalpha(path[0]) && path[1] == ':' && IS_PATHSEP(path[2]));
+#define IS_PATHSEP(x) (x == '/' || x == '\\')
+ if (isalpha(path[0]))
+ return (strlen(path) > 2 && path[1] == ':' && IS_PATHSEP(path[2]));
+ else
+ return (IS_PATHSEP(path[0]) && IS_PATHSEP(path[1]));
#undef IS_PATHSEP
#else
return (path[0] == '/');