From: Denys Vlasenko <vda.linux@googlemail.com>
Date: Sat, 26 Jun 2010 21:08:59 +0000 (+0200)
Subject: libbb/copyfd.c: fix the case of copy buffer <= 4kb
X-Git-Tag: 1_17_0~28
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=1eaf7e76bfff22646baf7d815650106e64ba0691;p=oweals%2Fbusybox.git

libbb/copyfd.c: fix the case of copy buffer <= 4kb

Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
---

diff --git a/libbb/copyfd.c b/libbb/copyfd.c
index 2538d496d..82622c06f 100644
--- a/libbb/copyfd.c
+++ b/libbb/copyfd.c
@@ -17,19 +17,21 @@ static off_t bb_full_fd_action(int src_fd, int dst_fd, off_t size)
 {
 	int status = -1;
 	off_t total = 0;
+	bool continue_on_write_error = 0;
 #if CONFIG_FEATURE_COPYBUF_KB <= 4
 	char buffer[CONFIG_FEATURE_COPYBUF_KB * 1024];
 	enum { buffer_size = sizeof(buffer) };
 #else
 	char *buffer;
 	int buffer_size;
-	bool continue_on_write_error = 0;
+#endif
 
 	if (size < 0) {
 		size = -size;
 		continue_on_write_error = 1;
 	}
 
+#if CONFIG_FEATURE_COPYBUF_KB > 4
 	if (size > 0 && size <= 4 * 1024)
 		goto use_small_buf;
 	/* We want page-aligned buffer, just in case kernel is clever