fix issue# 52 call incorrectly parsing arguments

when CALLing a batch file, the command line should not attempt to determine what are option characters when splitting into separate options
this may break some batch files that depend on FreeCOM bug of splitting argument1/opt1 into %1=argument1 %2=/opt1 instead of %1=argument1/op1 as done by other command shells.

Author: PerditionC

docs/cmt5.txt

@@ -26,6 +26,8 @@ i) /A and /B of the COPY command are local options, e.g.:
 ii) the /C option of FreeCom itself don't follow any common rule for
 	option, because anything right of it (except one optional argument
 	sign) is interpreted as an argument for this option.
+    Note: CALL command is similar, except it supports several optional
+        arguments then batch filename followed by its arguments
 
 
 === How an option is parsed
@@ -349,7 +351,7 @@ xmpl(char *line)
 == General reflections
 
 1) The callback mechanism allows a very flexible association between
-	a syntacical correct option to a semantic.
+	a syntactical correct option to a semantic.
 	However, if other semantics are needed, the optScan***() function
 	set should be improved rather than locally implemented into
 	the callback function.

lib/find.c

@@ -98,3 +98,37 @@ char *skip_word(char *p)
 char *skipdm(char *p)
 { return find(p, 0);
 }
+
+/*
+ * Find the next delimiter/non-delimiter within p
+ *  Honor quotes and leading option characters
+ */
+static char *find_batch(char *p, int delim)
+{ int ch, quote;
+
+  assert(p);
+
+  dprintf(("find_batch(%s, %i) -- ", p, delim));
+  quote = 0;
+  while((ch = *p++) != '\0' && (quote
+   || (delim && !(isargdelim(ch)))
+   || (!delim && isargdelim(ch))))
+   {
+    if(quote == ch)
+      quote = 0;
+    else if(strchr(QUOTE_STR, ch))
+      quote = ch;
+   }
+   
+  dprintf(("returning %s\n", (p-1)));
+  return p - 1;
+}
+
+
+char *skipnonoptdm(char *p)
+{ return find_batch(p, 0);
+}
+
+char *skipnonopt_word(char *p)
+{ return find_batch(p, 1);
+}

lib/split.c

@@ -47,15 +47,19 @@
 
 #include "../include/cmdline.h"
 
-static int addArg(char ***Xarg, int *argc, char *sBeg, char **sEnd)
+char *skipnonoptdm(char *p);  /* lib/find.c */
+char *skipnonopt_word(char *p);
+
+
+static int addArg(char ***Xarg, int *argc, char *sBeg, char **sEnd, int ignore_options)
 { char **arg;
 
   assert(Xarg);
   assert(argc);
   assert(sEnd);
   assert(sBeg);
 
-    *sEnd = skip_word(sBeg);   /* find end of argument */
+    *sEnd = (ignore_options ? skipnonopt_word(sBeg) : skip_word(sBeg));   /* find end of argument */
 
     /* Because *start != '\0' && !isargdelim(*start) ==> s != start */
     assert(*sEnd > sBeg);
@@ -77,7 +81,7 @@ static int addArg(char ***Xarg, int *argc, char *sBeg, char **sEnd)
     return 0;
   }
 
-char **split(char *s, int *args)
+static char **split_cmdline(char *s, int *args, int ignore_options)
 {
   char **arg,
    *start;
@@ -91,12 +95,23 @@ char **split(char *s, int *args)
   ac = 0;
 
     /* skip to next argument */
-  if(s) while (*(start = skipdm(s)) != '\0')
+  if(s) while (*(start = (ignore_options?skipnonoptdm(s):skipdm(s))) != '\0')
   {
-    if(addArg(&arg, &ac, start, &s))
+    if(addArg(&arg, &ac, start, &s, ignore_options))
       return 0;
   }
 
   arg[*args = ac] = 0;
   return arg;
 }
+
+char **split(char *s, int *args)
+{
+	return split_cmdline(s, args, 0);
+}
+
+/* we must not split on option delimiters, only argument delimiters, see issue#52 */
+char **split_batchargs(char *s, int *args)
+{
+	return split_cmdline(s, args, 1);
+}

shell/batch.c

@@ -134,14 +134,20 @@ struct bcontext *activeBatchContext(void)
 	return b;
 }
 
+
+/* see split(...) in lib\split.c 
+   -- we must not split on option delimiters, only argument delimiters, see issue#52
+ */
+char **split_batchargs(char *s, int *args);
+
 /*
  * setBatchParams builds a parameter list in newly allocated memory.
  * The parameters consist of null terminated strings with a final
  * NULL character signalling the end of the parameters.
  */
 int setBatchParams(char *s)
 {
-  if((bc->params = split(s, &bc->numParams)) == 0)
+  if((bc->params = split_batchargs(s, &bc->numParams)) == 0)
   {
     error_out_of_memory();
     return 0;

shell/command.c

@@ -204,7 +204,7 @@ void execute(char *first, char *rest, int lh_lf)
   assert(extension);
 
   /* loadhigh/loadfix don't do batch files */
-  if(!lh_lf && stricmp(extension, ".bat") == 0) {
+  if(!lh_lf && ((stricmp(extension, ".bat") == 0) || (stricmp(extension, ".cmd") == 0))) {
     dprintf(("[BATCH: %s %s]\n", fullname, rest));
     batch(fullname, first, rest);
   } else if(stricmp(extension, ".exe") == 0

tests/bat2.bat

@@ -1,3 +1,3 @@
 echo in bat 2
-call bat3.bat
+call bat3.bat ../nonexistantdir/argument1 ..\nonexistantdir\argument2 3\4\5/6
 echo back in bat 2

tests/bat3.bat

@@ -1 +1,4 @@
 echo in bat 3
+echo %1
+echo all the args [%1 %2 %3 %4 %5 %6 %7 %8 %9]
+echo leaving bat 3