From d578d084102498b71bc48f0d481699a8c5ef637d Mon Sep 17 00:00:00 2001 From: Dm1tr1y147 Date: Tue, 14 Jul 2020 20:20:39 +0500 Subject: [PATCH] Fixed command exit status display and its inversion --- src/shell.c | 23 +++++++++++++++++++---- 1 file changed, 19 insertions(+), 4 deletions(-) diff --git a/src/shell.c b/src/shell.c index 26be152..5814f23 100644 --- a/src/shell.c +++ b/src/shell.c @@ -34,6 +34,16 @@ void process_command() while (curr != NULL) { status = execute(curr); + + if (curr->stat.invert) + if (status == 0) + status = 1; + else + status = 0; + + curr->stat.s = status; + term.last_status = curr->stat.s; + curr = curr->next; } @@ -137,11 +147,16 @@ int execute(cmds_p command) if (command->args[0] == NULL) return 1; - for (int i = 0; i < BUILTIN_NUM; i++) - if (strcmp(command->args[0], builtin[i]) == 0) - return (*builtin_func[i])(command->args); + char **args = command->args; - return launch(command->args); + if (strcmp(command->args[0], "!") == 0) + args = slice_array(args, 1, -1, true); + + for (int i = 0; i < BUILTIN_NUM; i++) + if (strcmp(args[0], builtin[i]) == 0) + return (*builtin_func[i])(args); + + return launch(args); } /**