plumber: use strtoul to parse subexpression match variable substitutions

1 files changed, 9 insertions, 24 deletions

diff --git a/src/cmd/plumb/rules.c b/src/cmd/plumb/rules.c
index 4bd02e44..b899231f 100644
--- a/src/cmd/plumb/rules.c
+++ b/src/cmd/plumb/rules.c
@@ -254,36 +254,21 @@ 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;
+	ulong m;
+	char *t;
 	static char *abuf;
 
-	if(e!=nil && '0'<=s[0] && s[0]<='9')
-		return nonnil(subexpmatch(e, s, namelen));
+	if(e!=nil && '0'<=s[0] && s[0]<='9'){
+		m = strtoul(s, &t, 10);
+		*namelen = t-s;
+		if(t==s || m>=NMATCHSUBEXP)
+			return "";
+		return nonnil(e->match[m]);
+	}
 
 	n = scanvarname(s)-s;
 	*namelen = n;