From 67a85221d5bac4b363d3f8d0263a9b8848ba0adb Mon Sep 17 00:00:00 2001
From: Adam Ierymenko <adam.ierymenko@zerotier.com>
Date: Tue, 25 Mar 2014 17:31:03 -0700
Subject: WINDOWS IS SUFFERING

---
 main.cpp | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

(limited to 'main.cpp')

diff --git a/main.cpp b/main.cpp
index 647baa36..73567445 100644
--- a/main.cpp
+++ b/main.cpp
@@ -98,7 +98,7 @@ static void printHelp(const char *cn,FILE *out)
 	fprintf(out,"  -d                - Fork and run as daemon (Unix-ish OSes)"ZT_EOL_S);
 #endif
 	fprintf(out,"  -q                - Send a query to a running service (zerotier-cli)"ZT_EOL_S);
-	fprintf(out,"  -i                - Run idtool command (zerotier-idtool)"ZT_EOL_S);
+	fprintf(out,"  -i                - Generate and manage identities (zerotier-idtool)"ZT_EOL_S);
 #ifdef __WINDOWS__
 	fprintf(out,"  -C                - Run from command line instead of as service (Windows)"ZT_EOL_S);
 	fprintf(out,"  -I                - Install Windows service (Windows)"ZT_EOL_S);
@@ -139,7 +139,7 @@ static int main(int argc,char **argv)
 	for(int i=1;i<argc;++i) {
 		if (argv[i][0] == '-') {
 			switch(argv[i][1]) {
-				case 'i': // ignore -i since it's used to invoke this
+				case 'q': // ignore -q since it's used to invoke this
 					break;
 				case 'h':
 				default:
@@ -152,6 +152,10 @@ static int main(int argc,char **argv)
 			query.append(argv[i]);
 		}
 	}
+	if (!query.length()) {
+		printHelp(stdout,argv[0]);
+		return 1;
+	}
 
 	try {
 		volatile bool done = false;
-- 
cgit v1.2.3