projects
/
musl
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
add timerfd interfaces (untested)
[musl]
/
src
/
stdio
/
fmemopen.c
diff --git
a/src/stdio/fmemopen.c
b/src/stdio/fmemopen.c
index
ddb2433
..
770fd99
100644
(file)
--- a/
src/stdio/fmemopen.c
+++ b/
src/stdio/fmemopen.c
@@
-23,9
+23,12
@@
fail:
static size_t mread(FILE *f, unsigned char *buf, size_t len)
{
struct cookie *c = f->cookie;
static size_t mread(FILE *f, unsigned char *buf, size_t len)
{
struct cookie *c = f->cookie;
- size_t rem = c->size - c->pos;
- if (!len) return 0;
- if (len > rem) len = rem;
+ size_t rem = c->len - c->pos;
+ if (c->pos > c->len) rem = 0;
+ if (len > rem) {
+ len = rem;
+ f->flags |= F_EOF;
+ }
memcpy(buf, c->buf+c->pos, len);
c->pos += len;
rem -= len;
memcpy(buf, c->buf+c->pos, len);
c->pos += len;
rem -= len;
@@
-34,7
+37,6
@@
static size_t mread(FILE *f, unsigned char *buf, size_t len)
f->rend = f->buf + rem;
memcpy(f->rpos, c->buf+c->pos, rem);
c->pos += rem;
f->rend = f->buf + rem;
memcpy(f->rpos, c->buf+c->pos, rem);
c->pos += rem;
- if (!len) f->flags |= F_EOF;
return len;
}
return len;
}
@@
-47,13
+49,16
@@
static size_t mwrite(FILE *f, const unsigned char *buf, size_t len)
f->wpos = f->wbase;
if (mwrite(f, f->wpos, len2) < len2) return 0;
}
f->wpos = f->wbase;
if (mwrite(f, f->wpos, len2) < len2) return 0;
}
- if (c->mode == 'a') c->pos = c->
size
;
+ if (c->mode == 'a') c->pos = c->
len
;
rem = c->size - c->pos;
if (len > rem) len = rem;
memcpy(c->buf+c->pos, buf, len);
c->pos += len;
rem = c->size - c->pos;
if (len > rem) len = rem;
memcpy(c->buf+c->pos, buf, len);
c->pos += len;
- if (c->pos >= c->len) c->len = c->pos;
- c->buf[c->len==c->size ? c->len-1 : c->len] = 0;
+ if (c->pos > c->len) {
+ c->len = c->pos;
+ 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;
}
return len;
}
@@
-62,7
+67,7
@@
static int mclose(FILE *m)
return 0;
}
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;
{
FILE *f;
struct cookie *c;