X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Ffilesys%2Fdirectory.h;h=6503a309e0887cb041a86db36e87fecf19b4e79a;hb=993c1d9f4452e2edd851f3175dfdf317f18bdb9f;hp=aa07ad1b25586e5f1aa4f3c43a00b99241d4ed0f;hpb=9fe3c2a0f3ba65c470d726e99d54e8337eb4e0da;p=pintos-anon

diff --git a/src/filesys/directory.h b/src/filesys/directory.h
index aa07ad1..6503a30 100644
--- a/src/filesys/directory.h
+++ b/src/filesys/directory.h
@@ -1,36 +1,25 @@
-#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. */
-#define FILENAME_LEN_MAX 14
-
-struct dir 
-  {
-    size_t entry_cnt;
-    struct dir_entry *entries;
-  };
-
-struct dir_entry 
-  {
-    bool in_use;
-    char name[FILENAME_LEN_MAX + 1];
-    disk_sector_no filehdr_sector;
-  };
+   This is the traditional UNIX maximum.
+   (This macro name comes from POSIX.1.) */
+#define NAME_MAX 14
 
 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 *);
-bool dir_lookup (const struct dir *, const char *name, disk_sector_no *);
-bool dir_add (struct dir *, const char *name, disk_sector_no);
+bool dir_lookup (const struct dir *, const char *name, disk_sector_t *);
+bool dir_add (struct dir *, const char *name, disk_sector_t);
 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 */