ariadne
/
pkgconf
3
6
Fork 4
Code Issues 6 Pull Requests 2 Projects Releases 2 Wiki Activity

fileio: add support for quoting to pkg_fgetline().

William Pitcock 2012-07-30 01:53:32 -05:00
parent e09b46c2c0
commit 12b5f3cbc6
1 changed files with 30 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
fileio.c
View File

@ -21,6 +21,7 @@ pkg_fgetline(char *line, size_t size, FILE *stream)
{ {
char *s = line; char *s = line;
char *end = line + size - 1; char *end = line + size - 1;
bool quoted = false;
int c = '\0', c2; int c = '\0', c2;
if (s == NULL) if (s == NULL)
@ -28,9 +29,22 @@ pkg_fgetline(char *line, size_t size, FILE *stream)
while (s < end && (c = getc(stream)) != EOF) while (s < end && (c = getc(stream)) != EOF)
{ {
if (c == '\n') if (c == '\\')
{
quoted = true;
continue;
}
else if (c == '\n')
{ {
*s++ = c; *s++ = c;
if (quoted)
{
quoted = false;
continue;
}
break; break;
} }
else if (c == '\r') else if (c == '\r')
@ -38,9 +52,24 @@ pkg_fgetline(char *line, size_t size, FILE *stream)
*s++ = '\n'; *s++ = '\n';
if ((c2 = getc(stream)) == '\n') if ((c2 = getc(stream)) == '\n')
{
if (quoted)
{
quoted = false;
continue;
}
break; break;
}
ungetc(c2, stream); ungetc(c2, stream);
if (quoted)
{
quoted = false;
continue;
}
break; break;
} }
else else