Remove "release-" from displayed git version.

[tinc] / src / names.c

diff --git a/src/names.c b/src/names.c
index a631ad9..8218216 100644 (file)
--- a/src/names.c
+++ b/src/names.c
@@ -26,6 +26,7 @@
 char *netname = NULL;
 char *confdir = NULL;           /* base configuration directory */
 char *confbase = NULL;          /* base configuration directory for this instance of tinc */
+bool confbase_given;
 char *identname = NULL;         /* program name for syslog */
 char *unixsocketname = NULL;    /* UNIX socket location */
 char *logfilename = NULL;       /* log file location */
@@ -41,6 +42,7 @@ void make_names(void) {
        char installdir[1024] = "";
        DWORD len = sizeof installdir;
 #endif
+       confbase_given = confbase;
 
        if(netname && confbase)
                logger(DEBUG_ALWAYS, LOG_INFO, "Both netname and configuration directory given, using the latter...");
@@ -62,8 +64,6 @@ void make_names(void) {
                                else
                                        xasprintf(&confbase, "%s", installdir);
                        }
-                       if(!pidfilename)
-                               xasprintf(&pidfilename, "%s" SLASH "pid", confbase);
                }
                RegCloseKey(key);
        }
@@ -71,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);
@@ -86,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) {