# HG changeset patch # User Kenichi Handa # Date 981336055 0 # Node ID aedc87e25ce2d0fda09af34f445ba4d4cad3b989 # Parent 77f591ec2038cf692ad2120c6c800e57472b68e7 (CCL_WRITE_CHAR): Check if CH is valid or not. If invalid, execute CCL_INVALID_CMD. (ccl_driver): If the CCL program is terminated because of CCL_STAT_INVALID_CMD, copy the remaining source data to the destination instead of throwing them away. diff -r 77f591ec2038 -r aedc87e25ce2 src/ccl.c --- a/src/ccl.c Mon Feb 05 01:20:37 2001 +0000 +++ b/src/ccl.c Mon Feb 05 01:20:55 2001 +0000 @@ -721,8 +721,10 @@ multibyte form later. */ \ extra_bytes++; \ } \ + else if (CHAR_VALID_P (ch, 0)) \ + dst += CHAR_STRING (ch, dst); \ else \ - dst += CHAR_STRING (ch, dst); \ + CCL_INVALID_CMD; \ } \ else \ CCL_SUSPEND (CCL_STAT_SUSPEND_BY_DST); \ @@ -1781,6 +1783,16 @@ bcopy (msg, dst, msglen); dst += msglen; } + if (ccl->status == CCL_STAT_INVALID_CMD) + { + /* Copy the remaining source data. */ + int i = src_end - src; + if (dst_bytes && (dst_end - dst) < i) + i = dst_end - dst; + bcopy (src, dst, i); + src += i; + dst += i; + } } ccl_finish: