Page MenuHomeFreeBSD
Files F158990329

D12432.diff
No OneTemporary
Actions

D12432.diff
View Options

Index: head/bin/cat/cat.c
===================================================================
--- head/bin/cat/cat.c
+++ head/bin/cat/cat.c
@@ -226,10 +226,16 @@
} 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') {
Index: head/bin/cat/tests/Makefile
===================================================================
--- head/bin/cat/tests/Makefile
+++ head/bin/cat/tests/Makefile
@@ -17,10 +17,4 @@
.include <netbsd-tests.test.mk>
-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 <bsd.test.mk>

File Metadata

Mime Type
text/plain
Expires
Tue, Jun 9, 5:37 PM (1 h, 55 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
33833992
Default Alt Text
D12432.diff (1 KB)

Event Timeline