set up dealiasing

1 files changed, 41 insertions, 1 deletions

diff --git a/src/exec.c b/src/exec.c
index 2bcffb9..0c53971 100644
--- a/src/exec.c
+++ b/src/exec.c
@@ -1,4 +1,6 @@
+#include <assert.h>
 #include <stdio.h>
+#include <string.h>
 #include <unistd.h>
 #include <fcntl.h>
 #include <signal.h>
@@ -10,12 +12,38 @@
 void execute_command_pipeline(Pipeline pipeline, int stdin_fd, int stdout_fd, bool wait_here, int* pgid, ShellState* shstate);
 
 
+DECLARE_MAYBE(StrPair, MaybeStrPair)
+
+MaybeStrPair parse_assignment(char* token) {
+    printf("%s\n", token);
+    // TODO: ideally shouldn't mutate maybe
+    if (token == NULL) return (MaybeStrPair){.some = false};
+    char* eq = strchr(token, '=');
+    if (eq == NULL || eq == token) return (MaybeStrPair){.some = false};
+    *eq = '\0';
+    if (!is_identifier(token)) exit(42);
+    return (MaybeStrPair){.some = true, .value = (StrPair){.key = token, .val = eq+1}};
+}
+
+
 bool handle_builtin(ExecutableCommand cmd, ShellState* shstate) {
 
+    assert(cmd.args[0] != NULL); 
     // TODO: handle id=value assignments
 
     if (strcmp(cmd.args[0], "exit") == 0) {
         exit(0);
+    } else if (strcmp(cmd.args[0], "cd") == 0) {
+        assert(cmd.args[1] != NULL);
+        chdir(cmd.args[1]);
+        return true;
+    } else if (strcmp(cmd.args[0], "alias") == 0) {
+        // TODO: if no arg1 -> print alias list
+        MaybeStrPair m_assignment = parse_assignment(cmd.args[1]);
+        assert(m_assignment.some);
+        printf("%s:%s\n", m_assignment.value.key, m_assignment.value.val);
+        set_map_pair(&shstate->aliases, m_assignment.value); 
+        return true;
     }
     return false;
 }
@@ -137,7 +165,19 @@ ExecutableCommand process_pl_command(PlCommand pl_cmd, int* pgid, ShellState* sh
 
     char** args = malloc(sizeof(char*) * (arg_vec.count + 1));
     for (int i = 0; i < arg_vec.count; i++) {
-        args[i] = *get_from_StrVec(&arg_vec, i);
+        if (i == 0) {
+            char* arg = *get_from_StrVec(&arg_vec, 0);
+            MaybeStr m_dealias = get_map_value(&shstate->aliases, arg);
+            if (m_dealias.some) {
+                args[0] = m_dealias.value;
+                printf("%s\n", args[0]);
+            } else {
+                printf("Nah\n");
+                args[0] = arg;
+            }
+        } else {
+            args[i] = *get_from_StrVec(&arg_vec, i);
+        }
     }
     args[arg_vec.count] = NULL;