X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Ffilesys%2Fdirectory.h;h=c773887b6b57e920d59e7ddadf50502c7cf8fe30;hb=a6707cab2ede5adc59479d16000cb938b386db36;hp=f5f5ebdde8c041b85cf8046eb6fceb604f38e6ac;hpb=97dcefb4742e13df9eb22c3aa00bb802bdc55c60;p=pintos-anon

diff --git a/src/filesys/directory.h b/src/filesys/directory.h
index f5f5ebd..c773887 100644
--- a/src/filesys/directory.h
+++ b/src/filesys/directory.h
@@ -1,32 +1,19 @@
-#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.) */
+/* 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. */
-  };
-
-/* 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 *);
@@ -34,6 +21,5 @@ 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 */