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

Added command running conditions for || and && separators

Browse Source
This commit is contained in:
Dmitriy Shishkov 2020-07-15 15:02:28 +05:00
parent 9fe0b6a293
commit b00548dc0f
2 changed files with 20 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
README.md
View File

@ -12,7 +12,7 @@ Work is still in porgress, buf when you will see a "finished" topic assigned to
* History of commands and navigation or search through it with `up/down` keys * History of commands and navigation or search through it with `up/down` keys
* Username, ip address and current path in prompt before each command input * Username, ip address and current path in prompt before each command input
* Show previous command return status in prompt and invert it with `!`, separated with space, specified before it * Show previous command return status in prompt and invert it with `!`, separated with space, specified before it
* Running multiple commands separated by `;` * Running multiple commands separated by `;`, `&&` or `||`
# Builtin commands # Builtin commands
* `cd`: changes current working directory to the one specified by user. If no arguments provided, shows error. * `cd`: changes current working directory to the one specified by user. If no arguments provided, shows error.
@ -25,4 +25,3 @@ Work is still in porgress, buf when you will see a "finished" topic assigned to
* Environmental variables * Environmental variables
* `Ctrl+Z` running programm with `fd` * `Ctrl+Z` running programm with `fd`
* ~~Getting commands path from system `PATH` environment variable~~ * ~~Getting commands path from system `PATH` environment variable~~
* Running multiple commands separated by `&&` and `||` with appropriate logic

25
src/shell.c
View File

@ -47,6 +47,17 @@ void process_command()
curr->stat.s = status; curr->stat.s = status;
term.last_status = curr->stat.s; term.last_status = curr->stat.s;
if (curr->sep_next == AND_SEP)
{
if (term.last_status != 0)
break;
}
else if (curr->sep_next == OR_SEP)
{
if (term.last_status == 0)
break;
}
curr = curr->next; curr = curr->next;
} }
@ -110,14 +121,8 @@ int process_line(char *line, cmds_p **coms)
append_to_str_arr(&(curr_cmd->args), &args_am, trim_string(tmp, false)); append_to_str_arr(&(curr_cmd->args), &args_am, trim_string(tmp, false));
tmp += strlen(curr_cmd->args[args_am - 1]) + 1; tmp += strlen(curr_cmd->args[args_am - 1]) + 1;
} }
else { else
tmp++; tmp++;
}
if (tmp[0] == ' ')
{
tmp++;
i++;
}
curr_cmd->args = realloc(curr_cmd->args, sizeof(char *) * (args_am + 1)); curr_cmd->args = realloc(curr_cmd->args, sizeof(char *) * (args_am + 1));
curr_cmd->args[args_am] = NULL; curr_cmd->args[args_am] = NULL;
@ -141,6 +146,12 @@ int process_line(char *line, cmds_p **coms)
break; break;
} }
if (tmp[0] == ' ')
{
tmp++;
i++;
}
cmds_p *next = new_cmd(); cmds_p *next = new_cmd();
curr_cmd->next = next; curr_cmd->next = next;