From: Guus Sliepen <guus@tinc-vpn.org>
Date: Sat, 27 Dec 2014 08:08:34 +0000 (+0100)
Subject: Better default paths for log and PID files on Windows.
X-Git-Tag: release-1.1pre11~2
X-Git-Url: http://tinc-vpn.org/git/browse?a=commitdiff_plain;h=26d3ee0dd9b770a857615752b5c5588be0354a16;hp=b78436ff1e9afd767c3da473d34b7553d8411b6a;p=tinc

Better default paths for log and PID files on Windows.
---

diff --git a/src/names.c b/src/names.c
index 37708f81..8218216e 100644
--- a/src/names.c
+++ b/src/names.c
@@ -64,8 +64,6 @@ void make_names(void) {
 				else
 					xasprintf(&confbase, "%s", installdir);
 			}
-			if(!pidfilename)
-				xasprintf(&pidfilename, "%s" SLASH "pid", confbase);
 		}
 		RegCloseKey(key);
 	}
@@ -73,11 +71,26 @@ void make_names(void) {
 	if(!confdir)
 		confdir = xstrdup(CONFDIR SLASH "tinc");
 
+	if(!confbase) {
+		if(netname)
+			xasprintf(&confbase, CONFDIR SLASH "tinc" SLASH "%s", netname);
+		else
+			xasprintf(&confbase, CONFDIR SLASH "tinc");
+	}
+
+#ifdef HAVE_MINGW
+	if(!logfilename)
+		xasprintf(&logfilename, "%s" SLASH "log", confbase);
+
+	if(!pidfilename)
+		xasprintf(&pidfilename, "%s" SLASH "pid", confbase);
+#else
 	if(!logfilename)
 		xasprintf(&logfilename, LOCALSTATEDIR SLASH "log" SLASH "%s.log", identname);
 
 	if(!pidfilename)
 		xasprintf(&pidfilename, LOCALSTATEDIR SLASH "run" SLASH "%s.pid", identname);
+#endif
 
 	if(!unixsocketname) {
 		int len = strlen(pidfilename);
@@ -88,13 +101,6 @@ void make_names(void) {
 		else
 			strcpy(unixsocketname + len, ".socket");
 	}
-
-	if(!confbase) {
-		if(netname)
-			xasprintf(&confbase, CONFDIR SLASH "tinc" SLASH "%s", netname);
-		else
-			xasprintf(&confbase, CONFDIR SLASH "tinc");
-	}
 }
 
 void free_names(void) {