Make sh.c compile using a normal libc

Author: gmorenz

.gitignore

@@ -0,0 +1 @@
+sh

sh.c

@@ -1,8 +1,11 @@
 // Shell.
 
-#include "types.h"
-#include "user.h"
-#include "fcntl.h"
+#include <stdio.h>
+#include <string.h>
+#include <stdlib.h>
+#include <unistd.h>
+#include <fcntl.h>
+#include <sys/wait.h>
 
 // Parsed command representation
 #define EXEC  1
@@ -65,7 +68,7 @@ runcmd(struct cmd *cmd)
   struct redircmd *rcmd;
 
   if(cmd == 0)
-    exit();
+    exit(1);
 
   switch(cmd->type){
   default:
@@ -74,17 +77,17 @@ runcmd(struct cmd *cmd)
   case EXEC:
     ecmd = (struct execcmd*)cmd;
     if(ecmd->argv[0] == 0)
-      exit();
-    exec(ecmd->argv[0], ecmd->argv);
-    printf(2, "exec %s failed\n", ecmd->argv[0]);
+      exit(1);
+    execv(ecmd->argv[0], ecmd->argv);
+    dprintf(2, "exec %s failed\n", ecmd->argv[0]);
     break;
 
   case REDIR:
     rcmd = (struct redircmd*)cmd;
     close(rcmd->fd);
     if(open(rcmd->file, rcmd->mode) < 0){
-      printf(2, "open %s failed\n", rcmd->file);
-      exit();
+      dprintf(2, "open %s failed\n", rcmd->file);
+      exit(1);
     }
     runcmd(rcmd->cmd);
     break;
@@ -93,7 +96,7 @@ runcmd(struct cmd *cmd)
     lcmd = (struct listcmd*)cmd;
     if(fork1() == 0)
       runcmd(lcmd->left);
-    wait();
+    wait(NULL);
     runcmd(lcmd->right);
     break;
 
@@ -117,8 +120,8 @@ runcmd(struct cmd *cmd)
     }
     close(p[0]);
     close(p[1]);
-    wait();
-    wait();
+    wait(NULL);
+    wait(NULL);
     break;
 
   case BACK:
@@ -127,15 +130,15 @@ runcmd(struct cmd *cmd)
       runcmd(bcmd->cmd);
     break;
   }
-  exit();
+  exit(1);
 }
 
 int
 getcmd(char *buf, int nbuf)
 {
-  printf(2, "$ ");
+  dprintf(2, "$ ");
   memset(buf, 0, nbuf);
-  gets(buf, nbuf);
+  fgets(buf, nbuf, stdin);
   if(buf[0] == 0) // EOF
     return -1;
   return 0;
@@ -161,21 +164,21 @@ main(void)
       // Chdir must be called by the parent, not the child.
       buf[strlen(buf)-1] = 0;  // chop \n
       if(chdir(buf+3) < 0)
-        printf(2, "cannot cd %s\n", buf+3);
+        dprintf(2, "cannot cd %s\n", buf+3);
       continue;
     }
     if(fork1() == 0)
       runcmd(parsecmd(buf));
-    wait();
+    wait(NULL);
   }
-  exit();
+  exit(1);
 }
 
 void
 panic(char *s)
 {
-  printf(2, "%s\n", s);
-  exit();
+  dprintf(2, "%s\n", s);
+  exit(1);
 }
 
 int
@@ -334,7 +337,7 @@ parsecmd(char *s)
   cmd = parseline(&s, es);
   peek(&s, es, "");
   if(s != es){
-    printf(2, "leftovers: %s\n", s);
+    dprintf(2, "leftovers: %s\n", s);
     panic("syntax");
   }
   nulterminate(cmd);
@@ -386,10 +389,10 @@ parseredirs(struct cmd *cmd, char **ps, char *es)
       cmd = redircmd(cmd, q, eq, O_RDONLY, 0);
       break;
     case '>':
-      cmd = redircmd(cmd, q, eq, O_WRONLY|O_CREATE, 1);
+      cmd = redircmd(cmd, q, eq, O_WRONLY|O_CREAT, 1);
       break;
     case '+':  // >>
-      cmd = redircmd(cmd, q, eq, O_WRONLY|O_CREATE, 1);
+      cmd = redircmd(cmd, q, eq, O_WRONLY|O_CREAT, 1);
       break;
     }
   }