emo/busybox
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source 
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
This commit is contained in:
Denys Vlasenko 2010-06-26 23:08:59 +02:00
parent fd33e17a2b
commit 1eaf7e76bf
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
libbb/copyfd.c
View File

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