diff --git a/3-Shell/dsh b/3-Shell/dsh
index a8c1465c640b180fbb9787195897c4d0481646df..a099b0c121a54b24f307c08bab7b6e22a32a1ced 100755
Binary files a/3-Shell/dsh and b/3-Shell/dsh differ
diff --git a/3-Shell/dsh_cli.c b/3-Shell/dsh_cli.c
index 4b3b1928840656a49c28767933b58aabe0611ef7..86e76b4c70016126a4d44f148ecdf05d618ebc28 100644
--- a/3-Shell/dsh_cli.c
+++ b/3-Shell/dsh_cli.c
@@ -61,6 +61,10 @@ int main()
clist->num = 0;
printf("%s", SH_PROMPT);
+
+ // flush prompt before encountering any error
+ fflush(stdout);
+
if (fgets(cmd_buff, ARG_MAX, stdin) == NULL){
break;
}
@@ -76,6 +80,10 @@ int main()
else {
// printf("Command line: %s\n", cmd_buff);
code = build_cmd_list(cmd_buff, clist);
+
+ if (code == ERR_TOO_MANY_COMMANDS) {
+ printf(CMD_ERR_PIPE_LIMIT, CMD_MAX);
+ }
}
}
diff --git a/3-Shell/dshlib.c b/3-Shell/dshlib.c
index abe3c79e735f6b9cc4a9eb6990f4123894644383..6d4454270306293ed1d806ae4e0e69b5d7208f23 100644
--- a/3-Shell/dshlib.c
+++ b/3-Shell/dshlib.c
@@ -121,8 +121,8 @@ int build_cmd_list(char *cmd_line, command_list_t *clist)
}
if (clist->num > CMD_MAX) {
- printf("dsh> ");
- printf(CMD_ERR_PIPE_LIMIT, CMD_MAX);
+ // printf("dsh> ");
+ // printf(CMD_ERR_PIPE_LIMIT, CMD_MAX);
return ERR_TOO_MANY_COMMANDS;
}
diff --git a/3-Shell/test b/3-Shell/test
new file mode 100755
index 0000000000000000000000000000000000000000..3ec67e29589f9160a00b78636ed057d332b574f1
--- /dev/null
+++ b/3-Shell/test
@@ -0,0 +1,213 @@
+#!/usr/bin/env bats
+
+@test "Simple Command" {
+ run ./dsh <<EOF
+test_command
+exit
+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="dsh>PARSEDCOMMANDLINE-TOTALCOMMANDS1<1>test_commanddsh>"
+
+ # 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"
+
+ # Check exact match
+ [ "$stripped_output" = "$expected_output" ]
+
+ # Assertions
+ [ "$status" -eq 0 ]
+
+}
+
+@test "Simple Command with Args" {
+ run ./dsh <<EOF
+cmd -a1 -a2
+exit
+EOF
+
+ # Strip all whitespace (spaces, tabs, newlines) from the output
+ stripped_output=$(echo "$output" | tr -d '[:space:]')
+
+ # Expected output
+ expected_output="dsh>PARSEDCOMMANDLINE-TOTALCOMMANDS1<1>cmd[-a1-a2]dsh>"
+
+ # 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"
+
+ # Check exact match
+ [ "$stripped_output" = "$expected_output" ]
+
+ # Assertions
+ [ "$status" -eq 0 ]
+
+}
+
+
+@test "No command provided" {
+ run ./dsh <<EOF
+
+exit
+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="dsh>warning:nocommandsprovideddsh>"
+
+ # 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"
+
+ # Check exact match
+ [ "$stripped_output" = "$expected_output" ]
+
+ # Assertions
+ [ "$status" -eq 0 ]
+
+}
+
+@test "Two commands" {
+ run ./dsh <<EOF
+command_one | command_two
+exit
+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="dsh>PARSEDCOMMANDLINE-TOTALCOMMANDS2<1>command_one<2>command_twodsh>"
+
+ # 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"
+
+ # Check exact match
+ [ "$stripped_output" = "$expected_output" ]
+
+ # Assertions
+ [ "$status" -eq 0 ]
+
+}
+
+@test "three commands with args" {
+ run ./dsh <<EOF
+cmd1 a1 a2 a3 | cmd2 a4 a5 a6 | cmd3 a7 a8 a9
+exit
+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="dsh>PARSEDCOMMANDLINE-TOTALCOMMANDS3<1>cmd1[a1a2a3]<2>cmd2[a4a5a6]<3>cmd3[a7a8a9]dsh>"
+
+ # 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"
+
+ # Check exact match
+ [ "$stripped_output" = "$expected_output" ]
+
+ # Assertions
+ [ "$status" -eq 0 ]
+
+}
+
+@test "try max (8) commands" {
+ run ./dsh <<EOF
+cmd1 | cmd2 | cmd3 | cmd4 | cmd5 | cmd6 | cmd7 | cmd8
+exit
+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="dsh>PARSEDCOMMANDLINE-TOTALCOMMANDS8<1>cmd1<2>cmd2<3>cmd3<4>cmd4<5>cmd5<6>cmd6<7>cmd7<8>cmd8dsh>"
+
+ # 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"
+
+ # Check exact match
+ [ "$stripped_output" = "$expected_output" ]
+
+ # Assertions
+ [ "$status" -eq 0 ]
+
+}
+
+@test "try too many commands" {
+ run ./dsh <<EOF
+cmd1 | cmd2 | cmd3 | cmd4 | cmd5 | cmd6 | cmd7 | cmd8 | cmd9
+exit
+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="dsh>error:pipinglimitedto8commandsdsh>"
+
+ # These echo commands will help with debugging and will only print
+ #if the test fails
+ echo "Captured stdout:"
+ echo "Your output: $stripped_output"
+ echo "Expected: $expected_output"
+ echo "Exit Status: $status"
+
+ # Check exact match
+ [ "$stripped_output" = "$expected_output" ]
+
+ # Assertions
+ [ "$status" -eq 0 ]
+
+}
+
+@test "kitchen sink - multiple commands" {
+ run ./dsh <<EOF
+cmd1
+cmd2 arg arg2
+p1 | p2
+p3 p3a1 p3a2 | p4 p4a1 p4a2
+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="dsh>PARSEDCOMMANDLINE-TOTALCOMMANDS1<1>cmd1dsh>PARSEDCOMMANDLINE-TOTALCOMMANDS1<1>cmd2[argarg2]dsh>PARSEDCOMMANDLINE-TOTALCOMMANDS2<1>p1<2>p2dsh>PARSEDCOMMANDLINE-TOTALCOMMANDS2<1>p3[p3a1p3a2]<2>p4[p4a1p4a2]dsh>"
+
+ # 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"
+
+ # Check exact match
+ [ "$stripped_output" = "$expected_output" ]
+
+ # Assertions
+ [ "$status" -eq 0 ]
+
+}
\ No newline at end of file
diff --git a/3-Shell/test.sh b/3-Shell/test.sh
index 6d586dbabea1cf80d3862450f1c62c8664db13d4..3ec67e29589f9160a00b78636ed057d332b574f1 100644
--- a/3-Shell/test.sh
+++ b/3-Shell/test.sh
@@ -172,7 +172,8 @@ EOF
# These echo commands will help with debugging and will only print
#if the test fails
echo "Captured stdout:"
- echo "Output: $output"
+ echo "Your output: $stripped_output"
+ echo "Expected: $expected_output"
echo "Exit Status: $status"
# Check exact match