Use standard POSIX "ustar" format for the scratch disk.

[pintos-anon] / src / lib / string.c

diff --git a/src/lib/string.c b/src/lib/string.c
index 89fa1f05c01f130bce10948d493a10cac6d29063..d223c89f48493793c52dc45dbcf288328776fd6f 100644 (file)
--- a/src/lib/string.c
+++ b/src/lib/string.c
@@ -1,8 +1,4 @@
 #include <string.h>
-
-#ifdef KERNEL
-#define NDEBUG
-#endif
 #include <debug.h>
 
 /* Copies SIZE bytes from SRC to DST, which must not overlap.
@@ -194,7 +190,7 @@ strstr (const char *haystack, const char *needle)
     {
       size_t i;
 
-      for (i = 0; i < haystack_len - needle_len; i++)
+      for (i = 0; i <= haystack_len - needle_len; i++)
         if (!memcmp (haystack + i, needle, needle_len))
           return (char *) haystack + i;
     }