From a6ccd9344f306ae322030a64ed989ecb65e6b9f9 Mon Sep 17 00:00:00 2001
From: Dm1tr1y147 <me@dmitriy.icu>
Date: Thu, 9 Jul 2020 12:54:34 +0500
Subject: [PATCH] Added autocompletion for commands from /bin

---
 README.md          |  5 +++--
 include/complete.h |  1 +
 src/complete.c     | 33 ++++++++++++++++++++-------------
 3 files changed, 24 insertions(+), 15 deletions(-)

diff --git a/README.md b/README.md
index 6ea4576..62a82c2 100644
--- a/README.md
+++ b/README.md
@@ -8,7 +8,7 @@ Work is still in porgress, buf when you will see a "finished" topic assigned to
 * Command input with `left` and `right` arrow, `home` and `end` keys navigation and `backspace`, `delete` support
 * Running commands in separate process and termination them with `ctrl+c`
 * `cd` and `exit` builtin commands
-* Files autocompletion on `Tab` keypress
+* Files and commands from `/bin` autocompletion on `Tab` keypress
 
 # Builtin commands
 * `cd`: changes current working directory to the one specified by user. If no arguments provided, shows error.
@@ -19,4 +19,5 @@ 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`
-* Commands autocompletion
\ No newline at end of file
+* Commands autocompletion
+* Getting commands path from system `PATH` environment variable 
\ No newline at end of file
diff --git a/include/complete.h b/include/complete.h
index 35faa04..6752197 100644
--- a/include/complete.h
+++ b/include/complete.h
@@ -10,6 +10,7 @@
 #include <stdio.h>
 #include <dirent.h>
 
+size_t get_dir_list(char ***dir_list, char *path);
 void complete_line(int *pos, int *n, char **line, char **out);
 
 #endif
\ No newline at end of file
diff --git a/src/complete.c b/src/complete.c
index d4b9605..a5267e5 100644
--- a/src/complete.c
+++ b/src/complete.c
@@ -2,16 +2,15 @@
 #include "../include/shell.h"
 #include "../include/tree.h"
 
-size_t get_dir_list(char ***dir_list)
+size_t get_dir_list(char ***dir_list, char *path)
 {
     size_t n = 0;
     *dir_list = malloc(sizeof(char *) * n);
-    char *pwd = get_current_dir_name();
 
     DIR *dir;
     struct dirent *ent;
 
-    if ((dir = opendir(pwd)) == NULL)
+    if ((dir = opendir(path)) == NULL)
     {
         perror("opendir");
         return -1;
@@ -33,11 +32,21 @@ void complete_line(int *pos, int *n, char **line, char **out)
     (*line)[*pos] = '\0';
     *out = strdup("\x1b[2K");
 
-    char **dir_list;
-    size_t sz = get_dir_list(&dir_list);
+    char **comp_list;
 
     char *curr_path, *tmp_line = strdup(*line);
-    if ((curr_path = strtok(tmp_line, " ")) != NULL && (*line)[*pos - 1] != ' ')
+    size_t sz;
+
+    if ((curr_path = strtok(tmp_line, " ")) != NULL && (curr_path = strtok(NULL, " ")) != NULL)
+    {
+        sz = get_dir_list(&comp_list, get_current_dir_name());
+    }
+    else
+    {
+        sz = get_dir_list(&comp_list, "/usr/bin");
+        curr_path = *line;
+    }
+    if (*pos > 0 && (*line)[*pos - 1] != ' ')
     {
         curr_path = strdup(curr_path);
 
@@ -52,17 +61,15 @@ void complete_line(int *pos, int *n, char **line, char **out)
         struct tree_node *child_dirs_root = get_new_node();
         for (size_t i = 0; i < sz; i++)
         {
-            insert_tree(child_dirs_root, dir_list[i]);
+            insert_tree(child_dirs_root, comp_list[i]);
         }
 
-        free(dir_list);
-
-        sz = list_strings_containing(child_dirs_root, curr_path, &dir_list);
+        sz = list_strings_containing(child_dirs_root, curr_path, &comp_list);
     }
 
     if (sz == 1)
     {
-        *out = strdup(dir_list[0] + strlen(curr_path));
+        *out = strdup(comp_list[0] + strlen(curr_path));
         *pos += strlen(*out);
         *n = *pos;
 
@@ -74,8 +81,8 @@ void complete_line(int *pos, int *n, char **line, char **out)
 
     for (int i = 0; i < sz; i++)
     {
-        *out = realloc(*out, strlen(*out) + strlen(dir_list[i]) + 2);
-        *out = strcat(*out, dir_list[i]);
+        *out = realloc(*out, strlen(*out) + strlen(comp_list[i]) + 2);
+        *out = strcat(*out, comp_list[i]);
         *out = strcat(*out, " ");
     }