Kernel/iwd
3
0
Fork 0
mirror of https://git.kernel.org/pub/scm/network/wireless/iwd.git synced 2024-12-22 13:02:44 +01:00
Code Releases Activity

client: Use XDG_DATA_HOME for history file if available

Browse Source
This commit is contained in:
Marcel Holtmann 2019-12-13 09:33:19 +01:00
parent ce2b0e7cc6
commit d3e00d7f0f
1 changed files with 29 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
client/display.c
View File

@ -27,6 +27,7 @@
#define _GNU_SOURCE #define _GNU_SOURCE
#include <stdio.h> #include <stdio.h>
#include <signal.h> #include <signal.h>
#include <sys/stat.h>
#include <readline/history.h> #include <readline/history.h>
#include <readline/readline.h> #include <readline/readline.h>
@ -636,18 +637,37 @@ static char *history_path;
void display_init(void) void display_init(void)
{ {
const char *home_path; const char *data_home;
char *data_path;
display_refresh.redo_entries = l_queue_new(); display_refresh.redo_entries = l_queue_new();
stifle_history(24); stifle_history(24);
home_path = getenv("HOME"); data_home = getenv("XDG_DATA_HOME");
if (home_path) if (!data_home || *data_home != '/') {
history_path = l_strdup_printf("%s/%s", home_path, const char *home_path;
".iwctl_history");
read_history(history_path); home_path = getenv("HOME");
if (home_path)
data_path = l_strdup_printf("%s/%s/iwctl",
home_path, ".local/share");
else
data_path = NULL;
} else {
data_path = l_strdup_printf("%s/iwctl", data_home);
}
if (data_path) {
mkdir(data_path, 0700);
history_path = l_strdup_printf("%s/history", data_path);
read_history(history_path);
l_free(data_path);
} else {
history_path = NULL;
}
setlinebuf(stdout); setlinebuf(stdout);
@ -683,7 +703,9 @@ void display_exit(void)
l_signal_remove(resize_signal); l_signal_remove(resize_signal);
write_history(history_path); if (history_path)
write_history(history_path);
l_free(history_path); l_free(history_path);
display_quit(); display_quit();