Add history persistence to file #23
Open
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
waltertross
reviewed
Feb 24, 2020
waltertross
reviewed
Feb 24, 2020
| @@ -45,6 +47,8 @@ | |||
|
|
|||
| /* Config */ | |||
| #define BUFFER_MAX 1024 | |||
| #define HIST_DIR "clac" | |||
There was a problem hiding this comment.
Suggested change
| #define HIST_DIR "clac" | |
| #define CLAC_DIR "clac" |
| @@ -496,6 +500,26 @@ static void config() { | |||
| } | |||
| } | |||
|
|
|||
| static sds history_config() { | |||
| sds directory = NULL; | |||
| sds filename = NULL; | |||
There was a problem hiding this comment.
Suggested change
| sds filename = NULL; | |
| sds filename = NULL; | |
| int directory_ok; |
| sds filename = NULL; | ||
|
|
||
| if (getenv("XDG_DATA_HOME") != NULL) { | ||
| directory = buildpath("%s/%s", getenv("XDG_DATA_HOME"), HIST_DIR); |
There was a problem hiding this comment.
Suggested change
| directory = buildpath("%s/%s", getenv("XDG_DATA_HOME"), HIST_DIR); | |
| directory = buildpath("%s/%s", getenv("XDG_DATA_HOME"), CLAC_DIR); |
| directory = buildpath("%s/%s", getenv("XDG_DATA_HOME"), HIST_DIR); | ||
| filename = buildpath("%s/%s", getenv("XDG_DATA_HOME"), HIST_FILE); | ||
| } else if (getenv("HOME") != NULL) { | ||
| directory = buildpath("%s/.local/share/%s", getenv("HOME"), HIST_DIR); |
There was a problem hiding this comment.
Suggested change
| directory = buildpath("%s/.local/share/%s", getenv("HOME"), HIST_DIR); | |
| directory = buildpath("%s/.local/share/%s", getenv("HOME"), CLAC_DIR); |
| return NULL; | ||
| } | ||
|
|
||
| mkdir(directory, 0700); |
There was a problem hiding this comment.
Suggested change
| mkdir(directory, 0700); | |
| directory_ok = mkdir(directory, 0700) == 0 || errno == EEXIST; |
| mkdir(directory, 0700); | ||
| sdsfree(directory); | ||
|
|
||
| return filename; |
There was a problem hiding this comment.
Suggested change
| return filename; | |
| return directory_ok ? filename : NULL; |
| @@ -34,6 +34,8 @@ | |||
| #include <ctype.h> | |||
| #include <errno.h> | |||
| #include <math.h> | |||
| #include <sys/stat.h> | |||
| #include <sys/types.h> | |||
There was a problem hiding this comment.
can we delete this line? It doesn't seem to be used (compilation passes without it).
|
I didn't handle the mkdir return value because there's not much we can do, the app should just ignore any error condition on that directory. If Linenoise can save its history there, it will do so, otherwise it won't. As for the imports, I copied them from |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Hey there. Thank you for this great tool. I added history saving and loading to file (
~/.local/share/clac/history, configurable with XDG env) because I often need to review or amend previous calculations, so I guess other people would find it useful too. Besides, I didn't do much, because Linenoise already has the required functions.