OSDN Git Service
(root)
/
nkf
/
nkf.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
3a807a2
)
Fix: UTF-16's BOM.
author
NARUSE, Yui
<naruse@users.sourceforge.jp>
Fri, 12 Mar 2010 11:47:48 +0000
(20:47 +0900)
committer
NARUSE, Yui
<naruse@users.sourceforge.jp>
Fri, 12 Mar 2010 11:47:48 +0000
(20:47 +0900)
nkf.c
patch
|
blob
|
history
diff --git
a/nkf.c
b/nkf.c
index
9d569d5
..
36bffb6
100644
(file)
--- a/
nkf.c
+++ b/
nkf.c
@@
-6202,7
+6202,7
@@
options(unsigned char *cp)
break;
#endif
#ifdef UTF8_OUTPUT_ENABLE
break;
#endif
#ifdef UTF8_OUTPUT_ENABLE
- case 'w': /* UTF-
8
output */
+ case 'w': /* UTF-
{8,16,32}
output */
if (cp[0] == '8') {
cp++;
if (cp[0] == '0'){
if (cp[0] == '8') {
cp++;
if (cp[0] == '0'){
@@
-6227,16
+6227,18
@@
options(unsigned char *cp)
if (cp[0]=='L') {
cp++;
output_endian = ENDIAN_LITTLE;
if (cp[0]=='L') {
cp++;
output_endian = ENDIAN_LITTLE;
+ output_bom_f = TRUE;
} else if (cp[0] == 'B') {
cp++;
} else if (cp[0] == 'B') {
cp++;
+ output_bom_f = TRUE;
}
if (cp[0] == '0'){
}
if (cp[0] == '0'){
+ output_bom_f = FALSE;
cp++;
enc_idx = enc_idx == UTF_16
? (output_endian == ENDIAN_LITTLE ? UTF_16LE : UTF_16BE)
: (output_endian == ENDIAN_LITTLE ? UTF_32LE : UTF_32BE);
} else {
cp++;
enc_idx = enc_idx == UTF_16
? (output_endian == ENDIAN_LITTLE ? UTF_16LE : UTF_16BE)
: (output_endian == ENDIAN_LITTLE ? UTF_32LE : UTF_32BE);
} else {
- output_bom_f = TRUE;
enc_idx = enc_idx == UTF_16
? (output_endian == ENDIAN_LITTLE ? UTF_16LE_BOM : UTF_16BE_BOM)
: (output_endian == ENDIAN_LITTLE ? UTF_32LE_BOM : UTF_32BE_BOM);
enc_idx = enc_idx == UTF_16
? (output_endian == ENDIAN_LITTLE ? UTF_16LE_BOM : UTF_16BE_BOM)
: (output_endian == ENDIAN_LITTLE ? UTF_32LE_BOM : UTF_32BE_BOM);