Added new features

Author: Dayitva

README.md

@@ -10,9 +10,21 @@ It's a basic shell written in C.
 6. main.c : Wraps all the components together and contains shell loop
 7. parse.c : Tokenizes the input string
 8. pinfo.c : Implements the `pinfo` function
-8. prompt.c : Prepares and asks for the prompt
+9. prompt.c : Prepares and asks for the prompt
+10. bg.c : Implements the `bg` function
+11. fg.c : Implements the `fg` function
+12. env.c : Implements the `setenv` and `unsetenv` function
+13. jobs.c : Implements the `jobs` function
+14. kjob.c : Implements the `kjob` function
+15. list.c : Contains the structs for Nodes and Processes
+16. overkill.c : Implements the `overkill` function
+17. sighandle.c : Contains code for signal handling
+
+# Additional features
+1. Supports background processes
+2. Supports Ctrl + C and Ctrl + D functionality
 
 # Steps to run the shell:
 1. Type `make`.
 2. Then type `./dash` to run the shell.
-3. Type `exit` or `quit` to exit the shell. You can also press Ctrl + C to quit the shell.
+3. Type `quit` to exit the shell. You can also press Ctrl + D to quit the shell.

bg.c

@@ -0,0 +1,29 @@
+#include "bg.h"
+#include "list.h"
+#include "main.h"
+#include "headers.h"
+
+void bg(char ** parsed, int args)
+{
+    if(args != 2)
+    {
+        printf("Usage: bg <job number>\n");
+    }
+
+    else
+    {
+        pid_t bgPid;
+        bgPid = get_Pid(procList, atoi(parsed[1]) - 1);
+
+        if(bgPid == -1)
+        {
+            printf("Error: No job with the given job number found\n");
+        }
+
+        if(kill(bgPid, SIGCONT))
+        {
+            perror("bg");
+        }
+    }
+    
+}

bg.h

@@ -0,0 +1,6 @@
+#ifndef __BG_h
+#define __BG_h
+
+void bg(char ** parsed, int args);
+
+#endif // !__BG_h

cd.c

@@ -1,8 +1,9 @@
 #include "cd.h"
 #include "prompt.h"
 #include "headers.h"
+#include "cwd.h"
 
-void cd(char **path)
+void cd(char **path, char * prev, bool prevset)
 {
     if(path[1] == NULL)
     {
@@ -22,6 +23,25 @@ void cd(char **path)
         }
     }
 
+    else if(!strcmp(path[1], "-"))
+    {
+        if(prevset)
+        {
+            if(chdir(prev) != 0)
+            {
+                perror("Error");
+            }
+
+            pwd();
+        }
+
+        else
+        {
+            printf("Error: No previous directory set yet\n");
+        }
+        
+    }
+
     else
     {
         if(chdir(path[1]) != 0)

cd.h

@@ -1,6 +1,8 @@
+#include "headers.h"
+
 #ifndef __CD_H
 #define __CD_H
 
-void cd(char **path);
+void cd(char **path, char * prev, bool prevset);
 
 #endif

cmdhandle.c

@@ -5,31 +5,31 @@
 #include "ls.h"
 #include "pinfo.h"
 #include "echo.h"
+#include "env.h"
+#include "jobs.h"
+#include "bg.h"
+#include "fg.h"
+#include "overkill.h"
+#include "kjob.h"
+#include "sighandle.h"
+#include "main.h"
 
-int cmdhandle(char **parsed)
+int cmdhandle(char **parsed, int args)
 {
-    if(!strcmp(parsed[0], "quit"))
-    {
-        printf("You have exited the shell.\n");
-        exit(0);
-        return 1;
-    }
-
-    else if(!strcmp(parsed[0], "pwd"))
+    if(!strcmp(parsed[0], "pwd"))
     {
         pwd();
         return 0;
     }
 
     else if(!strcmp(parsed[0], "cd"))
     {
-        cd(parsed);
         return 0;
     }
 
     else if(!strcmp(parsed[0], "echo"))
     {
-        echo(parsed);
+        echo(parsed, args);
         return 0;
     }
 
@@ -45,6 +45,48 @@ int cmdhandle(char **parsed)
         return 0;
     }
 
+    else if(!strcmp(parsed[0], "setenv"))
+    {
+        setEnv(parsed, args);
+        return 0;
+    }
+
+    else if(!strcmp(parsed[0], "unsetenv"))
+    {
+        unsetEnv(parsed, args);
+        return 0;
+    }
+
+    else if(!strcmp(parsed[0], "jobs"))
+    {
+        jobs(args);
+        return 0;
+    }
+
+    else if(!strcmp(parsed[0], "kjob"))
+    {
+        kjob(parsed, args);
+        return 0;
+    }
+
+    else if(!strcmp(parsed[0], "overkill"))
+    {
+        overkill(args);
+        return 0;
+    }
+
+    else if(!strcmp(parsed[0], "fg"))
+    {
+        fg(parsed, args);
+        return 0;
+    }
+
+    else if(!strcmp(parsed[0], "bg"))
+    {
+        bg(parsed, args);
+        return 0;
+    }
+
     else if(!strcmp(parsed[0], "clear"))
     {
         printf("\e[1;1H\e[2J");
@@ -53,6 +95,6 @@ int cmdhandle(char **parsed)
 
     else
     {
-        return 2;
+        return 1;
     }
 }

cmdhandle.h

@@ -1,6 +1,6 @@
 #ifndef __CMDHANDLE_H
 #define __CMDHANDLE_H
 
-int cmdhandle(char **parsed);
+int cmdhandle(char **parsed, int args);
 
 #endif

dash

@@ -1,21 +1,34 @@
 #include "echo.h"
 #include "headers.h"
+#include "env.h"
 
-void echo(char **parsed)
-{  
-    if(parsed[1] == NULL)
+void echo(char **parsed, int args)
+{
+    char temp[1024];
+
+    if(args == 1)
     {
         printf("\n");
+        return;
     }
 
     else
     {
-        int i = 1;
+        int i;
 
-        while(parsed[i] != NULL)
+        for(i = 1; i < args; i++)
         {
-            printf("%s ", parsed[i]);
-            i++;
+            // if(parsed[i][0] == '$')
+            // {
+            //     strcpy(temp, &parsed[i][1]);
+            //     printf("%s ", temp);
+            //     printf("%s ", getenv(temp));
+            // }
+
+            if(parsed[i])
+            {
+                printf("%s ", parsed[i]);
+            }
         }
         printf("\n");    
     }   

echo.c

@@ -1,6 +1,6 @@
 #ifndef __ECHO_H
 #define __ECHO_H
 
-void echo(char **parsed);
+void echo(char **parsed, int args);
 
 #endif