comparison src/fileio.c @ 834:5117153003bd v7.0e

updated for version 7.0e
author vimboss
date Sun, 16 Apr 2006 18:30:08 +0000
parents 45fad0f590d0
children 8bebcabccc2c
comparison
equal deleted inserted replaced
833:52d17d53b555 834:5117153003bd
1257 if (conv_error == 0) 1257 if (conv_error == 0)
1258 conv_error = linecnt; 1258 conv_error = linecnt;
1259 if (bad_char_behavior != BAD_DROP) 1259 if (bad_char_behavior != BAD_DROP)
1260 { 1260 {
1261 fio_flags = 0; /* don't convert this */ 1261 fio_flags = 0; /* don't convert this */
1262 # ifdef USE_ICONV
1263 if (iconv_fd != (iconv_t)-1)
1264 {
1265 iconv_close(iconv_fd);
1266 iconv_fd = (iconv_t)-1;
1267 }
1268 # endif
1262 if (bad_char_behavior == BAD_KEEP) 1269 if (bad_char_behavior == BAD_KEEP)
1263 { 1270 {
1264 /* Keep the trailing bytes as-is. */ 1271 /* Keep the trailing bytes as-is. */
1265 size = conv_restlen; 1272 size = conv_restlen;
1266 ptr -= conv_restlen; 1273 ptr -= conv_restlen;