6271998 gcc and cmd/mailx don't get along

6271054 gcc and cmd/find don't get along

14 files changed, 62 insertions, 60 deletions

diff --git a/usr/src/cmd/find/find.c b/usr/src/cmd/find/find.c
index 3f2fbf107c..99466de17c 100644
--- a/usr/src/cmd/find/find.c
+++ b/usr/src/cmd/find/find.c
@@ -24,8 +24,6 @@
  * Use is subject to license terms.
  */
 
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
-
 /*	Copyright (c) 1984, 1986, 1987, 1988, 1989 AT&T	*/
 /*	  All Rights Reserved  	*/
 
@@ -39,6 +37,8 @@
  * Copyright 1985, 1990 by Mortice Kern Systems Inc.  All rights reserved.
  */
 
+#pragma ident	"%Z%%M%	%I%	%E% SMI"
+
 #include <stdio.h>
 #include <errno.h>
 #include <pwd.h>
@@ -185,7 +185,7 @@ static int		execute();
 static int		doexec();
 static struct Args	*lookup();
 static int		ok();
-static void		usage();
+static void		usage(void)	__NORETURN;
 static struct Arglist	*varargs();
 static int		list();
 static char		*getgroup();
@@ -697,7 +697,7 @@ err:
  */
 
 static void
-usage()
+usage(void)
 {
 	(void) fprintf(stderr,
 	    gettext("%s: [-H | -L] path-list predicate-list\n"), cmdname);
diff --git a/usr/src/cmd/mailx/Makefile b/usr/src/cmd/mailx/Makefile
index 1c2edd3003..3f74d721a1 100644
--- a/usr/src/cmd/mailx/Makefile
+++ b/usr/src/cmd/mailx/Makefile
@@ -92,7 +92,7 @@ $(VEROBJ): $(VERSRC)
 
 # want to recreate version.c whenever (and only when) mailx needs to be rebuilt
 $(VERSRC): $(OBJS) $(LIBMAIL)
-	$(ECHO) "extern const char *const version=\"mailx version $(MAILXVERSION) `date`\";" > $@
+	$(ECHO) "const char *const version=\"mailx version $(MAILXVERSION) `date`\";" > $@
 
 install: all $(ROOTMAILXD) $(ROOTPROG) $(ROOTMAILXHELP) \
 	$(ROOTMAILXRC) $(ROOTUCBMAIL) $(ROOTUCBCAPMAIL) $(ROOTUCBMAILRC)
diff --git a/usr/src/cmd/mailx/cmd1.c b/usr/src/cmd/mailx/cmd1.c
index 47be839e43..5cdb7ae465 100644
--- a/usr/src/cmd/mailx/cmd1.c
+++ b/usr/src/cmd/mailx/cmd1.c
@@ -19,15 +19,14 @@
  *
  * CDDL HEADER END
  */
-/*	Copyright (c) 1984, 1986, 1987, 1988, 1989 AT&T	*/
-/*	  All Rights Reserved  	*/
-
-
 /*
- * Copyright (c) 1985-2001 by Sun Microsystems, Inc.
- * All rights reserved.
+ * Copyright 2001 Sun Microsystems, Inc.  All rights reserved.
+ * Use is subject to license terms.
  */
 
+/*	Copyright (c) 1984, 1986, 1987, 1988, 1989 AT&T	*/
+/*	  All Rights Reserved  	*/
+
 /*
  * University Copyright- Copyright (c) 1982, 1986, 1988
  * The Regents of the University of California
@@ -421,7 +420,7 @@ Type(int *msgvec)
 static int
 type1(int *msgvec, int doign, int page)
 {
-	register *ip;
+	int *ip;
 	register struct message *mp;
 	register int mesg;
 	register char *cp;
diff --git a/usr/src/cmd/mailx/cmd2.c b/usr/src/cmd/mailx/cmd2.c
index 4337d39eec..2b436088b7 100644
--- a/usr/src/cmd/mailx/cmd2.c
+++ b/usr/src/cmd/mailx/cmd2.c
@@ -19,14 +19,14 @@
  *
  * 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 2002 Sun Microsystems, Inc.  All rights reserved.
  * Use is subject to license terms.
  */
 
+/*	Copyright (c) 1984, 1986, 1987, 1988, 1989 AT&T	*/
+/*	  All Rights Reserved  	*/
 
 /*
  * University Copyright- Copyright (c) 1982, 1986, 1988
@@ -577,7 +577,7 @@ int
 delm(int *msgvec)
 {
 	register struct message *mp;
-	register *ip, mesg;
+	int *ip, mesg;
 	int last;
 
 	last = NULL;
@@ -616,7 +616,7 @@ int
 undelete(int *msgvec)
 {
 	register struct message *mp;
-	register *ip, mesg;
+	int *ip, mesg;
 
 	for (ip = msgvec; ip-msgvec < msgCount; ip++) {
 		mesg = *ip;
diff --git a/usr/src/cmd/mailx/cmd3.c b/usr/src/cmd/mailx/cmd3.c
index 309cb9cf0f..ff56e2d552 100644
--- a/usr/src/cmd/mailx/cmd3.c
+++ b/usr/src/cmd/mailx/cmd3.c
@@ -19,15 +19,15 @@
  *
  * CDDL HEADER END
  */
-/*	Copyright (c) 1984, 1986, 1987, 1988, 1989 AT&T	*/
-/*	  All Rights Reserved  	*/
-
 
 /*
- * Copyright 1985-2002 Sun Microsystems, Inc.  All rights reserved.
+ * Copyright 2002 Sun Microsystems, Inc.  All rights reserved.
  * Use is subject to license terms.
  */
 
+/*	Copyright (c) 1984, 1986, 1987, 1988, 1989 AT&T	*/
+/*	  All Rights Reserved  	*/
+
 /*
  * University Copyright- Copyright (c) 1982, 1986, 1988
  * The Regents of the University of California
@@ -214,7 +214,7 @@ overf:
 int 
 help(void)
 {
-	register c;
+	int c;
 	register FILE *f;
 
 	if ((f = fopen(HELPFILE, "r")) == NULL) {
diff --git a/usr/src/cmd/mailx/cmdtab.c b/usr/src/cmd/mailx/cmdtab.c
index 6fa9d7d26a..aa62dcb06a 100644
--- a/usr/src/cmd/mailx/cmdtab.c
+++ b/usr/src/cmd/mailx/cmdtab.c
@@ -22,7 +22,6 @@
 /*	Copyright (c) 1984, 1986, 1987, 1988, 1989 AT&T	*/
 /*	  All Rights Reserved  	*/
 
-
 /*
  * University Copyright- Copyright (c) 1982, 1986, 1988
  * The Regents of the University of California
@@ -54,7 +53,7 @@
  */
 #define	C	(int (*)(void *))
 
-extern const struct cmd cmdtab[] = {
+const struct cmd cmdtab[] = {
 	"next",		C next,		NDMLIST,	0,	MMNDEL,
 	"alias",	C group,	M|RAWLIST,	0,	1000,
 	"print",	C type,		MSGLIST,	0,	MMNDEL,
diff --git a/usr/src/cmd/mailx/collect.c b/usr/src/cmd/mailx/collect.c
index 0a3afd08ef..e05a586bb6 100644
--- a/usr/src/cmd/mailx/collect.c
+++ b/usr/src/cmd/mailx/collect.c
@@ -134,7 +134,7 @@ collect(struct header *hp)
 		sigset(SIGINT, ignintr ? intack : collrub), sigblock(sigmask(SIGINT));
 	if ((savehup = sigset(SIGHUP, SIG_IGN)) != SIG_IGN)
 		sigset(SIGHUP, collrub), sigblock(sigmask(SIGHUP));
-# else VMUNIX
+# else /* VMUNIX */
 # ifdef OLD_BSD_SIGS
 	if ((savesig = sigset(SIGINT, SIG_IGN)) != SIG_IGN)
 		sigset(SIGINT, ignintr ? intack : collrub);
@@ -158,7 +158,7 @@ collect(struct header *hp)
 		sigprocmask(SIG_BLOCK, &mask, NULL);
 	}
 # endif
-# endif VMUNIX
+# endif /* VMUNIX */
 #ifdef SIGCONT
 	savecont = sigset(SIGCONT, collcont);
 #endif
@@ -228,14 +228,14 @@ collect(struct header *hp)
 		setjmp(coljmp);
 # ifdef VMUNIX
 		sigsetmask(omask);
-# else VMUNIX
+# else /* VMUNIX */
 # ifdef OLD_BSD_SIGS
 		sigrelse(SIGINT);
 		sigrelse(SIGHUP);
 # else
 		sigprocmask(SIG_SETMASK, &omask, NULL);
 # endif
-# endif VMUNIX
+# endif /* VMUNIX */
 		if (intty && !tflag && outtty && iprompt)
 			fputs(iprompt, stdout);
 		flush();
diff --git a/usr/src/cmd/mailx/fio.c b/usr/src/cmd/mailx/fio.c
index ea6d6b0a2d..818860d7ae 100644
--- a/usr/src/cmd/mailx/fio.c
+++ b/usr/src/cmd/mailx/fio.c
@@ -19,15 +19,16 @@
  *
  * CDDL HEADER END
  */
-/*	Copyright (c) 1984, 1986, 1987, 1988, 1989 AT&T	*/
-/*	  All Rights Reserved  	*/
 
 /*
- *	Copyright (c) 1999 by Sun Microsystems, Inc.
- *	All rights reserved.
+ * Copyright 1999 Sun Microsystems, Inc.  All rights reserved.
+ * Use is subject to license terms.
  */
 
-#ident	"%Z%%M%	%I%	%E% SMI"	/* from SVr4.0 1.13.2.2 */
+/*	Copyright (c) 1984, 1986, 1987, 1988, 1989 AT&T	*/
+/*	  All Rights Reserved  	*/
+
+#pragma	ident	"%Z%%M%	%I%	%E% SMI"
 
 #include "rcv.h"
 #include <locale.h>
@@ -391,6 +392,7 @@ getln(char *line, int max, FILE *f)
  * include the newline at the end.
  */
 
+int
 readline(FILE *ibuf, char *linebuf)
 {
 	register char *cp;
@@ -785,6 +787,7 @@ safeexpand(char name[])
 /*
  * Determine the current folder directory name.
  */
+int
 getfold(char *name)
 {
 	char *folder;
diff --git a/usr/src/cmd/mailx/head.c b/usr/src/cmd/mailx/head.c
index cba01bc0d2..3f833ab14e 100644
--- a/usr/src/cmd/mailx/head.c
+++ b/usr/src/cmd/mailx/head.c
@@ -185,7 +185,7 @@ int
 any(int ch, char *str)
 {
 	register char *f;
-	register c;
+	int c;
 
 	f = str;
 	c = ch;
diff --git a/usr/src/cmd/mailx/main.c b/usr/src/cmd/mailx/main.c
index 6d9f4a029a..350b81b0b2 100644
--- a/usr/src/cmd/mailx/main.c
+++ b/usr/src/cmd/mailx/main.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 1998 Sun Microsystems, Inc.  All rights reserved.
+ * Use is subject to license terms.
  */
 
+/*	Copyright (c) 1984, 1986, 1987, 1988, 1989 AT&T	*/
+/*	  All Rights Reserved  	*/
+
 /*
  * University Copyright- Copyright (c) 1982, 1986, 1988
  * The Regents of the University of California
@@ -440,8 +440,7 @@ gettext("Usage: %s -eiIUdFntBNHvV~ -T FILE -u USER -h hops -r address\n"),
 		quit(0);
 		Verhogen();
 	}
-	exit(rpterr);
-	/* NOTREACHED */
+	return (rpterr);
 }
 
 /*
diff --git a/usr/src/cmd/mailx/names.c b/usr/src/cmd/mailx/names.c
index 4326807032..0a5cf1d937 100644
--- a/usr/src/cmd/mailx/names.c
+++ b/usr/src/cmd/mailx/names.c
@@ -19,15 +19,15 @@
  *
  * CDDL HEADER END
  */
-/*	Copyright (c) 1984, 1986, 1987, 1988, 1989 AT&T	*/
-/*	  All Rights Reserved  	*/
-
 
 /*
- * Copyright (c) 1985-2001 by Sun Microsystems, Inc.
- * All rights reserved.
+ * Copyright 2001 Sun Microsystems, Inc.  All rights reserved.
+ * Use is subject to license terms.
  */
 
+/*	Copyright (c) 1984, 1986, 1987, 1988, 1989 AT&T	*/
+/*	  All Rights Reserved  	*/
+
 /*
  * University Copyright- Copyright (c) 1982, 1986, 1988
  * The Regents of the University of California
@@ -617,7 +617,7 @@ unpack(struct name *np)
 		extra++;
 	if (hflag)
 		extra += 2;
-#endif SENDMAIL
+#endif /* SENDMAIL */
 	top = (char **) salloc((t + extra) * sizeof (char *));
 	ap = top;
 	*ap++ = "mail";
@@ -636,7 +636,7 @@ unpack(struct name *np)
 		snprintf(hbuf, sizeof (hbuf), "%d", hflag);
 		*ap++ = savestr(hbuf);
 	}
-#endif SENDMAIL
+#endif /* SENDMAIL */
 	while (n != NIL) {
 		if (n->n_type & GDEL) {
 			n = n->n_flink;
diff --git a/usr/src/cmd/mailx/optim.c b/usr/src/cmd/mailx/optim.c
index 253cc3b99c..2b64f59015 100644
--- a/usr/src/cmd/mailx/optim.c
+++ b/usr/src/cmd/mailx/optim.c
@@ -134,7 +134,7 @@ netmap(char name[], char from[])
 		optim(nbuf, ret);
 #else
 	nstrcpy(ret, sizeof (ret), nbuf);
-#endif	OPTIM
+#endif	/* OPTIM */
 	if (debug) fprintf(stderr, "after  optim, nbuf '%s', ret '%s'\n", nbuf, ret);
 	cp = ret;
 	if (debug) fprintf(stderr, "wind up with '%s'\n", name);
@@ -667,7 +667,7 @@ optim1(char netstr[], char name[])
 	optiboth(name);
 	prefer(name);
 }
-#endif	OPTIM
+#endif	/* OPTIM */
 
 /*
  * Return the network of the separator --
@@ -847,7 +847,7 @@ best(int src, int dest)
 		np++;
 	return(np->no_char);
 }
-#endif	OPTIM
+#endif	/* OPTIM */
 
 #ifdef notdef
 /*
diff --git a/usr/src/cmd/mailx/send.c b/usr/src/cmd/mailx/send.c
index cfec800f53..6979cbe522 100644
--- a/usr/src/cmd/mailx/send.c
+++ b/usr/src/cmd/mailx/send.c
@@ -19,15 +19,15 @@
  *
  * CDDL HEADER END
  */
-/*	Copyright (c) 1984, 1986, 1987, 1988, 1989 AT&T	*/
-/*	  All Rights Reserved  	*/
-
 
 /*
  * Copyright 2004 Sun Microsystems, Inc.  All rights reserved.
  * Use is subject to license terms.
  */
 
+/*	Copyright (c) 1984, 1986, 1987, 1988, 1989 AT&T	*/
+/*	  All Rights Reserved  	*/
+
 /*
  * University Copyright- Copyright (c) 1982, 1986, 1988
  * The Regents of the University of California
@@ -652,6 +652,7 @@ infix(struct header *hp, FILE *fi)
  * passed file buffer.
  */
 
+int
 puthead(struct header *hp, FILE *fo, int w, long clen)
 {
 	register int gotcha;
diff --git a/usr/src/cmd/mailx/stralloc.c b/usr/src/cmd/mailx/stralloc.c
index d8659f5fc5..447586cc57 100644
--- a/usr/src/cmd/mailx/stralloc.c
+++ b/usr/src/cmd/mailx/stralloc.c
@@ -19,6 +19,12 @@
  *
  * CDDL HEADER END
  */
+
+/*
+ * Copyright 1997 Sun Microsystems, Inc.  All rights reserved.
+ * Use is subject to license terms.
+ */
+
 /*	Copyright (c) 1984, 1986, 1987, 1988, 1989 AT&T	*/
 /*	  All Rights Reserved  	*/
 
@@ -36,11 +42,6 @@
 #pragma ident	"%Z%%M%	%I%	%E% SMI"
 
 /*
- * Copyright (c) 1993-1997, by Sun Microsystems, Inc.
- * All rights reserved.
- */
-
-/*
  * mailx -- a modified version of a University of California at Berkeley
  *	mail program
  *
@@ -135,7 +136,7 @@ srealloc(void *optr, unsigned size)
 		s &= ~01;
 #else
 #error Unknown architecture!
-#endif defined(u3b) || defined(sparc)
+#endif /* defined(u3b) || defined(sparc) */
 		delta = s - (sp->s_nextFree - (char *)optr);
 		if (delta <= sp->s_nleft) {
 			sp->s_nextFree += delta;