applications/i3
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Bugfix: Correctly count variables when parsing the configfile (Thanks dbp)

Browse Source
This commit is contained in:
Michael Stapelberg 2010-11-26 11:25:02 +01:00
parent 1de97a1f1f
commit 4d7c24b92c
1 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/cfgparse.y
View File

@ -106,14 +106,21 @@ void parse_file(const char *f) {
* how much extra bytes it requires when replaced. */ * how much extra bytes it requires when replaced. */
struct Variable *current, *nearest; struct Variable *current, *nearest;
int extra_bytes = 0; int extra_bytes = 0;
/* We need to copy the buffer because we need to invalidate the
* variables (otherwise we will count them twice, which is bad when
* 'extra' is negative) */
char *bufcopy = sstrdup(buf);
SLIST_FOREACH(current, &variables, variables) { SLIST_FOREACH(current, &variables, variables) {
int extra = (strlen(current->value) - strlen(current->key)); int extra = (strlen(current->value) - strlen(current->key));
char *next; char *next;
for (next = buf; for (next = buf;
(next = strcasestr(buf + (next - buf), current->key)) != NULL; (next = strcasestr(buf + (next - buf), current->key)) != NULL;
next += strlen(current->key)) next += strlen(current->key)) {
*next = '_';
extra_bytes += extra; extra_bytes += extra;
}
} }
FREE(bufcopy);
/* Then, allocate a new buffer and copy the file over to the new one, /* Then, allocate a new buffer and copy the file over to the new one,
* but replace occurences of our variables */ * but replace occurences of our variables */