From d8c665a6254fed4a3a61c93a44622893f726e596 Mon Sep 17 00:00:00 2001 From: Dm1tr1y147 Date: Thu, 9 Jul 2020 04:29:20 +0500 Subject: [PATCH] Some minor code refactors. Added tree structure manipulations and files autocompletion on Tab keypress --- README.md | 4 +- include/complete.h | 15 +++++ include/input.h | 3 +- include/keys.h | 1 + include/shell.h | 2 + include/tree.h | 24 ++++++++ include/utils.h | 1 - src/complete.c | 93 +++++++++++++++++++++++++++++ src/input.c | 16 +---- src/keys.c | 63 ++++++++++++++++++++ src/output.c | 15 +++++ src/shell.c | 23 ++++++-- src/tree.c | 142 +++++++++++++++++++++++++++++++++++++++++++++ src/utils.c | 52 +++++++++++------ 14 files changed, 413 insertions(+), 41 deletions(-) create mode 100644 include/complete.h create mode 100644 include/tree.h create mode 100644 src/complete.c create mode 100644 src/tree.c diff --git a/README.md b/README.md index e591907..6ea4576 100644 --- a/README.md +++ b/README.md @@ -8,6 +8,7 @@ Work is still in porgress, buf when you will see a "finished" topic assigned to * 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 +* Files autocompletion on `Tab` keypress # Builtin commands * `cd`: changes current working directory to the one specified by user. If no arguments provided, shows error. @@ -17,4 +18,5 @@ Work is still in porgress, buf when you will see a "finished" topic assigned to * Pipes and files input/output * Replace linux `echo` command with builtin one with support of environmental variables * Environmental variables -* `Ctrl+Z` running programm with `fd` \ No newline at end of file +* `Ctrl+Z` running programm with `fd` +* Commands autocompletion \ No newline at end of file diff --git a/include/complete.h b/include/complete.h new file mode 100644 index 0000000..35faa04 --- /dev/null +++ b/include/complete.h @@ -0,0 +1,15 @@ +#ifndef _COMPLETE_H +#define _COMPLETE_H + +#define _GNU_SOURCE + +#include +#include +#include +#include +#include +#include + +void complete_line(int *pos, int *n, char **line, char **out); + +#endif \ No newline at end of file diff --git a/include/input.h b/include/input.h index 442c6bf..9d5698b 100644 --- a/include/input.h +++ b/include/input.h @@ -14,8 +14,7 @@ enum keys { BACKSPACE_KEY, ENTER_KEY, TAB_KEY, - ESCAPE_KEY, - CTRL_C_KEY + ESCAPE_KEY }; void change_mode(int on); diff --git a/include/keys.h b/include/keys.h index 9e607b7..4346281 100644 --- a/include/keys.h +++ b/include/keys.h @@ -10,6 +10,7 @@ void home_key(int *pos); void end_key(int *pos, int n); void backspace_key(int *pos, int *n, char **line); void new_line(); +void tab_key(int *pos, int *n, char **line); void printable_key(int *pos, int *n, char c, char **line); #endif \ No newline at end of file diff --git a/include/shell.h b/include/shell.h index 6b2551c..40dae68 100644 --- a/include/shell.h +++ b/include/shell.h @@ -23,6 +23,8 @@ void sig_handler(); int sh_cd(char **args); int sh_exit(char **args); +char *compose_prompt(); + #define BUILTIN_NUM sizeof(builtin) / sizeof(char *) #endif \ No newline at end of file diff --git a/include/tree.h b/include/tree.h new file mode 100644 index 0000000..f4e1820 --- /dev/null +++ b/include/tree.h @@ -0,0 +1,24 @@ +#ifndef _TREE_H +#define _TREE_H + +#include +#include + +#define ALPHABET_SIZE 256 + +struct tree_node +{ + struct tree_node *child[ALPHABET_SIZE]; + + int is_leaf; +}; + +struct tree_node *get_new_node(); +void insert_tree(struct tree_node *root, char *key); +void free_tree(struct tree_node *root); +int search_tree(struct tree_node *root, char *key); +int is_last_node(struct tree_node *root); +size_t list_strings_containing(struct tree_node *root, char *key, char ***strings); +void get_all_substrings(struct tree_node *root, size_t *amount, char **curr_prefix, char ***strings); + +#endif \ No newline at end of file diff --git a/include/utils.h b/include/utils.h index ed8544c..9f83060 100644 --- a/include/utils.h +++ b/include/utils.h @@ -7,7 +7,6 @@ #include #include -void die(char *s); void append_to_pos(char **str, int pos, char ch); void remove_on_pos(char **str, int pos); diff --git a/src/complete.c b/src/complete.c new file mode 100644 index 0000000..d4b9605 --- /dev/null +++ b/src/complete.c @@ -0,0 +1,93 @@ +#include "../include/complete.h" +#include "../include/shell.h" +#include "../include/tree.h" + +size_t get_dir_list(char ***dir_list) +{ + size_t n = 0; + *dir_list = malloc(sizeof(char *) * n); + char *pwd = get_current_dir_name(); + + DIR *dir; + struct dirent *ent; + + if ((dir = opendir(pwd)) == NULL) + { + perror("opendir"); + return -1; + } + while ((ent = readdir(dir)) != NULL) + { + n++; + *dir_list = realloc(*dir_list, sizeof(char *) * n); + (*dir_list)[n - 1] = strdup(ent->d_name); + } + + closedir(dir); + + return n; +} + +void complete_line(int *pos, int *n, char **line, char **out) +{ + (*line)[*pos] = '\0'; + *out = strdup("\x1b[2K"); + + char **dir_list; + size_t sz = get_dir_list(&dir_list); + + char *curr_path, *tmp_line = strdup(*line); + if ((curr_path = strtok(tmp_line, " ")) != NULL && (*line)[*pos - 1] != ' ') + { + curr_path = strdup(curr_path); + + char *tmp; + while ((tmp = strtok(NULL, " ")) != NULL) + { + free(curr_path); + + curr_path = strdup(tmp); + } + + struct tree_node *child_dirs_root = get_new_node(); + for (size_t i = 0; i < sz; i++) + { + insert_tree(child_dirs_root, dir_list[i]); + } + + free(dir_list); + + sz = list_strings_containing(child_dirs_root, curr_path, &dir_list); + } + + if (sz == 1) + { + *out = strdup(dir_list[0] + strlen(curr_path)); + *pos += strlen(*out); + *n = *pos; + + *line = realloc(*line, strlen(*line) + strlen(*out)); + *line = strcat(*line, *out); + + return; + } + + for (int i = 0; i < sz; i++) + { + *out = realloc(*out, strlen(*out) + strlen(dir_list[i]) + 2); + *out = strcat(*out, dir_list[i]); + *out = strcat(*out, " "); + } + + *out = realloc(*out, strlen(*out) + 2); + *out = strcat(*out, "\n"); + + char *prompt = compose_prompt(); + *out = realloc(*out, strlen(*out) + strlen(prompt) + 1); + *out = strcat(*out, prompt); + + *out = realloc(*out, strlen(*out) + *pos); + *out = strncat(*out, *line, *pos + 1); + + *n = *pos; +} \ No newline at end of file diff --git a/src/input.c b/src/input.c index e5c0f49..71368a9 100644 --- a/src/input.c +++ b/src/input.c @@ -72,22 +72,8 @@ char *read_line(char **line) case TAB_KEY: { - // char *buff = malloc(1); - // buff[0] = '\0'; - // size_t buff_size = 1; - - // n += 2; - // append_to_buff(&buff, &buff_size, " ", 2); - // for (int i = 0; i < 2; i++) - // append_to_pos(line, pos, ' '); - // append_to_buff(&buff, &buff_size, "\0337", 2); - // pos += 2; - // append_to_buff(&buff, &buff_size, *line + pos, n - pos); - // append_to_buff(&buff, &buff_size, "\0338", 2); - - // print_str(buff, buff_size); - // TODO: autocomplete + tab_key(&pos, &n, line); } break; diff --git a/src/keys.c b/src/keys.c index 9a08cee..06853ef 100644 --- a/src/keys.c +++ b/src/keys.c @@ -1,7 +1,15 @@ #include "../include/keys.h" #include "../include/output.h" #include "../include/utils.h" +#include "../include/complete.h" +/** + * @brief Delete key action + * + * @param pos + * @param n + * @param line + */ void delete_key(int pos, int *n, char **line) { if (pos < *n) @@ -22,6 +30,11 @@ void delete_key(int pos, int *n, char **line) } } +/** + * @brief Arrow left key action + * + * @param pos + */ void move_left(int *pos) { if (*pos > 0) @@ -31,6 +44,12 @@ void move_left(int *pos) } } +/** + * @brief Arrow right key action + * + * @param pos + * @param n + */ void move_right(int *pos, int n) { if (*pos < n) @@ -40,6 +59,11 @@ void move_right(int *pos, int n) } } +/** + * @brief Home key action + * + * @param pos + */ void home_key(int *pos) { char *buff = malloc(1); @@ -53,6 +77,12 @@ void home_key(int *pos) *pos = 0; } +/** + * @brief End key action + * + * @param pos + * @param n + */ void end_key(int *pos, int n) { char *buff = malloc(1); @@ -67,6 +97,13 @@ void end_key(int *pos, int n) *pos = n; } +/** + * @brief Backspace key action + * + * @param pos + * @param n + * @param line + */ void backspace_key(int *pos, int *n, char **line) { if (*pos > 0) @@ -89,11 +126,37 @@ void backspace_key(int *pos, int *n, char **line) } } +/** + * @brief Enter key action + * + */ void new_line() { print_str("\n", 1); } +void tab_key(int *pos, int *n, char **line) +{ + char *buff = malloc(1); + buff[0] = '\0'; + size_t buff_size = 1; + + char *options; + + complete_line(pos, n, line, &options); + append_to_buff(&buff, &buff_size, options, strlen(options)); + + print_str(buff, buff_size); +} + +/** + * @brief Any printable key action + * + * @param pos + * @param n + * @param c + * @param line + */ void printable_key(int *pos, int *n, char c, char **line) { char *buff = malloc(1); diff --git a/src/output.c b/src/output.c index 0e555ad..183cfc2 100644 --- a/src/output.c +++ b/src/output.c @@ -1,5 +1,14 @@ #include "../include/output.h" +/** + * @brief Appends to buffer string + * + * @param buff + * @param buff_size + * @param ap + * @param ap_size + * @return size_t + */ size_t append_to_buff(char **buff, size_t *buff_size, char *ap, size_t ap_size) { *buff = realloc(*buff, *buff_size + ap_size); @@ -11,6 +20,12 @@ size_t append_to_buff(char **buff, size_t *buff_size, char *ap, size_t ap_size) return *buff_size; } +/** + * @brief Prints buffer string + * + * @param buff + * @param size + */ void print_str(char *buff, size_t size) { write(STDOUT_FILENO, buff, size); diff --git a/src/shell.c b/src/shell.c index 11f432f..910cc76 100644 --- a/src/shell.c +++ b/src/shell.c @@ -24,10 +24,9 @@ void process_command() char *line = malloc(1); line[0] = '\0'; - if (getuid() == 0) - print_str("# ", 2); - else - print_str("> ", 2); + char *prompt = compose_prompt(); + + print_str(prompt, strlen(prompt)); line = read_line(&line); @@ -153,4 +152,20 @@ int sh_cd(char **args) int sh_exit(char **args) { exit(0); +} + +char *compose_prompt() +{ + char *prompt = malloc(1); + prompt[0] = '\0'; + + prompt = realloc(prompt, strlen(prompt) + 3); + if (getuid() == 0) + { + prompt = strcat(prompt, "\n# "); + } + else + prompt = strcat(prompt, "\n% "); + + return prompt; } \ No newline at end of file diff --git a/src/tree.c b/src/tree.c new file mode 100644 index 0000000..df0aaa5 --- /dev/null +++ b/src/tree.c @@ -0,0 +1,142 @@ +#include "../include/tree.h" + +struct tree_node *get_new_node() +{ + struct tree_node *node = (struct tree_node *)malloc(sizeof(struct tree_node)); + node->is_leaf = 0; + + for (int i = 0; i < ALPHABET_SIZE; i++) + { + node->child[i] = NULL; + } + + return node; +} + +void insert_tree(struct tree_node *root, char *key) +{ + struct tree_node *current = root; + + for (int i = 0; i < strlen(key); i++) + { + char index = key[i]; + if (current->child[index] == NULL) + { + current->child[index] = get_new_node(); + } + + current = current->child[index]; + } + + current->is_leaf = 1; +} + +void free_tree(struct tree_node *root) +{ + for (int i = 0; i < ALPHABET_SIZE; i++) + { + if (root->child[i] != NULL) + { + free_tree(root->child[i]); + } + } + + free(root); + return; +} + +int search_tree(struct tree_node *root, char *key) +{ + struct tree_node *current = root; + + for (int i = 0; i < strlen(key); i++) + { + char index = key[i]; + + if (current->child[index] == NULL) + { + return 0; + } + + current = current->child[index]; + } + + return (current != NULL && current->is_leaf); +} + +int is_last_node(struct tree_node *root) +{ + for (int i = 0; i < ALPHABET_SIZE; i++) + if (root->child[i] != NULL) + return 0; + + return 1; +} + +size_t list_strings_containing(struct tree_node *root, char *key, char ***strings) +{ + size_t amount = 0; + + *strings = malloc(amount * sizeof(char *)); + + struct tree_node *current = root; + + for (int level = 0; level < strlen(key); level++) + { + int index = key[level]; + + if (current->child[index] == NULL) + return amount; + + current = current->child[index]; + } + + int key_presents = current->is_leaf; + + int is_last = is_last_node(current); + + if (key_presents && is_last) + { + amount++; + *strings = (char **)realloc(*strings, amount * sizeof(char *)); + (*strings)[0] = strdup(key); + return amount; + } + + if (is_last == 0) + { + char *prefix = strdup(key); + prefix = realloc(prefix, strlen(prefix) + 2); + + get_all_substrings(current, &amount, &prefix, strings); + + return amount; + } + + return -1; +} + +void get_all_substrings(struct tree_node *root, size_t *amount, char **curr_prefix, char ***strings) +{ + if (root->is_leaf) + { + (*amount)++; + *strings = (char **)realloc(*strings, *amount * sizeof(char *)); + (*strings)[*amount - 1] = strdup(*curr_prefix); + } + + if (is_last_node(root)) + return; + + for (int index = 0; index < ALPHABET_SIZE; index++) + { + if (root->child[index] != NULL) + { + *curr_prefix = strncat(*curr_prefix, (char *)(&index), 1); + + get_all_substrings(root->child[index], amount, curr_prefix, strings); + + (*curr_prefix)[strlen(*curr_prefix) - 1] = '\0'; + } + } +} \ No newline at end of file diff --git a/src/utils.c b/src/utils.c index 9081e5d..5d89c0c 100644 --- a/src/utils.c +++ b/src/utils.c @@ -1,33 +1,49 @@ #include "../include/utils.h" -void die(char *s) -{ - perror(s); - exit(1); -} - +/** + * @brief Appends a character to the specified position of string + * + * @param str + * @param pos + * @param ch + */ void append_to_pos(char **str, int pos, char ch) { size_t len = strlen(*str); - - *str = realloc(*str, len + 2); - - for (int i = len; i >= pos; i--) + if (pos <= len + 1) { - (*str)[i + 1] = (*str)[i]; + *str = realloc(*str, len + 2); + + for (int i = len; i >= pos; i--) + { + (*str)[i + 1] = (*str)[i]; + } + (*str)[pos] = ch; + (*str)[len + 1] = '\0'; } - (*str)[pos] = ch; - (*str)[len + 1] = '\0'; + else + fprintf(stderr, "Can't add \"%c\" symbol outside of the string\n", ch); } +/** + * @brief Removes a character located in the specified position + * + * @param str + * @param pos + */ void remove_on_pos(char **str, int pos) { size_t len = strlen(*str); - - for (int i = pos - 1; i <= len; i++) + if (pos <= len) { - (*str)[i] = (*str)[i + 1]; + + for (int i = pos - 1; i <= len; i++) + { + (*str)[i] = (*str)[i + 1]; + } + (*str)[len] = '\0'; + *str = realloc(*str, len); } - (*str)[len] = '\0'; - *str = realloc(*str, len); + else + fprintf(stderr, "Can't remove symbol outside the string\n"); } \ No newline at end of file