X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=grading%2Fuserprog%2Fread-boundary.c;h=1fd187fe97252fdd3bbafa6d6487eef6d8bae555;hb=47868ce911e401077a0afb2f26f12685ff53a706;hp=799273093239f6a77ff2074e4b43efb8e547cede;hpb=ae20a83cc5ed14f276f2292d99079370562addc9;p=pintos-anon

diff --git a/grading/userprog/read-boundary.c b/grading/userprog/read-boundary.c
index 7992730..1fd187f 100644
--- a/grading/userprog/read-boundary.c
+++ b/grading/userprog/read-boundary.c
@@ -2,15 +2,7 @@
 #include <stdio.h>
 #include <string.h>
 #include <syscall.h>
-
-char expected[] = {
-  "Amazing Electronic Fact: If you scuffed your feet long enough without\n"
-  "touching anything, you would build up so many electrons that your\n"
-  "finger would explode!  But this is nothing to worry about unless you\n"
-  "have carpeting.\n" 
-};
-
-
+#include "sample.inc"
 
 static char *
 mk_boundary_string (const char *src) 
@@ -28,7 +20,7 @@ main (void)
   int byte_cnt;
   char *actual_p;
 
-  actual_p = mk_boundary_string (expected);
+  actual_p = mk_boundary_string (sample);
 
   printf ("(read-boundary) begin\n");
 
@@ -36,11 +28,11 @@ main (void)
   if (handle < 2)
     printf ("(read-boundary) fail: open() returned %d\n", handle);
 
-  byte_cnt = read (handle, actual_p, sizeof expected - 1);
-  if (byte_cnt != sizeof expected - 1)
-    printf ("(read-boundary) fail: read() returned %d instead of %d\n",
-            byte_cnt, sizeof expected - 1);
-  else if (strcmp (expected, actual_p))
+  byte_cnt = read (handle, actual_p, sizeof sample - 1);
+  if (byte_cnt != sizeof sample - 1)
+    printf ("(read-boundary) fail: read() returned %d instead of %zu\n",
+            byte_cnt, sizeof sample - 1);
+  else if (strcmp (sample, actual_p))
     printf ("(read-boundary) fail: expected text differs from actual:\n%s",
             actual_p);