fs: set path when mkdir recursive called on file

bcoe · codebytere · commit 21fc81821fa4 · 2020-02-17T12:04:57.000-08:00
PR-URL: #31607 Fixes: #28015 Reviewed-By: Anna Henningsen <anna@addaleax.net> Reviewed-By: Rich Trott <rtrott@gmail.com> Reviewed-By: Luigi Pinca <luigipinca@gmail.com> Reviewed-By: Richard Lau <riclau@uk.ibm.com>
diff --git a/src/node_file.cc b/src/node_file.cc
@@ -1234,6 +1234,7 @@ int MKDirpSync(uv_loop_t* loop,
           }
           break;
         case UV_EACCES:
+        case UV_ENOTDIR:
         case UV_EPERM: {
           return err;
         }
@@ -1309,6 +1310,7 @@ int MKDirpAsync(uv_loop_t* loop,
           break;
         }
         case UV_EACCES:
+        case UV_ENOTDIR:
         case UV_EPERM: {
           req_wrap->continuation_data()->Done(err);
           break;
@@ -1351,7 +1353,6 @@ int MKDirpAsync(uv_loop_t* loop,
             }
             // verify that the path pointed to is actually a directory.
             if (err == 0 && !S_ISDIR(req->statbuf.st_mode)) err = UV_EEXIST;
-            uv_fs_req_cleanup(req);
             req_wrap->continuation_data()->Done(err);
           }});
           if (err < 0) req_wrap->continuation_data()->Done(err);
diff --git a/test/parallel/test-fs-mkdir.js b/test/parallel/test-fs-mkdir.js
@@ -148,6 +148,7 @@ function nextdir() {
       message: /ENOTDIR: .*mkdir/,
       name: 'Error',
       syscall: 'mkdir',
+      path: pathname // See: https://github.com/nodejs/node/issues/28015
     }
   );
 }
@@ -187,6 +188,11 @@ function nextdir() {
     assert.strictEqual(err.code, 'ENOTDIR');
     assert.strictEqual(err.syscall, 'mkdir');
     assert.strictEqual(fs.existsSync(pathname), false);
+    // See: https://github.com/nodejs/node/issues/28015
+    // The path field varies slightly in Windows errors, vs., other platforms
+    // see: https://github.com/libuv/libuv/issues/2661, for this reason we
+    // use startsWith() rather than comparing to the full "pathname".
+    assert(err.path.startsWith(filename));
   }));
 }
 

Original file line number	Diff line number	Diff line change
`@@ -1234,6 +1234,7 @@ int MKDirpSync(uv_loop_t* loop,`
`1234`	`1234`	`}`
`1235`	`1235`	`break;`
`1236`	`1236`	`case UV_EACCES:`
	`1237`	`+ case UV_ENOTDIR:`
`1237`	`1238`	`case UV_EPERM: {`
`1238`	`1239`	`return err;`
`1239`	`1240`	`}`
`@@ -1309,6 +1310,7 @@ int MKDirpAsync(uv_loop_t* loop,`
`1309`	`1310`	`break;`
`1310`	`1311`	`}`
`1311`	`1312`	`case UV_EACCES:`
	`1313`	`+ case UV_ENOTDIR:`
`1312`	`1314`	`case UV_EPERM: {`
`1313`	`1315`	`req_wrap->continuation_data()->Done(err);`
`1314`	`1316`	`break;`
`@@ -1351,7 +1353,6 @@ int MKDirpAsync(uv_loop_t* loop,`
`1351`	`1353`	`}`
`1352`	`1354`	`// verify that the path pointed to is actually a directory.`
`1353`	`1355`	`if (err == 0 && !S_ISDIR(req->statbuf.st_mode)) err = UV_EEXIST;`
`1354`		`- uv_fs_req_cleanup(req);`
`1355`	`1356`	`req_wrap->continuation_data()->Done(err);`
`1356`	`1357`	`}});`
`1357`	`1358`	`if (err < 0) req_wrap->continuation_data()->Done(err);`
Original file line number	Diff line number	Diff line change
`@@ -148,6 +148,7 @@ function nextdir() {`
`148`	`148`	`message: /ENOTDIR: .*mkdir/,`
`149`	`149`	`name: 'Error',`
`150`	`150`	`syscall: 'mkdir',`
	`151`	`+ path: pathname // See: https://github.com/nodejs/node/issues/28015`
`151`	`152`	`}`
`152`	`153`	`);`
`153`	`154`	`}`
`@@ -187,6 +188,11 @@ function nextdir() {`
`187`	`188`	`assert.strictEqual(err.code, 'ENOTDIR');`
`188`	`189`	`assert.strictEqual(err.syscall, 'mkdir');`
`189`	`190`	`assert.strictEqual(fs.existsSync(pathname), false);`
	`191`	`+ // See: https://github.com/nodejs/node/issues/28015`
	`192`	`+ // The path field varies slightly in Windows errors, vs., other platforms`
	`193`	`+ // see: https://github.com/libuv/libuv/issues/2661, for this reason we`
	`194`	`+ // use startsWith() rather than comparing to the full "pathname".`
	`195`	`+ assert(err.path.startsWith(filename));`
`190`	`196`	`}));`
`191`	`197`	`}`
`192`	`198`