aboutsummaryrefslogtreecommitdiff
path: root/editors/diff.c
diff options
context:
space:
mode:
authorRon Yorston <rmy@pobox.com>2016-05-16 09:33:03 +0100
committerRon Yorston <rmy@pobox.com>2016-05-16 09:33:03 +0100
commit35d2f5bccb0f3dde600702ebcdb5424d4d50be4a (patch)
tree6e0ff0341c69839e268459a199682628bae734ed /editors/diff.c
parent248a2600a2f4b442101ad568d1994b908bb28d4b (diff)
parentf2559e5c2b7bd2c5fa0dd8e88d0a931da92a23af (diff)
downloadbusybox-w32-35d2f5bccb0f3dde600702ebcdb5424d4d50be4a.tar.gz
busybox-w32-35d2f5bccb0f3dde600702ebcdb5424d4d50be4a.tar.bz2
busybox-w32-35d2f5bccb0f3dde600702ebcdb5424d4d50be4a.zip
Merge branch 'busybox' into merge
Diffstat (limited to 'editors/diff.c')
-rw-r--r--editors/diff.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/editors/diff.c b/editors/diff.c
index a892cfdf2..ff269360f 100644
--- a/editors/diff.c
+++ b/editors/diff.c
@@ -125,6 +125,7 @@
125//usage: "\n -w Ignore all whitespace" 125//usage: "\n -w Ignore all whitespace"
126 126
127#include "libbb.h" 127#include "libbb.h"
128#include "common_bufsiz.h"
128 129
129#if 0 130#if 0
130# define dbg_error_msg(...) bb_error_msg(__VA_ARGS__) 131# define dbg_error_msg(...) bb_error_msg(__VA_ARGS__)
@@ -748,6 +749,7 @@ static int diffreg(char *file[2])
748 fp[i] = fdopen(fd, "r"); 749 fp[i] = fdopen(fd, "r");
749 } 750 }
750 751
752 setup_common_bufsiz();
751 while (1) { 753 while (1) {
752 const size_t sz = COMMON_BUFSIZE / 2; 754 const size_t sz = COMMON_BUFSIZE / 2;
753 char *const buf0 = bb_common_bufsiz1; 755 char *const buf0 = bb_common_bufsiz1;