File vrfy_990522-strerror.diff of Package vrfy

--- port.h
+++ port.h
@@ -37,18 +37,6 @@
 #endif
 
 /*
-** Special definitions for certain platforms.
-*/
-
-#if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__)
-#define ERRLIST_DEFINED		/* don't declare sys_errlist */
-#endif
-
-#if defined(linux) || defined(__bsdi__)
-#define ERRLIST_DEFINED		/* don't declare sys_errlist */
-#endif
-
-/*
 ** Distinguish between various BIND releases.
 */
 
--- stat.c
+++ stat.c
@@ -24,11 +24,6 @@
 
 #include "vrfy.h"
 
-#if !defined(ERRLIST_DEFINED)
-extern char *sys_errlist[];
-extern int sys_nerr;
-#endif
-
 extern int SmtpErrno;		/* saved errno from system calls */
 extern char *SmtpPhase;		/* connection state message */
 extern char *CurHostName;	/* remote host that is being contacted */
@@ -117,7 +112,7 @@
 		if (err == ECONNRESET)
 			(void) strcpy(buf, "Connection reset");
 		else
-			(void) strcpy(buf, sys_errlist[err]);
+			(void) strcpy(buf, strerror(err));
 		if (SmtpPhase != NULL)
 		{
 			(void) strcat(buf, " during ");
@@ -146,11 +141,7 @@
 		return(buf);
 	}
 
-	if (err > 0 && err < sys_nerr)
-		return((char *)sys_errlist[err]);
-
-	(void) sprintf(buf, "Error %d", err);
-	return(buf);
+	return strerror(err);
 }
 
 /*
--- vrfy.h
+++ vrfy.h
@@ -16,6 +16,7 @@
 #include <stdio.h>
 #include <ctype.h>
 #include <errno.h>
+#include <string.h>
 #include <signal.h>
 #include <setjmp.h>