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

Don't print a trailing space when counting from stdin.

This commit is contained in:
mycroft 1999-03-05 22:31:06 +00:00
parent 263d2c47a5
commit 7b58b02044
1 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
usr.bin/wc/wc.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: wc.c,v 1.18 1999/03/05 22:24:01 mycroft Exp $ */ /* $NetBSD: wc.c,v 1.19 1999/03/05 22:31:06 mycroft Exp $ */
/* /*
* Copyright (c) 1980, 1987, 1991, 1993 * Copyright (c) 1980, 1987, 1991, 1993
@ -43,7 +43,7 @@ __COPYRIGHT("@(#) Copyright (c) 1980, 1987, 1991, 1993\n\
#if 0 #if 0
static char sccsid[] = "@(#)wc.c 8.2 (Berkeley) 5/2/95"; static char sccsid[] = "@(#)wc.c 8.2 (Berkeley) 5/2/95";
#else #else
__RCSID("$NetBSD: wc.c,v 1.18 1999/03/05 22:24:01 mycroft Exp $"); __RCSID("$NetBSD: wc.c,v 1.19 1999/03/05 22:31:06 mycroft Exp $");
#endif #endif
#endif /* not lint */ #endif /* not lint */
@ -129,9 +129,8 @@ main(argc, argv)
cnt(*argv); cnt(*argv);
} while(*++argv); } while(*++argv);
if (dototal) { if (dototal)
print_counts(tlinect, twordct, tcharct, "total"); print_counts(tlinect, twordct, tcharct, "total");
}
} }
exit(rval); exit(rval);
@ -240,7 +239,7 @@ cnt(file)
} }
} }
print_counts(linect, wordct, charct, file ? file : ""); print_counts(linect, wordct, charct, file ? file : 0);
/* don't bother checkint doline, doword, or dochar --- speeds /* don't bother checkint doline, doword, or dochar --- speeds
up the common case */ up the common case */
@ -269,7 +268,10 @@ print_counts(lines, words, chars, name)
if (dochar) if (dochar)
printf(WCFMT, (WCCAST)chars); printf(WCFMT, (WCCAST)chars);
printf(" %s\n", name); if (name)
printf(" %s\n", name);
else
printf("\n");
} }
static void static void