Merge branch 'master' into next

This commit is contained in:
Michael Stapelberg 2011-09-20 22:37:08 +01:00
commit 143663f031

View File

@ -465,8 +465,8 @@ void parse_file(const char *f) {
int extra = (strlen(current->value) - strlen(current->key));
char *next;
for (next = bufcopy;
(bufcopy + (next - bufcopy)) < (buf + stbuf.st_size) &&
(next = strcasestr(bufcopy + (next - bufcopy), current->key)) != NULL;
next < (bufcopy + stbuf.st_size) &&
(next = strcasestr(next, current->key)) != NULL;
next += strlen(current->key)) {
*next = '_';
extra_bytes += extra;