From 05a074795f1934c196070cdb84c6b5ee2ac147b7 Mon Sep 17 00:00:00 2001
From: Dm1tr1y147 <me@dmitriy.icu>
Date: Mon, 13 Jul 2020 22:02:39 +0500
Subject: [PATCH] Rewrote command parcing function without strtok for future
 pipes and command secuences support

---
 README.md       |  2 +-
 include/shell.h | 16 +++++++++-
 src/main.c      |  5 ++++
 src/shell.c     | 79 ++++++++++++++++++++++++++++++++++++++++++++-----
 4 files changed, 92 insertions(+), 10 deletions(-)

diff --git a/README.md b/README.md
index 688e212..c81a4bb 100644
--- a/README.md
+++ b/README.md
@@ -22,4 +22,4 @@ Work is still in porgress, buf when you will see a "finished" topic assigned to
 * Replace linux `echo` command with builtin one with support of environmental variables
 * Environmental variables
 * `Ctrl+Z` running programm with `fd`
-* Getting commands path from system `PATH` environment variable
\ No newline at end of file
+* ~~Getting commands path from system `PATH` environment variable~~
\ No newline at end of file
diff --git a/include/shell.h b/include/shell.h
index f140947..dda88e0 100644
--- a/include/shell.h
+++ b/include/shell.h
@@ -10,6 +10,7 @@
 #include <unistd.h>
 #include <termios.h>
 #include <ifaddrs.h>
+#include <stdbool.h>
 
 #include <sys/types.h>
 #include <sys/wait.h>
@@ -40,11 +41,24 @@ struct history
     struct hist_sub sub;
 };
 
+struct command
+{
+    char *line;
+    char **args;
+    bool pipes;
+};
+
+struct status {
+    int s;
+    bool invert;
+};
+
 typedef struct
 {
-    int last_status;
     struct history hist;
     char **envs;
+    struct command com;
+    struct status status;
 } t_;
 
 //Globals defenition
diff --git a/src/main.c b/src/main.c
index 052eeb8..d9d85b3 100644
--- a/src/main.c
+++ b/src/main.c
@@ -48,6 +48,11 @@ t_ init_term()
     term.hist.sub.pos = -1;
     term.hist.sub.content = (char **)malloc(sizeof(char *) * 0);
 
+    term.status.s = 0;
+    term.status.invert = 0;
+
+    term.com.line = NULL;
+
     signal(SIGINT, SIG_IGN);
 
     atexit(exit_shell);
diff --git a/src/shell.c b/src/shell.c
index f37c6bc..11ba05c 100644
--- a/src/shell.c
+++ b/src/shell.c
@@ -25,9 +25,36 @@ void process_command()
     print_str(prompt, strlen(prompt));
 
     char *line = read_line();
+
+    line = trim_string(&line);
+    if (line[strlen(line) - 1] == ' ')
+        remove_on_pos(&line, strlen(line));
+
+    term.com.line = line;
+
     process_line(line, &args);
+
+    if (args[0] != NULL)
+        if (strcmp(args[0], "!") == 0)
+        {
+            term.status.invert = true;
+            args = slice_array(args, 1, -1, true);
+        }
+
     int status = execute(args);
 
+    if (term.status.invert)
+    {
+        if (status == 0)
+            term.status.s = 1;
+        else
+            term.status.s = 0;
+
+        term.status.invert = false;
+    }
+    else
+        term.status.s = status;
+
     free(line);
     free(prompt);
     free_str_arr(args);
@@ -43,12 +70,27 @@ int process_line(char *line, char ***args)
 {
     int buff_size = ARG_SIZE, pos = 0;
     *args = malloc(buff_size * sizeof(char *));
-    char *tok = NULL, *rest = strdup(line), *free_rest = rest;
 
-    while ((tok = strtok_r(rest, " ", &rest)) != NULL)
+    for (int i = 0; i < buff_size; i++)
     {
-        (*args)[pos] = strdup(tok);
-        pos++;
+        (*args)[i] = NULL;
+    }
+
+    char *tmp = strdup(line), *free_tmp = tmp;
+
+    for (int i = 0; i < strlen(line); i++)
+    {
+        if (line[i] == ' ')
+        {
+            tmp[i] = '\0';
+            (*args)[pos] = strdup(tmp);
+            tmp += strlen((*args)[pos]) + 1;
+            pos++;
+        }
+        else if (line[i] == '#')
+        {
+            break;
+        }
 
         if (pos > buff_size)
         {
@@ -56,13 +98,25 @@ int process_line(char *line, char ***args)
             *args = realloc(*args, buff_size * sizeof(char *));
             if (*args == NULL)
             {
-                fprintf(stderr, "myshell: allocation error");
+                fprintf(stderr, "myshell: memory allocation error");
                 exit(EXIT_FAILURE);
             }
         }
     }
 
-    free(free_rest);
+    if (tmp[0] != '\0' && tmp[0] != '#')
+    {
+        (*args)[pos] = strdup(tmp);
+        pos++;
+    }
+
+    if ((*args)[0] == NULL && line[0] != '#' && line[0] != '\0')
+    {
+        (*args)[0] = strdup(line);
+        pos++;
+    }
+
+    free(free_tmp);
 
     (*args)[pos] = NULL;
     return pos;
@@ -199,7 +253,7 @@ char *get_ip_addr()
 char *compose_prompt()
 {
     // New line
-    char *prompt = strdup("\n");
+    char *prompt = strdup("");
 
     // Username
     char *username = getenv("USER");
@@ -226,9 +280,18 @@ char *compose_prompt()
     prompt = strcat(prompt, "\033[92;1m");
     prompt = strcat(prompt, full_path);
     prompt = strcat(prompt, "\033[39;0m");
-
     free(full_path);
 
+    // Previous status
+    if (term.status.s != 0)
+    {
+        char *status = malloc(snprintf(NULL, 0, " \033[91m%d\033[39m", term.status.s));
+        sprintf(status, " \033[91m%d\033[39m", term.status.s);
+        prompt = realloc(prompt, strlen(prompt) + strlen(status) + 1);
+        prompt = strcat(prompt, status);
+        free(status);
+    }
+
     // Permissions specific character before user input
     prompt = realloc(prompt, strlen(prompt) + 4);
     if (getuid() == 0)