Fix reading configuration files that do not end with a newline. Again.

This commit is contained in:
Guus Sliepen 2010-04-17 12:01:38 +02:00
parent 26b8cf8680
commit 4766359e14
3 changed files with 6 additions and 2 deletions

View file

@ -224,7 +224,7 @@ static char *readline(FILE * fp, char *buf, size_t buflen) {
newline = strchr(p, '\n');
if(!newline)
return NULL;
return buf;
*newline = '\0'; /* kill newline */
if(newline > p && newline[-1] == '\r') /* and carriage return if necessary */