frederik
/
xserver
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

xfree86: Handle config files ending without newline 

The config parser expects to find a newline at the end of each line, so
files ending without one would confuse it. A newline is inserted at the
end of the buffer in these situations. Additionally, switching to the
next config file is moved to the higher level to allow parsing of the
last line of the previous file to complete before shifting the index and
resetting the line number.

Signed-off-by: Dan Nicholson <dbn.lists@gmail.com>
Tested-by: Stephan Raue<stephan.raue@gmx.net>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
This commit is contained in:
Dan Nicholson 2010-02-10 15:36:45 +10:00 committed by Peter Hutterer
parent 67bc278a51
commit 8b1a685f00
1 changed files with 19 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
hw/xfree86/parser/scan.c
View File

@ -227,13 +227,15 @@ xf86getNextLine(void)
configFiles[curFileIndex].file); configFiles[curFileIndex].file);
if (!ret) { if (!ret) {
/* stop if there are no more files */ /*
if (++curFileIndex >= numFiles) { * if the file doesn't end in a newline, add one
curFileIndex = 0; * and trigger another read
*/
if (pos != 0) {
strcpy(&configBuf[pos], "\n");
ret = configBuf;
} else
break; break;
}
configLineNo = 0;
continue;
} }
/* search for EOL in the new block of chars */ /* search for EOL in the new block of chars */
@ -338,7 +340,17 @@ again:
} }
if (ret == NULL) if (ret == NULL)
{ {
return (pushToken = EOF_TOKEN); /*
* if necessary, move to the next file and
* read the first line
*/
if (curFileIndex + 1 < numFiles) {
curFileIndex++;
configLineNo = 0;
goto again;
}
else
return (pushToken = EOF_TOKEN);
} }
configLineNo++; configLineNo++;
configPos = 0; configPos = 0;