Initial version.

diff --git a/src/filesys/fsutil.c b/src/filesys/fsutil.c
new file mode 100644 (file)
index 0000000..57cd4e8
--- /dev/null
+++ b/src/filesys/fsutil.c
@@ -0,0 +1,107 @@
+#include "fsutil.h"
+#include <stdbool.h>
+#include "debug.h"
+#include "filesys.h"
+#include "file.h"
+#include "lib.h"
+#include "mmu.h"
+#include "palloc.h"
+
+char *fsutil_copy_arg;
+char *fsutil_print_file;
+char *fsutil_remove_file;
+bool fsutil_list_files;
+bool fsutil_dump_filesys;
+
+static void
+copy (const char *filename, off_t size) 
+{
+  struct disk *src;
+  struct file dst;
+  disk_sector_no sector;
+  void *buffer;
+
+  /* Open source disk. */
+  src = disk_get (2);
+  if (src == NULL)
+    PANIC ("couldn't open source disk (hdc or ide1:0)");
+  if (size > (off_t) disk_size (src) * DISK_SECTOR_SIZE)
+    PANIC ("source disk is too small for %Ld-byte file",
+           (unsigned long long) size);
+  
+  /* Create destination file. */
+  if (!filesys_create (filename, size))
+    PANIC ("%s: create failed", filename);
+  if (!filesys_open (filename, &dst))
+    PANIC ("%s: open failed", filename);
+
+  /* Do copy. */
+  buffer = palloc_get (PAL_ASSERT);
+  sector = 0;
+  while (size > 0)
+    {
+      int chunk_size = size > DISK_SECTOR_SIZE ? DISK_SECTOR_SIZE : size;
+      disk_read (src, sector++, buffer);
+      if (file_write (&dst, buffer, chunk_size) != chunk_size)
+        PANIC ("%s: write failed with %Ld bytes unwritten",
+               filename, (unsigned long long) size);
+      size -= chunk_size;
+    }
+  palloc_free (buffer);
+
+  file_close (&dst);
+}
+
+void
+fsutil_run (void) 
+{
+  if (fsutil_copy_arg != NULL) 
+    {
+      char *save;
+      char *filename = strtok_r (fsutil_copy_arg, ":", &save);
+      char *size = strtok_r (NULL, "", &save);
+
+      if (filename == NULL || size == NULL)
+        PANIC ("bad format for -cp option; use -u for usage");
+
+      copy (filename, atoi (size));
+    }
+
+  if (fsutil_print_file != NULL)
+    fsutil_print (fsutil_print_file);
+
+  if (fsutil_remove_file != NULL) 
+    {
+      if (filesys_remove (fsutil_remove_file))
+        printk ("%s: removed\n", fsutil_remove_file);
+      else
+        PANIC ("%s: remove failed\n", fsutil_remove_file);
+    }
+
+  if (fsutil_list_files)
+    filesys_list ();
+
+  if (fsutil_dump_filesys)
+    filesys_dump ();
+}
+
+void
+fsutil_print (const char *filename) 
+{
+  struct file file;
+  char *buffer;
+
+  if (!filesys_open (filename, &file))
+    PANIC ("%s: open failed", filename);
+  buffer = palloc_get (PAL_ASSERT);
+  for (;;) 
+    {
+      off_t n = file_read (&file, buffer, PGSIZE);
+      if (n == 0)
+        break;
+
+      hex_dump (buffer, n, true);
+    }
+  palloc_free (buffer);
+  file_close (&file);
+}

diff --git a/src/filesys/fsutil.h b/src/filesys/fsutil.h
new file mode 100644 (file)
index 0000000..b37c5b6
--- /dev/null
+++ b/src/filesys/fsutil.h
@@ -0,0 +1,15 @@
+#ifndef HEADER_FSUTIL_H
+#define HEADER_FSUTIL_H 1
+
+#include <stdbool.h>
+
+extern char *fsutil_copy_arg;
+extern char *fsutil_print_file;
+extern char *fsutil_remove_file;
+extern bool fsutil_list_files;
+extern bool fsutil_dump_filesys;
+
+void fsutil_run (void);
+void fsutil_print (const char *filename);
+
+#endif /* fsutil.h */