Improve hex_dump().

[pintos-anon] / src / filesys / fsutil.c

diff --git a/src/filesys/fsutil.c b/src/filesys/fsutil.c
index 67dab6fdc59768fd4587a47f379308f24a525865..cc0e33500eb2a6ffad699e4342cd84cc40d22bf8 100644 (file)
--- a/src/filesys/fsutil.c
+++ b/src/filesys/fsutil.c
@@ -1,15 +1,20 @@
-#include "fsutil.h"
+#include "filesys/fsutil.h"
+#include <debug.h>
 #include <stdbool.h>
-#include "debug.h"
-#include "filesys.h"
-#include "file.h"
-#include "lib.h"
-#include "mmu.h"
-#include "palloc.h"
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include "filesys/file.h"
+#include "filesys/filesys.h"
+#include "threads/mmu.h"
+#include "threads/palloc.h"
 
-/* Filename and file size to use for copy operations,
-   as "filename:size". */
-char *fsutil_copy_arg;
+/* Destination filename and size for copy-in operations. */
+char *fsutil_copyin_file;
+int fsutil_copyin_size;
+
+/* Source filename for copy-out operations. */
+char *fsutil_copyout_file;
 
 /* Name of a file print to print to console. */
 char *fsutil_print_file;
@@ -27,10 +32,10 @@ bool fsutil_dump_filesys;
    to a file named FILENAME in the filesystem.
    The file will be SIZE bytes in length. */
 static void
-copy (const char *filename, off_t size) 
+copy_in (const char *filename, off_t size) 
 {
   struct disk *src;
-  struct file dst;
+  struct file *dst;
   disk_sector_t sector;
   void *buffer;
 
@@ -45,7 +50,8 @@ copy (const char *filename, off_t size)
   /* Create destination file. */
   if (!filesys_create (filename, size))
     PANIC ("%s: create failed", filename);
-  if (!filesys_open (filename, &dst))
+  dst = filesys_open (filename);
+  if (dst == NULL)
     PANIC ("%s: open failed", filename);
 
   /* Do copy. */
@@ -55,14 +61,63 @@ copy (const char *filename, off_t size)
     {
       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)
+      if (file_write (dst, buffer, chunk_size) != chunk_size)
         PANIC ("%s: write failed with %lld bytes unwritten",
                filename, (unsigned long long) size);
       size -= chunk_size;
     }
   palloc_free (buffer);
 
-  file_close (&dst);
+  file_close (dst);
+}
+
+/* Copies FILENAME from the file system to the scratch disk.
+   The first four bytes of the first sector in the disk
+   receive the file's size in bytes as a little-endian integer.
+   The second and subsequent sectors receive the file's data. */
+static void
+copy_out (const char *filename) 
+{
+  void *buffer;
+  struct file *src;
+  struct disk *dst;
+  off_t size;
+  disk_sector_t sector;
+
+  buffer = palloc_get (PAL_ASSERT | PAL_ZERO);
+
+  /* Open source file. */
+  src = filesys_open (filename);
+  if (src == NULL)
+    PANIC ("%s: open failed", filename);
+  size = file_length (src);
+
+  /* Open target disk. */
+  dst = disk_get (1, 0);
+  if (dst == NULL)
+    PANIC ("couldn't open target disk (hdc or hd1:0)");
+  if (size + DISK_SECTOR_SIZE > (off_t) disk_size (dst) * DISK_SECTOR_SIZE)
+    PANIC ("target disk is too small for %lld-byte file",
+           (unsigned long long) size);
+  
+  /* Write size to sector 0. */
+  *(uint32_t *) buffer = size;
+  disk_write (dst, 0, buffer);
+  
+  /* Do copy. */
+  sector = 1;
+  while (size > 0) 
+    {
+      int chunk_size = size > DISK_SECTOR_SIZE ? DISK_SECTOR_SIZE : size;
+      if (file_read (src, buffer, chunk_size) != chunk_size)
+        PANIC ("%s: read failed with %lld bytes unread",
+               filename, (unsigned long long) size);
+      disk_write (dst, sector++, buffer);
+      size -= chunk_size;
+    }
+  palloc_free (buffer);
+
+  file_close (src);
 }
 
 /* Executes the filesystem operations described by the variables
@@ -70,17 +125,11 @@ copy (const char *filename, off_t size)
 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");
+  if (fsutil_copyin_file != NULL) 
+    copy_in (fsutil_copyin_file, fsutil_copyin_size);
 
-      copy (filename, atoi (size));
-    }
+  if (fsutil_copyout_file != NULL)
+    copy_out (fsutil_copyout_file);
 
   if (fsutil_print_file != NULL)
     fsutil_print (fsutil_print_file);
@@ -88,7 +137,7 @@ fsutil_run (void)
   if (fsutil_remove_file != NULL) 
     {
       if (filesys_remove (fsutil_remove_file))
-        printk ("%s: removed\n", fsutil_remove_file);
+        printf ("%s: removed\n", fsutil_remove_file);
       else
         PANIC ("%s: remove failed\n", fsutil_remove_file);
     }
@@ -105,20 +154,21 @@ fsutil_run (void)
 void
 fsutil_print (const char *filename) 
 {
-  struct file file;
+  struct file *file;
   char *buffer;
 
-  if (!filesys_open (filename, &file))
+  file = filesys_open (filename);
+  if (file == NULL)
     PANIC ("%s: open failed", filename);
   buffer = palloc_get (PAL_ASSERT);
   for (;;) 
     {
-      off_t n = file_read (&file, buffer, PGSIZE);
+      off_t n = file_read (file, buffer, PGSIZE);
       if (n == 0)
         break;
 
-      hex_dump (buffer, n, true);
+      hex_dump (0, buffer, n, true);
     }
   palloc_free (buffer);
-  file_close (&file);
+  file_close (file);
 }