simplify config file setup; with Tiago Cunha

1 files changed, 19 insertions, 4 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();