dilim/make
1
0
Fork 0
mirror of https://github.com/mirror/make.git synced 2026-08-09 17:38:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

Commit fix for bug #1418.

Browse Source 
Upgrade to require autoconf 2.56.
Fix a pathological performance hit substituting in large values with
lots of words.
This commit is contained in:
Paul Smith
2003-03-25 00:15:25 +00:00
parent 4068c5e4a3
commit 955899ef77
8 changed files with 110 additions and 90 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
function.c
View File

@@ -80,13 +80,14 @@ subst_expand (char *o, char *text, char *subst, char *replace,
unsigned int slen, unsigned int rlen,
int by_word, int suffix_only)
{
register char *t = text;
register char *p;
char *t = text;
unsigned int tlen = strlen (text);
char *p;
if (slen == 0 && !by_word && !suffix_only)
{
/* The first occurrence of "" in any string is its end. */
o = variable_buffer_output (o, t, strlen (t));
o = variable_buffer_output (o, t, tlen);
if (rlen > 0)
o = variable_buffer_output (o, replace, rlen);
return o;
@@ -100,11 +101,11 @@ subst_expand (char *o, char *text, char *subst, char *replace,
p = end_of_token (next_token (t));
else
{
p = sindex (t, 0, subst, slen);
p = sindex (t, tlen, subst, slen);
if (p == 0)
{
/* No more matches. Output everything left on the end. */
o = variable_buffer_output (o, t, strlen (t));
o = variable_buffer_output (o, t, tlen);
return o;
}
}
@@ -127,8 +128,12 @@ subst_expand (char *o, char *text, char *subst, char *replace,
/* Output the replacement string. */
o = variable_buffer_output (o, replace, rlen);
/* Advance T past the string to be replaced. */
t = p + slen;
/* Advance T past the string to be replaced; adjust tlen. */
{
char *nt = p + slen;
tlen -= nt - t;
t = nt;
}
} while (*t != '\0');
return o;