diff options
| author | Tim J. Robbins <tjr@FreeBSD.org> | 2002-06-21 07:08:34 +0000 |
|---|---|---|
| committer | Tim J. Robbins <tjr@FreeBSD.org> | 2002-06-21 07:08:34 +0000 |
| commit | 4e774f7fbe7c154f101f90c115b702780920ebcb (patch) | |
| tree | 1442cf57b2489454c888382bdc6b16e249ee65eb /usr.bin/uniq | |
| parent | 518e4deb99df2d6aa959c483414a6a281522b307 (diff) | |
| download | src-4e774f7fbe7c154f101f90c115b702780920ebcb.tar.gz src-4e774f7fbe7c154f101f90c115b702780920ebcb.zip | |
Notes
Diffstat (limited to 'usr.bin/uniq')
| -rw-r--r-- | usr.bin/uniq/uniq.c | 26 |
1 files changed, 22 insertions, 4 deletions
diff --git a/usr.bin/uniq/uniq.c b/usr.bin/uniq/uniq.c index 701e58b5fa09..85733f08797b 100644 --- a/usr.bin/uniq/uniq.c +++ b/usr.bin/uniq/uniq.c @@ -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 * |