make ls work

022104b1 · Nickolai Zeldovich · 1d1e1ede · 022104b1 · 022104b1 · 022104b1
--- a/defs.h
+++ b/defs.h
@@ -62,6 +62,7 @@ int             readi(struct inode*, char*, uint, uint);
 void            stati(struct inode*, struct stat*);
 int             writei(struct inode*, char*, uint, uint);
 void	        dir_init(struct inode *dp);
+void	        dir_flush(struct inode *dp);
 // ide.c
 void            ideinit(void);

--- a/fs.c
+++ b/fs.c
@@ -587,15 +587,39 @@ dir_init(struct inode *dp)
  }
 }
+struct flush_state {
+  struct inode *dp;
+  uint off;
+};
+static void *
+dir_flush_cb(void *key, void *val, void *arg)
+{
+  struct flush_state *fs = arg;
+  char *name = key;
+  uint inum = (uint) val;
+  struct dirent de;
+  strncpy(de.name, name, DIRSIZ);
+  de.inum = inum;
+  if(writei(fs->dp, (char*)&de, fs->off, sizeof(de)) != sizeof(de))
+    panic("dir_flush_cb");
+  fs->off += sizeof(de);
+  return 0;
+}
 void
 dir_flush(struct inode *dp)
 {
+  // assume already locked
  if (!dp->dir)
    return;
-  ilock(dp, 1);
+  struct flush_state fs;
+  fs.dp = dp;
-  iunlock(dp);
+  fs.off = 0;
+  ns_enumerate(dp->dir, dir_flush_cb, &fs);
 }
 // Look for a directory entry in a directory.

--- a/sysfile.c
+++ b/sysfile.c
@@ -284,9 +284,13 @@ sys_open(void)
    ilock(ip, 0);
    if(ip->type == 0)
      panic("open");
-    if(ip->type == T_DIR && omode != O_RDONLY){
+    if(ip->type == T_DIR) {
-      iunlockput(ip);
+      if (omode != O_RDONLY){
-      return -1;
+	iunlockput(ip);
+	return -1;
+      }
+      dir_flush(ip);
    }
  }