Merge from Lite2 (reject widths <= 0 instead of pretending that they are 80).
This commit is contained in:
parent
e2457a1d79
commit
c55d6c087d
Notes:
svn2git
2020-12-20 02:59:44 +00:00
svn path=/head/; revision=27226
@ -38,7 +38,7 @@ static char copyright[] =
|
||||
#endif /* not lint */
|
||||
|
||||
#ifndef lint
|
||||
static char sccsid[] = "@(#)banner.c 8.3 (Berkeley) 4/2/94";
|
||||
static char sccsid[] = "@(#)banner.c 8.4 (Berkeley) 4/29/95";
|
||||
#endif /* not lint */
|
||||
|
||||
/*
|
||||
@ -1026,26 +1026,26 @@ int width = DWIDTH; /* -w option: scrunch letters to 80 columns */
|
||||
int
|
||||
main(argc, argv)
|
||||
int argc;
|
||||
char **argv;
|
||||
char *argv[];
|
||||
{
|
||||
int ch;
|
||||
|
||||
while ((ch = getopt(argc, argv, "w:td")) != -1)
|
||||
switch(ch) {
|
||||
case 'w':
|
||||
width = atoi(optarg);
|
||||
if (width <= 0)
|
||||
width = 80;
|
||||
break;
|
||||
switch (ch) {
|
||||
case 'd':
|
||||
debug = 1;
|
||||
break;
|
||||
case 't':
|
||||
trace = 1;
|
||||
break;
|
||||
case 'w':
|
||||
width = atoi(optarg);
|
||||
if (width <= 0)
|
||||
errx(1, "illegal argument for -w option");
|
||||
break;
|
||||
case '?':
|
||||
default:
|
||||
fprintf(stderr, "usage: banner [-w width]\n");
|
||||
(void)fprintf(stderr, "usage: banner [-w width]\n");
|
||||
exit(1);
|
||||
}
|
||||
argc -= optind;
|
||||
|
Loading…
Reference in New Issue
Block a user