diff options
author | Laurent Bercot <ska-skaware@skarnet.org> | 2015-02-05 23:56:14 +0000 |
---|---|---|
committer | Laurent Bercot <ska-skaware@skarnet.org> | 2015-02-05 23:56:14 +0000 |
commit | 153a646667ff5ae7578a6027938524db91c40821 (patch) | |
tree | 429f092f8254acbb207302d9dd8c790bc596322f /src/libstddjb/buffer_getall.c | |
parent | cea441e894405c6d28e302ae4360e9f848b37797 (diff) | |
download | skalibs-153a646667ff5ae7578a6027938524db91c40821.tar.xz |
- Add siovec_trunc
- Add openwritevnclose
- replace buffer_read/write with fd_readsv/writesv
- add localtmn_from_tain_g
- refactor cdb_make
- rewrite buffer_getvall and buffer_putvall, with a bugfix
Diffstat (limited to 'src/libstddjb/buffer_getall.c')
-rw-r--r-- | src/libstddjb/buffer_getall.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/src/libstddjb/buffer_getall.c b/src/libstddjb/buffer_getall.c index 4f1490b..dc0e115 100644 --- a/src/libstddjb/buffer_getall.c +++ b/src/libstddjb/buffer_getall.c @@ -7,12 +7,13 @@ int buffer_getall (buffer *b, char *buf, unsigned int len, unsigned int *w) { if (*w > len) return (errno = EINVAL, -1) ; - *w += buffer_getnofill(b, buf + *w, len - *w) ; - while (*w < len) + for (;;) { - register int r = sanitize_read(buffer_fill(b)) ; - if (r <= 0) return r ; + register int r ; *w += buffer_getnofill(b, buf + *w, len - *w) ; + if (*w >= len) break ; + r = sanitize_read(buffer_fill(b)) ; + if (r <= 0) return r ; } return 1 ; } |