Merge branch 'busybox' into merge

1 files changed, 5 insertions, 2 deletions

diff --git a/miscutils/less.c b/miscutils/less.c
index cc0e20bc7..248f3e3f5 100644
--- a/miscutils/less.c
+++ b/miscutils/less.c
@@ -131,6 +131,7 @@
 #endif
 
 #include "libbb.h"
+#include "common_bufsiz.h"
 #if ENABLE_FEATURE_LESS_REGEXP
 #include "xregex.h"
 #endif
@@ -445,7 +446,6 @@ static int at_end(void)
  */
 static void read_lines(void)
 {
-#define readbuf bb_common_bufsiz1
         char *current_line, *p;
         int w = width;
         char last_terminated = terminated;
@@ -455,6 +455,9 @@ static void read_lines(void)
         unsigned old_max_fline = max_fline;
 #endif
 
+#define readbuf bb_common_bufsiz1
+        setup_common_bufsiz();
+
         /* (careful: max_fline can be -1) */
         if (max_fline + 1 > MAXLINES)
                 return;
@@ -486,7 +489,7 @@ static void read_lines(void)
                                         time_t t;
 
                                         errno = 0;
-                                        eof_error = safe_read(STDIN_FILENO, readbuf, sizeof(readbuf));
+                                        eof_error = safe_read(STDIN_FILENO, readbuf, COMMON_BUFSIZE);
                                         if (errno != EAGAIN)
                                                 break;
                                         t = time(NULL);