projects
/
yaz-moved-to-github.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix release of requests (bug introduced by previous commit)
[yaz-moved-to-github.git]
/
util
/
nmem.c
diff --git
a/util/nmem.c
b/util/nmem.c
index
8415772
..
24225c7
100644
(file)
--- a/
util/nmem.c
+++ b/
util/nmem.c
@@
-3,7
+3,7
@@
* See the file LICENSE for details.
* Sebastian Hammer, Adam Dickmeiss
*
* 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,
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);
(LPTSTR) buf,
max-1,
NULL);
@@
-460,11
+460,21
@@
void yaz_strerror(char *buf, int max)
else
*buf = '\0';
#else
else
*buf = '\0';
#else
+/* UNIX */
#if HAVE_STRERROR_R
#if HAVE_STRERROR_R
+#if YAZ_POSIX_THREADS
+ *buf = '\0';
strerror_r(errno, buf, max);
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
#else
strcpy(buf, strerror(yaz_errno()));
#endif
+/* UNIX */
#endif
if ((cp=strrchr(buf, '\n')))
*cp = '\0';
#endif
if ((cp=strrchr(buf, '\n')))
*cp = '\0';