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

Newline characters should not participate in line comparisons. Only apparent

Browse Source 
when -s is used or the last line of the file is missing a newline.
Noticed by the textutils test suite.

MFC after:	1 week
This commit is contained in:
Tim J. Robbins 2002-06-21 07:08:34 +00:00
parent 518e4deb99
commit 4e774f7fbe
1 changed files with 22 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
usr.bin/uniq/uniq.c
View File

@ -63,6 +63,7 @@ int cflag, dflag, uflag;
int numchars, numfields, repeats;
FILE *file(const char *, const char *);
char *getline(char *, size_t, FILE *);
void show(FILE *, char *);
char *skip(char *);
void obsolete(char *[]);
@ -137,10 +138,10 @@ main (argc, argv)
if (prevline == NULL || thisline == NULL)
errx(1, "malloc");
if (fgets(prevline, MAXLINELEN, ifp) == NULL)
if (getline(prevline, MAXLINELEN, ifp) == NULL)
exit(0);
while (fgets(thisline, MAXLINELEN, ifp)) {
while (getline(thisline, MAXLINELEN, ifp)) {
/* If requested get the chosen fields + character offsets. */
if (numfields || numchars) {
t1 = skip(thisline);
@ -169,6 +170,23 @@ main (argc, argv)
exit(0);
}
char *
getline(char *buf, size_t buflen, FILE *fp)
{
size_t bufpos;
int ch;
bufpos = 0;
while (bufpos + 2 != buflen && (ch = getc(fp)) != EOF && ch != '\n')
buf[bufpos++] = ch;
if (bufpos + 1 != buflen)
buf[bufpos] = '\0';
while (ch != EOF && ch != '\n')
ch = getc(fp);
return (bufpos != 0 || ch == '\n' ? buf : NULL);
}
/*
* show --
* Output a line depending on the flags and number of repetitions
@ -181,9 +199,9 @@ show(ofp, str)
{
if (cflag && *str)
(void)fprintf(ofp, "%4d %s", repeats + 1, str);
(void)fprintf(ofp, "%4d %s\n", repeats + 1, str);
if ((dflag && repeats) || (uflag && !repeats))
(void)fprintf(ofp, "%s", str);
(void)fprintf(ofp, "%s\n", str);
}
char *