commit a46e719ecbf8d89d75a07fca6f090871555ba660
author Josh Gao <jmgao@google.com> Tue Jul 31 15:36:03 2018 -0700
committer Josh Gao <jmgao@google.com> Tue Jul 31 15:57:52 2018 -0700
tree 0f7e0eddc8b8eff5ef3f174f5547c1ce3c831db9
parent 15975fe7307f271a91d50631a9f1d957445e825e

adb: fix error message for `adb {forward,reverse}`

Test: `adb reverse`
Change-Id: I6fa078ea7a0e019df5c6309df99ffdf2a3219194

adb/client/commandline.cpp

diff --git a/adb/client/commandline.cpp b/adb/client/commandline.cpp
index a7a94e7..3fb14f3 100644
--- a/adb/client/commandline.cpp
+++ b/adb/client/commandline.cpp
@@ -1614,9 +1614,9 @@
         return bugreport.DoIt(argc, argv);
     } else if (!strcmp(argv[0], "forward") || !strcmp(argv[0], "reverse")) {
         bool reverse = !strcmp(argv[0], "reverse");
-        ++argv;
         --argc;
         if (argc < 1) return syntax_error("%s requires an argument", argv[0]);
+        ++argv;
 
         // Determine the <host-prefix> for this command.
         std::string host_prefix;