===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/apropos/Attic/apropos.c,v
retrieving revision 1.1.1.1
retrieving revision 1.8
diff -u -r1.1.1.1 -r1.8
--- src/usr.bin/apropos/Attic/apropos.c	1995/10/18 08:44:52	1.1.1.1
+++ src/usr.bin/apropos/Attic/apropos.c	2002/02/16 21:27:43	1.8
@@ -1,3 +1,4 @@
+/*      $OpenBSD: apropos.c,v 1.8 2002/02/16 21:27:43 millert Exp $      */
 /*      $NetBSD: apropos.c,v 1.5 1995/09/04 20:46:20 tls Exp $      */
 
 /*
@@ -43,7 +44,7 @@
 #if 0
 static char sccsid[] = "@(#)apropos.c	8.8 (Berkeley) 5/4/95";
 #else
-static char rcsid[] = "$NetBSD: apropos.c,v 1.5 1995/09/04 20:46:20 tls Exp $";
+static char rcsid[] = "$OpenBSD: apropos.c,v 1.8 2002/02/16 21:27:43 millert Exp $";
 #endif
 #endif /* not lint */
 
@@ -63,11 +64,13 @@
 
 static int *found, foundman;
 
-void apropos __P((char **, char *, int));
-void lowstr __P((char *, char *));
-int match __P((char *, char *));
-void usage __P((void));
+#define	MAXLINELEN	8192		/* max line handled */
 
+void apropos(char **, char *, int);
+void lowstr(char *, char *);
+int match(char *, char *);
+void usage(void);
+
 int
 main(argc, argv)
 	int argc;
@@ -80,7 +83,7 @@
 
 	conffile = NULL;
 	p_augment = p_path = NULL;
-	while ((ch = getopt(argc, argv, "C:M:m:P:")) != EOF)
+	while ((ch = getopt(argc, argv, "C:M:m:P:")) != -1)
 		switch (ch) {
 		case 'C':
 			conffile = optarg;
@@ -139,16 +142,16 @@
 	int buildpath;
 {
 	char *end, *name, **p;
-	char buf[LINE_MAX + 1], wbuf[LINE_MAX + 1];
+	char buf[MAXLINELEN + 1], wbuf[MAXLINELEN + 1];
+	char hold[MAXPATHLEN];
 
 	for (name = path; name; name = end) {	/* through name list */
-		if (end = strchr(name, ':'))
+		if ((end = strchr(name, ':')))
 			*end++ = '\0';
 
 		if (buildpath) {
-			char hold[MAXPATHLEN + 1];
-
-			(void)sprintf(hold, "%s/%s", name, _PATH_WHATIS);
+			(void)snprintf(hold, sizeof(hold), "%s/%s", name,
+			    _PATH_WHATIS);
 			name = hold;
 		}
 
@@ -225,6 +228,6 @@
 {
 
 	(void)fprintf(stderr,
-	    "usage: apropos [-C file] [-M path] [-m path] keyword ...\n");
+	    "usage: apropos [-C file] [-M path] [-m path] keyword [...]\n");
 	exit(1);
 }