projects
/
musl
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
use alt signal stack when present for implementation-internal signals
[musl]
/
src
/
stdio
/
open_memstream.c
diff --git
a/src/stdio/open_memstream.c
b/src/stdio/open_memstream.c
index
eab024d
..
600d277
100644
(file)
--- a/
src/stdio/open_memstream.c
+++ b/
src/stdio/open_memstream.c
@@
-2,6
+2,8
@@
#include <errno.h>
#include <limits.h>
#include <string.h>
#include <errno.h>
#include <limits.h>
#include <string.h>
+#include <stdlib.h>
+#include "libc.h"
struct cookie {
char **bufp;
struct cookie {
char **bufp;
@@
-12,6
+14,12
@@
struct cookie {
size_t space;
};
size_t space;
};
+struct ms_FILE {
+ FILE f;
+ struct cookie c;
+ unsigned char buf[BUFSIZ];
+};
+
static off_t ms_seek(FILE *f, off_t off, int whence)
{
ssize_t base;
static off_t ms_seek(FILE *f, off_t off, int whence)
{
ssize_t base;
@@
-57,34
+65,35
@@
static int ms_close(FILE *f)
FILE *open_memstream(char **bufp, size_t *sizep)
{
FILE *open_memstream(char **bufp, size_t *sizep)
{
- FILE *f;
- struct cookie *c;
+ struct ms_FILE *f;
char *buf;
char *buf;
- if (!(f=malloc(sizeof *f
+ sizeof *c + BUFSIZ
))) return 0;
+ if (!(f=malloc(sizeof *f))) return 0;
if (!(buf=malloc(sizeof *buf))) {
free(f);
return 0;
}
if (!(buf=malloc(sizeof *buf))) {
free(f);
return 0;
}
- memset(f, 0, sizeof *f + sizeof *c);
- f->cookie = c = (void *)(f+1);
+ memset(&f->f, 0, sizeof f->f);
+ memset(&f->c, 0, sizeof f->c);
+ f->f.cookie = &f->c;
-
c->
bufp = bufp;
-
c->
sizep = sizep;
-
c->pos = c->len = c->
space = *sizep = 0;
-
c->
buf = *bufp = buf;
+
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;
*buf = 0;
- f->flags = F_NORD;
- f->fd = -1;
- f->buf = (void *)(c+1);
- f->buf_size = BUFSIZ;
- f->lbf = EOF;
- f->write = ms_write;
- f->seek = ms_seek;
- f->close = ms_close;
+ f->f.flags = F_NORD;
+ f->f.fd = -1;
+ f->f.buf = f->buf;
+ f->f.buf_size = sizeof f->buf;
+ f->f.lbf = EOF;
+ f->f.write = ms_write;
+ f->f.seek = ms_seek;
+ f->f.close = ms_close;
+ f->f.mode = -1;
- if (!libc.threaded) f->lock = -1;
+ if (!libc.threaded) f->
f.
lock = -1;
- return __ofl_add(f);
+ return __ofl_add(
&f->
f);
}
}