projects
/
pintos-anon
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Replace lsdir system call by readdir, isdir system calls,
[pintos-anon]
/
src
/
filesys
/
fsutil.c
diff --git
a/src/filesys/fsutil.c
b/src/filesys/fsutil.c
index 9c81fb015b605432ee2d60198454d1ce48e21bdf..14e615f8c989b5ad0863fd94d58a316068d2614d 100644
(file)
--- a/
src/filesys/fsutil.c
+++ b/
src/filesys/fsutil.c
@@
-3,6
+3,7
@@
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
+#include "filesys/directory.h"
#include "filesys/file.h"
#include "filesys/filesys.h"
#include "devices/disk.h"
#include "filesys/file.h"
#include "filesys/filesys.h"
#include "devices/disk.h"
@@
-14,8
+15,15
@@
void
fsutil_ls (char **argv UNUSED)
{
void
fsutil_ls (char **argv UNUSED)
{
+ struct dir *dir;
+ char name[NAME_MAX + 1];
+
printf ("Files in the root directory:\n");
printf ("Files in the root directory:\n");
- filesys_list ();
+ dir = dir_open_root ();
+ if (dir == NULL)
+ PANIC ("root dir open failed");
+ while (dir_readdir (dir, name))
+ printf ("%s\n", name);
printf ("End of listing.\n");
}
printf ("End of listing.\n");
}