ctrl c handler

README.md

@@ -37,13 +37,13 @@ The Shell Assignment (total 42 points)
     + `ls a*b`
 + 1 ~~Knows how to change directory~~
     + `cd /fred`
-+ 1 Bang last command
++ 1 ~~Bang last command~~
     + `!l` runs ls
 + 1 Bang # command
     + `!4` runs 4th command from history
-+ 1 Queue commands
++ 1 ~~Queue commands~~
     + `make ; make install`
-+ 1 Can have lots of semicolons
++ 1 ~~Can have lots of semicolons~~
     + `ls; sleep 3; rm fred`
 + 2 Change Prompt
     + `PS1="what is you command?"`
@@ -69,7 +69,8 @@ The Shell Assignment (total 42 points)
 + 2 Only runs execuatables from an approved list
 + -2  Commands cannot have arguments (i.e. ls -l does not work).
     
-
+13 pts
+/20
 
 Some cases to consider
 + A person tries to run a non-executable.

bish.cc

@@ -54,12 +54,32 @@ int main(int argc, char **argv){
 
     // char **args = v_to_cpp(split(line));
     // parse line
-    command *cmd = parse(split(line));
+    vector<string> wfwe = split(line, ';');
+    for (auto it: wfwe) {
+
+
+      command *cmd = parse(split(it.c_str()));
       print_cmd(cmd);
       // clear line var
       free(line);
       line = (char*)NULL;
 
+      // COMMANDS that do something with the line before fork/exec
+      if (strcmp(cmd->args[0], "!") == 0) {
+        line = history_get(where_history())->line;
+        cmd = parse(split(line));
+      }
+
+      else if (strcmp(cmd->args[0], ".") == 0 || strcmp(cmd->args[0], "source") == 0) {
+        int dotsrcfile = open(cmd->args[1], O_RDONLY);
+        if (dotsrcfile < 0) {
+          perror("dotsrcfile");
+          continue;
+        }
+        // do the thing to read the files
+      }
+
+      // COMMANDS that skip fork/exec
       // http://www.linuxquestions.org/questions/programming-9/making-a-c-shell-775690/
       if (strcmp(cmd->args[0], "exit") == 0) break;
 
@@ -158,7 +178,7 @@ int main(int argc, char **argv){
       delete cmd;
 
     }
-
+  }
   cout << endl;
   if (write_history(histpath.c_str())) perror("write_history");
 

parse.cc

@@ -10,14 +10,10 @@ using namespace std;
 
 
 void print_cmd(command *cmd) {
-  // cout << "args: " << endl;
-
   if (cmd->background) cout << "backgroud: true" << endl;
-
   if (cmd->piping != "") cout << "piping to: " << cmd->piping << endl;
   if (cmd->infile != "") cout << "infile: " << cmd->infile << endl;
   if (cmd->outfile != "") cout << "outfile: " << cmd->outfile << endl;
-  cout << endl;
 }
 
 

util_fns.cc

@@ -5,16 +5,13 @@
 #include <signal.h>
 #include <iostream>
 #include <string.h>
+#include <unistd.h>
 // #include "util_fns.h"
 using namespace std;
 
 
 void ctrlCHandler(int sig) {
-  if (sig == SIGINT) {
-    // cout << "SIGINT received" << endl;
-    // return;
-    cout << endl;
-  }
+  cout << endl << "\e[34mbish:\e[92m" << get_current_dir_name() << "\e[34m:$\e[0m ";
 }
 
 // util methods
@@ -23,7 +20,8 @@ vector<string> split(const char *str, char c) {
   do {
     const char *begin = str;
     while (*str != c && *str) str++;
-    result.push_back(string(begin, str));
+    string tmp = string(begin, str);
+    if (tmp != "") result.push_back(tmp);
   } while (0 != *str++);
   return result;
 }
@@ -38,3 +36,5 @@ char** v_to_cpp(vector<string> vargs) {
   args[vargs.size()] = NULL;
   return args;
 }
+
+