diff options
| author |   cgd <cgd@NetBSD.org> | 1995-04-22 11:55:13 +0000 |
|---|---|---|
| committer | cgd <cgd@NetBSD.org> | 1995-04-22 11:55:13 +0000 |
| commit | d7c608df67f7b99aee31ddf6c13d8870695f6827 (patch) | |
| tree | 72c5440808dc8be4038a4aef5a5c0314726dbb0d /banner | |
| parent | fd169b744e1a21d2e23db940204238aa795129d3 (diff) | |
| download | bsdgames-darwin-d7c608df67f7b99aee31ddf6c13d8870695f6827.tar.gz bsdgames-darwin-d7c608df67f7b99aee31ddf6c13d8870695f6827.tar.zst bsdgames-darwin-d7c608df67f7b99aee31ddf6c13d8870695f6827.zip | |
don't print 'Message:' prompt if stdin is not a terminal.
(from Masanobu Saitoh <saitoh@spa.is.uec.ac.jp> in pr 982.)
Also, fix usage string and manual page to note that width argument
for -w is _not_ optional.
Diffstat (limited to 'banner')
| -rw-r--r-- | banner/banner.6 | 10 | ||||
| -rw-r--r-- | banner/banner.c | 9 |
2 files changed, 9 insertions, 10 deletions
diff --git a/banner/banner.6 b/banner/banner.6 index f4fdc40f..0e2de635 100644 --- a/banner/banner.6 +++ b/banner/banner.6 @@ -1,4 +1,4 @@ -.\" $NetBSD: banner.6,v 1.5 1995/03/25 07:44:48 glass Exp $ +.\" $NetBSD: banner.6,v 1.6 1995/04/22 11:55:13 cgd Exp $ .\" .\" Copyright (c) 1980, 1993 .\" The Regents of the University of California. All rights reserved. @@ -41,7 +41,7 @@ .Nd print large banner on printer .Sh SYNOPSIS .Nm banner -.Op Fl w Op Ar n +.Op Fl w Ar width .Ar message ... .Sh DESCRIPTION .Nm Banner @@ -50,10 +50,8 @@ If the message is omitted, it prompts for and reads one line of its standard input. If .Fl w is given, the output is scrunched down from a width of 132 to -.Ar n , -suitable for a narrow terminal. If -.Ar n -is omitted, it defaults to 132. +.Ar width , +suitable for a narrow terminal. .Pp The output should be printed on a hard-copy device, up to 132 columns wide, with no breaks between the pages. The volume is great enough that you diff --git a/banner/banner.c b/banner/banner.c index 0b5fddd2..b3d842a2 100644 --- a/banner/banner.c +++ b/banner/banner.c @@ -1,4 +1,4 @@ -/* $NetBSD: banner.c,v 1.3 1995/03/25 07:44:49 glass Exp $ */ +/* $NetBSD: banner.c,v 1.4 1995/04/22 11:55:15 cgd Exp $ */ /* * Copyright (c) 1980, 1993, 1994 @@ -43,13 +43,13 @@ static char copyright[] = #if 0 static char sccsid[] = "@(#)banner.c 8.3 (Berkeley) 4/2/94"; #else -static char rcsid[] = "$NetBSD: banner.c,v 1.3 1995/03/25 07:44:49 glass Exp $"; +static char rcsid[] = "$NetBSD: banner.c,v 1.4 1995/04/22 11:55:15 cgd Exp $"; #endif #endif /* not lint */ /* * banner - prints large signs - * banner [-w#] [-d] [-t] message ... + * banner [-w width] [-d] [-t] message ... */ #include <err.h> @@ -1071,7 +1071,8 @@ main(argc, argv) } nchars = strlen(message); } else { - fprintf(stderr,"Message: "); + if (isatty(fileno(stdin))) + fprintf(stderr,"Message: "); (void)fgets(message, sizeof(message), stdin); nchars = strlen(message); message[nchars--] = '\0'; /* get rid of newline */ |