From b64434fb9d726945f6eb82befbe3d1de5062da9a Mon Sep 17 00:00:00 2001
From: Themis Demetriades <td1223@ic.ac.uk>
Date: Fri, 8 Nov 2024 15:41:35 +0000
Subject: [PATCH] Move definition of maximum file name length from <syscall> to
 file.h

---
 src/filesys/file.h     | 3 +++
 src/lib/user/syscall.c | 2 +-
 src/lib/user/syscall.h | 6 ++----
 3 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/src/filesys/file.h b/src/filesys/file.h
index 43088db..cfa320a 100644
--- a/src/filesys/file.h
+++ b/src/filesys/file.h
@@ -4,6 +4,9 @@
 #include "filesys/off_t.h"
 #include <stdbool.h>
 
+/* The maximum length of a file name in PintOS. */
+#define FNAME_MAX_LEN 14
+
 struct inode;
 
 /* Opening and closing files. */
diff --git a/src/lib/user/syscall.c b/src/lib/user/syscall.c
index a9c5bc8..b928b41 100644
--- a/src/lib/user/syscall.c
+++ b/src/lib/user/syscall.c
@@ -166,7 +166,7 @@ mkdir (const char *dir)
 }
 
 bool
-readdir (int fd, char name[READDIR_MAX_LEN + 1]) 
+readdir (int fd, char name[FNAME_MAX_LEN + 1]) 
 {
   return syscall2 (SYS_READDIR, fd, name);
 }
diff --git a/src/lib/user/syscall.h b/src/lib/user/syscall.h
index 32265bb..305c7af 100644
--- a/src/lib/user/syscall.h
+++ b/src/lib/user/syscall.h
@@ -3,6 +3,7 @@
 
 #include <stdbool.h>
 #include <debug.h>
+#include "../../filesys/file.h"
 
 /* Process identifier. */
 typedef int pid_t;
@@ -12,9 +13,6 @@ typedef int pid_t;
 typedef int mapid_t;
 #define MAP_FAILED ((mapid_t) -1)
 
-/* Maximum characters in a filename written by readdir(). */
-#define READDIR_MAX_LEN 14
-
 /* Typical return values from main() and arguments to exit(). */
 #define EXIT_SUCCESS 0          /* Successful execution. */
 #define EXIT_FAILURE 1          /* Unsuccessful execution. */
@@ -41,7 +39,7 @@ void munmap (mapid_t);
 /* Task 4 only. */
 bool chdir (const char *dir);
 bool mkdir (const char *dir);
-bool readdir (int fd, char name[READDIR_MAX_LEN + 1]);
+bool readdir (int fd, char name[FNAME_MAX_LEN + 1]);
 bool isdir (int fd);
 int inumber (int fd);