d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Replace homemade getline(3) by actual getline(3)

Browse Source
This commit is contained in:
Baptiste Daroussin 2019-12-17 11:03:32 +00:00
parent bc188bd4f8
commit 94678ee678
1 changed files with 5 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
usr.bin/diff3/diff3.c
View File

@ -257,28 +257,16 @@ getchange(FILE *b)
static char *
get_line(FILE *b, size_t *n)
{
char *cp;
size_t len;
static char *buf;
static size_t bufsize;
ssize_t len;
static char *buf = NULL;
static size_t bufsize = 0;
if ((cp = fgetln(b, &len)) == NULL)
if ((len = getline(&buf, &bufsize, b)) < 0)
return (NULL);
if (cp[len - 1] != '\n')
len++;
if (len + 1 > bufsize) {
do {
bufsize += 1024;
} while (len + 1 > bufsize);
if ((buf = realloc(buf, bufsize)) == NULL)
err(EXIT_FAILURE, NULL);
}
memcpy(buf, cp, len - 1);
buf[len - 1] = '\n';
buf[len] = '\0';
if (n != NULL)
*n = len;
return (buf);
}