Fix starting tinc as a service on Windows.
authorGuus Sliepen <guus@tinc-vpn.org>
Sat, 23 Apr 2016 19:32:42 +0000 (21:32 +0200)
committerGuus Sliepen <guus@tinc-vpn.org>
Sat, 23 Apr 2016 19:32:42 +0000 (21:32 +0200)
Don't assume tincd.exe is in the working directory, especially now that
chdir() is called very early. We use GetModuleFileName() instead.

src/process.c

index 5d78c29..5bb7eb3 100644 (file)
@@ -62,12 +62,9 @@ static bool install_service(void) {
                return false;
        }
 
-       if(!strchr(program_name, '\\')) {
-               GetCurrentDirectory(sizeof command - 1, command + 1);
-               strncat(command, "\\", sizeof command - strlen(command));
-       }
-
-       strncat(command, program_name, sizeof command - strlen(command));
+       HMODULE module = GetModuleHandle(NULL);
+       GetModuleFileName(module, command + 1, sizeof command - 1);
+       command[sizeof command - 1] = 0;
 
        strncat(command, "\"", sizeof command - strlen(command));