Skip to content

Commit 905ac12

Browse files
committed
Rearrange memfs rename
1 parent 9a54975 commit 905ac12

File tree

1 file changed

+7
-11
lines changed

1 file changed

+7
-11
lines changed

src/library_memfs.js

Lines changed: 7 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -192,23 +192,19 @@ addToLibrary({
192192
return MEMFS.createNode(parent, name, mode, dev);
193193
},
194194
rename(old_node, new_dir, new_name) {
195-
// if we're overwriting a directory at new_name, make sure it's empty.
196195
var new_node;
197-
if (FS.isDir(old_node.mode)) {
198-
try {
199-
new_node = FS.lookupNode(new_dir, new_name);
200-
} catch (e) {
201-
}
202-
if (new_node) {
196+
try {
197+
new_node = FS.lookupNode(new_dir, new_name);
198+
} catch (e) {}
199+
if (new_node) {
200+
if (FS.isDir(old_node.mode)) {
201+
// if we're overwriting a directory at new_name, make sure it's empty.
203202
for (var i in new_node.contents) {
204203
throw new FS.ErrnoError({{{ cDefs.ENOTEMPTY }}});
205204
}
206205
}
207-
}
208-
try {
209-
new_node = FS.lookupNode(new_dir, new_name);
210206
FS.hashRemoveNode(new_node);
211-
} catch (e) {}
207+
}
212208
// do the internal rewiring
213209
delete old_node.parent.contents[old_node.name];
214210
old_node.parent.timestamp = Date.now()

0 commit comments

Comments
 (0)