Attachment #171845 for bug #210607

View | Details | Raw Unified | Return to bug 210607
Collapse All | Expand All




				} else
					gobble = 0;
			}
			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') {

Lines 1-3 Link Here

(-)contrib/netbsd-tests/bin/cat/d_align.in (+2 lines)
1	a b c	1	a b c
		2
2	1 2 3	3	1 2 3
		4
3	x y z	5	x y z

Lines 1-3 Link Here

(-)contrib/netbsd-tests/bin/cat/d_align.out (+2 lines)
1	1 a b c$	1	1 a b c$
		2	$
2	2 1 2 3$	3	2 1 2 3$
		4	$
3	3 x y z$	5	3 x y z$

Return to bug 210607

Lines 223-232 Link Here

(-)bin/cat/cat.c (-4 / +10 lines)
223	} else	223	} else
224	gobble = 0;	224	gobble = 0;
225	}	225	}
226	if (nflag && (!bflag \|\| ch != '\n')) {	226	if (nflag) {
227	(void)fprintf(stdout, "%6d\t", ++line);	227	if (!bflag \|\| ch != '\n') {
228	if (ferror(stdout))	228	(void)fprintf(stdout, "%6d\t", ++line);
229	break;	229	if (ferror(stdout))
		230	break;
		231	} else if (eflag) {
		232	(void)fprintf(stdout, "%6s\t", "");
		233	if (ferror(stdout))
		234	break;
		235	}
230	}	236	}
231	}	237	}
232	if (ch == '\n') {	238	if (ch == '\n') {