- made FS.readdir easier to use

 - tightened up exported node and stream ops for each type

3 files changed, 59 insertions, 28 deletions

diff --git a/src/library.js b/src/library.js
index 815badc1..33b1f1aa 100644
--- a/src/library.js
+++ b/src/library.js
@@ -100,7 +100,7 @@ LibraryManager.library = {
     }
     var entries;
     try {
-      entries = FS.readdir(stream);
+      entries = FS.readdir(stream.path);
     } catch (e) {
       return FS.handleFSError(e);
     }
diff --git a/src/library_fs.js b/src/library_fs.js
index 9c83fcad..c9aa9900 100644
--- a/src/library_fs.js
+++ b/src/library_fs.js
@@ -730,6 +730,9 @@ mergeInto(LibraryManager.library, {
       });
       // use a custom read function
       stream_ops.read = function(stream, buffer, offset, length, position) {
+        if (!FS.forceLoadFile(node)) {
+          throw new FS.ErrnoError(ERRNO_CODES.EIO);
+        }
         var contents = stream.node.contents;
         var size = Math.min(contents.length - position, length);
         if (contents.slice) { // normal array
@@ -1035,7 +1038,7 @@ mergeInto(LibraryManager.library, {
       FS.hashRemoveNode(old_node);
       // do the underlying fs rename
       try {
-        old_node.node_ops.rename(old_node, new_dir, new_name);
+        old_dir.node_ops.rename(old_node, new_dir, new_name);
       } catch (e) {
         throw e;
       } finally {
@@ -1062,6 +1065,14 @@ mergeInto(LibraryManager.library, {
       parent.node_ops.rmdir(parent, name);
       FS.destroyNode(node);
     },
+    readdir: function(path) {
+      var lookup = FS.lookupPath(path, { follow: true });
+      var node = lookup.node;
+      if (!node.node_ops.readdir) {
+        throw new FS.ErrnoError(ERRNO_CODES.ENOTDIR);
+      }
+      return node.node_ops.readdir(node);
+    },
     unlink: function(path) {
       var lookup = FS.lookupPath(path, { parent: true });
       var parent = lookup.node;
@@ -1280,12 +1291,6 @@ mergeInto(LibraryManager.library, {
       }
       return stream.stream_ops.llseek(stream, offset, whence);
     },
-    readdir: function(stream) {
-      if (!stream.stream_ops.readdir) {
-        throw new FS.ErrnoError(ERRNO_CODES.ENOTDIR);
-      }
-      return stream.stream_ops.readdir(stream);
-    },
     read: function(stream, buffer, offset, length, position) {
       if (length < 0 || position < 0) {
         throw new FS.ErrnoError(ERRNO_CODES.EINVAL);
diff --git a/src/library_memfs.js b/src/library_memfs.js
index a044e0c6..0fa6cdfb 100644
--- a/src/library_memfs.js
+++ b/src/library_memfs.js
@@ -10,16 +10,48 @@ mergeInto(LibraryManager.library, {
         throw new FS.ErrnoError(ERRNO_CODES.EPERM);
       }
       var node = FS.createNode(parent, name, mode, dev);
-      node.node_ops = MEMFS.node_ops;
       if (FS.isDir(node.mode)) {
-        node.stream_ops = MEMFS.stream_ops;
+        node.node_ops = {
+          getattr: MEMFS.node_ops.getattr,
+          setattr: MEMFS.node_ops.setattr,
+          lookup: MEMFS.node_ops.lookup,
+          mknod: MEMFS.node_ops.mknod,
+          mknod: MEMFS.node_ops.mknod,
+          rename: MEMFS.node_ops.rename,
+          unlink: MEMFS.node_ops.unlink,
+          rmdir: MEMFS.node_ops.rmdir,
+          readdir: MEMFS.node_ops.readdir,
+          symlink: MEMFS.node_ops.symlink
+        };
+        node.stream_ops = {
+          llseek: MEMFS.stream_ops.llseek
+        };
         node.contents = {};
       } else if (FS.isFile(node.mode)) {
-        node.stream_ops = MEMFS.stream_ops;
+        node.node_ops = {
+          getattr: MEMFS.node_ops.getattr,
+          setattr: MEMFS.node_ops.setattr
+        };
+        node.stream_ops = {
+          llseek: MEMFS.stream_ops.llseek,
+          read: MEMFS.stream_ops.read,
+          write: MEMFS.stream_ops.write,
+          allocate: MEMFS.stream_ops.allocate,
+          mmap: MEMFS.stream_ops.mmap
+        };
         node.contents = [];
       } else if (FS.isLink(node.mode)) {
-        node.stream_ops = MEMFS.stream_ops;
+        node.node_ops = {
+          getattr: MEMFS.node_ops.getattr,
+          setattr: MEMFS.node_ops.setattr,
+          readlink: MEMFS.node_ops.readlink
+        };
+        node.stream_ops = {};
       } else if (FS.isChrdev(node.mode)) {
+        node.node_ops = {
+          getattr: MEMFS.node_ops.getattr,
+          setattr: MEMFS.node_ops.setattr
+        };
         node.stream_ops = FS.chrdev_stream_ops;
       }
       node.timestamp = Date.now();
@@ -106,6 +138,16 @@ mergeInto(LibraryManager.library, {
         }
         delete parent.contents[name];
       },
+      readdir: function(node) {
+        var entries = ['.', '..']
+        for (var key in node.contents) {
+          if (!node.contents.hasOwnProperty(key)) {
+            continue;
+          }
+          entries.push(key);
+        }
+        return entries;
+      },
       symlink: function(parent, newname, oldpath) {
         var node = MEMFS.create_node(parent, newname, 0777 | {{{ cDefine('S_IFLNK') }}}, 0);
         node.link = oldpath;
@@ -119,19 +161,6 @@ mergeInto(LibraryManager.library, {
       },
     },
     stream_ops: {
-      open: function(stream) {
-        if (FS.isDir(stream.node.mode)) {
-          // cache off the directory entries when open'd
-          var entries = ['.', '..']
-          for (var key in stream.node.contents) {
-            if (!stream.node.contents.hasOwnProperty(key)) {
-              continue;
-            }
-            entries.push(key);
-          }
-          stream.entries = entries;
-        }
-      },
       read: function(stream, buffer, offset, length, position) {
         var contents = stream.node.contents;
         var size = Math.min(contents.length - position, length);
@@ -172,9 +201,6 @@ mergeInto(LibraryManager.library, {
         stream.position = position;
         return position;
       },
-      readdir: function(stream) {
-        return stream.entries;
-      },
       allocate: function(stream, offset, length) {
         var contents = stream.node.contents;
         var limit = offset + length;