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

diff --git a/src/tincctl.c b/src/tincctl.c
index 799da0aa..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},
@@ -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;
@@ -1629,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...
@@ -1666,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 = {
@@ -2439,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;
@@ -2469,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);