mirror/zig
1
0
Fork 0
mirror of https://github.com/ziglang/zig.git synced 2025-12-20 13:13:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

std: Fix edge case in isAbsolute fn family

Browse Source 
* Empty strings are not considered absolute paths.
* Refactor some common code.

Closes #4382
This commit is contained in:
LemonBoy 2020-02-04 12:32:05 +01:00 committed by Andrew Kelley
parent a697de3eac
commit 3e7c02edc1
1 changed files with 20 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

60
lib/std/fs/path.zig
View File

@ -146,72 +146,51 @@ pub fn isAbsolute(path: []const u8) bool {
} }
} }
pub fn isAbsoluteW(path_w: [*:0]const u16) bool { fn isAbsoluteWindowsImpl(comptime T: type, path: []const T) bool {
if (path_w[0] == '/') if (path.len < 1)
return true;
if (path_w[0] == '\\') {
return true;
}
if (path_w[0] == 0 or path_w[1] == 0 or path_w[2] == 0) {
return false; return false;
}
if (path_w[1] == ':') {
if (path_w[2] == '/')
return true;
if (path_w[2] == '\\')
return true;
}
return false;
}
pub fn isAbsoluteWindows(path: []const u8) bool {
if (path[0] == '/') if (path[0] == '/')
return true; return true;
if (path[0] == '\\') { if (path[0] == '\\')
return true; return true;
}
if (path.len < 3) { if (path.len < 3)
return false; return false;
}
if (path[1] == ':') { if (path[1] == ':') {
if (path[2] == '/') if (path[2] == '/')
return true; return true;
if (path[2] == '\\') if (path[2] == '\\')
return true; return true;
} }
return false; return false;
} }
pub fn isAbsoluteWindows(path: []const u8) bool {
return isAbsoluteWindowsImpl(u8, path);
}
pub fn isAbsoluteW(path_w: [*:0]const u16) bool {
return isAbsoluteWindowsImpl(u16, mem.toSliceConst(u16, path_w));
}
pub fn isAbsoluteWindowsC(path_c: [*:0]const u8) bool { pub fn isAbsoluteWindowsC(path_c: [*:0]const u8) bool {
if (path_c[0] == '/') return isAbsoluteWindowsImpl(u8, mem.toSliceConst(u8, path_c));
return true;
if (path_c[0] == '\\') {
return true;
}
if (path_c[0] == 0 or path_c[1] == 0 or path_c[2] == 0) {
return false;
}
if (path_c[1] == ':') {
if (path_c[2] == '/')
return true;
if (path_c[2] == '\\')
return true;
}
return false;
} }
pub fn isAbsolutePosix(path: []const u8) bool { pub fn isAbsolutePosix(path: []const u8) bool {
return path[0] == sep_posix; return path.len > 0 and path[0] == sep_posix;
} }
pub fn isAbsolutePosixC(path_c: [*:0]const u8) bool { pub fn isAbsolutePosixC(path_c: [*:0]const u8) bool {
return path_c[0] == sep_posix; return isAbsolutePosix(mem.toSliceConst(u8, path_c));
} }
test "isAbsoluteWindows" { test "isAbsoluteWindows" {
testIsAbsoluteWindows("", false);
testIsAbsoluteWindows("/", true); testIsAbsoluteWindows("/", true);
testIsAbsoluteWindows("//", true); testIsAbsoluteWindows("//", true);
testIsAbsoluteWindows("//server", true); testIsAbsoluteWindows("//server", true);
@ -234,6 +213,7 @@ test "isAbsoluteWindows" {
} }
test "isAbsolutePosix" { test "isAbsolutePosix" {
testIsAbsolutePosix("", false);
testIsAbsolutePosix("/home/foo", true); testIsAbsolutePosix("/home/foo", true);
testIsAbsolutePosix("/home/foo/..", true); testIsAbsolutePosix("/home/foo/..", true);
testIsAbsolutePosix("bar/", false); testIsAbsolutePosix("bar/", false);