From e8d2885728d9ec7662ca4360ff42e7e593f71a30 Mon Sep 17 00:00:00 2001
From: dockes <none@none>
Date: Wed, 21 Jan 2009 10:49:38 +0000
Subject: [PATCH] initialize the error buffer for gnu strerror_r

---
 src/utils/readfile.cpp | 18 ++++++++++++++++--
 1 file changed, 16 insertions(+), 2 deletions(-)

diff --git a/src/utils/readfile.cpp b/src/utils/readfile.cpp
index a785dc6c..06d79526 100644
--- a/src/utils/readfile.cpp
+++ b/src/utils/readfile.cpp
@@ -41,15 +41,29 @@ using std::string;
 static void caterrno(string *reason, const char *what, int _errno)
 {
     if (reason) {
-	reason->append("file_to_string: ");
 	reason->append(what);
-	reason->append(": ");
+	reason->append(": errno: ");
+	char nbuf[10];
+	sprintf(nbuf, "%d", _errno);
+	reason->append(nbuf);
+	reason->append(" : ");
 #ifdef sun
 	// Note: sun strerror is noted mt-safe ??
 	reason->append(strerror(_errno));
 #else
 #define ERRBUFSZ 200    
 	char errbuf[ERRBUFSZ];
+	// There are 2 versions of strerror_r. 
+	// - The GNU one returns a pointer to the message (maybe
+	//   static storage or supplied buffer).
+        // - The POSIX one always stores in supplied buffer and
+	//   returns 0 on success. As the possibility of error and
+	//   error code are not specified, we're basically doomed
+	//   cause we can't use a test on the 0 value to know if we
+	//   were returned a pointer... 
+	// Also couldn't find an easy way to disable the gnu version without
+	// changing the cxxflags globally, so forget it.
+	// At worse we get no message at all here.
 	errbuf[0] = 0;
 	strerror_r(_errno, errbuf, ERRBUFSZ);
 	reason->append(errbuf);