[git commit master 1/1] libbb/copyfd.c: fix the case of copy buffer <= 4kb

Denys Vlasenko vda.linux at googlemail.com
Sat Jun 26 21:08:59 UTC 2010


commit: http://git.busybox.net/busybox/commit/?id=1eaf7e76bfff22646baf7d815650106e64ba0691
branch: http://git.busybox.net/busybox/commit/?id=refs/heads/master

Signed-off-by: Denys Vlasenko <vda.linux at googlemail.com>
---
 libbb/copyfd.c |    4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)

diff --git a/libbb/copyfd.c b/libbb/copyfd.c
index 2538d49..82622c0 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
-- 
1.7.1



More information about the busybox-cvs mailing list