diff options
author | Ron Yorston <rmy@pobox.com> | 2014-03-20 13:40:19 +0000 |
---|---|---|
committer | Ron Yorston <rmy@pobox.com> | 2014-03-20 13:40:19 +0000 |
commit | 85aca2f0f45f199458a6cfdcf3eee27c4be2a3a6 (patch) | |
tree | 0e4f76e5d146cf507ea4d73c70875347d478337d | |
parent | 3c363398fbd15f56ebeb7287b68368c8fb6abba7 (diff) | |
download | busybox-w32-85aca2f0f45f199458a6cfdcf3eee27c4be2a3a6.tar.gz busybox-w32-85aca2f0f45f199458a6cfdcf3eee27c4be2a3a6.tar.bz2 busybox-w32-85aca2f0f45f199458a6cfdcf3eee27c4be2a3a6.zip |
Fixes to write replacement
-rw-r--r-- | win32/winansi.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/win32/winansi.c b/win32/winansi.c index 8f2bb72e4..491285275 100644 --- a/win32/winansi.c +++ b/win32/winansi.c | |||
@@ -561,7 +561,7 @@ static int ansi_emulate_write(int fd, const void *buf, size_t count) | |||
561 | /* make a writable copy of the data and retain it for reuse */ | 561 | /* make a writable copy of the data and retain it for reuse */ |
562 | if ( count > max_len ) { | 562 | if ( count > max_len ) { |
563 | free(mem); | 563 | free(mem); |
564 | mem = xmalloc(count+1); | 564 | mem = malloc(count+1); |
565 | max_len = count; | 565 | max_len = count; |
566 | } | 566 | } |
567 | memcpy(mem, buf, count); | 567 | memcpy(mem, buf, count); |
@@ -576,7 +576,7 @@ static int ansi_emulate_write(int fd, const void *buf, size_t count) | |||
576 | 576 | ||
577 | if (len) { | 577 | if (len) { |
578 | CharToOemBuff(str, str, len); | 578 | CharToOemBuff(str, str, len); |
579 | out_len = write(fd, buf, len); | 579 | out_len = write(fd, str, len); |
580 | rv += out_len; | 580 | rv += out_len; |
581 | if (out_len < len) | 581 | if (out_len < len) |
582 | return rv; | 582 | return rv; |