6269756 gcc and cmd/saf don't get along

6272663 gcc and cmd/psradm don't get along
6273836 gcc and cmd/script don't get along
6273943 gcc and cmd/ttymon don't get along

12 files changed, 193 insertions, 170 deletions

diff --git a/usr/src/cmd/psradm/psradm.c b/usr/src/cmd/psradm/psradm.c
index c0a24172c6..eab03a6ec4 100644
--- a/usr/src/cmd/psradm/psradm.c
+++ b/usr/src/cmd/psradm/psradm.c
@@ -20,7 +20,7 @@
  * CDDL HEADER END
  */
 /*
- * Copyright 2004 Sun Microsystems, Inc.  All rights reserved.
+ * Copyright 2005 Sun Microsystems, Inc.  All rights reserved.
  * Use is subject to license terms.
  */
 
@@ -37,6 +37,7 @@
 #include <syslog.h>
 #include <time.h>
 #include <utmpx.h>
+#include <assert.h>
 
 static char	*cmdname;	/* command name for messages */
 
@@ -97,7 +98,7 @@ psr_action_lookup(int action)
 			return (&psr_action[i]);
 		}
 	}
-	/* NOTREACHED */
+	return (NULL);
 }
 
 /*
@@ -285,6 +286,7 @@ main(int argc, char *argv[])
 	}
 
 	pac = psr_action_lookup(action);
+	assert(pac != NULL);
 
 	errors = 0;
 	if (all_flag) {
diff --git a/usr/src/cmd/saf/admutil.c b/usr/src/cmd/saf/admutil.c
index 8e6788f42c..622e67d9aa 100644
--- a/usr/src/cmd/saf/admutil.c
+++ b/usr/src/cmd/saf/admutil.c
@@ -21,20 +21,25 @@
  */
 /*	Copyright (c) 1984, 1986, 1987, 1988, 1989 AT&T	*/
 /*	  All Rights Reserved  	*/
+/*
+ * Copyright 2005 Sun Microsystems, Inc.  All rights reserved.
+ * Use is subject to license terms.
+ */
 
-
-#ident	"%Z%%M%	%I%	%E% SMI"       /* SVr4.0 1.8*/
+#pragma ident	"%Z%%M%	%I%	%E% SMI"
 
 
-# include <stdio.h>
-# include <signal.h>
-# include <sac.h>
-# include <sys/types.h>
-# include <sys/stat.h>
-# include <unistd.h>
-# include "misc.h"
-# include "structs.h"
-# include "extern.h"
+#include <stdio.h>
+#include <stdlib.h>
+#include <strings.h>
+#include <signal.h>
+#include <sac.h>
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <unistd.h>
+#include "misc.h"
+#include "structs.h"
+#include "extern.h"
 
 
 /*
@@ -170,14 +175,10 @@ char *tname;
  *		finish - ending line number (-1 indicates entire file)
  */
 
-
-copy_file(fp, tfp, start, finish)
-FILE *fp;
-FILE *tfp;
-register int start;
-register int finish;
+int
+copy_file(FILE *fp, FILE *tfp, int start, int finish)
 {
-	register int i;		/* loop variable */
+	int i;		/* loop variable */
 	char dummy[SIZE];	/* scratch buffer */
 
 /*
@@ -231,11 +232,10 @@ register int finish;
  *		pmtag - tag of port monitor we're looking for
  */
 
-find_pm(fp, pmtag)
-FILE *fp;
-char *pmtag;
+int
+find_pm(FILE *fp, char *pmtag)
 {
-	register char *p;	/* working pointer */
+	char *p;		/* working pointer */
 	int line = 0;		/* line number we found entry on */
 	struct sactab stab;	/* place to hold parsed info */
 	char buf[SIZE];	/* scratch buffer */
@@ -253,6 +253,7 @@ char *pmtag;
 		Saferrno = E_SYSERR;
 		error("error reading _sactab");
 		/* NOTREACHED */
+		return (0);
 	}
 	else
 		return(0);
@@ -271,9 +272,8 @@ char *pmtag;
  *		basename - name of script (relative to HOME (from misc.h))
  */
 
-do_config(script, basename)
-char *script;
-char *basename;
+int
+do_config(char *script, char *basename)
 {
 	FILE *ifp;		/* file pointer for source file */
 	FILE *ofp;		/* file pointer for target file */
diff --git a/usr/src/cmd/saf/extern.h b/usr/src/cmd/saf/extern.h
index 13e46e449e..0b909fba14 100644
--- a/usr/src/cmd/saf/extern.h
+++ b/usr/src/cmd/saf/extern.h
@@ -23,12 +23,18 @@
 /*	  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"       /* SVr4.0 1.5*/
+#ifndef	_EXTERN_H
+#define	_EXTERN_H
 
+#pragma ident	"%Z%%M%	%I%	%E% SMI"
+
+#ifdef	__cplusplus
+extern "C" {
+#endif
 
 extern	void	log();
 extern	void	initialize();
@@ -54,7 +60,7 @@ extern	void	sendack();
 extern	void	account();
 extern	void	cleanutx();
 extern	void	readutmpx();
-extern	void	quit();
+extern	void	quit() __NORETURN;
 extern	void	usage();
 
 extern	FILE	*open_temp();
@@ -63,31 +69,12 @@ extern	struct	sactab	*read_entry();
 extern	struct	sactab	*findpm();
 
 extern	char	*trim();
-extern	char	*pstate();
+extern	char	*pstate(unchar);
 extern	char	*nexttok();
 extern	char	**mkargv();
 extern	char	*make_tempname();
 extern	char	**dump_table();
 
-extern	time_t	time();
-extern	long	atol();
-extern	char	*ctime();
-extern	char	*strchr();
-extern	char	*strrchr();
-extern	char	*strcat();
-extern	char	*strpbrk();
-extern	char	*strtok();
-extern	char	*strcpy();
-extern	char	*fgets();
-extern	char	*malloc();
-extern	char	*calloc();
-extern	char	*mktemp();
-extern	void	free();
-extern	void	setutent();
-extern	void	endutent();
-extern	struct	utmp	*getutid();
-extern	struct	utmp	*getutent();
-
 extern	int	N_msgs;
 extern	unsigned	Stime;
 extern	int	Sfd;
@@ -101,7 +88,9 @@ extern	char	Comment[];
 extern	int	Saferrno;
 
 extern	char	**environ;
-extern	int	errno;
-extern	char	*optarg;
-extern	int	optind;
-extern	int	opterr;
+
+#ifdef	__cplusplus
+}
+#endif
+
+#endif	/* _EXTERN_H */
diff --git a/usr/src/cmd/saf/log.c b/usr/src/cmd/saf/log.c
index d37539c61c..ba40f97a09 100644
--- a/usr/src/cmd/saf/log.c
+++ b/usr/src/cmd/saf/log.c
@@ -20,7 +20,7 @@
  * CDDL HEADER END
  */
 /*
- * Copyright 2003 Sun Microsystems, Inc.  All rights reserved.
+ * Copyright 2005 Sun Microsystems, Inc.  All rights reserved.
  * Use is subject to license terms.
  */
 
@@ -36,6 +36,8 @@
 #include <stdio.h>
 #include <unistd.h>
 #include <stdarg.h>
+#include <strings.h>
+#include <errno.h>
 
 #include "extern.h"
 #include "misc.h"
diff --git a/usr/src/cmd/saf/misc.c b/usr/src/cmd/saf/misc.c
index 8118e70a3d..84c0fb69ea 100644
--- a/usr/src/cmd/saf/misc.c
+++ b/usr/src/cmd/saf/misc.c
@@ -21,25 +21,29 @@
  */
 /*	Copyright (c) 1984, 1986, 1987, 1988, 1989 AT&T	*/
 /*	  All Rights Reserved  	*/
+/*
+ * Copyright 2005 Sun Microsystems, Inc.  All rights reserved.
+ * Use is subject to license terms.
+ */
 
-
-#ident	"%Z%%M%	%I%	%E% SMI"       /* SVr4.0 1.9*/
+#pragma ident	"%Z%%M%	%I%	%E% SMI"
 
 
-# include <stdio.h>
-# include <unistd.h>
-# include <fcntl.h>
-# include <sys/types.h>
-# include <sys/stropts.h>
-# include <signal.h>
-# include <sys/stat.h>
-# include <poll.h>
-# include "misc.h"
-# include "msgs.h"
-# include "extern.h"
-# include <sac.h>
-# include "adm.h"
-# include "structs.h"
+#include <stdio.h>
+#include <unistd.h>
+#include <stdlib.h>
+#include <fcntl.h>
+#include <sys/types.h>
+#include <sys/stropts.h>
+#include <signal.h>
+#include <sys/stat.h>
+#include <poll.h>
+#include "misc.h"
+#include "msgs.h"
+#include "extern.h"
+#include <sac.h>
+#include "adm.h"
+#include "structs.h"
 
 
 /*
@@ -511,10 +515,8 @@ register struct sacmsg *sm;
  *		signo - signal number to send
  */
 
-
-sendsig(sp, signo)
-register struct sactab *sp;
-int signo;
+int
+sendsig(struct sactab *sp, int signo)
 {
 	pid_t pid;	/* pid of designated port monitor */
 	pid_t checklock();
diff --git a/usr/src/cmd/saf/pmadm.c b/usr/src/cmd/saf/pmadm.c
index 806a4879eb..f0eeb3e89d 100644
--- a/usr/src/cmd/saf/pmadm.c
+++ b/usr/src/cmd/saf/pmadm.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.
  */
 
@@ -29,22 +29,24 @@
 
 #pragma ident	"%Z%%M%	%I%	%E% SMI"
 
-# include <stdio.h>
-# include <sys/types.h>
-# include <sys/stat.h>
-# include <unistd.h>
-# include "extern.h"
-# include "misc.h"
-# include <sac.h>
-# include "structs.h"
-
-# define ADD		0x1	/* -a or other required options seen */
-# define REMOVE		0x2	/* -r seen */
-# define ENABLE		0x4	/* -e seen */
-# define DISABLE	0x8	/* -d seen */
-# define PLIST		0x10	/* -l seen */
-# define LIST		0x20	/* -L seen */
-# define CONFIG		0x40	/* -g seen */
+#include <stdio.h>
+#include <stdlib.h>
+#include <strings.h>
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <unistd.h>
+#include "extern.h"
+#include "misc.h"
+#include <sac.h>
+#include "structs.h"
+
+#define	ADD		0x1	/* -a or other required options seen */
+#define	REMOVE		0x2	/* -r seen */
+#define	ENABLE		0x4	/* -e seen */
+#define	DISABLE		0x8	/* -d seen */
+#define	PLIST		0x10	/* -l seen */
+#define	LIST		0x20	/* -L seen */
+#define	CONFIG		0x40	/* -g seen */
 
 # define U_FLAG		0x1	/* -fu seen */
 # define X_FLAG		0x2	/* -fx seen */
@@ -103,9 +105,8 @@ int	Saferrno;	/* internal `errno' for exit */
  * main - scan args for pmadm and call appropriate handling code
  */
 
-main(argc, argv)
-int argc;
-char *argv[];
+int
+main(int argc, char *argv[])
 {
 	int c;			/* option letter */
 	int ret;		/* return code from check_version */
@@ -868,8 +869,8 @@ char *svctag;
  */
 
 
-tell_sac(tag)
-char *tag;
+int
+tell_sac(char *tag)
 {
 	pid_t pid;	/* returned pid from fork */
 	int status;	/* return status from sacadm child */
@@ -1038,10 +1039,8 @@ char *svctag;
  *		svctag - tag of service we're looking for
  */
 
-find_svc(fp, tag, svctag)
-FILE *fp;
-char *tag;
-char *svctag;
+int
+find_svc(FILE *fp, char *tag, char *svctag)
 {
 	register char *p;	/* working pointer */
 	int line = 0;		/* line number we found entry on */
@@ -1061,10 +1060,10 @@ char *svctag;
 		(void) sprintf(buf, "error reading %s/%s/_pmtab", HOME, tag);
 		Saferrno = E_SYSERR;
 		error(buf);
-	}
-	else
-		return(0);
-	/* NOTREACHED */
+		/* NOTREACHED */
+		return (0);
+	} else
+		return (0);
 }
 
 
@@ -1328,8 +1327,8 @@ char *type;
 	if (!feof(fp)) {
 		Saferrno = E_SYSERR;
 		error("error reading _sactab");
-	}
-	else
-		return(thead ? thead : NULL);
-	/* NOTREACHED */
+		/* NOTREACHED */
+		return (0);
+	} else
+		return (thead ? thead : NULL);
 }
diff --git a/usr/src/cmd/saf/readtab.c b/usr/src/cmd/saf/readtab.c
index bbf580db57..3d524f8d8d 100644
--- a/usr/src/cmd/saf/readtab.c
+++ b/usr/src/cmd/saf/readtab.c
@@ -23,21 +23,22 @@
 /*	  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"       /* SVr4.0 1.12*/
-
-# include <stdio.h>
-# include <signal.h>
-# include "misc.h"
-# include "msgs.h"
-# include <sac.h>
-# include "structs.h"
-# include <sys/types.h>
-# include <unistd.h>
-# include "extern.h"
+#pragma ident	"%Z%%M%	%I%	%E% SMI"
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <signal.h>
+#include "misc.h"
+#include "msgs.h"
+#include <sac.h>
+#include "structs.h"
+#include <sys/types.h>
+#include <unistd.h>
+#include "extern.h"
 
 
 /*
diff --git a/usr/src/cmd/saf/sac.c b/usr/src/cmd/saf/sac.c
index e3f06bdde4..6ecbe7fb41 100644
--- a/usr/src/cmd/saf/sac.c
+++ b/usr/src/cmd/saf/sac.c
@@ -23,16 +23,18 @@
 /*	  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.
  */
 
-#pragma	ident	"%Z%%M%	%I%	%E% SMI"	/* SVr4.0 1.14 */
+#pragma ident	"%Z%%M%	%I%	%E% SMI"
 
 #include <stdio.h>
+#include <stdlib.h>
 #include <fcntl.h>
 #include <ctype.h>
 #include <signal.h>
+#include <strings.h>
 #include <errno.h>
 #include <sys/types.h>
 #include <sys/stat.h>
@@ -83,6 +85,7 @@ void startpoll(void);
  *	  from sacadm via the command pipe
  */
 
+int
 main(int argc, char *argv[])
 {
 	int c;	/* place to hold options */
diff --git a/usr/src/cmd/saf/sacadm.c b/usr/src/cmd/saf/sacadm.c
index c3a3a559b6..141423649c 100644
--- a/usr/src/cmd/saf/sacadm.c
+++ b/usr/src/cmd/saf/sacadm.c
@@ -20,29 +20,30 @@
  * CDDL HEADER END
  */
 /*
- * Copyright (c) 1999 by 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"
 
-#pragma ident	"%Z%%M%	%I%	%E% SMI"       /* SVr4.0 1.15*/
 
-
-# include <stdio.h>
-# include <fcntl.h>
-# include <errno.h>
-# include <sys/types.h>
-# include <sys/stat.h>
-# include <signal.h>
-# include <unistd.h>
-# include <sac.h>
-# include "misc.h"
-# include "structs.h"
-# include "adm.h"
-# include "extern.h"
+#include <stdio.h>
+#include <stdlib.h>
+#include <strings.h>
+#include <fcntl.h>
+#include <errno.h>
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <signal.h>
+#include <unistd.h>
+#include <sac.h>
+#include "misc.h"
+#include "structs.h"
+#include "adm.h"
+#include "extern.h"
 
 
 /*
@@ -94,9 +95,8 @@ int	Saferrno;	/* internal `errno' for exit */
  * main - scan args for sacadm and call appropriate handling code
  */
 
-main(argc, argv)
-int argc;
-char *argv[];
+int
+main(int argc, char *argv[])
 {
 	int c;			/* option letter */
 	uid_t uid;		/* invoker's real uid */
@@ -393,6 +393,7 @@ char *argv[];
 	}
 	quit();
 	/* NOTREACHED */
+	return (0);
 }
 
 
@@ -1017,6 +1018,7 @@ char **p;
  * openpipe - open up command pipe to SAC
  */
 
+int
 openpipe()
 {
 	int fd;		/* file descriptor associated with command pipe */
@@ -1230,6 +1232,7 @@ int dflag;
  *	single user mode)
  */
 
+int
 sac_home()
 {
 	int fd;		/* fd to sac logfile */
diff --git a/usr/src/cmd/saf/util.c b/usr/src/cmd/saf/util.c
index 888effb0a3..bc05e98107 100644
--- a/usr/src/cmd/saf/util.c
+++ b/usr/src/cmd/saf/util.c
@@ -22,21 +22,27 @@
 /*	Copyright (c) 1984, 1986, 1987, 1988, 1989 AT&T	*/
 /*	  All Rights Reserved  	*/
 
+/*
+ * Copyright 2005 Sun Microsystems, Inc.  All rights reserved.
+ * Use is subject to license terms.
+ */
 
-#ident	"%Z%%M%	%I%	%E% SMI"       /* SVr4.0 1.8*/
+#pragma ident	"%Z%%M%	%I%	%E% SMI"
 
 
-# include <stdio.h>
-# include <ctype.h>
-# include <sys/types.h>
-# include <unistd.h>
-# include "extern.h"
-# include "misc.h"
-# include <sac.h>
-# include "structs.h"
-# ifdef SAC
-# include "msgs.h"
-# endif
+#include <stdio.h>
+#include <stdlib.h>
+#include <strings.h>
+#include <ctype.h>
+#include <sys/types.h>
+#include <unistd.h>
+#include "extern.h"
+#include "misc.h"
+#include <sac.h>
+#include "structs.h"
+#ifdef SAC
+#include "msgs.h"
+#endif
 
 char	Comment[SIZE];	/* place holder for comments */
 
@@ -279,8 +285,7 @@ register char *p;
  */
 
 char *
-pstate(state)
-unchar state;
+pstate(unchar state)
 {
 	switch (state) {
 	case NOTRUNNING:
@@ -310,4 +315,5 @@ unchar state;
 # endif
 	}
 	/* NOTREACHED */
+	return (NULL);
 }
diff --git a/usr/src/cmd/script/script.c b/usr/src/cmd/script/script.c
index fd396bae0a..af843763a6 100644
--- a/usr/src/cmd/script/script.c
+++ b/usr/src/cmd/script/script.c
@@ -19,9 +19,11 @@
 #pragma ident	"%Z%%M%	%I%	%E% SMI"
 
 /*
- * script
+ * script: Produce a record of a terminal session.
  */
 #include <stdio.h>
+#include <stdlib.h>
+#include <unistd.h>
 #include <signal.h>
 #include <fcntl.h>
 #include <locale.h>
@@ -36,9 +38,15 @@
 int 	grantpt();
 int 	unlockpt();
 char	*ptsname();
+void	doinput() __NORETURN;
+void	dooutput();
+void	doshell();
+void	fixtty();
+void	fail();
+void	done() __NORETURN;
+void	getmaster();
+void	getslave();
 
-char	*getenv();
-struct tm *localtime();
 char	*shell;
 FILE	*fscript;
 int	master;			/* file descriptor for master pseudo-tty */
@@ -57,9 +65,8 @@ char	*mptname = "/dev/ptmx";	/* master pseudo-tty device */
 
 int	aflg;
 
-main(argc, argv)
-	int argc;
-	char *argv[];
+int
+main(int argc, char *argv[])
 {
 	uid_t ruidt;
 	gid_t gidt;
@@ -71,7 +78,7 @@ main(argc, argv)
 	(void) textdomain(TEXT_DOMAIN);
 
 	shell = getenv("SHELL");
-	if (shell == 0)
+	if (shell == NULL)
 		shell = "/bin/sh";
 	argc--, argv++;
 	while (argc > 0 && argv[0][0] == '-') {
@@ -119,8 +126,11 @@ main(argc, argv)
 			doshell();
 	}
 	doinput();
+	/* NOTREACHED */
+	return (0);
 }
 
+void
 doinput()
 {
 	char ibuf[BUFSIZ];
@@ -168,6 +178,7 @@ finish()
 		done();
 }
 
+void
 dooutput()
 {
 	time_t tvec;
@@ -189,6 +200,7 @@ dooutput()
 	done();
 }
 
+void
 doshell()
 {
 
@@ -205,6 +217,7 @@ doshell()
 	fail();
 }
 
+void
 fixtty()
 {
 	struct termios sbuf;
@@ -218,6 +231,7 @@ fixtty()
 	(void) ioctl(0, TCSETSF, (char *)&sbuf);
 }
 
+void
 fail()
 {
 
@@ -225,6 +239,7 @@ fail()
 	done();
 }
 
+void
 done()
 {
 	time_t tvec;
@@ -243,6 +258,7 @@ done()
 	exit(0);
 }
 
+void
 getmaster()
 {
 	struct stat stb;
@@ -258,6 +274,7 @@ getmaster()
 	}
 }
 
+void
 getslave()
 {
 	char *slavename;	/* name of slave pseudo-tty */
diff --git a/usr/src/cmd/ttymon/ttymon.c b/usr/src/cmd/ttymon/ttymon.c
index 9f29194d80..309b2bec58 100644
--- a/usr/src/cmd/ttymon/ttymon.c
+++ b/usr/src/cmd/ttymon/ttymon.c
@@ -20,7 +20,7 @@
  * CDDL HEADER END
  */
 /*
- * Copyright 2004 Sun Microsystems, Inc.  All rights reserved.
+ * Copyright 2005 Sun Microsystems, Inc.  All rights reserved.
  * Use is subject to license terms.
  */
 
@@ -91,9 +91,8 @@ extern int di_devperm_logout(const char *);
  *		  have login service on the fly
  */
 
-main(argc, argv)
-int	argc;
-char	*argv[];
+int
+main(int argc, char *argv[])
 {
 	int	nfds;
 	extern	char	*lastname();