Forbid renaming directories

Author: rstz

pthreadfs/examples/emscripten-tests/rename.cpp

@@ -80,6 +80,7 @@ void test() {
   assert(err == -1);
   assert(errno == ENOTDIR);
 
+#ifndef PTHREADFS_NO_DIR_RENAME
   // can't overwrite a non-empty folder
   err = rename("persistent/dir", "persistent/dir-nonempty");
   assert(err == -1);
@@ -99,6 +100,7 @@ void test() {
   err = rename("persistent/dir/subdir", "persistent/dir");
   assert(err == -1);
   assert(errno == ENOTEMPTY);
+#endif  // PTHREADFS_NO_DIR_RENAME
 
   // do some valid renaming
   err = rename("persistent/dir/file", "persistent/dir/file1");

pthreadfs/library_pthreadfs.js

@@ -3187,8 +3187,9 @@ mergeInto(LibraryManager.library, {
 
       rename: async function (oldNode, newParentNode, newName) {
         FSAFS.debug('rename', arguments);
-        if (oldNode.contents && Object.keys(oldNode.contents).length > 0) {
-          throw new PThreadFS.ErrnoError({{{ cDefine('ENOTEMPTY') }}});
+        if (PThreadFS.isDir(oldNode.mode)) {
+          console.log('Rename error: File System Access does not support renaming directories');
+          throw new PThreadFS.ErrnoError({{{ cDefine('EXDEV') }}});
         }
         try {
           await oldNode.localReference.move(newParentNode.localReference, newName);

pthreadfs/src/js/library_fsafs.js

@@ -189,8 +189,9 @@ mergeInto(LibraryManager.library, {
 
       rename: async function (oldNode, newParentNode, newName) {
         FSAFS.debug('rename', arguments);
-        if (oldNode.contents && Object.keys(oldNode.contents).length > 0) {
-          throw new PThreadFS.ErrnoError({{{ cDefine('ENOTEMPTY') }}});
+        if (PThreadFS.isDir(oldNode.mode)) {
+          console.log('Rename error: File System Access does not support renaming directories');
+          throw new PThreadFS.ErrnoError({{{ cDefine('EXDEV') }}});
         }
         try {
           await oldNode.localReference.move(newParentNode.localReference, newName);