Aren/NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

PR/32759: Ulrich Heilmann: Output of cat -s -n is wrong

Browse Source 
Applied patch from David A. Holland, thanks!
This commit is contained in:
elad 2006-10-08 21:52:56 +00:00
parent f6a57672cd
commit 93bbf8101f
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
bin/cat/cat.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: cat.c,v 1.44 2006/02/26 19:44:24 christos Exp $ */ /* $NetBSD: cat.c,v 1.45 2006/10/08 21:52:56 elad 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.44 2006/02/26 19:44:24 christos Exp $"); __RCSID("$NetBSD: cat.c,v 1.45 2006/10/08 21:52:56 elad Exp $");
#endif #endif
#endif /* not lint */ #endif /* not lint */
@ -175,7 +175,10 @@ cook_buf(FILE *fp)
if (prev == '\n') { if (prev == '\n') {
if (ch == '\n') { if (ch == '\n') {
if (sflag) { if (sflag) {
if (!gobble && putchar(ch) == EOF) if (!gobble && nflag && !bflag)
(void)fprintf(stdout,
"%6d\t\n", ++line);
else if (!gobble && putchar(ch) == EOF)
break; break;
gobble = 1; gobble = 1;
continue; continue;