6324803 sys_errlist should be expunged where possible

--HG--
rename : usr/src/cmd/oamuser/lib/prerrno.c => usr/src/cmd/oamuser/lib/.del-prerrno.c-Sep-20-05

53 files changed, 329 insertions, 618 deletions

diff --git a/usr/src/Makefile.lint b/usr/src/Makefile.lint
index 7d5119a649..437d0e6d2d 100644
--- a/usr/src/Makefile.lint
+++ b/usr/src/Makefile.lint
@@ -131,6 +131,7 @@ COMMON_SUBDIRS = \
 	cmd/fs.d/tmpfs \
 	cmd/fs.d/udfs/mount \
 	cmd/fs.d/ufs/mount \
+	cmd/fs.d/ufs/fsirand\
 	cmd/fuser \
 	cmd/gcore \
 	cmd/getconf \
diff --git a/usr/src/cmd/auditconfig/auditconfig.c b/usr/src/cmd/auditconfig/auditconfig.c
index 322cf2687b..46d42cd346 100644
--- a/usr/src/cmd/auditconfig/auditconfig.c
+++ b/usr/src/cmd/auditconfig/auditconfig.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.
  */
 
@@ -347,8 +347,6 @@ static void print_mask1();
 static void print_stats();
 static void print_tid_ex();
 
-extern char *sys_errlist[];
-
 int
 main(argc, argv)
 	int argc;
diff --git a/usr/src/cmd/bnu/callers.c b/usr/src/cmd/bnu/callers.c
index 91e0324cfd..392c3e12de 100644
--- a/usr/src/cmd/bnu/callers.c
+++ b/usr/src/cmd/bnu/callers.c
@@ -20,7 +20,7 @@
  * CDDL HEADER END
  */
 /*
- * Copyright 1996 Sun Microsystems, Inc.  All rights reserved.
+ * Copyright 2005 Sun Microsystems, Inc.  All rights reserved.
  * Use is subject to license terms.
  */
 
@@ -582,8 +582,6 @@ char *flds[], *dev[];
 {
 	int ret;
 	short port;
-	extern int sys_nerr;
-	extern char *sys_errlist[];
 	struct servent *sp;
 	struct hostent *hp;
 	struct sockaddr_in sin;
@@ -635,14 +633,8 @@ char *flds[], *dev[];
 
 	ret = socket(AF_INET, SOCK_STREAM, 0);
 	if (ret < 0) {
-		if (errno < sys_nerr) {
-			DEBUG(5, "no socket: %s\n", sys_errlist[errno]);
-			logent("no socket", sys_errlist[errno]);
-		}
-		else {
-			DEBUG(5, "no socket, errno %d\n", errno);
-			logent("tcpopen", "NO SOCKET");
-		}
+		DEBUG(5, "no socket: %s\n", strerror(errno));
+		logent("no socket", strerror(errno));
 		Uerror = SS_NO_DEVICE;
 		return(FAIL);
 	}
@@ -667,14 +659,8 @@ char *flds[], *dev[];
 	if (connect(ret, (struct sockaddr *)&sin, sizeof (sin)) < 0) {
 		(void) alarm(0);
 		(void) close(ret);
-		if (errno < sys_nerr) {
-			DEBUG(5, "connect failed: %s\n", sys_errlist[errno]);
-			logent("connect failed", sys_errlist[errno]);
-		}
-		else {
-			DEBUG(5, "connect failed, errno %d\n", errno);
-			logent("tcpopen", "CONNECT FAILED");
-		}
+		DEBUG(5, "connect failed: %s\n", strerror(errno));
+		logent("connect failed", strerror(errno));
 		Uerror = SS_NO_DEVICE;
 		return(FAIL);
 	}
diff --git a/usr/src/cmd/bnu/cntrl.c b/usr/src/cmd/bnu/cntrl.c
index 979e213586..69c2491f61 100644
--- a/usr/src/cmd/bnu/cntrl.c
+++ b/usr/src/cmd/bnu/cntrl.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.
  */
 
@@ -671,7 +671,7 @@ process:
 				logent(tbuf, "RESTART");
 				errno = 0;
 				if (lseek(fileno(fp), startp, 0) == -1) {
-				    logent(sys_errlist[errno], "FSEEK ERROR");
+				    logent(strerror(errno), "FSEEK ERROR");
 				    (void) fclose(fp);
 				    (*Turnoff)();
 		    		    Seqn++;
@@ -1256,7 +1256,7 @@ process:
 			errno = 0;
 			if (lseek(fileno(fp), startp, 0) == -1) {
 			    WMESG(RCVFILE, EM_SEEK);
-			    logent(sys_errlist[errno], "FSEEK ERROR");
+			    logent(strerror(errno), "FSEEK ERROR");
 			    (void) fclose(fp);
 			    goto top;
 			}
diff --git a/usr/src/cmd/bnu/dio.c b/usr/src/cmd/bnu/dio.c
index 52581621a7..5ff4a34b6f 100644
--- a/usr/src/cmd/bnu/dio.c
+++ b/usr/src/cmd/bnu/dio.c
@@ -22,8 +22,12 @@
 /*	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"	/* from SVR4 bnu:dio.c 2.11 */
+#pragma ident	"%Z%%M%	%I%	%E% SMI"
 
 #include "uucp.h"
 
@@ -179,7 +183,7 @@ FILE *fp1;
 		if (len != XBUFSIZ)
 			break;
 	}
-	ASSERT(len >= 0, "DISK READ ERROR", sys_errlist[errno], len);
+	ASSERT(len >= 0, "DISK READ ERROR", strerror(errno), len);
 #ifndef V8
 	(*Ioctl)(fn, DIOCXCTL, dkeof);
 #endif
diff --git a/usr/src/cmd/bnu/imsg.c b/usr/src/cmd/bnu/imsg.c
index 94adc3727c..d89318fe02 100644
--- a/usr/src/cmd/bnu/imsg.c
+++ b/usr/src/cmd/bnu/imsg.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.
  */
 
@@ -54,8 +54,6 @@ register int fn;
 	register int i;
 	short fndsync;
 	char *bmsg;
-	extern int	errno, sys_nerr;
-	extern char *sys_errlist[];
 
 	fndsync = 0;
 	bmsg = msg;
@@ -85,11 +83,7 @@ register int fn;
 	}
 	/* have not found sync or end of message */
 	if (i < 0) {
-		if (errno < sys_nerr)
-			CDEBUG(7, "\nimsg read error: %s\n",
-			    sys_errlist[errno]);
-		else
-			CDEBUG(7, "\nimsg read error, errno %d\n", errno);
+		CDEBUG(7, "\nimsg read error: %s\n", strerror(errno));
 	}
 	*msg = '\0';
 	return(EOF);
diff --git a/usr/src/cmd/bnu/interface.c b/usr/src/cmd/bnu/interface.c
index 2f71234f6c..bf4ca27021 100644
--- a/usr/src/cmd/bnu/interface.c
+++ b/usr/src/cmd/bnu/interface.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.
  */
 
@@ -400,7 +400,6 @@ tfaillog(fd, s)
 int	fd;
 char	*s;
 {
-	extern char	*sys_errlist[];
 	char	fmt[ BUFSIZ ];
 
 	if (0 < t_errno && t_errno < t_nerr) {
@@ -409,7 +408,7 @@ char	*s;
 		logent(s, t_errlist[t_errno]);
 		if ( t_errno == TSYSERR ) {
 			strcpy(fmt, "tlicall: system error: %s\n");
-			DEBUG(5, fmt, sys_errlist[errno]);
+			DEBUG(5, fmt, strerror(errno));
 		} else if ( t_errno == TLOOK ) {
 			show_tlook(fd);
 		}
@@ -419,7 +418,7 @@ char	*s;
 		sprintf(fmt, "%s: unknown tli error %d", s, t_errno);
 		DEBUG(5, fmt, 0);
 		sprintf(fmt, "%s: %%s\n", s);
-		DEBUG(5, fmt, sys_errlist[errno]);
+		DEBUG(5, fmt, strerror(errno));
 	}
 	return;
 }
diff --git a/usr/src/cmd/bnu/pk1.c b/usr/src/cmd/bnu/pk1.c
index a8d40460d8..50a07218de 100644
--- a/usr/src/cmd/bnu/pk1.c
+++ b/usr/src/cmd/bnu/pk1.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.
  */
 
@@ -389,8 +389,8 @@ char cntl;
 	if (x < 0) {
 		if ((*Write)(pk->p_ofn, p, HDRSIZ) != HDRSIZ) {
 			DEBUG(4, "pkxstart, write failed, %s\n",
-			    sys_errlist[errno]);
-			logent(sys_errlist[errno], "PKXSTART WRITE");
+			    strerror(errno));
+			logent(strerror(errno), "PKXSTART WRITE");
 			pkfail();
 			/* NOT REACHED */
 		}
@@ -402,8 +402,8 @@ char cntl;
 		if ((*Write)(pk->p_ofn, buf, pk->p_xsize + HDRSIZ) !=
 		    pk->p_xsize + HDRSIZ) {
 			DEBUG(4, "pkxstart, write failed, %s\n",
-			    sys_errlist[errno]);
-			logent(sys_errlist[errno], "PKXSTART WRITE");
+			    strerror(errno));
+			logent(strerror(errno), "PKXSTART WRITE");
 			pkfail();
 			/* NOT REACHED */
 		}
@@ -463,8 +463,8 @@ register int fn;
 		}
 		if (ret < 0) {
 			DEBUG(4, "pkcget, read failed, %s\n",
-			    sys_errlist[errno]);
-			logent(sys_errlist[errno], "PKCGET READ");
+			    strerror(errno));
+			logent(strerror(errno), "PKCGET READ");
 			pkfail();
 			/* NOT REACHED */
 		}
diff --git a/usr/src/cmd/bnu/ulockf.c b/usr/src/cmd/bnu/ulockf.c
index 25cdffdfdf..8a08247919 100644
--- a/usr/src/cmd/bnu/ulockf.c
+++ b/usr/src/cmd/bnu/ulockf.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.
  */
 
@@ -320,7 +320,7 @@ char *tempfile, *name;
 	(void) chown(tempfile, UUCPUID, UUCPGID);
 	(void) close(fd);
 	if(link(tempfile,name)<0){
-		DEBUG(4, "%s: ", sys_errlist[errno]);
+		DEBUG(4, "%s: ", strerror(errno));
 		DEBUG(4, "link(%s, ", tempfile);
 		DEBUG(4, "%s)\n", name);
 		if(unlink(tempfile)< 0){
diff --git a/usr/src/cmd/bnu/unknown.c b/usr/src/cmd/bnu/unknown.c
index 2e5691137a..7f96dd5959 100644
--- a/usr/src/cmd/bnu/unknown.c
+++ b/usr/src/cmd/bnu/unknown.c
@@ -20,15 +20,15 @@
  * 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" /* from SVR4 bnu:unknown.c 1.8 */
+#pragma ident	"%Z%%M%	%I%	%E% SMI"
 /*
  *	logs attempts by unknown remote machines to run uucico in FOREIGN
  *	("/var/uucp/.Admin/Foreign").  if anything goes wrong,
@@ -96,15 +96,11 @@ char	*errmsg, *logmsg;
 	char		ebuf[BUFSIZ+1];
 	int		fds[2];
 	size_t		sz;
-	extern int	sys_nerr;
-	extern char	*sys_errlist[];
-
 
 	(void) snprintf(ebuf, BUFSIZ,
 		"To: %s\nSubject: %s %s\n\n%s %s:\t%s (%d)\nlog msg:\t%s",
 		MAILTO, errmsg, FOREIGN, errmsg, FOREIGN,
-		(errno < sys_nerr ? sys_errlist[errno] : "Unknown error "),
-		errno, logmsg);
+		strerror(errno), errno, logmsg);
 	sz = strlen(ebuf);
 	if (ebuf[sz-1] != '\n') {
 		ebuf[sz] = '\n';
diff --git a/usr/src/cmd/bnu/uucp.h b/usr/src/cmd/bnu/uucp.h
index e9e043db00..90c2104f6d 100644
--- a/usr/src/cmd/bnu/uucp.h
+++ b/usr/src/cmd/bnu/uucp.h
@@ -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.
  */
 
@@ -28,11 +28,15 @@
 /*	  All Rights Reserved  	*/
 
 
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
-
 #ifndef _UUCP_H
 #define _UUCP_H
 
+#pragma ident	"%Z%%M%	%I%	%E% SMI"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 #include <unistd.h>
 #include <stdlib.h>
 #include <string.h>
@@ -42,6 +46,8 @@
 #include <wctype.h>
 #include <ulimit.h>
 #include <values.h>
+#include <sys/types.h>
+#include <sys/wait.h>
 
 #include "parms.h"
 
@@ -527,7 +533,6 @@ EXTERN char Progname[];
 EXTERN char RemSpool[];
 EXTERN char *Bnptr;		/* used when BASENAME macro is expanded */
 EXTERN char *Shchar;		/* shell meta-charaters */
-extern char *sys_errlist[];
 EXTERN int SizeCheck;		/* ulimit check supported flag */
 EXTERN long RemUlimit;		/* remote ulimit if supported */
 EXTERN int Restart;		/* checkpoint restart supported flag */
@@ -536,10 +541,6 @@ EXTERN char Jobid[NAMESIZE];	/* Jobid of current C. file */
 EXTERN int Uerror;		/* global error code */
 EXTERN char *UerrorText[];	/* text for error code */
 
-/*	Some globals needed for section 2 and section 3 routines */
-extern char *optarg;	/* for getopt() */
-extern int optind;	/* for getopt() */
-
 #define UERRORTEXT		UerrorText[Uerror]
 #define UTEXT(x)		UerrorText[x]
 
@@ -571,18 +572,6 @@ EXTERN struct stat __s_;
 #define DIRECTORY(f)	((stat((f),&__s_)==0) && ((__s_.st_mode&(S_IFMT))==S_IFDIR) )
 #define NOTEMPTY(f)	((stat((f),&__s_)==0) && (__s_.st_size!=0) )
 
-/* standard functions used */
-
-extern char	*strcat(), *strcpy(), *strncpy(), *strrchr();
-extern char	*strchr(), *strpbrk();
-extern char	*index(), *rindex(), *getlogin(), *ttyname(); /*, *malloc();
-extern char	*calloc(); */
-extern long	lseek(), atol();
-extern time_t	time();
-extern int	pipe(), close(), getopt();
-extern struct tm	*localtime();
-extern FILE	*popen();
-
 /* uucp functions and subroutine */
 EXTERN void	(*genbrk)();
 extern int	iswrk(), gtwvec();			/* anlwrk.c */
@@ -684,4 +673,9 @@ EXTERN char *Ct_CLOSE;
 EXTERN char *Ct_BADOWN;
 EXTERN char *Fl_EXISTS;
 
+
+#ifdef __cplusplus
+}
 #endif
+
+#endif	/* _UUCP_H */
diff --git a/usr/src/cmd/cmd-inet/usr.bin/rdist/defs.h b/usr/src/cmd/cmd-inet/usr.bin/rdist/defs.h
index 69c7c8ba05..5b02f89bca 100644
--- a/usr/src/cmd/cmd-inet/usr.bin/rdist/defs.h
+++ b/usr/src/cmd/cmd-inet/usr.bin/rdist/defs.h
@@ -11,85 +11,89 @@
  * University may not be used to endorse or promote products derived
  * from this software without specific prior written permission.
  *
- * Copyright (c) 1998, by Sun Microsystems, Inc.
- * All rights reserved.
+ * Copyright 2005 Sun Microsystems, Inc.  All rights reserved.
+ * Use is subject to license terms.
  */
+
+#ifndef	_DEFS_H
+#define	_DEFS_H
+
 #pragma ident	"%Z%%M%	%I%	%E% SMI"
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 #include <stdio.h>
 #include <ctype.h>
 #include <errno.h>
 #include <pwd.h>
 #include <grp.h>
 #include <dirent.h>
+#include <strings.h>
 #include <sys/types.h>
 #include <sys/param.h>
 #include <sys/stat.h>
 #include <sys/time.h>
 #include <netinet/in.h>
 
-#ifdef SYSV
-#define rindex  strrchr
-#define index   strchr
-#endif /* SYSV */
-
 /*
  * The version number should be changed whenever the protocol changes.
  */
-#define VERSION	 3
+#define	VERSION	 3
 
 #define	MAILCMD	 "/usr/lib/sendmail -oi -t"
 
 	/* defines for yacc */
-#define EQUAL	1
-#define LP	2
-#define RP	3
-#define SM	4
-#define ARROW	5
-#define COLON	6
-#define DCOLON	7
-#define NAME	8
-#define STRING	9
-#define INSTALL	10
-#define NOTIFY	11
-#define EXCEPT	12
-#define PATTERN	13
-#define SPECIAL	14
-#define OPTION	15
+#define	EQUAL	1
+#define	LP	2
+#define	RP	3
+#define	SM	4
+#define	ARROW	5
+#define	COLON	6
+#define	DCOLON	7
+#define	NAME	8
+#define	STRING	9
+#define	INSTALL	10
+#define	NOTIFY	11
+#define	EXCEPT	12
+#define	PATTERN	13
+#define	SPECIAL	14
+#define	OPTION	15
 
 	/* lexical definitions */
 #define	QUOTE 	0200		/* used internally for quoted characters */
 #define	TRIM	0177		/* Mask to strip quote bit */
 
 	/* table sizes */
-#define HASHSIZE	1021
-#define INMAX	3500
+#define	HASHSIZE	1021
+#define	INMAX	3500
 #define	LINESIZE	BUFSIZ
 
 	/* option flags */
-#define VERIFY	0x1
-#define WHOLE	0x2
-#define YOUNGER	0x4
-#define COMPARE	0x8
-#define REMOVE	0x10
-#define FOLLOW	0x20
-#define IGNLNKS	0x40
+#define	VERIFY	0x1
+#define	WHOLE	0x2
+#define	YOUNGER	0x4
+#define	COMPARE	0x8
+#define	REMOVE	0x10
+#define	FOLLOW	0x20
+#define	IGNLNKS	0x40
 #define	OBITS "\020\1VERIFY\2WHOLE\3YOUNGER\4COMPARE\5REMOVE\6FOLLOW\7IGNLNKS"
 
 	/* expand type definitions */
-#define E_VARS	0x1
-#define E_SHELL	0x2
-#define E_TILDE	0x4
-#define E_ALL	0x7
+#define	E_VARS	0x1
+#define	E_SHELL	0x2
+#define	E_TILDE	0x4
+#define	E_ALL	0x7
 
 	/* actions for lookup() */
-#define LOOKUP	0
-#define INSERT	1
-#define REPLACE	2
+#define	LOOKUP	0
+#define	INSERT	1
+#define	REPLACE	2
 
-#define ISDIR(m) (((m) & S_IFMT) == S_IFDIR)
+#define	ISDIR(m) (((m) & S_IFMT) == S_IFDIR)
 
-#define ALLOC(x) (struct x *) malloc(sizeof(struct x))
+#define	ALLOC(x) (struct x *)malloc(sizeof (struct x))
 
 struct namelist {	/* for making lists of strings */
 	char	*n_name;
@@ -136,8 +140,6 @@ extern struct passwd *pw;	/* pointer to static area used by getpwent */
 extern struct group *gr;	/* pointer to static area used by getgrent */
 extern char host[];		/* host name of master copy */
 extern char buf[];		/* general purpose buffer */
-extern int errno;		/* system error number */
-extern char *sys_errlist[];
 
 char *makestr();
 struct namelist *makenl();
@@ -145,7 +147,11 @@ struct subcmd *makesubcmd();
 struct namelist *lookup();
 struct namelist *expand();
 char *exptilde();
-char *rindex();
-char *index();
 char *printb();
 void sendrem();
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif	/* _DEFS_H */
diff --git a/usr/src/cmd/cmd-inet/usr.bin/rlogin.c b/usr/src/cmd/cmd-inet/usr.bin/rlogin.c
index 1ecccb4ce4..e9bf6b6628 100644
--- a/usr/src/cmd/cmd-inet/usr.bin/rlogin.c
+++ b/usr/src/cmd/cmd-inet/usr.bin/rlogin.c
@@ -151,7 +151,6 @@ static char *appdef[] = { "appdefaults", rlogin, NULL };
 static	boolean_t ttcompat;
 static	struct termios savetty;
 
-static	char *errmsg(int);
 static	char *host;
 static	int port_number;
 static	int rem = -1;
@@ -942,7 +941,7 @@ writer(void)
 				continue;
 			else {
 				prf(gettext("Read error from terminal: %s"),
-				    errmsg(errno));
+				    strerror(errno));
 				break;
 			}
 		}
@@ -976,7 +975,7 @@ writer(void)
 				if (deswrite(rem, &cmdchar, 1, 0) < 0) {
 					prf(gettext(
 					    "Write error to network: %s"),
-					    errmsg(errno));
+					    strerror(errno));
 					break;
 				}
 			}
@@ -986,7 +985,7 @@ writer(void)
 				prf(gettext("line gone"));
 			else
 				prf(gettext("Write error to network: %s"),
-				    errmsg(errno));
+				    strerror(errno));
 			break;
 		}
 		bol = c == defkill || c == deftc.t_eofc ||
@@ -1014,7 +1013,7 @@ echo(char c)
 	*p++ = '\r';
 	*p++ = '\n';
 	if (write(STDOUT_FILENO, buf, p - buf) < 0)
-		prf(gettext("Write error to terminal: %s"), errmsg(errno));
+		prf(gettext("Write error to terminal: %s"), strerror(errno));
 }
 
 static void
@@ -1061,7 +1060,7 @@ sendwindow(void)
 	wp->ws_xpixel = htons(winsize.ws_xpixel);
 	wp->ws_ypixel = htons(winsize.ws_ypixel);
 	if (deswrite(rem, obuf, sizeof (obuf), 0) < 0)
-		prf(gettext("Write error to network: %s"), errmsg(errno));
+		prf(gettext("Write error to network: %s"), strerror(errno));
 }
 
 
@@ -1194,7 +1193,7 @@ oob(void)
 				if (n < 0)
 					prf(gettext(
 					    "Read error from network: %s"),
-					    errmsg(errno));
+					    strerror(errno));
 				break;
 			}
 		}
@@ -1253,7 +1252,7 @@ reader(int oldmask)
 				if (errno != EINTR) {
 					prf(gettext(
 					    "Write error to terminal: %s"),
-					    errmsg(errno));
+					    strerror(errno));
 					return (-1);
 				}
 				continue;
@@ -1270,7 +1269,7 @@ reader(int oldmask)
 			if (errno == EINTR)
 				continue;
 			prf(gettext("Read error from network: %s"),
-			    errmsg(errno));
+			    strerror(errno));
 			return (-1);
 		}
 	}
@@ -1347,17 +1346,6 @@ lostpeer(void)
 	done(EXIT_FAILURE);
 }
 
-static char *
-errmsg(int errcode)
-{
-	extern int sys_nerr;
-
-	if (errcode < 0 || errcode > sys_nerr)
-		return (gettext("Unknown error"));
-	else
-		return (strerror(errcode));
-}
-
 static int
 compat_ioctl(int des, int request, void *arg)
 {
diff --git a/usr/src/cmd/cmd-inet/usr.bin/talk/io.c b/usr/src/cmd/cmd-inet/usr.bin/talk/io.c
index 8650830971..36b9865a7f 100644
--- a/usr/src/cmd/cmd-inet/usr.bin/talk/io.c
+++ b/usr/src/cmd/cmd-inet/usr.bin/talk/io.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,9 +53,6 @@
 
 #define	A_LONG_TIME 10000000
 #define	STDIN_MASK (1<<fileno(stdin))	/* the bit mask for standard input */
-extern int	errno;
-extern int	sys_nerr;
-
 
 /*
  * The routine to do the actual talking
@@ -64,7 +61,7 @@ extern int	sys_nerr;
 void
 talk()
 {
-	register int read_template, sockt_mask;
+	int read_template, sockt_mask;
 	int read_set, nb;
 	char buf[BUFSIZ];
 	struct timeval wait;
@@ -122,53 +119,45 @@ talk()
 
 		if (read_set & STDIN_MASK) {
 
-		/*
-		 * we can't make the tty non_blocking, because
-		 * curses's output routines would screw up
-		 */
+			/*
+			 * we can't make the tty non_blocking, because
+			 * curses's output routines would screw up
+			 */
 
 			ioctl(0, FIONREAD, (struct sgttyb *)&nb);
 			nb = read(0, buf, nb);
 			display(&my_win, buf, nb);
 			write(sockt, buf, nb);
 
-		/* We might lose data here because sockt is non-blocking */
-
+			/*
+			 * We might lose data here because sockt is
+			 * non-blocking
+			 */
 		}
 	}
 }
 
 
-	/*
-	 * p_error prints the system error message on the standard location
-	 * on the screen and then exits. (i.e. a curses version of perror)
-	 */
+/*
+ * p_error prints the system error message on the standard location
+ * on the screen and then exits. (i.e. a curses version of perror)
+ */
 
 void
-p_error(string)
-char *string;
+p_error(char *string)
 {
-	char *sys;
-
-	if (errno < sys_nerr) {
-		sys = strerror(errno);
-	} else {
-		sys = gettext("Unknown error");
-	}
-
 	wmove(my_win.x_win, current_line%my_win.x_nlines, 0);
-	wprintw(my_win.x_win, "[%s : %s (%d)]\n", string, sys, errno);
+	wprintw(my_win.x_win, "[%s : %s]\n", string, strerror(errno));
 	wrefresh(my_win.x_win);
 	move(LINES-1, 0);
 	refresh();
 	quit();
 }
 
-	/* display string in the standard location */
+/* display string in the standard location */
 
 void
-message(string)
-char *string;
+message(char *string)
 {
 	wmove(my_win.x_win, current_line%my_win.x_nlines, 0);
 	wprintw(my_win.x_win, "[%s]\n", string);
diff --git a/usr/src/cmd/fmli/sys/terror.c b/usr/src/cmd/fmli/sys/terror.c
index 655c32429b..4eabc28523 100644
--- a/usr/src/cmd/fmli/sys/terror.c
+++ b/usr/src/cmd/fmli/sys/terror.c
@@ -36,6 +36,7 @@
 #pragma ident	"%Z%%M%	%I%	%E% SMI"
 
 #include	<stdio.h>
+#include	<stdlib.h>
 #include	<errno.h>
 #include	<sys/types.h>
 #include	"wish.h"
@@ -136,9 +137,6 @@ int	line;
 	register FILE	*fp;
 	extern char	*Oasys;
 	extern char	*Progname;
-	extern char	*sys_errlist[];
-	char	*getenv();
-	time_t	time();   /* EFT abs k16 */
 
 	/*
 	 * construct path of error log file
@@ -164,7 +162,7 @@ int	line;
 		getenv("LOGNAME"), Progname, file, line,
 		(sev & TERR_EXIT) ? "(FATAL)" : nil,
 		(sev & TERR_EXIT) ? 17 : 24,
-		What[what], sys_errlist[errno], name);
+		What[what], strerror(errno), name);
 	if (method == LOGFILE)
 		fclose(fp);
 	else if (method == MAILADM)
diff --git a/usr/src/cmd/fmthard/fmthard.c b/usr/src/cmd/fmthard/fmthard.c
index 92d44338d8..6887b269aa 100644
--- a/usr/src/cmd/fmthard/fmthard.c
+++ b/usr/src/cmd/fmthard/fmthard.c
@@ -94,14 +94,6 @@ extern	int	read_vtoc(int, struct vtoc *);
 extern	int	write_vtoc(int, struct vtoc *);
 
 /*
- * Externals
- */
-extern	char	*optarg;
-extern	int	optind;
-extern	int	errno;
-extern	char	*sys_errlist[];
-
-/*
  * Internal functions.
  */
 extern	int	main(int, char **);
@@ -233,7 +225,7 @@ main(int argc, char **argv)
 
 	if ((fd = open(argv[optind], O_RDWR|O_NDELAY)) < 0) {
 		(void) fprintf(stderr, "fmthard:  Cannot open device %s - %s\n",
-			argv[optind], sys_errlist[errno]);
+			argv[optind], strerror(errno));
 		exit(1);
 	}
 
diff --git a/usr/src/cmd/fs.d/autofs/autod_main.c b/usr/src/cmd/fs.d/autofs/autod_main.c
index a16e87c079..7bcf02d127 100644
--- a/usr/src/cmd/fs.d/autofs/autod_main.c
+++ b/usr/src/cmd/fs.d/autofs/autod_main.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.
  */
 
@@ -360,9 +360,9 @@ static void
 usage()
 {
 	(void) fprintf(stderr, "Usage: automountd\n"
-		"\t[-T]\t\t(trace requests)\n"
-		"\t[-v]\t\t(verbose error msgs)\n"
-		"\t[-D n=s]\t(define env variable)\n");
+	    "\t[-T]\t\t(trace requests)\n"
+	    "\t[-v]\t\t(verbose error msgs)\n"
+	    "\t[-D n=s]\t(define env variable)\n");
 	exit(1);
 	/* NOTREACHED */
 }
@@ -492,7 +492,7 @@ dupdonereq_nonidemp(struct svc_req *rqstp, caddr_t res, bool_t (*xdr_result)())
 			memset(resp_buf, 0, resp_bufsz);
 			memset((caddr_t)&xdrs, 0, sizeof (XDR));
 			xdrmem_create(&xdrs, resp_buf, (uint_t)resp_bufsz,
-					XDR_ENCODE);
+			    XDR_ENCODE);
 			if ((*xdr_result)(&xdrs, res) == FALSE) {
 				if (verbose)
 					syslog(LOG_ERR,
@@ -507,7 +507,7 @@ dupdonereq_nonidemp(struct svc_req *rqstp, caddr_t res, bool_t (*xdr_result)())
 	}
 
 	dupstat = __svc_vc_dupdone(rqstp, resp_buf, (uint_t)resp_bufsz,
-				DUP_DONE);
+	    DUP_DONE);
 	if (dupstat == DUP_ERROR) {
 		if (verbose)
 			syslog(LOG_ERR, "dupdonereq_nonidemp: cache error");
@@ -971,15 +971,12 @@ autofs_mount_1_free_r(res)
 }
 
 /*
- * Used for reporting messages from code
- * shared with automount command.
- * Formats message into a buffer and
- * calls syslog.
+ * Used for reporting messages from code shared with automount command.
+ * Formats message into a buffer and calls syslog.
  *
- * Print an error.
- * Works like printf (fmt string and variable args)
- * except that it will subsititute an error message
- * for a "%m" string (like syslog).
+ * Print an error.  Works like printf (fmt string and variable args)
+ * except that it will subsititute an error message for a "%m" string
+ * (like syslog).
  */
 void
 pr_msg(const char *fmt, ...)
@@ -993,11 +990,9 @@ pr_msg(const char *fmt, ...)
 	fmt = gettext(fmt);
 
 	for (p1 = fmt; *p1; p1++) {
-		if (*p1 == '%' && *(p1+1) == 'm') {
-			if (errno < sys_nerr) {
-				(void) strcpy(p2, sys_errlist[errno]);
-				p2 += strlen(p2);
-			}
+		if (*p1 == '%' && *(p1 + 1) == 'm') {
+			(void) strcpy(p2, strerror(errno));
+			p2 += strlen(p2);
 			p1++;
 		} else {
 			*p2++ = *p1;
diff --git a/usr/src/cmd/fs.d/autofs/automount.c b/usr/src/cmd/fs.d/autofs/automount.c
index a957355624..76fa200618 100644
--- a/usr/src/cmd/fs.d/autofs/automount.c
+++ b/usr/src/cmd/fs.d/autofs/automount.c
@@ -573,10 +573,8 @@ pr_msg(const char *fmt, ...)
 
 	for (p1 = nfmt; *p1; p1++) {
 		if (*p1 == '%' && *(p1+1) == 'm') {
-			if (errno < sys_nerr) {
-				(void) strcpy(p2, sys_errlist[errno]);
-				p2 += strlen(p2);
-			}
+			(void) strcpy(p2, strerror(errno));
+			p2 += strlen(p2);
 			p1++;
 		} else {
 			*p2++ = *p1;
diff --git a/usr/src/cmd/fs.d/autofs/automount.h b/usr/src/cmd/fs.d/autofs/automount.h
index fb1ee0275c..99daa17c2b 100644
--- a/usr/src/cmd/fs.d/autofs/automount.h
+++ b/usr/src/cmd/fs.d/autofs/automount.h
@@ -228,8 +228,6 @@ extern char self[];
 extern int verbose;
 extern int trace;
 extern int automountd_nobrowse;
-extern int sys_nerr;
-extern char *sys_errlist[];
 extern struct autodir *dir_head;
 extern struct autodir *dir_tail;
 extern struct mntlist *current_mounts;
diff --git a/usr/src/cmd/fs.d/ufs/fsirand/Makefile b/usr/src/cmd/fs.d/ufs/fsirand/Makefile
index 9643a8176c..bd8aac8e6f 100644
--- a/usr/src/cmd/fs.d/ufs/fsirand/Makefile
+++ b/usr/src/cmd/fs.d/ufs/fsirand/Makefile
@@ -22,8 +22,8 @@
 #
 #ident	"%Z%%M%	%I%	%E% SMI"
 #
-# Copyright (c) 1992,1996 by Sun Microsystems, Inc.
-# All rights reserved.
+# Copyright 2005 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
 #
 # cmd/fs.d/ufs/fsirand/Makefile
 
@@ -36,6 +36,9 @@ LINKVALUE=	../lib/fs/$(FSTYPE)/$(LIBPROG)
 include		../../Makefile.fstype
 
 CPPFLAGS +=	-D_LARGEFILE64_SOURCE
+
+lint		:=	PROG= $(LIBPROG)
+
 lint:		lint_PROG
 
 $(ROOTUSRSBIN)/$(LIBPROG):
diff --git a/usr/src/cmd/fs.d/ufs/fsirand/fsirand.c b/usr/src/cmd/fs.d/ufs/fsirand/fsirand.c
index 96989f3d66..3a4c3b6803 100644
--- a/usr/src/cmd/fs.d/ufs/fsirand/fsirand.c
+++ b/usr/src/cmd/fs.d/ufs/fsirand/fsirand.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.
  */
 
@@ -35,12 +35,17 @@
 #pragma ident	"%Z%%M%	%I%	%E% SMI"
 
 /*
- * fsirand
+ * fsirand installs random inode generation numbers on all the inodes on
+ * device <special>, and also installs a file system ID in the superblock.
+ * This helps increase the security of  file systems exported by NFS.
  */
 
 #include <fcntl.h>
 #include <stdio.h>
 #include <errno.h>
+#include <strings.h>
+#include <unistd.h>
+#include <stdlib.h>
 #include <sys/param.h>
 #include <sys/types.h>
 #include <sys/time.h>
@@ -48,20 +53,11 @@
 #include <sys/vnode.h>
 #include <sys/fs/ufs_inode.h>
 
-extern offset_t	llseek();
-
-extern long	lrand48();
-extern void	srand48();
-
-char fsbuf[SBSIZE];
+long fsbuf[(SBSIZE / sizeof (long))];
 struct dinode dibuf[8192/sizeof (struct dinode)];
 
-static char	*strerror(/*int errnum*/);
-
-void
-main(argc, argv)
-int	argc;
-char	*argv[];
+int
+main(int argc, char *argv[])
 {
 	struct fs *fs;
 	int fd;
@@ -162,7 +158,7 @@ char	*argv[];
 				    "fsirand: Seek to %ld %ld failed: %s\n",
 				    ((off_t *)&seekaddr)[0],
 				    ((off_t *)&seekaddr)[1],
-				    seekaddr, strerror(errno));
+				    strerror(errno));
 				exit(1);
 			}
 			n = write(fd, (char *)dibuf, bsize);
@@ -222,21 +218,5 @@ char	*argv[];
 			}
 		}
 	}
-	exit(0);
-	/* NOTREACHED */
-}
-
-static char *
-strerror(errnum)
-	int errnum;
-{
-	extern int sys_nerr;
-	extern char *sys_errlist[];
-	static char unknown_error[16+1];	/* "Error NNNNNNNNNN" + '\0' */
-
-	if (errnum < 0 || errnum > sys_nerr) {
-		(void) sprintf(unknown_error, "Error %d", errnum);
-		return (unknown_error);
-	} else
-		return (sys_errlist[errnum]);
+	return (0);
 }
diff --git a/usr/src/cmd/listen/lslog.c b/usr/src/cmd/listen/lslog.c
index 35d37a5d9b..4e32765a88 100644
--- a/usr/src/cmd/listen/lslog.c
+++ b/usr/src/cmd/listen/lslog.c
@@ -22,8 +22,12 @@
 /*	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.7.3.1	*/
+#pragma ident	"%Z%%M%	%I%	%E% SMI"
 
 /*
  * error/logging/cleanup functions for the network listener process.
@@ -61,8 +65,8 @@ extern char *Netspec;
 extern FILE *Logfp;
 extern FILE *Debugfp;
 extern char Mytag[];
- 
-static char * stamp(char *);
+
+static char *stamp(char *);
 
 /*
  * error handling and debug routines
@@ -95,23 +99,21 @@ int code, exitflag;
 
 static char *tlirange = "Unknown TLI error (t_errno > t_nerr)";
 
-tli_error(code, exitflag)
-int code, exitflag;
+void
+tli_error(int code, int exitflag)
 {
 	void	t_error();
-	extern char *sys_errlist[];
-	extern int sys_nerr;
-	extern char *range_err();
 	char	scratch[256];
 	const char *p;
+	int	save_errno = errno;
 
-	p = ( t_errno < t_nerr ? t_errlist[t_errno] : tlirange );
+	p = (t_errno < t_nerr ? t_errlist[t_errno] : tlirange);
 
-	sprintf(scratch, "%s: %s", err_list[code].err_msg, p);
+	(void) snprintf(scratch, sizeof (scratch), "%s: %s",
+	    err_list[code].err_msg, p);
 	if (t_errno == TSYSERR)  {
-		p = (errno < sys_nerr ? sys_errlist[errno] : range_err());
-		strcat(scratch, ": ");
-		strcat(scratch, p);
+		(void) strlcat(scratch, ": ", sizeof (scratch));
+		(void) strlcat(scratch, strerror(save_errno), sizeof (scratch));
 	}
 	clean_up(code, exitflag, scratch);
 }
@@ -121,19 +123,13 @@ int code, exitflag;
  * sys_error: error in a system call
  */
 
-sys_error(code, exitflag)
-int code, exitflag;
+void
+sys_error(int code, int exitflag)
 {
-	extern int errno;
-	extern char *sys_errlist[];
-	extern int sys_nerr;
-	register char *p;
 	char scratch[256];
-	extern char *range_err();
-
-	p = (errno < sys_nerr ? sys_errlist[errno] : range_err());
 
-	sprintf(scratch, "%s: %s", err_list[code].err_msg, p);
+	(void) snprintf(scratch, sizeof (scratch), "%s: %s",
+	    err_list[code].err_msg, strerror(errno));
 	clean_up(code, exitflag, scratch);
 }
 
@@ -172,7 +168,7 @@ char *msg;
 		for (i=0;i<Dbf_entries;i++) {
 			t_unbind(dbp->dbf_fd);
 			dbp++;
-		} 
+		}
 	}
 
 #ifdef	COREDUMP
@@ -184,24 +180,6 @@ char *msg;
 }
 
 
-
-/*
- * range_err:	returns a string to use when errno > sys_nerr
- */
-
-static char *sysrange = "Unknown system error (errno %d > sys_nerr)";
-static char range_buf[128];
-
-char *
-range_err()
-{
-	extern int errno;
-
-	sprintf(range_buf,sysrange,errno);
-	return(range_buf);
-}
-
-
 void
 logexit(exitcode, msg)
 int exitcode;
@@ -284,7 +262,7 @@ char *s;
 			rewind(Logfp);
 			DEBUG((1,"errno %d renaming log to old logfile",errno));
 		}
-		else  if (nlogfp = fopen(log, "a+"))  { 
+		else  if (nlogfp = fopen(log, "a+"))  {
 			fclose(Logfp);
 			Logfp = nlogfp;
 			fcntl(fileno(Logfp), F_SETFD, 1); /* reset close-on-exec */
@@ -315,7 +293,7 @@ stamp(char *msg)
 	tm_p = (struct tm *) localtime(&clock);
 	tm_p->tm_mon++;	/* since months are 0-11 */
 	sprintf(Lastmsg, "%2.2d/%2.2d/%2.2d %2.2d:%2.2d:%2.2d; %ld; %s\n",
-		tm_p->tm_mon, tm_p->tm_mday, (tm_p->tm_year % 100), 
+		tm_p->tm_mon, tm_p->tm_mday, (tm_p->tm_year % 100),
 		tm_p->tm_hour, tm_p->tm_min, tm_p->tm_sec, Pid, msg);
 	return(Lastmsg);
 }
diff --git a/usr/src/cmd/lp/cmd/lpfilter.c b/usr/src/cmd/lp/cmd/lpfilter.c
index 3a694569a3..dd7c626d68 100644
--- a/usr/src/cmd/lp/cmd/lpfilter.c
+++ b/usr/src/cmd/lp/cmd/lpfilter.c
@@ -20,7 +20,7 @@
  * CDDL HEADER END
  */
 /*
- * Copyright 2002 Sun Microsystems, Inc.  All rights reserved.
+ * Copyright 2005 Sun Microsystems, Inc.  All rights reserved.
  * Use is subject to license terms.
  */
 
@@ -30,9 +30,9 @@
 
 #pragma ident	"%Z%%M%	%I%	%E% SMI"
 
-#include "stdio.h"
-#include "errno.h"
-#include "string.h"
+#include <stdio.h>
+#include <errno.h>
+#include <string.h>
 #include <locale.h>
 
 #include "lp.h"
@@ -45,11 +45,6 @@
 
 #define	OPT_LIST	"f:F:ixl"
 
-extern char		*strerror(),
-			*malloc();
-
-extern int		sys_nerr;
-
 int			add_filter(),
 			reload_filter(),
 			delete_filter(),
@@ -915,7 +910,7 @@ static void		same_complaints (table, type)
 			ERROR,
 			E_FL_UNKNOWN,
 			getfilterfile(table),
-			(errno < sys_nerr? strerror(errno): "unknown")
+			strerror(errno)
 		);
 		break;
 	}
diff --git a/usr/src/cmd/lp/filter/postscript/postio/parallel.c b/usr/src/cmd/lp/filter/postscript/postio/parallel.c
index c22cbfbf45..a8bca7e41e 100644
--- a/usr/src/cmd/lp/filter/postscript/postio/parallel.c
+++ b/usr/src/cmd/lp/filter/postscript/postio/parallel.c
@@ -20,21 +20,16 @@
  * CDDL HEADER END
  */
 /*
- * Copyright 1991-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"
 
-#ifndef lint
-static char sccsid[] = "%Z%%M% %I% %E%";
-#endif
-
 extern char *postbegin;
 
 #include <stdio.h>
 #include <errno.h>
-extern char *_sys_errlist[];
 #include <string.h>
 #include <stdarg.h>
 #include <signal.h>
@@ -285,7 +280,7 @@ printer_error(int error)
 {
 	switch (error) {
 		case -1:
-			printer_info("ioctl(): %s", _sys_errlist[errno]);
+			printer_info("ioctl(): %s", strerror(errno));
 			break;
 		case PRINTER_ERROR_PAPER_OUT:
 			printer_info("out of paper");
@@ -379,7 +374,7 @@ parallel_comm(int fd, int get_state())
 
 #if defined(DEBUG) && defined(NOTDEF)
 		logit("Writing (%d) at 0x%x actual: %d, %s\n", count++, head,
-			actual, (actual < 1 ? _sys_errlist[errno] : ""));
+			actual, (actual < 1 ? strerror(errno) : ""));
 #endif
 	}
 
diff --git a/usr/src/cmd/lp/include/lp.h b/usr/src/cmd/lp/include/lp.h
index 32d4ce85ca..4a7beb3637 100644
--- a/usr/src/cmd/lp/include/lp.h
+++ b/usr/src/cmd/lp/include/lp.h
@@ -27,18 +27,21 @@
 /*	Copyright (c) 1984, 1986, 1987, 1988, 1989 AT&T	*/
 /*	  All Rights Reserved  	*/
 
+#ifndef _LP_LP_H
+#define	_LP_LP_H
 
 #pragma ident	"%Z%%M%	%I%	%E% SMI"
 
-#if	!defined(_LP_LP_H)
-#define	_LP_LP_H
+#ifdef __cplusplus
+extern "C" {
+#endif
 
-#include "errno.h"
-#include "fcntl.h"
-#include "sys/types.h"
-#include "sys/stat.h"
-#include "stdio.h"
-#include "dirent.h"
+#include <errno.h>
+#include <fcntl.h>
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <stdio.h>
+#include <dirent.h>
 
 /**
  ** Types:
@@ -298,11 +301,7 @@ extern int		lp_errno;
 
 #define	NB(X)		(X? X : "")
 
-extern int	errno;
-extern char *	sys_errlist[];
-extern int	sys_nerr;
-
-#define PERROR		(errno < sys_nerr? sys_errlist[errno] : "unknown")
+#define PERROR		strerror(errno)
 
 /*
  * Largest number we'll ever expect to get from doing %ld in printf,
@@ -600,4 +599,8 @@ extern int chownmod(char *path, uid_t owner, gid_t group, mode_t mode);
 
 char *		next_x  ( char * , long * , unsigned int );
 
+#ifdef __cplusplus
+}
 #endif
+
+#endif	/* _LP_LP_H */
diff --git a/usr/src/cmd/lp/lib/lp/llib-llp b/usr/src/cmd/lp/lib/lp/llib-llp
index c105e436b0..b1faa81b20 100644
--- a/usr/src/cmd/lp/lib/lp/llib-llp
+++ b/usr/src/cmd/lp/lib/lp/llib-llp
@@ -23,8 +23,8 @@
 /* PROTOLIB1 */
 
 /*
- * Copyright (c) 1998 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	*/
@@ -50,10 +50,6 @@ typedef struct FALERT {
 	int	W;	/* alert is sent every "W" minutes */
 } FALERT;
 
-extern int	errno;
-extern char *	sys_errlist[];
-extern int	sys_nerr;
-
 extern int	open_locked(char *, char *, mode_t);
 extern char	*fdgets(char *, int, int);
 extern int	fdprintf(int, char *, ...);
diff --git a/usr/src/cmd/lp/model/lp.cat.c b/usr/src/cmd/lp/model/lp.cat.c
index 79ac77913d..0483ea4a2e 100644
--- a/usr/src/cmd/lp/model/lp.cat.c
+++ b/usr/src/cmd/lp/model/lp.cat.c
@@ -29,14 +29,15 @@
 
 #pragma ident	"%Z%%M%	%I%	%E% SMI"
 
-#include "stdio.h"
-#include "termio.h"
-#include "sys/types.h"
-#include "errno.h"
-#include "signal.h"
-#include "sys/times.h"
-#include "string.h"
-#include "limits.h"
+#include <stdio.h>
+#include <stdlib.h>
+#include <termio.h>
+#include <sys/types.h>
+#include <errno.h>
+#include <signal.h>
+#include <sys/times.h>
+#include <string.h>
+#include <limits.h>
 #include <sys/prnio.h>
 
 #include "lp.h"
@@ -47,7 +48,6 @@
  **	Begin Sun Additions for Parallel ports
  **/
 
-extern char *_sys_errlist[];
 #include <string.h>
 #include <stdarg.h>
 #include <signal.h>
@@ -295,7 +295,7 @@ printer_error(int error)
 {
 	switch (error) {
 		case -1:
-			printer_info("ioctl(): %s", _sys_errlist[errno]);
+			printer_info("ioctl(): %s", strerror(errno));
 			break;
 		case PRINTER_ERROR_PAPER_OUT:
 			printer_info("out of paper");
@@ -364,13 +364,6 @@ wait_state(int fd, int get_state())
 #define R(F)		(int)((F) + .5)
 #define DELAY(N,D)	R(SAFETY_FACTOR * ((N) / (double)(D)))
 
-extern int		sys_nerr;
-
-extern char		*sys_errlist[],
-			*getenv();
-
-extern int		atoi();
-
 char			buffer[BUFSIZ];
 
 void			sighup(),
diff --git a/usr/src/cmd/mail/mail.h b/usr/src/cmd/mail/mail.h
index 35c3296ee5..08dbd66d75 100644
--- a/usr/src/cmd/mail/mail.h
+++ b/usr/src/cmd/mail/mail.h
@@ -271,47 +271,9 @@ typedef struct t_surrfile
     int fullyresolved;	/*		translate		    */
 } t_surrfile;
 
-#ifdef __STDC__
-# include <stdlib.h>
-# include <unistd.h>
-#else
-extern	int	chmod();
-extern	int	close();
-extern	char	*ctime();
-extern	int	errno;
-extern	int	execl();
-extern	int	execvp();
-extern	void	exit();
-extern	char	*getenv();
-extern	char	*getlogin();
-extern	long	ftell();
-extern	struct group *getgrnam();
-extern	struct passwd *getpwent();
-extern	struct passwd *getpwnam();
-extern	struct passwd *getpwuid();
-extern	char	*malloc();
-extern	char	*memcpy();
-extern	char	*memmove();
-extern	char	*mktemp();
-extern	char	*realloc();
-extern	void	setpwent();
-extern	unsigned	sleep();
-extern	char	*strchr();
-extern	char	*strcpy();
-extern	char	*strncpy();
-extern	char	*strpbrk();
-extern	char	*strrchr();
-extern	time_t	time();
-extern	char	*tempnam();
-extern	FILE	*tmpfile();
-extern	int	unlink();
-#endif
+#include <stdlib.h>
+#include <unistd.h>
 
-extern	char	*optarg;	/* for getopt */
-extern	int	optind;
-extern	char	*sys_errlist[];
-
-#ifdef __STDC__
 extern	void	Dout(char *subname, int level, char *fmt, ...);
 extern	void	Tout(char *subname, char *msg, ...);
 extern	int	add_recip(reciplist *plist, char *name, int checkdups);
@@ -389,85 +351,6 @@ extern	int	translate(reciplist *plist, char *cmdstr, char *origname);
 extern	void	unlock(void);
 extern	int	validmsg(int);
 extern	int	wtmpf(char *str, int length);
-#else
-extern	void	Dout();
-extern	void	Tout();
-extern	int	add_recip();
-extern	char	*altcompile();
-extern	int	areforwarding();
-extern	void	cat();
-extern	int	ckdlivopts();
-extern	void	cksaved();
-extern	int	cksurg_rc();
-extern	void	clr_hinfo();
-extern	void	clrhdr();
-extern	void	cmdexpand();
-extern	void	copyback();
-extern	int	copylet();
-extern	void	copymt();
-extern	void	createmf();
-extern	void	del_reciplist ();
-extern	void	delete();
-extern	void	doFopt();
-extern	void	done();
-extern	void	sig_done();
-extern	FILE	*doopen();
-extern	int	dowait();
-extern	void	dumpaff();
-extern	void	dumprcv();
-extern	void	errmsg();
-extern	int	findSurg();
-extern	void	gendeliv();
-extern	int	getcomment();
-extern	int	gethead();
-extern	int	getline();
-extern	int	getnumbr();
-extern	int	getsurr();
-extern	void	goback();
-extern	int	init();
-extern	void	initsurrfile();
-extern	int	isheader();
-extern	int	isit();
-extern	int	islocal();
-extern	int	istext();
-extern	int	legal();
-extern	void	lock();
-extern	void	madd_recip();
-extern	char	*mailcompile();
-extern	void	mkdead();
-extern	void	mktmp();
-extern	void	mta_ercode();
-extern	void	new_reciplist ();
-extern	int	notme();
-extern	int	parse();
-extern	int	pckaffspot();
-extern	int	pckrcvspot();
-extern	void	pickFrom ();
-extern	int	pipletr();
-extern	void	poplist ();
-extern	int	printhdr ();
-extern	void	printmail();
-extern	void	pushlist();
-extern	void	savdead();
-extern	void	savehdrs();
-extern	int	sel_disp ();
-extern	int	sendlist();
-extern	void	sendmail();
-extern	int	sendsurg();
-extern	void	setletr();
-extern	void	(*setsig())();
-extern	void	setsurg_bt();
-extern	char	*setsurg_rc();
-extern	char	**setup_exec();
-extern	void	stamp();
-extern	int	systm();
-extern	void	tmperr();
-extern	string	*tokdef();
-extern	int	translate();
-extern	void	unlock();
-extern	int	validmsg();
-extern	int	wtmpf();
-#endif
 
 extern	int	ac;		/* argument list count */
 extern	char	**av;		/* argument list */
@@ -564,11 +447,7 @@ extern	char	Rpath[1024];	/* return path to sender of message */
 extern	char	rtrnmsg[];	/* "UNDELIVERABLE MAIL being returned by %s" */
 extern	int	sav_errno;
 extern	char	savefile[MAXFILENAME];	/* holds filename of save file */
-#ifdef __STDC__
 extern	void	(*saveint)(int);
-#else
-extern	void	(*saveint)();
-#endif
 extern	char	*seldisp[];
 extern	int	sending;	/* TRUE==>sending mail; FALSE==>printing mail */
 extern	char	m_sendto[1024];
diff --git a/usr/src/cmd/oamuser/lib/prerrno.c b/usr/src/cmd/oamuser/lib/.del-prerrno.c-Sep-20-05
index 2c1cf6297e..2c1cf6297e 100644
--- a/usr/src/cmd/oamuser/lib/prerrno.c
+++ b/usr/src/cmd/oamuser/lib/.del-prerrno.c-Sep-20-05
diff --git a/usr/src/cmd/oamuser/lib/Makefile b/usr/src/cmd/oamuser/lib/Makefile
index 76e852618f..990c85493e 100644
--- a/usr/src/cmd/oamuser/lib/Makefile
+++ b/usr/src/cmd/oamuser/lib/Makefile
@@ -22,8 +22,8 @@
 #
 #ident	"%Z%%M%	%I%	%E% SMI"
 #
-# Copyright (c) 1990-2000 by Sun Microsystems, Inc.
-# All rights reserved.
+# Copyright 2005 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
 #
 # cmd/oamuser/lib/Makefile
 #
@@ -45,7 +45,6 @@ OBJECTS= 	putgrent.o \
 		vproj.o \
 		dates.o \
 		vexpire.o \
-		prerrno.o \
 		putprojent.o \
 		vprojid.o \
 		vprojname.o
diff --git a/usr/src/cmd/oamuser/user/homedir.c b/usr/src/cmd/oamuser/user/homedir.c
index db56c9c885..1551c60125 100644
--- a/usr/src/cmd/oamuser/user/homedir.c
+++ b/usr/src/cmd/oamuser/user/homedir.c
@@ -35,12 +35,12 @@
 #include <stdio.h>
 #include <userdefs.h>
 #include <errno.h>
+#include <strings.h>
 #include "messages.h"
 
 #define 	SBUFSZ	256
 
-extern int mkdir(), chown(), rm_homedir();
-extern char *prerrno();
+extern int rm_homedir();
 
 static char cmdbuf[ SBUFSZ ];	/* buffer for system call */
 
@@ -56,13 +56,13 @@ create_home(char *homedir, char *skeldir, uid_t uid, gid_t gid)
 		/* group id of new user */
 {
 	if( mkdir(homedir, 0775) != 0 ) {
-		errmsg( M_OOPS, "create the home directory", prerrno( errno ) );
+		errmsg(M_OOPS, "create the home directory", strerror(errno));
 		return( EX_HOMEDIR );
 	}
 
 	if( chown(homedir, uid, gid) != 0 ) {
-		errmsg( M_OOPS, "change ownership of home directory", 
-			prerrno( errno ) );
+		errmsg(M_OOPS, "change ownership of home directory", 
+		    strerror(errno));
 		return( EX_HOMEDIR );
 	}
 
@@ -72,8 +72,8 @@ create_home(char *homedir, char *skeldir, uid_t uid, gid_t gid)
 			skeldir, homedir);
 
 		if( system( cmdbuf ) != 0 ) {
-			errmsg( M_OOPS, "copy skeleton directory into home directory",
-				prerrno( errno ) );
+			errmsg(M_OOPS, "copy skeleton directory into home "
+			    "directory", strerror(errno));
 			(void) rm_homedir( homedir );
 			return( EX_HOMEDIR );
 		}
@@ -82,8 +82,8 @@ create_home(char *homedir, char *skeldir, uid_t uid, gid_t gid)
 		(void) sprintf( cmdbuf,"cd %s && find . -exec chown %ld {} \\;",
 			homedir, uid );
 		if( system( cmdbuf ) != 0) {
-			errmsg( M_OOPS, "change owner of files home directory",
-				prerrno( errno ) );
+			errmsg(M_OOPS, "change owner of files home directory",
+			    strerror(errno));
 
 			(void) rm_homedir( homedir );
 			return( EX_HOMEDIR );
@@ -93,8 +93,8 @@ create_home(char *homedir, char *skeldir, uid_t uid, gid_t gid)
 		(void) sprintf( cmdbuf, "cd %s && find . -exec chgrp %ld {} \\;",
 			homedir, gid );
 		if( system( cmdbuf ) != 0) {
-			errmsg( M_OOPS, "change group of files home directory",
-				prerrno( errno ) );
+			errmsg(M_OOPS, "change group of files home directory",
+			    strerror(errno));
 			(void) rm_homedir( homedir );
 			return( EX_HOMEDIR );
 		}
diff --git a/usr/src/cmd/oamuser/user/rmfiles.c b/usr/src/cmd/oamuser/user/rmfiles.c
index 4f005e8d4d..b74af672ba 100644
--- a/usr/src/cmd/oamuser/user/rmfiles.c
+++ b/usr/src/cmd/oamuser/user/rmfiles.c
@@ -24,7 +24,7 @@
 
 
 /*
- * Copyright 2004 Sun Microsystems, Inc.  All rights reserved.
+ * Copyright 2005 Sun Microsystems, Inc.  All rights reserved.
  * Use is subject to license terms.
  */
 
@@ -38,9 +38,6 @@
 
 #define 	SBUFSZ	256
 
-extern int rmdir();
-extern char *prerrno();
-
 static char sptr[SBUFSZ];	/* buffer for system call */
 
 int
diff --git a/usr/src/cmd/oamuser/user/userdel.c b/usr/src/cmd/oamuser/user/userdel.c
index 1bdcfd9e6f..3ae57b83c5 100644
--- a/usr/src/cmd/oamuser/user/userdel.c
+++ b/usr/src/cmd/oamuser/user/userdel.c
@@ -24,7 +24,7 @@
 
 
 /*
- * Copyright 2004 Sun Microsystems, Inc.  All rights reserved.
+ * Copyright 2005 Sun Microsystems, Inc.  All rights reserved.
  * Use is subject to license terms.
  */
 
@@ -43,6 +43,8 @@
 #include <userdefs.h>
 #include <stdlib.h>
 #include <errno.h>
+#include <unistd.h>
+#include <strings.h>
 #include "users.h"
 #include "messages.h"
 #include "funcs.h"
@@ -57,13 +59,9 @@
  *	login - a string of printable chars except colon (:)
  ******************************************************************************/
 
-extern char *prerrno();
 extern int check_perm(), isbusy();
 extern int rm_files(), call_passmgmt(), edit_group();
 
-extern char *optarg;		/* used by getopt */
-extern int optind, opterr;	/* used by getopt */
-
 static char *logname;			/* login name to delete */
 static char *nargv[20];		/* arguments for execvp of passmgmt */
 
@@ -159,8 +157,8 @@ main(int argc, char **argv)
 	if( rflag ) {
 		/* Check Permissions */
 		if( stat( pstruct->pw_dir, &statbuf ) ) {
-			errmsg( M_OOPS, "find status about home directory", 
-				prerrno( errno ) );
+			errmsg(M_OOPS, "find status about home directory", 
+			    strerror(errno));
 			exit( EX_HOMEDIR );
 		}
 			
diff --git a/usr/src/cmd/sa/timex.c b/usr/src/cmd/sa/timex.c
index 8bc07f062f..d31f514418 100644
--- a/usr/src/cmd/sa/timex.c
+++ b/usr/src/cmd/sa/timex.c
@@ -63,8 +63,6 @@ main(int argc, char **argv)
 	time_t	before, after;
 	char	stime[9], etime[9];
 	char	cmd[80];
-	extern	char	*optarg;
-	extern	int	optind;
 	int	pflg = 0, sflg = 0, oflg = 0;
 	char	aopt[25];
 	FILE	*pipin;
diff --git a/usr/src/cmd/syslogd/syslogd.c b/usr/src/cmd/syslogd/syslogd.c
index 45de24f28a..c5230ba4ed 100644
--- a/usr/src/cmd/syslogd/syslogd.c
+++ b/usr/src/cmd/syslogd/syslogd.c
@@ -3357,7 +3357,7 @@ cfline(char *line, int lineno, struct filed *f)
 
 	DPRINT2(1, "cfline(%u): (%s)\n", mythreadno, line);
 
-	errno = 0;	/* keep sys_errlist stuff out of logerror messages */
+	errno = 0;	/* keep errno related stuff out of logerror messages */
 
 	/* clear out file entry */
 	bzero((char *)f, sizeof (*f));
diff --git a/usr/src/cmd/tbl/te.c b/usr/src/cmd/tbl/te.c
index b5bcb47b8e..56ad4e102d 100644
--- a/usr/src/cmd/tbl/te.c
+++ b/usr/src/cmd/tbl/te.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 2003 Sun Microsystems, Inc.  All rights reserved.
+ * Copyright 2005 Sun Microsystems, Inc.  All rights reserved.
  * Use is subject to license terms.
  */
 
@@ -15,37 +15,18 @@
 #pragma ident	"%Z%%M%	%I%	%E% SMI"
 
  /* te.c: error message control, input line count */
-# include "t..c"
-# include <locale.h>
-# include <errno.h>
+#include "t..c"
+#include <locale.h>
+#include <errno.h>
+#include <unistd.h>
+#include <string.h>
 
 void
 error(char *s)
 {
-fprintf(stderr, gettext("\n%s: line %d: %s\n"), ifile, iline, s);
-# ifdef unix
-fprintf(stderr, gettext("tbl quits\n"));
-exit(1);
-# endif
-# ifdef gcos
-fprintf(stderr, "run terminated due to error condition detected by tbl preprocessor\n");
-exit(0);
-# endif
-}
-
-char *
-errmsg(int errnum)
-{
-extern int sys_nerr;
-extern char *sys_errlist[];
-static char errmsgbuf[18];
-if (errnum > sys_nerr)
-	{
-	sprintf(errmsgbuf, "Error %d", errnum);
-	return (errmsgbuf);
-	}
-else
-	return (sys_errlist[errnum]);
+	(void) fprintf(stderr, gettext("\n%s: line %d: %s\n"), ifile, iline, s);
+	(void) fprintf(stderr, gettext("tbl quits\n"));
+	exit(1);
 }
 
 char *
@@ -64,17 +45,17 @@ while(len > 0)
 
 	while (*s) s++;
 	s--;
-	if (*s == '\n') *s-- =0;
-	else
-		{
-		if (!feof(tabin))
-			{
+	if (*s == '\n') {
+		*s-- = '\0';
+	} else {
+		if (!feof(tabin)) {
 			if (ferror(tabin))
-				error(errmsg(errno));
+				error(strerror(errno));
 			else
 				error(gettext("Line too long"));
-			}
 		}
+	}
+
 	for(nbl=0; *s == '\\' && s>p; s--)
 		nbl++;
 	if (linstart && nbl % 2) /* fold escaped nl if in table */
diff --git a/usr/src/cmd/time/time.c b/usr/src/cmd/time/time.c
index 69858f2f96..f1a7881d3a 100644
--- a/usr/src/cmd/time/time.c
+++ b/usr/src/cmd/time/time.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.
  */
 
@@ -61,14 +61,12 @@ static char *nsep = "\0\0.\0 \0 \0\0";
 
 static void usage(void);
 static void printt(char *, clock_t);
-extern char *sys_errlist[];
 
 int
 main(int argc, char **argv)
 {
 	struct tms	buffer;
 	pid_t		p;
-	extern int	errno;
 	int		status;
 	int		pflag		= 0;
 	int		c;
diff --git a/usr/src/cmd/ttymon/ulockf.c b/usr/src/cmd/ttymon/ulockf.c
index 5390f83e3b..f4c916ab76 100644
--- a/usr/src/cmd/ttymon/ulockf.c
+++ b/usr/src/cmd/ttymon/ulockf.c
@@ -21,9 +21,13 @@
  */
 /*	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 "uucp.h"
 
@@ -315,7 +319,7 @@ char *tempfile, *name;
 	(void) chown(tempfile, UUCPUID, UUCPGID);
 	(void) close(fd);
 	if(link(tempfile,name)<0){
-		DEBUG(4, "%s: ", sys_errlist[errno]);
+		DEBUG(4, "%s: ", strerror(errno));
 		DEBUG(4, "link(%s, ", tempfile);
 		DEBUG(4, "%s)\n", name);
 		if(unlink(tempfile)< 0){
diff --git a/usr/src/cmd/ttymon/uucp.h b/usr/src/cmd/ttymon/uucp.h
index 2432a4eaf1..b05bbdc6a0 100644
--- a/usr/src/cmd/ttymon/uucp.h
+++ b/usr/src/cmd/ttymon/uucp.h
@@ -21,13 +21,21 @@
  */
 /*	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.
+ */
 
 
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
-
 #ifndef _UUCP_H
 #define _UUCP_H
 
+#pragma ident	"%Z%%M%	%I%	%E% SMI"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 #include <unistd.h>
 #include <stdlib.h>
 #include <string.h>
@@ -461,7 +469,6 @@ EXTERN char Myname[];
 EXTERN char Progname[];
 EXTERN char RemSpool[];
 EXTERN char *Bnptr;		/* used when BASENAME macro is expanded */
-extern char *sys_errlist[];
 EXTERN int SizeCheck;		/* ulimit check supported flag */
 EXTERN long RemUlimit;		/* remote ulimit if supported */
 EXTERN int Restart;		/* checkpoint restart supported flag */
@@ -470,10 +477,6 @@ EXTERN char Jobid[];		/* Jobid of current C. file */
 EXTERN int Uerror;		/* global error code */
 EXTERN char *UerrorText[];	/* text for error code */
 
-/*	Some global I need for section 2 and section 3 routines */
-extern char *optarg;	/* for getopt() */
-extern int optind;	/* for getopt() */
-
 #define UERRORTEXT		UerrorText[Uerror]
 #define UTEXT(x)		UerrorText[x]
 
@@ -609,4 +612,8 @@ EXTERN char *Ct_CLOSE;
 EXTERN char *Ct_BADOWN;
 EXTERN char *Fl_EXISTS;
 
+#ifdef __cplusplus
+}
 #endif
+
+#endif /* _UUCP_H */
diff --git a/usr/src/cmd/vi/port/ex.h b/usr/src/cmd/vi/port/ex.h
index 257623ad4c..1240651f39 100644
--- a/usr/src/cmd/vi/port/ex.h
+++ b/usr/src/cmd/vi/port/ex.h
@@ -26,11 +26,19 @@
 /* Copyright (c) 1981 Regents of the University of California */
 
 /*
- * Copyright (c) 2000 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.34	*/
+#ifndef	_EX_H
+#define	_EX_H
+
+#pragma ident	"%Z%%M%	%I%	%E% SMI"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 /*
  * This file contains most of the declarations common to a large number
  * of routines.  The file ex_vis.h contains declarations
@@ -50,6 +58,7 @@
  * is much more carefully documented, and still rough in spots.
  *
  */
+
 #ifdef UCBV7
 #include <whoami.h>
 #endif
@@ -108,8 +117,6 @@ var char *exit_bold;		/* string to exit standout mode */
 #define CBREAK xxxxx
 #endif
 
-extern	int errno;
-
 #ifndef VMUNIX
 typedef	short	line;
 #else
@@ -396,7 +403,6 @@ int	(*wdbdg)(wchar_t, wchar_t, int);	/* tells word binding force */
 wchar_t	*(*wddlm)(wchar_t, wchar_t, int);	/* tells desired delimiter */
 wchar_t	(*mcfllr)(void);	/* tells multicolumn filler character */
 #endif /* PRESUNEUC */
-char	*sbrk();
 line	*address();
 unsigned char	*cgoto();
 unsigned char	*genindent();
@@ -408,8 +414,6 @@ unsigned char	*place();
 unsigned char	*plural();
 line	*scanfor();
 line	*setin();
-unsigned char	*strcat();
-unsigned char	*strcpy();
 unsigned char	*strend();
 unsigned char	*tailpath();
 char	*tgetstr();
@@ -425,7 +429,6 @@ int	put();
 int	putreg();
 int	YANKreg();
 int	delete();
-int	execlp();
 int	vi_filter();
 int	getfile();
 int	getsub();
@@ -479,3 +482,9 @@ int	yank();
 unsigned char *lastchr();
 unsigned char *nextchr();
 bool putoctal;
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* _EX_H */
diff --git a/usr/src/cmd/vi/port/exrecover.c b/usr/src/cmd/vi/port/exrecover.c
index 99918a5c49..22097fd290 100644
--- a/usr/src/cmd/vi/port/exrecover.c
+++ b/usr/src/cmd/vi/port/exrecover.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.
 */
 
@@ -29,7 +29,7 @@
 
 
 /* Copyright (c) 1981 Regents of the University of California */
-#ident	"%Z%%M%	%I%	%E% SMI"	/* SVr4.0 1.28	*/
+#pragma ident	"%Z%%M%	%I%	%E% SMI"
 
 #include <stdio.h>	/* BUFSIZ: stdio = 1024, VMUNIX = 1024 */
 #ifndef TRACE
@@ -43,6 +43,9 @@
 #include <pwd.h>
 #include <locale.h>
 #include <dirent.h>
+#include <unistd.h>
+#include <errno.h>
+
 #define DIRSIZ	MAXNAMLEN
 
 short tfile = -1;	/* ditto */
@@ -67,7 +70,6 @@ short tfile = -1;	/* ditto */
  * Change both if you change either.
  */
 unsigned char	mydir[PATH_MAX+1];
-struct	passwd *getpwuid();
 
 /*
  * Limit on the number of printed entries
@@ -75,12 +77,11 @@ struct	passwd *getpwuid();
  */
 #define	NENTRY	50
 
-extern void setbuf();
 unsigned char	nb[BUFSIZE];
 int	vercnt;			/* Count number of versions of file found */
-main(argc, argv)
-	int argc;
-	unsigned char *argv[];
+
+int
+main(int argc, unsigned char *argv[])
 {
 	unsigned char string[50];
 	register unsigned char *cp;
@@ -88,7 +89,6 @@ main(argc, argv)
 	register int rflg = 0, errflg = 0;
 	int label;
 	line *tmpadr;
-	extern int optind;
 	extern unsigned char *mypass();
 	struct passwd *pp = getpwuid(getuid());
 	unsigned char rmcmd[PATH_MAX+1];
@@ -247,7 +247,7 @@ main(argc, argv)
 	 * ever edits with temporaries in "." anyways.
 	 */
 	if (nb[0] == '/') {
-		(void)unlink(nb);
+		(void)unlink((const char *)nb);
 		sprintf((char *)rmcmd, "rmdir %s 2> /dev/null", (char *)mydir);
 		system((char *)rmcmd);
 	}
@@ -312,7 +312,7 @@ listfiles(dirname)
 		fprintf(stderr,gettext("No files saved.\n"));
 		return;
 	}
-	if (chdir(dirname) < 0) {
+	if (chdir((const char *)dirname) < 0) {
 		perror((char *)dirname);
 		return;
 	}
@@ -472,7 +472,7 @@ findtmp(dir)
 	 * (actually the user's "directory" option).
 	 */
 	searchdir(dir);
-	if (chdir(mydir) == 0)
+	if (chdir((const char *)mydir) == 0)
 		searchdir(mydir);
 	if (bestfd != -1) {
 		/*
@@ -811,21 +811,15 @@ blkio(b, buf, iofcn)
 
 syserror()
 {
-	extern int sys_nerr;
-	extern unsigned char *sys_errlist[];
+	int save_err = errno;
 
 	dirtcnt = 0;
 	write(2, " ", 1);
-	if (errno >= 0 && errno <= sys_nerr)
-		error(sys_errlist[errno]);
-	else
-		error(gettext("System error %d"), errno);
+	error(strerror(save_err));
 	exit(1);
 }
 
 extern findiop();
-extern int kill(), ioctl(); 
-extern pid_t getpid();
 static int intrupt;
 
 unsigned char *
diff --git a/usr/src/cmd/volmgt/rmm/rmm_util.c b/usr/src/cmd/volmgt/rmm/rmm_util.c
index 4b28f6f9fa..4133c470a9 100644
--- a/usr/src/cmd/volmgt/rmm/rmm_util.c
+++ b/usr/src/cmd/volmgt/rmm/rmm_util.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.
  */
 
@@ -241,8 +241,7 @@ dprintf(const char *fmt, ...)
 	va_list		ap;
 	const char	*p;
 	char		msg[BUFSIZ];
-	extern char	*sys_errlist[];
-	char		*errmsg = sys_errlist[errno];
+	char		*errmsg = strerror(errno);
 	char		*s;
 
 
diff --git a/usr/src/cmd/volmgt/util/eject.c b/usr/src/cmd/volmgt/util/eject.c
index 9199eda9e6..5e986a2d7c 100644
--- a/usr/src/cmd/volmgt/util/eject.c
+++ b/usr/src/cmd/volmgt/util/eject.c
@@ -27,7 +27,7 @@
 #pragma ident	"%Z%%M%	%I%	%E% SMI"
 
 /*
- * Program to eject oen or more pieces of media.
+ * Program to eject one or more pieces of media.
  */
 
 #include	<stdio.h>
@@ -455,7 +455,7 @@ ejectit(char *name, bool_t volmgt_is_running)
 		absname = path;
 
 	volume_is_not_managed = !volmgt_is_running ||
-		(!volmgt_ownspath(absname) && volmgt_symname(name) == NULL);
+	    (!volmgt_ownspath(absname) && volmgt_symname(name) == NULL);
 
 	/*
 	 * If volume management is either not running or not being managed by
@@ -471,12 +471,12 @@ ejectit(char *name, bool_t volmgt_is_running)
 			if (!force_eject) {
 				(void) fprintf(stderr,
 gettext("WARNING: can not unmount %s, the file system is (probably) busy\n"),
-					name);
+				    name);
 				return (EJECT_PARM_ERR);
 			} else {
 				(void) fprintf(stderr,
 gettext("WARNING: %s has a mounted filesystem, ejecting anyway\n"),
-					name);
+				    name);
 			}
 		}
 	}
@@ -699,7 +699,6 @@ display_busy(char *path, bool_t vm_running)
 {
 	int		errno_save = errno;	/* to save errno */
 	char		*blk;			/* block name */
-	extern char	*sys_errlist[];		/* see perror(3) */
 	FILE		*fp = NULL;		/* for scanning mnttab */
 	struct mnttab	mref;			/* for scanning mnttab */
 	struct mnttab	mp;			/* for scanning mnttab */
@@ -760,7 +759,7 @@ display_busy(char *path, bool_t vm_running)
 		if (strncmp(busy_base, mp.mnt_special, bblen) == 0) {
 			res = TRUE;
 			(void) fprintf(stderr, "%s: %s\n", mp.mnt_special,
-			    sys_errlist[EBUSY]);
+			    strerror(EBUSY));
 		}
 	}
 
@@ -1230,8 +1229,7 @@ eject_getfullblkname(char *path, bool_t vm_running)
 		/* see if we have a raw volmgt pathname (e.g. "/vol/r*") */
 		if (strncmp(path, raw_root, raw_root_len) == 0) {
 			if (snprintf(res_buf, sizeof (res_buf), "%s/%s",
-				vm_root, path + raw_root_len)
-				>= sizeof (res_buf)) {
+			    vm_root, path + raw_root_len) >= sizeof (res_buf)) {
 				return (NULL);
 			}
 			goto dun;		/* found match in /vol */
@@ -1244,8 +1242,7 @@ eject_getfullblkname(char *path, bool_t vm_running)
 		/* see if we have a raw volmgt pathname (e.g. "/vol/dev/r*") */
 		if (strncmp(path, raw_root, raw_root_len) == 0) {
 			if (snprintf(res_buf, sizeof (res_buf), "%s/dev/%s",
-				vm_root, path + raw_root_len)
-				>= sizeof (res_buf)) {
+			    vm_root, path + raw_root_len) >= sizeof (res_buf)) {
 				return (NULL);
 			}
 			goto dun;		/* found match in /vol/dev */
diff --git a/usr/src/cmd/volmgt/vold/vold_err.c b/usr/src/cmd/volmgt/vold/vold_err.c
index 83a36c03c6..357ab8928a 100644
--- a/usr/src/cmd/volmgt/vold/vold_err.c
+++ b/usr/src/cmd/volmgt/vold/vold_err.c
@@ -20,8 +20,8 @@
  * CDDL HEADER END
  */
 /*
- * Copyright (c) 1995-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"
@@ -46,12 +46,10 @@
 #define	ER_SYSLOG	0x2
 #define	ER_NOSTAMP	0x4
 
-static void	errmsg(int, u_int, char *, const char *, va_list);
+static void	errmsg(int, uint_t, char *, const char *, va_list);
 
 static FILE	*logfile;
 
-extern char	*sys_errlist[];			/* should use strerror(3C) ? */
-
 static mutex_t	err_mutex;
 
 #define	FATALMSG	"fatal: "
@@ -209,7 +207,7 @@ info(const char *fmt, ...)
 
 
 void
-debug(u_int level, const char *fmt, ...)
+debug(uint_t level, const char *fmt, ...)
 {
 	extern int	debug_level;
 	va_list		ap;
@@ -285,7 +283,7 @@ failass(char *a, char *f, int l)
 }
 
 static void
-errmsg(int err, u_int flags, char *tag, const char *fmt, va_list ap)
+errmsg(int err, uint_t flags, char *tag, const char *fmt, va_list ap)
 {
 	const char	*p;
 	char		msg[BUFSIZ];
@@ -303,11 +301,7 @@ errmsg(int err, u_int flags, char *tag, const char *fmt, va_list ap)
 		logfile = stderr;
 	}
 
-	if ((err > ESTALE) || (err < 0)) {
-		errmsg = "Bad errno";
-	} else {
-		errmsg = sys_errlist[err];
-	}
+	errmsg = strerror(err);
 
 	(void) memset(msg, 0, BUFSIZ);
 
diff --git a/usr/src/cmd/who/who.c b/usr/src/cmd/who/who.c
index 9901487174..07533927be 100644
--- a/usr/src/cmd/who/who.c
+++ b/usr/src/cmd/who/who.c
@@ -98,9 +98,6 @@ static void process(void);
 static void ck_file(char *);
 static void dump(void);
 
-extern char *optarg;		/* for getopt()			*/
-extern int optind;		/* for getopt()			*/
-extern char *sys_errlist[];	/* error msgs for errno    */
 static struct	utmpx *utmpp;	/* pointer for getutxent()	*/
 
 /*
diff --git a/usr/src/cmd/ypcmd/yppush.c b/usr/src/cmd/ypcmd/yppush.c
index 441e546763..303985420f 100644
--- a/usr/src/cmd/ypcmd/yppush.c
+++ b/usr/src/cmd/ypcmd/yppush.c
@@ -19,7 +19,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.
  *
  * Copyright (c) 1983, 1984, 1985, 1986, 1987, 1988, 1989 AT&T
@@ -253,8 +253,6 @@ extern int yp_getalias(char *key, char *key_alias, int maxlen);
 extern int getdomainname(char *, int);
 
 extern struct rpc_createerr rpc_createerr;
-extern char *sys_errlist[];
-extern int sys_nerr;
 extern CLIENT *__yp_clnt_create_rsvdport();
 
 int
diff --git a/usr/src/lib/libcrypt/inc/synonyms.h b/usr/src/lib/libcrypt/inc/synonyms.h
index 8eb72192a7..609c19e9f1 100644
--- a/usr/src/lib/libcrypt/inc/synonyms.h
+++ b/usr/src/lib/libcrypt/inc/synonyms.h
@@ -24,7 +24,7 @@
 
 
 /*
- * Copyright 2003 Sun Microsystems, Inc.  All rights reserved.
+ * Copyright 2005 Sun Microsystems, Inc.  All rights reserved.
  * Use is subject to license terms.
  */
 
@@ -372,8 +372,6 @@ extern "C" {
 #define	symlink		_symlink
 #define	sync		_sync
 #define	sys3b		_sys3b
-#define	sys_errlist	_sys_errlist
-#define	sys_nerr	_sys_nerr
 #define	syscall		_syscall
 #define	sysconf		_sysconf
 #define	sysfs		_sysfs
diff --git a/usr/src/lib/libcurses/screen/synonyms.h b/usr/src/lib/libcurses/screen/synonyms.h
index 51d1e96b31..c3d1229c31 100644
--- a/usr/src/lib/libcurses/screen/synonyms.h
+++ b/usr/src/lib/libcurses/screen/synonyms.h
@@ -24,7 +24,7 @@
 
 
 /*
- * Copyright 2003 Sun Microsystems, Inc.  All rights reserved.
+ * Copyright 2005 Sun Microsystems, Inc.  All rights reserved.
  * Use is subject to license terms.
  */
 
@@ -364,8 +364,6 @@ extern "C" {
 #define	symlink		_symlink
 #define	sync		_sync
 #define	sys3b		_sys3b
-#define	sys_errlist	_sys_errlist
-#define	sys_nerr	_sys_nerr
 #define	syscall		_syscall
 #define	sysconf		_sysconf
 #define	sysfs		_sysfs
diff --git a/usr/src/lib/libgen/inc/synonyms.h b/usr/src/lib/libgen/inc/synonyms.h
index 2d943a16de..1d2450f2f4 100644
--- a/usr/src/lib/libgen/inc/synonyms.h
+++ b/usr/src/lib/libgen/inc/synonyms.h
@@ -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.
  */
 
@@ -396,8 +396,6 @@ extern "C" {
 #define	symlink		_symlink
 #define	sync		_sync
 #define	sys3b		_sys3b
-#define	sys_errlist	_sys_errlist
-#define	sys_nerr	_sys_nerr
 #define	syscall		_syscall
 #define	sysconf		_sysconf
 #define	sysfs		_sysfs
diff --git a/usr/src/lib/libmail/inc/synonyms.h b/usr/src/lib/libmail/inc/synonyms.h
index a0f7cd54c8..099190faf5 100644
--- a/usr/src/lib/libmail/inc/synonyms.h
+++ b/usr/src/lib/libmail/inc/synonyms.h
@@ -439,8 +439,6 @@ extern "C" {
 #define	sync		_sync
 #define	synchutmp	_synchutmp
 #define	syssun		_syssun
-#define	sys_errlist	_sys_errlist
-#define	sys_nerr	_sys_nerr
 #define	syscall		_syscall
 #define	sysconf		_sysconf
 #define	sysfs		_sysfs
diff --git a/usr/src/lib/libnsl/dial/uucp.h b/usr/src/lib/libnsl/dial/uucp.h
index 669168d430..e2ccffe365 100644
--- a/usr/src/lib/libnsl/dial/uucp.h
+++ b/usr/src/lib/libnsl/dial/uucp.h
@@ -404,15 +404,10 @@ static const char *Spool;
 static const char *Pubdir;
 static char Progname[];
 static char *Bnptr;		/* used when BASENAME macro is expanded */
-extern char *sys_errlist[];
 
 static int Uerror;		/* global error code */
 static char *UerrorText[];	/* text for error code */
 
-/*	Some global I need for section 2 and section 3 routines */
-extern char *optarg;	/* for getopt() */
-extern int optind;	/* for getopt() */
-
 #define	UERRORTEXT		UerrorText[Uerror]
 #define	UTEXT(x)		UerrorText[x]
 
diff --git a/usr/src/lib/libresolv/synonyms.h b/usr/src/lib/libresolv/synonyms.h
index 6523a38db7..e1063aec22 100644
--- a/usr/src/lib/libresolv/synonyms.h
+++ b/usr/src/lib/libresolv/synonyms.h
@@ -423,8 +423,6 @@ extern "C" {
 #define	sync		_sync
 #define	synchutmp	_synchutmp
 #define	syssun		_syssun
-#define	sys_errlist	_sys_errlist
-#define	sys_nerr	_sys_nerr
 #define	syscall		_syscall
 #define	sysconf		_sysconf
 #define	sysfs		_sysfs
diff --git a/usr/src/ucblib/libucb/port/gen/synonyms.h b/usr/src/ucblib/libucb/port/gen/synonyms.h
index 4b1c33503b..7ac3fbaf71 100644
--- a/usr/src/ucblib/libucb/port/gen/synonyms.h
+++ b/usr/src/ucblib/libucb/port/gen/synonyms.h
@@ -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.
  */
 
@@ -365,8 +365,6 @@ extern "C" {
 #define	synchutmp	_synchutmp
 #define	sys3b		_sys3b
 #define	sysi86		_sysi86
-#define	sys_errlist	_sys_errlist
-#define	sys_nerr	_sys_nerr
 #define	sysconf		_sysconf
 #define	sysfs		_sysfs
 #define	sysinfo		_sysinfo