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

diff --git a/util/nmem.c b/util/nmem.c
index 8415772..24225c7 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.42 2003-09-16 19:46:56 adam Exp $
  */
 
 /*
@@ -452,7 +452,7 @@ void yaz_strerror(char *buf, int max)
 		FORMAT_MESSAGE_FROM_SYSTEM,
 		NULL,
 		err,
-		MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT), // Default language
+		MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT), /* Default lang */
 		(LPTSTR) buf,
 		max-1,
 		NULL);
@@ -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';