Make usage of -t<timeout> option consistent for C and Python client

RonIovine · Jul 5, 2019 · c64a1fe · c64a1fe
1 parent 3f97766
commit c64a1fe
Show file tree

Hide file tree

Showing 4 changed files with 23 additions and 23 deletions.
diff --git a/README b/README
@@ -333,8 +333,8 @@ wrapper.
 The usage of the "pshell" and "pshell.exp" (see NOTE) command line client
 programs are as follows:
 
-Usage: pshell -n | -l |  [-t<timeout>] {{{<hostName | ipAddr>} {<portNum> | <udpServerName>}} | <unixServerName> | <serverIndex}
-                                       [{{-c <command> | -f <filename>} [rate=<seconds>] [repeat=<count>] [clear]}]
+Usage: pshell -n | -l | {{{<hostName | ipAddr>} {<portNum> | <udpServerName>}} | <unixServerName> | <serverIndex} [-t<timeout>]
+                        [{{-c <command> | -f <filename>} [rate=<seconds>] [repeat=<count>] [clear]}]
 
   where:
 

diff --git a/README.md b/README.md
@@ -236,8 +236,8 @@ a `-h` to show the usage as follows:
 ```
 $ pshell -h
 
-Usage: pshell -n | -l |  [-t<timeout>] {{{<hostName | ipAddr>} {<portNum> | <udpServerName>}} | <unixServerName> | <serverIndex}
-                                       [{{-c <command> | -f <filename>} [rate=<seconds>] [repeat=<count>] [clear]}]
+Usage: pshell -n | -l | {{{<hostName | ipAddr>} {<portNum> | <udpServerName>}} | <unixServerName> | <serverIndex} [-t<timeout>]
+                        [{{-c <command> | -f <filename>} [rate=<seconds>] [repeat=<count>] [clear]}]
 
   where:
 

diff --git a/c/bin/pshell b/c/bin/pshell
diff --git a/c/src/PshellClient.cc b/c/src/PshellClient.cc
@@ -1461,8 +1461,8 @@ void showCommands(void)
 void showUsage(void)
 {
   printf("\n");
-  printf("Usage: pshell -n | -l |  [-t<timeout>] {{{<hostName | ipAddr>} {<portNum> | <udpServerName>}} | <unixServerName> | <serverIndex}\n");
-  printf("                                       [{{-c <command> | -f <filename>} [rate=<seconds>] [repeat=<count>] [clear]}]\n");
+  printf("Usage: pshell -n | -l | {{{<hostName | ipAddr>} {<portNum> | <udpServerName>}} | <unixServerName> | <serverIndex} [-t<timeout>]\n");
+  printf("                        [{{-c <command> | -f <filename>} [rate=<seconds>] [repeat=<count>] [clear]}]\n");
   printf("\n");
   printf("  where:\n");
   printf("\n");
@@ -1539,23 +1539,6 @@ void parseCommandLine(int *argc, char *argv[])
   }
   else if (*argc < 8)
   {
-    if (strstr(argv[0], "-t") == argv[0])
-    {
-      if ((strlen(argv[0]) > 2) && (isNumeric(&argv[0][2])))
-      {
-        _serverResponseTimeout = atoi(&argv[0][2]);
-        _serverResponseTimeoutOverride = true;
-      }
-      else
-      {
-        printf("PSHELL_ERROR: Must provide value for timeout, e.g. -t20\n");
-      }
-      for (i = 0; i < (*argc-1); i++)
-      {
-        argv[i] = argv[i+1];
-      }
-      (*argc)--;
-    }
     if ((_server = getActiveServer(argv[0])) == NULL)
     {
       if (isNumeric(argv[1]))
@@ -1596,6 +1579,23 @@ void parseCommandLine(int *argc, char *argv[])
       }
       (*argc)--;
     }
+    if (strstr(argv[0], "-t") == argv[0])
+    {
+      if ((strlen(argv[0]) > 2) && (isNumeric(&argv[0][2])))
+      {
+        _serverResponseTimeout = atoi(&argv[0][2]);
+        _serverResponseTimeoutOverride = true;
+      }
+      else
+      {
+        printf("PSHELL_ERROR: Must provide value for timeout, e.g. -t20\n");
+      }
+      for (i = 0; i < (*argc-1); i++)
+      {
+        argv[i] = argv[i+1];
+      }
+      (*argc)--;
+    }
   }
   else
   {