Commit 2551946a5102a72b4120b70d400ce4c9ff517415 | zig

author	LemonBoy <thatlemon@gmail.com> 2021-11-04 22:40:31+01:00
committer	Andrew Kelley <andrew@ziglang.org> 2021-11-04 21:05:14-04:00
log	2551946a5102a72b4120b70d400ce4c9ff517415
tree	0e5186c313f398ff2133f90457722eca1c82d758
parent	e97feb96e4daf7d53538c9c8773d50459a59e5ee

std: Fix path resolution on Windows

GetCurrentDirectory returns a path with a trailing slash iff the cwd is
a root directory, making the code in `resolveWindows` return an invalid
path with two consecutive slashes.

Closes #10093

2 files changed, 10 insertions(+), 0 deletions(-)

lib
- std
  - fs
    path.zig
src
- stage1
  - os.cpp

lib/std/fs/path.zig+5

 @@ -592,6 +592,11 @@ pub fn resolveWindows(allocator: *Allocator, paths: []const []const u8) ![]u8 {
         result_disk_designator = parsed_cwd.disk_designator;
         if (parsed_cwd.kind == WindowsPath.Kind.Drive) {
             result[0] = asciiUpper(result[0]);
+            // Remove the trailing slash if present, eg. if the cwd is a root
+            // directory.
+            if (cwd.len > 0 and cwd[cwd.len - 1] == sep_windows) {
+                result_index -= 1;
+            }
         }
         have_drive_kind = parsed_cwd.kind;
     }

src/stage1/os.cpp+5

 @@ -473,6 +473,11 @@ static Buf os_path_resolve_windows(Buf **paths_ptr, size_t paths_len) {
         result_disk_designator = parsed_cwd.disk_designator;
         if (parsed_cwd.kind == WindowsPathKindDrive) {
             result.ptr[0] = asciiUpper(result.ptr[0]);
+            // Remove the trailing slash if present, eg. if the cwd is a root
+            // directory.
+            if (buf_ends_with_mem(&cwd, "\\", 1)) {
+                result_index -= 1;
+            }
         }
         have_drive_kind = parsed_cwd.kind;
     }