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

diff --git a/ustream-fd.c b/ustream-fd.c
index 6f8f561..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,8 +66,9 @@ static void ustream_fd_read_pending(struct ustream_fd *sf, bool *more)
 		}
 
 		if (!len) {
+			if (!s->eof)
+				ustream_state_change(s);
 			s->eof = true;
-			ustream_state_change(s);
 			ustream_fd_set_uloop(s, false);
 			return;
 		}
@@ -123,7 +119,7 @@ static bool __ustream_fd_poll(struct ustream_fd *sf, unsigned int events)
 		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);
 	}
 
@@ -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;
 }