GeezerVison

The World Wide Web, restored to 800 pixels of glory.

GeezerVison is showing github.com — fs: fix rmSync error code · nodejs/node@041a217

File tree

Expand file treeCollapse file tree

Open diff view settings

Filter options

src
- node_file.cc
test/parallel
- test-fs-rm.js

Expand file treeCollapse file tree

Open diff view settings

Collapse file

`‎src/node_file.cc‎`

Copy file name to clipboardExpand all lines: src/node_file.cc

+2-1Lines changed: 2 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -1705,7 +1705,8 @@ static void RmSync(const FunctionCallbackInfo<Value>& args) {`
`1705`	`1705`	`return env->ThrowErrnoException(EPERM, "rm", message.c_str(), path_c_str);`
`1706`	`1706`	`} else if (error == std::errc::directory_not_empty) {`
`1707`	`1707`	`std::string message = "Directory not empty: " + file_path_str;`
`1708`		`- return env->ThrowErrnoException(EACCES, "rm", message.c_str(), path_c_str);`
	`1708`	`+ return env->ThrowErrnoException(`
	`1709`	`+ ENOTEMPTY, "rm", message.c_str(), path_c_str);`
`1709`	`1710`	`} else if (error == std::errc::not_a_directory) {`
`1710`	`1711`	`std::string message = "Not a directory: " + file_path_str;`
`1711`	`1712`	`return env->ThrowErrnoException(ENOTDIR, "rm", message.c_str(), path_c_str);`

Collapse file

`‎test/parallel/test-fs-rm.js‎`

Copy file name to clipboardExpand all lines: test/parallel/test-fs-rm.js

+12-4Lines changed: 12 additions & 4 deletions

Original file line number	Diff line number	Diff line change
`@@ -481,12 +481,20 @@ if (isGitPresent) {`
`481`	`481`	`// IBMi has a different access permission mechanism`
`482`	`482`	// This test should not be run as `root`
`483`	`483`	`if (!common.isIBMi && (common.isWindows \|\| process.getuid() !== 0)) {`
`484`		`- function makeDirectoryReadOnly(dir, mode) {`
	`484`	`+ function makeDirectoryReadOnly(dir, allowExecute) {`
`485`	`485`	`let accessErrorCode = 'EACCES';`
	`486`	`+ if (common.isMacOS && allowExecute) {`
	`487`	`+ accessErrorCode = 'ENOTEMPTY';`
	`488`	`+ }`
`486`	`489`	`if (common.isWindows) {`
`487`	`490`	`accessErrorCode = 'EPERM';`
`488`		- execSync(`icacls ${dir} /deny "everyone:(OI)(CI)(DE,DC)"`);
	`491`	`+ const permissions = ['DE', 'DC'];`
	`492`	`+ if (!allowExecute) {`
	`493`	`+ permissions.push('X');`
	`494`	`+ }`
	`495`	+ execSync(`icacls ${dir} /deny "everyone:(OI)(CI)(${permissions.join(',')})"`);
`489`	`496`	`} else {`
	`497`	`+ const mode = allowExecute ? 0o555 : 0o444;`
`490`	`498`	`fs.chmodSync(dir, mode);`
`491`	`499`	`}`
`492`	`500`	`return accessErrorCode;`
`@@ -510,7 +518,7 @@ if (isGitPresent) {`
`510`	`518`	`try {`
`511`	`519`	`fs.mkdirSync(dirname, common.mustNotMutateObjectDeep({ recursive: true }));`
`512`	`520`	`fs.writeFileSync(filePath, 'hello');`
`513`		`- const code = makeDirectoryReadOnly(dirname, 0o444);`
	`521`	`+ const code = makeDirectoryReadOnly(dirname, false);`
`514`	`522`	`assert.throws(() => {`
`515`	`523`	`fs.rmSync(filePath, common.mustNotMutateObjectDeep({ force: true }));`
`516`	`524`	`}, {`
`@@ -532,7 +540,7 @@ if (isGitPresent) {`
`532`	`540`	`fs.mkdirSync(middle);`
`533`	`541`	fs.mkdirSync(path.join(middle, 'leaf')); // Make `middle` non-empty
`534`	`542`	`try {`
`535`		`- const code = makeDirectoryReadOnly(middle, 0o555);`
	`543`	`+ const code = makeDirectoryReadOnly(middle, true);`
`536`	`544`	`try {`
`537`	`545`	`assert.throws(() => {`
`538`	`546`	`fs.rmSync(root, common.mustNotMutateObjectDeep({ recursive: true }));`

0 commit comments

Comments

0 (0)

You are visitor 01402503 — GeezerVison does not store the pages you look up.
Best viewed with Netscape Navigator 4.7 or Internet Explorer 6 at 800×600. No cookies required.