From d6ed9d8de099f34c7edfe54b016d885798f193a6 Mon Sep 17 00:00:00 2001
From: Dm1tr1y147 <me@dmitriy.icu>
Date: Wed, 15 Jul 2020 19:52:57 +0500
Subject: [PATCH] Added wildcard explanation

---
 README.md       |  1 +
 include/shell.h |  1 +
 src/shell.c     | 23 ++++++++++++++++++++++-
 3 files changed, 24 insertions(+), 1 deletion(-)

diff --git a/README.md b/README.md
index fd777c7..ce9b310 100644
--- a/README.md
+++ b/README.md
@@ -13,6 +13,7 @@ Work is still in porgress, buf when you will see a "finished" topic assigned to
 * Username, ip address and current path in prompt before each command input
 * Show previous command return status in prompt and invert it with `!`, separated with space, specified before it
 * Running multiple commands separated by `;`, `&&` or `||`
+* Expand `*` wildcards
 
 # Builtin commands
 * `cd`: changes current working directory to the one specified by user. If no arguments provided, shows error.
diff --git a/include/shell.h b/include/shell.h
index 56d14cb..913c970 100644
--- a/include/shell.h
+++ b/include/shell.h
@@ -7,6 +7,7 @@
 #include <unistd.h>
 #include <termios.h>
 #include <ifaddrs.h>
+#include <glob.h>
 #include <stdbool.h>
 
 #include <sys/types.h>
diff --git a/src/shell.c b/src/shell.c
index 6e36acd..92656ae 100644
--- a/src/shell.c
+++ b/src/shell.c
@@ -297,7 +297,27 @@ int sh_exec(char **args)
     if (strcmp(args[0], "exec") == 0)
         args = slice_array(args, 1, -1, 1);
 
-    if (execvp(args[0], args) < 0)
+    int amount = get_null_term_arr_size(args) - 1, k = 0;
+    char **ex_args = malloc(0);
+
+    for (int i = 0; i < amount; i++)
+    {
+        if (strchr(args[i], '*') || strchr(args[i], '~'))
+        {
+            glob_t globbuf;
+            glob(args[i], GLOB_DOOFFS, NULL, &globbuf);
+            
+            for (int j = 0; j < globbuf.gl_pathc; j++)
+                append_to_str_arr(&ex_args, &k, globbuf.gl_pathv[j]);
+        }
+        else
+            append_to_str_arr(&ex_args, &k, args[i]);
+    }
+
+    ex_args = realloc(ex_args, sizeof(char *) * ++k);
+    ex_args[k - 1] = NULL;
+
+    if (execvp(ex_args[0], ex_args) < 0)
     {
         perror("myshell3");
     }
@@ -394,6 +414,7 @@ cmds_p *new_cmd()
     cmds_p *new = malloc(sizeof(cmds_p));
     new->args = calloc(0, sizeof(char *));
     new->stat.s = 0;
+    new->sep_next = NO_SEP;
     new->stat.invert = false;
     new->next = NULL;