[SCM] exiv2 packaging branch, master, updated. debian/0.25-3.1-3734-gdcbc29a

[Maximiliano Curia]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-extras/exiv2.git;a=commitdiff;h=e82d40e

The following commit has been merged in the master branch:
commit e82d40e91530394b0fd921527f3f4fbfe98f3be3
Author: Robin Mills <robin at clanmills.com>
Date:   Wed Jun 19 14:53:09 2013 +0000

    Issue: #908.  futils.cpp strError() does not report correct error string.
---
 src/futils.cpp | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/futils.cpp b/src/futils.cpp
index 84872f9..0351426 100644
--- a/src/futils.cpp
+++ b/src/futils.cpp
@@ -69,7 +69,7 @@ namespace Exiv2 {
     bool fileExists(const std::string& path, bool ct)
     {
         struct stat buf;
-		int ret = ::stat(path.c_str(), &buf);
+        int ret = ::stat(path.c_str(), &buf);
         if (0 != ret)                    return false;
         if (ct && !S_ISREG(buf.st_mode)) return false;
         return true;
@@ -104,6 +104,9 @@ namespace Exiv2 {
         strerror_r(error, buf, n);
 # endif
         os << buf;
+        // Issue# 908.
+        // report strerror() if strerror_r() returns empty
+        if ( !buf[0] ) os << strerror(error);
 #else
         os << std::strerror(error);
 #endif

-- 
exiv2 packaging