small fix

hw5/starter/bats/student_tests.sh

@@ -12,3 +12,66 @@ EOF
     # Assertions
     [ "$status" -eq 0 ]
 }
+
+@test "Change directory then do ls" {
+    current=$(pwd)
+    cd /tmp
+    mkdir -p student-test
+    cd student-test
+    touch test_file
+    cd ..
+
+    run "${current}/dsh" <<EOF                     
+cd student-test | ls
+EOF
+
+    # Strip all whitespace (spaces, tabs, newlines) from the output
+    stripped_output=$(echo "$output" | tr -d '[:space:]')
+
+    # Expected output with all whitespace removed for easier matching
+    expected_output="test_filedsh3>dsh3>cmdloopreturned0"
+
+    # These echo commands will help with debugging and will only print
+    #if the test fails
+    echo "Captured stdout:" 
+    echo "Output: $output"
+    echo "Exit Status: $status"
+    echo "${stripped_output} -> ${expected_output}"
+
+    # Check exact match
+    [ "$stripped_output" = "$expected_output" ]
+
+    # Assertions
+    [ "$status" -eq 0 ]
+}
+
+@test "Change directory" {
+    current=$(pwd)
+    cd /tmp
+    mkdir -p student-test
+
+    run "${current}/dsh" <<EOF                     
+cd student-test
+pwd
+EOF
+
+    # Strip all whitespace (spaces, tabs, newlines) from the output
+    stripped_output=$(echo "$output" | tr -d '[:space:]')
+
+    # Expected output with all whitespace removed for easier matching
+    expected_output="/tmp/student-testdsh3>dsh3>dsh3>cmdloopreturned0"
+
+    # These echo commands will help with debugging and will only print
+    #if the test fails
+    echo "Captured stdout:" 
+    echo "Output: $output"
+    echo "Exit Status: $status"
+    echo "${stripped_output} -> ${expected_output}"
+
+    # Check exact match
+    [ "$stripped_output" = "$expected_output" ]
+
+    # Assertions
+    [ "$status" -eq 0 ]
+}
+

hw5/starter/dshlib.c

@@ -189,10 +189,16 @@ int execute_pipeline(command_list_t *clist){
             }
 
             // Execute command
+            if (strcmp(clist->commands[i].argv[0], "cd") == 0){
+                continue;
+            }else{
+
                 execvp(clist->commands[i].argv[0], clist->commands[i].argv);
                 perror("execvp");
                 exit(EXIT_FAILURE);
             }
+
+        }
     }
 
     // Parent process: close all pipe ends
@@ -206,9 +212,9 @@ int execute_pipeline(command_list_t *clist){
         waitpid(pids[i], NULL, 0);
     }
 
-    exit(OK);
+    // exit(OK);
 
-    // return OK;
+    return OK;
 
 }
 
@@ -222,12 +228,12 @@ int exec_local_cmd_loop()
 
     // TODO IMPLEMENT MAIN LOOP
     while(1){
-        
+        printf("%s", SH_PROMPT);
         if (fgets(cmd_buff, ARG_MAX, stdin) == NULL){
             printf("\n");
             break;
         }
-        printf("%s", SH_PROMPT);
+        
         //remove the trailing \n from cmd_buff
         cmd_buff[strcspn(cmd_buff,"\n")] = '\0';
 
@@ -241,16 +247,22 @@ int exec_local_cmd_loop()
         }
         build_cmd_list(cmd_buff, &clist);
 
-        int supervisor = fork();
-        if (supervisor == 0) {
-            execute_pipeline(&clist);  // Supervisor process
+        if (strcmp(clist.commands[0].argv[0], "cd") == 0){
+            if (clist.commands[0].argc == 2){
+                
+                chdir(clist.commands[0].argv[1]);
+            } else {
+                printf("cd command requires 1 argument\n");
+            }
+
+            for (int i=0; i<clist.num - 1; i++){
+                clist.commands[i] = clist.commands[i+1];
             }
-        if (supervisor == -1) {
-            perror("fork supervisor");
-            exit(EXIT_FAILURE);
+            clist.num--;
         }
         
-        waitpid(supervisor, NULL, 0);
+        
+        execute_pipeline(&clist);  
         
     }