From 6d2e5f3ddfa6777cd4925c57cd043950d047116a Mon Sep 17 00:00:00 2001 From: Sevan Janiyan Date: Thu, 21 Sep 2017 14:14:49 +0000 Subject: [PATCH] Ammend bin/cat/cat.c so the output is the same aside from blank lines being numbered or unnumbered, depending on whether cat was invoked with -ne or -be. At present, when cat is invoked with -be, there is an aditional difference that the '$' on blank lines is placed on the far left of the output. Discussed in bug 210607. While here, revert the workaround from r304035 which skipped the unit test for this issue previously. PR: 210607 Submitted by: myself Reviewed by: bdrewery Obtained from: NetBSD Relnotes: yes Differential Revision: https://reviews.freebsd.org/D12432 --- bin/cat/cat.c | 14 ++++++++++---- bin/cat/tests/Makefile | 6 ------ 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/bin/cat/cat.c b/bin/cat/cat.c index 770ab61a08a4..57d48028906e 100644 --- a/bin/cat/cat.c +++ b/bin/cat/cat.c @@ -226,10 +226,16 @@ cook_cat(FILE *fp) } else gobble = 0; } - if (nflag && (!bflag || ch != '\n')) { - (void)fprintf(stdout, "%6d\t", ++line); - if (ferror(stdout)) - break; + if (nflag) { + if (!bflag || ch != '\n') { + (void)fprintf(stdout, "%6d\t", ++line); + if (ferror(stdout)) + break; + } else if (eflag) { + (void)fprintf(stdout, "%6s\t", ""); + if (ferror(stdout)) + break; + } } } if (ch == '\n') { diff --git a/bin/cat/tests/Makefile b/bin/cat/tests/Makefile index 92e16aea1732..ebc313c5a091 100644 --- a/bin/cat/tests/Makefile +++ b/bin/cat/tests/Makefile @@ -17,10 +17,4 @@ ${PACKAGE}FILES+= d_vt_output.out .include -d_align.out: ${TESTSRC}/d_align.out - sed -E -e 's,^[[:space:]]{7}\$$$$,\$$,' < ${.ALLSRC} > ${.TARGET}.tmp - mv ${.TARGET}.tmp ${.TARGET} - -CLEANFILES+= d_align.out d_align.out.tmp - .include