merge some code with enigma code

[enigma2.git] / lib / base / buffer.cpp

diff --git a/lib/base/buffer.cpp b/lib/base/buffer.cpp
index 07e9d7f1c086f55c68b6b0c6b7ace45cbce47da8..9839b3e8536597a7f3cf9c894ddfe09e3c7d6762 100644 (file)
--- a/lib/base/buffer.cpp
+++ b/lib/base/buffer.cpp
@@ -120,23 +120,22 @@ int eIOBuffer::fromfile(int fd, int len)
        while (len)
        {
                int tc=len;
-               int r;
+               int r=0;
                if (buffer.empty() || (allocationsize == buffer.back().len))
                        addblock();
                if (tc > allocationsize-buffer.back().len)
                        tc=allocationsize-buffer.back().len;
                r=::read(fd, buffer.back().data+buffer.back().len, tc);
                buffer.back().len+=r;
-               len-=r;
-               if (r < 0)
+               if (r < 0 && errno != EWOULDBLOCK )
+                       eDebug("couldn't read: %m");
+               else
                {
-                       if (errno != EWOULDBLOCK)
-                               eDebug("read: %m");
-                       r=0;
+                       len-=r;
+                       re+=r;
+                       if (r != tc)
+                               break;
                }
-               re+=r;
-               if (r != tc)
-                       break;
        }
        return re;
 }