# HG changeset patch # User Kenichi Handa # Date 1245117584 0 # Node ID db4ec1a977bd47fcaa76354d8bd3dca4633a236f # Parent d08523c14cca16d58417f7bf7ec010902f6ce115 (detect_coding_utf_16): Fix previous change. diff -r d08523c14cca -r db4ec1a977bd src/coding.c --- a/src/coding.c Tue Jun 16 01:17:10 2009 +0000 +++ b/src/coding.c Tue Jun 16 01:59:44 2009 +0000 @@ -1665,10 +1665,11 @@ e[c1] = 1; o[c2] = 1; - detect_info->rejected - |= (CATEGORY_MASK_UTF_16_BE | CATEGORY_MASK_UTF_16_LE); - - while (1) + detect_info->rejected |= (CATEGORY_MASK_UTF_16_AUTO + |CATEGORY_MASK_UTF_16_BE + | CATEGORY_MASK_UTF_16_LE); + + while (detect_info->rejected != CATEGORY_MASK_UTF_16) { TWO_MORE_BYTES (c1, c2); if (c2 < 0) @@ -1677,18 +1678,17 @@ { e[c1] = 1; e_num++; - if (e_num >= 128 && o_num >= 128) - break; + if (e_num >= 128) + detect_info->rejected |= CATEGORY_MASK_UTF_16_BE_NOSIG; } if (! o[c2]) { o[c2] = 1; o_num++; - if (e_num >= 128 && o_num >= 128) - break; + if (o_num >= 128) + detect_info->rejected |= CATEGORY_MASK_UTF_16_LE_NOSIG; } } - detect_info->rejected |= CATEGORY_MASK_UTF_16; return 0; }