oneechanhax/phunix
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Sync with cat.c from netbsd-8

Browse Source 
When cat is invoked with -se, print a '$' on blank lines.

Change-Id: I1bdcced967261a231eab93e8d28736f9f52f53fd
This commit is contained in:
Sevan Janiyan 2018-06-25 23:35:19 +00:00 committed by Lionel Sambuc
parent 145839b147
commit a513517459
1 changed files with 10 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
bin/cat/cat.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: cat.c,v 1.55 2015/07/25 16:17:01 sevan Exp $ */ /* $NetBSD: cat.c,v 1.57 2016/06/16 00:52:37 sevan Exp $ */
/* /*
* Copyright (c) 1989, 1993 * Copyright (c) 1989, 1993
@ -44,7 +44,7 @@ __COPYRIGHT(
#if 0 #if 0
static char sccsid[] = "@(#)cat.c 8.2 (Berkeley) 4/27/95"; static char sccsid[] = "@(#)cat.c 8.2 (Berkeley) 4/27/95";
#else #else
__RCSID("$NetBSD: cat.c,v 1.55 2015/07/25 16:17:01 sevan Exp $"); __RCSID("$NetBSD: cat.c,v 1.57 2016/06/16 00:52:37 sevan Exp $");
#endif #endif
#endif /* not lint */ #endif /* not lint */
@ -113,6 +113,7 @@ main(int argc, char *argv[])
vflag = 1; vflag = 1;
break; break;
default: default:
case '?':
(void)fprintf(stderr, (void)fprintf(stderr,
"Usage: %s [-beflnstuv] [-B bsize] [-] " "Usage: %s [-beflnstuv] [-B bsize] [-] "
"[file ...]\n", getprogname()); "[file ...]\n", getprogname());
@ -174,18 +175,16 @@ cook_buf(FILE *fp)
line = gobble = 0; line = gobble = 0;
for (prev = '\n'; (ch = getc(fp)) != EOF; prev = ch) { for (prev = '\n'; (ch = getc(fp)) != EOF; prev = ch) {
if (prev == '\n') { if (prev == '\n') {
if (ch == '\n') { if (sflag) {
if (sflag) { if (ch == '\n') {
if (!gobble && nflag && !bflag) if (gobble)
(void)fprintf(stdout, continue;
"%6d\t\n", ++line);
else if (!gobble && putchar(ch) == EOF)
break;
gobble = 1; gobble = 1;
continue; } else
gobble = 0;
} }
if (nflag) { if (nflag) {
if (!bflag) { if (!bflag || ch != '\n') {
(void)fprintf(stdout, (void)fprintf(stdout,
"%6d\t", ++line); "%6d\t", ++line);
if (ferror(stdout)) if (ferror(stdout))
@ -197,13 +196,7 @@ cook_buf(FILE *fp)
break; break;
} }
} }
} else if (nflag) {
(void)fprintf(stdout, "%6d\t", ++line);
if (ferror(stdout))
break;
} }
}
gobble = 0;
if (ch == '\n') { if (ch == '\n') {
if (eflag) if (eflag)
if (putchar('$') == EOF) if (putchar('$') == EOF)