github.com/simh.simh
1
0
Fork 0
mirror of https://github.com/simh/simh.git synced 2026-03-20 16:38:01 +00:00
Code Releases Activity

Added sub_args expansion of %* to mean insert all args %1..%9

Browse Source
This commit is contained in:
Mark Pizzolato
2012-03-28 04:49:54 -07:00
parent 4510ca64c0
commit 72d209fbe5
1 changed files with 19 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
scp.c
View File

@@ -1177,7 +1177,9 @@ return (stat == SCPE_EXIT) ? SCPE_EXIT : SCPE_OK;
maxstr = min (len (instr), len (tmpbuf))
do_arg[10] = arguments
Token "%0" represents the command file name.
Token "%0" expands to the command file name.
Token %n (n being a single digit) expands to the n'th argument
Tonen %* expands to the whole set of arguments (%1 ... %9)
The input sequence "\%" represents a literal "%", and "\\" represents a
literal "\". All other character combinations are rendered literally.
@@ -1198,6 +1200,7 @@ return (stat == SCPE_EXIT) ? SCPE_EXIT : SCPE_OK;
void sub_args (char *instr, char *tmpbuf, int32 maxstr, char *do_arg[])
{
char *ip, *op, *ap, *oend = tmpbuf + maxstr - 2;
char rbuf[CBUFSIZE];
for (ip = instr, op = tmpbuf; *ip && (op < oend); ) {
if ((ip [0] == '\\') && /* literal escape? */
@@ -1205,12 +1208,26 @@ for (ip = instr, op = tmpbuf; *ip && (op < oend); ) {
ip++; /* skip '\' */
*op++ = *ip++; /* copy escaped char */
}
else
else
if (*ip == '%') { /* sub? */
if ((ip[1] >= '0') && (ip[1] <= ('9'))) { /* %n = sub */
ap = do_arg[ip[1] - '0'];
ip = ip + 2;
}
else if (ip[1] == '*') { /* %1 ... %9 = sub */
int i;
memset (rbuf, '\0', sizeof(rbuf));
ap = rbuf;
for (i=1; i<=9; ++i)
if (do_arg[i] == NULL)
break;
else
if ((sizeof(rbuf)-strlen(rbuf)) < (2 + strlen(do_arg[i])))
sprintf(&rbuf[strlen(rbuf)], "%s%s", (i != 1) ? " " : "", do_arg[i]);
else
break;
}
else { /* environment variable */
char gbuf[CBUFSIZE];
@@ -1220,7 +1237,6 @@ for (ip = instr, op = tmpbuf; *ip && (op < oend); ) {
if (*ip == '%') ++ip;
ap = getenv(gbuf);
if (!ap) {
static char rbuf[CBUFSIZE];
time_t now;
struct tm *tmnow;