From d125a84156c722511bc225239152a06f1a76f041 Mon Sep 17 00:00:00 2001 From: Dm1tr1y147 Date: Sat, 11 Jul 2020 20:09:44 +0500 Subject: [PATCH] Added exec builtin command --- README.md | 3 ++- include/input.h | 3 ++- include/shell.h | 2 +- include/utils.h | 3 +++ src/input.c | 15 +++++++------ src/keys.c | 5 ++--- src/shell.c | 60 +++++++++++++++++++++++++------------------------ src/tree.c | 2 ++ src/utils.c | 30 ++++++++++++++++++++++++- 9 files changed, 80 insertions(+), 43 deletions(-) diff --git a/README.md b/README.md index d5d84cd..0896c37 100644 --- a/README.md +++ b/README.md @@ -7,12 +7,13 @@ Work is still in porgress, buf when you will see a "finished" topic assigned to # Supported features * Command input with `left` and `right` arrow, `home` and `end` keys navigation and `backspace`, `delete` support * Running commands in separate process and termination them with `ctrl+c` -* `cd` and `exit` builtin commands +* `cd`, `exit` and `exec` builtin commands * Files and commands from `/usr/bin` autocompletion on `Tab` keypress # Builtin commands * `cd`: changes current working directory to the one specified by user. If no arguments provided, shows error. * `exit`: exits shell +* `exec`: executes entered command and exits # TODO * Pipes and files input/output diff --git a/include/input.h b/include/input.h index 9d5698b..58795e5 100644 --- a/include/input.h +++ b/include/input.h @@ -4,6 +4,7 @@ #include #include #include +#include enum keys { DELETE_KEY = 1000, @@ -18,7 +19,7 @@ enum keys { }; void change_mode(int on); -char *read_line(char **line); +char *read_line(); int process_keypress(char c); #endif \ No newline at end of file diff --git a/include/shell.h b/include/shell.h index 8bb3459..77285a3 100644 --- a/include/shell.h +++ b/include/shell.h @@ -15,7 +15,6 @@ #define BUFF_SIZE 1024 #define ARG_SIZE 32 -char *read_line(); int process_line(char *line, char ***args); int launch(char **args); void process_command(); @@ -25,6 +24,7 @@ void sig_handler(); int sh_cd(char **args); int sh_exit(char **args); +int sh_exec(char **args); char *compose_prompt(); diff --git a/include/utils.h b/include/utils.h index df12923..a3b28b0 100644 --- a/include/utils.h +++ b/include/utils.h @@ -6,6 +6,7 @@ #include #include #include +#include extern FILE *log_file; @@ -21,5 +22,7 @@ void remove_on_pos(char **str, int pos); int sep_string(char *line, char ***toks, char *sep); char *trim_string(char **str); void free_str_arr(char **arr); +char **slice_array(char **arr, int beg, int end, bool asc); +int get_null_term_arr_size(char **arr); #endif \ No newline at end of file diff --git a/src/input.c b/src/input.c index 71368a9..05d14c4 100644 --- a/src/input.c +++ b/src/input.c @@ -27,11 +27,13 @@ void change_mode(int on) * @param line * @return char* */ -char *read_line(char **line) +char *read_line() { int c; int n = 0, pos = 0; + char *line = strdup(""); + while (read(STDIN_FILENO, &c, 1)) { c = process_keypress(c); @@ -41,7 +43,7 @@ char *read_line(char **line) switch (c) { case DELETE_KEY: - delete_key(pos, &n, line); + delete_key(pos, &n, &line); break; case LEFT_KEY: @@ -61,19 +63,18 @@ char *read_line(char **line) break; case BACKSPACE_KEY: - backspace_key(&pos, &n, line); + backspace_key(&pos, &n, &line); break; case ENTER_KEY: new_line(); - return *line; + return line; break; case TAB_KEY: { - // TODO: autocomplete - tab_key(&pos, &n, line); + tab_key(&pos, &n, &line); } break; @@ -82,7 +83,7 @@ char *read_line(char **line) default: if ((c > 31 && c < 127) || (c > 127 && c < 255)) - printable_key(&pos, &n, (char)c, line); + printable_key(&pos, &n, (char)c, &line); break; } diff --git a/src/keys.c b/src/keys.c index 96b0f03..4cf9068 100644 --- a/src/keys.c +++ b/src/keys.c @@ -148,7 +148,7 @@ void tab_key(int *pos, int *n, char **line) *pos = strlen(*line); *n = *pos; - char *buff = strdup(""), *output = NULL; + char *buff = strdup(""); size_t buff_size = 1; char **complete_options = malloc(0), *to_complete = NULL; @@ -167,7 +167,7 @@ void tab_key(int *pos, int *n, char **line) } else { - append_to_buff(&buff, &buff_size, "\x1b[2K\r", 5); + append_to_buff(&buff, &buff_size, "\n", 1); if ((int)opts_sz < 1) { @@ -193,7 +193,6 @@ void tab_key(int *pos, int *n, char **line) free(buff); free(to_complete); - free_str_arr(complete_options); } /** diff --git a/src/shell.c b/src/shell.c index 2ea5232..bb1e757 100644 --- a/src/shell.c +++ b/src/shell.c @@ -6,11 +6,13 @@ /* Global definitions */ char *builtin[] = { "cd", - "exit"}; + "exit", + "exec"}; int (*builtin_func[])(char **) = { &sh_cd, - &sh_exit}; + &sh_exit, + &sh_exec}; /** * @brief Function for main loop. It prints prompt, reads user's input and executes it @@ -18,25 +20,17 @@ int (*builtin_func[])(char **) = { void process_command() { char **args = NULL; - int status; - do - { - char *line = strdup(""); + char *prompt = compose_prompt(); + print_str(prompt, strlen(prompt)); - char *prompt = compose_prompt(); + char *line = read_line(); + process_line(line, &args); + int status = execute(args); - print_str(prompt, strlen(prompt)); - - line = read_line(&line); - - process_line(line, &args); - status = execute(args); - - free(line); - free(prompt); - free_str_arr(args); - } while (status); + free(line); + free(prompt); + free_str_arr(args); } /** @@ -107,15 +101,7 @@ int launch(char **args) if (pid == 0) { - change_mode(0); - signal(SIGINT, SIG_DFL); - - if (execvp(args[0], args) < 0) - { - perror("myshell"); - } - - exit(EXIT_FAILURE); + sh_exec(args); } else if (pid < 0) { @@ -140,11 +126,11 @@ int launch(char **args) int sh_cd(char **args) { if (args[1] == NULL) - fprintf(stderr, "myshell: expected arguments for \"cd\"\n"); + chdir(getenv("HOME")); else if (chdir(args[1]) < 0) perror("myshell"); - return 1; + return 0; } /** @@ -158,6 +144,22 @@ int sh_exit(char **args) exit(0); } +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("myshell"); + } + + exit(EXIT_FAILURE); +} + char *compose_prompt() { char *prompt = strdup("\n"); diff --git a/src/tree.c b/src/tree.c index 15ca43c..e53e190 100644 --- a/src/tree.c +++ b/src/tree.c @@ -77,6 +77,8 @@ size_t list_strings_containing(struct tree_node *root, char *key, char ***string { size_t amount = 0; + free(*strings); + *strings = malloc(amount * sizeof(char *)); struct tree_node *current = root; diff --git a/src/utils.c b/src/utils.c index 5fc1fff..bcd6a9b 100644 --- a/src/utils.c +++ b/src/utils.c @@ -50,7 +50,7 @@ int sep_string(char *line, char ***toks, char *sep) { free(*toks); char *tmp_line = strdup(line); - char *free_tmp_line = tmp_line; + char *free_tmp_line = tmp_line; int n = 0; *toks = malloc(sizeof(char *) * n); @@ -89,3 +89,31 @@ void free_str_arr(char **arr) free(arr[i]); free(arr); } + +char **slice_array(char **arr, int beg, int end, bool asc) +{ + if (beg == -1) + beg = 0; + if (end == -1) + end = get_null_term_arr_size(arr); + + char **new_arr = malloc(abs(end - beg) * sizeof(char *)); + + if (asc) + for (int i = beg, j = 0; i < end; i++, j++) + new_arr[j] = arr[i]; + else + for (int i = end, j = 0; i > beg; i--, j++) + new_arr[j] = arr[i]; + + return new_arr; +} + +int get_null_term_arr_size(char **arr) +{ + int k = 0; + for (int i = 0; arr[i]!= NULL; i++) + k++; + + return k; +} \ No newline at end of file