6268925 cmd/bnu and gcc don't get along

33 files changed, 450 insertions, 356 deletions

diff --git a/usr/src/cmd/bnu/anlwrk.c b/usr/src/cmd/bnu/anlwrk.c
index 875bd5158b..69d8250bf4 100644
--- a/usr/src/cmd/bnu/anlwrk.c
+++ b/usr/src/cmd/bnu/anlwrk.c
@@ -19,11 +19,16 @@
  *
  * CDDL HEADER END
  */
+/*
+ * Copyright 2005 Sun Microsystems, Inc.  All rights reserved.
+ * Use is subject to license terms.
+ */
+
 /*	Copyright (c) 1984, 1986, 1987, 1988, 1989 AT&T	*/
 /*	  All Rights Reserved  	*/
 
 
-#ident	"%Z%%M%	%I%	%E% SMI"	/* from SVR4 bnu:anlwrk.c 2.6 */
+#pragma ident	"%Z%%M%	%I%	%E% SMI"
 /*
 	This module contains routines that find C. files
 	in a system spool directory, return the next C. file
@@ -71,8 +76,8 @@ static int
 anlwrk(file, wvec, wcount)
 char *file, **wvec;
 {
-	register i;
-	register FILE *p_bookmark;    /* pointer to afile 		    */
+	int i;
+	FILE *p_bookmark;    /* pointer to afile */
 	static   FILE *fp = NULL;    /* currently opened C. file pointer    */
 	static char afile[NAMESIZE]; /* file with line count for book marks */
 	static char str[MAXRQST];    /* the string which  wvec points to    */
@@ -241,7 +246,7 @@ char *file;
 static int
 bldflst()
 {
-	register DIR *pdir;
+	DIR *pdir;
 	char filename[NAMESIZE];
 	char prefix[SYSNSIZE+3];
 
@@ -277,7 +282,7 @@ extern int
 gtwvec(file, wrkvec, wcount)
 char *file, **wrkvec;
 {
-	register int nargs;
+	int nargs;
 
 	DEBUG(7, "gtwvec: dir %s\n", RemSpool);
 	while ((nargs = anlwrk(file, wrkvec, wcount)) == 0) {
@@ -297,8 +302,8 @@ static void
 insert(file)
 char *file;
 {
-	register i, j;
-	register char *p;
+	int i, j;
+	char *p;
 
 	DEBUG(7, "insert(%s)  ", file);
 	for (i = Nfiles; i>0; i--) {
diff --git a/usr/src/cmd/bnu/bnuconvert.c b/usr/src/cmd/bnu/bnuconvert.c
index 7bb6ae2d7b..873ae0d044 100644
--- a/usr/src/cmd/bnu/bnuconvert.c
+++ b/usr/src/cmd/bnu/bnuconvert.c
@@ -19,14 +19,20 @@
  *
  * CDDL HEADER END
  */
+/*
+ * Copyright 2005 Sun Microsystems, Inc.  All rights reserved.
+ * Use is subject to license terms.
+ */
+
 /*	Copyright (c) 1984, 1986, 1987, 1988, 1989 AT&T	*/
 /*	  All Rights Reserved  	*/
 
 
-#ident	"%Z%%M%	%I%	%E% SMI"	/* from SVR4 bnu:bnuconvert.c 1.3.1.2 */
+#pragma ident	"%Z%%M%	%I%	%E% SMI"
 
 #include	"uucp.h"
 
+int
 main(argc, argv)
 int argc;
 char **argv;
@@ -127,7 +133,7 @@ char **argv;
 		closedir(machdir);
 	}
 	closedir(spooldir);
-	exit(0);
+	return (0);
 }
 /* a dummy cleanup function to satisfy a .o file */
 void cleanup() {}
diff --git a/usr/src/cmd/bnu/callers.c b/usr/src/cmd/bnu/callers.c
index 392c3e12de..93f0c17efc 100644
--- a/usr/src/cmd/bnu/callers.c
+++ b/usr/src/cmd/bnu/callers.c
@@ -183,10 +183,10 @@ char *in, *out;
  */
 static char *
 repphone(arg, phone, trstr)
-register char *arg, *phone, *trstr;
+char *arg, *phone, *trstr;
 {
 	static char pbuf[2*(MAXPH+2)];
-	register char *fp, *tp;
+	char *fp, *tp;
 
 	for (tp=pbuf; *arg; arg++) {
 		if (*arg != '\\') {
@@ -228,15 +228,15 @@ static char saved_dcname[20];
  */
 GLOBAL int
 processdev(flds, dev)
-register char *flds[], *dev[];
+char *flds[], *dev[];
 {
 	int dcf = -1;
-	register struct caller	*ca;
+	struct caller	*ca;
 	char *args[D_MAX+1], dcname[20];
-	register char **sdev;
+	char **sdev;
 	EXTERN int pop_push();
 	EXTERN void  setdevcfg();
-	register nullfd;
+	int nullfd;
 	char *phonecl;			/* clear phone string */
 	char phoneex[2*(MAXPH+2)];	/* expanded phone string */
 	EXTERN void ttygenbrk();
@@ -361,7 +361,7 @@ register char *flds[], *dev[];
 	 * according to scripts in dialers file.
 	 */
 	for (; dev[D_CALLER] != NULL; dev += 2) {
-		register int w;
+		int w;
 		/*
 		 * Scan Dialers file to find an entry
 		 */
@@ -436,9 +436,9 @@ int dcf;
  */
 static void
 translate(ttab, str)
-register char *ttab, *str;
+char *ttab, *str;
 {
-	register char *s;
+	char *s;
 
 	for(;*ttab && *(ttab+1); ttab += 2)
 		for(s=str;*s;s++)
@@ -461,11 +461,11 @@ register char *ttab, *str;
  */
 static int
 gdial(type, arps, narps)
-register char *type, *arps[];
-register int narps;
+char *type, *arps[];
+int narps;
 {
 	static char info[MAXLINE];
-	register na;
+	int na;
 	EXTERN void dialreset();
 	EXTERN char * currdial();
 
@@ -509,7 +509,7 @@ GLOBAL int
 dkcall(flds, dev)
 char *flds[], *dev[];
 {
-	register fd;
+	int fd;
 #ifdef V8
 	extern int cdkp_ld;
 #endif
@@ -1052,7 +1052,7 @@ char *dev[];
 	char		addrbuf[ BUFSIZ ];
 	char		devname[MAXNAMESIZE];
 	int		fd;
-	register int	i, j;
+	int	i, j;
 	struct t_bind	*bind_ret = 0;
 	struct t_info	tinfo;
 	struct t_call	*sndcall = 0, *rcvcall = 0;
diff --git a/usr/src/cmd/bnu/cntrl.c b/usr/src/cmd/bnu/cntrl.c
index 69c2491f61..8d3f1da9cc 100644
--- a/usr/src/cmd/bnu/cntrl.c
+++ b/usr/src/cmd/bnu/cntrl.c
@@ -248,7 +248,6 @@ cntrl()
 {
 	FILE * fp;
 	struct stat stbuf;
-	extern (*Rdmsg)(), (*Wrmsg)();
 	char *	p;
 	long 	startp;		/* checkpoint restart point */
 	long	actualsize;	/* actual file size */
@@ -1385,11 +1384,11 @@ char *s, m;
 void
 notify(mailopt, user, msgin, sys, msgcode)
 char *user, *msgin, *sys;
-register char *msgcode;
+char *msgcode;
 {
-	register int i;
+	int i;
 	char str[BUFSIZ];
-	register char *msg;
+	char *msg;
 
 	DEBUG(4,"mailopt %d, ", mailopt);
 	DEBUG(4,"statfopt %d\n", statfopt);
@@ -1481,10 +1480,9 @@ char	*f, *m;
  *	SUCCESS	-> successful protocol selection
  *	FAIL	-> can't find common or open failed
  */
-startup()
+int
+startup(void)
 {
-	extern (*Rdmsg)(), (*Wrmsg)();
-	extern imsg(), omsg();
 	extern void blptcl();
 	extern int fptcl();
 	char msg[BUFSIZ], str[BUFSIZ];
@@ -1525,7 +1523,7 @@ startup()
  */
 int
 fptcl(str, valid)
-register char *str, *valid;
+char *str, *valid;
 {
 	char *l;
 
@@ -1559,10 +1557,10 @@ register char *str, *valid;
  */
 void
 blptcl(str)
-register char *str;
+char *str;
 {
-	register struct Proto *p;
-	register char *validPtr;
+	struct Proto *p;
+	char *validPtr;
 
 	/* Build list of valid protocols. */
 	for (validPtr = str, p = Ptbl; (*validPtr = p->P_id) != NULLCHAR;
@@ -1582,9 +1580,9 @@ register char *str;
  */
 int
 stptcl(c)
-register char *c;
+char *c;
 {
-	register struct Proto *p;
+	struct Proto *p;
 
 	for (p = Ptbl; p->P_id != '\0'; p++) {
 		if (*c == p->P_id) {
@@ -1617,7 +1615,7 @@ register char *c;
  */
 void
 unlinkdf(file)
-register char *file;
+char *file;
 {
 	if (strlen(file) > (size_t) 6)
 		(void) unlink(file);
diff --git a/usr/src/cmd/bnu/conn.c b/usr/src/cmd/bnu/conn.c
index 094a6fd798..d2b7fcd8a4 100644
--- a/usr/src/cmd/bnu/conn.c
+++ b/usr/src/cmd/bnu/conn.c
@@ -20,7 +20,7 @@
  * CDDL HEADER END
  */
 /*
- * Copyright 1994 Sun Microsystems, Inc.  All rights reserved.
+ * Copyright 2005 Sun Microsystems, Inc.  All rights reserved.
  * Use is subject to license terms.
  */
 
@@ -53,10 +53,10 @@ static char	par_tab[128];
 
 EXTERN void alarmtr();
 static void addProto(), mergeProto(), removeProto();
+static void bld_partab();
 static char *nextProto();
 EXTERN char *findProto();
 static void getProto();
-static finds();
 EXTERN int getto();		/* make this static when ct uses altconn() */
 EXTERN int chat(), rddev(), expect(), wrstr(), wrchr();
 EXTERN int processdev(), getdevline(), getsysline(), sysaccess();
@@ -145,8 +145,8 @@ getto(flds)
 char *flds[];
 {
 	char *dev[D_MAX+2], devbuf[BUFSIZ];
-	register int status;
-	register int dcf = -1;
+	int status;
+	int dcf = -1;
 	int reread = 0;
 	int tries = 0;	/* count of call attempts - for limit purposes */
 	EXTERN void devreset();
@@ -376,7 +376,7 @@ getProto(save, str)
 char *save;
 char *str;
 {
-	register char *p;
+	char *p;
 
 	*save = NULLCHAR;
 	if ( (p=strchr(str, ',')) != NULL) {
@@ -432,8 +432,8 @@ addProto (desired, valid)
 char *desired;
 char *valid;
 {
-	register char * protoPtr;
-	register char *	wantPtr;
+	char *protoPtr;
+	char *wantPtr;
 
 	if ( *desired == '\0' )
 	    return;
@@ -623,7 +623,7 @@ expect(str, fn)
 char *str;
 int fn;
 {
-	register char *bptr, *sptr;
+	char *bptr, *sptr;
 	char    buf[BUFSIZ];
 
 	bptr = buf;
@@ -675,7 +675,7 @@ int fn;
 {
 	static char rdvec[MR];
 	char *rp = rdvec;
-	register int kr, c;
+	int kr, c;
 	char nextch;
 
 	*rp = 0;
@@ -782,7 +782,7 @@ char *str, *phstr1, *phstr2;
 int fn;
 {
 	int sendcr = 1, echocheck = 0;
-	register char	*sptr, *bptr;
+	char	*sptr, *bptr;
 	char	buf[BUFSIZ];
 	struct termio	ttybuf;
 	static int p_init = 0;
@@ -939,10 +939,11 @@ err:
 /*
  * generate parity table for use by sendthem.
  */
+static void
 bld_partab(type)
 int type;
 {
-	register int i, j, n;
+	int i, j, n;
 
 	for (i = 0; i < 128; i++) {
 		n = 0;
@@ -993,8 +994,8 @@ char *buf;
 
 GLOBAL int
 wrchr(fn, buf, len)
-register int fn;
-register char *buf;
+int fn;
+char *buf;
 {
 	int 	i, saccess;
 	char	cin, cout;
@@ -1228,7 +1229,7 @@ char *cp;
 /*	Sleep in increments of 60ths of second.	*/
 GLOBAL void
 nap (time)
-register int time;
+int time;
 {
 	static int fd;
 
diff --git a/usr/src/cmd/bnu/ct.c b/usr/src/cmd/bnu/ct.c
index a0e02c95fe..d16701fc05 100644
--- a/usr/src/cmd/bnu/ct.c
+++ b/usr/src/cmd/bnu/ct.c
@@ -19,15 +19,15 @@
  *
  * CDDL HEADER END
  */
-/*	Copyright (c) 1984, 1986, 1987, 1988, 1989 AT&T	*/
-/*	  All Rights Reserved  	*/
-
 /*
- * Copyright (c) 1998 by Sun Microsystems, Inc.
- * All rights reserved.
+ * Copyright 2005 Sun Microsystems, Inc.  All rights reserved.
+ * Use is subject to license terms.
  */
 
-#ident	"%Z%%M%	%I%	%E% SMI"	/* from SVR4 bnu:ct.c 2.27.2.1 */
+/*	Copyright (c) 1984, 1986, 1987, 1988, 1989 AT&T	*/
+/*	  All Rights Reserved  	*/
+
+#pragma ident	"%Z%%M%	%I%	%E% SMI"
 
 /*
  *
@@ -131,10 +131,12 @@ char *s1, *s2;
 
 jmp_buf Sjbuf;			/* used by uucp routines */
 
+int
 main (argc, argv)
+int argc;
 char   *argv[];
 {
-    register int    c;
+    int    	c;
     int		found = 0,
 		errors = 0,
 		first = TRUE;
@@ -523,7 +525,7 @@ disconnect (code)
  */
 void
 cleanup (code)
-register int    code;
+int    code;
 {
     CDEBUG(5, "cleanup(%d)\n", code);
     rmlock (CNULL);
@@ -760,8 +762,8 @@ char   *file;
 
 static void
 zero (adr, size)
-register char  *adr;
-register int    size;
+char  *adr;
+int    size;
 {
     while (size--)
 	*adr++ = '\0';
diff --git a/usr/src/cmd/bnu/cu.c b/usr/src/cmd/bnu/cu.c
index 9617f233ce..e497278979 100644
--- a/usr/src/cmd/bnu/cu.c
+++ b/usr/src/cmd/bnu/cu.c
@@ -19,15 +19,15 @@
  *
  * CDDL HEADER END
  */
-/*	Copyright (c) 1984, 1986, 1987, 1988, 1989 AT&T	*/
-/*	  All Rights Reserved  	*/
-
 /*
- * Copyright (c) 2000, 2001 by Sun Microsystems, Inc.
- * All rights reserved.
+ * Copyright 2005 Sun Microsystems, Inc.  All rights reserved.
+ * Use is subject to license terms.
  */
 
-#ident	"%Z%%M%	%I%	%E% SMI"	/* from SVR4 cu:cu.c 2.46.2.2 */
+/*	Copyright (c) 1984, 1986, 1987, 1988, 1989 AT&T	*/
+/*	  All Rights Reserved  	*/
+
+#pragma ident	"%Z%%M%	%I%	%E% SMI"
 
 
 /*
@@ -274,7 +274,9 @@ static char *P_TELLENGTH = "Telno cannot exceed 58 digits!\r\n";
  *	Main line invokes "transmit" to read TTY & write to remote.
  ***************************************************************/
 
+int
 main(argc, argv)
+int argc;
 char *argv[];
 {
     extern void setservice();
@@ -618,6 +620,7 @@ char *argv[];
     }
     cleanup(Cn);
     /*NOTREACHED*/
+	return (0);
 }
 
 /*
@@ -665,9 +668,9 @@ int
 transmit()
 {
     char b[BUFSIZ];
-    register char *p;
-    register int escape;
-    register int id = 0;  /*flag for systemname prompt on tilda escape*/
+    char *p;
+    int escape;
+    int id = 0;  /* flag for systemname prompt on tilda escape */
 
     CDEBUG(4,"transmit started\n\r%s", "");
 
@@ -785,7 +788,7 @@ _flush()
  **************************************************************/
 int
 tilda(cmd)
-register char	*cmd;
+char	*cmd;
 {
 
     VERBOSE("\r\n%s", "");
@@ -973,7 +976,7 @@ char	*str;
 
 static void
 _dopercen(cmd)
-register char *cmd;
+char *cmd;
 {
     char	*arg[5];
     char	*getpath;
@@ -1222,8 +1225,8 @@ register char *cmd;
 static void
 _receive()
 {
-    register silent = NO, file = -1;
-    register char *p;
+    int silent = NO, file = -1;
+    char *p;
     int	tic;
     int for_me = NO;
     char	b[BUFSIZ];
@@ -1416,7 +1419,7 @@ _mode(arg)
 static pid_t
 dofork()
 {
-    register int i;
+    int i;
     pid_t x;
 
     for(i = 0; i < 6; ++i) {
@@ -1538,7 +1541,7 @@ int fd;
 
 static void
 _w_str(string)
-register char *string;
+char *string;
 {
     int len;
 
@@ -1681,7 +1684,7 @@ sysname(name)
 char * name;
 {
 
-    register char *s;
+    char *s;
 
     if(uname(&utsn) < 0)
 	s = "Local";
@@ -1698,8 +1701,8 @@ blckcnt(count)
 long count;
 {
     static long lcharcnt = 0;
-    register long c1, c2;
-    register int i;
+    long c1, c2;
+    int i;
     char c;
 
     if(count == (long) (-1)) {	/* initialization call */
diff --git a/usr/src/cmd/bnu/eio.c b/usr/src/cmd/bnu/eio.c
index d6ba3506bb..f514239690 100644
--- a/usr/src/cmd/bnu/eio.c
+++ b/usr/src/cmd/bnu/eio.c
@@ -20,7 +20,7 @@
  * CDDL HEADER END
  */
 /*
- * Copyright 1994 Sun Microsystems, Inc.  All rights reserved.
+ * Copyright 2005 Sun Microsystems, Inc.  All rights reserved.
  * Use is subject to license terms.
  */
 
@@ -96,7 +96,7 @@ eturnoff()
  */
 int
 ewrmsg(type, str, fn)
-register char *str;
+char *str;
 int fn;
 char type;
 {
@@ -113,7 +113,7 @@ char type;
  */
 int
 erdmsg(str, fn)
-register char *str;
+char *str;
 {
 	return(etrdmsg(str, fn, 0));
 }
@@ -129,10 +129,10 @@ register char *str;
  */
 int
 ewrdata(fp1, fn)
-register FILE *fp1;
+FILE *fp1;
 int	fn;
 {
-	register int ret;
+	int ret;
 	int	fd1;
 	int len;
 	unsigned long bytes;
@@ -201,9 +201,9 @@ int	fn;
  */
 int
 erddata(fn, fp2)
-register FILE *fp2;
+FILE *fp2;
 {
-	register int ret;
+	int ret;
 	int	fd2;
 	char bufr[EBUFSIZ];
 	int	len;
@@ -283,9 +283,9 @@ register FILE *fp2;
  */
 int
 erdblk(blk, len,  fn)
-register char *blk;
+char *blk;
 {
-	register int i, ret;
+	int i, ret;
 
 	if(setjmp(Failbuf)) {
 		DEBUG(7, "timeout (%d sec)\n", msgtime);
@@ -322,6 +322,7 @@ struct tbuf {
  *	FAIL	-> read timed out
  *	SUCCESS	-> ok message in str
  */
+int
 trdmsg(str, fn)
 char *str;
 {
@@ -337,6 +338,7 @@ char *str;
  *	FAIL	-> write failed
  *	SUCCESS	-> write succeeded
  */
+int
 twrmsg(type, str, fn)
 char type;
 char *str;
@@ -352,11 +354,12 @@ char *str;
  *	FAIL	->failure in link
  *	SUCCESS	-> ok
  */
+int
 twrdata(fp1, fn)
-register FILE *fp1;
+FILE *fp1;
 int	fn;
 {
-	register int ret;
+	int ret;
 	int len;
 	unsigned long bytes;
 	struct tbuf bufr;
@@ -400,10 +403,11 @@ int	fn;
  *	SUCCESS	-> ok
  *	FAIL	-> failure on link
  */
+int
 trddata(fn, fp2)
-register FILE *fp2;
+FILE *fp2;
 {
-	register int len, nread;
+	int len, nread;
 	long Nbytes;
 	unsigned long bytes = 0L;
 	char bufr[TBUFSIZE];
@@ -443,11 +447,12 @@ register FILE *fp2;
  * where rddata can pick it up.
  */
 
+int
 etrdmsg(str, fn, i)
-register char *str;
-register int i;
+char *str;
+int i;
 {
-	register int len;
+	int len;
 	int nullterm = 0;
 	char *null, *argstr;
 
@@ -508,9 +513,10 @@ register int i;
  *	FAIL	-> write failed
  *	SUCCESS	-> write succeeded
  */
+int
 etwrmsg(type, str, fn, len)
 char type;
-register char *str;
+char *str;
 int fn, len;
 {
 	char bufr[EBUFSIZ], *endstr;
diff --git a/usr/src/cmd/bnu/fio.c b/usr/src/cmd/bnu/fio.c
index 563a1a3e1e..5df1e21248 100644
--- a/usr/src/cmd/bnu/fio.c
+++ b/usr/src/cmd/bnu/fio.c
@@ -20,7 +20,7 @@
  * CDDL HEADER END
  */
 /*
- * Copyright 1995 Sun Microsystems, Inc.  All rights reserved.
+ * Copyright 2005 Sun Microsystems, Inc.  All rights reserved.
  * Use is subject to license terms.
  */
 
@@ -87,7 +87,7 @@ static int frdblk(), fwrblk();
 
 #ifndef MAXMSGLEN
 #define MAXMSGLEN	BUFSIZ
-#endif MAXMSGLEN
+#endif	/* MAXMSGLEN */
 
 static int fchksum;
 static jmp_buf Ffailbuf;
@@ -110,7 +110,8 @@ static struct termio ttbuf;
 static struct sgttyb ttbuf;
 #endif
 
-fturnon()
+int
+fturnon(void)
 {
 	int ret;
 #ifdef ATTSVTTY
@@ -150,7 +151,8 @@ fturnon()
 	return SUCCESS;
 }
 
-fturnoff()
+int
+fturnoff(void)
 {
 	if (ioctlok) {
 #ifdef ATTSVTTY
@@ -164,12 +166,13 @@ fturnoff()
 	return SUCCESS;
 }
 
+int
 fwrmsg(type, str, fn)
-register char *str;
+char *str;
 int fn;
 char type;
 {
-	register char *s;
+	char *s;
 	char bufr[MAXMSGLEN];
 
 	s = bufr;
@@ -184,11 +187,12 @@ char type;
 	return SUCCESS;
 }
 
+int
 frdmsg(str, fn)
-register char *str;
-register int fn;
+char *str;
+int fn;
 {
-	register char *smax;
+	char *smax;
 
 	if (setjmp(Ffailbuf))
 		return FAIL;
@@ -214,11 +218,12 @@ msgerr:
 	return FAIL;
 }
 
+int
 fwrdata(fp1, fn)
 FILE *fp1;
 int fn;
 {
-	register int alen, ret;
+	int alen, ret;
 	char ack, ibuf[MAXMSGLEN];
 	int flen, retries = 0;
 	long fbytes;
@@ -255,12 +260,13 @@ acct:
 /* max. attempts to retransmit a file: */
 #define MAXRETRIES	(fbytes < 10000L ? 2 : 1)
 
+int
 frddata(fn, fp2)
-register int fn;
-register FILE *fp2;
+int fn;
+FILE *fp2;
 {
-	register int flen;
-	register char eof;
+	int flen;
+	char eof;
 	char ibuf[FIBUFSIZ];
 	int ret, retries = 0;
 	long alen, fbytes;
@@ -300,11 +306,11 @@ acct:
 	return ret;
 }
 
-static
+static int
 frdbuf(blk, len, fn)
-register char *blk;
-register int len;
-register int fn;
+char *blk;
+int len;
+int fn;
 {
 	static int ret = FIBUFSIZ / 2;
 
@@ -320,7 +326,7 @@ register int fn;
 /* call ultouch every TC calls to either frdblk or fwrblk  */
 #define TC	20
 static int tc = TC;
-#endif !defined(ATTSVKILL)
+#endif	/* !defined(ATTSVKILL) */
 
 /* Byte conversion:
  *
@@ -333,14 +339,14 @@ static int tc = TC;
  * 372-377	 176	 072-077
  */
 
-static
+static int
 fwrblk(fn, fp, lenp)
 int fn;
-register FILE *fp;
+FILE *fp;
 int *lenp;
 {
-	register char *op;
-	register int c, sum, nl, len;
+	char *op;
+	int c, sum, nl, len;
 	char obuf[FOBUFSIZ + 8];
 	int ret;
 
@@ -420,14 +426,14 @@ writeit:
 	return ret == nl ? nl : ret < 0 ? 0 : -ret;
 }
 
-static
+static int
 frdblk(ip, fn, rlen)
-register char *ip;
+char *ip;
 int fn;
 long *rlen;
 {
-	register char *op, c;
-	register int sum, len, nl;
+	char *op, c;
+	int sum, len, nl;
 	char buf[5], *erbp = ip;
 	int i;
 	static char special = 0;
diff --git a/usr/src/cmd/bnu/getprm.c b/usr/src/cmd/bnu/getprm.c
index b21b7eec4b..5169e7950e 100644
--- a/usr/src/cmd/bnu/getprm.c
+++ b/usr/src/cmd/bnu/getprm.c
@@ -20,7 +20,7 @@
  * CDDL HEADER END
  */
 /*
- * Copyright 1995 Sun Microsystems, Inc.  All rights reserved.
+ * Copyright 2005 Sun Microsystems, Inc.  All rights reserved.
  * Use is subject to license terms.
  */
 
@@ -48,9 +48,9 @@ static char *bal();
  */
 char *
 getprm(s, whsp, prm)
-register char *s, *whsp, *prm;
+char *s, *whsp, *prm;
 {
-	register char *c;
+	char *c;
 	char rightq;		/* the right quote character */
 	char *beginning;
 	wchar_t	ch;
@@ -100,7 +100,7 @@ register char *s, *whsp, *prm;
 					*prm++ = *s++;
 					*prm++ = *s++;
 					*prm = '\0';
-					return;
+					return (s);
 				}
 				*prm++ = *s++;
 			}
@@ -157,7 +157,7 @@ register char *s, *whsp, *prm;
 
 static char *
 bal(s, r)
-register char *s;
+char *s;
 char r;
 {
 	int	width;
@@ -190,7 +190,7 @@ int
 split(arg, sys, fwd, file)
 char *arg, *sys, *fwd, *file;
 {
-    register wchar_t *cl, *cr, *n;
+    wchar_t *cl, *cr, *n;
     int retval = 0;
     wchar_t	wcbuf[MAXFULLNAME];
     wchar_t	tmpbuf[MAXFULLNAME];
diff --git a/usr/src/cmd/bnu/gio.c b/usr/src/cmd/bnu/gio.c
index 09f1feb812..c09bfdca36 100644
--- a/usr/src/cmd/bnu/gio.c
+++ b/usr/src/cmd/bnu/gio.c
@@ -20,7 +20,7 @@
  * CDDL HEADER END
  */
 /*
- * Copyright 1988 Sun Microsystems, Inc.  All rights reserved.
+ * Copyright 2005 Sun Microsystems, Inc.  All rights reserved.
  * Use is subject to license terms.
  */
 
@@ -35,9 +35,12 @@
 #include "pk.h"
 
 struct pack *Pk;
-extern int gwrblk(), grdblk(), pkread(), pkwrite();
+extern int pkread(), pkwrite();
 extern void pkclose();
 
+static int grdblk(char *, int);
+static int gwrblk(char *, int);
+
 extern int packsize, xpacksize;
 
 jmp_buf Getjbuf, Gfailbuf;
@@ -166,7 +169,7 @@ int
 grddata(fn, fp2)
 FILE *fp2;
 {
-	register int ret = SUCCESS;
+	int ret = SUCCESS;
 	int fd2;
 	int len;
 	char bufr[BUFSIZ];
diff --git a/usr/src/cmd/bnu/gwd.c b/usr/src/cmd/bnu/gwd.c
index a2d85e8453..fd453593ac 100644
--- a/usr/src/cmd/bnu/gwd.c
+++ b/usr/src/cmd/bnu/gwd.c
@@ -19,11 +19,16 @@
  *
  * CDDL HEADER END
  */
+/*
+ * Copyright 2005 Sun Microsystems, Inc.  All rights reserved.
+ * Use is subject to license terms.
+ */
+
 /*	Copyright (c) 1984, 1986, 1987, 1988, 1989 AT&T	*/
 /*	  All Rights Reserved  	*/
 
 
-#ident	"%Z%%M%	%I%	%E% SMI"	/* from SVR4 bnu:gwd.c 2.5 */
+#pragma ident	"%Z%%M%	%I%	%E% SMI"
 
 #include "uucp.h"
 
@@ -82,7 +87,7 @@ char *file;
 struct stat *buf;
 {
 #ifndef V7
-	register ret;
+	int ret;
 
 	(void) setuid(Uid);
 	ret = stat(file, buf);
diff --git a/usr/src/cmd/bnu/imsg.c b/usr/src/cmd/bnu/imsg.c
index d89318fe02..3d24d05086 100644
--- a/usr/src/cmd/bnu/imsg.c
+++ b/usr/src/cmd/bnu/imsg.c
@@ -47,11 +47,11 @@
  */
 int
 imsg(msg, fn)
-register char *msg;
-register int fn;
+char *msg;
+int fn;
 {
-	register char c;
-	register int i;
+	char c;
+	int i;
 	short fndsync;
 	char *bmsg;
 
@@ -100,8 +100,8 @@ register int fn;
  */
 int
 omsg(type, msg, fn)
-register char *msg;
-register char type;
+char *msg;
+char type;
 int fn;
 {
 	char buf[BUFSIZ];
@@ -116,7 +116,8 @@ int fn;
  * null turnoff routine to be used for errors
  * during protocol selection.
  */
-turnoff()
+int
+turnoff(void)
 {
 	return(0);
 }
diff --git a/usr/src/cmd/bnu/in.uucpd.c b/usr/src/cmd/bnu/in.uucpd.c
index 54b22b164e..ba37679150 100644
--- a/usr/src/cmd/bnu/in.uucpd.c
+++ b/usr/src/cmd/bnu/in.uucpd.c
@@ -20,14 +20,12 @@
  * CDDL HEADER END
  */
 /*
- * Copyright 1998-2002 Sun Microsystems, Inc.  All rights reserved.
+ * Copyright 2005 Sun Microsystems, Inc.  All rights reserved.
  * Use is subject to license terms.
  */
 
 #pragma ident	"%Z%%M%	%I%	%E% SMI"
 
-/* from UCB 5.4 6/23/85 */
-
 /*
  * 4.2BSD, 2.9BSD, or ATTSVR4 TCP/IP server for uucico
  * uucico's TCP channel causes this server to be run at the remote end.
@@ -38,7 +36,7 @@
 #ifdef BSD2_9
 #include <sys/localopts.h>
 #include <sys/file.h>
-#endif BSD2_9
+#endif	/* BSD2_9 */
 #include <signal.h>
 #include <errno.h>
 #include <sys/socket.h>
@@ -63,7 +61,7 @@ pam_handle_t    *pamh;
 
 #if !defined(BSD4_2) && !defined(BSD2_9) && !defined(ATTSVR4)
 --- You must have either BSD4_2, BSD2_9, or ATTSVR4 defined for this to work
-#endif !BSD4_2 && !BSD2_9
+#endif	/* !BSD4_2 && !BSD2_9 */
 #if defined(BSD4_2) && defined(BSD2_9)
 --- You may not have both BSD4_2 and BSD2_9 defined for this to work
 #endif	/* check for stupidity */
@@ -87,16 +85,19 @@ char *nenv[] = {
 };
 extern char **environ;
 
+static void doit(struct sockaddr_in *);
+static void dologout(void);
+
+int
 main(argc, argv)
 int argc;
 char **argv;
 {
 #ifndef BSDINETD
-	register int s, tcp_socket;
+	int s, tcp_socket;
 	struct servent *sp;
-#endif !BSDINETD
+#endif	/* !BSDINETD */
 	extern int errno;
-	int dologout();
 
 	if (argc > 1 && strcmp(argv[1], "-n") == 0)
 		nolog = 1;
@@ -114,7 +115,7 @@ char **argv;
 		doit(&hisctladdr);
 	dologout();
 	exit(1);
-#else !BSDINETD
+#else	/* !BSDINETD */
 	sp = getservbyname("uucp", "tcp");
 	if (sp == NULL) {
 		perror("uucpd: getservbyname");
@@ -168,7 +169,7 @@ char **argv;
 		}
 		close(s);
 	}
-#endif BSD4_2
+#endif	/* BSD4_2 */
 
 #ifdef BSD2_9
 	for (;;) {
@@ -195,12 +196,13 @@ char **argv;
 			exit(1);
 		}
 	}
-#endif BSD2_9
-#endif	!BSDINETD
+#endif	/* BSD2_9 */
+#endif	/* !BSDINETD */
 
 	/* NOTREACHED */
 }
 
+static void
 doit(sinp)
 struct sockaddr_in *sinp;
 {
@@ -304,17 +306,18 @@ struct sockaddr_in *sinp;
 
 #if defined(BSD4_2) || defined(ATTSVR4)
 	execl(UUCICO, "uucico", "-u", user, (char *)0);
-#endif BSD4_2
+#endif	/* BSD4_2 */
 #ifdef BSD2_9
 	sprintf(passwd, "-h%s", inet_ntoa(sinp->sin_addr));
 	execl(UUCICO, "uucico", passwd, (char *)0);
-#endif BSD2_9
+#endif	/* BSD2_9 */
 	perror("uucico server: execl");
 }
 
+int
 readline(p, n)
-register char *p;
-register int n;
+char *p;
+int n;
 {
 	char c;
 
@@ -334,42 +337,43 @@ register int n;
 #ifdef ATTSVR4
 #include <sac.h>	/* for SC_WILDC */
 #include <utmpx.h>
-#else !ATTSVR4
+#else	/* !ATTSVR4 */
 #include <utmp.h>
-#endif !ATTSVR4
+#endif	/* !ATTSVR4 */
 #if defined(BSD4_2) || defined(ATTSVR4)
 #include <fcntl.h>
-#endif BSD4_2
+#endif	/* BSD4_2 */
 
 #ifdef BSD2_9
 #define	O_APPEND	0 /* kludge */
 #define	wait3(a, b, c)	wait2(a, b)
-#endif BSD2_9
+#endif	/* BSD2_9 */
 
 #define	SCPYN(a, b)	strncpy(a, b, sizeof (a))
 
 #ifdef ATTSVR4
 struct	utmpx utmp;
-#else !ATTSVR4
+#else	/* !ATTSVR4 */
 struct	utmp utmp;
-#endif !ATTSVR4
+#endif	/* !ATTSVR4 */
 
-dologout()
+static void
+dologout(void)
 {
 #ifdef ATTSVR4
 	int status;
-#else !ATTSVR4
+#else	/* !ATTSVR4 */
 	union wait status;
-#endif !ATSVR4
+#endif	/* !ATSVR4 */
 	int pid, wtmp;
 	/* the following 2 variables are needed for utmp mgmt */
 	struct utmpx	ut;
 
 #ifdef BSDINETD
 	while ((pid = wait(&status)) > 0) {
-#else  !BSDINETD
+#else	/* !BSDINETD */
 	while ((pid = wait3(&status, WNOHANG, 0)) > 0) {
-#endif !BSDINETD
+#endif	/* !BSDINETD */
 		if (nolog)
 			continue;
 #ifdef ATTSVR4
@@ -397,7 +401,7 @@ dologout()
 		 */
 
 		updwtmpx(WTMPX_FILE, &ut);
-#else !ATTSVR4
+#else	/* !ATTSVR4 */
 		wtmp = open("/usr/adm/wtmp", O_WRONLY|O_APPEND);
 		if (wtmp >= 0) {
 			sprintf(utmp.ut_line, "uucp%.4d", pid);
@@ -406,17 +410,18 @@ dologout()
 			(void) time(&utmp.ut_time);
 #ifdef BSD2_9
 			(void) lseek(wtmp, 0L, 2);
-#endif BSD2_9
+#endif	/* BSD2_9 */
 			(void) write(wtmp, (char *)&utmp, sizeof (utmp));
 			(void) close(wtmp);
 		}
-#endif !ATTSVR4
+#endif	/* !ATTSVR4 */
 	}
 }
 
 /*
  * Record login in wtmp file.
  */
+int
 dologin(pw, sin)
 struct passwd *pw;
 struct sockaddr_in *sin;
@@ -477,7 +482,7 @@ struct sockaddr_in *sin;
 	 *	}
 	 */
 
-#else !ATTSVR4
+#else	/* !ATTSVR4 */
 	wtmp = open("/usr/adm/wtmp", O_WRONLY|O_APPEND);
 	if (wtmp >= 0) {
 		/* hack, but must be unique and no tty line */
@@ -488,11 +493,11 @@ struct sockaddr_in *sin;
 		time(&utmp.ut_time);
 #ifdef BSD2_9
 		(void) lseek(wtmp, 0L, 2);
-#endif BSD2_9
+#endif	/* BSD2_9 */
 		(void) write(wtmp, (char *)&utmp, sizeof (utmp));
 		(void) close(wtmp);
 	}
-#endif !ATTSVR4
+#endif	/* !ATTSVR4 */
 
 	return (0);
 }
diff --git a/usr/src/cmd/bnu/limits.c b/usr/src/cmd/bnu/limits.c
index 500bcf0ef6..f1cce97ba7 100644
--- a/usr/src/cmd/bnu/limits.c
+++ b/usr/src/cmd/bnu/limits.c
@@ -19,11 +19,16 @@
  *
  * CDDL HEADER END
  */
+/*
+ * Copyright 2005 Sun Microsystems, Inc.  All rights reserved.
+ * Use is subject to license terms.
+ */
+
 /*	Copyright (c) 1984, 1986, 1987, 1988, 1989 AT&T	*/
 /*	  All Rights Reserved  	*/
 
 
-#ident	"%Z%%M%	%I%	%E% SMI"	/* from SVR4 bnu:limits.c 1.4 */
+#pragma ident	"%Z%%M%	%I%	%E% SMI"
 
 #include "uucp.h"
 
@@ -124,8 +129,8 @@ get_tokens (line,flds)
 char *line;
 char *flds[];
 {
-	register i;
-	register char *p;
+	int i;
+	char *p;
 	struct name_value pair;
 
 	/* initialize defaults  in case parameter is not specified */
diff --git a/usr/src/cmd/bnu/log.h b/usr/src/cmd/bnu/log.h
index 6c6308fd1f..098ac25df9 100644
--- a/usr/src/cmd/bnu/log.h
+++ b/usr/src/cmd/bnu/log.h
@@ -19,11 +19,18 @@
  *
  * CDDL HEADER END
  */
+/*
+ * Copyright 2005 Sun Microsystems, Inc.  All rights reserved.
+ * Use is subject to license terms.
+ */
+
 /*	Copyright (c) 1984, 1986, 1987, 1988, 1989 AT&T	*/
 /*	  All Rights Reserved  	*/
 
+#ifndef LOG_H
+#define	LOG_H
 
-#ident	"%Z%%M%	%I%	%E% SMI"	/* from SVR4 bnu:log.h 1.1 */
+#pragma ident	"%Z%%M%	%I%	%E% SMI"
 
 #define	MCHAR		'M'	/* Indicates master */
 #define SCHAR		'S'	/* Indicates slave */
@@ -84,7 +91,9 @@ extern char * scOwn();			/* security.c */
 extern char * scSize();			/* security.c */
 extern void copyText();			/* perfstat.c */
 extern void writeLog();			/* perfstat.c */
-extern openLog();			/* perfstat.c */
+extern int openLog();			/* perfstat.c */
 extern void closeLog();			/* perfstat.c */
 extern char *	gmt();			/* perfstat.c */
 extern time_t  	cpucycle();		/* account.c */
+
+#endif	/* LOG_H */
diff --git a/usr/src/cmd/bnu/permission.c b/usr/src/cmd/bnu/permission.c
index ad15b8a2e9..e21989b8d5 100644
--- a/usr/src/cmd/bnu/permission.c
+++ b/usr/src/cmd/bnu/permission.c
@@ -19,15 +19,15 @@
  *
  * CDDL HEADER END
  */
-/*	Copyright (c) 1984, 1986, 1987, 1988, 1989 AT&T	*/
-/*	  All Rights Reserved  	*/
-
 /*
- * Copyright 2001-2002 Sun Microsystems, Inc.  All rights reserved.
+ * Copyright 2005 Sun Microsystems, Inc.  All rights reserved.
  * Use is subject to license terms.
  */
 
-#pragma ident	"%Z%%M%	%I%	%E% SMI"	/* from SVR4 bnu:permission.c 2.12 */
+/*	Copyright (c) 1984, 1986, 1987, 1988, 1989 AT&T	*/
+/*	  All Rights Reserved  	*/
+
+#pragma ident	"%Z%%M%	%I%	%E% SMI"
 
 #ifndef UUCHECK
 #include "uucp.h"
@@ -178,7 +178,7 @@ int
 mchFind(name)
 char *name;
 {
-	register i, ret;
+	int i, ret;
 	DEBUG(5, "mchFind called (%s)\n", name);
 	if ( (ret = userFind (name, "", U_MACHINE)) == FAIL)
 	    /* see if there is a default line */
@@ -314,8 +314,8 @@ fillList(type, list)
 int type;
 char *list[];
 {
-	register char *p;
-	register num;
+	char *p;
+	int num;
 	int maxlist = 0;
 
 	p = _Flds[type];
@@ -561,11 +561,11 @@ parse_tokens(flds, buf)
 char *flds[];
 char *buf;
 {
-	register i;
-	register char *p;
+	int i;
+	char *p;
 	struct name_value pair;
 	static char _line[BUFSIZ];
-	register char *line = buf;
+	char *line = buf;
 
 	if (buf == NULL)
 		line = _line;	/* if no buffer specified, use default */
@@ -613,7 +613,7 @@ char *buf;
  */
 char *
 next_token (string, pair)
-register char *string;
+char *string;
 struct name_value *pair;
 {
 	char	*prev = _uu_setlocale(LC_ALL, "C");
@@ -652,7 +652,7 @@ getuline(fp, line)
 FILE *fp;
 char *line;
 {
-	register char *p, *c;
+	char *p, *c;
 	char buf[BUFSIZ];
 	
 	p = line;
@@ -691,7 +691,7 @@ char *
 nextarg(str, name)
 char *str, **name;
 {
-	register char *p, *b;
+	char *p, *b;
 	static char buf[SMAX+1];
 
 	for(b=buf,p=str; *p != ':' && *p && b < buf+SMAX;)
@@ -788,9 +788,9 @@ char	*cmd, *fullcmd;
  */
 static int
 listMatch(name, list)
-register char *name, *list[];
+char *name, *list[];
 {
-    register i;
+    int i;
     char *temp, *tend;
     struct stat statbuf;
     dev_t _dev[MAXPATHS+1];
@@ -848,10 +848,10 @@ register char *name, *list[];
  */
 static int
 cmdMatch(name, fullname)
-register char *name;
+char *name;
 char *fullname;
 {
-	register i;
+	int i;
 	char *bname;
 	int allok = FALSE;
 
@@ -900,7 +900,7 @@ int
 chkpth(path, flag)
 char *path;
 {
-	register char *s;
+	char *s;
 
 	/*
 	 * this is probably redundant,
@@ -954,7 +954,7 @@ int
 chkperm(from, to, opt)
 char *from, *to, *opt;
 {
-	register char *lxp, *p;
+	char *lxp, *p;
 	struct stat s;
 	char dir[MAXFULLNAME];
 
diff --git a/usr/src/cmd/bnu/pk0.c b/usr/src/cmd/bnu/pk0.c
index 594c185974..9d96a954ef 100644
--- a/usr/src/cmd/bnu/pk0.c
+++ b/usr/src/cmd/bnu/pk0.c
@@ -20,7 +20,7 @@
  * CDDL HEADER END
  */
 /*
- * Copyright 1988 Sun Microsystems, Inc.  All rights reserved.
+ * Copyright 2005 Sun Microsystems, Inc.  All rights reserved.
  * Use is subject to license terms.
  */
 
@@ -35,6 +35,7 @@
 #include "pk.h"
 #include <sys/buf.h>
 
+extern void xlatecntl();
 extern void pkcntl(), pkoutput(), pkclose(), pkreset(), pkzero(),
 	pkgetpack(), pkxstart();
 extern int pkread(), pkwrite(), pksack();
@@ -50,9 +51,10 @@ extern int xpacksize;
  */
 void
 pkcntl(c, pk)
-register struct pack *pk;
+int c;
+struct pack *pk;
 {
-	register cntl, val;
+	int cntl, val;
 
 	val = c & MOD8;
 	cntl = (c>>3) & MOD8;
@@ -124,8 +126,8 @@ register struct pack *pk;
 static int
 pkaccept()
 {
-	register struct pack *pk;
-	register x,seq;
+	struct pack *pk;
+	int x,seq;
 	char m, cntl, *p, imask, **bp;
 	int bad,accept,skip,t,cc;
 	unsigned short sum;
@@ -250,8 +252,8 @@ pkread(ibuf, icount)
 char *ibuf;
 int icount;
 {
-	register struct pack *pk;
-	register x;
+	struct pack *pk;
+	int x;
 	int is,cc,xfr,count;
 	char *cp, **bp;
 
@@ -316,8 +318,8 @@ pkwrite(ibuf, icount)
 char *ibuf;
 int icount;
 {
-	register struct pack *pk;
-	register x;
+	struct pack *pk;
+	int x;
 	caddr_t cp;
 	int partial;
 	int cc, fc, count;
@@ -368,9 +370,9 @@ int icount;
 
 int
 pksack(pk)
-register struct pack *pk;
+struct pack *pk;
 {
-	register x, i;
+	int x, i;
 
 	i = 0;
 	for(x=pk->p_ps; x!=pk->p_rpr; ) {
@@ -391,9 +393,9 @@ register struct pack *pk;
 
 void
 pkoutput(pk)
-register struct pack *pk;
+struct pack *pk;
 {
-register x;
+int x;
 char bstate;
 int i;
 
@@ -499,8 +501,8 @@ out:
 void
 pkclose()
 {
-	register struct pack *pk;
-	register i;
+	struct pack *pk;
+	int i;
 	int rcheck;
 	char **bp;
 
@@ -560,7 +562,7 @@ pkclose()
 
 void
 pkreset(pk)
-register struct pack *pk;
+struct pack *pk;
 {
 
 	pk->p_ps = pk->p_pr =  pk->p_rpr = 0;
@@ -569,12 +571,12 @@ register struct pack *pk;
 
 static int
 chksum(s,n)
-register char *s;
-register n;
+char *s;
+int n;
 {
-	register short sum;
-	register unsigned short t;
-	register short x;
+	short sum;
+	unsigned short t;
+	short x;
 
 	sum = -1;
 	x = 0;
@@ -598,9 +600,9 @@ register n;
 
 static int
 pksize(n)
-register n;
+int n;
 {
-	register k;
+	int k;
 
 	n >>= 5;
 	for(k=0; n >>= 1; k++);
diff --git a/usr/src/cmd/bnu/pk1.c b/usr/src/cmd/bnu/pk1.c
index 50a07218de..5ebf58edc3 100644
--- a/usr/src/cmd/bnu/pk1.c
+++ b/usr/src/cmd/bnu/pk1.c
@@ -39,6 +39,8 @@ extern void pkfail(), pkzero(), pkoutput(), pkreset(), pkcntl(), pkgetpack();
 extern int pksack();
 static void pkdata();
 static int pkcget();
+static void xlatestate(struct pack *, int);
+void xlatecntl(int, int);
 
 /*
  * Code added to allow translation of states from numbers to
@@ -81,9 +83,9 @@ struct pack *
 pkopen(ifn, ofn)
 int ifn, ofn;
 {
-	register struct pack *pk;
-	register char **bp;
-	register int i;
+	struct pack *pk;
+	char **bp;
+	int i;
 	int windows = WINDOWS;
 	extern int xpacksize, packsize;
 
@@ -163,11 +165,11 @@ int ifn, ofn;
  */
 void
 pkgetpack(ipk)
-register struct pack *ipk;
+struct pack *ipk;
 {
-	register char *p;
-	register struct pack *pk;
-	register struct header *h;
+	char *p;
+	struct pack *pk;
+	struct header *h;
 	unsigned short sum;
 	int k, tries, ifn, noise;
 	char **bp, hdchk;
@@ -289,10 +291,12 @@ retransmit:
 /*
  * Translate pk->p_state into something printable.
  */
+static void
 xlatestate(pk, dbglvl)
-register struct pack *pk;
+struct pack *pk;
+int dbglvl;
 {
-	register int i;
+	int i;
 	char delimc = ' ', msgline[80], *buf = msgline;
 
 	if (Debug < dbglvl)
@@ -308,16 +312,17 @@ register struct pack *pk;
 	}
 	sprintf(buf, " (0%o)\n", pk->p_state);
 	DEBUG(dbglvl, "%s", msgline);
+	return;
 }
 
 static void
 pkdata(c, sum, pk, bp)
-register struct pack *pk;
+struct pack *pk;
 unsigned short sum;
 char c;
 char **bp;
 {
-	register x;
+	int x;
 	int t;
 	char m;
 
@@ -353,13 +358,13 @@ slot:
  */
 void
 pkxstart(pk, cntl, x)
-register struct pack *pk;
+struct pack *pk;
 int x;
 char cntl;
 {
-	register char *p;
-	register short checkword;
-	register char hdchk;
+	char *p;
+	short checkword;
+	char hdchk;
 
 	p = (caddr_t) &pk->p_ohbuf;
 	*p++ = SYN;
@@ -425,14 +430,14 @@ char cntl;
 
 static int
 pkcget(fn, b, n)
-register int n;
-register char *b;
-register int fn;
+int n;
+char *b;
+int fn;
 {
-	register int ret;
+	int ret;
 #ifdef PKSPEEDUP
 	extern int linebaudrate;
-	register int donap = (linebaudrate > 0 && linebaudrate < 4800);
+	int donap = (linebaudrate > 0 && linebaudrate < 4800);
 #endif /*  PKSPEEDUP  */
 
 	if (n == 0)
@@ -491,13 +496,16 @@ register int fn;
  * role == 0: receive
  * role == 1: send
  */
+void
 xlatecntl(role, cntl)
+int role;
+int cntl;
 {
 	static char *cntltype[4] = {"CNTL, ", "ALT, ", "DATA, ", "SHORT, "};
 	static char *cntlxxx[8] = {"ZERO, ", "CLOSE, ", "RJ, ", "SRJ, ",
 				   "RR, ", "INITC, ", "INITB, ", "INITA, "};
 	char dbgbuf[128];
-	register char *ptr;
+	char *ptr;
 
 	ptr = dbgbuf;
 	strcpy(ptr, role ? "send " : "recv ");
diff --git a/usr/src/cmd/bnu/setmode.c b/usr/src/cmd/bnu/setmode.c
index 2daf89719b..8d4cd16d1e 100644
--- a/usr/src/cmd/bnu/setmode.c
+++ b/usr/src/cmd/bnu/setmode.c
@@ -1,6 +1,6 @@
 /*
- * Copyright (c) 1988,1989,1999 by Sun Microsystems, Inc.
- * All rights reserved.
+ * Copyright 2005 Sun Microsystems, Inc.  All rights reserved.
+ * Use is subject to license terms.
  */
 
 /*
@@ -21,12 +21,17 @@
 static struct termios termios_set;
 static struct termios termios_clear;
 
+static int parse_modes(char *modes);
+static void setty(int);
+
+int
 setmode(modes, fd)
 	char *modes;
 	int fd;
 {
 	if (parse_modes(modes))
 		setty(fd);
+	return (0);
 }
 
 struct mds {
@@ -276,9 +281,9 @@ static int
 parse_modes(modes)
 	char *modes;
 {
-	register char *curtoken;
-	register int match;
-	register int i;
+	char *curtoken;
+	int match;
+	int i;
 
 	termios_clear.c_iflag = 0;
 	termios_clear.c_oflag = 0;
@@ -332,8 +337,8 @@ parse_modes(modes)
 /*
  * setup tty lines.
  */
-static
-setty(fd)
+static void
+setty(int fd)
 {
 	struct termios termios;
 
diff --git a/usr/src/cmd/bnu/unknown.c b/usr/src/cmd/bnu/unknown.c
index 7f96dd5959..8919350dff 100644
--- a/usr/src/cmd/bnu/unknown.c
+++ b/usr/src/cmd/bnu/unknown.c
@@ -19,7 +19,7 @@
  *
  * CDDL HEADER END
  */
-/* 
+/*
  * Copyright 2005 Sun Microsystems, Inc.  All rights reserved.
  * Use is subject to license terms.
  */
@@ -48,6 +48,7 @@
 
 void fall_on_sword();
 
+int
 main(argc, argv)
 int	argc;
 char	*argv[];
@@ -83,9 +84,7 @@ char	*argv[];
 	if ( fclose(fp) != 0 )
 		fall_on_sword("cannot close", buf);
 
-	exit(0);
-
-	/* NOTREACHED */
+	return (0);
 }
 
 /* don't return from here */
diff --git a/usr/src/cmd/bnu/uucheck.c b/usr/src/cmd/bnu/uucheck.c
index 4533c6115f..ce43740a71 100644
--- a/usr/src/cmd/bnu/uucheck.c
+++ b/usr/src/cmd/bnu/uucheck.c
@@ -20,7 +20,7 @@
  * CDDL HEADER END
  */
 /*
- * Copyright 1993 Sun Microsystems, Inc.  All rights reserved.
+ * Copyright 2005 Sun Microsystems, Inc.  All rights reserved.
  * Use is subject to license terms.
  */
 
@@ -49,8 +49,8 @@ int Uerrors = 0;	/* error count */
 #define USAGE	"[-v] [-xNUM]"
 
 int Debug=0;
-mkdirs(){}
-canPath(){}
+int mkdirs(){ return (0); }
+int canPath(){ return (0); }
 char RemSpool[] = SPOOL; /* this is a dummy for chkpth() -- never used here */
 char *Spool = SPOOL;
 char *Pubdir = PUBDIR;
@@ -97,7 +97,9 @@ struct tab
 extern char *nextarg();
 int verbose = 0;	/* fsck-like verbosity */
 
+int
 main(argc, argv)
+int argc;
 char *argv[];
 {
     struct stat statbuf;
@@ -150,10 +152,7 @@ char *argv[];
     Uerrors += checkPerm();
     if (verbose) printf("*** uucheck:  %s Check Complete\n\n", PERMISSIONS);
 
-    exit(Uerrors);
-
-
-	/* NOTREACHED */
+    return(Uerrors);
 }
 
 int
@@ -208,8 +207,8 @@ int
 outLine(type)
 int type;
 {
-	register int i;
-	register char *p;
+	int i;
+	char *p;
 	char *arg, cmd[BUFSIZ];
 	int error = 0;
 	char myname[MAXBASENAME+1];
diff --git a/usr/src/cmd/bnu/uucico.c b/usr/src/cmd/bnu/uucico.c
index fed862fc12..ac3f721447 100644
--- a/usr/src/cmd/bnu/uucico.c
+++ b/usr/src/cmd/bnu/uucico.c
@@ -20,7 +20,7 @@
  * CDDL HEADER END
  */
 /*
- * Copyright 1995 Sun Microsystems, Inc.  All rights reserved.
+ * Copyright 2005 Sun Microsystems, Inc.  All rights reserved.
  * Use is subject to license terms.
  */
 
@@ -79,7 +79,9 @@ static void checkrmt();		/* See if we want to talk to remote. */
 
 extern char *Mytype;
 
+int
 main(argc, argv, envp)
+int argc;
 char *argv[];
 char **envp;
 {
@@ -756,6 +758,7 @@ char **envp;
 	}
 	cleanup(exitcode);
 	/*NOTREACHED*/
+	return (0);
 }
 
 /*
@@ -763,7 +766,7 @@ char **envp;
  */
 void
 cleanup(code)
-register int code;
+int code;
 {
 	(void) signal(SIGINT, SIG_IGN);
 	(void) signal(SIGHUP, SIG_IGN);
@@ -789,7 +792,7 @@ char TM_name[MAXNAMESIZE];
 void
 cleanTM()
 {
-	register int i;
+	int i;
 	char tm_name[MAXNAMESIZE];
 
 	DEBUG(7,"TM_cnt: %d\n",TM_cnt);
@@ -820,7 +823,7 @@ pid_t pnum;
  */
 void
 onintr(inter)
-register int inter;
+int inter;
 {
 	char str[30];
 	/* I'm putting a test for zero here because I saw it happen
@@ -865,7 +868,7 @@ timeout()
 /* skip to next field */
 static char *
 pskip(p)
-register char *p;
+char *p;
 {
 	if ((p = strchr(p, ' ')) != CNULL)
 		do
@@ -877,7 +880,7 @@ register char *p;
 void
 closedem()
 {
-	register i, maxfiles;
+	int i, maxfiles;
 
 #ifdef ATTSVR3
 	maxfiles = ulimit(4,0);
@@ -913,7 +916,7 @@ setTZ()
 	extern char	*fgets();
 	FILE		*tzfp;
 	extern FILE	*fopen();
-	register int	i;
+	int		i;
 	extern int	fclose(), strncmp();
 
 	if ( (tzfp = fopen("/etc/TIMEZONE","r")) == (FILE *)NULL )
diff --git a/usr/src/cmd/bnu/uucleanup.c b/usr/src/cmd/bnu/uucleanup.c
index 962a0073e4..3e99f09425 100644
--- a/usr/src/cmd/bnu/uucleanup.c
+++ b/usr/src/cmd/bnu/uucleanup.c
@@ -20,7 +20,7 @@
  * CDDL HEADER END
  */
 /*
- * Copyright 1994 Sun Microsystems, Inc.  All rights reserved.
+ * Copyright 2005 Sun Microsystems, Inc.  All rights reserved.
  * Use is subject to license terms.
  */
 
@@ -101,6 +101,7 @@ void cleanup(){}
 void systat(){}
 void logent(){}
 
+static void cleanworkspace(void);
 
 /* types of D. files */
 #define D_MAIL	1
@@ -149,7 +150,9 @@ char *_Warning[] = {
 "",
 };
 
+int
 main(argc, argv, envp)
+int argc;
 char *argv[];
 char **envp;
 {
@@ -316,9 +319,7 @@ char **envp;
 		closedir(machdir);
 	}
 	closedir(spooldir);
-	exit(0);
-
-	/* NOTREACHED */
+	return (0);
 }
 
 /* procdtype - select the type of processing that a D. file should receive */
@@ -382,7 +383,7 @@ cprocess(fullname)
 char *fullname;
 {
 	struct stat s;
-	register struct tm *tp;
+	struct tm *tp;
 	char buf[BUFSIZ], user[9];
 	char file1[BUFSIZ], file2[BUFSIZ], file3[BUFSIZ], type[2], opt[256];
 	char text[BUFSIZ], text1[BUFSIZ], text2[BUFSIZ];
@@ -477,7 +478,7 @@ wprocess(dir, file)
 char *dir, *file;
 {
 	struct stat s;
-	register struct tm *tp;
+	struct tm *tp;
 	char fullname[BUFSIZ], xfile[BUFSIZ], xF_file[BUFSIZ];
 	char buf[BUFSIZ], user[BUFSIZ];
 	char file1[BUFSIZ], file2[BUFSIZ], file3[BUFSIZ], type[2], opt[256];
@@ -900,7 +901,7 @@ sendMail(system, user, file, mtext)
 char *system, *user, *file;
 char *mtext[];
 {
-	register FILE *fp, *fi;
+	FILE *fp, *fi;
 	char cmd[BUFSIZ];
 	char *p;
 
@@ -950,7 +951,7 @@ int
 execRnews(file)
 char *file;
 {
-	register FILE *fp, *fi;
+	FILE *fp, *fi;
 	char cmd[BUFSIZ];
 
 	DEBUG(5, "Rnews %s\n", file);
@@ -1068,7 +1069,7 @@ static FILE	*_Lf = NULL;
 
 void
 logit(text, status)
-register char	*text;
+char	*text;
 int status;
 {
 
@@ -1089,7 +1090,8 @@ int status;
 	return;
 }
 
-cleanworkspace()
+static void
+cleanworkspace(void)
 {
 	DIR	*spooldir;
 	char f[MAXFULLNAME];
diff --git a/usr/src/cmd/bnu/uucp.c b/usr/src/cmd/bnu/uucp.c
index 2ccde01f38..2c57d7e61b 100644
--- a/usr/src/cmd/bnu/uucp.c
+++ b/usr/src/cmd/bnu/uucp.c
@@ -19,14 +19,14 @@
  *
  * CDDL HEADER END
  */
-/*	Copyright (c) 1984, 1986, 1987, 1988, 1989 AT&T	*/
-/*	  All Rights Reserved  	*/
-
 /*
- * Copyright 2004 Sun Microsystems, Inc.  All rights reserved.
+ * Copyright 2005 Sun Microsystems, Inc.  All rights reserved.
  * Use is subject to license terms.
  */
 
+/*	Copyright (c) 1984, 1986, 1987, 1988, 1989 AT&T	*/
+/*	  All Rights Reserved  	*/
+
 #pragma ident	"%Z%%M%	%I%	%E% SMI"
 
 #include "uucp.h"
@@ -54,7 +54,9 @@ void commitall(), wfabort(), mailst(), gename(), svcfile();
 
 char	Sfile[MAXFULLNAME];
 
+int
 main(argc, argv, envp)
+int argc;
 char *argv[];
 char	**envp;
 {
@@ -438,6 +440,7 @@ char	**envp;
 	}
 	cleanup(errors);
 	/*NOTREACHED*/
+	return (0);
 }
 
 /*
@@ -445,7 +448,7 @@ char	**envp;
  */
 void
 cleanup(code)
-register int	code;
+int	code;
 {
 	static int first = 1;
 
diff --git a/usr/src/cmd/bnu/uucp.h b/usr/src/cmd/bnu/uucp.h
index 90c2104f6d..cab069c485 100644
--- a/usr/src/cmd/bnu/uucp.h
+++ b/usr/src/cmd/bnu/uucp.h
@@ -391,7 +391,7 @@ extern "C" {
 
 /* The call structure is used by ct.c, cu.c, and dial.c.	*/
 
-static struct call {
+struct call {
 	char *speed;		/* transmission baud rate */
 	char *line;		/* device name for outgoing line */
 	char *telno;		/* ptr to tel-no digit string */
@@ -456,7 +456,7 @@ struct caller {
 
 /* structure for a saved C file */
 
-static struct cs_struct {
+struct cs_struct {
 	char	file[NAMESIZE];
 	char	sys[NAMESIZE+5];
 	char	sgrade[NAMESIZE];
@@ -598,11 +598,11 @@ extern unsigned long	getfilesize();			/* statlog.c */
 extern void 		putfilesize();			/* statlog.c */
 
 EXTERN char	*protoString();				/* permission.c */
-extern		logFind(), mchFind();			/* permission.c */
-extern		chkperm(), chkpth();			/* permission.c */
-extern		cmdOK(), switchRole();			/* permission.c */
-extern		callBack(), requestOK();		/* permission.c */
-extern		noSpool();				/* permission.c */
+extern int	logFind(), mchFind();			/* permission.c */
+extern int	chkperm(), chkpth();			/* permission.c */
+extern int	cmdOK(), switchRole();			/* permission.c */
+extern int	callBack(), requestOK();		/* permission.c */
+extern int	noSpool();				/* permission.c */
 extern void	myName();				/* permission.c */
 
 extern int	mkdirs();				/* expfile.c */
diff --git a/usr/src/cmd/bnu/uuglist.c b/usr/src/cmd/bnu/uuglist.c
index 1462480fdf..7524860c32 100644
--- a/usr/src/cmd/bnu/uuglist.c
+++ b/usr/src/cmd/bnu/uuglist.c
@@ -19,11 +19,16 @@
  *
  * CDDL HEADER END
  */
+/*
+ * Copyright 2005 Sun Microsystems, Inc.  All rights reserved.
+ * Use is subject to license terms.
+ */
+
 /*	Copyright (c) 1984, 1986, 1987, 1988, 1989 AT&T	*/
 /*	  All Rights Reserved  	*/
 
 
-#ident	"%Z%%M%	%I%	%E% SMI"	/* from SVR4 bnu:uuglist.c 1.6 */
+#pragma ident	"%Z%%M%	%I%	%E% SMI"
 
 #include	"uucp.h"
 
@@ -37,6 +42,7 @@ static char  Nnament[MAXLENGTH][NAMESIZE];
 static char *Nptr[MAXLENGTH];
 static short Nnames = 0;
 
+int
 main(argc, argv)
 int argc;
 char **argv;
@@ -84,14 +90,14 @@ char **argv;
 		puts(Nptr[i]);
 		(void) strcpy(prev, Nptr[i]);
 	}
-	exit(0);
+	return (0);
 }
 static void
 insert(name)
 char *name;
 {
-	register i,j;
-	register char *p;
+	int i,j;
+	char *p;
 
 	DEBUG(7, "insert(%s) ", name);
 
@@ -160,11 +166,11 @@ uproc()
 }
 
 int Dfileused = FALSE;
-wfcommit() {}
+void wfcommit() {}
 void cleanup() {}
-gnamef() {}
-gdirf() {}
-cklock() {}
+int gnamef() { return (0); }
+int gdirf() { return (0); }
+int cklock() { return (0); }
 
 /*VARARGS*/
 /*ARGSUSED*/
diff --git a/usr/src/cmd/bnu/uuname.c b/usr/src/cmd/bnu/uuname.c
index 4219be8772..7dcc82e82b 100644
--- a/usr/src/cmd/bnu/uuname.c
+++ b/usr/src/cmd/bnu/uuname.c
@@ -20,7 +20,7 @@
  * CDDL HEADER END
  */
 /*
- * Copyright 1995 Sun Microsystems, Inc.  All rights reserved.
+ * Copyright 2005 Sun Microsystems, Inc.  All rights reserved.
  * Use is subject to license terms.
  */
 
@@ -38,6 +38,7 @@
  *	-l	-> returns only the local system name.
  *	-c	-> print remote systems accessible to cu
  */
+int
 main(argc,argv)
 int argc;
 char **argv;
@@ -98,9 +99,7 @@ char **argv;
 		puts(name);
 		(void) strcpy(prev, name);
 	}
-	exit(0);
-
-	/* NOTREACHED */
+	return (0);
 }
 
 /* small, private copies of assert(), logent(), */
diff --git a/usr/src/cmd/bnu/uusched.c b/usr/src/cmd/bnu/uusched.c
index 8b6250faac..85040b49c2 100644
--- a/usr/src/cmd/bnu/uusched.c
+++ b/usr/src/cmd/bnu/uusched.c
@@ -20,7 +20,7 @@
  * CDDL HEADER END
  */
 /*
- * Copyright 1997 Sun Microsystems, Inc.  All rights reserved.
+ * Copyright 2005 Sun Microsystems, Inc.  All rights reserved.
  * Use is subject to license terms.
  */
 
@@ -45,7 +45,9 @@ void cleanup(), exuucico();
 
 void logent(){}		/* to load ulockf.c */
 
+int
 main(argc, argv, envp)
+int argc;
 char *argv[];
 char **envp;
 {
@@ -200,6 +202,7 @@ char **envp;
 	cleanup(0);
 
 	/* NOTREACHED */
+	return (0);
 }
 
 struct m	*
diff --git a/usr/src/cmd/bnu/uustat.c b/usr/src/cmd/bnu/uustat.c
index 72c601513b..67031d6866 100644
--- a/usr/src/cmd/bnu/uustat.c
+++ b/usr/src/cmd/bnu/uustat.c
@@ -19,14 +19,14 @@
  *
  * CDDL HEADER END
  */
-/*	Copyright (c) 1984, 1986, 1987, 1988, 1989 AT&T	*/
-/*	  All Rights Reserved  	*/
-
 /*
- * Copyright 2004 Sun Microsystems, Inc.  All rights reserved.
+ * Copyright 2005 Sun Microsystems, Inc.  All rights reserved.
  * Use is subject to license terms.
  */
 
+/*	Copyright (c) 1984, 1986, 1987, 1988, 1989 AT&T	*/
+/*	  All Rights Reserved  	*/
+
 #pragma ident	"%Z%%M%	%I%	%E% SMI"
 #include <time.h>
 #include "uucp.h"
@@ -81,6 +81,8 @@ static void friendlytime();
 static void complete();
 static int state();
 static int gnameflck();
+static void kprocessC();
+static int convert();
 void uprocessC(), printit(), docalc(), procState();
 
 static short State, Queued, Running, Complete, Interrupted;
@@ -118,6 +120,7 @@ short avgxfer;		/*  will be set to 1 if -c not specified    */
 short Jobcount;		/* == 1 if -j parameter set with -s option */
 char f[NAMESIZE];
 
+int
 main(argc, argv, envp)
 char *argv[];
 char **envp;
@@ -450,9 +453,7 @@ char **envp;
 	    for (m = M; m->mach[0] != NULLCHAR; m++)
 		printit(m);
 	}
-	exit(0);
-
-	/* NOTREACHED */
+	return (0);
 }
 
 
@@ -466,14 +467,14 @@ uprocessC(machine, dir, file)
 char   *machine, *dir, *file;
 {
 	struct stat s;
-	register struct tm *tp;
+	struct tm *tp;
 	char fullname[MAXFULLNAME], buf[BUFSIZ], user[9];
 	char xfullname[MAXFULLNAME];
 	char file1[BUFSIZ], file2[BUFSIZ], file3[BUFSIZ], type[2], opt[256];
 	short goodRecord = 0;
 	FILE *fp, *xfp;
 	short first = 1;
-	short statefound = 0;
+	int statefound = 0;
 	extern long fsize();
 	char format_tmp[BUFSIZ+1];
 	fp=xfp=NULL;
@@ -699,12 +700,12 @@ int inputint;
  * kprocessC - process kill or rejuvenate job
  */
 
-int
+static void
 kprocessC(dir, file)
 char *file, *dir;
 {
 	struct stat s;
-	register struct tm *tp;
+	struct tm *tp;
 	extern struct tm *localtime();
 	char fullname[MAXFULLNAME], buf[BUFSIZ], user[9];
 	char rfullname[MAXFULLNAME];
@@ -919,7 +920,7 @@ void
 printit(m)
 struct m *m;
 {
-	register struct tm *tp;
+	struct tm *tp;
 	time_t	t;
 	int	minimum;
 	extern struct tm *localtime();
@@ -997,7 +998,7 @@ struct m *m;
 int
 lckpid()
 {
-    register i;
+    int i;
     int fd, ret;
     pid_t pid, list[MAXLOCKS];
     char alpid[SIZEOFPID+2];	/* +2 for '\n' and null */
@@ -1068,11 +1069,11 @@ lckpid()
  */
 static int
 gnameflck(p, filename)
-register char *filename;
+char *filename;
 DIR *p;
 {
 	struct dirent dentry;
-	register struct dirent *dp = &dentry;
+	struct dirent *dp = &dentry;
 
 	for (;;) {
 		if ((dp = readdir(p)) == NULL)
@@ -1233,12 +1234,12 @@ char *jcdir, *cdotfile;
 	char lckfile[MAXBASENAME+1], lockname[MAXBASENAME+1];
 	char lckdir[BUFSIZ+1];
 	DIR *subjcdir, *sjcdir;
-	short rtnstate = 0;
+	int rtnstate = 0;
 	foundlck = 0;
 	CequalA = 0;
 	sjcdir = opendir(jcdir);
 	if (sjcdir == NULL)
-		return;
+		return (0);
 
 	while (gnamef(sjcdir, comparef) == TRUE) {
 	    if (comparef[0] == 'A') {
@@ -1309,7 +1310,7 @@ long timerange;
 	static float rst, ust, kst, xferrate, utt, ktt;
 	static float rtt, wfield, xfield, yfield;
 
-	register struct perfrec *recptr;
+	struct perfrec *recptr;
 	static float tqt;
 	static int jobs;
 	char abuf[BUFSIZ];
@@ -1478,7 +1479,7 @@ gmts()
 {
 	static char	date[] = "YYMMDDhhmmss";
 
-	register struct tm *	td;
+	struct tm 		*td;
 	time_t			now;	/* Current time. */
 	time_t			temp;
 	now = time((time_t *) 0);
@@ -1520,7 +1521,7 @@ gmt()
 {
 	static char	date[] = "YYMMDDhhmmss";
 
-	register struct tm *	td;
+	struct tm	*td;
 	time_t			now;	/* Current time. */
 
 	now = time((time_t *) 0);
diff --git a/usr/src/cmd/bnu/uux.c b/usr/src/cmd/bnu/uux.c
index 74d89e5ce5..28f1c6ff22 100644
--- a/usr/src/cmd/bnu/uux.c
+++ b/usr/src/cmd/bnu/uux.c
@@ -20,7 +20,7 @@
  * CDDL HEADER END
  */
 /*
- * Copyright 1998 Sun Microsystems, Inc.  All rights reserved.
+ * Copyright 2005 Sun Microsystems, Inc.  All rights reserved.
  * Use is subject to license terms.
  */
 
@@ -65,7 +65,9 @@ static void usage();
 /*
  *	uux
  */
+int
 main(argc, argv, envp)
+int argc;
 char *argv[];
 char *envp[];
 {
@@ -940,6 +942,7 @@ char *envp[];
 
 	cleanup(0);
 	/* NOTREACHED */
+	return (0);
 }
 
 
@@ -951,7 +954,7 @@ char *envp[];
  */
 void
 cleanup(code)
-register int code;
+int code;
 {
 	static int first = 1;
 
@@ -976,7 +979,7 @@ register int code;
  */
 static void
 onintr(inter)
-register int inter;
+int inter;
 {
 	char str[30];
 	(void) signal(inter, SIG_IGN);
diff --git a/usr/src/cmd/bnu/uuxqt.c b/usr/src/cmd/bnu/uuxqt.c
index d077675e28..70083f685e 100644
--- a/usr/src/cmd/bnu/uuxqt.c
+++ b/usr/src/cmd/bnu/uuxqt.c
@@ -19,16 +19,14 @@
  *
  * CDDL HEADER END
  */
-/*	Copyright (c) 1984, 1986, 1987, 1988, 1989 AT&T	*/
-/*	  All Rights Reserved  	*/
-
-/*	from SVR4 bnu:uuxqt.c 2.12.1.12				*/
-
 /*
- * Copyright 2000, 2003 Sun Microsystems, Inc.  All rights reserved.
+ * Copyright 2005 Sun Microsystems, Inc.  All rights reserved.
  * Use is subject to license terms.
  */
 
+/*	Copyright (c) 1984, 1986, 1987, 1988, 1989 AT&T	*/
+/*	  All Rights Reserved  	*/
+
 #pragma ident	"%Z%%M%	%I%	%E% SMI"
 
 #include "uucp.h"
@@ -61,7 +59,9 @@ static int chkFile();
 static int doFileChk();
 void cleanup(), xprocess();
 
+int
 main(argc, argv, envp)
+int argc;
 char *argv[];
 char *envp[];
 {
@@ -221,6 +221,7 @@ char *envp[];
 	closedir(fp1);
 	cleanup(0);
 	/* NOTREACHED */
+	return (0);
 }
 
 void
@@ -236,7 +237,7 @@ int	code;
  */
 void
 onintr(inter)
-register int	inter;
+int	inter;
 {
 	char	str[30];
 	(void) signal(inter, SIG_IGN);
@@ -270,7 +271,7 @@ char	*file;
  */
 static int
 xcompare(f1, f2)
-const register void	*f1, *f2;
+const void	*f1, *f2;
 {
 	/* assumes file name is X.siteG1234 */
 	/* use -strcmp() so that xstash is sorted largest first */
@@ -323,7 +324,7 @@ char	*file;
  */
 int
 gt_Xfile(file, dir)
-register char	*file, *dir;
+char	*file, *dir;
 {
 	DIR *pdir;
 
@@ -363,9 +364,9 @@ register char	*file, *dir;
  */
 int
 gotfiles(file)
-register char	*file;
+char	*file;
 {
-	register FILE *fp;
+	FILE *fp;
 	struct stat stbuf;
 	char	buf[BUFSIZ], rqfile[MAXNAMESIZE];
 
@@ -411,7 +412,7 @@ register char	*file;
 void
 rm_Xfiles()
 {
-	register FILE *fp;
+	FILE *fp;
 	char	buf[BUFSIZ], file[MAXNAMESIZE], tfile[MAXNAMESIZE];
 	char	tfull[MAXFULLNAME];
 
@@ -443,7 +444,7 @@ rm_Xfiles()
 void
 mv_Xfiles()
 {
-	register FILE *fp;
+	FILE *fp;
 	char	buf[BUFSIZ], ffile[MAXFULLNAME], tfile[MAXNAMESIZE];
 	char	tfull[MAXFULLNAME];
 
@@ -1201,6 +1202,8 @@ char *dirname;
 			    sizeof (msgbuf));
 		}
 	    } else {
+		char *bname;
+
 		if (eaccess(GRADES, 04) != -1)
 			dqueue = fdgrade();
 		else
@@ -1210,8 +1213,9 @@ char *dirname;
 		    WORKSPACE, tempname);
 		fp = fdopen(ret = creat(cfile, CFILEMODE), "w");
 		ASSERT(ret >= 0 && fp != NULL, Ct_OPEN, cfile, errno);
+		bname = BASENAME(dfile, '/');
 		(void) fprintf(fp, "S %s %s %s -d %s 0666\n",
-		    BASENAME(dfile, '/'), fout, user, BASENAME(dfile, '/'));
+		    bname, fout, user, bname);
 		fclose(fp);
 		(void) snprintf(sendsys, sizeof (sendsys), "%s/%c", sysout,
 		    dqueue);
@@ -1245,6 +1249,8 @@ char *dirname;
 		    }
 		}
 	    } else {
+		char *bname;
+
 		if (eaccess(GRADES, 04) != -1)
 			dqueue = fdgrade();
 		else
@@ -1254,9 +1260,9 @@ char *dirname;
 		    WORKSPACE, tempname);
 		fp = fdopen(ret = creat(cfile, CFILEMODE), "w");
 		ASSERT(ret >= 0 && fp != NULL, Ct_OPEN, cfile, errno);
+		bname = BASENAME(errDfile, '/');
 		(void) fprintf(fp, "S %s %s %s -d %s 0666\n",
-		    BASENAME(errDfile, '/'), ferr, user,
-		    BASENAME(errDfile, '/'));
+		    bname, ferr, user, bname);
 		fclose(fp);
 		(void) snprintf(sendsys, sizeof (sendsys), "%s/%c",
 		    syserr, dqueue);
diff --git a/usr/src/cmd/bnu/xio.c b/usr/src/cmd/bnu/xio.c
index 4518478d07..c610841112 100644
--- a/usr/src/cmd/bnu/xio.c
+++ b/usr/src/cmd/bnu/xio.c
@@ -20,7 +20,7 @@
  * CDDL HEADER END
  */
 /*
- * Copyright 1988 Sun Microsystems, Inc.  All rights reserved.
+ * Copyright 2005 Sun Microsystems, Inc.  All rights reserved.
  * Use is subject to license terms.
  */
 
@@ -79,11 +79,11 @@ xturnoff()
  */
 int
 xwrmsg(type, str, fn)
-register char *str;
+char *str;
 int fn;
 char type;
 {
-	register char *s;
+	char *s;
 	char bufr[XBUFSIZ];
 
 	bufr[0] = type;
@@ -107,9 +107,9 @@ char type;
  */
 int
 xrdmsg(str, fn)
-register char *str;
+char *str;
 {
-	register int len;
+	int len;
 
 	if(setjmp(Xfailbuf))
 		return(FAIL);
@@ -143,8 +143,8 @@ int
 xwrdata(fp1, fn)
 FILE *fp1;
 {
-	register fd1;
-	register int len, ret;
+	int fd1;
+	int len, ret;
 	unsigned long bytes;
 	char bufr[XBUFSIZ];
 
@@ -177,9 +177,9 @@ int
 xrddata(fn, fp2)
 FILE *fp2;
 {
-	register int fd2;
-	register int len;
-	register int ret = SUCCESS;
+	int fd2;
+	int len;
+	int ret = SUCCESS;
 	unsigned long bytes;
 	char bufr[XBUFSIZ];
 
@@ -212,9 +212,9 @@ FILE *fp2;
  */
 int
 xrdblk(blk, len,  fn)
-register char *blk;
+char *blk;
 {
-	register int i, ret;
+	int i, ret;
 
 	if(setjmp(Xfailbuf))
 		return(FAIL);