	@@ -1598,42 +1598,42 @@ add_debug_regex_map (const char *arg)		@@ -1598,42 +1598,42 @@ add_debug_regex_map (const char *arg)
1598	free(old);	1598	free(old);
1599	return;	1599	return;
1600	}	1600	}
1601	free(old);	1601	free(old);
1602		1602
1603	map = XNEW (debug_regex_map);	1603	map = XNEW (debug_regex_map);
1604	map->re = re;	1604	map->re = re;
1605	p++;	1605	p++;
1606	map->sub = xstrdup (p);	1606	map->sub = xstrdup (p);
1607	map->next = debug_regex_maps;	1607	map->next = debug_regex_maps;
1608	debug_regex_maps = map;	1608	debug_regex_maps = map;
1609	}	1609	}
1610		1610
1611	extern ssize_t aregsub(char *, const char ,	1611	extern ssize_t regasub(char *, const char ,
1612	const regmatch_t rm, const char );	1612	const regmatch_t rm, const char );
1613		1613
1614	/* Perform user-specified mapping of debug filename regular expressions. Return	1614	/* Perform user-specified mapping of debug filename regular expressions. Return
1615	the new name corresponding to FILENAME. */	1615	the new name corresponding to FILENAME. */
1616		1616
1617	static const char *	1617	static const char *
1618	remap_debug_regex_filename (const char *filename)	1618	remap_debug_regex_filename (const char *filename)
1619	{	1619	{
1620	debug_regex_map *map;	1620	debug_regex_map *map;
1621	char *s;	1621	char *s;
1622	regmatch_t rm[10];	1622	regmatch_t rm[10];
1623		1623
1624	for (map = debug_regex_maps; map; map = map->next)	1624	for (map = debug_regex_maps; map; map = map->next)
1625	if (regexec (&map->re, filename, 10, rm, 0) == 0	1625	if (regexec (&map->re, filename, 10, rm, 0) == 0
1626	&& aregsub (&s, map->sub, rm, filename) >= 0)	1626	&& regasub (&s, map->sub, rm, filename) >= 0)
1627	{	1627	{
1628	const char *name = ggc_strdup(s);	1628	const char *name = ggc_strdup(s);
1629	free(s);	1629	free(s);
1630	return name;	1630	return name;
1631	}	1631	}
1632	return filename;	1632	return filename;
1633	}	1633	}
1634		1634
1635	const char *	1635	const char *
1636	remap_debug_filename (const char *filename)	1636	remap_debug_filename (const char *filename)
1637	{	1637	{
1638	return remap_debug_regex_filename (remap_debug_prefix_filename (filename));	1638	return remap_debug_regex_filename (remap_debug_prefix_filename (filename));
1639	}	1639	}

 @@ -1,14 +1,14 @@
-/*	$NetBSD: regsub.c,v 1.2 2016/01/16 19:28:36 christos Exp $	*/
+/*	$NetBSD: regsub.c,v 1.3 2016/01/20 15:13:33 christos Exp $	*/
 /*-
  * Copyright (c) 2015 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Christos Zoulas.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
 @@ -18,57 +18,53 @@
+ *
  * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
  * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
  * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
  * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
  * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
  * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
  * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
  * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
  * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  */
 #include <sys/cdefs.h>
 #ifdef __RCSID
 __RCSID("$NetBSD: regsub.c,v 1.2 2016/01/16 19:28:36 christos Exp $");
 #endif
 #include <sys/param.h>
 #include <ctype.h>
 #include <stdlib.h>
 #include <string.h>
 #include <regex.h>
 struct str {
 	char *s_ptr;
 	size_t s_max;
 	size_t s_len;
 	int s_fixed;
 };
 #define	REINCR	64
 static int
 addspace(struct str *s, size_t len)
+{
 	void *v;
 	if (s->s_max - s->s_len > len)
 		return 0;
 	if (s->s_fixed)
 		return -1;
-	s->s_max += MAX(len, 64);
+	s->s_max += len + REINCR;
 	v = realloc(s->s_ptr, s->s_max);
 	if (v == NULL)
 		return -1;
 	s->s_ptr = (char *)v;
 	return 0;
+}
 static void
 addchar(struct str *s, int c)
+{
 	if (addspace(s, 1) == -1)
 @@ -83,37 +79,37 @@ addchar(struct str *s, int c)
 static void
 addnstr(struct str *s, const char *buf, size_t len)
+{
 	if (addspace(s, len) != -1)
 		memcpy(s->s_ptr + s->s_len, buf, len);
 	s->s_len += len;
+}
 static int
 initstr(struct str *s, char *buf, size_t len)
+{
 	s->s_max = len;
-	s->s_ptr = buf == NULL ? (char *)malloc(len) : buf;
+	s->s_ptr = (char *)(buf == NULL ? malloc(len) : buf);
 	s->s_fixed = buf != NULL;
 	s->s_len = 0;
 	return s->s_ptr == NULL ? -1 : 0;
+}
 static ssize_t
 regsub1(char **buf, size_t len, const char *sub,
     const regmatch_t *rm, const char *str)
+{
         ssize_t i;
         char c;
 	struct str s;
 	if (initstr(&s, *buf, len) == -1)
 		return -1;
         while ((c = *sub++) != '\0') {
 		switch (c) {
 		case '&':
 			i = 0;
 			break;
 		case '\\':
 @@ -139,25 +135,25 @@ regsub1(char **buf, size_t len, const ch
 	addchar(&s, '\0');
 	if (!s.s_fixed) {
 		if (s.s_len >= s.s_max) {
 			free(s.s_ptr);
 			return -1;
+		}
 		*buf = s.s_ptr;
+	}
 	return s.s_len;
+}
 ssize_t
-regsub(char *buf, size_t len, const char *sub, const regmatch_t *rm,
+regnsub(char *buf, size_t len, const char *sub, const regmatch_t *rm,
     const char *str)
+{
 	return regsub1(&buf, len, sub, rm, str);
+}
 ssize_t
-aregsub(char **buf, const char *sub, const regmatch_t *rm, const char *str)
+regasub(char **buf, const char *sub, const regmatch_t *rm, const char *str)
+{
 	*buf = NULL;
-	return regsub1(buf, 64, sub, rm, str);
+	return regsub1(buf, REINCR, sub, rm, str);
+}