From 3ab9e3a7696d84d636d4028d3367ffed61ee68aa Mon Sep 17 00:00:00 2001
From: Dm1tr1y147 <me@dmitriy.icu>
Date: Wed, 15 Jul 2020 16:41:39 +0500
Subject: [PATCH] Fixed autocompletion after command separators, spacing after
 quotes and somem more errors

---
 include/shell.h |  3 ---
 include/utils.h |  1 +
 src/complete.c  |  2 +-
 src/input.c     |  1 +
 src/shell.c     | 16 ++++++++++------
 src/utils.c     | 10 +++++++++-
 6 files changed, 22 insertions(+), 11 deletions(-)

diff --git a/include/shell.h b/include/shell.h
index debf36b..56d14cb 100644
--- a/include/shell.h
+++ b/include/shell.h
@@ -1,9 +1,6 @@
 #ifndef _SHELL_H
 #define _SHELL_H
 
-#define _GNU_SOURCE
-
-#include <features.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
diff --git a/include/utils.h b/include/utils.h
index 4a95dbd..f324bd6 100644
--- a/include/utils.h
+++ b/include/utils.h
@@ -23,5 +23,6 @@ void free_str_arr(char **arr);
 char **slice_array(char **arr, int beg, int end, bool asc);
 int get_null_term_arr_size(char **arr);
 int append_to_str_arr(char ***arr, int *sz, char *str);
+char *get_curr_dir_name();
 
 #endif
\ No newline at end of file
diff --git a/src/complete.c b/src/complete.c
index 1eab645..e976851 100644
--- a/src/complete.c
+++ b/src/complete.c
@@ -76,7 +76,7 @@ ssize_t get_dir_list(char ***dir_list, char *path, int ex)
  * @param size 
  * @return ssize_t 
  */
-ssize_t append_builtin_list(char ***commands_list, size_t *size)
+ssize_t append_builtin_list(char ***commands_list, ssize_t *size)
 {
     for (int i = 0; i < 3; i++)
     {
diff --git a/src/input.c b/src/input.c
index 93d2700..68dd16b 100644
--- a/src/input.c
+++ b/src/input.c
@@ -106,6 +106,7 @@ char *read_line()
             }
         }
     }
+    return line;
 }
 
 /**
diff --git a/src/shell.c b/src/shell.c
index fa49aa9..6e36acd 100644
--- a/src/shell.c
+++ b/src/shell.c
@@ -39,10 +39,12 @@ void process_command()
         status = execute(curr);
 
         if (curr->stat.invert)
+        {
             if (status == 0)
                 status = 1;
             else
                 status = 0;
+        }
 
         curr->stat.s = status;
         term.last_status = curr->stat.s;
@@ -114,7 +116,7 @@ int process_line(char *line, cmds_p **coms)
             }
 
             i = j;
-            
+
             if (tmp[0] == ' ')
             {
                 tmp++;
@@ -350,19 +352,19 @@ char *compose_prompt()
     char *ip = get_ip_addr();
     if (ip == NULL)
         ip = "none";
-    prompt = realloc(prompt, strlen(prompt) + 1 + strlen(ip) + strlen("\033[39m") + strlen("\033[48;2;28;32;35m") + 2);
+    prompt = realloc(prompt, strlen(prompt) + 1 + strlen(ip) + strlen("\033[39m") + strlen("\033[0m") + 2);
     prompt = strcat(prompt, "@");
     prompt = strcat(prompt, ip);
     prompt = strcat(prompt, "\033[39m");
-    prompt = strcat(prompt, "\033[48;2;28;32;35m");
+    prompt = strcat(prompt, "\033[0m");
     prompt = strcat(prompt, ":");
 
     // Current path
-    char *full_path = get_current_dir_name();
-    prompt = realloc(prompt, strlen(prompt) + strlen("\033[92;1m") + strlen("\033[39;0m") + strlen(full_path) + 2);
+    char *full_path = get_curr_dir_name();
+    prompt = realloc(prompt, strlen(prompt) + strlen("\033[92;1m") + strlen("\033[0m") + strlen(full_path) + 2);
     prompt = strcat(prompt, "\033[92;1m");
     prompt = strcat(prompt, full_path);
-    prompt = strcat(prompt, "\033[39;0m");
+    prompt = strcat(prompt, "\033[0m");
     free(full_path);
 
     // Previous status
@@ -394,4 +396,6 @@ cmds_p *new_cmd()
     new->stat.s = 0;
     new->stat.invert = false;
     new->next = NULL;
+
+    return new;
 }
\ No newline at end of file
diff --git a/src/utils.c b/src/utils.c
index f02b71e..dab4163 100644
--- a/src/utils.c
+++ b/src/utils.c
@@ -89,7 +89,7 @@ char *trim_string(char *str, bool leave_trailing_space)
             remove_on_pos(&tmp, i);
             i--;
         }
-    
+
     if (!leave_trailing_space)
         if (tmp[strlen(tmp) - 1] == ' ' && tmp[strlen(tmp) - 2] == ' ')
             remove_on_pos(&tmp, strlen(tmp) - 1);
@@ -168,4 +168,12 @@ int append_to_str_arr(char ***arr, int *sz, char *str)
     (*arr)[*sz - 1] = strdup(str);
 
     return 0;
+}
+
+char *get_curr_dir_name()
+{
+    char *pwd = malloc(FILENAME_MAX);
+    getcwd(pwd, FILENAME_MAX);
+
+    return pwd;
 }
\ No newline at end of file