[GNUnet-SVN] r23394 - Extractor/src/plugins

[gnunet]

Author: grothoff
Date: 2012-08-24 00:22:03 +0200 (Fri, 24 Aug 2012)
New Revision: 23394

Modified:
   Extractor/src/plugins/exiv2_extractor.cc
Log:
fix exiv2 -- does not like partial reads

Modified: Extractor/src/plugins/exiv2_extractor.cc
===================================================================
--- Extractor/src/plugins/exiv2_extractor.cc    2012-08-23 21:31:18 UTC (rev 
23393)
+++ Extractor/src/plugins/exiv2_extractor.cc    2012-08-23 22:22:03 UTC (rev 
23394)
@@ -283,11 +283,17 @@
 {
   void *data;
   ssize_t ret;
-  
-  if (-1 == (ret = ec->read (ec->cls, &data, rcount)))
-    return 0;
-  memcpy (buf, data, ret);
-  return ret;
+  long got;
+
+  got = 0;
+  while (got < rcount)
+    {
+      if (-1 == (ret = ec->read (ec->cls, &data, rcount - got)))
+       return got;
+      memcpy (&buf[got], data, ret);
+      got += ret;
+    }
+  return got;
 }