6274733 gcc and ucbcmd/chown don't get along

6274741 gcc and ucbcmd/install.d don't get along
6274742 gcc and ucbcmd/ln don't get along
6274785 gcc and ucbcmd/stty don't get along
6274798 gcc and ucbcmd/touch don't get along
6274801 gcc and ucbcmd/tr don't get along
6274805 gcc and ucbcmd/tset don't get along
6274816 gcc and ucbcmd/whereis don't get along

9 files changed, 238 insertions, 232 deletions

diff --git a/usr/src/ucbcmd/chown/chown.c b/usr/src/ucbcmd/chown/chown.c
index 6d8e102968..9567b1d44e 100644
--- a/usr/src/ucbcmd/chown/chown.c
+++ b/usr/src/ucbcmd/chown/chown.c
@@ -60,12 +60,15 @@ int	status;
 int	fflag;
 int	rflag;
 
-main(argc, argv)
-	char *argv[];
+void fatal(int, char *, char *);
+
+int
+main(int argc, char *argv[])
 {
-	register int c;
+	int c;
 	gid_t gid;
-	register char *cp, *group;
+	char *cp, *group;
+	char optchar[2];
 	struct group *grp;
 	extern char *strchr();
 
@@ -84,7 +87,9 @@ main(argc, argv)
 			break;
 
 		default:
-			fatal(255, "unknown option: %c", *cp);
+			optchar[0] = *cp;
+			optchar[1] = '\0';
+			fatal(255, "unknown option: %s", optchar);
 		}
 		argv++, argc--;
 	}
@@ -144,13 +149,13 @@ main(argc, argv)
 			continue;
 		}
 	}
-	exit(status);
+	return (status);
 }
 
-isnumber(s)
-	char *s;
+int
+isnumber(char *s)
 {
-	register c;
+	int c;
 
 	while (c = *s++)
 		if (!isdigit(c))
@@ -158,13 +163,11 @@ isnumber(s)
 	return (1);
 }
 
-chownr(dir, uid, gid)
-	char *dir;
-	uid_t uid;
-	gid_t gid;
+int
+chownr(char *dir, uid_t uid, gid_t gid)
 {
-	register DIR *dirp;
-	register struct dirent *dp;
+	DIR *dirp;
+	struct dirent *dp;
 	struct stat st;
 	char savedir[1024];
 	int ecode;
@@ -210,8 +213,8 @@ chownr(dir, uid, gid)
 	return (ecode);
 }
 
-error(fmt, a)
-	char *fmt, *a;
+int
+error(char *fmt, char *a)
 {
 
 	if (!fflag) {
@@ -222,9 +225,8 @@ error(fmt, a)
 	return (!fflag);
 }
 
-fatal(status, fmt, a)
-	int status;
-	char *fmt, *a;
+void
+fatal(int status, char *fmt, char *a)
 {
 
 	fflag = 0;
@@ -232,8 +234,8 @@ fatal(status, fmt, a)
 	exit(status);
 }
 
-Perror(s)
-	char *s;
+int
+Perror(char *s)
 {
 
 	if (!fflag) {
diff --git a/usr/src/ucbcmd/install.d/install.c b/usr/src/ucbcmd/install.d/install.c
index f0ec328457..0679ffaf9b 100644
--- a/usr/src/ucbcmd/install.d/install.c
+++ b/usr/src/ucbcmd/install.d/install.c
@@ -65,9 +65,8 @@ extern int errno;
 int copy();
 void usage();
 
-main(argc, argv)
-	int	argc;
-	char	**argv;
+int
+main(int argc, char **argv)
 {
 	extern char	*optarg;
 	extern int	optind;
@@ -182,8 +181,7 @@ main(argc, argv)
         rc = 0;
         for (i = 0; i < argc-1; i++)
                 rc |= install(argv[i], argv[argc-1]);
-        exit(rc);
-	/* NOTREACHED */
+        return (rc);
 }
 
 int
@@ -302,9 +300,9 @@ copy_done:
  */
 int
 atoo(str)
-        register char   *str;
+        char   *str;
 {        
-        register int    val;
+        int    val;
  
         for (val = 0; isdigit(*str); ++str)
                 val = val * 8 + *str - '0';
diff --git a/usr/src/ucbcmd/ln/ln.c b/usr/src/ucbcmd/ln/ln.c
index 6bf02b82da..098ed00b3e 100644
--- a/usr/src/ucbcmd/ln/ln.c
+++ b/usr/src/ucbcmd/ln/ln.c
@@ -1,19 +1,18 @@
+/*
+ * Copyright 1991 Sun Microsystems, Inc.  All rights reserved.
+ * Use is subject to license terms.
+ */
+
 /*	Copyright (c) 1984, 1986, 1987, 1988, 1989 AT&T	*/
 /*	  All Rights Reserved  	*/
 
-
 /*
  * Copyright (c) 1980 Regents of the University of California.
  * All rights reserved. The Berkeley software License Agreement
  * specifies the terms and conditions for redistribution.
  */
 
-/*
- * Copyright (c) 1983, 1984 1985, 1986, 1987, 1988, Sun Microsystems, Inc.
- * All Rights Reserved.
- */
-
-#ident	"%Z%%M%	%I%	%E% SMI"	/* SVr4.0 1.1	*/
+#pragma ident	"%Z%%M%	%I%	%E% SMI"
 
 /*
  * ln
@@ -23,17 +22,19 @@
 #include <sys/param.h>
 #include <sys/stat.h>
 #include <errno.h>
+#include <unistd.h>
 
 struct	stat stb;
 int	fflag;		/* force flag set? */
 int	sflag;
-extern	int errno;
 
-main(argc, argv)
-	int argc;
-	register char **argv;
+int linkit(char *, char *);
+void Perror(char *);
+
+int
+main(int argc, char **argv)
 {
-	register int i, r;
+	int i, r;
 
 	argc--, argv++;
 again:
@@ -47,7 +48,7 @@ again:
 		argv++;
 		argc--;
 	}
-	if (argc == 0) 
+	if (argc == 0)
 		goto usage;
 	else if (argc == 1) {
 		argv[argc] = ".";
@@ -56,11 +57,11 @@ again:
 	if (argc > 2) {
 		if (stat(argv[argc-1], &stb) < 0)
 			goto usage;
-		if ((stb.st_mode&S_IFMT) != S_IFDIR) 
+		if ((stb.st_mode&S_IFMT) != S_IFDIR)
 			goto usage;
 	}
 	r = 0;
-	for(i = 0; i < argc-1; i++)
+	for (i = 0; i < argc-1; i++)
 		r |= linkit(argv[i], argv[argc-1]);
 	exit(r);
 usage:
@@ -68,13 +69,11 @@ usage:
 	    "Usage: ln [-f] [-s] f1\n\
        ln [-f] [-s] f1 f2\n\
        ln [-f] [-s] f1 ... fn d1\n");
-	exit(1);
+	return (1);
 }
 
-int	link(), symlink();
-
-linkit(from, to)
-	char *from, *to;
+int
+linkit(char *from, char *to)
 {
 	char destname[MAXPATHLEN + 1];
 	char *tail;
@@ -82,8 +81,8 @@ linkit(from, to)
 	char *strrchr();
 
 	/* is target a directory? */
-	if (sflag == 0 && fflag == 0 && stat(from, &stb) >= 0
-	    && (stb.st_mode&S_IFMT) == S_IFDIR) {
+	if (sflag == 0 && fflag == 0 && stat(from, &stb) >= 0 &&
+	    (stb.st_mode&S_IFMT) == S_IFDIR) {
 		printf("%s is a directory\n", from);
 		return (1);
 	}
@@ -93,7 +92,7 @@ linkit(from, to)
 			tail = from;
 		else
 			tail++;
-		if (strlen(to) + strlen(tail) >= sizeof destname - 1) {
+		if (strlen(to) + strlen(tail) >= sizeof (destname) - 1) {
 			(void) fprintf(stderr, "ln: %s/%s: Name too long\n",
 			    to, tail);
 			return (1);
@@ -113,10 +112,9 @@ linkit(from, to)
 	return (0);
 }
 
-Perror(s)
-	char *s;
+void
+Perror(char *s)
 {
-
 	(void) fprintf(stderr, "ln: ");
 	perror(s);
 }
diff --git a/usr/src/ucbcmd/stty/stty.c b/usr/src/ucbcmd/stty/stty.c
index 712079f5fc..b37bebf6f6 100644
--- a/usr/src/ucbcmd/stty/stty.c
+++ b/usr/src/ucbcmd/stty/stty.c
@@ -52,11 +52,20 @@ static struct termiox termiox;
 static struct winsize winsize, owinsize;
 static int term;
 
+void prmodes(int);
+void pramodes(int);
+void prachars(void);
+void pcol(int, int);
+void pit(unsigned char, char *, char *);
+void delay(int, char *s);
+void prspeed(char *, int);
+void prencode(void);
+
 #define ioctl_desc	1
 #define output		stderr
 
-main(argc, argv)
-char	*argv[];
+int
+main(int argc, char *argv[])
 {
 
 	int i;
@@ -163,13 +172,14 @@ char	*argv[];
 		perror(STTY);
 		exit(2);
 	}
-	exit(0);	/*NOTREACHED*/
+	return (0);	/*NOTREACHED*/
 }
 
-prmodes(moremodes)			/* print modes, no options, argc is 1 */
-int moremodes;
+void
+prmodes(int moremodes)
+/* print modes, no options, argc is 1 */
 {
-	register m;
+	int m;
 
 	if (!(term & ASYNC)) {
 		m = stio.imode;
@@ -422,10 +432,11 @@ int moremodes;
 		prachars();
 }
 
-pramodes(tabform)			/* print all modes, -a option */
-int tabform;
+void
+pramodes(int tabform)
+/* print all modes, -a option */
 {
-	register m;
+	int m;
 
 	m = cb.c_cflag;
 	if(term & ASYNC) {
@@ -593,7 +604,8 @@ int tabform;
 		prachars();
 }
 
-prachars()
+void
+prachars(void)
 {
 	if ((cb.c_lflag&ICANON)==0)
 		(void) fprintf(output,"min %d, time %d\n", cb.c_cc[VMIN],
@@ -624,8 +636,8 @@ eol2  swtch\
 	}
 }
 
-pcol(ch1, ch2)
-	int ch1, ch2;
+void
+pcol(int ch1, int ch2)
 {
 	int nout = 0;
 
@@ -663,10 +675,9 @@ pcol(ch1, ch2)
 	}
 }
 
-
-pit(what, itsname, sep)		/*print function for prmodes() and pramodes() */
-	unsigned char what;
-	char *itsname, *sep;
+void
+pit(unsigned char what, char *itsname, char *sep)
+/* print function for prmodes() and pramodes() */
 {
 
 	pitt++;
@@ -690,8 +701,8 @@ pit(what, itsname, sep)		/*print function for prmodes() and pramodes() */
 	(void) fprintf(output,"%c%s", what, sep);
 }
 
-delay(m, s)
-char *s;
+void
+delay(int m, char *s)
 {
 	if(m)
 		(void) fprintf(output,"%s%d ", s, m);
@@ -702,20 +713,23 @@ long	speed[] = {
 	57600,76800,115200,153600,230400,307200,460800
 };
 
-prspeed(c, s)
-char *c;
-int s;
+void
+prspeed(char *c, int s)
 {
 
 	(void) fprintf(output,"%s%d baud; ", c, speed[s]);
 }
 
-					/* print current settings for use with  */
-prencode()				/* another stty cmd, used for -g option */
+/*
+ * print current settings for use with
+ * another stty cmd, used for -g option
+ */
+void
+prencode(void)
 {
 	int i, last;
 
-	/* Since the -g option is mostly used for redirecting to a file *
+	/* Since the -g option is mostly used for redirecting to a file */
 	/* We must print to stdout here, not stderr */
 
 	(void) printf("%x:%x:%x:%x:",cb.c_iflag,cb.c_oflag,cb.c_cflag,cb.c_lflag);
diff --git a/usr/src/ucbcmd/stty/sttyparse.c b/usr/src/ucbcmd/stty/sttyparse.c
index 3068ca6be0..3f7f979859 100644
--- a/usr/src/ucbcmd/stty/sttyparse.c
+++ b/usr/src/ucbcmd/stty/sttyparse.c
@@ -41,6 +41,7 @@
 static char	*s_arg;			/* s_arg: ptr to mode to be set */
 static int	match;
 static int gct(), eq(), encode();
+static int eqarg(char *, int);
 
 /* set terminal modes for supplied options */
 char *
@@ -55,7 +56,7 @@ struct	termios	*cb;
 struct	termiox	*termiox;
 struct	winsize	*winsize;
 {
-	register i;
+	int i;
 	extern	const struct	speeds	speeds[];
 	extern	const struct	mds	lmodes[];
 	extern	const struct	mds	nlmodes[];
@@ -276,7 +277,7 @@ struct	winsize	*winsize;
 static int eq(string)
 char *string;
 {
-	register i;
+	int i;
 
 	if(!s_arg)
 		return(0);
@@ -292,9 +293,7 @@ loop:
 
 /* Checks for options that require an argument */
 static int
-eqarg(string, argc)
-char *string;
-int argc;
+eqarg(char *string, int argc)
 {
 	int status;
 
@@ -311,10 +310,10 @@ int argc;
 /* get pseudo control characters from terminal */
 /* and convert to internal representation      */
 static int gct(cp, term)
-register char *cp;
+char *cp;
 int term;
 {
-	register c;
+	int c;
 
 	c = *cp++;
 	if (c == '^') {
diff --git a/usr/src/ucbcmd/touch/touch.c b/usr/src/ucbcmd/touch/touch.c
index 1eeffe8948..d60e6067e1 100644
--- a/usr/src/ucbcmd/touch/touch.c
+++ b/usr/src/ucbcmd/touch/touch.c
@@ -44,7 +44,7 @@ struct	stat	stbuf;
 int	status;
 #ifdef S5EMUL
 int dmsize[12]={31, 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31};
-#endif S5EMUL
+#endif /* S5EMUL */
 
 static char usage[] =
 #ifdef S5EMUL
@@ -60,7 +60,7 @@ char	*prog;
 
 #ifdef S5EMUL
 char	*cbp;
-#endif S5EMUL
+#endif /* S5EMUL */
 time_t	time();
 off_t	lseek();
 time_t	timelocal(), timegm();
@@ -93,8 +93,8 @@ gtime()
 
 gpair()
 {
-	register int c, d;
-	register char *cp;
+	int c, d;
+	char *cp;
 
 	cp = cbp;
 	if (*cp == 0)
@@ -111,15 +111,14 @@ gpair()
 }
 #endif /*S5EMUL*/
 
-main(argc, argv)
-	int argc;
-	char *argv[];
+int
+main(int argc, char *argv[])
 {
-	register c;
+	int c;
 #ifdef S5EMUL
 	int days_in_month;
 	struct tm *tp;
-#endif S5EMUL
+#endif /* S5EMUL */
 
 	int errflg=0, optc;
 	extern char *optarg;
@@ -191,8 +190,7 @@ main(argc, argv)
 		if (touch(argv[c]) < 0)
 			status++;
 	}
-	exit(status);
-	/* NOTREACHED */
+	return (status);
 }
 
 int
@@ -200,7 +198,7 @@ touch(filename)
 	char *filename;
 {
 	struct timeval times[2];
-	register int fd;
+	int fd;
 
 	if (stat(filename, &stbuf)) {
 		/*
@@ -273,7 +271,7 @@ touch(filename)
 int
 oldtouch(filename, statp)
 	char *filename;
-	register struct stat *statp;
+	struct stat *statp;
 {
 	int rwstatus;
 
@@ -340,14 +338,14 @@ error:
 isnumber(s)
 	char *s;
 {
-	register c;
+	char c;
 
 	while (c = *s++)
 		if (!isdigit(c))
 			return (0);
 	return (1);
 }
-#endif S5EMUL
+#endif /* S5EMUL */
 
 /*
  * nanoseconds are rounded off to microseconds by flooring.
diff --git a/usr/src/ucbcmd/tr/tr.c b/usr/src/ucbcmd/tr/tr.c
index 691837521a..b8ab5fc8d3 100644
--- a/usr/src/ucbcmd/tr/tr.c
+++ b/usr/src/ucbcmd/tr/tr.c
@@ -51,12 +51,12 @@ char	squeez[256];
 char	vect[256];
 struct string { int last, max; char *p; } string1, string2;
 
-main(argc,argv)
-char **argv;
+int
+main(int argc, char **argv)
 {
-	register i;
+	int i;
 	int j;
-	register c, d;
+	int c, d;
 	char *compl;
 	int lastd;
 
@@ -127,12 +127,11 @@ char **argv;
 					exit(1);
 			}
 	}
-	exit(0);
-	/* NOTREACHED */
+	return (0);
 }
 
-next(s)
-struct string *s;
+int
+next(struct string *s)
 {
 
 again:
@@ -157,10 +156,10 @@ again:
 	return(s->last = nextc(s));
 }
 
-nextc(s)
-struct string *s;
+int
+nextc(struct string *s)
 {
-	register c, i, n;
+	int c, i, n;
 
 	c = *s->p++;
 	if(c=='\\') {
diff --git a/usr/src/ucbcmd/tset/tset.c b/usr/src/ucbcmd/tset/tset.c
index 4dc67a1975..8476c4faa1 100644
--- a/usr/src/ucbcmd/tset/tset.c
+++ b/usr/src/ucbcmd/tset/tset.c
@@ -1,3 +1,8 @@
+/*
+ * Copyright 1999 Sun Microsystems, Inc.  All rights reserved.
+ * Use is subject to license terms.
+ */
+
 /*	Copyright (c) 1984, 1986, 1987, 1988, 1989 AT&T	*/
 /*	  All Rights Reserved  	*/
 
@@ -8,12 +13,7 @@
  * specifies the terms and conditions for redistribution.
  */
 
-/*
- * Copyright (c) 1983 - 1999 by Sun Microsystems, Inc.
- * All rights reserved.
- */
-
-#ident	"%Z%%M%	%I%	%E% SMI"	/* SVr4.0 1.1	*/
+#pragma ident	"%Z%%M%	%I%	%E% SMI"
 
 /*
 **  TSET -- set terminal modes
@@ -320,10 +320,10 @@
 #define	OLDDIALUP	"sd"
 #define	PLUGBOARD	"plugboard"
 #define	OLDPLUGBOARD	"sp"
-/***
+/*
 #define	ARPANET		"arpanet"
 #define	OLDARPANET	"sa"
-/***/
+*/
 
 #define	DEFTYPE		"unknown"
 
@@ -437,19 +437,27 @@ struct termios	modes;
 struct termios	oldmodes;
 int		istermios;
 
+void reportek(char *, char, char, char);
+void setdelay(char *, struct delay [], tcflag_t, tcflag_t *);
+void prs(char *);
+void prc(char);
+void flush(void);
+void cat(char *);
+void bmove(char *, char *, int);
+void makealias(char *);
+void wrtermcap(char *);
+void fatal (char *, char *);
 char reset();			/* Routine for checking&resetting chars */
-int prc();
 
-main(argc, argv)
-int	argc;
-char	*argv[];
+int
+main(int argc, char *argv[])
 {
 	char		buf[CAPBUFSIZ];
 	char		termbuf[32];
 	auto char	*bufp;
-	register char	*p;
+	char		*p;
 	char		*command;
-	register int	i;
+	int		i;
 	int		Break;
 	int		Not;
 	char		*nextarg();
@@ -1097,7 +1105,7 @@ ask:
 	reportek("Kill", curkill, oldkill, CKILL);
 	reportek("Interrupt", curintr, oldintr, CINTR);
 
-	exit(0);
+	return (0);
 }
 
 /*
@@ -1105,7 +1113,8 @@ ask:
  * st (set one tab) and ch (horizontal cursor addressing) capabilities.
  * This is done before if and is, so they can patch in case we blow this.
  */
-settabs()
+int
+settabs(void)
 {
 	char caps[100];
 	char *capsp = caps;
@@ -1145,9 +1154,9 @@ settabs()
 			tputs(set_tab, 0, prc);
 		}
 		prc('\r');
-		return 1;
+		return (1);
 	}
-	return 0;
+	return (0);
 }
 
 void setmode(flag)
@@ -1160,7 +1169,7 @@ int	flag;
 {
 	struct termio *ttymode;
 	struct termios *ttymodes;
-	register int i;
+	int i;
 
 	ttymode = (struct termio *)0;
 	ttymodes = (struct termios *)0;
@@ -1207,15 +1216,12 @@ int	flag;
 		exit(1);
 }
 
-reportek(name, new, old, def)
-char	*name;
-char	old;
-char	new;
-char	def;
+void
+reportek(char *name, char new, char old, char def)
 {
-	register char	o;
-	register char	n;
-	register char	*p;
+	char	o;
+	char	n;
+	char	*p;
 	char		buf[32];
 	char		*bufp;
 	extern char *tgetstr();
@@ -1253,15 +1259,11 @@ char	def;
 
 
 
-
-setdelay(cap, dtab, bits, flags)
-char		*cap;
-struct delay	dtab[];
-int		bits;
-short		*flags;
+void
+setdelay(char *cap, struct delay dtab[], tcflag_t bits, tcflag_t *flags)
 {
-	register int	i;
-	register struct delay	*p;
+	int		i;
+	struct delay	*p;
 	extern short	ospeed;
 
 	/* see if this capability exists at all */
@@ -1286,12 +1288,11 @@ short		*flags;
 	}
 
 	/* use last entry if none will do */
-	*flags |= (--p)->d_bits;
+	*flags |= (tcflag_t)((--p)->d_bits);
 }
 
-
-prs(s)
-char	*s;
+void
+prs(char *s)
 {
 	while (*s != '\0')
 		prc(*s++);
@@ -1301,27 +1302,27 @@ char	*s;
 char	OutBuf[256];
 int	OutPtr;
 
-prc(c)
-char	c;
+void
+prc(char c)
 {
 	OutBuf[OutPtr++] = c;
 	if (OutPtr >= sizeof OutBuf)
 		flush();
 }
 
-flush()
+void
+flush(void)
 {
 	if (OutPtr > 0)
 		(void) write(2, OutBuf, OutPtr);
 	OutPtr = 0;
 }
 
-
-cat(file)
-char	*file;
+void
+cat(char *file)
 {
-	register int	fd;
-	register int	i;
+	int	fd;
+	int	i;
 	char		buf[BUFSIZ];
 
 	fd = open(file, 0);
@@ -1341,14 +1342,11 @@ char	*file;
 }
 
 
-
-bmove(from, to, length)
-char	*from;
-char	*to;
-int	length;
+void
+bmove(char *from, char *to, int length)
 {
-	register char	*p, *q;
-	register int	i;
+	char	*p, *q;
+	int	i;
 
 	i = length;
 	p = from;
@@ -1359,14 +1357,11 @@ int	length;
 }
 
 
-
-bequal(a, b, len)	/* must be same thru len chars */
-char	*a;
-char	*b;
-int	len;
+int
+bequal(char *a, char *b, int len)	/* must be same thru len chars */
 {
-	register char	*p, *q;
-	register int	i;
+	char	*p, *q;
+	int	i;
 
 	i = len;
 	p = a;
@@ -1379,11 +1374,10 @@ int	len;
 	return ((*p == *q) && i >= 0);
 }
 
-sequal(a, b)	/* must be same thru NULL */
-char	*a;
-char	*b;
+int
+sequal(char *a, char *b)	/* must be same thru NULL */
 {
-	register char *p = a, *q = b;
+	char *p = a, *q = b;
 
 	while (*p && *q && (*p == *q))
 	{
@@ -1392,12 +1386,12 @@ char	*b;
 	return (*p == *q);
 }
 
-makealias(buf)
-char	*buf;
+void
+makealias(char *buf)
 {
-	register int i;
-	register char *a;
-	register char *b;
+	int i;
+	char *a;
+	char *b;
 
 	Alias[0] = a = Aliasbuf;
 	b = buf;
@@ -1418,8 +1412,8 @@ char	*buf;
 # endif
 }
 
-isalias(ident)	/* is ident same as one of the aliases? */
-char	*ident;
+int
+isalias(char *ident)	/* is ident same as one of the aliases? */
 {
 	char **a = Alias;
 
@@ -1440,8 +1434,8 @@ char	*ident;
 char delcap[128][2];
 int ncap = 0;
 
-wrtermcap(bp)
-char *bp;
+void
+wrtermcap(char *bp)
 {
 	char buf[CAPBUFSIZ];
 	char *p = buf;
@@ -1523,10 +1517,10 @@ char *bp;
 	(void) write (STDOUT, buf, p-buf);
 }
 
-cancelled(cap)
-char	*cap;
+int
+cancelled(char *cap)
 {
-	register int i;
+	int i;
 
 	for (i = 0; i < ncap; i++)
 	{
@@ -1565,9 +1559,8 @@ char	*str;
 	return (ptr);
 }
 
-
-baudrate(p)
-char	*p;
+int
+baudrate(char *p)
 {
 	char buf[8];
 	int i = 0;
@@ -1663,9 +1656,8 @@ char	*argv[];
 	return (*argv);
 }
 
-fatal (mesg, obj)
-char	*mesg;
-char	*obj;
+void
+fatal (char *mesg, char *obj)
 {
 	prs (mesg);
 	prs (obj);
diff --git a/usr/src/ucbcmd/whereis/whereis.c b/usr/src/ucbcmd/whereis/whereis.c
index f2cf33b972..9dc07227d6 100644
--- a/usr/src/ucbcmd/whereis/whereis.c
+++ b/usr/src/ucbcmd/whereis/whereis.c
@@ -116,25 +116,38 @@ int	Bcnt;
 char	**Mflag;
 int	Mcnt;
 char	uflag;
+
+void getlist(int *, char ***, char ***, int *);
+void zerof(void);
+void lookup(char *);
+void looksrc(char *);
+void lookbin(char *);
+void lookman(char *);
+void findv(char **, int, char *);
+void find(char **, char *);
+void findin(char *, char *);
+
 /*
  * whereis name
  * look for source, documentation and binaries
  */
-main(argc, argv)
-	int argc;
-	char *argv[];
+int
+main(int argc, char *argv[])
 {
 
 	argc--, argv++;
 	if (argc == 0) {
 usage:
-		fprintf(stderr, "whereis [ -sbmu ] [ -SBM dir ... -f ] name...\n");
+		fprintf(stderr, "whereis [ -sbmu ] [ -SBM dir ... -f ] "
+		    "name...\n");
 		exit(1);
 	}
 	do
 		if (argv[0][0] == '-') {
-			register char *cp = argv[0] + 1;
-			while (*cp) switch (*cp++) {
+			char *cp = argv[0] + 1;
+			while (*cp) {
+
+				switch (*cp++) {
 
 			case 'f':
 				break;
@@ -172,20 +185,17 @@ usage:
 
 			default:
 				goto usage;
+				}
 			}
 			argv++;
 		} else
 			lookup(*argv++);
 	while (--argc > 0);
-	exit(0);
-	/* NOTREACHED */
+	return (0);
 }
 
-getlist(argcp, argvp, flagp, cntp)
-	char ***argvp;
-	int *argcp;
-	char ***flagp;
-	int *cntp;
+void
+getlist(int *argcp, char ***argvp, char ***flagp, int *cntp)
 {
 
 	(*argvp)++;
@@ -197,8 +207,8 @@ getlist(argcp, argvp, flagp, cntp)
 	(*argvp)--;
 }
 
-
-zerof()
+void
+zerof(void)
 {
 
 	if (sflag && bflag && mflag)
@@ -207,11 +217,10 @@ zerof()
 int	count;
 int	print;
 
-
-lookup(cp)
-	register char *cp;
+void
+lookup(char *cp)
 {
-	register char *dp;
+	char *dp;
 
 	for (dp = cp; *dp; dp++)
 		continue;
@@ -259,8 +268,8 @@ again:
 		printf("\n");
 }
 
-looksrc(cp)
-	char *cp;
+void
+looksrc(char *cp)
 {
 	if (Sflag == 0) {
 		find(srcdirs, cp);
@@ -268,8 +277,8 @@ looksrc(cp)
 		findv(Sflag, Scnt, cp);
 }
 
-lookbin(cp)
-	char *cp;
+void
+lookbin(char *cp)
 {
 	if (Bflag == 0)
 		find(bindirs, cp);
@@ -277,8 +286,8 @@ lookbin(cp)
 		findv(Bflag, Bcnt, cp);
 }
 
-lookman(cp)
-	char *cp;
+void
+lookman(char *cp)
 {
 	if (Mflag == 0) {
 		find(mandirs, cp);
@@ -286,27 +295,24 @@ lookman(cp)
 		findv(Mflag, Mcnt, cp);
 }
 
-findv(dirv, dirc, cp)
-	char **dirv;
-	int dirc;
-	char *cp;
+void
+findv(char **dirv, int dirc, char *cp)
 {
 
 	while (dirc > 0)
 		findin(*dirv++, cp), dirc--;
 }
 
-find(dirs, cp)
-	char **dirs;
-	char *cp;
+void
+find(char **dirs, char *cp)
 {
 
 	while (*dirs)
 		findin(*dirs++, cp);
 }
 
-findin(dir, cp)
-	char *dir, *cp;
+void
+findin(char *dir, char *cp)
 {
 	DIR *dirp;
 	struct dirent *dp;
@@ -324,10 +330,10 @@ findin(dir, cp)
 	closedir(dirp);
 }
 
-itsit(cp, dp)
-	register char *cp, *dp;
+int
+itsit(char *cp, char *dp)
 {
-	register int i = strlen(dp);
+	int i = strlen(dp);
 
 	if (dp[0] == 's' && dp[1] == '.' && itsit(cp, dp+2))
 		return (1);