Fixed corner cases with cat and &, and modified setenv to match the requirements

Author: b30wulffz

envvar.c

@@ -2,7 +2,18 @@
 
 void setEnv(char **parsedCommand, int parsedLength)
 {
-    if (parsedLength == 3)
+    if (parsedLength == 2)
+    {
+        if (setenv(parsedCommand[1], "", 1) != -1)
+        {
+            printf("%s=%s\n", parsedCommand[1], "");
+        }
+        else
+        {
+            printf("setenv: [Error] environment variable cannot be set.\n");
+        }
+    }
+    else if (parsedLength == 3)
     {
         if (setenv(parsedCommand[1], parsedCommand[2], 1) != -1)
         {

execute.c

@@ -18,11 +18,12 @@ void execute(char **data, int len, char *trimmedCommand, int isBackground)
                 signal(SIGTTIN, SIG_IGN);
                 signal(SIGTTOU, SIG_IGN);
 
-                if (tcsetpgrp(STDIN_FILENO, pid) == -1)
-                {
-                    perror("Error, process cannot be made foreground");
-                    return;
-                }
+                tcsetpgrp(STDIN_FILENO, pid);
+                // if (tcsetpgrp(STDIN_FILENO, pid) == -1)
+                // {
+                //     perror("Error, process cannot be made foreground");
+                //     return;
+                // }
 
                 int status;
                 if (waitpid(pid, &status, WUNTRACED) == -1)
@@ -39,12 +40,12 @@ void execute(char **data, int len, char *trimmedCommand, int isBackground)
                         printf("[%d] %d\n", node->jobid, node->pid);
                     }
                 }
-
-                if (tcsetpgrp(STDIN_FILENO, getpgrp()) == -1)
-                {
-                    perror("Error, terminal cannot be made foreground");
-                    return;
-                }
+                tcsetpgrp(STDIN_FILENO, getpgrp());
+                // if (tcsetpgrp(STDIN_FILENO, getpgrp()) == -1)
+                // {
+                //     perror("Error, terminal cannot be made foreground");
+                //     return;
+                // }
                 signal(SIGTTIN, SIG_DFL);
                 signal(SIGTTOU, SIG_DFL);
                 setCurrentFgPid(-1);

fgbg.c

@@ -6,11 +6,12 @@
 int terminalFG()
 {
     setCurrentFgPid(-1);
-    if (tcsetpgrp(STDIN_FILENO, getpgrp()) == -1)
-    {
-        perror("Error, terminal cannot be made foreground");
-        return -1;
-    }
+    tcsetpgrp(STDIN_FILENO, getpgrp());
+    // if (tcsetpgrp(STDIN_FILENO, getpgrp()) == -1)
+    // {
+    //     perror("Error, terminal cannot be made foreground");
+    //     return -1;
+    // }
     signal(SIGTTIN, SIG_DFL);
     signal(SIGTTOU, SIG_DFL);
     return 0;
@@ -42,11 +43,12 @@ int fg(char **parsedCommand, int parsedLength)
             signal(SIGTTIN, SIG_IGN);
             signal(SIGTTOU, SIG_IGN);
 
-            if (tcsetpgrp(STDIN_FILENO, tmpProcess->pid) == -1)
-            {
-                perror("Error, process cannot be made foreground");
-                return -1;
-            }
+            tcsetpgrp(STDIN_FILENO, tmpProcess->pid);
+            // if (tcsetpgrp(STDIN_FILENO, tmpProcess->pid) == -1)
+            // {
+            //     perror("Error, process cannot be made foreground");
+            //     return -1;
+            // }
             if (kill(tmpProcess->pid, SIGCONT) == -1)
             {
                 perror("Error, SIGCONT signal cannot be sent to the process");

init.c

@@ -73,11 +73,16 @@ void ctrlZHandler()
     }
 }
 
+void ctrlDHandler()
+{
+    cleanup();
+}
+
 void init()
 {
     setHomeDir(pwd());
     signal(SIGINT, ctrlCHandler);
-    // signal(SIGQUIT, SIG_IGN);
+    // signal(SIGQUIT, ctrlDHandler);
     signal(SIGCHLD, childProcHandler);
     signal(SIGTSTP, ctrlZHandler);
     initialiseChildProcessList();

log.txt

@@ -1,20 +1,20 @@
-fg
-lls
 ls
-git
+cd
 make
 ls
 cat
 vi
-jobs
-overkill
-kjob
-make
-exit
+fg
+ls
 vi
-sleep
-kjobs
-kjob
-jobs
-kjob
-git
+overkill
+d
+ddd
+a
+pwd
+pinfo
+echo
+ssstcsetpgrp(STDIN_FILENO,
+getenv
+printenv
+history

main

@@ -145,6 +145,10 @@ void parseIORedir(char *command, int stdinBkp2, int stdoutBkp2)
 
     for (int i = 0; i < parsedLength; i++)
     {
+        if (i == parsedLength - 1 && (strcmp(parsed[i], "&") == 0))
+        {
+            continue;
+        }
         if (strcmp(parsed[i], "<") == 0)
         {
             ipFlag = 1;
@@ -572,7 +576,10 @@ void shellInput(char *homeDir)
     size_t bufferLen = 1024;
     buffer = (char *)malloc(bufferLen * sizeof(char));
 
-    getline(&buffer, &bufferLen, stdin);
+    if (getline(&buffer, &bufferLen, stdin) == EOF)
+    {
+        cleanup();
+    }
 
     parseInput(buffer);
 

shellinput.c

@@ -1 +1 @@
-A  aa  b  c  d  i  p1  p2  p3  p4  p5  p6  p7  test1  
+      1      47     466

test/a

@@ -0,0 +1 @@
+A  aa  b  c  cat  d  i  p1  p2  p3  p4  p5  p6  p7  test1