From d7037ec237b761694fd07213d0d34e8d10c69b27 Mon Sep 17 00:00:00 2001 From: Dm1tr1y147 Date: Fri, 17 Jul 2020 21:06:56 +0500 Subject: [PATCH] Added permanent history saving into file and fixed hidded files suggestion --- README.md | 2 +- foo | 1 - include/history.h | 3 ++ include/shell.h | 2 +- include/utils.h | 1 + src/complete.c | 2 +- src/history.c | 113 ++++++++++++++++++++++++++++++++++++++++++++++ src/main.c | 15 +++--- src/utils.c | 29 ++++++++++++ test.txt | 1 - test.txt;cat | 1 - 11 files changed, 156 insertions(+), 14 deletions(-) delete mode 100644 foo delete mode 100644 test.txt delete mode 100644 test.txt;cat diff --git a/README.md b/README.md index aeac97c..0d30a84 100644 --- a/README.md +++ b/README.md @@ -15,6 +15,7 @@ Work is still in porgress, buf when you will see a "finished" topic assigned to * Running multiple commands separated by `;`, `&&` or `||` * Expand `*` wildcards * Commands I/O redirection with `|` pipes and `>`, `<`, `>>`, `<>` file input/output +* Save history into file and access recent command in another instance of shell # Builtin commands * `cd`: changes current working directory to the one specified by user. If no arguments provided, shows error. @@ -27,4 +28,3 @@ Work is still in porgress, buf when you will see a "finished" topic assigned to * `Ctrl+Z` running programm with `fd` * Gettingcommands path from system `PATH` environment variable for autocomplete * `$()` subcommands -* Save history into file diff --git a/foo b/foo deleted file mode 100644 index 5da2c6b..0000000 --- a/foo +++ /dev/null @@ -1 +0,0 @@ -zim diff --git a/include/history.h b/include/history.h index 78ee50f..91bd80e 100644 --- a/include/history.h +++ b/include/history.h @@ -5,5 +5,8 @@ void append_to_history(char *line); void clear_sub_history(); char *previous_hist_entry(char *line); char *next_hist_entry(char *line); +void init_history(); +void open_history_file(); +void close_history_file(); #endif \ No newline at end of file diff --git a/include/shell.h b/include/shell.h index f2568d5..1f5d63e 100644 --- a/include/shell.h +++ b/include/shell.h @@ -35,7 +35,7 @@ struct history char **content; int length; int pos; - char *curr_command; + FILE *file; struct hist_sub sub; }; diff --git a/include/utils.h b/include/utils.h index 0c4ac40..caec45c 100644 --- a/include/utils.h +++ b/include/utils.h @@ -24,5 +24,6 @@ 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); char *get_curr_dir_name(); +int get_num_of_lines(FILE *file); #endif \ No newline at end of file diff --git a/src/complete.c b/src/complete.c index 467465c..c858ee6 100644 --- a/src/complete.c +++ b/src/complete.c @@ -50,7 +50,7 @@ ssize_t get_dir_list(char ***dir_list, char *path, int ex) if (ex != 0 && !check_if_executable(path, ent->d_name)) continue; - if (ent->d_name[0] == '.') + if (strcmp(ent->d_name, ".") == 0 || strcmp(ent->d_name, "..") == 0) continue; n++; diff --git a/src/history.c b/src/history.c index 42f9e54..a734651 100644 --- a/src/history.c +++ b/src/history.c @@ -13,6 +13,9 @@ void append_to_history(char *line) if (strcmp(line, term.hist.content[term.hist.length - 1]) == 0) return; + if (strncmp(line, "exit", strlen("exit")) == 0) + return; + if (line[0] == '\0') return; @@ -20,6 +23,10 @@ void append_to_history(char *line) term.hist.content = (char **)realloc(term.hist.content, term.hist.length * sizeof(char *)); term.hist.content[term.hist.length - 1] = strdup(line); + fseek(term.hist.file, 0, SEEK_END); + fprintf(term.hist.file, "%s\n", line); + fflush(term.hist.file); + term.hist.pos = -1; } @@ -41,6 +48,51 @@ void clear_sub_history() char *previous_hist_entry(char *line) { static int h_size; + int f_len = get_num_of_lines(term.hist.file); + + if (term.hist.length != f_len) + { + clear_sub_history(); + term.hist.pos = -1; + + char **tmp_h = calloc(sizeof(char *), 0); + int tmp_h_pos = 0; + + fseek(term.hist.file, 0, SEEK_END); + + while (term.hist.length + tmp_h_pos < f_len && ftell(term.hist.file) > 1) + { + char ch = '\0'; + size_t llen = 0; + while (ch != '\n') + { + fseek(term.hist.file, -2, SEEK_CUR); + if (ftell(term.hist.file) < 1) + break; + ch = fgetc(term.hist.file); + } + + long f_pos = ftell(term.hist.file); + + tmp_h = realloc(tmp_h, sizeof(char *) * (tmp_h_pos + 1)); + getline(&tmp_h[tmp_h_pos], &llen, term.hist.file); + + fseek(term.hist.file, f_pos, SEEK_SET); + + if (tmp_h[tmp_h_pos][strlen(tmp_h[tmp_h_pos]) - 1] == '\n') + tmp_h[tmp_h_pos][strlen(tmp_h[tmp_h_pos]) - 1] = '\0'; + + tmp_h_pos++; + + fseek(term.hist.file, -2, SEEK_CUR); + } + + for (int i = 0; i < tmp_h_pos; i++) + append_to_str_arr(&term.hist.content, &term.hist.length, tmp_h[i]); + + free_str_arr(tmp_h, tmp_h_pos); + } + if (line == NULL) { if (term.hist.pos + 1 == term.hist.length) @@ -114,4 +166,65 @@ char *next_hist_entry(char *line) term.hist.sub.pos--; return strdup(term.hist.sub.content[term.hist.sub.length - term.hist.sub.pos - 1]); +} + +void init_history() +{ + term.hist.length = 0; + term.hist.pos = -1; + term.hist.content = calloc(term.hist.length, sizeof(char *)); + + term.hist.sub.length = -1; + term.hist.sub.pos = -1; + term.hist.sub.content = calloc(0, sizeof(char *)); + + open_history_file(); + + size_t sz = 0; + int len = 0; + char *buf = NULL; + + while ((len = getline(&buf, &sz, term.hist.file)) != -1) + { + char *tmp = strdup(buf); + if (tmp[strlen(tmp) - 1] == '\n') + tmp[strlen(tmp) - 1] = '\0'; + + append_to_str_arr(&term.hist.content, &term.hist.length, tmp); + free(tmp); + } + free(buf); +} + +void open_history_file() +{ + char *data_path; + if ((data_path = getenv("XDG_DATA_HOME")) == NULL) + { + char *user_home; + if ((user_home = getenv("HOME")) == NULL) + { + perror("getenv"); + exit(EXIT_FAILURE); + } + data_path = strdup(user_home); + data_path = realloc(data_path, strlen(data_path) + strlen("/.local/share/") + 1); + data_path = strcat(data_path, "/.local/share/"); + } + + data_path = realloc(data_path, strlen(data_path) + strlen(".mshistory") + 1); + data_path = strcat(data_path, ".mshistory"); + + if ((term.hist.file = fopen(data_path, "a+")) == NULL) + { + perror("open"); + exit(EXIT_FAILURE); + } + + fseek(term.hist.file, 0, SEEK_SET); +} + +void close_history_file() +{ + fclose(term.hist.file); } \ No newline at end of file diff --git a/src/main.c b/src/main.c index bb1b7ae..e72e2ff 100644 --- a/src/main.c +++ b/src/main.c @@ -5,6 +5,7 @@ #include "../include/input.h" #include "../include/utils.h" #include "../include/shell.h" +#include "../include/history.h" // Definitions t_ term; @@ -25,7 +26,7 @@ int main() // Init t_ init_term() { - + // Log file FILE *log_file = fopen("/var/log/mshell.log", "w"); if (log_file == NULL) { @@ -37,20 +38,18 @@ t_ init_term() fclose(log_file); } + // Entering raw mode change_mode(1); - term.hist.length = 0; - term.hist.pos = -1; - term.hist.content = calloc(term.hist.length, sizeof(char *)); - - term.hist.sub.length = -1; - term.hist.sub.pos = -1; - term.hist.sub.content = calloc(0, sizeof(char *)); + // Init history + init_history(); term.last_status = 0; + // Disable Ctrl+C default behaviour for shell signal(SIGINT, SIG_IGN); + // Set up function to run on shell exit atexit(exit_shell); return term; diff --git a/src/utils.c b/src/utils.c index 224e68e..53bfa2f 100644 --- a/src/utils.c +++ b/src/utils.c @@ -190,4 +190,33 @@ char *get_curr_dir_name() getcwd(pwd, FILENAME_MAX); return pwd; +} + +/** + * @brief Get the number of lines in file + * + * @param file + * @return int + */ +int get_num_of_lines(FILE *file) +{ + int n = 0; + char ch, pch; + long curr_pos = ftell(file); + + fseek(file, 0, SEEK_SET); + + while ((ch = fgetc(file)) != EOF) + { + if (ch == '\n') + n++; + pch = ch; + } + + if (pch != '\n') + n++; + + fseek(file, curr_pos, SEEK_SET); + + return n; } \ No newline at end of file diff --git a/test.txt b/test.txt deleted file mode 100644 index 345e6ae..0000000 --- a/test.txt +++ /dev/null @@ -1 +0,0 @@ -Test diff --git a/test.txt;cat b/test.txt;cat deleted file mode 100644 index 7ba49bb..0000000 --- a/test.txt;cat +++ /dev/null @@ -1 +0,0 @@ -Test test.txt