Move problem 1-2 (join) into project 2 as the "wait" system call.

[pintos-anon] / grading / vm / mmap-exit.c

diff --git a/grading/vm/mmap-exit.c b/grading/vm/mmap-exit.c
index 87c256503dcb4ef379c6f38b9299da121d98cb01..3601df8e216f3b2755aeb28a1fd563e73c562f1a 100644 (file)
--- a/grading/vm/mmap-exit.c
+++ b/grading/vm/mmap-exit.c
@@ -27,10 +27,10 @@ main (void)
       printf ("(mmap-exit) exec() failed\n");
       return 1;
     }
-  code = join (child);
+  code = wait (child);
   if (code != 234) 
     {
-      printf ("(mmap-exit) join() returned bad exit code: %d\n", code);
+      printf ("(mmap-exit) wait() returned bad exit code: %d\n", code);
       return 1;
     }
   printf ("(mmap-exit) child finished\n");
@@ -44,7 +44,7 @@ main (void)
     }
 
   read (fd, buf, strlen (sample));
-  if (memcmp (ACTUAL, sample, strlen (sample)))
+  if (memcmp (buf, sample, strlen (sample)))
     {
       printf ("(mmap-exit) read of mmap-written file reported bad data\n");
       return 1;