X-Git-Url: https://tinc-vpn.org/git/browse?a=blobdiff_plain;f=src%2Ftincctl.c;h=e022cdd5ece4c4fa1fc232b39cc4e76496aa12f6;hb=9e2ae03d1dc3b0d9a32a748320b9ed1565fa1374;hp=ea96fa1740d6ba2e0f7940cacbdb090c4805c86a;hpb=1d226977a43cc6c3e4ff32e1a41a06dde08356e0;p=tinc

diff --git a/src/tincctl.c b/src/tincctl.c
index ea96fa17..e022cdd5 100644
--- a/src/tincctl.c
+++ b/src/tincctl.c
@@ -112,11 +112,10 @@ static void usage(bool status) {
 				"\n"
 				"Valid commands are:\n"
 				"  init [name]                Create initial configuration files.\n"
-				"  config                     Change configuration:\n"
-				"    [get] VARIABLE           - print current value of VARIABLE\n"
-				"    [set] VARIABLE VALUE     - set VARIABLE to VALUE\n"
-				"    add VARIABLE VALUE       - add VARIABLE with the given VALUE\n"
-				"    del VARIABLE [VALUE]     - remove VARIABLE [only ones with watching VALUE]\n"
+				"  get VARIABLE               Print current value of VARIABLE\n"
+				"  set VARIABLE VALUE         Set VARIABLE to VALUE\n"
+				"  add VARIABLE VALUE         Add VARIABLE with the given VALUE\n"
+				"  del VARIABLE [VALUE]       Remove VARIABLE [only ones with watching VALUE]\n"
 				"  start [tincd options]      Start tincd.\n"
 				"  stop                       Stop tincd.\n"
 				"  restart                    Restart tincd.\n"
@@ -1148,7 +1147,7 @@ static int cmd_top(int argc, char *argv[]) {
 	top(fd);
 	return 0;
 #else
-	fprintf(stderr, "This version of tincctl was compiled without support for the curses library.\n");
+	fprintf(stderr, "This version of tinc was compiled without support for the curses library.\n");
 	return 1;
 #endif
 }
@@ -1311,6 +1310,9 @@ static int cmd_config(int argc, char *argv[]) {
 		return 1;
 	}
 
+	if(strcasecmp(argv[0], "config"))
+		argv--, argc++;
+
 	int action = -2;
 	if(!strcasecmp(argv[1], "get")) {
 		argv++, argc--;
@@ -1972,6 +1974,7 @@ static int cmd_exchange_all(int argc, char *argv[]) {
 static const struct {
 	const char *command;
 	int (*function)(int argc, char *argv[]);
+	bool hidden;
 } commands[] = {
 	{"start", cmd_start},
 	{"stop", cmd_stop},
@@ -1987,7 +1990,11 @@ static const struct {
 	{"pcap", cmd_pcap},
 	{"log", cmd_log},
 	{"pid", cmd_pid},
-	{"config", cmd_config},
+	{"config", cmd_config, true},
+	{"add", cmd_config},
+	{"del", cmd_config},
+	{"get", cmd_config},
+	{"set", cmd_config},
 	{"init", cmd_init},
 	{"generate-keys", cmd_generate_keys},
 	{"generate-rsa-keys", cmd_generate_rsa_keys},
@@ -2014,7 +2021,7 @@ static char *complete_command(const char *text, int state) {
 		i++;
 
 	while(commands[i].command) {
-		if(!strncasecmp(commands[i].command, text, strlen(text)))
+		if(!commands[i].hidden && !strncasecmp(commands[i].command, text, strlen(text)))
 			return xstrdup(commands[i].command);
 		i++;
 	}
@@ -2041,42 +2048,24 @@ static char *complete_dump(const char *text, int state) {
 }
 
 static char *complete_config(const char *text, int state) {
-	const char *sub[] = {"get", "set", "add", "del"};
 	static int i;
-	if(!state) {
+
+	if(!state)
 		i = 0;
-		if(!strchr(rl_line_buffer + 7, ' '))
-			i = -4;
-		else {
-			bool found = false;
-			for(int i = 0; i < 4; i++) {
-				if(!strncasecmp(rl_line_buffer + 7, sub[i], strlen(sub[i])) && rl_line_buffer[7 + strlen(sub[i])] == ' ') {
-					found = true;
-					break;
-				}
-			}
-			if(!found)
-				return NULL;
-		}
-	} else {
+	else
 		i++;
-	}
 
-	while(i < 0 || variables[i].name) {
-		if(i < 0 && !strncasecmp(sub[i + 4], text, strlen(text)))
-			return xstrdup(sub[i + 4]);
-		if(i >= 0) {
-			char *dot = strchr(text, '.');
-			if(dot) {
-				if((variables[i].type & VAR_HOST) && !strncasecmp(variables[i].name, dot + 1, strlen(dot + 1))) {
-					char *match;
-					xasprintf(&match, "%.*s.%s", dot - text, text, variables[i].name);
-					return match;
-				}
-			} else {
-				if(!strncasecmp(variables[i].name, text, strlen(text)))
-					return xstrdup(variables[i].name);
+	while(variables[i].name) {
+		char *dot = strchr(text, '.');
+		if(dot) {
+			if((variables[i].type & VAR_HOST) && !strncasecmp(variables[i].name, dot + 1, strlen(dot + 1))) {
+				char *match;
+				xasprintf(&match, "%.*s.%s", dot - text, text, variables[i].name);
+				return match;
 			}
+		} else {
+			if(!strncasecmp(variables[i].name, text, strlen(text)))
+				return xstrdup(variables[i].name);
 		}
 		i++;
 	}
@@ -2129,7 +2118,13 @@ static char **completion (const char *text, int start, int end) {
 		matches = rl_completion_matches(text, complete_command);
 	else if(!strncasecmp(rl_line_buffer, "dump ", 5))
 		matches = rl_completion_matches(text, complete_dump);
-	else if(!strncasecmp(rl_line_buffer, "config ", 7))
+	else if(!strncasecmp(rl_line_buffer, "add ", 4))
+		matches = rl_completion_matches(text, complete_config);
+	else if(!strncasecmp(rl_line_buffer, "del ", 4))
+		matches = rl_completion_matches(text, complete_config);
+	else if(!strncasecmp(rl_line_buffer, "get ", 4))
+		matches = rl_completion_matches(text, complete_config);
+	else if(!strncasecmp(rl_line_buffer, "set ", 4))
 		matches = rl_completion_matches(text, complete_config);
 	else if(!strncasecmp(rl_line_buffer, "info ", 5))
 		matches = rl_completion_matches(text, complete_info);