SCP: Allow bare % not followed by a digit or a alpha character to be kept while substituting arguments and environment variables in simulator commands.

2013-11-05 10:06:46 -08:00 · 2013-11-05 10:06:46 -08:00 · f5cfa392d7
commit f5cfa392d7
parent 32b8f06362
1 changed files with 3 additions and 1 deletions
--- a/scp.c
+++ b/scp.c
@ -1792,7 +1792,9 @@ for (; *ip && (op < oend); ) {
        *op++ = *ip++;                                  /* copy escaped char */
        }
    else 
-        if (*ip == '%') {                               /* sub? */
+        if ((*ip == '%') && 
+            (!isalnum(ip[1])) && 
+            (ip[1] != '\0')) {                          /* sub? */
            if ((ip[1] >= '0') && (ip[1] <= ('9'))) {   /* %n = sub */
                ap = do_arg[ip[1] - '0'];
                for (i=0; i<ip[1] - '0'; ++i)           /* make sure we're not past the list end */