ExternalVendorCode/conserver
1
0
Fork 0
mirror of https://github.com/bstansell/conserver.git synced 2025-03-15 00:36:28 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix bug with parser and "#" lines, fix debug output in ParseFile()

Browse Source
This commit is contained in:
Bryan Stansell 2025-01-28 12:17:01 -08:00
parent ebec2150ec
commit 9cbb5cd602
1 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
conserver/cutil.c
View File

@ -2415,7 +2415,7 @@ GetWord(FILE *fp, int *line, short spaceok, STRING *word)
while ((c = fgetc(fp)) != EOF) {
if (c == '\n') {
(*line)++;
if (checkInc == -2)
if (checkInc == -2 || checkInc == 0)
checkInc = -1;
}
if (comment) {
@ -2592,11 +2592,17 @@ ParseFile(char *filename, FILE *fp, int level)
strerror(errno));
} else {
char *fname;
char *sfile;
int *sline;
/* word gets destroyed, so save the name */
fname = StrDup(word->string);
sfile = file;
sline = line;
ParseFile(fname, lfp, level + 1);
fclose(lfp);
free(fname);
file = sfile;
line = sline;
}
} else {
switch (state) {