X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/d63d2c3c6cbbd574dda4f8b00ebe6c661735edd5..7f088b2e0ec5051c3b9b9a1942198f0be28f315b:/lib/base/buffer.cpp

diff --git a/lib/base/buffer.cpp b/lib/base/buffer.cpp
index 07e9d7f1..3a0a6a3d 100644
--- a/lib/base/buffer.cpp
+++ b/lib/base/buffer.cpp
@@ -120,23 +120,25 @@ 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 (errno != EWOULDBLOCK)
-				eDebug("read: %m");
-			r=0;
+			if (errno != EWOULDBLOCK && errno != EBUSY && errno != EINTR)
+				eDebug("couldn't read: %m");
+		}
+		else
+		{
+			len-=r;
+			re+=r;
+			if (r != tc)
+				break;
 		}
-		re+=r;
-		if (r != tc)
-			break;
 	}
 	return re;
 }
@@ -156,7 +158,7 @@ int eIOBuffer::tofile(int fd, int len)
 		w=::write(fd, buffer.front().data+ptr, tc);
 		if (w < 0)
 		{
-			if (errno != EWOULDBLOCK)
+			if (errno != EWOULDBLOCK && errno != EBUSY && errno != EINTR)
 				eDebug("write: %m");
 			w=0;
 		}