Skip to content

Fix fs.mkdir(). #996

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Dec 1, 2025
+170 −38
Merged

Fix fs.mkdir(). #996

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
44dd66e
FS: fixed fs.mkdir() and friends.
xeioex Nov 26, 2025
fec2c1f
FS: fixed path restoration in fs.mkdir() and friends on error.
xeioex Nov 26, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
43 changes: 24 additions & 19 deletions external/njs_fs_module.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2950,28 +2950,27 @@ njs_fs_make_path(njs_vm_t *vm, char *path, mode_t md, njs_bool_t recursive,
ret = mkdir(path, md);
err = errno;

switch (ret) {
case 0:
break;

case EACCES:
case ENOTDIR:
case EPERM:
goto failed;

case EEXIST:
default:
ret = stat(path, &sb);
if (ret == 0) {
if (!S_ISDIR(sb.st_mode)) {
err = ENOTDIR;
goto failed;
if (ret != 0) {
switch (err) {
case EACCES:
case ENOTDIR:
case EPERM:
goto failed_restore;

case EEXIST:
default:
ret = stat(path, &sb);
if (ret == 0) {
if (!S_ISDIR(sb.st_mode)) {
err = ENOTDIR;
goto failed_restore;
}

break;
}

break;
goto failed_restore;
}

goto failed;
}

if (p == end) {
Expand All @@ -2984,6 +2983,12 @@ njs_fs_make_path(njs_vm_t *vm, char *path, mode_t md, njs_bool_t recursive,

return NJS_OK;

failed_restore:

if (p != end) {
path[p - path] = '/';
}

failed:

return njs_fs_error(vm, "mkdir", strerror(err), path, err, retval);
Expand Down
43 changes: 24 additions & 19 deletions external/qjs_fs_module.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -513,28 +513,27 @@ qjs_fs_make_path(JSContext *cx, char *path, mode_t md, int recursive)
ret = mkdir(path, md);
err = errno;

switch (ret) {
case 0:
break;

case EACCES:
case ENOTDIR:
case EPERM:
goto failed;

case EEXIST:
default:
ret = stat(path, &sb);
if (ret == 0) {
if (!S_ISDIR(sb.st_mode)) {
err = ENOTDIR;
goto failed;
if (ret != 0) {
switch (err) {
case EACCES:
case ENOTDIR:
case EPERM:
goto failed_restore;

case EEXIST:
default:
ret = stat(path, &sb);
if (ret == 0) {
if (!S_ISDIR(sb.st_mode)) {
err = ENOTDIR;
goto failed_restore;
}

break;
}

break;
goto failed_restore;
}

goto failed;
}

if (p == end) {
Expand All @@ -547,6 +546,12 @@ qjs_fs_make_path(JSContext *cx, char *path, mode_t md, int recursive)

return JS_UNDEFINED;

failed_restore:

if (p != end) {
path[p - path] = '/';
}

failed:

return qjs_fs_error(cx, "mkdir", strerror(err), path, err);
Expand Down
122 changes: 122 additions & 0 deletions test/fs/mkdir_error_path.t.mjs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,122 @@
/*---
includes: [compareArray.js, compatFs.js]
flags: [async]
---*/

var dname = `${test_dir}/mkdir_error_path`;

let stages = [];

var testSync = () => new Promise((resolve, reject) => {
try {
try { fs.unlinkSync(dname + '/a/b'); } catch (e) {}
try { fs.rmdirSync(dname + '/a'); } catch (e) {}
try { fs.rmdirSync(dname); } catch (e) {}

fs.mkdirSync(dname + '/a', {recursive: true});
fs.writeFileSync(dname + '/a/b', 'blocking file');

try {
fs.mkdirSync(dname + '/a/b/c/d', {recursive: true});
reject(new Error('Expected ENOTDIR'));
} catch (e) {
if (e.code != 'ENOTDIR') {
reject(e);
}

if (!e.path.includes('/c/d')) {
reject(new Error('Path truncated: ' + e.path));
}
}

fs.unlinkSync(dname + '/a/b');
fs.rmdirSync(dname + '/a');
fs.rmdirSync(dname);

stages.push("mkdirSync");

resolve();
} catch (e) {
reject(e);
}
});

var testCallback = () => new Promise((resolve, reject) => {
try {
try { fs.unlinkSync(dname + '/a/b'); } catch (e) {}
try { fs.rmdirSync(dname + '/a'); } catch (e) {}
try { fs.rmdirSync(dname); } catch (e) {}

fs.mkdir(dname + '/a', {recursive: true}, (err) => {
if (err) {
reject(err);
return;
}

fs.writeFile(dname + '/a/b', 'blocking file', (err) => {
if (err) {
reject(err);
return;
}

fs.mkdir(dname + '/a/b/c/d', {recursive: true}, (err) => {
if (!err || err.code != 'ENOTDIR') {
reject(new Error('Expected ENOTDIR'));
return;
}

if (!err.path.includes('/c/d')) {
reject(new Error('Path truncated: ' + err.path));
return;
}

fs.unlinkSync(dname + '/a/b');
fs.rmdirSync(dname + '/a');
fs.rmdirSync(dname);

stages.push("mkdir");

resolve();
});
});
});
} catch (e) {
reject(e);
}
});

let testFsp = () => Promise.resolve()
.then(() => {
try { fs.unlinkSync(dname + '/a/b'); } catch (e) {}
try { fs.rmdirSync(dname + '/a'); } catch (e) {}
try { fs.rmdirSync(dname); } catch (e) {}
})
.then(() => fsp.mkdir(dname + '/a', {recursive: true}))
.then(() => fsp.writeFile(dname + '/a/b', 'blocking file'))
.then(() => fsp.mkdir(dname + '/a/b/c/d', {recursive: true}))
.then(() => {
throw new Error('Expected ENOTDIR');
})
.catch((e) => {
if (e.code != 'ENOTDIR') {
throw e;
}

if (!e.path.includes('/c/d')) {
throw new Error('Path truncated: ' + e.path);
}
})
.then(() => fsp.unlink(dname + '/a/b'))
.then(() => fsp.rmdir(dname + '/a'))
.then(() => fsp.rmdir(dname))
.then(() => {
stages.push("fsp.mkdir");
})

let p = Promise.resolve()
.then(testSync)
.then(testCallback)
.then(testFsp)
.then(() => assert.compareArray(stages, ['mkdirSync', 'mkdir', 'fsp.mkdir']))

p.then($DONE, $DONE);
0 test/fs/mkdir2.t.mjs → test/fs/mkdir_recursive.t.mjs
View file
Open in desktop
File renamed without changes.