simplify pthread_attr_t stack/guard size representation

[musl] / src / stdio / open_memstream.c

diff --git a/src/stdio/open_memstream.c b/src/stdio/open_memstream.c
index 7fc1620..eab024d 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;
@@ -32,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;
@@ -56,14 +59,21 @@ FILE *open_memstream(char **bufp, size_t *sizep)
 {
        FILE *f;
        struct cookie *c;
+       char *buf;
+
        if (!(f=malloc(sizeof *f + sizeof *c + BUFSIZ))) return 0;
+       if (!(buf=malloc(sizeof *buf))) {
+               free(f);
+               return 0;
+       }
        memset(f, 0, sizeof *f + sizeof *c);
        f->cookie = c = (void *)(f+1);
 
        c->bufp = bufp;
        c->sizep = sizep;
-       c->pos = c->len = c->space = 0;
-       c->buf = 0;
+       c->pos = c->len = c->space = *sizep = 0;
+       c->buf = *bufp = buf;
+       *buf = 0;
 
        f->flags = F_NORD;
        f->fd = -1;
@@ -74,12 +84,7 @@ 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;
 
-       return f;
+       return __ofl_add(f);
 }