Merge branch 'busybox' into merge

1 files changed, 7 insertions, 5 deletions

diff --git a/libbb/read_printf.c b/libbb/read_printf.c
index e47ac7afe..1e67d6542 100644
--- a/libbb/read_printf.c
+++ b/libbb/read_printf.c
@@ -107,10 +107,9 @@ char* FAST_FUNC xmalloc_reads(int fd, size_t *maxsz_p)
 
 // Read (potentially big) files in one go. File size is estimated
 // by stat. Extra '\0' byte is appended.
-void* FAST_FUNC xmalloc_read(int fd, size_t *maxsz_p)
+void* FAST_FUNC xmalloc_read_with_initial_buf(int fd, size_t *maxsz_p, char *buf, size_t total)
 {
-        char *buf;
-        size_t size, rd_size, total;
+        size_t size, rd_size;
         size_t to_read;
         struct stat st;
 
@@ -123,8 +122,6 @@ void* FAST_FUNC xmalloc_read(int fd, size_t *maxsz_p)
         /* In order to make such files readable, we add small const */
         size = (st.st_size | 0x3ff) + 1;
 
-        total = 0;
-        buf = NULL;
         while (1) {
                 if (to_read < size)
                         size = to_read;
@@ -153,6 +150,11 @@ void* FAST_FUNC xmalloc_read(int fd, size_t *maxsz_p)
         return buf;
 }
 
+void* FAST_FUNC xmalloc_read(int fd, size_t *maxsz_p)
+{
+        return xmalloc_read_with_initial_buf(fd, maxsz_p, NULL, 0);
+}
+
 #ifdef USING_LSEEK_TO_GET_SIZE
 /* Alternatively, file size can be obtained by lseek to the end.
  * The code is slightly bigger. Retained in case fstat approach