awesomewm-mirrors
/
awesome
mirror of https://github.com/awesomeWM/awesome.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Add support for ~ in include() from awesome

This commit is contained in:
Julien Danjou 2008-03-09 20:01:32 +01:00
parent 2fd1f0db66
commit a9d7a08c2e
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
common/configopts.c
View File

@ -43,6 +43,7 @@ static int
cfg_awesome_include(cfg_t *cfg, cfg_opt_t *opt, cfg_awesome_include(cfg_t *cfg, cfg_opt_t *opt,
int argc, const char **argv) int argc, const char **argv)
{ {
char *filename;
FILE *fp; FILE *fp;
if(argc != 1 || !a_strlen(argv[0])) if(argc != 1 || !a_strlen(argv[0]))
@ -51,12 +52,16 @@ cfg_awesome_include(cfg_t *cfg, cfg_opt_t *opt,
return 0; return 0;
} }
if(!(fp = fopen(argv[0], "r"))) filename = cfg_tilde_expand(argv[0]);
if(!(fp = fopen(filename, "r")))
{ {
cfg_error(cfg, "cannot include configuration file %s: %s", argv[0], strerror(errno)); cfg_error(cfg, "cannot include configuration file %s: %s",
filename, strerror(errno));
return 0; return 0;
} }
p_delete(&filename);
fclose(fp); fclose(fp);
return cfg_include(cfg, opt, argc, argv); return cfg_include(cfg, opt, argc, argv);