fs: fix wrong order of file names in cpSync error message

npaun · targos · commit 8eb0d9d834c4 · 2025-09-09T08:34:18.000+02:00
PR-URL: #59775 Reviewed-By: Dario Piotrowicz <dario.piotrowicz@gmail.com> Reviewed-By: Luigi Pinca <luigipinca@gmail.com> Reviewed-By: Yagiz Nizipli <yagiz@nizipli.com> Reviewed-By: Ulises Gascón <ulisesgascongonzalez@gmail.com> Reviewed-By: Anna Henningsen <anna@addaleax.net> Reviewed-By: James M Snell <jasnell@gmail.com>
diff --git a/src/node_file.cc b/src/node_file.cc
@@ -3276,7 +3276,7 @@ static void CpSyncCheckPaths(const FunctionCallbackInfo<Value>& args) {
       std::string message =
           "Cannot overwrite non-directory %s with directory %s";
       return THROW_ERR_FS_CP_DIR_TO_NON_DIR(
-          env, message.c_str(), src_path_str, dest_path_str);
+          env, message.c_str(), dest_path_str, src_path_str);
     }
 
     if (!src_is_dir && dest_is_dir) {
diff --git a/test/parallel/test-fs-cp-sync-copy-directory-to-file-error.mjs b/test/parallel/test-fs-cp-sync-copy-directory-to-file-error.mjs
@@ -14,11 +14,11 @@ if (isInsideDirWithUnusualChars) {
 tmpdir.refresh();
 
 {
-  const src = nextdir();
+  const src = nextdir('FIRST_DIRECTORY');
   mkdirSync(src, mustNotMutateObjectDeep({ recursive: true }));
   const dest = fixtures.path('copy/kitchen-sink/README.md');
   assert.throws(
     () => cpSync(src, dest),
-    { code: 'ERR_FS_CP_DIR_TO_NON_DIR' }
+    { code: 'ERR_FS_CP_DIR_TO_NON_DIR', message: /non-directory .*README\.md with directory .*FIRST_DIRECTORY/ }
   );
 }

Original file line number	Diff line number	Diff line change
`@@ -3276,7 +3276,7 @@ static void CpSyncCheckPaths(const FunctionCallbackInfo<Value>& args) {`
`3276`	`3276`	`std::string message =`
`3277`	`3277`	`"Cannot overwrite non-directory %s with directory %s";`
`3278`	`3278`	`return THROW_ERR_FS_CP_DIR_TO_NON_DIR(`
`3279`		`- env, message.c_str(), src_path_str, dest_path_str);`
	`3279`	`+ env, message.c_str(), dest_path_str, src_path_str);`
`3280`	`3280`	`}`
`3281`	`3281`
`3282`	`3282`	`if (!src_is_dir && dest_is_dir) {`
Original file line number	Diff line number	Diff line change
`@@ -14,11 +14,11 @@ if (isInsideDirWithUnusualChars) {`
`14`	`14`	`tmpdir.refresh();`
`15`	`15`
`16`	`16`	`{`
`17`		`- const src = nextdir();`
	`17`	`+ const src = nextdir('FIRST_DIRECTORY');`
`18`	`18`	`mkdirSync(src, mustNotMutateObjectDeep({ recursive: true }));`
`19`	`19`	`const dest = fixtures.path('copy/kitchen-sink/README.md');`
`20`	`20`	`assert.throws(`
`21`	`21`	`() => cpSync(src, dest),`
`22`		`- { code: 'ERR_FS_CP_DIR_TO_NON_DIR' }`
	`22`	`+ { code: 'ERR_FS_CP_DIR_TO_NON_DIR', message: /non-directory .README\.md with directory .FIRST_DIRECTORY/ }`
`23`	`23`	`);`
`24`	`24`	`}`