X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?p=pintos-anon;a=blobdiff_plain;f=src%2Ffilesys%2Fdirectory.h;h=930acf986df4b1a647cb8d7cbd01c522d1b2b786;hp=abc3029f9e86cea3c861a9ca711956a6d77efc1f;hb=a03618133f7df0954802a470a4bee7674f7aed45;hpb=615bf3b3d2a8573ed6fb9ddc0055745e163ac999

diff --git a/src/filesys/directory.h b/src/filesys/directory.h
index abc3029..930acf9 100644
--- a/src/filesys/directory.h
+++ b/src/filesys/directory.h
@@ -3,7 +3,7 @@
 
 #include <stdbool.h>
 #include <stddef.h>
-#include "devices/disk.h"
+#include "devices/block.h"
 
 /* Maximum length of a file name component.
    This is the traditional UNIX maximum length.
@@ -12,14 +12,19 @@
 #define NAME_MAX 14
 
 struct inode;
-struct dir;
-bool dir_create (disk_sector_t sector, size_t entry_cnt);
-bool dir_open (struct inode *, struct dir **);
-bool dir_open_root (struct dir **);
+
+/* Opening and closing directories. */
+bool dir_create (block_sector_t sector, size_t entry_cnt);
+struct dir *dir_open (struct inode *);
+struct dir *dir_open_root (void);
+struct dir *dir_reopen (struct dir *);
 void dir_close (struct dir *);
+struct inode *dir_get_inode (struct dir *);
+
+/* Reading and writing. */
 bool dir_lookup (const struct dir *, const char *name, struct inode **);
-bool dir_add (struct dir *, const char *name, disk_sector_t);
+bool dir_add (struct dir *, const char *name, block_sector_t);
 bool dir_remove (struct dir *, const char *name);
-void dir_list (const struct dir *);
+bool dir_readdir (struct dir *, char name[NAME_MAX + 1]);
 
 #endif /* filesys/directory.h */