mirror of
https://github.com/9fans/plan9port.git
synced 2025-01-12 11:10:07 +00:00
plumber: allow multi-digit subexpression match variable substitutions
This commit is contained in:
parent
760cf86705
commit
6c0efecd13
1 changed files with 23 additions and 2 deletions
|
@ -254,15 +254,36 @@ filename(Exec *e, char *name)
|
|||
return cleanname(buf);
|
||||
}
|
||||
|
||||
static char*
|
||||
subexpmatch(Exec *e, char *s, int *numlen)
|
||||
{
|
||||
int n, d, ok;
|
||||
char *t;
|
||||
|
||||
n = 0;
|
||||
ok = 1;
|
||||
for(t = s; '0'<=*t && *t<='9'; t++)
|
||||
if(ok){
|
||||
d = *t-'0';
|
||||
if(d<NMATCHSUBEXP && n<=(NMATCHSUBEXP-1-d)/10)
|
||||
n = 10*n+d;
|
||||
else
|
||||
ok = 0;
|
||||
}
|
||||
*numlen = t-s;
|
||||
if(t==s || !ok)
|
||||
return nil;
|
||||
return e->match[n];
|
||||
}
|
||||
|
||||
char*
|
||||
dollar(Exec *e, char *s, int *namelen)
|
||||
{
|
||||
int n;
|
||||
static char *abuf;
|
||||
|
||||
*namelen = 1;
|
||||
if(e!=nil && '0'<=s[0] && s[0]<='9')
|
||||
return nonnil(e->match[s[0]-'0']);
|
||||
return nonnil(subexpmatch(e, s, namelen));
|
||||
|
||||
n = scanvarname(s)-s;
|
||||
*namelen = n;
|
||||
|
|
Loading…
Reference in a new issue