From fbe2d85bd5a5c370a8cacea92b3bdfbd9f98a530 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?H=C3=BCseyin=20A=C3=A7acak?= <huseyin@janeasystems.com>
Date: Thu, 10 Oct 2024 09:09:53 +0300
Subject: [PATCH] win,fs: remove trailing slash in junctions

Fixes: https://github.com/libuv/libuv/issues/3329
---
 src/win/fs.c   | 1 -
 test/test-fs.c | 8 ++++----
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/src/win/fs.c b/src/win/fs.c
index 08b42eb14..81a7c99d2 100644
--- a/src/win/fs.c
+++ b/src/win/fs.c
@@ -2566,7 +2566,6 @@ static void fs__create_junction(uv_fs_t* req, const WCHAR* path,
 
     path_buf[path_buf_len++] = path[i];
   }
-  path_buf[path_buf_len++] = L'\\';
   len = path_buf_len - start;
 
   /* Set the info about the substitute name */
diff --git a/test/test-fs.c b/test/test-fs.c
index ff0f9fc89..33cbd4287 100644
--- a/test/test-fs.c
+++ b/test/test-fs.c
@@ -2379,8 +2379,8 @@ int test_symlink_dir_impl(int type) {
   strcpy(test_dir_abs_buf, "\\\\?\\");
   uv_cwd(test_dir_abs_buf + 4, &test_dir_abs_size);
   test_dir_abs_size += 4;
-  strcat(test_dir_abs_buf, "\\test_dir\\");
-  test_dir_abs_size += strlen("\\test_dir\\");
+  strcat(test_dir_abs_buf, "\\test_dir");
+  test_dir_abs_size += strlen("\\test_dir");
   test_dir = test_dir_abs_buf;
 #else
   uv_cwd(test_dir_abs_buf, &test_dir_abs_size);
@@ -2435,8 +2435,8 @@ int test_symlink_dir_impl(int type) {
   r = uv_fs_realpath(NULL, &req, "test_dir_symlink", NULL);
   ASSERT_OK(r);
 #ifdef _WIN32
-  ASSERT_EQ(strlen(req.ptr), test_dir_abs_size - 5);
-  ASSERT_OK(_strnicmp(req.ptr, test_dir + 4, test_dir_abs_size - 5));
+  ASSERT_EQ(strlen(req.ptr), test_dir_abs_size - 4);
+  ASSERT_OK(_strnicmp(req.ptr, test_dir + 4, test_dir_abs_size - 4));
 #else
   ASSERT_OK(strcmp(req.ptr, test_dir_abs_buf));
 #endif