X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;ds=sidebyside;f=src%2Fstdio%2Ffmemopen.c;h=2ce43d327f812145be057a4d61f684dfb615f844;hb=c9c2cd3e6955cb1d57b8be01d4b072bf44058762;hp=260d2889ebf549989d59e497b396653972ae15aa;hpb=e72ee5786b1f328da131b87388333c2e3a09b7b3;p=oweals%2Fmusl.git

diff --git a/src/stdio/fmemopen.c b/src/stdio/fmemopen.c
index 260d2889..2ce43d32 100644
--- a/src/stdio/fmemopen.c
+++ b/src/stdio/fmemopen.c
@@ -1,4 +1,7 @@
 #include "stdio_impl.h"
+#include <errno.h>
+#include <string.h>
+#include <inttypes.h>
 
 struct cookie {
 	size_t pos, len, size;
@@ -54,9 +57,10 @@ static size_t mwrite(FILE *f, const unsigned char *buf, size_t len)
 	if (len > rem) len = rem;
 	memcpy(c->buf+c->pos, buf, len);
 	c->pos += len;
-	if (c->pos >= c->len) {
+	if (c->pos > c->len) {
 		c->len = c->pos;
-		c->buf[c->len==c->size ? c->len-1 : c->len] = 0;
+		if (c->len < c->size) c->buf[c->len] = 0;
+		else if ((f->flags&F_NORD) && c->size) c->buf[c->size-1] = 0;
 	}
 	return len;
 }
@@ -66,7 +70,7 @@ static int mclose(FILE *m)
 	return 0;
 }
 
-FILE *fmemopen(void *buf, size_t size, const char *mode)
+FILE *fmemopen(void *restrict buf, size_t size, const char *restrict mode)
 {
 	FILE *f;
 	struct cookie *c;
@@ -77,7 +81,7 @@ FILE *fmemopen(void *buf, size_t size, const char *mode)
 		return 0;
 	}
 
-	if (!buf && size > SIZE_MAX-sizeof(FILE)-BUFSIZ-UNGET) {
+	if (!buf && size > PTRDIFF_MAX) {
 		errno = ENOMEM;
 		return 0;
 	}
@@ -104,12 +108,7 @@ FILE *fmemopen(void *buf, size_t size, const char *mode)
 	f->seek = mseek;
 	f->close = mclose;
 
-	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);
 }