always add memory streams to stdio open file list

[musl] / src / stdio / open_memstream.c

diff --git a/src/stdio/open_memstream.c b/src/stdio/open_memstream.c
index 2f3569f..9eafdfb 100644 (file)
--- a/src/stdio/open_memstream.c
+++ b/src/stdio/open_memstream.c
@@ -1,4 +1,7 @@
 #include "stdio_impl.h"
+#include <errno.h>
+#include <limits.h>
+#include <string.h>
 
 struct cookie {
        char **bufp;
@@ -13,22 +16,13 @@ static off_t ms_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-base) goto fail;
+       base = (size_t [3]){0, c->pos, c->len}[whence];
+       if (off < -base || off > SSIZE_MAX-base) goto fail;
        return c->pos = base+off;
 }
 
@@ -41,8 +35,8 @@ static size_t ms_write(FILE *f, const unsigned char *buf, size_t len)
                f->wpos = f->wbase;
                if (ms_write(f, f->wbase, len2) < len2) return 0;
        }
-       if (len >= c->space - c->pos) {
-               len2 = 2*c->space+1 | c->space+len+1;
+       if (len + c->pos >= c->space) {
+               len2 = 2*c->space+1 | c->pos+len+1;
                newbuf = realloc(c->buf, len2);
                if (!newbuf) return 0;
                *c->bufp = c->buf = newbuf;
@@ -83,12 +77,13 @@ FILE *open_memstream(char **bufp, size_t *sizep)
        f->seek = ms_seek;
        f->close = ms_close;
 
-       if (!libc.threaded) {
-               f->lock = -1;
-               f->next = libc.ofl_head;
-               if (libc.ofl_head) libc.ofl_head->prev = f;
-               libc.ofl_head = f;
-       }
+       if (!libc.threaded) f->lock = -1;
+
+       OFLLOCK();
+       f->next = libc.ofl_head;
+       if (libc.ofl_head) libc.ofl_head->prev = f;
+       libc.ofl_head = f;
+       OFLUNLOCK();
 
        return f;
 }