Mercurial > hg > webserver / file diff

--- a/src/server/util/io.c	Wed Nov 02 19:19:01 2022 +0100
+++ b/src/server/util/io.c	Sun Nov 06 15:53:32 2022 +0100
@@ -66,7 +66,8 @@
 #include "pool.h"
 #include "../daemon/netsite.h"
 #include "../daemon/event.h"
-#include "ucx/utils.h"
+#include "cx/utils.h"
+#include <cx/printf.h>
 
 IOStream native_io_funcs = {
     (io_write_f)net_sys_write,
@@ -106,31 +107,31 @@
 
 
 /*
- * SysStream implementation
+ * Sycx_stream implementation
  */
 
-IOStream* sysstream_new(pool_handle_t *pool, SYS_SOCKET fd) {
-    SysStream *st = pool_malloc(pool, sizeof(SysStream));
+IOStream* sycx_stream_new(pool_handle_t *pool, SYS_SOCKET fd) {
+    Sycx_stream *st = pool_malloc(pool, sizeof(Sycx_stream));
     st->st = native_io_funcs;
     st->fd = fd;
     return (IOStream*)st;
 }
 
 #ifdef XP_UNIX
-ssize_t net_sys_write(SysStream *st, void *buf, size_t nbytes) {
+ssize_t net_sys_write(Sycx_stream *st, void *buf, size_t nbytes) {
     return write(st->fd, buf, nbytes);
 }
 
-ssize_t net_sys_writev(SysStream *st, struct iovec *iovec, int iovcnt) {
+ssize_t net_sys_writev(Sycx_stream *st, struct iovec *iovec, int iovcnt) {
     return writev(st->fd, iovec, iovcnt);
 }
 
-ssize_t net_sys_read(SysStream *st, void *buf, size_t nbytes) {
+ssize_t net_sys_read(Sycx_stream *st, void *buf, size_t nbytes) {
     return read(st->fd, buf, nbytes);
 }
 
 #ifdef WS_SENDFILE
-ssize_t net_sys_sendfile(SysStream *st, sendfiledata *sfd) {
+ssize_t net_sys_sendfile(Sycx_stream *st, sendfiledata *sfd) {
     ssize_t ret = 0;
     off_t fileoffset = sfd->offset;
     if(sfd->fd->fd != -1) {
@@ -177,11 +178,11 @@
 }
 #endif
 
-void net_sys_close(SysStream *st) {
+void net_sys_close(Sycx_stream *st) {
     system_close(st->fd);
 }
 
-void net_sys_setmode(SysStream *st, int mode) {
+void net_sys_setmode(Sycx_stream *st, int mode) {
     int flags;
     if (-1 == (flags = fcntl(st->fd, F_GETFL, 0))) {
         flags = 0;
@@ -199,7 +200,7 @@
     }
 }
 
-int net_sys_poll(SysStream *st, EventHandler *ev, int events, Event *cb) {
+int net_sys_poll(Sycx_stream *st, EventHandler *ev, int events, Event *cb) {
     switch(events) {
         default: return -1;
         case IO_POLL_NONE: return ev_remove_poll(ev, st->fd);
@@ -211,7 +212,7 @@
 
 #elif defined(XP_WIN32)
 
-ssize_t net_sys_write(SysStream *st, void *buf, size_t nbytes) {
+ssize_t net_sys_write(Sycx_stream *st, void *buf, size_t nbytes) {
     int ret = send(st->fd, buf, nbytes, 0);
     if(ret == SOCKET_ERROR) {
         return IO_ERROR;
@@ -219,11 +220,11 @@
     return ret;
 }
 
-ssize_t net_sys_writev(SysStream *st, struct iovec *iovec, int iovcnt) {
+ssize_t net_sys_writev(Sycx_stream *st, struct iovec *iovec, int iovcnt) {
     // TODO
 }
 
-ssize_t net_sys_read(SysStream *st, void *buf, size_t nbytes) {
+ssize_t net_sys_read(Sycx_stream *st, void *buf, size_t nbytes) {
     int ret = recv(st->fd, buf, nbytes, 0);
     if(ret == SOCKET_ERROR) {
         return IO_ERROR;
@@ -231,11 +232,11 @@
     return ret;
 }
 
-ssize_t net_sys_sendfile(SysStream *st, sendfiledata *sfd) {
+ssize_t net_sys_sendfile(Sycx_stream *st, sendfiledata *sfd) {
     // TODO
 }
 
-void net_sys_close(SysStream *st) {
+void net_sys_close(Sycx_stream *st) {
     closesocket(st->fd);
 }
 
@@ -250,6 +251,7 @@
     HttpStream *st = pool_malloc(pool, sizeof(HttpStream));
     st->st = http_io_funcs;
     st->fd = fd;
+    st->written = 0;
     st->max_read = 0;
     st->read = 0;
     st->read_total = 0;
@@ -747,7 +749,7 @@
 ssize_t net_printf(SYS_NETFD fd, char *format, ...) {
     va_list arg;
     va_start(arg, format);
-    sstr_t buf = ucx_vasprintf(ucx_default_allocator(), format, arg);
+    cxmutstr buf = cx_vasprintf_a(cxDefaultAllocator, format, arg);
     ssize_t r = buf.length > 0 ? net_write(fd, buf.ptr, buf.length) : 0;
     free(buf.ptr);
     va_end(arg);