Skip to content
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

Fix error being overridden incorrectly on FS.Rename #11812

Merged
merged 6 commits into from
Aug 19, 2020
Merged

Fix error being overridden incorrectly on FS.Rename #11812

Changes from 3 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
fb934d6
Fix error being overridden incorrectly on FS.Rename
kjpou1 Aug 5, 2020
a61131c
Merge branch 'master' of https://github.com/emscripten-core/emscripte…
kjpou1 Aug 18, 2020
7d3dae0
Remove try catch around directory path lookup as per review comments.
kjpou1 Aug 18, 2020
772383c
Add test to test_rename.c.
kjpou1 Aug 18, 2020
86c4ab5
Add to authors
kjpou1 Aug 18, 2020
e729dd2
Merge branch 'master' of https://github.com/emscripten-core/emscripte…
kjpou1 Aug 19, 2020
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
15 changes: 7 additions & 8 deletions src/library_fs.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -720,14 +720,13 @@ FS.staticInit();` +
var new_name = PATH.basename(new_path);
// parents must exist
var lookup, old_dir, new_dir;
try {
lookup = FS.lookupPath(old_path, { parent: true });
old_dir = lookup.node;
lookup = FS.lookupPath(new_path, { parent: true });
new_dir = lookup.node;
} catch (e) {
throw new FS.ErrnoError({{{ cDefine('EBUSY') }}});
}

// let the errors from non existant directories percolate up
lookup = FS.lookupPath(old_path, { parent: true });
old_dir = lookup.node;
lookup = FS.lookupPath(new_path, { parent: true });
new_dir = lookup.node;

if (!old_dir || !new_dir) throw new FS.ErrnoError({{{ cDefine('ENOENT') }}});
// need to be part of the same mount
if (old_dir.mount !== new_dir.mount) {
Expand Down