diff options
| author | okan <okan> | 2012-10-31 22:06:24 +0000 |
|---|---|---|
| committer | okan <okan> | 2012-10-31 22:06:24 +0000 |
| commit | 620af2e52d71d3df86c5da594a3f70f3c263b344 (patch) | |
| tree | 051bd24f2ddb98f67681f34b1dbdfcbe2a8e352d | |
| parent | 4fb420514d73699acfc7ec1c35124cf7819a277f (diff) | |
| download | cwm-620af2e52d71d3df86c5da594a3f70f3c263b344.tar.gz cwm-620af2e52d71d3df86c5da594a3f70f3c263b344.tar.xz cwm-620af2e52d71d3df86c5da594a3f70f3c263b344.zip | |
no longer a reason to carry conf_path in struct conf, so dice.
| -rw-r--r-- | calmwm.h | 1 | ||||
| -rw-r--r-- | conf.c | 12 | ||||
| -rw-r--r-- | parse.y | 2 |
3 files changed, 6 insertions, 9 deletions
diff --git a/calmwm.h b/calmwm.h index 00d6442..5d96485 100644 --- a/calmwm.h +++ b/calmwm.h @@ -273,7 +273,6 @@ struct conf { struct keybinding_q keybindingq; struct autogroupwin_q autogroupq; struct winmatch_q ignoreq; - char conf_path[MAXPATHLEN]; struct cmd_q cmdq; struct mousebinding_q mousebindingq; #define CONF_STICKY_GROUPS 0x0001 diff --git a/conf.c b/conf.c index 0be8fb3..57e45a2 100644 --- a/conf.c +++ b/conf.c @@ -237,6 +237,7 @@ conf_clear(struct conf *c) void conf_setup(struct conf *c, const char *conf_file) { + char conf_path[MAXPATHLEN]; char *home; struct stat sb; int parse = 0; @@ -247,23 +248,22 @@ conf_setup(struct conf *c, const char *conf_file) if ((home = getenv("HOME")) == NULL) errx(1, "No HOME directory."); - (void)snprintf(c->conf_path, sizeof(c->conf_path), "%s/%s", + (void)snprintf(conf_path, sizeof(conf_path), "%s/%s", home, CONFFILE); - if (stat(c->conf_path, &sb) == 0 && (sb.st_mode & S_IFREG)) + 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(c->conf_path, conf_file, - sizeof(c->conf_path)); + (void)strlcpy(conf_path, conf_file, sizeof(conf_path)); parse = 1; } } - if (parse && (parse_config(c->conf_path, c) == -1)) - warnx("config file %s has errors, not loading", c->conf_path); + if (parse && (parse_config(conf_path, c) == -1)) + warnx("config file %s has errors, not loading", conf_path); } void diff --git a/parse.y b/parse.y index 1b1a249..c89c038 100644 --- a/parse.y +++ b/parse.y @@ -516,8 +516,6 @@ parse_config(const char *filename, struct conf *xconf) return (-1); } - (void)strlcpy(conf->conf_path, filename, sizeof(conf->conf_path)); - conf_init(conf); yyparse(); |