Pipeless and works

Author: zubairabid

README.md

@@ -50,7 +50,7 @@ In order to exit the shell, type `exit`
  - [x] I/O Redirection
  - [x] Command Redirection, pipes
  - [x] I/O+pipes
- - [ ] setenv, getenv
+ - [x] setenv, getenv
  - [ ] jobs, kjo, overkill
  - [ ] fg, bg, ^Z
  - [ ] quit, ^C

global.c

@@ -0,0 +1,9 @@
+typedef struct {
+  char name[2048];
+  int id;
+  int fore;
+} process;
+
+int backCount = 0;
+process currentProcess;
+char bgProcess[2048];

include/builtins.h

@@ -4,3 +4,4 @@ int shexit();
 int shecho(char **argv, int argc);
 int remind(char **argv, int argc);
 int shsetenv(char **argv, int argc);
+int shunsetenv(char **argv, int argc);

include/global.h

@@ -3,3 +3,4 @@ char **splitlines(char *line, int *num);
 void sig_child(int signum);
 void sig_stop(int signum);
 void sig_int(int signum);
+void sig_tstp(int signum);

include/util.h

@@ -3,7 +3,7 @@ IDIR = include
 CC=gcc
 CFLAGS=-I$(IDIR) -Wall
 
-FILES = smain.c disp.c util.c operation.c builtins.c ls.c pinfo.c redirection.c pipe.c
+FILES = smain.c disp.c util.c operation.c builtins.c ls.c pinfo.c redirection.c pipe.c global.c
 
 install:
 	$(CC) $(CFLAGS) $(FILES) -o shell

makefile

@@ -32,18 +32,28 @@ int run(char **argv, int argc) {
   else if (strcmp(argv[0], "setenv") == 0) {
     return shsetenv(argv, argc);
   }
+  else if (strcmp(argv[0], "unsetenv") == 0) {
+    return shunsetenv(argv, argc);
+  }
+
+
+  prex(argv);
+  return 1;
 
   // Flow: check for all pipes, split commands and parent/child processes
   // accordingly. Then for each of these, process with redirection etc as
   // per normal
 
 
+
+  // Stores all comss
   char *args[128][128];
 
   int m = 0, n = 0;
   for (int i = 0; i < argc; i++) {
     if (strcmp(argv[i],"|") != 0) {
       args[m][n++] = argv[i];
+      strcat(args[m][n], "\0");
     }
     else {
       args[m][n] = NULL;
@@ -54,6 +64,15 @@ int run(char **argv, int argc) {
   args[++m][0] = NULL;
 
 
+  printf("THIS IS A TEST\n");
+  for(int i = 0; *args[i] != NULL; i++) {
+    for(int j = 0; args[i][j] != NULL; i++) {
+      printf("%s", args[i][j]);
+    }
+    printf("\n");
+  }
+
+
   int fdes[2] = {0, 0}, ret;
   pid_t pid;
   int fd_in = 0;
@@ -109,18 +128,18 @@ int prex(char **argv) {
   while(argv[argc] != NULL)
     argc++;
 
-  printf("Printing command that's gonna be executed\n");
-  for(int i = 0; i < argc; i++) {
-    printf("%s ", argv[i]);
-  }
-  printf("\n\n");
-
-  for(int i = 0; i < argc; i++) {
-    for(int j = 0; j < strlen(argv[i]); j++)
-      printf("%d ", (int)argv[i][j]);
-    printf("\t");
-  }
-  printf("\n\n");
+  // printf("Printing command that's gonna be executed\n");
+  // for(int i = 0; i < argc; i++) {
+  //   printf("%s ", argv[i]);
+  // }
+  // printf("\n\n");
+  //
+  // for(int i = 0; i < argc; i++) {
+  //   for(int j = 0; j < strlen(argv[i]); j++)
+  //     printf("%d ", (int)argv[i][j]);
+  //   printf("\t");
+  // }
+  // printf("\n\n");
 
   for(int i = 0; i < argc; i++) {
     if (argv[i][0] == '<' || argv[i][0] == '>') {

operation.c

@@ -47,8 +47,8 @@ int loop() {
 
 	signal(SIGINT, sig_int);
 	signal(SIGSTOP, sig_stop);
+	signal(SIGTSTP, sig_tstp);
 	// Print any process IDs
-	signal(SIGCHLD, sig_child);
 	do {
 
 		//			FLOW: Display prompt and get input

shell

@@ -0,0 +1,7 @@
+Inside process: thing running is
+cat test1 
+
+nothing
+nothing
+nothing
+oona