From 148d5e85ac484cb84c2c4fa500e6d278d876ef4d Mon Sep 17 00:00:00 2001
From: Werner Almesberger <werner@almesberger.net>
Date: Tue, 22 May 2012 13:46:44 -0300
Subject: [PATCH] b2/: regexec puts first substring into pmatch[1] and not
 pmatch[0]

Also clean up the hard-coded number of matches.
---
 b2/subex.c | 12 ++++++------
 b2/subst.h |  5 ++++-
 2 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/b2/subex.c b/b2/subex.c
index 9ee6479..76971db 100644
--- a/b2/subex.c
+++ b/b2/subex.c
@@ -26,7 +26,7 @@
 #include "subex.h"
 
 
-#define FIELDS	10
+#define FIELDS	10	/* fields in KiCad schematics */
 
 
 static const char *fn = NULL, *f[FIELDS];
@@ -116,11 +116,11 @@ static char *compose(const struct chunk *c,
 				append(&res, &res_len, s);
 				break;
 			}
-			if (match[n-1].rm_so == -1)
+			if (match[n].rm_so == -1)
 				break;
-			len = match[n-1].rm_eo-match[n-1].rm_so;
+			len = match[n].rm_eo-match[n].rm_so;
 			tmp = alloc_size(len);
-			memcpy(tmp, s+match[n-1].rm_so, len);
+			memcpy(tmp, s+match[n].rm_so, len);
 			tmp[len] = 0;
 			tmp2 = canonicalize(tmp, units ? units[n-1] : 0);
 			append(&res, &res_len, tmp2);
@@ -160,7 +160,7 @@ static int do_match_1(const char *var, const regex_t *re,
 		*val = var_lookup(in, var);
 	if (!*val)
 		return -1;
-	return regexec(re, *val, 10, match, 0);
+	return regexec(re, *val, NMATCH, match, 0);
 }
 
 
@@ -186,7 +186,7 @@ static const struct subst *recurse_sub(const struct subst *sub,
     const regmatch_t *match, const char *units, struct param **out)
 {
 	const struct subst *jump;
-	regmatch_t m_tmp[10];
+	regmatch_t m_tmp[NMATCH];
 	const char *var, *val;
 	char *tmp;
 
diff --git a/b2/subst.h b/b2/subst.h
index 22d872c..62e8718 100644
--- a/b2/subst.h
+++ b/b2/subst.h
@@ -20,6 +20,9 @@
 #include "relop.h"
 
 
+#define	NMATCH	10	/* $0 (not used), $1...$9 */
+
+
 enum chunk_type {
 	ct_string,
 	ct_var,
@@ -52,7 +55,7 @@ struct subst {
 			const char *src;
 			regex_t re;
 			struct subst *block;
-			char units[10];
+			char units[NMATCH-1];
 			int parens; /* number of parentheses */
 		} match;
 		struct {