X-Git-Url: http://git.archive.openwrt.org/?p=project%2Flibubox.git;a=blobdiff_plain;f=ustream-fd.c;h=bc44d4a825425f49e8fd9c3c63c768bf862f3e46;hp=a47ff9430a1d3cda85e858f0c0ab771ffb9d77bd;hb=827ad8337e88ec9e0bf73a8af1d6cf8555e8ef3d;hpb=5bbedafe09b9ab1de9c8ec1e73e2b936726b63d4

diff --git a/ustream-fd.c b/ustream-fd.c
index a47ff94..bc44d4a 100644
--- a/ustream-fd.c
+++ b/ustream-fd.c
@@ -21,8 +21,6 @@
 #include <stdio.h>
 #include "ustream.h"
 
-static bool _init = false;
-
 static void ustream_fd_set_uloop(struct ustream *s, bool write)
 {
 	struct ustream_fd *sf = container_of(s, struct ustream_fd, stream);
@@ -37,9 +35,6 @@ static void ustream_fd_set_uloop(struct ustream *s, bool write)
 		flags |= ULOOP_WRITE;
 
 	uloop_fd_add(&sf->fd, flags);
-
-	if ((flags & ULOOP_READ) && !_init);
-		sf->fd.cb(&sf->fd, ULOOP_READ);
 }
 
 static void ustream_fd_set_read_blocked(struct ustream *s)
@@ -71,7 +66,10 @@ static void ustream_fd_read_pending(struct ustream_fd *sf, bool *more)
 		}
 
 		if (!len) {
-			sf->fd.eof = true;
+			if (!s->eof)
+				ustream_state_change(s);
+			s->eof = true;
+			ustream_fd_set_uloop(s, false);
 			return;
 		}
 
@@ -83,50 +81,48 @@ static void ustream_fd_read_pending(struct ustream_fd *sf, bool *more)
 static int ustream_fd_write(struct ustream *s, const char *buf, int buflen, bool more)
 {
 	struct ustream_fd *sf = container_of(s, struct ustream_fd, stream);
-	ssize_t len;
+	ssize_t ret = 0, len;
 
 	if (!buflen)
 		return 0;
 
-retry:
-	len = write(sf->fd.fd, buf, buflen);
-	if (!len)
-		goto retry;
+	while (buflen) {
+		len = write(sf->fd.fd, buf, buflen);
 
-	if (len < 0) {
-		if (errno == EINTR)
-			goto retry;
+		if (len < 0) {
+			if (errno == EINTR)
+				continue;
 
-		if (errno == EAGAIN || errno == EWOULDBLOCK)
-			len = 0;
+			if (errno == EAGAIN || errno == EWOULDBLOCK)
+				break;
+
+			return -1;
+		}
+
+		ret += len;
+		buf += len;
+		buflen -= len;
 	}
 
-	if (len >= 0 && len < buflen)
+	if (buflen)
 		ustream_fd_set_uloop(s, true);
 
-	return len;
+	return ret;
 }
 
 static bool __ustream_fd_poll(struct ustream_fd *sf, unsigned int events)
 {
 	struct ustream *s = &sf->stream;
-	struct uloop_fd *fd = &sf->fd;
 	bool more = false;
 
 	if (events & ULOOP_READ)
 		ustream_fd_read_pending(sf, &more);
 
 	if (events & ULOOP_WRITE) {
-		if (!ustream_write_pending(s))
+		if (ustream_write_pending(s))
 			ustream_fd_set_uloop(s, false);
 	}
 
-	if (!s->eof && fd->eof) {
-		s->eof = true;
-		ustream_fd_set_uloop(s, false);
-		ustream_state_change(s);
-	}
-
 	return more;
 }
 
@@ -163,7 +159,5 @@ void ustream_fd_init(struct ustream_fd *sf, int fd)
 	s->write = ustream_fd_write;
 	s->free = ustream_fd_free;
 	s->poll = ustream_fd_poll;
-	_init = true;
 	ustream_fd_set_uloop(s, false);
-	_init = false;
 }