remove LFS64 symbol aliases; replace with dynamic linker remapping

[musl] / src / stdio / open_wmemstream.c

diff --git a/src/stdio/open_wmemstream.c b/src/stdio/open_wmemstream.c
index 5402ca1..b8ae4a7 100644 (file)
--- a/src/stdio/open_wmemstream.c
+++ b/src/stdio/open_wmemstream.c
@@ -1,4 +1,10 @@
 #include "stdio_impl.h"
+#include <wchar.h>
+#include <errno.h>
+#include <limits.h>
+#include <string.h>
+#include <stdlib.h>
+#include "libc.h"
 
 struct cookie {
        wchar_t **bufp;
@@ -10,26 +16,23 @@ struct cookie {
        mbstate_t mbs;
 };
 
+struct wms_FILE {
+       FILE f;
+       struct cookie c;
+       unsigned char buf[1];
+};
+
 static off_t wms_seek(FILE *f, off_t off, int whence)
 {
        ssize_t base;
        struct cookie *c = f->cookie;
-       switch (whence) {
-       case SEEK_SET:
-               base = 0;
-               break;
-       case SEEK_CUR:
-               base = c->pos;
-               break;
-       case SEEK_END:
-               base = c->len;
-               break;
-       default:
-       fail:
+       if (whence>2U) {
+fail:
                errno = EINVAL;
                return -1;
        }
-       if (-off > base || off > SSIZE_MAX/4-base) goto fail;
+       base = (size_t [3]){0, c->pos, c->len}[whence];
+       if (off < -base || off > SSIZE_MAX/4-base) goto fail;
        memset(&c->mbs, 0, sizeof c->mbs);
        return c->pos = base+off;
 }
@@ -37,15 +40,19 @@ static off_t wms_seek(FILE *f, off_t off, int whence)
 static size_t wms_write(FILE *f, const unsigned char *buf, size_t len)
 {
        struct cookie *c = f->cookie;
-       size_t len2;
+       size_t len2 = f->wpos - f->wbase;
        wchar_t *newbuf;
-       if (len > c->space - c->pos) {
-               len2 = 2*c->space+1 | c->space+len+1;
+       if (len2) {
+               f->wpos = f->wbase;
+               if (wms_write(f, f->wbase, len2) < len2) return 0;
+       }
+       if (len + c->pos >= c->space) {
+               len2 = 2*c->space+1 | c->pos+len+1;
                if (len2 > SSIZE_MAX/4) return 0;
                newbuf = realloc(c->buf, len2*4);
                if (!newbuf) return 0;
                *c->bufp = c->buf = newbuf;
-               memset(c->buf + c->space, 0, len2 - c->space);
+               memset(c->buf + c->space, 0, 4*(len2 - c->space));
                c->space = len2;
        }
        
@@ -64,32 +71,36 @@ static int wms_close(FILE *f)
 
 FILE *open_wmemstream(wchar_t **bufp, size_t *sizep)
 {
-       FILE *f;
-       struct cookie *c;
-       if (!(f=malloc(sizeof *f + sizeof *c))) return 0;
-       memset(f, 0, sizeof *f + sizeof *c);
-       f->cookie = c = (void *)(f+1);
+       struct wms_FILE *f;
+       wchar_t *buf;
 
-       c->bufp = bufp;
-       c->sizep = sizep;
-       c->pos = c->len = c->space = 0;
-       c->buf = 0;
+       if (!(f=malloc(sizeof *f))) return 0;
+       if (!(buf=malloc(sizeof *buf))) {
+               free(f);
+               return 0;
+       }
+       memset(&f->f, 0, sizeof f->f);
+       memset(&f->c, 0, sizeof f->c);
+       f->f.cookie = &f->c;
 
-       f->flags = F_NORD;
-       f->fd = -1;
-       f->buf = (void *)(c+1);
-       f->buf_size = 0;
-       f->lbf = EOF;
-       f->write = wms_write;
-       f->seek = wms_seek;
-       f->close = wms_close;
+       f->c.bufp = bufp;
+       f->c.sizep = sizep;
+       f->c.pos = f->c.len = f->c.space = *sizep = 0;
+       f->c.buf = *bufp = buf;
+       *buf = 0;
 
-       if (!libc.threaded) {
-               f->lock = -1;
-               f->next = libc.ofl_head;
-               if (libc.ofl_head) libc.ofl_head->prev = f;
-               libc.ofl_head = f;
-       }
+       f->f.flags = F_NORD;
+       f->f.fd = -1;
+       f->f.buf = f->buf;
+       f->f.buf_size = 0;
+       f->f.lbf = EOF;
+       f->f.write = wms_write;
+       f->f.seek = wms_seek;
+       f->f.close = wms_close;
+
+       if (!libc.threaded) f->f.lock = -1;
+
+       fwide(&f->f, 1);
 
-       return f;
+       return __ofl_add(&f->f);
 }