X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fthreads%2Finit.c;h=458f67cb2bbd7a7424950d8a219c9f08747c30f8;hb=bd2784aef647e8bbbd13eca1ed237e383015c874;hp=a624ef57edf02a2b3aa7b392e5a4fc37abded034;hpb=c0206643b024b6f0e6cde1cbb5e7d37abbc84c69;p=pintos-anon

diff --git a/src/threads/init.c b/src/threads/init.c
index a624ef5..458f67c 100644
--- a/src/threads/init.c
+++ b/src/threads/init.c
@@ -9,6 +9,7 @@
 #include <stdlib.h>
 #include <string.h>
 #include "devices/kbd.h"
+#include "devices/input.h"
 #include "devices/serial.h"
 #include "devices/timer.h"
 #include "devices/vga.h"
@@ -108,6 +109,7 @@ main (void)
   intr_init ();
   timer_init ();
   kbd_init ();
+  input_init ();
 #ifdef USERPROG
   exception_init ();
   syscall_init ();
@@ -219,7 +221,10 @@ read_command_line (void)
   /* Print kernel command line. */
   printf ("Kernel command line:");
   for (i = 0; i < argc; i++)
-    printf (" %s", argv[i]);
+    if (strchr (argv[i], ' ') == NULL)
+      printf (" %s", argv[i]);
+    else
+      printf (" '%s'", argv[i]);
   printf ("\n");
 
   return argv;
@@ -362,7 +367,7 @@ usage (void)
 
 
 /* Powers down the machine we're running on,
-   as long as we're running on Bochs or qemu. */
+   as long as we're running on Bochs or QEMU. */
 void
 power_off (void) 
 {
@@ -380,6 +385,8 @@ power_off (void)
 
   for (p = s; *p != '\0'; p++)
     outb (0x8900, *p);
+  asm ("cli; hlt");
+  printf ("still running...\n");
   for (;;);
 }