diff options
| author | Andrey A. Chernov <ache@FreeBSD.org> | 1997-03-17 17:07:39 +0000 |
|---|---|---|
| committer | Andrey A. Chernov <ache@FreeBSD.org> | 1997-03-17 17:07:39 +0000 |
| commit | 3429a3040604a6d99ad55650d5fdf1a6bae30328 (patch) | |
| tree | adb31205f6bbd4512c102db29ff4c76ce6761362 /usr.bin/finger/lprint.c | |
| parent | 2eaf474aeaa644c3dda0d6d927a41032d0ae6755 (diff) | |
| download | src-3429a3040604a6d99ad55650d5fdf1a6bae30328.tar.gz src-3429a3040604a6d99ad55650d5fdf1a6bae30328.zip | |
Skip \r character while printing Plan/etc. text files, it allows to
handle \r\n and \n\r files properly.
Previous variant put ^M for \r\n and ^M\n for \n\r
Notes
Notes:
svn path=/head/; revision=23971
Diffstat (limited to 'usr.bin/finger/lprint.c')
| -rw-r--r-- | usr.bin/finger/lprint.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/usr.bin/finger/lprint.c b/usr.bin/finger/lprint.c index 847f26d195cc..9ab0673e411b 100644 --- a/usr.bin/finger/lprint.c +++ b/usr.bin/finger/lprint.c @@ -313,7 +313,8 @@ show_text(directory, file_name, header) if (cnt <= 1) { (void)printf("%s: ", header); for (p = tbuf, cnt = nr; cnt--; ++p) - vputc(lastc = *p); + if (*p != '\r') + vputc(lastc = *p); if (lastc != '\n') (void)putchar('\n'); (void)close(fd); @@ -326,7 +327,8 @@ show_text(directory, file_name, header) return(0); (void)printf("%s:\n", header); while ((ch = getc(fp)) != EOF) - vputc(lastc = ch); + if (ch != '\r') + vputc(lastc = ch); if (lastc != '\n') (void)putchar('\n'); (void)fclose(fp); |