aniani/vim
0
0
Fork 1
mirror of https://github.com/vim/vim.git synced 2025-09-26 04:04:07 -04:00
Code Activity

updated for version 7.1a

Browse Source
This commit is contained in:
Bram Moolenaar
2007-05-06 12:40:34 +00:00
parent 623fe606ae
commit 36f5ac0859
1 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/fileio.c
View File

@@ -5013,13 +5013,13 @@ buf_write_bytes(ip)
* buffer. The buffer has been allocated to be big enough. */ * buffer. The buffer has been allocated to be big enough. */
ip->bw_restlen = 0; ip->bw_restlen = 0;
needed = MultiByteToWideChar(enc_codepage, needed = MultiByteToWideChar(enc_codepage,
MB_ERR_INVALID_CHARS, (LPCSTR)from, (int)fromlen, MB_ERR_INVALID_CHARS, (LPCSTR)from, (int)fromlen,
NULL, 0); NULL, 0);
if (needed == 0) if (needed == 0)
{ {
/* When conversion fails there may be a trailing byte. */ /* When conversion fails there may be a trailing byte. */
needed = MultiByteToWideChar(enc_codepage, needed = MultiByteToWideChar(enc_codepage,
MB_ERR_INVALID_CHARS, (LPCSTR)from, (int)fromlen - 1, MB_ERR_INVALID_CHARS, (LPCSTR)from, (int)fromlen - 1,
NULL, 0); NULL, 0);
if (needed == 0) if (needed == 0)
{ {
@@ -5032,7 +5032,7 @@ buf_write_bytes(ip)
ip->bw_restlen = 1; ip->bw_restlen = 1;
} }
needed = MultiByteToWideChar(enc_codepage, MB_ERR_INVALID_CHARS, needed = MultiByteToWideChar(enc_codepage, MB_ERR_INVALID_CHARS,
(LPCSTR)from, (int)(fromlen - ip->bw_restlen), (LPCSTR)from, (int)(fromlen - ip->bw_restlen),
(LPWSTR)to, needed); (LPWSTR)to, needed);
if (needed == 0) if (needed == 0)
{ {
@@ -5072,7 +5072,8 @@ buf_write_bytes(ip)
* fail. */ * fail. */
len = WideCharToMultiByte(FIO_GET_CP(flags), 0, len = WideCharToMultiByte(FIO_GET_CP(flags), 0,
(LPCWSTR)ip->bw_conv_buf, (int)fromlen / sizeof(WCHAR), (LPCWSTR)ip->bw_conv_buf, (int)fromlen / sizeof(WCHAR),
(LPSTR)to, (int)(ip->bw_conv_buflen - fromlen), 0, &bad); (LPSTR)to, (int)(ip->bw_conv_buflen - fromlen), 0,
&bad);
if (bad) if (bad)
{ {
ip->bw_conv_error = TRUE; ip->bw_conv_error = TRUE;
@@ -5201,7 +5202,7 @@ buf_write_bytes(ip)
#endif #endif
/* Repeat the write(), it may be interrupted by a signal. */ /* Repeat the write(), it may be interrupted by a signal. */
while (len) while (len > 0)
{ {
wlen = vim_write(ip->bw_fd, buf, len); wlen = vim_write(ip->bw_fd, buf, len);
if (wlen <= 0) /* error! */ if (wlen <= 0) /* error! */