From e6c2e4a479f0f3fc4e7735296312660935ea7fda Mon Sep 17 00:00:00 2001
From: Dm1tr1y147 <me@dmitriy.icu>
Date: Sat, 18 Jul 2020 15:34:14 +0500
Subject: [PATCH] Added $ENV_VARIABLES expansion

---
 README.md        |  4 ++--
 src/line_parce.c | 29 ++++++++++++++++++++++++-----
 2 files changed, 26 insertions(+), 7 deletions(-)

diff --git a/README.md b/README.md
index 53723e4..3678d40 100644
--- a/README.md
+++ b/README.md
@@ -16,6 +16,7 @@ Work is still in porgress, buf when you will see a "finished" topic assigned to
 * Expand `*` wildcards
 * Commands I/O redirection with `|` pipes and `>`, `<`, `>>`, `<>` file input/output
 * Save history into file and access recent command in another instance of shell
+* `$ENVIRONMENT_VARIABLES` expansion
 
 # Builtin commands
 * `cd`: changes current working directory to the one specified by user. If no arguments provided, shows error.
@@ -23,7 +24,6 @@ Work is still in porgress, buf when you will see a "finished" topic assigned to
 * `exec`: executes entered command and exits
   
 # TODO
-* Replace linux `echo` command with builtin one with support of environmental variables
-* Environmental variables
 * `Ctrl+Z` running programm with `fd`
 * `$()` subcommands
+* Setting environment variables with `export` and before commands
diff --git a/src/line_parce.c b/src/line_parce.c
index e1d521f..fb3df7e 100644
--- a/src/line_parce.c
+++ b/src/line_parce.c
@@ -34,7 +34,7 @@ cmds_p *process_line(char *line)
                 {
                     free_tmp[j] = '\0';
 
-                    append_to_str_arr(&(curr_pipe->args), &curr_pipe->args_am, trim_string(tmp, false));
+                    append_to_str_arr(&curr_pipe->args, &curr_pipe->args_am, trim_string(tmp, false));
 
                     tmp += strlen(curr_pipe->args[curr_pipe->args_am - 1]) + 1;
 
@@ -68,7 +68,7 @@ cmds_p *process_line(char *line)
             free_tmp[i] = '\0';
             if (line[i - 1] != ' ')
             {
-                append_to_str_arr(&(curr_pipe->args), &curr_pipe->args_am, trim_string(tmp, false));
+                append_to_str_arr(&curr_pipe->args, &curr_pipe->args_am, trim_string(tmp, false));
                 tmp += strlen(curr_pipe->args[curr_pipe->args_am - 1]) + 1;
             }
             else
@@ -122,7 +122,7 @@ cmds_p *process_line(char *line)
         {
             if (line[i - 1] != ' ')
             {
-                append_to_str_arr(&(curr_pipe->args), &curr_pipe->args_am, trim_string(tmp, false));
+                append_to_str_arr(&curr_pipe->args, &curr_pipe->args_am, trim_string(tmp, false));
                 tmp += strlen(curr_pipe->args[curr_pipe->args_am - 1]) + 1;
             }
             else
@@ -220,6 +220,25 @@ cmds_p *process_line(char *line)
             tmp += j - i + 1;
             i = j;
         }
+        else if (line[i] == '$')
+        {
+            tmp++;
+            i++;
+            int j = i;
+
+            for (; j < line_size; j++)
+                if (line[j] == ' ')
+                    break;
+
+            free_tmp[j] = '\0';
+
+            char *msg = getenv(tmp);
+            if (msg != NULL)
+                append_to_str_arr(&curr_pipe->args, &curr_pipe->args_am, "\n");
+
+            tmp += j - i + 1;
+            i = j;
+        }
         else if (line[i] == ' ')
         {
             free_tmp[i] = '\0';
@@ -229,7 +248,7 @@ cmds_p *process_line(char *line)
             int sz = expand_wildcatrd(&exp, ap_string);
 
             for (int l = 0; l < sz; l++)
-                append_to_str_arr(&(curr_pipe->args), &curr_pipe->args_am, exp[l]);
+                append_to_str_arr(&curr_pipe->args, &curr_pipe->args_am, exp[l]);
 
             tmp += strlen(ap_string) + 1;
         }
@@ -248,7 +267,7 @@ cmds_p *process_line(char *line)
             int sz = expand_wildcatrd(&exp, ap_string);
 
             for (int l = 0; l < sz; l++)
-                append_to_str_arr(&(curr_pipe->args), &curr_pipe->args_am, exp[l]);
+                append_to_str_arr(&curr_pipe->args, &curr_pipe->args_am, exp[l]);
         }
         else
             append_to_str_arr(&curr_pipe->args, &curr_pipe->args_am, trim_string(tmp, false));