Implement a proper block layer with partition support.

[pintos-anon] / src / filesys / directory.h

diff --git a/src/filesys/directory.h b/src/filesys/directory.h
index 4464d466baffa0b04fca022e8f9d72939f7b6884..930acf986df4b1a647cb8d7cbd01c522d1b2b786 100644 (file)
--- a/src/filesys/directory.h
+++ b/src/filesys/directory.h
@@ -3,37 +3,28 @@
 
 #include <stdbool.h>
 #include <stddef.h>
-#include "devices/disk.h"
+#include "devices/block.h"
 
-/* Maximum length of a filename.
-   This is the traditional UNIX maximum.
-   (This macro name comes from POSIX.1.) */
+/* Maximum length of a file name component.
+   This is the traditional UNIX maximum length.
+   After directories are implemented, this maximum length may be
+   retained, but much longer full path names must be allowed. */
 #define NAME_MAX 14
 
-/* A directory. */
-struct dir 
-  {
-    size_t entry_cnt;           /* Number of entries. */
-    struct dir_entry *entries;  /* Array of entries. */
-  };
+struct inode;
 
-/* A single directory entry. */
-struct dir_entry 
-  {
-    bool in_use;                        /* In use or free? */
-    char name[NAME_MAX + 1];            /* Null terminated file name. */
-    disk_sector_t filehdr_sector;       /* Sector number of header. */
-  };
+/* 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 *);
 
-struct file;
-bool dir_init (struct dir *, size_t entry_cnt);
-void dir_destroy (struct dir *);
-void dir_read (struct dir *, struct file *);
-void dir_write (struct dir *, struct file *);
-bool dir_lookup (const struct dir *, const char *name, disk_sector_t *);
-bool dir_add (struct dir *, const char *name, disk_sector_t);
+/* Reading and writing. */
+bool dir_lookup (const struct dir *, const char *name, struct inode **);
+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 *);
-void dir_dump (const struct dir *);
+bool dir_readdir (struct dir *, char name[NAME_MAX + 1]);
 
 #endif /* filesys/directory.h */