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

Teach cut(1) how to handle long lines: convert from fgets(3) to fgetln(3).

Browse Source 
PR:		26810
Reviewed by:	dwmalone
This commit is contained in:
Dima Dorfman 2001-04-25 05:42:53 +00:00
parent 5d9898abd3
commit 1928e20e95
1 changed files with 17 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -228,19 +228,29 @@ f_cut(fp, fname)
int ch, field, isdelim;
char *pos, *p, sep;
int output;
char lbuf[_POSIX2_LINE_MAX + 1];
char *lbuf, *mlbuf = NULL;
size_t lbuflen;
for (sep = dchar; fgets(lbuf, sizeof(lbuf), fp);) {
for (sep = dchar; (lbuf = fgetln(fp, &lbuflen)) != NULL;) {
/* Assert EOL has a newline. */
if (*(lbuf + lbuflen - 1) != '\n') {
/* Can't have > 1 line with no trailing newline. */
mlbuf = malloc(lbuflen + 1);
if (mlbuf == NULL)
err(1, "malloc");
memcpy(mlbuf, lbuf, lbuflen);
*(mlbuf + lbuflen) = '\n';
lbuf = mlbuf;
}
output = 0;
for (isdelim = 0, p = lbuf;; ++p) {
if (!(ch = *p))
errx(1, "%s: line too long.", fname);
ch = *p;
/* this should work if newline is delimiter */
if (ch == sep)
isdelim = 1;
if (ch == '\n') {
if (!isdelim && !sflag)
(void)printf("%s", lbuf);
(void)fwrite(lbuf, lbuflen, 1, stdout);
break;
}
}
@ -272,6 +282,8 @@ f_cut(fp, fname)
}
(void)putchar('\n');
}
if (mlbuf != NULL)
free(mlbuf);
}
static void