protos

21 files changed, 92 insertions, 69 deletions

diff --git a/usr.bin/at/at.h b/usr.bin/at/at.h
index 9d20d4d4a8b..ea05e3dd224 100644
--- a/usr.bin/at/at.h
+++ b/usr.bin/at/at.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: at.h,v 1.9 2003/03/14 04:15:04 millert Exp $	*/
+/*	$OpenBSD: at.h,v 1.10 2003/07/02 21:04:09 deraadt Exp $	*/
 
 /*
  *  at.h -  header for at(1)
@@ -44,3 +44,7 @@ struct atjob {
 
 #define DEFAULT_BATCH_QUEUE	'E'
 #define DEFAULT_AT_QUEUE	'c'
+
+
+time_t	parsetime(int, char **);
+
diff --git a/usr.bin/aucat/aucat.c b/usr.bin/aucat/aucat.c
index 03156392020..fab357e4c25 100644
--- a/usr.bin/aucat/aucat.c
+++ b/usr.bin/aucat/aucat.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: aucat.c,v 1.6 2003/06/10 22:20:44 deraadt Exp $	*/
+/*	$OpenBSD: aucat.c,v 1.7 2003/07/02 21:04:09 deraadt Exp $	*/
 /*
  * Copyright (c) 1997 Kenneth Stailey.  All rights reserved.
  *
@@ -40,6 +40,8 @@
  * aucat: concatinate and play Sun 8-bit .au files
  */
 
+int	playfile(int, char *);
+
 /* function playfile: given a file which is positioned at the beginning
  * of what is assumed to be an .au data stream copy it out to the audio
  * device.  Return 0 on success, -1 on failure.
diff --git a/usr.bin/awk/lex.c b/usr.bin/awk/lex.c
index 96d61ebdfc0..49471d46f5c 100644
--- a/usr.bin/awk/lex.c
+++ b/usr.bin/awk/lex.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: lex.c,v 1.6 2002/12/19 21:24:28 millert Exp $	*/
+/*	$OpenBSD: lex.c,v 1.7 2003/07/02 21:04:09 deraadt Exp $	*/
 /****************************************************************
 Copyright (C) Lucent Technologies 1997
 All Rights Reserved
@@ -97,6 +97,10 @@ Keyword keywords[] ={	/* keep sorted: binary searched */
 #define	RET(x)	return(x)
 #endif
 
+int peek(void);
+int gettok(char **, int *);
+int binsearch(char *, Keyword *, int);
+
 int peek(void)
 {
 	int c = input();
diff --git a/usr.bin/awk/run.c b/usr.bin/awk/run.c
index 6b00abd130a..b36e7d01c9c 100644
--- a/usr.bin/awk/run.c
+++ b/usr.bin/awk/run.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: run.c,v 1.21 2003/04/28 03:07:40 tedu Exp $	*/
+/*	$OpenBSD: run.c,v 1.22 2003/07/02 21:04:09 deraadt Exp $	*/
 /****************************************************************
 Copyright (C) Lucent Technologies 1997
 All Rights Reserved
@@ -89,6 +89,10 @@ static Cell	tempcell	={ OCELL, CTEMP, 0, "", 0.0, NUM|STR|DONTFREE };
 
 Node	*curnode = NULL;	/* the node being executed, for debugging */
 
+void	stdinit(void);
+void	flush_all(void);
+
+
 /* buffer memory management */
 int adjbuf(char **pbuf, int *psiz, int minlen, int quantum, char **pbptr,
 	const char *whatrtn)
diff --git a/usr.bin/bdes/bdes.c b/usr.bin/bdes/bdes.c
index 0a784bdd53d..52cb84366ee 100644
--- a/usr.bin/bdes/bdes.c
+++ b/usr.bin/bdes/bdes.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: bdes.c,v 1.11 2003/06/10 22:20:45 deraadt Exp $	*/
+/*	$OpenBSD: bdes.c,v 1.12 2003/07/02 21:04:09 deraadt Exp $	*/
 /*	$NetBSD: bdes.c,v 1.2 1995/03/26 03:33:19 glass Exp $	*/
 
 /*-
@@ -47,7 +47,7 @@ static char copyright[] =
 #if 0
 static char sccsid[] = "@(#)bdes.c	8.1 (Berkeley) 6/6/93";
 #else
-static char rcsid[] = "$OpenBSD: bdes.c,v 1.11 2003/06/10 22:20:45 deraadt Exp $";
+static char rcsid[] = "$OpenBSD: bdes.c,v 1.12 2003/07/02 21:04:09 deraadt Exp $";
 #endif
 #endif /* not lint */
 
@@ -90,7 +90,7 @@ static char rcsid[] = "$OpenBSD: bdes.c,v 1.11 2003/06/10 22:20:45 deraadt Exp $
 #include <string.h>
 
 typedef char Desbuf[8];
-int 	tobinhexi(char, int);
+int 	tobinhex(char, int);
 void 	cvtkey(char *, char *);
 int 	setbits(char *, int);
 void 	makekey(Desbuf);
@@ -213,7 +213,7 @@ main(int ac, char *av[])
 	/* process the argument list */
 	kflag = 0;
 	while ((i = getopt(argc, argv, "abdF:f:k:m:o:pv:")) != -1)
-		switch(i) {
+		switch (i) {
 		case 'a':		/* key is ASCII */
 			keybase = KEY_ASCII;
 			break;
@@ -281,9 +281,9 @@ main(int ac, char *av[])
 	makekey(msgbuf);
 	inverse = (alg == ALG_CBC || alg == ALG_ECB) && mode == MODE_DECRYPT;
 
-	switch(alg) {
+	switch (alg) {
 	case ALG_CBC:
-		switch(mode) {
+		switch (mode) {
 		case MODE_AUTHENTICATE:	/* authenticate using CBC mode */
 			cbcauth();
 			break;
@@ -296,7 +296,7 @@ main(int ac, char *av[])
 		}
 		break;
 	case ALG_CFB:
-		switch(mode) {
+		switch (mode) {
 		case MODE_AUTHENTICATE:	/* authenticate using CFB mode */
 			cfbauth();
 			break;
@@ -309,7 +309,7 @@ main(int ac, char *av[])
 		}
 		break;
 	case ALG_CFBA:
-		switch(mode) {
+		switch (mode) {
 		case MODE_AUTHENTICATE:	/* authenticate using CFBA mode */
 			err(1, "can't authenticate with CFBA mode");
 			break;
@@ -322,7 +322,7 @@ main(int ac, char *av[])
 		}
 		break;
 	case ALG_ECB:
-		switch(mode) {
+		switch (mode) {
 		case MODE_AUTHENTICATE:	/* authenticate using ECB mode */
 			err(1, "can't authenticate with ECB mode");
 			break;
@@ -335,7 +335,7 @@ main(int ac, char *av[])
 		}
 		break;
 	case ALG_OFB:
-		switch(mode) {
+		switch (mode) {
 		case MODE_AUTHENTICATE:	/* authenticate using OFB mode */
 			err(1, "can't authenticate with OFB mode");
 			break;
@@ -357,7 +357,7 @@ main(int ac, char *av[])
 int
 tobinhex(char c, int radix)
 {
-	switch(c) {
+	switch (c) {
 	case '0':		return(0x0);
 	case '1':		return(0x1);
 	case '2':		return(radix > 2 ? 0x2 : -1);
@@ -393,7 +393,7 @@ cvtkey(char *obuf, char *ibuf)
 	/*
 	 * just switch on the key base
 	 */
-	switch(keybase) {
+	switch (keybase) {
 	case KEY_ASCII:			/* ASCII to integer */
 		(void)strncpy(obuf, ibuf, 8);
 		return;
diff --git a/usr.bin/chpass/pw_yp.c b/usr.bin/chpass/pw_yp.c
index 3113fb665b2..11a9614bd3e 100644
--- a/usr.bin/chpass/pw_yp.c
+++ b/usr.bin/chpass/pw_yp.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: pw_yp.c,v 1.18 2003/06/03 02:56:06 millert Exp $	*/
+/*	$OpenBSD: pw_yp.c,v 1.19 2003/07/02 21:04:09 deraadt Exp $	*/
 /*	$NetBSD: pw_yp.c,v 1.5 1995/03/26 04:55:33 glass Exp $	*/
 
 /*
@@ -33,7 +33,7 @@
 #if 0
 static char sccsid[] = "@(#)pw_yp.c	1.0 2/2/93";
 #else
-static char rcsid[] = "$OpenBSD: pw_yp.c,v 1.18 2003/06/03 02:56:06 millert Exp $";
+static char rcsid[] = "$OpenBSD: pw_yp.c,v 1.19 2003/07/02 21:04:09 deraadt Exp $";
 #endif
 #endif /* not lint */
 
@@ -54,6 +54,7 @@ static char rcsid[] = "$OpenBSD: pw_yp.c,v 1.18 2003/06/03 02:56:06 millert Exp
 #define passwd yp_passwd_rec
 #include <rpcsvc/yppasswd.h>
 #undef passwd
+#include "chpass.h"
 
 extern char *__progname;
 
diff --git a/usr.bin/colcrt/colcrt.c b/usr.bin/colcrt/colcrt.c
index 02195e9bb6a..01ba34a7968 100644
--- a/usr.bin/colcrt/colcrt.c
+++ b/usr.bin/colcrt/colcrt.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: colcrt.c,v 1.7 2003/06/28 15:36:35 mickey Exp $	*/
+/*	$OpenBSD: colcrt.c,v 1.8 2003/07/02 21:04:09 deraadt Exp $	*/
 /*	$NetBSD: colcrt.c,v 1.3 1995/03/26 05:31:00 glass Exp $	*/
 
 /*
@@ -40,7 +40,7 @@ static char copyright[] =
 #if 0
 static char sccsid[] = "@(#)colcrt.c	8.1 (Berkeley) 6/6/93";
 #else
-static char rcsid[] = "$OpenBSD: colcrt.c,v 1.7 2003/06/28 15:36:35 mickey Exp $";
+static char rcsid[] = "$OpenBSD: colcrt.c,v 1.8 2003/07/02 21:04:09 deraadt Exp $";
 #endif
 #endif /* not lint */
 
@@ -49,6 +49,7 @@ static char rcsid[] = "$OpenBSD: colcrt.c,v 1.7 2003/06/28 15:36:35 mickey Exp $
 #include <stdlib.h>
 #include <string.h>
 #include <stdio.h>
+#include <err.h>
 
 /*
  * colcrt - replaces col for crts with new nroff esp. when using tbl.
@@ -86,7 +87,7 @@ main(int argc, char *argv[])
 	int c;
 
 	argc--;
-	*argv++;
+	argv++;
 	while (argc > 0 && argv[0][0] == '-') {
 		switch (argv[0][1]) {
 			case 0:
diff --git a/usr.bin/du/du.c b/usr.bin/du/du.c
index e1f1b374cb8..9d08df612ca 100644
--- a/usr.bin/du/du.c
+++ b/usr.bin/du/du.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: du.c,v 1.13 2003/06/10 22:20:46 deraadt Exp $	*/
+/*	$OpenBSD: du.c,v 1.14 2003/07/02 21:04:09 deraadt Exp $	*/
 /*	$NetBSD: du.c,v 1.11 1996/10/18 07:20:35 thorpej Exp $	*/
 
 /*
@@ -43,7 +43,7 @@ static char copyright[] =
 #if 0
 static char sccsid[] = "@(#)du.c	8.5 (Berkeley) 5/4/95";
 #else
-static char rcsid[] = "$OpenBSD: du.c,v 1.13 2003/06/10 22:20:46 deraadt Exp $";
+static char rcsid[] = "$OpenBSD: du.c,v 1.14 2003/07/02 21:04:09 deraadt Exp $";
 #endif
 #endif /* not lint */
 
@@ -60,9 +60,12 @@ static char rcsid[] = "$OpenBSD: du.c,v 1.13 2003/06/10 22:20:46 deraadt Exp $";
 #include <string.h>
 #include <unistd.h>
 
+typedef enum { NONE = 0, KILO, MEGA, GIGA, TERA, PETA /* , EXA */ } unit_t;
+
 int	 linkchk(FTSENT *);
 void	 prtout(quad_t, char *, int);
 void	 usage(void);
+unit_t	 unit_adjust(double *);
 
 int
 main(int argc, char *argv[])
@@ -251,8 +254,6 @@ linkchk(FTSENT *p)
  * the end.  Makes output compact and easy-to-read. 
  */
 
-typedef enum { NONE = 0, KILO, MEGA, GIGA, TERA, PETA /* , EXA */ } unit_t;
-
 unit_t
 unit_adjust(double *val)
 {
diff --git a/usr.bin/encrypt/encrypt.c b/usr.bin/encrypt/encrypt.c
index e62b988c6ea..5c0c983fa6f 100644
--- a/usr.bin/encrypt/encrypt.c
+++ b/usr.bin/encrypt/encrypt.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: encrypt.c,v 1.18 2003/06/14 23:19:18 millert Exp $	*/
+/*	$OpenBSD: encrypt.c,v 1.19 2003/07/02 21:04:09 deraadt Exp $	*/
 
 /*
  * Copyright (c) 1996, Jason Downs.  All rights reserved.
@@ -49,6 +49,10 @@
 extern char *__progname;
 char buffer[_PASSWORD_LEN];
 
+void	usage(void);
+char	*trim(char *);
+void	print_passwd(char *, int, void *);
+
 void
 usage(void)
 {
diff --git a/usr.bin/file/file.c b/usr.bin/file/file.c
index 9f388117213..a51952350bf 100644
--- a/usr.bin/file/file.c
+++ b/usr.bin/file/file.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: file.c,v 1.12 2003/06/13 18:31:14 deraadt Exp $	*/
+/*	$OpenBSD: file.c,v 1.13 2003/07/02 21:04:09 deraadt Exp $	*/
 
 /*
  * file - find type of a file or files - main program.
@@ -31,7 +31,7 @@
  */
 
 #ifndef	lint
-static char *moduleid = "$OpenBSD: file.c,v 1.12 2003/06/13 18:31:14 deraadt Exp $";
+static char *moduleid = "$OpenBSD: file.c,v 1.13 2003/07/02 21:04:09 deraadt Exp $";
 #endif	/* lint */
 
 #include <stdio.h>
@@ -94,9 +94,7 @@ static short	byteconv2(int, int, int);
  * main - parse arguments and handle options
  */
 int
-main(argc, argv)
-int argc;
-char *argv[];
+main(int argc, char *argv[])
 {
 	int c;
 	int check = 0, didsomefiles = 0, errflg = 0, ret = 0, app = 0;
diff --git a/usr.bin/file/file.h b/usr.bin/file/file.h
index 0f02bdf4087..c9586b3aaaa 100644
--- a/usr.bin/file/file.h
+++ b/usr.bin/file/file.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: file.h,v 1.13 2003/06/13 18:31:14 deraadt Exp $	*/
+/*	$OpenBSD: file.h,v 1.14 2003/07/02 21:04:10 deraadt Exp $	*/
 
 /*
  * file.h - definitions for file(1) program
@@ -147,4 +147,7 @@ extern char *sys_errlist[];
 #define	MAXPATHLEN	512
 #endif
 
+int	pipe2file(int, void *, size_t);
+void	error(const char *, ...);
+
 #endif /* __file_h__ */
diff --git a/usr.bin/file/tar.h b/usr.bin/file/tar.h
index 9246a133bd0..82863d4dffc 100644
--- a/usr.bin/file/tar.h
+++ b/usr.bin/file/tar.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: tar.h,v 1.3 1997/02/09 23:58:37 millert Exp $	*/
+/*	$OpenBSD: tar.h,v 1.4 2003/07/02 21:04:10 deraadt Exp $	*/
 
 /*
  * Header file for public domain tar (tape archive) program.
@@ -166,15 +166,3 @@ TAR_EXTERN struct link	*linklist;	/* Points to first link in list */
  * Error recovery stuff
  */
 TAR_EXTERN char		read_error_flag;
-
-
-/*
- * Declarations of functions available to the world.
- */
-/*LINTLIBRARY*/
-union record *findrec();
-void userec();
-union record *endofrecs();
-void anno();
-#define	 annorec(stream, msg)	anno(stream, msg, 0)	/* Cur rec */
-#define	annofile(stream, msg)	anno(stream, msg, 1)	/* Saved rec */
diff --git a/usr.bin/find/option.c b/usr.bin/find/option.c
index d8f6a515a50..697a3ec55b7 100644
--- a/usr.bin/find/option.c
+++ b/usr.bin/find/option.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: option.c,v 1.16 2003/06/26 07:27:29 deraadt Exp $	*/
+/*	$OpenBSD: option.c,v 1.17 2003/07/02 21:04:10 deraadt Exp $	*/
 
 /*-
  * Copyright (c) 1990, 1993
@@ -34,7 +34,7 @@
 
 #ifndef lint
 /*static char sccsid[] = "from: @(#)option.c	8.1 (Berkeley) 6/6/93";*/
-static char rcsid[] = "$OpenBSD: option.c,v 1.16 2003/06/26 07:27:29 deraadt Exp $";
+static char rcsid[] = "$OpenBSD: option.c,v 1.17 2003/07/02 21:04:10 deraadt Exp $";
 #endif /* not lint */
 
 #include <sys/types.h>
@@ -49,6 +49,8 @@ static char rcsid[] = "$OpenBSD: option.c,v 1.16 2003/06/26 07:27:29 deraadt Exp
 #include "find.h"
 #include "extern.h"
 
+int typecompare(const void *, const void *);
+
 /* NB: the following table must be sorted lexically. */
 static OPTION options[] = {
 	{ "!",		N_NOT,		c_not,		O_ZERO },
@@ -144,7 +146,6 @@ OPTION *
 option(char *name)
 {
 	OPTION tmp;
-	int typecompare(const void *, const void *);
 
 	tmp.name = name;
 	return ((OPTION *)bsearch(&tmp, options,
diff --git a/usr.bin/finger/util.c b/usr.bin/finger/util.c
index 0c570af2063..98be72cc068 100644
--- a/usr.bin/finger/util.c
+++ b/usr.bin/finger/util.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: util.c,v 1.18 2003/06/25 21:10:55 deraadt Exp $	*/
+/*	$OpenBSD: util.c,v 1.19 2003/07/02 21:04:10 deraadt Exp $	*/
 
 /*
  * Copyright (c) 1989 The Regents of the University of California.
@@ -35,7 +35,7 @@
 
 #ifndef lint
 /*static char sccsid[] = "from: @(#)util.c	5.14 (Berkeley) 1/17/91";*/
-static char rcsid[] = "$OpenBSD: util.c,v 1.18 2003/06/25 21:10:55 deraadt Exp $";
+static char rcsid[] = "$OpenBSD: util.c,v 1.19 2003/07/02 21:04:10 deraadt Exp $";
 #endif /* not lint */
 
 #include <sys/types.h>
@@ -56,8 +56,10 @@ static char rcsid[] = "$OpenBSD: util.c,v 1.18 2003/06/25 21:10:55 deraadt Exp $
 #include "finger.h"
 #include "extern.h"
 
-char *estrdup(char *);
-WHERE *walloc(PERSON *pn);
+char	*estrdup(char *);
+WHERE	*walloc(PERSON *pn);
+void	find_idle_and_ttywrite(WHERE *);
+void	userinfo(PERSON *, struct passwd *);
 
 void
 find_idle_and_ttywrite(WHERE *w)
diff --git a/usr.bin/fstat/fstat.c b/usr.bin/fstat/fstat.c
index 47fe4b4e13e..c4a5eeab5b3 100644
--- a/usr.bin/fstat/fstat.c
+++ b/usr.bin/fstat/fstat.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: fstat.c,v 1.46 2003/06/28 16:49:44 deraadt Exp $	*/
+/*	$OpenBSD: fstat.c,v 1.47 2003/07/02 21:04:10 deraadt Exp $	*/
 
 /*-
  * Copyright (c) 1988, 1993
@@ -37,7 +37,7 @@ static char copyright[] =
 
 #ifndef lint
 /*static char sccsid[] = "from: @(#)fstat.c	8.1 (Berkeley) 6/6/93";*/
-static char *rcsid = "$OpenBSD: fstat.c,v 1.46 2003/06/28 16:49:44 deraadt Exp $";
+static char *rcsid = "$OpenBSD: fstat.c,v 1.47 2003/07/02 21:04:10 deraadt Exp $";
 #endif /* not lint */
 
 #include <sys/param.h>
@@ -160,8 +160,10 @@ void vtrans(struct vnode *, int, int, off_t);
 int getfname(char *);
 void pipetrans(struct pipe *, int);
 void kqueuetrans(struct kqueue *, int);
-void cryptotrans(void *, int i);
-void systracetrans(struct fsystrace *, int i);
+void cryptotrans(void *, int);
+void systracetrans(struct fsystrace *, int);
+char *getmnton(struct mount *);
+const char *inet6_addrstr(struct in6_addr *);
 
 int
 main(int argc, char *argv[])
@@ -398,7 +400,7 @@ vtrans(struct vnode *vp, int i, int flag, off_t offset)
 	struct vnode vn;
 	struct filestat fst;
 	char rw[3], mode[17];
-	char *badtype = NULL, *filename, *getmnton(struct mount *);
+	char *badtype = NULL, *filename;
 
 	filename = badtype = NULL;
 	if (!KVM_READ(vp, &vn, sizeof (struct vnode))) {
diff --git a/usr.bin/fstat/isofs.c b/usr.bin/fstat/isofs.c
index f2c46ff3d43..243c01fa72a 100644
--- a/usr.bin/fstat/isofs.c
+++ b/usr.bin/fstat/isofs.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: isofs.c,v 1.6 2003/06/03 02:56:08 millert Exp $	*/
+/*	$OpenBSD: isofs.c,v 1.7 2003/07/02 21:04:10 deraadt Exp $	*/
 
 /*-
  * Copyright (c) 1988, 1993
@@ -73,6 +73,8 @@
 
 extern pid_t Pid;
 
+int	isofs_filestat(struct vnode *, struct filestat *);
+
 int
 isofs_filestat(struct vnode *vp, struct filestat *fsp)
 {
diff --git a/usr.bin/ftp/main.c b/usr.bin/ftp/main.c
index 99566e611ce..1b03784d8f2 100644
--- a/usr.bin/ftp/main.c
+++ b/usr.bin/ftp/main.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: main.c,v 1.53 2003/06/03 02:56:08 millert Exp $	*/
+/*	$OpenBSD: main.c,v 1.54 2003/07/02 21:04:10 deraadt Exp $	*/
 /*	$NetBSD: main.c,v 1.24 1997/08/18 10:20:26 lukem Exp $	*/
 
 /*
@@ -69,7 +69,7 @@ static char copyright[] =
 #if 0
 static char sccsid[] = "@(#)main.c	8.6 (Berkeley) 10/9/94";
 #else
-static char rcsid[] = "$OpenBSD: main.c,v 1.53 2003/06/03 02:56:08 millert Exp $";
+static char rcsid[] = "$OpenBSD: main.c,v 1.54 2003/07/02 21:04:10 deraadt Exp $";
 #endif
 #endif /* not lint */
 
@@ -94,9 +94,7 @@ static char rcsid[] = "$OpenBSD: main.c,v 1.53 2003/06/03 02:56:08 millert Exp $
 int family = PF_UNSPEC;
 
 int
-main(argc, argv)
-	volatile int argc;
-	char ** volatile argv;
+main(volatile int argc, char *argv[])
 {
 	int ch, top, rval;
 	struct passwd *pw = NULL;
diff --git a/usr.bin/grep/grep.h b/usr.bin/grep/grep.h
index cc163e820f1..8163bf0627c 100644
--- a/usr.bin/grep/grep.h
+++ b/usr.bin/grep/grep.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: grep.h,v 1.7 2003/06/25 17:28:00 millert Exp $	*/
+/*	$OpenBSD: grep.h,v 1.8 2003/07/02 21:04:10 deraadt Exp $	*/
 
 /*-
  * Copyright (c) 1999 James Howard and Dag-Erling Coïdan Smørgrav
@@ -92,6 +92,7 @@ void		 initqueue(void);
 void		 enqueue(str_t *x);
 void		 printqueue(void);
 void		 clearqueue(void);
+int		 countqueue(void);
 
 /* mmfile.c */
 typedef struct mmfile {
diff --git a/usr.bin/passwd/pwd_gensalt.c b/usr.bin/passwd/pwd_gensalt.c
index 66598aad4ca..893a9a0560a 100644
--- a/usr.bin/passwd/pwd_gensalt.c
+++ b/usr.bin/passwd/pwd_gensalt.c
@@ -1,4 +1,5 @@
-/* $OpenBSD: pwd_gensalt.c,v 1.16 2003/04/05 15:56:27 deraadt Exp $ */
+/*	$OpenBSD: pwd_gensalt.c,v 1.17 2003/07/02 21:04:10 deraadt Exp $ */
+
 /*
  * Copyright 1997 Niels Provos <provos@physnet.uni-hamburg.de>
  * All rights reserved.
@@ -43,6 +44,7 @@
 
 void	to64(char *, int32_t, int n);
 char	*bcrypt_gensalt(u_int8_t);
+int	pwd_gensalt(char *, int, struct passwd *, login_cap_t *, char);
 
 int
 pwd_gensalt(char *salt, int saltlen, struct passwd *pwd, login_cap_t *lc, char type)
diff --git a/usr.bin/ypcat/ypcat.c b/usr.bin/ypcat/ypcat.c
index 32aa4eacc12..80294f8248d 100644
--- a/usr.bin/ypcat/ypcat.c
+++ b/usr.bin/ypcat/ypcat.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ypcat.c,v 1.9 2003/06/02 04:00:16 deraadt Exp $ */
+/*	$OpenBSD: ypcat.c,v 1.10 2003/07/02 21:04:10 deraadt Exp $ */
 
 /*
  * Copyright (c) 1992, 1993, 1996 Theo de Raadt <deraadt@theos.com>
@@ -27,7 +27,7 @@
  */
 
 #ifndef LINT
-static char rcsid[] = "$OpenBSD: ypcat.c,v 1.9 2003/06/02 04:00:16 deraadt Exp $";
+static char rcsid[] = "$OpenBSD: ypcat.c,v 1.10 2003/07/02 21:04:10 deraadt Exp $";
 #endif
 
 #include <sys/param.h>
@@ -43,6 +43,9 @@ static char rcsid[] = "$OpenBSD: ypcat.c,v 1.9 2003/06/02 04:00:16 deraadt Exp $
 #include <rpcsvc/yp.h>
 #include <rpcsvc/ypclnt.h>
 
+void	usage(void);
+int	printit(u_long, char *, int, char *, int, void *);
+
 struct ypalias {
 	char *alias, *name;
 } ypaliases[] = {
diff --git a/usr.bin/ypmatch/ypmatch.c b/usr.bin/ypmatch/ypmatch.c
index 89b1ba2347b..1c962ffe5f5 100644
--- a/usr.bin/ypmatch/ypmatch.c
+++ b/usr.bin/ypmatch/ypmatch.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ypmatch.c,v 1.9 2003/06/02 04:00:17 deraadt Exp $ */
+/*	$OpenBSD: ypmatch.c,v 1.10 2003/07/02 21:04:10 deraadt Exp $ */
 /*	$NetBSD: ypmatch.c,v 1.8 1996/05/07 01:24:52 jtc Exp $	*/
 
 /*
@@ -28,7 +28,7 @@
  */
 
 #ifndef LINT
-static char rcsid[] = "$OpenBSD: ypmatch.c,v 1.9 2003/06/02 04:00:17 deraadt Exp $";
+static char rcsid[] = "$OpenBSD: ypmatch.c,v 1.10 2003/07/02 21:04:10 deraadt Exp $";
 #endif
 
 #include <sys/param.h>
@@ -44,6 +44,8 @@ static char rcsid[] = "$OpenBSD: ypmatch.c,v 1.9 2003/06/02 04:00:17 deraadt Exp
 #include <rpcsvc/yp_prot.h>
 #include <rpcsvc/ypclnt.h>
 
+void	usage(void);
+
 struct ypalias {
 	char *alias, *name;
 } ypaliases[] = {