[PATCH v13 3/4] server: Handle renames to destinations containing trailing slashes.

[Gabriel Ivăncescu]

From: Gabriel Ivăncescu

They don't affect the operation even for regular files.

Signed-off-by: Gabriel Ivăncescu 
---

Also simplifies next patch.
---
 dlls/kernel32/tests/file.c | 18 ++++++++++++++++++
 server/fd.c                |  5 +++++
 2 files changed, 23 insertions(+)

diff --git a/dlls/kernel32/tests/file.c b/dlls/kernel32/tests/file.c
index e81fa0a4e20..378c3eb12a0 100644
--- a/dlls/kernel32/tests/file.c
+++ b/dlls/kernel32/tests/file.c
@@ -2185,6 +2185,24 @@ static void test_MoveFileA(void)
     todo_wine
     ok(ret == INVALID_FILE_ATTRIBUTES && GetLastError() == ERROR_FILE_NOT_FOUND, "GetFileAttributesA: error %ld\n", GetLastError());
     if(ret != INVALID_FILE_ATTRIBUTES) DeleteFileA(source);
+
+    /* test renaming a regular file to a name with trailing slash */
+    lstrcpyA(source, dest);
+    lstrcpyA(strrchr(dest, '\') + 1, "dir\");
+    ret = MoveFileA(source, dest);
+    ok(ret, "MoveFileA: error %ld\n", GetLastError());
+    *strrchr(dest, '\') = '\0';
+
+    hfind = FindFirstFileA(dest, &find_data);
+    ok(hfind != INVALID_HANDLE_VALUE, "FindFirstFileA: failed, error %ld\n", GetLastError());
+    if (hfind != INVALID_HANDLE_VALUE)
+    {
+        ok(!lstrcmpA(find_data.cFileName, "dir"),
+           "MoveFile failed to rename regular file to name with trailing slash: got %s\n", find_data.cFileName);
+    }
+    FindClose(hfind);
+    ret = GetFileAttributesA(source);
+    ok(ret == INVALID_FILE_ATTRIBUTES && GetLastError() == ERROR_FILE_NOT_FOUND, "GetFileAttributesA: error %ld\n", GetLastError());
     ret = DeleteFileA(dest);
     ok(ret, "DeleteFileA: error %ld\n", GetLastError());

diff --git a/server/fd.c b/server/fd.c
index bb0e90d99d0..4a0f7a1ad02 100644
--- a/server/fd.c
+++ b/server/fd.c
@@ -2568,6 +2568,11 @@ static void set_fd_name( struct fd *fd, struct fd *root, const char *nameptr, da
         set_error( STATUS_OBJECT_PATH_SYNTAX_BAD );
         return;
     }
+
+    /* strip trailing slashes */
+    while (len > 1 && nameptr[len - 1] == '/')
+        len--;
+
     if (!(name = mem_alloc( len + 1 ))) return;
     memcpy( name, nameptr, len );
     name[len] = 0;