Rewrite filesystem to support Unix "delete" semantics.

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

diff --git a/src/filesys/directory.h b/src/filesys/directory.h
index f5f5ebdde8c041b85cf8046eb6fceb604f38e6ac..6503a309e0887cb041a86db36e87fecf19b4e79a 100644 (file)
--- a/src/filesys/directory.h
+++ b/src/filesys/directory.h
@@ -1,32 +1,18 @@
-#ifndef HEADER_DIRECTORY_H
-#define HEADER_DIRECTORY_H 1
+#ifndef FILESYS_DIRECTORY_H
+#define FILESYS_DIRECTORY_H
 
 #include <stdbool.h>
 #include <stddef.h>
-#include "disk.h"
+#include "devices/disk.h"
 
 /* Maximum length of a filename.
    This is the traditional UNIX maximum.
    (This macro name comes from POSIX.1.) */
 #define NAME_MAX 14
 
-/* A directory. */
-struct dir 
-  {
-    size_t entry_cnt;           /* Number of entries. */
-    struct dir_entry *entries;  /* Array of entries. */
-  };
-
-/* 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. */
-  };
-
 struct file;
-bool dir_init (struct dir *, size_t entry_cnt);
+struct dir *dir_create (size_t entry_cnt);
+size_t dir_size (size_t entry_cnt);
 void dir_destroy (struct dir *);
 void dir_read (struct dir *, struct file *);
 void dir_write (struct dir *, struct file *);
@@ -36,4 +22,4 @@ bool dir_remove (struct dir *, const char *name);
 void dir_list (const struct dir *);
 void dir_dump (const struct dir *);
 
-#endif /* directory.h */
+#endif /* filesys/directory.h */