fbt/sbase
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

libutil/getlines: use known line length

Browse Source 
also style: linelen = length of getline(), this was slightly confusing.
This commit is contained in:
Hiltjo Posthuma 2015-05-05 14:55:09 +02:00 committed by sin
parent adf9f47525
commit 3f01706837
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
libutil/getlines.c
View File

@ -18,13 +18,13 @@ getlines(FILE *fp, struct linebuf *b)
b->capacity += 512; b->capacity += 512;
b->lines = erealloc(b->lines, b->capacity * sizeof(*b->lines)); b->lines = erealloc(b->lines, b->capacity * sizeof(*b->lines));
} }
linelen = len + 1; linelen = len;
b->lines[b->nlines - 1] = memcpy(emalloc(linelen), line, linelen); b->lines[b->nlines - 1] = memcpy(emalloc(linelen + 1), line, linelen + 1);
} }
free(line); free(line);
if (b->lines && b->nlines && !strchr(b->lines[b->nlines - 1], '\n')) { if (b->lines && b->nlines && b->lines[b->nlines - 1][linelen - 1] != '\n') {
b->lines[b->nlines - 1] = erealloc(b->lines[b->nlines - 1], linelen + 1); b->lines[b->nlines - 1] = erealloc(b->lines[b->nlines - 1], linelen + 2);
b->lines[b->nlines - 1][linelen - 1] = '\n'; b->lines[b->nlines - 1][linelen] = '\n';
b->lines[b->nlines - 1][linelen] = '\0'; b->lines[b->nlines - 1][linelen + 1] = '\0';
} }
} }