mirror/cwm
1
0
Fork 0
mirror of https://github.com/leahneukirchen/cwm.git synced 2023-08-10 21:13:12 +03:00
Code Issues Projects Releases Wiki Activity

simplify config file setup; with Tiago Cunha

Browse Source
This commit is contained in:
okan
2012-12-18 00:14:41 +00:00
parent 479e9f769c
commit b848a2b236
3 changed files with 20 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
calmwm.c
View File

@ -62,7 +62,7 @@ int
main(int argc, char **argv)
{
const char *conf_file = NULL;
char *display_name = NULL;
char *conf_path, *display_name = NULL;
int ch;
struct passwd *pw;
@ -97,10 +97,25 @@ main(int argc, char **argv)
homedir = "/";
}
if (conf_file == NULL)
xasprintf(&conf_path, "%s/%s", homedir, CONFFILE);
else
conf_path = xstrdup(conf_file);
if (access(conf_path, R_OK) != 0) {
if (conf_file != NULL)
warn("%s", conf_file);
free(conf_path);
conf_path = NULL;
}
dpy_init(display_name);
bzero(&Conf, sizeof(Conf));
conf_setup(&Conf, conf_file);
conf_init(&Conf);
if (conf_path && (parse_config(conf_path, &Conf) == -1))
warnx("config file %s has errors, not loading", conf_path);
free(conf_path);
xu_getatoms();
x_setup();
xev_loop();