From f4e9f082ee8259b83a5962fa44ed154e27848238 Mon Sep 17 00:00:00 2001 From: JonasBa Date: Fri, 19 Jul 2024 17:17:45 -0400 Subject: [PATCH 1/3] fs: remove unnecessary option argument validation --- lib/fs.js | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/lib/fs.js b/lib/fs.js index 2119554c0e72c1..2d930629400fe1 100644 --- a/lib/fs.js +++ b/lib/fs.js @@ -1310,23 +1310,23 @@ function mkdir(path, options, callback) { if (typeof options === 'function') { callback = options; } else if (typeof options === 'number' || typeof options === 'string') { - mode = options; + mode = parseFileMode(options, 'mode'); } else if (options) { - if (options.recursive !== undefined) + if (options.recursive !== undefined) { recursive = options.recursive; - if (options.mode !== undefined) - mode = options.mode; + validateBoolean(options.recursive); + } + if (options.mode !== undefined) { + mode = parseFileMode(options.mode, 'options.mode'); + } } callback = makeCallback(callback); - path = getValidatedPath(path); - - validateBoolean(recursive, 'options.recursive'); const req = new FSReqCallback(); req.oncomplete = callback; binding.mkdir( - path, - parseFileMode(mode, 'mode'), + getValidatedPath(path), + mode, recursive, req, ); From 1a7b03d0a50d8c84d0e54cb7f5581bc6337bb30e Mon Sep 17 00:00:00 2001 From: JonasBa Date: Fri, 19 Jul 2024 17:55:08 -0400 Subject: [PATCH 2/3] fs: validate recursive --- lib/fs.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/fs.js b/lib/fs.js index 2d930629400fe1..2a686ca23046b6 100644 --- a/lib/fs.js +++ b/lib/fs.js @@ -1314,7 +1314,7 @@ function mkdir(path, options, callback) { } else if (options) { if (options.recursive !== undefined) { recursive = options.recursive; - validateBoolean(options.recursive); + validateBoolean(recursive); } if (options.mode !== undefined) { mode = parseFileMode(options.mode, 'options.mode'); From 89a14bfb1296db6e7ca5521b46a543246e334847 Mon Sep 17 00:00:00 2001 From: JonasBa Date: Mon, 5 Aug 2024 16:30:24 -0400 Subject: [PATCH 3/3] fs: fix validation name arg --- lib/fs.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/fs.js b/lib/fs.js index 2a686ca23046b6..75921ebfd52d36 100644 --- a/lib/fs.js +++ b/lib/fs.js @@ -1314,7 +1314,7 @@ function mkdir(path, options, callback) { } else if (options) { if (options.recursive !== undefined) { recursive = options.recursive; - validateBoolean(recursive); + validateBoolean(recursive, 'options.recursive'); } if (options.mode !== undefined) { mode = parseFileMode(options.mode, 'options.mode');