libubus: mark ubus socket with close-on-exec

[project/ubus.git] / libubus-io.c

diff --git a/libubus-io.c b/libubus-io.c
index f38403f83b9eef1ff1259778bc7b5cb02d0fdec1..3280e41a37489ff084624675e76c1966bf25dbab 100644 (file)
--- a/libubus-io.c
+++ b/libubus-io.c
@@ -111,7 +111,10 @@ static int writev_retry(int fd, struct iovec *iov, int iov_len, int sock_fd)
                        if (!iov_len)
                                return len;
                }
+               iov->iov_base += cur_len;
                iov->iov_len -= cur_len;
+               msghdr.msg_iov = iov;
+               msghdr.msg_iovlen = iov_len;
        } while (1);
 
        /* Should never reach here */
@@ -376,7 +379,7 @@ int ubus_reconnect(struct ubus_context *ctx, const char *path)
                goto out_free;
 
        ret = UBUS_STATUS_OK;
-       fcntl(ctx->sock.fd, F_SETFL, fcntl(ctx->sock.fd, F_GETFL) | O_NONBLOCK);
+       fcntl(ctx->sock.fd, F_SETFL, fcntl(ctx->sock.fd, F_GETFL) | O_NONBLOCK | O_CLOEXEC);
 
        ubus_refresh_state(ctx);