[patch] cygwin-apps/run 1.0.3

Index: ChangeLog
===================================================================
RCS file: /cvs/cygwin-apps/run/ChangeLog,v
retrieving revision 1.25
diff -u -p -r1.25 ChangeLog
--- ChangeLog	24 Jul 2013 22:24:19 -0000	1.25
+++ ChangeLog	30 Nov 2013 21:19:35 -0000
@@ -1,3 +1,8 @@
+2013-11-30  Max Polk  <[email protected]>
+
+	* src/run.c: account for NULL argv list terminator.  Surround
+	arguments with double quotes in case of space in original arg.
+
 2013-07-24  Charles Wilson  <[email protected]>

 	Release 1.3.0. Massive refactoring.
Index: src/run.c
===================================================================
RCS file: /cvs/cygwin-apps/run/src/run.c,v
retrieving revision 1.17
diff -u -p -r1.17 run.c
--- src/run.c	24 Jul 2013 22:10:53 -0000	1.17
+++ src/run.c	30 Nov 2013 21:19:35 -0000
@@ -252,7 +252,8 @@ realMain(int argc, char* argv[])
       newargv = run2_dupargv (argv);
       /* discard newargv[0] and shift up */
       free (newargv[0]);
-      for (newargc = 1; newargc < argc; newargc++)
+      /* Account for NULL array terminator */
+      for (newargc = 1; newargc <= argc; newargc++)
          newargv[newargc-1] = newargv[newargc];
       newargc = argc - 1;

@@ -576,7 +577,7 @@ build_cmdline(char* new_cmdline, char* e

    char_cnt = strlen(exec);
    for (i = 1; i < argc; i++)
-      char_cnt += strlen(argv[i]);
+     char_cnt += strlen(argv[i]) + 2;  /* add two for quotes */
    if (char_cnt > MAX_ARGS*MAX_PATH) /* then we ran out of room */
       run2_error(EXIT_FAILURE, 0, "command line too long -\n%s",new_cmdline);

@@ -584,7 +585,10 @@ build_cmdline(char* new_cmdline, char* e
    for (i = 1; i < argc; i++)
    {
       strcat(new_cmdline," ");
+      /* Place each argument in quotes */
+      strcat(new_cmdline,"\"");
       strcat(new_cmdline,argv[i]);
+      strcat(new_cmdline,"\"");
    }
 }