Ignore trailing whitespace and terminate output array with a NULL entry.

@@ -52,10 +52,10 @@ argcv_scan (int len, const char *command, const char *delim,
       if (isdelim (command [i], delim))
       if (isdelim (command [i], delim))
 	break;
 	break;
       /* Skip until next whitespace character or end of line */
       /* Skip until next whitespace character or end of line */
-      while (++i < len && !(isws (command [i]) || isdelim (command [i], delim)))
+      while (++i < len &&
+	     !(isws (command [i]) || isdelim (command [i], delim)))
 	;
 	;
-      if (i < len)
-	i--;
+      i--;
       break;
       break;
     }
     }
 
 
@@ -68,11 +68,14 @@ int
 argcv_get (const char *command, const char *delim, int *argc, char ***argv)
 argcv_get (const char *command, const char *delim, int *argc, char ***argv)
 {
 {
   int len = strlen (command);
   int len = strlen (command);
-  int i = 0, j = 0;
+  int i = 0;
   int start, end, save;
   int start, end, save;
 
 
   *argc = 0;
   *argc = 0;
   *argv = NULL;
   *argv = NULL;
+
+  while (len > 0 && isspace (command[len-1]))
+    len--;
   if (len < 1)
   if (len < 1)
     return 1;
     return 1;
 
 
@@ -86,7 +89,7 @@ argcv_get (const char *command, const char *delim, int *argc, char ***argv)
 
 
   i = 0;
   i = 0;
   save = 0;
   save = 0;
-  do
+  for (i = 0; i < *argc; i++)
     {
     {
       int n;
       int n;
       argcv_scan (len, command, delim, &start, &end, &save);
       argcv_scan (len, command, delim, &start, &end, &save);
@@ -107,9 +110,8 @@ argcv_get (const char *command, const char *delim, int *argc, char ***argv)
 	return 1;
 	return 1;
       memcpy ((*argv)[i], &command[start], n);
       memcpy ((*argv)[i], &command[start], n);
       (*argv)[i][n] = 0;
       (*argv)[i][n] = 0;
-      i++;
     }
     }
-  while (end < len);
+  (*argv)[i] = NULL;
   return 0;
   return 0;
 }
 }