Yesterday's fix makes argcv_get include trailing

whitespace to the argv array. To fix:
  (argcv_scan): Return len+1 if called on or after
  the terminating null character.
  (argcv_get): Initialize *argc to zero and continue scanning
  until argcv_scan return is  > len. Thanks Sam for noticing.

@@ -19,8 +19,6 @@
 
 
 #include "argcv.h"
 #include "argcv.h"
 
 
-char srtime[] = __TIME__;
-
 /*
 /*
  * takes a string and splits it into several strings, breaking at ' '
  * takes a string and splits it into several strings, breaking at ' '
  * command is the string to split
  * command is the string to split
@@ -43,7 +41,7 @@ argcv_scan (int len, const char *command, const char *delim, const char* cmnt,
       i = *save;
       i = *save;
 
 
       if (i >= len)
       if (i >= len)
-	return i;
+	return i + 1;
 
 
       /* Skip initial whitespace */
       /* Skip initial whitespace */
       while (i < len && isws (command[i]))
       while (i < len && isws (command[i]))
@@ -102,10 +100,10 @@ argcv_get (const char *command, const char *delim, const char* cmnt,
   *argv = NULL;
   *argv = NULL;
 
 
   /* Count number of arguments */
   /* Count number of arguments */
-  *argc = 1;
+  *argc = 0;
   save = 0;
   save = 0;
 
 
-  while (argcv_scan (len, command, delim, cmnt, &start, &end, &save) < len)
+  while (argcv_scan (len, command, delim, cmnt, &start, &end, &save) <= len)
       (*argc)++;
       (*argc)++;
 
 
   *argv = calloc ((*argc + 1), sizeof (char *));
   *argv = calloc ((*argc + 1), sizeof (char *));
@@ -198,14 +196,14 @@ argcv_string (int argc, char **argv, char **pstring)
 }
 }
 
 
 #if 0
 #if 0
-char *command = "set prompt=\"& \"";
+char *command = "set prompt=\"& \" ";
 
 
-main()
+main(int xargc, char **xargv)
 {
 {
   int i, argc;
   int i, argc;
   char **argv;
   char **argv;
 
 
-  argcv_get (command, "=", NULL, &argc, &argv);
+  argcv_get (xargv[1] ? xargv[1]:command, "=", "#", &argc, &argv);
   printf ("%d args:\n", argc);
   printf ("%d args:\n", argc);
   for (i = 0; i < argc; i++)
   for (i = 0; i < argc; i++)
     printf ("%s\n", argv[i]);
     printf ("%s\n", argv[i]);