From 61c904ebfaae89c07108fed66c3bc0fbb7dad4fe Mon Sep 17 00:00:00 2001
From: okan
Date: Wed, 31 Oct 2012 22:06:24 +0000
Subject: no longer a reason to carry conf_path in struct conf, so dice.

---
 conf.c | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

(limited to 'conf.c')

diff --git a/conf.c b/conf.c
index 61dfe07..bef35b9 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.101 2012/10/31 19:30:19 okan Exp $
+ * $OpenBSD: conf.c,v 1.102 2012/10/31 22:06:24 okan Exp $
  */
 
 #include <sys/param.h>
@@ -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
-- 
cgit v1.2.3-2-gb3c3