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

diff --git a/util/nmem.c b/util/nmem.c
index 9545471..b546b8f 100644
--- a/util/nmem.c
+++ b/util/nmem.c
@@ -1,9 +1,9 @@
 /*
- * Copyright (c) 1995-2001, Index Data.
+ * Copyright (c) 1995-2003, Index Data.
  * See the file LICENSE for details.
  * Sebastian Hammer, Adam Dickmeiss
  *
- * $Id: nmem.c,v 1.35 2002-06-12 19:42:38 adam Exp $
+ * $Id: nmem.c,v 1.41 2003-02-22 00:08:44 adam Exp $
  */
 
 /*
@@ -16,6 +16,7 @@
 
 #include <assert.h>
 #include <string.h>
+#include <errno.h>
 #include <yaz/xmalloc.h>
 #include <yaz/nmem.h>
 #include <yaz/log.h>
@@ -429,3 +430,54 @@ BOOL WINAPI DllMain (HINSTANCE hinstDLL,
     return TRUE;
 }
 #endif
+
+int yaz_errno(void)
+{
+    return errno;
+}
+
+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 language
+		(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';
+}