fix main() prototype, as per PR#5867

[bsdgames-darwin.git] / banner / banner.c

diff --git a/banner/banner.c b/banner/banner.c
index b3d842a22de225a3bedaf5ee71b9ee17719e2023..a696d0bdec74b898aa6132a054557fda4c4ac636 100644 (file)
--- a/banner/banner.c
+++ b/banner/banner.c
@@ -1,4 +1,4 @@
-/*     $NetBSD: banner.c,v 1.4 1995/04/22 11:55:15 cgd Exp $   */
+/*     $NetBSD: banner.c,v 1.7 1997/10/10 09:48:48 lukem Exp $ */

 
 /*
  * Copyright (c) 1980, 1993, 1994
 
 /*
  * Copyright (c) 1980, 1993, 1994


@@ -33,17 +33,17 @@
  * SUCH DAMAGE.
  */
 
  * SUCH DAMAGE.
  */
 

+#include <sys/cdefs.h>

 #ifndef lint
 #ifndef lint

-static char copyright[] =
-"@(#) Copyright (c) 1980, 1993, 1994\n\
-       The Regents of the University of California.  All rights reserved.\n";
+__COPYRIGHT("@(#) Copyright (c) 1980, 1993, 1994\n\
+       The Regents of the University of California.  All rights reserved.\n");

 #endif /* not lint */
 
 #ifndef lint
 #if 0
 #endif /* not lint */
 
 #ifndef lint
 #if 0

-static char sccsid[] = "@(#)banner.c   8.3 (Berkeley) 4/2/94";
+static char sccsid[] = "@(#)banner.c   8.4 (Berkeley) 4/29/95";

 #else
 #else

-static char rcsid[] = "$NetBSD: banner.c,v 1.4 1995/04/22 11:55:15 cgd Exp $";
+__RCSID("$NetBSD: banner.c,v 1.7 1997/10/10 09:48:48 lukem Exp $");

 #endif
 #endif /* not lint */
 
 #endif
 #endif /* not lint */
 


@@ -1029,29 +1029,32 @@ char    print[DWIDTH];
 int    debug, i, j, linen, max, nchars, pc, term, trace, x, y;
 int    width = DWIDTH; /* -w option: scrunch letters to 80 columns */
 
 int    debug, i, j, linen, max, nchars, pc, term, trace, x, y;
 int    width = DWIDTH; /* -w option: scrunch letters to 80 columns */
 

+
+int main __P((int, char *[]));
+

 int
 main(argc, argv)
        int argc;
 int
 main(argc, argv)
        int argc;

-       char **argv;
+       char *argv[];

 { 
        int ch;
 
 { 
        int ch;
 

-       while ((ch = getopt(argc, argv, "w:td")) != EOF)
-               switch(ch) {
-               case 'w':
-                       width = atoi(optarg);
-                       if (width <= 0)
-                               width = 80;
-                       break;
+       while ((ch = getopt(argc, argv, "w:td")) != -1)
+               switch (ch) {

                case 'd':
                        debug = 1;
                        break;
                case 't':
                        trace = 1;
                        break;
                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:
                case '?':
                default:

-                       fprintf(stderr, "usage: banner [-w width]\n");
+                       (void)fprintf(stderr, "usage: banner [-w width]\n");

                        exit(1);
                }
        argc -= optind;
                        exit(1);
                }
        argc -= optind;