nate/ncdg
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix a nesting bug

Browse Source 
Before, strings such as @n@!_filename@@m wouldn't be parsed correctly
because of that '@@' in there.
This commit is contained in:
Nate Choe
2024-02-17 23:56:28 -06:00
parent ba55ebd057
commit 561ad55a60
1 changed files with 10 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
src/parse.c
View File

@@ -181,7 +181,7 @@ autoescapeend:
/* read nest data into a string */ /* read nest data into a string */
while (i < data->len) { while (i < data->len) {
int c; int c;
c = data->data[i++]; c = data->data[i++];
if (c != ESCAPE_CHAR) { if (c != ESCAPE_CHAR) {
appendchar(buff, c); appendchar(buff, c);
continue; continue;
@@ -334,16 +334,17 @@ static int expandfile(struct expandfile *ret, char *filename, int level) {
appendchar(ret->data, c); appendchar(ret->data, c);
continue; continue;
} }
c = fgetc(file);
if (c == EOF) {
goto no_nest_end;
}
appendchar(ret->data, ESCAPE_CHAR);
appendchar(ret->data, c); appendchar(ret->data, c);
if (c != NEST_END) { c = fgetc(file);
continue; if (c == NEST_END) {
appendchar(ret->data, c);
break;
} }
break; ungetc(c, file);
do {
c = fgetc(file);
appendchar(ret->data, c);
} while (c != ESCAPE_CHAR);
} }
break; break;
no_nest_end: no_nest_end: