dm1sh/mshell
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fixed command exit status display and its inversion

Browse Source
This commit is contained in:
Dmitriy Shishkov 2020-07-14 20:20:39 +05:00
parent 775290a6d1
commit d578d08410
1 changed files with 19 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
src/shell.c
View File

@ -34,6 +34,16 @@ void process_command()
while (curr != NULL) while (curr != NULL)
{ {
status = execute(curr); 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; curr = curr->next;
} }
@ -137,11 +147,16 @@ int execute(cmds_p command)
if (command->args[0] == NULL) if (command->args[0] == NULL)
return 1; return 1;
for (int i = 0; i < BUILTIN_NUM; i++) char **args = command->args;
if (strcmp(command->args[0], builtin[i]) == 0)
return (*builtin_func[i])(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);
} }
/** /**