Second Extended Filesystem (ext2) and other improvements (#33)

[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 4a924db7a9130f49f7e8ee80e645389a17054470..33f0b030b1372b860afff9b8cda068d8ef59b5fe 100644 (file)
--- a/lunaix-os/usr/sh/sh.c
+++ b/lunaix-os/usr/sh/sh.c
@@ -46,8 +46,8 @@ strltrim_safe(char* str)
     return strcpy(str, str + l);
 }
 
     return strcpy(str, str + l);
 }
 

-void
-parse_cmdline(char* line, char** cmd, char** arg_part)
+int
+parse_cmdline(char* line, char** args)

 {
     strrtrim(line);
     line = strltrim_safe(line);
 {
     strrtrim(line);
     line = strltrim_safe(line);


@@ -60,12 +60,15 @@ parse_cmdline(char* line, char** cmd, char** arg_part)
         }
         l++;
     }
         }
         l++;
     }

-    *cmd = line;
-    if (c) {
-        *arg_part = strltrim_safe(line + l);
+
+    args[0] = line;
+    if (c && l) {
+        args[1] = strltrim_safe(line + l);

     } else {
     } else {

-        *arg_part = NULL;
+        args[1] = NULL;

     }
     }

+
+    return !!l;

 }
 
 void
 }
 
 void


@@ -108,23 +111,59 @@ sigint_handle(int signum)
 }
 
 void
 }
 
 void

-sh_exec(const char* name, const char** argv)
+sh_exec(const char** argv)

 {
 {

+    static int prev_exit;
+    const char* envp[] = { 0 };
+    char* name = argv[0];

     if (!strcmp(name, "cd")) {
     if (!strcmp(name, "cd")) {

-        chdir(argv[0] ? argv[0] : ".");
+        chdir(argv[1] ? argv[1] : ".");

         sh_printerr();
         return;
     }
 
         sh_printerr();
         return;
     }
 

+    if (!strcmp(name, "?")) {
+        printf("%d\n", prev_exit);
+        return;
+    }
+
+    char buffer[1024];
+    strcpy(buffer, "/usr/bin/");
+    strcpy(&buffer[9], name);
+

     pid_t p;
     pid_t p;

+    int res;

     if (!(p = fork())) {
     if (!(p = fork())) {

-        if (execve(name, argv, NULL)) {
+        if (execve(buffer, argv, envp)) {

             sh_printerr();
         }
         _exit(1);
     }
     setpgid(p, getpgid());
             sh_printerr();
         }
         _exit(1);
     }
     setpgid(p, getpgid());

-    waitpid(p, NULL, 0);
+    waitpid(p, &res, 0);
+
+    prev_exit = WEXITSTATUS(res);
+}
+
+static char*
+sanity_filter(char* buf)
+{
+    int off = 0, i = 0;
+    char c;
+    do {
+        c = buf[i];
+        
+        if ((32 <= c && c <= 126) || !c) {
+            buf[i - off] = c;
+        }
+        else {
+            off++;
+        }
+
+        i++;
+    } while(c);
+
+    return buf;

 }
 
 void
 }
 
 void


@@ -139,11 +178,11 @@ sh_loop()
     // stdout (by default, unless user did smth) is the tty we are currently at
     ioctl(stdout, TIOCSPGRP, getpgid());
 
     // stdout (by default, unless user did smth) is the tty we are currently at
     ioctl(stdout, TIOCSPGRP, getpgid());
 

-    char* argv[] = {0, 0};
+    char* argv[] = {0, 0, 0};

 
     while (1) {
         getcwd(pwd, 512);
 
     while (1) {
         getcwd(pwd, 512);

-        printf("[\033[2m%s\033[39;49m]$ ", pwd);
+        printf("[%s]$ ", pwd);

         int sz = read(stdin, buf, 511);
 
         if (sz < 0) {
         int sz = read(stdin, buf, 511);
 
         if (sz < 0) {


@@ -152,21 +191,20 @@ sh_loop()
         }
 
         buf[sz] = '\0';
         }
 
         buf[sz] = '\0';

+        sanity_filter(buf);

 
         // currently, this shell only support single argument
 
         // currently, this shell only support single argument

-        parse_cmdline(buf, &cmd, &argv[0]);
-
-        if (cmd[0] == 0) {
+        if (!parse_cmdline(buf, argv)) {

             printf("\n");
             goto cont;
         }
 
         // cmd=="exit"
             printf("\n");
             goto cont;
         }
 
         // cmd=="exit"

-        if (*(unsigned int*)cmd == 0x74697865U) {
+        if (*(unsigned int*)argv[0] == 0x74697865U) {

             break;
         }
 
             break;
         }
 

-        sh_exec(cmd, (const char**)&argv);
+        sh_exec((const char**)argv);

     cont:
         printf("\n");
     }
     cont:
         printf("\n");
     }