ustream: fix polling for write buffer availability after buffering writes

[project/libubox.git] / ustream.c

diff --git a/ustream.c b/ustream.c
index a58069d..37fbaf7 100644 (file)
--- a/ustream.c
+++ b/ustream.c
@@ -24,7 +24,7 @@
 
 #include "ustream.h"
 
-void ustream_init_buf(struct ustream_buf *buf, int len)
+static void ustream_init_buf(struct ustream_buf *buf, int len)
 {
        if (!len)
                abort();
@@ -104,7 +104,8 @@ static void ustream_state_change_cb(struct uloop_timeout *t)
 
        if (s->write_error)
                ustream_free_buffers(&s->w);
-       s->notify_state(s);
+       if (s->notify_state)
+               s->notify_state(s);
 }
 
 void ustream_init_defaults(struct ustream *s)
@@ -340,7 +341,7 @@ bool ustream_write_pending(struct ustream *s)
        if (s->write_error)
                return false;
 
-       while (buf) {
+       while (buf && s->w.data_bytes) {
                struct ustream_buf *next = buf->next;
                int maxlen = buf->tail - buf->data;
 
@@ -378,6 +379,7 @@ static int ustream_write_buffered(struct ustream *s, const char *data, int len,
        struct ustream_buf_list *l = &s->w;
        struct ustream_buf *buf;
        int maxlen;
+       bool has_data = !!s->w.data_bytes;
 
        while (len) {
                if (!ustream_prepare_buf(s, &s->w, len))
@@ -397,13 +399,16 @@ static int ustream_write_buffered(struct ustream *s, const char *data, int len,
                l->data_bytes += maxlen;
        }
 
+       if (s->poll && !has_data)
+               s->poll(s);
+
        return wr;
 }
 
 int ustream_write(struct ustream *s, const char *data, int len, bool more)
 {
        struct ustream_buf_list *l = &s->w;
-       int wr;
+       int wr = 0;
 
        if (s->write_error)
                return 0;
@@ -434,6 +439,9 @@ int ustream_vprintf(struct ustream *s, const char *format, va_list arg)
        va_list arg2;
        int wr, maxlen, buflen;
 
+       if (s->write_error)
+               return 0;
+
        if (!l->data_bytes) {
                buf = alloca(MAX_STACK_BUFLEN);
                va_copy(arg2, arg);
@@ -492,6 +500,9 @@ int ustream_printf(struct ustream *s, const char *format, ...)
        va_list arg;
        int ret;
 
+       if (s->write_error)
+               return 0;
+
        va_start(arg, format);
        ret = ustream_vprintf(s, format, arg);
        va_end(arg);