X-Git-Url: https://tinc-vpn.org/git/browse?a=blobdiff_plain;f=src%2Ftincctl.c;h=158dfed89acd3201d0b1d2084565500ffa3a0b2e;hb=511b51ffe60c20a9091829c03863197b76027716;hp=6227750ce73ed2c9b9139bfd69115a953a283170;hpb=e024b7a2c50e23311834e6d180e5acc72783b339;p=tinc

diff --git a/src/tincctl.c b/src/tincctl.c
index 6227750c..158dfed8 100644
--- a/src/tincctl.c
+++ b/src/tincctl.c
@@ -75,6 +75,7 @@ char *scriptextension = "";
 static char *prompt;
 
 static struct option const long_options[] = {
+	{"batch", no_argument, NULL, 'b'},
 	{"config", required_argument, NULL, 'c'},
 	{"net", required_argument, NULL, 'n'},
 	{"help", no_argument, NULL, 1},
@@ -86,7 +87,7 @@ static struct option const long_options[] = {
 
 static void version(void) {
 	printf("%s version %s (built %s %s, protocol %d.%d)\n", PACKAGE,
-		   BUILD_VERSION, BUILD_DATE, BUILD_TIME, PROT_MAJOR, PROT_MINOR);
+		   VERSION, BUILD_DATE, BUILD_TIME, PROT_MAJOR, PROT_MINOR);
 	printf("Copyright (C) 1998-2012 Ivo Timmermans, Guus Sliepen and others.\n"
 			"See the AUTHORS file for a complete list.\n\n"
 			"tinc comes with ABSOLUTELY NO WARRANTY.  This is free software,\n"
@@ -100,6 +101,7 @@ static void usage(bool status) {
 	} else {
 		printf("Usage: %s [options] command\n\n", program_name);
 		printf("Valid options are:\n"
+				"  -b, --batch             Don't ask for anything (non-interactive mode).\n"
 				"  -c, --config=DIR        Read configuration options from DIR.\n"
 				"  -n, --net=NETNAME       Connect to net NETNAME.\n"
 				"      --pidfile=FILENAME  Read control cookie from FILENAME.\n"
@@ -158,6 +160,10 @@ static bool parse_options(int argc, char **argv) {
 			case 0:   /* long option */
 				break;
 
+			case 'b':
+				tty = false;
+				break;
+
 			case 'c': /* config file */
 				confbase = xstrdup(optarg);
 				confbasegiven = true;
@@ -810,16 +816,31 @@ static int cmd_start(int argc, char *argv[]) {
 	int nargc = 0;
 	char **nargv = xzalloc((optind + argc) * sizeof *nargv);
 
-	nargv[nargc++] = c;
+	char *arg0 = c;
+#ifdef HAVE_MINGW
+	/*
+	   Windows has no real concept of an "argv array". A command line is just one string.
+	   The CRT of the new process will decode the command line string to generate argv before calling main(), and (by convention)
+	   it uses quotes to handle spaces in arguments.
+	   Therefore we need to quote all arguments that might contain spaces. No, execvp() won't do that for us (see MSDN).
+	   If we don't do that, then execvp() will run fine but any spaces in the filename contained in arg0 will bleed
+	   into the next arguments when the spawned process' CRT parses its command line, resulting in chaos.
+	*/
+	xasprintf(&arg0, "\"%s\"", arg0);
+#endif
+	nargv[nargc++] = arg0;
 	for(int i = 1; i < optind; i++)
 		nargv[nargc++] = orig_argv[i];
 	for(int i = 1; i < argc; i++)
 		nargv[nargc++] = argv[i];
 
 #ifdef HAVE_MINGW
-	execvp(c, nargv);
-	fprintf(stderr, "Error starting %s: %s\n", c, strerror(errno));
-	return 1;
+	int status = spawnvp(_P_WAIT, c, nargv);
+	if (status == -1) {
+		fprintf(stderr, "Error starting %s: %s\n", c, strerror(errno));
+		return 1;
+	}
+	return status;
 #else
 	pid_t pid = fork();
 	if(pid == -1) {
@@ -1614,9 +1635,12 @@ static int cmd_config(int argc, char *argv[]) {
 	}
 
 	if(action < -1) {
-		if(!found)
+		if(found) {
+			return 0;
+		} else {
 			fprintf(stderr, "No matching configuration variables found.\n");
-		return 1;
+			return 1;
+		}
 	}
 
 	// Make sure we wrote everything...
@@ -1651,18 +1675,6 @@ static int cmd_config(int argc, char *argv[]) {
 	return 0;
 }
 
-bool check_id(const char *name) {
-	if(!name || !*name)
-		return false;
-
-	for(int i = 0; i < strlen(name); i++) {
-		if(!isalnum(name[i]) && name[i] != '_')
-			return false;
-	}
-
-	return true;
-}
-
 static bool try_bind(int port) {
 	struct addrinfo *ai = NULL;
 	struct addrinfo hint = {
@@ -2424,6 +2436,7 @@ int main(int argc, char *argv[]) {
 	program_name = argv[0];
 	orig_argv = argv;
 	orig_argc = argc;
+	tty = isatty(0) && isatty(1);
 
 	if(!parse_options(argc, argv))
 		return 1;
@@ -2454,8 +2467,6 @@ int main(int argc, char *argv[]) {
 	srand(time(NULL));
 	crypto_init();
 
-	tty = isatty(0) && isatty(1);
-
 	if(optind >= argc)
 		return cmd_shell(argc, argv);