projects
/
project
/
libubox.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
utils: fix build error with g++
[project/libubox.git]
/
ustream-fd.c
diff --git
a/ustream-fd.c
b/ustream-fd.c
index
daef499
..
b546fa1
100644
(file)
--- a/
ustream-fd.c
+++ b/
ustream-fd.c
@@
-25,7
+25,7
@@
static void ustream_fd_set_uloop(struct ustream *s, bool write)
{
struct ustream_fd *sf = container_of(s, struct ustream_fd, stream);
struct ustream_buf *buf;
{
struct ustream_fd *sf = container_of(s, struct ustream_fd, stream);
struct ustream_buf *buf;
- unsigned int flags = ULOOP_EDGE_TRIGGER;
+ unsigned int flags = ULOOP_EDGE_TRIGGER
| ULOOP_ERROR_CB
;
if (!s->read_blocked && !s->eof)
flags |= ULOOP_READ;
if (!s->read_blocked && !s->eof)
flags |= ULOOP_READ;
@@
-50,6
+50,9
@@
static void ustream_fd_read_pending(struct ustream_fd *sf, bool *more)
char *buf;
do {
char *buf;
do {
+ if (s->read_blocked)
+ break;
+
buf = ustream_reserve(s, 1, &buflen);
if (!buf)
break;
buf = ustream_reserve(s, 1, &buflen);
if (!buf)
break;
@@
-59,7
+62,7
@@
static void ustream_fd_read_pending(struct ustream_fd *sf, bool *more)
if (errno == EINTR)
continue;
if (errno == EINTR)
continue;
- if (errno == EAGAIN)
+ if (errno == EAGAIN
|| errno == ENOTCONN
)
return;
len = 0;
return;
len = 0;
@@
-93,7
+96,7
@@
static int ustream_fd_write(struct ustream *s, const char *buf, int buflen, bool
if (errno == EINTR)
continue;
if (errno == EINTR)
continue;
- if (errno == EAGAIN || errno == EWOULDBLOCK)
+ if (errno == EAGAIN || errno == EWOULDBLOCK
|| errno == ENOTCONN
)
break;
return -1;
break;
return -1;
@@
-124,6
+127,12
@@
static bool __ustream_fd_poll(struct ustream_fd *sf, unsigned int events)
ustream_fd_set_uloop(s, false);
}
ustream_fd_set_uloop(s, false);
}
+ if (sf->fd.error && !s->write_error) {
+ ustream_state_change(s);
+ s->write_error = true;
+ ustream_fd_set_uloop(s, false);
+ }
+
return more;
}
return more;
}