sync with HEAD

[openldap] / include / ac / errno.h

diff --git a/include/ac/errno.h b/include/ac/errno.h
index 3d9b6b22dafdeff551348c35b0c96caa4e925491..e1b7168cacaa2352f68ed106d0aac918226ea47d 100644 (file)
--- a/include/ac/errno.h
+++ b/include/ac/errno.h
@@ -1,13 +1,17 @@
 /* Generic errno.h */
 /* $OpenLDAP$ */
-/*
- * Copyright 1998,1999 The OpenLDAP Foundation, Redwood City, California, USA
+/* This work is part of OpenLDAP Software <http://www.openldap.org/>.
+ *
+ * Copyright 1998-2004 The OpenLDAP Foundation.
  * All rights reserved.
  *
- * Redistribution and use in source and binary forms are permitted only
- * as authorized by the OpenLDAP Public License.  A copy of this
- * license is available at http://www.OpenLDAP.org/license.html or
- * in file LICENSE in the top-level directory of the distribution.
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted only as authorized by the OpenLDAP
+ * Public License.
+ *
+ * A copy of this license is available in file LICENSE in the
+ * top-level directory of the distribution or, alternatively, at
+ * <http://www.OpenLDAP.org/license.html>.
  */
 
 #ifndef _AC_ERRNO_H
@@ -23,17 +27,29 @@
        /* no sys_errlist */
 #      define          sys_nerr        0
 #      define          sys_errlist     ((char **)0)
-#elif DECL_SYS_ERRLIST 
+#elif DECL_SYS_ERRLIST
        /* have sys_errlist but need declaration */
-       LIBC_F (int)      sys_nerr;
-       LIBC_F (char)    *sys_errlist[];
+       LDAP_LIBC_V(int)      sys_nerr;
+       LDAP_LIBC_V(char)    *sys_errlist[];
 #endif
 
-#ifdef HAVE_STRERROR
-#define        STRERROR(err)   strerror(err)
+#undef _AC_ERRNO_UNKNOWN
+#define _AC_ERRNO_UNKNOWN "unknown error"
+
+#ifdef HAVE_SYS_ERRLIST
+       /* this is thread safe */
+#      define  STRERROR(e) ( (e) > -1 && (e) < sys_nerr \
+                       ? sys_errlist[(e)] : _AC_ERRNO_UNKNOWN )
+
+#elif defined( HAVE_STRERROR )
+       /* this may not be thread safe */
+       /* and, yes, some implementations of strerror may return NULL */
+#      define  STRERROR(e) ( strerror(e) \
+               ? strerror(e) : _AC_ERRNO_UNKNOWN )
+
 #else
-#define        STRERROR(err) \
-       ((err) > -1 && (err) < sys_nerr ? sys_errlist[(err)] : "unknown")
+       /* this is thread safe */
+#      define  STRERROR(e) ( _AC_ERRNO_UNKNOWN )
 #endif
 
 #endif /* _AC_ERRNO_H */