From 36bf81830c116600c1ee9f8c0fc8423f6e642a89 Mon Sep 17 00:00:00 2001
From: okan
Date: Tue, 18 Dec 2012 00:14:41 +0000
Subject: simplify config file setup; with Tiago Cunha

---
 calmwm.c | 23 +++++++++++++++++++----
 calmwm.h |  3 +--
 conf.c   | 33 +++------------------------------
 3 files changed, 23 insertions(+), 36 deletions(-)

diff --git a/calmwm.c b/calmwm.c
index 18da2a7..8452f46 100644
--- a/calmwm.c
+++ b/calmwm.c
@@ -15,7 +15,7 @@
  * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  *
- * $OpenBSD: calmwm.c,v 1.71 2012/12/17 23:03:41 okan Exp $
+ * $OpenBSD: calmwm.c,v 1.72 2012/12/18 00:14:41 okan Exp $
  */
 
 #include <sys/param.h>
@@ -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();
diff --git a/calmwm.h b/calmwm.h
index d9f5f29..d9b0231 100644
--- a/calmwm.h
+++ b/calmwm.h
@@ -15,7 +15,7 @@
  * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  *
- * $OpenBSD: calmwm.h,v 1.173 2012/12/17 23:54:57 okan Exp $
+ * $OpenBSD: calmwm.h,v 1.174 2012/12/18 00:14:41 okan Exp $
  */
 
 #ifndef _CALMWM_H_
@@ -448,7 +448,6 @@ void			 conf_grab(struct conf *, struct keybinding *);
 void			 conf_grab_mouse(struct client_ctx *);
 void			 conf_init(struct conf *);
 void			 conf_mousebind(struct conf *, char *, char *);
-void			 conf_setup(struct conf *, const char *);
 void			 conf_ungrab(struct conf *, struct keybinding *);
 
 int			 font_ascent(struct screen_ctx *);
diff --git a/conf.c b/conf.c
index a06a3e7..dd705e0 100644
--- a/conf.c
+++ b/conf.c
@@ -15,7 +15,7 @@
  * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  *
- * $OpenBSD: conf.c,v 1.114 2012/12/17 23:54:57 okan Exp $
+ * $OpenBSD: conf.c,v 1.115 2012/12/18 00:14:41 okan Exp $
  */
 
 #include <sys/param.h>
@@ -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)
 {
-- 
cgit v1.2.3-2-gb3c3