[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=d880881

The following commit has been merged in the master branch:
commit d880881bad279c097a1615c6daf812ce9a20b990
Author: Robin Mills <robin at clanmills.com>
Date:   Mon Nov 12 07:58:53 2012 +0000

    Linux fixes for exiv2 -v -V (in src/version.cpp)
---
 src/version.cpp | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/src/version.cpp b/src/version.cpp
index 7fa61c7..feee41c 100644
--- a/src/version.cpp
+++ b/src/version.cpp
@@ -184,8 +184,13 @@ EXIV2API void dumpLibraryInfo(std::ostream& os)
 	char proc[100];
 	char path[500];
 	sprintf(proc,"/proc/%d/exe", getpid());
-	path_l = readlink (proc, path,sizeof(path));
-	libs.push_back(path);
+	int l = readlink (proc, path,sizeof(path)-1);
+    if (l>0) {
+        path[l]=0;
+        libs.push_back(path);
+    } else {
+        libs.push_back("unknown");
+    }
 
 	// http://syprog.blogspot.com/2011/12/listing-loaded-shared-objects-in-linux.html
 	struct lmap* pl;
@@ -194,9 +199,9 @@ EXIV2API void dumpLibraryInfo(std::ostream& os)
 	p  = p->ptr;
 	pl = (struct lmap*)p->ptr;
 
-	while(NULL != pl)
+	while ( pl )
 	{
-		libraries.push_back(pl->path);
+		libs.push_back(pl->path);
 		pl = pl->next;
 	}
 #endif

-- 
exiv2 packaging