From 56ae61743042e5b5709c70d2bda60d998af20d01 Mon Sep 17 00:00:00 2001 From: Dm1tr1y147 Date: Thu, 16 Jul 2020 20:03:07 +0500 Subject: [PATCH] shell.c divided into multiple files, command pipes support --- README.md | 3 +- include/keys.h | 1 + include/shell.h | 37 ++++- include/utils.h | 2 +- src/complete.c | 16 +- src/execute.c | 178 ++++++++++++++++++++ src/input.c | 2 +- src/keys.c | 2 +- src/line_parce.c | 234 ++++++++++++++++++++++++++ src/main.c | 7 +- src/prompt.c | 91 +++++++++++ src/shell.c | 417 +++++------------------------------------------ src/tree.c | 4 +- src/utils.c | 9 +- 14 files changed, 599 insertions(+), 404 deletions(-) create mode 100644 src/execute.c create mode 100644 src/line_parce.c create mode 100644 src/prompt.c diff --git a/README.md b/README.md index ce9b310..06344de 100644 --- a/README.md +++ b/README.md @@ -14,6 +14,7 @@ Work is still in porgress, buf when you will see a "finished" topic assigned to * Show previous command return status in prompt and invert it with `!`, separated with space, specified before it * Running multiple commands separated by `;`, `&&` or `||` * Expand `*` wildcards +* Commands I/O redirection with `|` pipes # Builtin commands * `cd`: changes current working directory to the one specified by user. If no arguments provided, shows error. @@ -21,7 +22,7 @@ Work is still in porgress, buf when you will see a "finished" topic assigned to * `exec`: executes entered command and exits # TODO -* Pipes and files input/output +* Files input/output * Replace linux `echo` command with builtin one with support of environmental variables * Environmental variables * `Ctrl+Z` running programm with `fd` diff --git a/include/keys.h b/include/keys.h index 8c7584b..6d4f281 100644 --- a/include/keys.h +++ b/include/keys.h @@ -2,6 +2,7 @@ #define _KEYS_H #include +#include void delete_key(int pos, int *n, char **line); void up_key(int *pos, int *n, char **line); diff --git a/include/shell.h b/include/shell.h index 3e0fa8a..a7bd61d 100644 --- a/include/shell.h +++ b/include/shell.h @@ -53,9 +53,19 @@ typedef enum OR_SEP } cmd_sep; -typedef struct commands +typedef struct pipes { char **args; + int args_am; + int pipefd[2]; + struct pipes *next; +} cmd_pipe; + +typedef struct commands +{ + cmd_pipe *pipe; + int pipes_am; + struct status stat; struct commands *next; cmd_sep sep_next; @@ -72,22 +82,31 @@ typedef struct extern t_ term; extern char *builtin[]; -// Functions prototypes -int process_line(char *line, cmds_p **coms); -int launch(char **args); +// shell.c file void process_command(); -int execute(cmds_p *command); +cmds_p *new_cmd(); +cmd_pipe *new_cmd_pipe(); +void free_cmds_p(cmds_p *root); +void free_cmd_pipe(cmd_pipe *root); -void sig_handler(); +// line_parce.c file +cmds_p *process_line(char *line); +int expand_wildcatrd(char ***arr, char *input); + +// execute.c file +int execute_with_pipes(cmds_p *command); +int execute(cmd_pipe *command); +int launch(cmd_pipe *command); int sh_cd(char **args); int sh_exit(char **args); int sh_exec(char **args); -char *compose_prompt(); +void redirect_fd(int old, int new); -cmds_p *new_cmd(); -int expand_wildcatrd(char ***arr, char *input); +// prompt.c +char *get_ip_addr(); +char *compose_prompt(); #define BUILTIN_NUM sizeof(builtin) / sizeof(char *) diff --git a/include/utils.h b/include/utils.h index f324bd6..0c4ac40 100644 --- a/include/utils.h +++ b/include/utils.h @@ -19,7 +19,7 @@ void append_to_pos(char **str, int pos, char ch); void remove_on_pos(char **str, int pos); int sep_string(char *line, char ***toks, char *sep); char *trim_string(char *str, bool leave_trailing_space); -void free_str_arr(char **arr); +void free_str_arr(char **arr, int sz); char **slice_array(char **arr, int beg, int end, bool asc); int get_null_term_arr_size(char **arr); int append_to_str_arr(char ***arr, int *sz, char *str); diff --git a/src/complete.c b/src/complete.c index e976851..467465c 100644 --- a/src/complete.c +++ b/src/complete.c @@ -98,33 +98,31 @@ ssize_t append_builtin_list(char ***commands_list, ssize_t *size) */ ssize_t get_complete_options(char ***opts, char *line, char **to_complete) { - char **args = NULL, **folders = malloc(0); + char **args = NULL, **folders = calloc(0, sizeof(char *)); ssize_t sz; - int am = sep_string(line, &args, " "); + int am = sep_string(line, &args, " "), path_depth = 0; char *last_arg = args[am - 1]; if (am > 0) { - int path_depth = sep_string(last_arg, &folders, "/"); + path_depth = sep_string(last_arg, &folders, "/"); *to_complete = strdup(folders[path_depth - 1]); char *curr_pos = NULL; - int i = 0; if (last_arg[0] == '/') { curr_pos = strdup(""); } - else if (strchr(line, ' ') && strcmp(args[am - 2], "||") != 0 && strcmp(args[am - 2], "&&") != 0 && strcmp(args[am - 2], ";") != 0 && line[strlen(line) - 2] != ';' && line[strlen(line) - 2] != '&' && line[strlen(line) - 2] != '|') + else if (strchr(line, ' ') && strcmp(args[am - 2], "||") != 0 && strcmp(args[am - 2], "|") != 0 && strcmp(args[am - 2], "&&") != 0 && strcmp(args[am - 2], ";") != 0 && line[strlen(line) - 2] != ';' && line[strlen(line) - 2] != '&' && line[strlen(line) - 2] != '|') { curr_pos = strdup("."); } else if (last_arg[0] == '.' && last_arg[1] == '/') { curr_pos = strdup(folders[0]); - i++; } else goto ABSOLUTE; @@ -152,8 +150,8 @@ ssize_t get_complete_options(char ***opts, char *line, char **to_complete) append_builtin_list(opts, &sz); } - free_str_arr(args); - free_str_arr(folders); + free_str_arr(args, am); + free_str_arr(folders, path_depth); if (sz < 0) return sz; @@ -197,7 +195,7 @@ ssize_t filter_options(char ***comp_list, ssize_t *size, char *filter_string) *size = list_strings_containing(child_dirs_root, last_option, comp_list); free_tree(child_dirs_root); - free_str_arr(folders); + free_str_arr(folders, path_depth); return *size; } \ No newline at end of file diff --git a/src/execute.c b/src/execute.c new file mode 100644 index 0000000..e383425 --- /dev/null +++ b/src/execute.c @@ -0,0 +1,178 @@ +#include "../include/shell.h" +#include "../include/utils.h" +#include "../include/input.h" + +/* Global definitions */ +char *builtin[] = { + "cd", + "exit", + "exec"}; + +int (*builtin_func[])(char **) = { + &sh_cd, + &sh_exit, + &sh_exec}; + +/** + * @brief Redirects command input/output and executes it + * + * @param command + * @return int + */ +int execute_with_pipes(cmds_p *command) +{ + cmd_pipe *curr = command->pipe; + int status = 0, tmp_fd[2] = {-1}; + + for (int i = 0; i < command->pipes_am - 1 && curr != NULL && status == 0; i++) + { + + if (pipe(tmp_fd) < 0) + { + perror("pipe"); + return 1; + } + + curr->pipefd[1] = tmp_fd[1]; + curr->next->pipefd[0] = tmp_fd[0]; + + status = execute(curr); + + curr = curr->next; + } + + status = execute(curr); + + return status; +} + +/** + * @brief Executes either builtin or system command + * + * @param args + * @return int + */ +int execute(cmd_pipe *command) +{ + if (command->args[0] == NULL) + return 1; + + char **args = command->args; + + if (strcmp(args[0], "!") == 0) + { + args = slice_array(args, 1, -1, true); + command->args = args; + } + + for (int i = 0; i < BUILTIN_NUM; i++) + if (strcmp(args[0], builtin[i]) == 0) + return (*builtin_func[i])(args); + + return launch(command); +} + +/** + * @brief Launches separate process and executes specified command + * + * @param args + * @return int + */ +int launch(cmd_pipe *command) +{ + pid_t pid, wpid; + int status; + + pid = fork(); + + if (pid == 0) + { + redirect_fd(command->pipefd[0], STDIN_FILENO); + + redirect_fd(command->pipefd[1], STDOUT_FILENO); + + sh_exec(command->args); + } + else if (pid < 0) + { + perror("mshell"); + return -1; + } + else + { + for (int j = 0; j < 2; j++) + if (command->pipefd[j] > 2) + close(command->pipefd[j]); + do + wpid = waitpid(pid, &status, WUNTRACED); + while (!WIFEXITED(status) && !WIFSIGNALED(status)); + } + + change_mode(1); + + return status; +} + +/** + * @brief Shell builtin command. Changes current working directory + * + * @param args + * @return int + */ +int sh_cd(char **args) +{ + if (args[1] == NULL) + chdir(getenv("HOME")); + else if (chdir(args[1]) < 0) + { + perror("cd"); + return 1; + } + + return 0; +} + +/** + * @brief Shell builtin command. Exits shell + * + * @param args + * @return int + */ +int sh_exit(char **args) +{ + exit(0); +} + +/** + * @brief Shell builtin command. Executes command replacing shell with it + * + * @param args + * @return int + */ +int sh_exec(char **args) +{ + change_mode(0); + signal(SIGINT, SIG_DFL); + + if (strcmp(args[0], "exec") == 0) + args = slice_array(args, 1, -1, 1); + + if (execvp(args[0], args) < 0) + { + perror("mshell"); + } + + exit(EXIT_FAILURE); +} + +void redirect_fd(int old, int new) +{ + if (old > 0) + if (old != new) + { + if (dup2(old, new) < 0) + perror("dup2"); + else + close(old); + } +} \ No newline at end of file diff --git a/src/input.c b/src/input.c index e80bc94..f339f54 100644 --- a/src/input.c +++ b/src/input.c @@ -121,7 +121,7 @@ int process_keypress(char c) if (c == '\x1b') { for (int i = 0; i < 2; i++) - if (read(STDIN_FILENO, &seq[i], 1) == -1) + if (read(STDIN_FILENO, &seq[i], 1) < 0) return ESCAPE_KEY; if (seq[0] == '[') { diff --git a/src/keys.c b/src/keys.c index 0129d9c..13e0dd4 100644 --- a/src/keys.c +++ b/src/keys.c @@ -278,7 +278,7 @@ void tab_key(int *pos, int *n, char **line) char *buff = strdup(""); size_t buff_size = 1; - char **complete_options = malloc(0), *to_complete = NULL; + char **complete_options = calloc(0, sizeof(char *)), *to_complete = NULL; size_t opts_sz = get_complete_options(&complete_options, *line, &to_complete); if (opts_sz == 1) diff --git a/src/line_parce.c b/src/line_parce.c new file mode 100644 index 0000000..09847e9 --- /dev/null +++ b/src/line_parce.c @@ -0,0 +1,234 @@ +#include "../include/shell.h" +#include "../include/utils.h" +#include "../include/input.h" + +/** + * @brief Extracts command and its arguments from line + * + * @param line + * @param args + */ +cmds_p *process_line(char *line) +{ + int line_size = strlen(line); + + if (line_size < 1) + return NULL; + + char *tmp = strdup(line), *free_tmp = tmp; + cmds_p *coms = new_cmd(); + + cmds_p *curr_cmd = coms; + cmd_pipe *curr_pipe = curr_cmd->pipe; + curr_pipe->pipefd[0] = STDIN_FILENO; + + for (int i = 0; i < line_size; i++) + { + if (line[i] == '"') + { + tmp++; + i++; + int j = i; + for (; j < line_size; j++) + if (line[j] == '"') + { + free_tmp[j] = '\0'; + + append_to_str_arr(&(curr_pipe->args), &curr_pipe->args_am, trim_string(tmp, false)); + + tmp += strlen(curr_pipe->args[curr_pipe->args_am - 1]) + 1; + + break; + } + + if (j >= line_size) + { + char *ap_line = read_line(); + + line = realloc(line, strlen(line) + strlen(ap_line) + 1); + line = strcat(line, ap_line); + + line_size = strlen(line); + + free(ap_line); + i--; + continue; + } + + i = j; + + if (tmp[0] == ' ') + { + tmp++; + i++; + } + } + else if (line[i] == ';' || (line[i] == '&' && line[i + 1] == '&') || (line[i] == '|' && line[i + 1] == '|')) + { + free_tmp[i] = '\0'; + if (line[i - 1] != ' ') + { + append_to_str_arr(&(curr_pipe->args), &curr_pipe->args_am, trim_string(tmp, false)); + tmp += strlen(curr_pipe->args[curr_pipe->args_am - 1]) + 1; + } + else + tmp++; + + curr_pipe->args = realloc(curr_pipe->args, sizeof(char *) * (curr_pipe->args_am + 1)); + curr_pipe->args[curr_pipe->args_am] = NULL; + + switch (line[i]) + { + case ';': + curr_cmd->sep_next = SEMICOLON_SEP; + break; + + case '&': + curr_cmd->sep_next = AND_SEP; + i++; + tmp++; + break; + + case '|': + curr_cmd->sep_next = OR_SEP; + i++; + tmp++; + break; + } + + if (tmp[0] == ' ') + { + tmp++; + i++; + } + + if (curr_pipe->args[0] != NULL) + { + if (strcmp(curr_pipe->args[0], "!") == 0) + { + curr_cmd->stat.invert = true; + } + } + + cmds_p *next = new_cmd(); + + curr_cmd->next = next; + + curr_cmd = curr_cmd->next; + + curr_pipe = curr_cmd->pipe; + } + else if (line[i] == '|') + { + if (line[i - 1] != ' ') + { + append_to_str_arr(&(curr_pipe->args), &curr_pipe->args_am, trim_string(tmp, false)); + tmp += strlen(curr_pipe->args[curr_pipe->args_am - 1]) + 1; + } + else + tmp++; + + curr_pipe->args = realloc(curr_pipe->args, sizeof(char *) * (curr_pipe->args_am + 1)); + curr_pipe->args[curr_pipe->args_am] = NULL; + + if (tmp[0] == ' ') + { + tmp++; + i++; + } + + if (curr_pipe->args[0] != NULL) + { + if (strcmp(curr_pipe->args[0], "!") == 0) + { + curr_cmd->stat.invert = true; + } + } + + cmd_pipe *next = new_cmd_pipe(); + + curr_pipe->next = next; + curr_cmd->pipes_am++; + curr_pipe = curr_pipe->next; + } + else if (line[i] == ' ') + { + free_tmp[i] = '\0'; + + char *ap_string = trim_string(tmp, false), **exp = calloc(0, sizeof(char *)); + + int sz = expand_wildcatrd(&exp, ap_string); + + for (int l = 0; l < sz; l++) + append_to_str_arr(&(curr_pipe->args), &curr_pipe->args_am, exp[l]); + + tmp += strlen(ap_string) + 1; + } + else if (line[i] == '#') + { + break; + } + } + + if (tmp[0] != '\0' && tmp[0] != '#') + { + if (tmp[strlen(tmp) - 1] != '"') + { + char *ap_string = trim_string(tmp, false), **exp = calloc(0, sizeof(char *)); + + int sz = expand_wildcatrd(&exp, ap_string); + + for (int l = 0; l < sz; l++) + append_to_str_arr(&(curr_pipe->args), &curr_pipe->args_am, exp[l]); + } + else + append_to_str_arr(&curr_pipe->args, &curr_pipe->args_am, trim_string(tmp, false)); + } + + if (curr_pipe->args[0] != NULL) + { + if (strcmp(curr_pipe->args[0], "!") == 0) + { + curr_cmd->stat.invert = true; + } + } + + free(free_tmp); + + if (curr_pipe->args[curr_pipe->args_am] != NULL) + { + curr_pipe->args = realloc(curr_pipe->args, sizeof(char *) * (curr_pipe->args_am + 1)); + curr_pipe->args[curr_pipe->args_am] = NULL; + } + + curr_pipe->pipefd[1] = STDOUT_FILENO; + + return coms; +} + +/** + * @brief Expands wildcard in argument + * + * @param arr + * @param input + * @return int + */ +int expand_wildcatrd(char ***arr, char *input) +{ + int size = 0; + + if (strchr(input, '*') || strchr(input, '~') || strchr(input, '?')) + { + glob_t globbuf; + int t = glob(input, GLOB_TILDE, NULL, &globbuf); + if (t != 0) + perror("Glob"); + + for (int j = 0; j < globbuf.gl_pathc; j++) + append_to_str_arr(arr, &size, globbuf.gl_pathv[j]); + } + else + append_to_str_arr(arr, &size, input); + + return size; +} \ No newline at end of file diff --git a/src/main.c b/src/main.c index 1e2c4bd..bb1b7ae 100644 --- a/src/main.c +++ b/src/main.c @@ -12,7 +12,7 @@ void exit_shell(); t_ init_term(); // Main -int main(int argc, char **argv) +int main() { term = init_term(); @@ -25,7 +25,6 @@ int main(int argc, char **argv) // Init t_ init_term() { - t_ term; FILE *log_file = fopen("/var/log/mshell.log", "w"); if (log_file == NULL) @@ -42,11 +41,11 @@ t_ init_term() term.hist.length = 0; term.hist.pos = -1; - term.hist.content = (char **)malloc(sizeof(char *) * term.hist.length); + term.hist.content = calloc(term.hist.length, sizeof(char *)); term.hist.sub.length = -1; term.hist.sub.pos = -1; - term.hist.sub.content = (char **)malloc(sizeof(char *) * 0); + term.hist.sub.content = calloc(0, sizeof(char *)); term.last_status = 0; diff --git a/src/prompt.c b/src/prompt.c new file mode 100644 index 0000000..18cd0cc --- /dev/null +++ b/src/prompt.c @@ -0,0 +1,91 @@ +#include "../include/shell.h" +#include "../include/utils.h" + +/** + * @brief Get IP adress of system + * + * @return char* + */ +char *get_ip_addr() +{ + struct ifaddrs *host, *tmp; + getifaddrs(&host); + tmp = host; + char *ip = NULL; + + while (tmp) + { + if (tmp->ifa_addr && tmp->ifa_addr->sa_family == AF_INET) + { + struct sockaddr_in *pAddr = (struct sockaddr_in *)tmp->ifa_addr; + ip = inet_ntoa(pAddr->sin_addr); + if (strncmp(ip, "127", 3) != 0) + break; + } + + tmp = tmp->ifa_next; + } + + freeifaddrs(host); + + return ip; +} + +/** + * @brief Creates prompt string + * + * @return char* + */ +char *compose_prompt() +{ + // New line + char *prompt = strdup(""); + + // Username + char *username = getenv("USER"); + if (username == NULL) + username = "none"; + prompt = realloc(prompt, strlen(prompt) + strlen("\033[97;44m") + strlen(username) + 2); + prompt = strcat(prompt, "\033[97;44m"); + prompt = strcat(prompt, username); + + // Current host ip + char *ip = get_ip_addr(); + if (ip == NULL) + ip = "none"; + prompt = realloc(prompt, strlen(prompt) + 1 + strlen(ip) + strlen("\033[39m") + strlen("\033[0m") + 2); + prompt = strcat(prompt, "@"); + prompt = strcat(prompt, ip); + prompt = strcat(prompt, "\033[39m"); + prompt = strcat(prompt, "\033[0m"); + prompt = strcat(prompt, ":"); + + // Current path + char *full_path = get_curr_dir_name(); + prompt = realloc(prompt, strlen(prompt) + strlen("\033[92;1m") + strlen("\033[0m") + strlen(full_path) + 2); + prompt = strcat(prompt, "\033[92;1m"); + prompt = strcat(prompt, full_path); + prompt = strcat(prompt, "\033[0m"); + free(full_path); + + // Previous status + if (term.last_status != 0) + { + char *status = malloc(snprintf(NULL, 0, " \033[91m%d\033[39m", term.last_status)); + sprintf(status, " \033[91m%d\033[39m", term.last_status); + prompt = realloc(prompt, strlen(prompt) + strlen(status) + 1); + prompt = strcat(prompt, status); + free(status); + } + + // Permissions specific character before user input + prompt = realloc(prompt, strlen(prompt) + 4); + if (getuid() == 0) + { + prompt = strcat(prompt, "\n# "); + } + else + prompt = strcat(prompt, "\n% "); + + return prompt; +} \ No newline at end of file diff --git a/src/shell.c b/src/shell.c index f321687..8d51f40 100644 --- a/src/shell.c +++ b/src/shell.c @@ -1,26 +1,13 @@ #include "../include/shell.h" +#include "../include/utils.h" #include "../include/input.h" #include "../include/output.h" -#include "../include/utils.h" - -/* Global definitions */ -char *builtin[] = { - "cd", - "exit", - "exec"}; - -int (*builtin_func[])(char **) = { - &sh_cd, - &sh_exit, - &sh_exec}; /** * @brief Function for main loop. It prints prompt, reads user's input and executes it */ void process_command() { - cmds_p *coms = NULL; - char *prompt = compose_prompt(); print_str(prompt, strlen(prompt)); @@ -30,13 +17,13 @@ void process_command() free(line); line = tmp; - process_line(line, &coms); + cmds_p *coms = process_line(line); cmds_p *curr = coms; int status = 0; while (curr != NULL) { - status = execute(curr); + status = execute_with_pipes(curr); if (curr->stat.invert) { @@ -46,8 +33,7 @@ void process_command() status = 0; } - curr->stat.s = status; - term.last_status = curr->stat.s; + curr->stat.s = term.last_status = status; if (curr->sep_next == AND_SEP) { @@ -65,359 +51,21 @@ void process_command() free(line); free(prompt); -} - -/** - * @brief Extracts command and its arguments from line - * - * @param line - * @param args - */ -int process_line(char *line, cmds_p **coms) -{ - char *tmp = strdup(line), *free_tmp = tmp; - int line_size = strlen(line), args_am = 0; - - *coms = new_cmd(); - - cmds_p *curr_cmd = *coms; - - for (int i = 0; i < line_size; i++) - { - if (line[i] == '"') - { - tmp++; - i++; - int j = i; - for (; j < line_size; j++) - if (line[j] == '"') - { - free_tmp[j] = '\0'; - - append_to_str_arr(&(curr_cmd->args), &args_am, trim_string(tmp, false)); - - tmp += strlen(curr_cmd->args[args_am - 1]) + 1; - - break; - } - - if (j >= line_size) - { - char *ap_line = read_line(); - - line = realloc(line, strlen(line) + strlen(ap_line) + 1); - line = strcat(line, ap_line); - - line_size = strlen(line); - - free(ap_line); - i--; - continue; - } - - i = j; - - if (tmp[0] == ' ') - { - tmp++; - i++; - } - } - else if (line[i] == ';' || (line[i] == '&' && line[i + 1] == '&') || (line[i] == '|' && line[i + 1] == '|')) - { - free_tmp[i] = '\0'; - if (line[i - 1] != ' ') - { - append_to_str_arr(&(curr_cmd->args), &args_am, trim_string(tmp, false)); - tmp += strlen(curr_cmd->args[args_am - 1]) + 1; - } - else - tmp++; - - curr_cmd->args = realloc(curr_cmd->args, sizeof(char *) * (args_am + 1)); - curr_cmd->args[args_am] = NULL; - - switch (line[i]) - { - case ';': - curr_cmd->sep_next = SEMICOLON_SEP; - break; - - case '&': - curr_cmd->sep_next = AND_SEP; - i++; - tmp++; - break; - - case '|': - curr_cmd->sep_next = OR_SEP; - i++; - tmp++; - break; - } - - if (tmp[0] == ' ') - { - tmp++; - i++; - } - - cmds_p *next = new_cmd(); - - curr_cmd->next = next; - curr_cmd = curr_cmd->next; - args_am = 0; - } - else if (line[i] == ' ') - { - free_tmp[i] = '\0'; - - char *ap_string = trim_string(tmp, false), **exp = malloc(0); - - int sz = expand_wildcatrd(&exp, ap_string); - - for (int l = 0; l < sz; l++) - append_to_str_arr(&(curr_cmd->args), &args_am, exp[l]); - - tmp += strlen(ap_string) + 1; - } - else if (line[i] == '#') - { - break; - } - } - - if (tmp[0] != '\0' && tmp[0] != '#') - { - if (tmp[strlen(tmp) - 1] != '"') - { - char *ap_string = trim_string(tmp, false), **exp = malloc(0); - - int sz = expand_wildcatrd(&exp, ap_string); - - for (int l = 0; l < sz; l++) - append_to_str_arr(&(curr_cmd->args), &args_am, exp[l]); - } - else - append_to_str_arr(&(curr_cmd->args), &args_am, trim_string(tmp, false)); - } - - if (curr_cmd->args[0] != NULL) - { - if (strcmp(curr_cmd->args[0], "!") == 0) - { - curr_cmd->stat.invert = true; - } - } - - free(free_tmp); - - curr_cmd->args = realloc(curr_cmd->args, sizeof(char *) * (args_am + 1)); - curr_cmd->args[args_am] = NULL; - return args_am; -} - -/** - * @brief Executes either builtin or system command - * - * @param args - * @return int - */ -int execute(cmds_p *command) -{ - if (command->args[0] == NULL) - return 1; - - char **args = command->args; - - if (strcmp(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); -} - -/** - * @brief Launches separate process and executes specified command - * - * @param args - * @return int - */ -int launch(char **args) -{ - pid_t pid, wpid; - int status; - - pid = fork(); - - if (pid == 0) - { - sh_exec(args); - } - else if (pid < 0) - { - perror("myshell1"); - } - else - do - wpid = waitpid(pid, &status, WUNTRACED); - while (!WIFEXITED(status) && !WIFSIGNALED(status)); - - change_mode(1); - - return status; -} - -/** - * @brief Shell builtin command. Changes current working directory - * - * @param args - * @return int - */ -int sh_cd(char **args) -{ - if (args[1] == NULL) - chdir(getenv("HOME")); - else if (chdir(args[1]) < 0) - perror("myshell2"); - - return 0; -} - -/** - * @brief Shell builtin command. Exits shell - * - * @param args - * @return int - */ -int sh_exit(char **args) -{ - exit(0); -} - -/** - * @brief Shell builtin command. Executes command replacing shell with it - * - * @param args - * @return int - */ -int sh_exec(char **args) -{ - change_mode(0); - signal(SIGINT, SIG_DFL); - - if (strcmp(args[0], "exec") == 0) - args = slice_array(args, 1, -1, 1); - - if (execvp(args[0], args) < 0) - { - perror("myshell3"); - } - - exit(EXIT_FAILURE); -} - -/** - * @brief Get IP adress of system - * - * @return char* - */ -char *get_ip_addr() -{ - struct ifaddrs *host, *tmp; - getifaddrs(&host); - tmp = host; - char *ip = NULL; - - while (tmp) - { - if (tmp->ifa_addr && tmp->ifa_addr->sa_family == AF_INET) - { - struct sockaddr_in *pAddr = (struct sockaddr_in *)tmp->ifa_addr; - ip = inet_ntoa(pAddr->sin_addr); - if (strncmp(ip, "127", 3) != 0) - break; - } - - tmp = tmp->ifa_next; - } - - freeifaddrs(host); - - return ip; -} - -/** - * @brief Creates prompt string - * - * @return char* - */ -char *compose_prompt() -{ - // New line - char *prompt = strdup(""); - - // Username - char *username = getenv("USER"); - if (username == NULL) - username = "none"; - prompt = realloc(prompt, strlen(prompt) + strlen("\033[97;44m") + strlen(username) + 2); - prompt = strcat(prompt, "\033[97;44m"); - prompt = strcat(prompt, username); - - // Current host ip - char *ip = get_ip_addr(); - if (ip == NULL) - ip = "none"; - prompt = realloc(prompt, strlen(prompt) + 1 + strlen(ip) + strlen("\033[39m") + strlen("\033[0m") + 2); - prompt = strcat(prompt, "@"); - prompt = strcat(prompt, ip); - prompt = strcat(prompt, "\033[39m"); - prompt = strcat(prompt, "\033[0m"); - prompt = strcat(prompt, ":"); - - // Current path - char *full_path = get_curr_dir_name(); - prompt = realloc(prompt, strlen(prompt) + strlen("\033[92;1m") + strlen("\033[0m") + strlen(full_path) + 2); - prompt = strcat(prompt, "\033[92;1m"); - prompt = strcat(prompt, full_path); - prompt = strcat(prompt, "\033[0m"); - free(full_path); - - // Previous status - if (term.last_status != 0) - { - char *status = malloc(snprintf(NULL, 0, " \033[91m%d\033[39m", term.last_status)); - sprintf(status, " \033[91m%d\033[39m", term.last_status); - prompt = realloc(prompt, strlen(prompt) + strlen(status) + 1); - prompt = strcat(prompt, status); - free(status); - } - - // Permissions specific character before user input - prompt = realloc(prompt, strlen(prompt) + 4); - if (getuid() == 0) - { - prompt = strcat(prompt, "\n# "); - } - else - prompt = strcat(prompt, "\n% "); - - return prompt; + free_cmds_p(coms); } /** * @brief Initialize command structure * - * @return cmds_p* + * @return cmds_p* */ cmds_p *new_cmd() { cmds_p *new = malloc(sizeof(cmds_p)); - new->args = calloc(0, sizeof(char *)); + + new->pipe = new_cmd_pipe(); + new->pipes_am = 1; + new->stat.s = 0; new->sep_next = NO_SEP; new->stat.invert = false; @@ -426,20 +74,45 @@ cmds_p *new_cmd() return new; } -int expand_wildcatrd(char ***arr, char *input) +/** + * @brief Initialize command pipe structure + * + * @return cmd_pipe* + */ +cmd_pipe *new_cmd_pipe() { - int size = 0; + cmd_pipe *new = malloc(sizeof(cmd_pipe)); + new->args = calloc(0, sizeof(char *)); + new->args_am = 0; + new->next = NULL; + new->pipefd[0] = new->pipefd[1] = -1; - if (strchr(input, '*') || strchr(input, '~') || strchr(input, '?')) + return new; +} + +void free_cmds_p(cmds_p *root) +{ + if (root != NULL) { - glob_t globbuf; - int t = glob(input, GLOB_TILDE, NULL, &globbuf); + if (root->pipe != NULL) + free_cmd_pipe(root->pipe); - for (int j = 0; j < globbuf.gl_pathc; j++) - append_to_str_arr(arr, &size, globbuf.gl_pathv[j]); + if (root->next != NULL) + free_cmds_p(root->next); + + free(root); } - else - append_to_str_arr(arr, &size, input); + return; +} - return size; +void free_cmd_pipe(cmd_pipe *root) +{ + if (root != NULL) + { + if (root->next != NULL) + free_cmd_pipe(root->next); + + free(root); + } + return; } \ No newline at end of file diff --git a/src/tree.c b/src/tree.c index 1995165..ade5fd4 100644 --- a/src/tree.c +++ b/src/tree.c @@ -7,7 +7,7 @@ */ struct tree_node *get_new_node() { - struct tree_node *node = (struct tree_node *)malloc(sizeof(struct tree_node)); + struct tree_node *node = malloc(sizeof(struct tree_node)); node->is_leaf = 0; for (int i = 0; i < ALPHABET_SIZE; i++) @@ -119,7 +119,7 @@ ssize_t list_strings_containing(struct tree_node *root, char *key, char ***strin free(*strings); - *strings = malloc(amount * sizeof(char *)); + *strings = calloc(amount, sizeof(char *)); struct tree_node *current = root; diff --git a/src/utils.c b/src/utils.c index 9f17eaa..224e68e 100644 --- a/src/utils.c +++ b/src/utils.c @@ -56,7 +56,7 @@ int sep_string(char *line, char ***toks, char *sep) char *tmp_line = strdup(line); char *free_tmp_line = tmp_line; int n = 0; - *toks = malloc(sizeof(char *) * n); + *toks = calloc(n, sizeof(char *)); char *tmp = NULL; while ((tmp = strsep(&tmp_line, sep)) != NULL) @@ -101,11 +101,12 @@ char *trim_string(char *str, bool leave_trailing_space) * @brief Frees array of strings * * @param arr + * @param sz */ -void free_str_arr(char **arr) +void free_str_arr(char **arr, int sz) { if (arr[0] != NULL) - for (int i = 0; i < sizeof(arr) / sizeof(char *); i++) + for (int i = 0; i < sz; i++) free(arr[i]); free(arr); } @@ -126,7 +127,7 @@ char **slice_array(char **arr, int beg, int end, bool asc) if (end == -1) end = get_null_term_arr_size(arr); - char **new_arr = malloc(abs(end - beg) * sizeof(char *)); + char **new_arr = calloc(abs(end - beg), sizeof(char *)); if (asc) for (int i = beg, j = 0; i < end; i++, j++)