Replace MinGW with Windows to avoid ambiguities

[tinc] / src / names.c

diff --git a/src/names.c b/src/names.c
index 6db364e..fa3574b 100644 (file)
--- a/src/names.c
+++ b/src/names.c
@@ -1,7 +1,7 @@
 /*
     names.c -- generate commonly used (file)names
     Copyright (C) 1998-2005 Ivo Timmermans
-                  2000-2017 Guus Sliepen <guus@tinc-vpn.org>
+                  2000-2018 Guus Sliepen <guus@tinc-vpn.org>
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -39,7 +39,7 @@ char *program_name = NULL;
   Set all files and paths according to netname
 */
 void make_names(bool daemon) {
-#ifdef HAVE_MINGW
+#ifdef HAVE_WINDOWS
        HKEY key;
        char installdir[1024] = "";
        DWORD len = sizeof(installdir);
@@ -50,13 +50,15 @@ void make_names(bool daemon) {
                logger(DEBUG_ALWAYS, LOG_INFO, "Both netname and configuration directory given, using the latter...");
        }
 
+       free(identname);
+
        if(netname) {
                xasprintf(&identname, "tinc.%s", netname);
        } else {
                identname = xstrdup("tinc");
        }
 
-#ifdef HAVE_MINGW
+#ifdef HAVE_WINDOWS
 
        if(!RegOpenKeyEx(HKEY_LOCAL_MACHINE, "SOFTWARE\\tinc", 0, KEY_READ, &key)) {
                if(!RegQueryValueEx(key, NULL, 0, 0, (LPBYTE)installdir, &len)) {
@@ -92,7 +94,8 @@ void make_names(bool daemon) {
                }
        }
 
-#ifdef HAVE_MINGW
+#ifdef HAVE_WINDOWS
+       (void)daemon;
 
        if(!logfilename) {
                xasprintf(&logfilename, "%s" SLASH "log", confbase);
@@ -147,7 +150,7 @@ void make_names(bool daemon) {
 #endif
 
        if(!unixsocketname) {
-               int len = strlen(pidfilename);
+               size_t len = strlen(pidfilename);
                unixsocketname = xmalloc(len + 8);
                memcpy(unixsocketname, pidfilename, len);