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

31
conf.c
View File

@@ -166,7 +166,8 @@ conf_init(struct conf *c)
{
int i;
c->flags = 0;
bzero(c, sizeof(*c));
c->bwidth = CONF_BWIDTH;
c->mamount = CONF_MAMOUNT;
c->snapdist = CONF_SNAPDIST;
@@ -242,34 +243,6 @@ conf_clear(struct conf *c)
free(c->font);
}
void
conf_setup(struct conf *c, const char *conf_file)
{
char conf_path[MAXPATHLEN];
struct stat sb;
int parse = 0;
conf_init(c);
if (conf_file == NULL) {
(void)snprintf(conf_path, sizeof(conf_path), "%s/%s",
homedir, CONFFILE);
if (stat(conf_path, &sb) == 0 && (sb.st_mode & S_IFREG))
parse = 1;
} else {
if (stat(conf_file, &sb) == -1 || !(sb.st_mode & S_IFREG))
errx(1, "%s: %s", conf_file, strerror(errno));
else {
(void)strlcpy(conf_path, conf_file, sizeof(conf_path));
parse = 1;
}
}
if (parse && (parse_config(conf_path, c) == -1))
warnx("config file %s has errors, not loading", conf_path);
}
void
conf_client(struct client_ctx *cc)
{