X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=util%2Fnmem.c;h=b546b8fa95051f569f4f8bb77104b8d432acd7a6;hb=cfd0664043248f6e52ffa6265a0c430658d04370;hp=8415772319d2488afaf0dfff47cd7cebfa60f7fa;hpb=4d531a1a9131d69c3b6c27fbac42837e22cff61c;p=yaz-moved-to-github.git

diff --git a/util/nmem.c b/util/nmem.c
index 8415772..b546b8f 100644
--- a/util/nmem.c
+++ b/util/nmem.c
@@ -3,7 +3,7 @@
  * See the file LICENSE for details.
  * Sebastian Hammer, Adam Dickmeiss
  *
- * $Id: nmem.c,v 1.39 2003-01-06 08:20:28 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';