From: Guus Sliepen <guus@tinc-vpn.org>
Date: Sat, 23 Apr 2016 19:32:42 +0000 (+0200)
Subject: Fix starting tinc as a service on Windows.
X-Git-Tag: release-1.1pre12~2
X-Git-Url: https://tinc-vpn.org/git/browse?p=tinc;a=commitdiff_plain;h=83fa44ce42c67837dad30ba1538bf1fa8c49a47d

Fix starting tinc as a service on Windows.

Don't assume tincd.exe is in the working directory, especially now that
chdir() is called very early. We use GetModuleFileName() instead.
---

diff --git a/src/process.c b/src/process.c
index 5d78c295..5bb7eb3d 100644
--- a/src/process.c
+++ b/src/process.c
@@ -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));