From: Derrick Brashear <shadow@dementia.org>
Date: Fri, 25 Jul 2003 05:40:14 +0000 (+0000)
Subject: STABLE12-use-strerror-if-available-20030725
X-Git-Tag: openafs-stable-1_2_10~6
X-Git-Url: https://git.michaelhowe.org/gitweb/?a=commitdiff_plain;h=df038a87592b1560bb9e90d8f7bbbfce325044e3;p=packages%2Fo%2Fopenafs.git

STABLE12-use-strerror-if-available-20030725


discover and use strerror instead of sys_errlist and sys_nerr.


(cherry picked from commit 7356b6696e7b22f0d130fe27ef6233bc251b9a0d)
---

diff --git a/acinclude.m4 b/acinclude.m4
index 870ecd3d6..b6e2bf20b 100644
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -694,7 +694,7 @@ fi
 AC_SUBST(HAVE_PAM)
 
 AC_CHECK_FUNCS(utimes random srandom getdtablesize snprintf re_comp re_exec)
-AC_CHECK_FUNCS(setprogname getprogname sigaction mkstemp)
+AC_CHECK_FUNCS(setprogname getprogname sigaction mkstemp strerror)
 AC_CHECK_TYPE(ssize_t, int)
 
 AC_CHECK_FUNCS(timegm)
diff --git a/src/pinstall/install.c b/src/pinstall/install.c
index 43f9b60c8..476a2dad4 100644
--- a/src/pinstall/install.c
+++ b/src/pinstall/install.c
@@ -85,12 +85,18 @@ RCSID("$Header$");
 
 struct stat istat, ostat;
 
+/* How many systems don't have strerror now? */
+#ifndef HAVE_STRERROR
 #if !defined(AFS_DARWIN60_ENV)
 extern int sys_nerr;
 #endif
 #if !defined(AFS_LINUX20_ENV) && !defined(AFS_DARWIN_ENV) && !defined(AFS_FBSD_ENV)
 extern char *sys_errlist[];
 #endif
+#else
+#define ErrorString strerror
+#endif
+
 #if	defined(AFS_AIX_ENV) || defined(AFS_HPUX_ENV) || defined(AFS_SUN5_ENV) || defined(AFS_DECOSF_ENV) || defined(AFS_SGI_ENV) || defined(AFS_LINUX20_ENV) || defined(AFS_DARWIN_ENV) || defined(AFS_XBSD_ENV)
 extern struct passwd *getpwnam();
 int stripcalled = 0;
@@ -123,6 +129,7 @@ static char *strrpbrk (s, set)
     return 0;
 }
 
+#ifndef HAVE_STRERROR
 char *ErrorString(aerrno)
     int aerrno; {
     static char tbuffer[100];
@@ -133,6 +140,7 @@ char *ErrorString(aerrno)
     }
     return tbuffer;
 }
+#endif
 
 int
 stripName(aname)