Pass shell environment on to commands

1 files changed, 2 insertions, 6 deletions

diff --git a/cmd.c b/cmd.c
index 4834bfb..69b9bf3 100644
--- a/cmd.c
+++ b/cmd.c
@@ -1,21 +1,17 @@
 #include "spsh.h"
 
 /* Process a read line into a command and arguments and try to execute it */
-void cmd(char *line) {
+void cmd(char *line, char **environ) {
     char *cmd, *cmd_arg;
     pid_t pid;
     int status, cmd_argc;
     char *cmd_argv[MAX_ARGS];
-    char *cmd_envp[MAX_ENVS];
 
     /* First argument is always the executable file itself; we make it NULL to
      * start with, and then terminate the array with NULL */
     cmd_argv[0] = cmd_argv[1] = NULL;
     cmd_argc = 1;
 
-    /* Environment is just empty for now, I'll figure this out later */
-    cmd_envp[0] = NULL;
-
     /* Read the command as the first token of the line */
     cmd = strtok(line, ARG_DELIM);
 
@@ -41,7 +37,7 @@ void cmd(char *line) {
         pid = fork();
         if (pid == 0) {
             cmd_argv[0] = cmd;
-            execve(cmd, cmd_argv, cmd_envp);
+            execve(cmd, cmd_argv, environ);
         }
         waitpid(pid, &status, 0);
     }