Fix sample PQF

[yaz-moved-to-github.git] / util / nmem.c

diff --git a/util/nmem.c b/util/nmem.c
index 75cbd20..24225c7 100644 (file)
--- 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.37 2002-09-25 12:37:07 adam Exp $
+ * $Id: nmem.c,v 1.42 2003-09-16 19:46:56 adam Exp $
  */
 
 /*
@@ -440,3 +440,44 @@ void yaz_set_errno(int v)
 {
     errno = v;
 }
+
+void yaz_strerror(char *buf, int max)
+{
+    char *cp;
+#ifdef WIN32
+    DWORD err = GetLastError();
+    if (err)
+    {
+        FormatMessage(
+               FORMAT_MESSAGE_FROM_SYSTEM,
+               NULL,
+               err,
+               MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT), /* Default lang */
+               (LPTSTR) buf,
+               max-1,
+               NULL);
+    }
+    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';
+    if ((cp=strrchr(buf, '\r')))
+       *cp = '\0';
+}