fyb/calcurse-edge
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add option to specify the configuration file used

Browse Source 
The configuration file (~/.calcurse/conf by default) can now be
specified with -C or --conf.

Workaround for GitHub issue #86.

Signed-off-by: Lukas Fleischer <lfleischer@calcurse.org>
This commit is contained in:
Quentin Hibon
2018-05-27 10:05:56 +02:00
committed by Lukas Fleischer
parent 574156be7c
commit 407d5abd23
3 changed files with 21 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/io.c
View File

@@ -226,16 +226,20 @@ unsigned io_fprintln(const char *fname, const char *fmt, ...)
* one (~/.calcurse/apts) is taken. If the one given does not exist, it
* is created.
* The datadir argument can be use to specify an alternative data root dir.
* The conffile argument can be use to specify an alternative configuration file.
*/
void io_init(const char *cfile, const char *datadir)
void io_init(const char *cfile, const char *datadir, const char *conffile)
{
const char *home;
if (datadir != NULL) {
home = datadir;
snprintf(path_dir, BUFSIZ, "%s", home);
if (conffile)
snprintf(path_conf, BUFSIZ, "%s", conffile);
else
snprintf(path_conf, BUFSIZ, "%s/" CONF_PATH_NAME, home);
snprintf(path_todo, BUFSIZ, "%s/" TODO_PATH_NAME, home);
snprintf(path_conf, BUFSIZ, "%s/" CONF_PATH_NAME, home);
snprintf(path_notes, BUFSIZ, "%s/" NOTES_DIR_NAME, home);
snprintf(path_keys, BUFSIZ, "%s/" KEYS_PATH_NAME, home);
snprintf(path_cpid, BUFSIZ, "%s/" CPID_PATH_NAME, home);
@@ -248,9 +252,12 @@ void io_init(const char *cfile, const char *datadir)
if (home == NULL) {
home = ".";
}
if (conffile)
snprintf(path_conf, BUFSIZ, "%s", conffile);
else
snprintf(path_conf, BUFSIZ, "%s/" CONF_PATH, home);
snprintf(path_dir, BUFSIZ, "%s/" DIR_NAME, home);
snprintf(path_todo, BUFSIZ, "%s/" TODO_PATH, home);
snprintf(path_conf, BUFSIZ, "%s/" CONF_PATH, home);
snprintf(path_keys, BUFSIZ, "%s/" KEYS_PATH, home);
snprintf(path_cpid, BUFSIZ, "%s/" CPID_PATH, home);
snprintf(path_dpid, BUFSIZ, "%s/" DPID_PATH, home);