X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=util%2Fnmem.c;h=b546b8fa95051f569f4f8bb77104b8d432acd7a6;hb=b258a14997c70bf78310b2e094eb6bcf14b26a55;hp=f91ecc15bb6800d5764904f86882df0d04a31744;hpb=79b486cea07c6352407a289d3b4b9a8545b470e6;p=yaz-moved-to-github.git

diff --git a/util/nmem.c b/util/nmem.c
index f91ecc1..b546b8f 100644
--- a/util/nmem.c
+++ b/util/nmem.c
@@ -1,9 +1,9 @@
 /*
- * Copyright (c) 1995-2002, Index Data.
+ * Copyright (c) 1995-2003, Index Data.
  * See the file LICENSE for details.
  * Sebastian Hammer, Adam Dickmeiss
  *
- * $Id: nmem.c,v 1.38 2002-12-05 12:19:24 adam Exp $
+ * $Id: nmem.c,v 1.41 2003-02-22 00:08:44 adam Exp $
  */
 
 /*
@@ -460,11 +460,21 @@ void yaz_strerror(char *buf, int max)
     else
 	*buf = '\0';
 #else
+/* UNIX */
+#if HAVE_STRERROR_R
 #if YAZ_POSIX_THREADS
+    *buf = '\0';
     strerror_r(errno, buf, max);
+    /* if buffer is unset - use strerror anyway (GLIBC bug) */
+    if (*buf == '\0')
+        strcpy(buf, strerror(yaz_errno()));
 #else
     strcpy(buf, strerror(yaz_errno()));
 #endif
+#else
+    strcpy(buf, strerror(yaz_errno()));
+#endif
+/* UNIX */
 #endif
     if ((cp=strrchr(buf, '\n')))
 	*cp = '\0';