diff options
author | Lars Henriksen <LarsHenriksen@get2net.dk> | 2018-08-17 21:49:39 +0200 |
---|---|---|
committer | Lukas Fleischer <lfleischer@calcurse.org> | 2018-12-14 10:35:11 +0100 |
commit | 4285e8859353c31b39fa9539a89e58dc3a020264 (patch) | |
tree | 099e93aa2103026f88666799b2bd297993d71d1c /src/calcurse.h | |
parent | 6f22e99ad5187f1c80717bfbe0d84d7dd12a2dba (diff) | |
download | calcurse-4285e8859353c31b39fa9539a89e58dc3a020264.tar.gz calcurse-4285e8859353c31b39fa9539a89e58dc3a020264.zip |
Rewrite of io_init()
The introduction of the "-C <confdir>" option is an opportunity to
review the initialization of data paths. It lead to a rewrite.
Two "root" directories are used (data and configuration files); by
default they are identical. The statically allocated path buffers are
turned into dynamically allocated buffers.
Missing files/directories now include hooks.
Signed-off-by: Lars Henriksen <LarsHenriksen@get2net.dk>
Signed-off-by: Lukas Fleischer <lfleischer@calcurse.org>
Diffstat (limited to 'src/calcurse.h')
-rw-r--r-- | src/calcurse.h | 36 |
1 files changed, 13 insertions, 23 deletions
diff --git a/src/calcurse.h b/src/calcurse.h index 616d954..8626393 100644 --- a/src/calcurse.h +++ b/src/calcurse.h @@ -95,16 +95,6 @@ #define NOTES_DIR_NAME "notes/" #define HOOKS_DIR_NAME "hooks/" -#define TODO_PATH DIR_NAME TODO_PATH_NAME -#define APTS_PATH DIR_NAME APTS_PATH_NAME -#define CONF_PATH DIR_NAME CONF_PATH_NAME -#define KEYS_PATH DIR_NAME KEYS_PATH_NAME -#define CPID_PATH DIR_NAME CPID_PATH_NAME -#define DLOG_PATH DIR_NAME DLOG_PATH_NAME -#define DPID_PATH DIR_NAME DPID_PATH_NAME -#define NOTES_DIR DIR_NAME NOTES_DIR_NAME -#define HOOKS_DIR DIR_NAME HOOKS_DIR_NAME - #define DEFAULT_EDITOR "vi" #define DEFAULT_PAGER "less" #define DEFAULT_MERGETOOL "vimdiff" @@ -1219,19 +1209,19 @@ extern enum ui_mode ui_mode; extern int read_only; extern int quiet; extern int want_reload; -extern const char *datefmt_str[DATE_FORMATS]; -extern int days[12]; -extern char path_dir[BUFSIZ]; -extern char path_conf_dir[BUFSIZ]; -extern char path_todo[BUFSIZ]; -extern char path_apts[BUFSIZ]; -extern char path_conf[BUFSIZ]; -extern char path_keys[BUFSIZ]; -extern char path_notes[BUFSIZ]; -extern char path_cpid[BUFSIZ]; -extern char path_dpid[BUFSIZ]; -extern char path_dmon_log[BUFSIZ]; -extern char path_hooks[BUFSIZ]; +extern const char *datefmt_str[]; +extern int days[]; +extern char *path_ddir; +extern char *path_cdir; +extern char *path_todo; +extern char *path_apts; +extern char *path_conf; +extern char *path_keys; +extern char *path_notes; +extern char *path_cpid; +extern char *path_dpid; +extern char *path_dmon_log; +extern char *path_hooks; extern struct conf conf; extern struct pad apad; extern struct nbar nbar; |