Attachment 171845 Details for Bug 210607 – patch cat.c & ATF tests

[patch] patch cat.c & ATF tests

patch-freebsd-cat-be-align.txt (text/plain), 1.19 KB, created by Sevan Janiyan on 2016-06-27 01:48:52 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Sevan Janiyan

Created: 2016-06-27 01:48:52 UTC

Size: 1.19 KB

patch

obsolete

>Index: bin/cat/cat.c
>===================================================================
>--- bin/cat/cat.c	(revision 302145)
>+++ bin/cat/cat.c	(working copy)
>@@ -223,10 +223,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: contrib/netbsd-tests/bin/cat/d_align.in
>===================================================================
>--- contrib/netbsd-tests/bin/cat/d_align.in	(revision 302145)
>+++ contrib/netbsd-tests/bin/cat/d_align.in	(working copy)
>@@ -1,3 +1,5 @@
> a b c
>+
> 1 2 3
>+
> x y z
>Index: contrib/netbsd-tests/bin/cat/d_align.out
>===================================================================
>--- contrib/netbsd-tests/bin/cat/d_align.out	(revision 302145)
>+++ contrib/netbsd-tests/bin/cat/d_align.out	(working copy)
>@@ -1,3 +1,5 @@
>      1	a b c$
>+      	$
>      2	1 2 3$
>+      	$
>      3	x y z$

Actions: View | Diff

Attachments on bug 210607: 171845