X-Git-Url: https://tinc-vpn.org/git/browse?a=blobdiff_plain;f=src%2Ftincctl.c;h=f0515c925d3dc65ed37c0529bab237c5de4b265f;hb=a0f795ff5bd671ca10a7203e4234b37a12d8d1cd;hp=a7f6185f0716b93164763854b43f8c5c774cffae;hpb=2696ad2cca73aee13e38f740d5530dc33e4a92e6;p=tinc

diff --git a/src/tincctl.c b/src/tincctl.c
index a7f6185f..f0515c92 100644
--- a/src/tincctl.c
+++ b/src/tincctl.c
@@ -516,7 +516,7 @@ static bool remove_service(void) {
 }
 #endif
 
-int main(int argc, char *argv[], char *envp[]) {
+int main(int argc, char *argv[]) {
 	int fd;
 	int result;
 	char host[128];
@@ -568,9 +568,26 @@ int main(int argc, char *argv[], char *envp[]) {
 	}
 
 	if(!strcasecmp(argv[optind], "start")) {
-		argv[optind] = NULL;
-		execve(SBINDIR "/tincd", argv, envp);
-		fprintf(stderr, "Could not start tincd: %s", strerror(errno));
+		int i, j;
+		char *c;
+		char *slash = strrchr(argv[0], '/');
+#ifdef HAVE_MINGW
+		if ((c = strrchr(argv[0], '\\')) > slash)
+			slash = c;
+#endif
+		if (slash++) {
+			c = xmalloc((slash - argv[0]) + sizeof("tincd"));
+			sprintf(c, "%.*stincd", slash - argv[0], argv[0]);
+		}
+		else
+			c = "tincd";
+		argv[0] = c;
+		for(i = j = 1; argv[i]; ++i)
+			if (i != optind && strcmp(argv[i], "--") != 0)
+				argv[j++] = argv[i];
+		argv[j] = NULL;
+		execvp(c, argv);
+		fprintf(stderr, "Could not start %s: %s\n", c, strerror(errno));
 		return 1;
 	}