summaryrefslogtreecommitdiff
path: root/src/libstddjb/buffer_getall.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/libstddjb/buffer_getall.c')
-rw-r--r--src/libstddjb/buffer_getall.c9
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 ;
}