renamed and cleaned up export header files to match linux convention

[lunaix-os.git] / lunaix-os / usr / sh / sh.c

diff --git a/lunaix-os/usr/sh/sh.c b/lunaix-os/usr/sh/sh.c
index 33f0b030b1372b860afff9b8cda068d8ef59b5fe..c18b5edc0c435a690e5455bb9b4edf2ee1bce64f 100644 (file)
--- a/lunaix-os/usr/sh/sh.c
+++ b/lunaix-os/usr/sh/sh.c
@@ -1,6 +1,6 @@
 #include <errno.h>
-#include <lunaix/ioctl.h>
-#include <lunaix/lunaix.h>
+#include <sys/ioctl.h>
+#include <sys/wait.h>
 #include <signal.h>
 #include <stdio.h>
 #include <string.h>
@@ -128,8 +128,8 @@ sh_exec(const char** argv)
     }
 
     char buffer[1024];
-    strcpy(buffer, "/usr/bin/");
-    strcpy(&buffer[9], name);
+    strcpy(buffer, "/bin/");
+    strcpy(&buffer[5], name);
 
     pid_t p;
     int res;
@@ -182,7 +182,7 @@ sh_loop()
 
     while (1) {
         getcwd(pwd, 512);
-        printf("[%s]$ ", pwd);
+        printf("%s # ", pwd);
         int sz = read(stdin, buf, 511);
 
         if (sz < 0) {
@@ -195,8 +195,7 @@ sh_loop()
 
         // currently, this shell only support single argument
         if (!parse_cmdline(buf, argv)) {
-            printf("\n");
-            goto cont;
+             continue;
         }
 
         // cmd=="exit"
@@ -204,9 +203,7 @@ sh_loop()
             break;
         }
 
-        sh_exec((const char**)argv);
-    cont:
-        printf("\n");
+        sh_exec((const char**)argv);       
     }
 }