X-Git-Url: http://git.sourceforge.jp/view?p=nkf%2Fnkf.git;a=blobdiff_plain;f=nkf.c;h=1d6387f2c64e2d315f0a6e97f01404671cbba989;hp=74722553753eea8ec329560b0792f15bd5cbdafd;hb=e763ae711dc1989c58fb22bbb9fab050f538c7b7;hpb=9e642379df738071f6d7555269a656a679d2515b diff --git a/nkf.c b/nkf.c index 7472255..1d6387f 100644 --- a/nkf.c +++ b/nkf.c @@ -39,13 +39,15 @@ ** E-Mail: furukawa@tcp-ip.or.jp ** まで御連絡をお願いします。 ***********************************************************************/ -/* $Id: nkf.c,v 1.65 2005/03/05 07:05:20 naruse Exp $ */ -#define NKF_VERSION "2.0.4" -#define NKF_RELEASE_DATE "2005-03-05" +/* $Id: nkf.c,v 1.127 2007/07/19 20:08:29 naruse Exp $ */ +#define NKF_VERSION "2.0.8" +#define NKF_RELEASE_DATE "2007-07-20" #include "config.h" +#include "utf8tbl.h" -static char *CopyRight = - "Copyright (C) 1987, FUJITSU LTD. (I.Ichikawa),2000 S. Kono, COW, 2002-2004 Kono, Furukawa"; +#define COPY_RIGHT \ + "Copyright (C) 1987, FUJITSU LTD. (I.Ichikawa),2000 S. Kono, COW\n" \ + "Copyright (C) 2002-2007 Kono, Furukawa, Naruse, mastodon" /* @@ -60,7 +62,7 @@ static char *CopyRight = ** ** t no operation ** -** j Outout code is JIS 7 bit (DEFAULT SELECT) +** j Output code is JIS 7 bit (DEFAULT SELECT) ** s Output code is MS Kanji (DEFAULT SELECT) ** e Output code is AT&T JIS (DEFAULT SELECT) ** w Output code is AT&T JIS (DEFAULT SELECT) @@ -95,7 +97,7 @@ static char *CopyRight = ** **/ -#if (defined(__TURBOC__) || defined(_MSC_VER) || defined(LSI_C) || defined(__MINGW32__)) && !defined(MSDOS) +#if (defined(__TURBOC__) || defined(_MSC_VER) || defined(LSI_C) || defined(__MINGW32__) || defined(__EMX__) || defined(__MSDOS__) || defined(__WINDOWS__) || defined(__DOS__) || defined(__OS2__)) && !defined(MSDOS) #define MSDOS #if (defined(__Win32__) || defined(_WIN32)) && !defined(__WIN32__) #define __WIN32__ @@ -111,22 +113,40 @@ static char *CopyRight = #endif #include +#include -#if defined(MSDOS) || defined(__OS2__) +#if defined(MSDOS) || defined(__OS2__) #include #include +#if defined(_MSC_VER) || defined(__WATCOMC__) +#define mktemp _mktemp +#endif #endif #ifdef MSDOS #ifdef LSI_C #define setbinmode(fp) fsetbin(fp) +#elif defined(__DJGPP__) +#include +#define setbinmode(fp) djgpp_setbinmode(fp) #else /* Microsoft C, Turbo C */ #define setbinmode(fp) setmode(fileno(fp), O_BINARY) #endif -#else /* UNIX,OS/2 */ +#else /* UNIX */ #define setbinmode(fp) #endif +#if defined(__DJGPP__) +void djgpp_setbinmode(FILE *fp) +{ + /* we do not use libc's setmode(), which changes COOKED/RAW mode in device. */ + int fd, m; + fd = fileno(fp); + m = (__file_handle_modes[fd] & (~O_TEXT)) | O_BINARY; + __file_handle_set(fd, m); +} +#endif + #ifdef _IOFBF /* SysV and MSDOS, Windows */ #define setvbuffer(fp, buf, size) setvbuf(fp, buf, _IOFBF, size) #else /* BSD */ @@ -144,11 +164,17 @@ static char *CopyRight = #ifdef OVERWRITE /* added by satoru@isoternet.org */ -#include +#if defined(__EMX__) +#include +#endif #include -#ifndef MSDOS /* UNIX, OS/2 */ +#if !defined(MSDOS) || defined(__DJGPP__) /* UNIX, djgpp */ #include +#if defined(__WATCOMC__) +#include +#else #include +#endif #else /* defined(MSDOS) */ #ifdef __WIN32__ #ifdef __BORLANDC__ /* BCC32 */ @@ -157,7 +183,7 @@ static char *CopyRight = #include #endif /* (__BORLANDC__) */ #else /* !defined(__WIN32__) */ -#if defined(_MSC_VER) || defined(__MINGW32__) /* VC++, MinGW */ +#if defined(_MSC_VER) || defined(__MINGW32__) || defined(__WATCOMC__) || defined(__OS2__) || defined(__EMX__) || defined(__IBMC__) || defined(__IBMCPP__) /* VC++, MinGW, Watcom, emx+gcc, IBM VAC++ */ #include #elif defined(__TURBOC__) /* BCC */ #include @@ -165,10 +191,6 @@ static char *CopyRight = #endif /* (__WIN32__) */ #endif #endif -#endif - -#ifdef INT_IS_SHORT -#define int long #endif #define FALSE 0 @@ -190,11 +212,14 @@ static char *CopyRight = #define X0201 2 #define ISO8859_1 8 #define NO_X0201 3 -#define X0212 16 +#define X0212 0x2844 +#define X0213_1 0x284F +#define X0213_2 0x2850 /* Input Assumption */ #define JIS_INPUT 4 +#define EUC_INPUT 16 #define SJIS_INPUT 5 #define LATIN1_INPUT 6 #define FIXED_MIME 7 @@ -208,8 +233,15 @@ static char *CopyRight = #define UTF8 12 #define UTF8_INPUT 13 -#define UTF16LE_INPUT 14 -#define UTF16BE_INPUT 15 +#define UTF16_INPUT 1015 +#define UTF32_INPUT 1017 + +/* byte order */ + +#define ENDIAN_BIG 1234 +#define ENDIAN_LITTLE 4321 +#define ENDIAN_2143 2143 +#define ENDIAN_3412 3412 #define WISH_TRUE 15 @@ -232,8 +264,34 @@ static char *CopyRight = #define is_alnum(c) \ (('a'<=c && c<='z')||('A'<= c && c<='Z')||('0'<=c && c<='9')) +/* I don't trust portablity of toupper */ +#define nkf_toupper(c) (('a'<=c && c<='z')?(c-('a'-'A')):c) +#define nkf_isoctal(c) ('0'<=c && c<='7') +#define nkf_isdigit(c) ('0'<=c && c<='9') +#define nkf_isxdigit(c) (nkf_isdigit(c) || ('a'<=c && c<='f') || ('A'<=c && c <= 'F')) +#define nkf_isblank(c) (c == SPACE || c == TAB) +#define nkf_isspace(c) (nkf_isblank(c) || c == CR || c == NL) +#define nkf_isalpha(c) (('a' <= c && c <= 'z') || ('A' <= c && c <= 'Z')) +#define nkf_isalnum(c) (nkf_isdigit(c) || nkf_isalpha(c)) +#define nkf_isprint(c) (' '<=c && c<='~') +#define nkf_isgraph(c) ('!'<=c && c<='~') +#define hex2bin(c) (('0'<=c&&c<='9') ? (c-'0') : \ + ('A'<=c&&c<='F') ? (c-'A'+10) : \ + ('a'<=c&&c<='f') ? (c-'a'+10) : 0 ) +#define is_eucg3(c2) (((unsigned short)c2 >> 8) == SS3) + +#define CP932_TABLE_BEGIN 0xFA +#define CP932_TABLE_END 0xFC +#define CP932INV_TABLE_BEGIN 0xED +#define CP932INV_TABLE_END 0xEE +#define is_ibmext_in_sjis(c2) (CP932_TABLE_BEGIN <= c2 && c2 <= CP932_TABLE_END) + #define HOLD_SIZE 1024 +#if defined(INT_IS_SHORT) +#define IOBUF_SIZE 2048 +#else #define IOBUF_SIZE 16384 +#endif #define DEFAULT_J 'B' #define DEFAULT_R 'B' @@ -246,117 +304,153 @@ static char *CopyRight = #define GETA2 0x2e -#if defined( UTF8_OUTPUT_ENABLE ) || defined( UTF8_INPUT_ENABLE ) -#define sizeof_euc_utf8 94 +#if defined(UTF8_OUTPUT_ENABLE) || defined(UTF8_INPUT_ENABLE) #define sizeof_euc_to_utf8_1byte 94 #define sizeof_euc_to_utf8_2bytes 94 #define sizeof_utf8_to_euc_C2 64 #define sizeof_utf8_to_euc_E5B8 64 #define sizeof_utf8_to_euc_2bytes 112 -#define sizeof_utf8_to_euc_3bytes 112 +#define sizeof_utf8_to_euc_3bytes 16 #endif /* MIME preprocessor */ - #ifdef EASYWIN /*Easy Win */ extern POINT _BufferSize; #endif -/* function prototype */ - -#ifdef ANSI_C_PROTOTYPE -#define PROTO(x) x -#define STATIC static -#else -#define PROTO(x) () -#define STATIC -#endif - struct input_code{ char *name; - int stat; - int score; - int index; - int buf[3]; - void (*status_func)PROTO((struct input_code *, int)); - int (*iconv_func)PROTO((int c2, int c1, int c0)); + nkf_char stat; + nkf_char score; + nkf_char index; + nkf_char buf[3]; + void (*status_func)(struct input_code *, nkf_char); + nkf_char (*iconv_func)(nkf_char c2, nkf_char c1, nkf_char c0); int _file_stat; }; -STATIC char *input_codename = ""; +static char *input_codename = ""; -STATIC int noconvert PROTO((FILE *f)); -STATIC int kanji_convert PROTO((FILE *f)); -STATIC int h_conv PROTO((FILE *f,int c2,int c1)); -STATIC int push_hold_buf PROTO((int c2)); -STATIC void set_iconv PROTO((int f, int (*iconv_func)(int c2,int c1,int c0))); -STATIC int s_iconv PROTO((int c2,int c1,int c0)); -STATIC int s2e_conv PROTO((int c2, int c1, int *p2, int *p1)); -STATIC int e_iconv PROTO((int c2,int c1,int c0)); +#ifndef PERL_XS +static const char *CopyRight = COPY_RIGHT; +#endif +#if !defined(PERL_XS) && !defined(WIN32DLL) +static nkf_char noconvert(FILE *f); +#endif +static void module_connection(void); +static nkf_char kanji_convert(FILE *f); +static nkf_char h_conv(FILE *f,nkf_char c2,nkf_char c1); +static nkf_char push_hold_buf(nkf_char c2); +static void set_iconv(nkf_char f, nkf_char (*iconv_func)(nkf_char c2,nkf_char c1,nkf_char c0)); +static nkf_char s_iconv(nkf_char c2,nkf_char c1,nkf_char c0); +static nkf_char s2e_conv(nkf_char c2, nkf_char c1, nkf_char *p2, nkf_char *p1); +static nkf_char e_iconv(nkf_char c2,nkf_char c1,nkf_char c0); +#if defined(UTF8_INPUT_ENABLE) || defined(UTF8_OUTPUT_ENABLE) +/* UCS Mapping + * 0: Shift_JIS, eucJP-ascii + * 1: eucJP-ms + * 2: CP932, CP51932 + * 3: CP10001 + */ +#define UCS_MAP_ASCII 0 +#define UCS_MAP_MS 1 +#define UCS_MAP_CP932 2 +#define UCS_MAP_CP10001 3 +static int ms_ucs_map_f = UCS_MAP_ASCII; +#endif #ifdef UTF8_INPUT_ENABLE -STATIC int w2e_conv PROTO((int c2,int c1,int c0,int *p2,int *p1)); -STATIC int w_iconv PROTO((int c2,int c1,int c0)); -STATIC int w_iconv16 PROTO((int c2,int c1,int c0)); -STATIC int w_iconv_common PROTO((int c1,int c0,unsigned short **pp,int psize,int *p2,int *p1)); -STATIC int ww16_conv PROTO((int c2, int c1, int c0)); +/* no NEC special, NEC-selected IBM extended and IBM extended characters */ +static int no_cp932ext_f = FALSE; +/* ignore ZERO WIDTH NO-BREAK SPACE */ +static int no_best_fit_chars_f = FALSE; +static int input_endian = ENDIAN_BIG; +static nkf_char unicode_subchar = '?'; /* the regular substitution character */ +static void nkf_each_char_to_hex(void (*f)(nkf_char c2,nkf_char c1), nkf_char c); +static void encode_fallback_html(nkf_char c); +static void encode_fallback_xml(nkf_char c); +static void encode_fallback_java(nkf_char c); +static void encode_fallback_perl(nkf_char c); +static void encode_fallback_subchar(nkf_char c); +static void (*encode_fallback)(nkf_char c) = NULL; +static nkf_char w2e_conv(nkf_char c2,nkf_char c1,nkf_char c0,nkf_char *p2,nkf_char *p1); +static nkf_char w_iconv(nkf_char c2,nkf_char c1,nkf_char c0); +static nkf_char w_iconv16(nkf_char c2,nkf_char c1,nkf_char c0); +static nkf_char w_iconv32(nkf_char c2,nkf_char c1,nkf_char c0); +static nkf_char unicode_to_jis_common(nkf_char c2,nkf_char c1,nkf_char c0,nkf_char *p2,nkf_char *p1); +static nkf_char w_iconv_common(nkf_char c1,nkf_char c0,const unsigned short *const *pp,nkf_char psize,nkf_char *p2,nkf_char *p1); +static void w16w_conv(nkf_char val, nkf_char *p2, nkf_char *p1, nkf_char *p0); +static nkf_char ww16_conv(nkf_char c2, nkf_char c1, nkf_char c0); +static nkf_char w16e_conv(nkf_char val,nkf_char *p2,nkf_char *p1); +static void w_status(struct input_code *, nkf_char); #endif #ifdef UTF8_OUTPUT_ENABLE -STATIC int e2w_conv PROTO((int c2,int c1)); -STATIC void w_oconv PROTO((int c2,int c1)); -STATIC void w_oconv16 PROTO((int c2,int c1)); -#endif -STATIC void e_oconv PROTO((int c2,int c1)); -STATIC int e2s_conv PROTO((int c2, int c1, int *p2, int *p1)); -STATIC void s_oconv PROTO((int c2,int c1)); -STATIC void j_oconv PROTO((int c2,int c1)); -STATIC void fold_conv PROTO((int c2,int c1)); -STATIC void cr_conv PROTO((int c2,int c1)); -STATIC void z_conv PROTO((int c2,int c1)); -STATIC void rot_conv PROTO((int c2,int c1)); -STATIC void hira_conv PROTO((int c2,int c1)); -STATIC void base64_conv PROTO((int c2,int c1)); -STATIC void iso2022jp_check_conv PROTO((int c2,int c1)); -STATIC void no_connection PROTO((int c2,int c1)); -STATIC int no_connection2 PROTO((int c2,int c1,int c0)); - -STATIC void code_score PROTO((struct input_code *ptr)); -STATIC void code_status PROTO((int c)); - -STATIC void std_putc PROTO((int c)); -STATIC int std_getc PROTO((FILE *f)); -STATIC int std_ungetc PROTO((int c,FILE *f)); - -STATIC int broken_getc PROTO((FILE *f)); -STATIC int broken_ungetc PROTO((int c,FILE *f)); - -STATIC int mime_begin PROTO((FILE *f)); -STATIC int mime_getc PROTO((FILE *f)); -STATIC int mime_ungetc PROTO((int c,FILE *f)); - -STATIC int mime_begin_strict PROTO((FILE *f)); -STATIC int mime_getc_buf PROTO((FILE *f)); -STATIC int mime_ungetc_buf PROTO((int c,FILE *f)); -STATIC int mime_integrity PROTO((FILE *f,unsigned char *p)); - -STATIC int base64decode PROTO((int c)); -STATIC void mime_prechar PROTO((int c2, int c1)); -STATIC void mime_putc PROTO((int c)); -STATIC void open_mime PROTO((int c)); -STATIC void close_mime PROTO(()); -STATIC void usage PROTO(()); -STATIC void version PROTO(()); -STATIC void options PROTO((unsigned char *c)); +static int output_bom_f = FALSE; +static int output_endian = ENDIAN_BIG; +static nkf_char e2w_conv(nkf_char c2,nkf_char c1); +static void w_oconv(nkf_char c2,nkf_char c1); +static void w_oconv16(nkf_char c2,nkf_char c1); +static void w_oconv32(nkf_char c2,nkf_char c1); +#endif +static void e_oconv(nkf_char c2,nkf_char c1); +static nkf_char e2s_conv(nkf_char c2, nkf_char c1, nkf_char *p2, nkf_char *p1); +static void s_oconv(nkf_char c2,nkf_char c1); +static void j_oconv(nkf_char c2,nkf_char c1); +static void fold_conv(nkf_char c2,nkf_char c1); +static void cr_conv(nkf_char c2,nkf_char c1); +static void z_conv(nkf_char c2,nkf_char c1); +static void rot_conv(nkf_char c2,nkf_char c1); +static void hira_conv(nkf_char c2,nkf_char c1); +static void base64_conv(nkf_char c2,nkf_char c1); +static void iso2022jp_check_conv(nkf_char c2,nkf_char c1); +static void no_connection(nkf_char c2,nkf_char c1); +static nkf_char no_connection2(nkf_char c2,nkf_char c1,nkf_char c0); + +static void code_score(struct input_code *ptr); +static void code_status(nkf_char c); + +static void std_putc(nkf_char c); +static nkf_char std_getc(FILE *f); +static nkf_char std_ungetc(nkf_char c,FILE *f); + +static nkf_char broken_getc(FILE *f); +static nkf_char broken_ungetc(nkf_char c,FILE *f); + +static nkf_char mime_begin(FILE *f); +static nkf_char mime_getc(FILE *f); +static nkf_char mime_ungetc(nkf_char c,FILE *f); + +static void switch_mime_getc(void); +static void unswitch_mime_getc(void); +static nkf_char mime_begin_strict(FILE *f); +static nkf_char mime_getc_buf(FILE *f); +static nkf_char mime_ungetc_buf(nkf_char c,FILE *f); +static nkf_char mime_integrity(FILE *f,const unsigned char *p); + +static nkf_char base64decode(nkf_char c); +static void mime_prechar(nkf_char c2, nkf_char c1); +static void mime_putc(nkf_char c); +static void open_mime(nkf_char c); +static void close_mime(void); +static void eof_mime(void); +static void mimeout_addchar(nkf_char c); +#ifndef PERL_XS +static void usage(void); +static void version(void); +#endif +static void options(unsigned char *c); #if defined(PERL_XS) || defined(WIN32DLL) -STATIC void reinit PROTO(()); +static void reinit(void); #endif /* buffers */ +#if !defined(PERL_XS) && !defined(WIN32DLL) static unsigned char stdibuf[IOBUF_SIZE]; static unsigned char stdobuf[IOBUF_SIZE]; +#endif static unsigned char hold_buf[HOLD_SIZE*2]; -static int hold_count; +static int hold_count = 0; /* MIME preprocessor fifo */ @@ -367,6 +461,7 @@ static unsigned char mime_buf[MIME_BUF_SIZE]; static unsigned int mime_top = 0; static unsigned int mime_last = 0; /* decoded */ static unsigned int mime_input = 0; /* undecoded */ +static nkf_char (*mime_iconv_back)(nkf_char c2,nkf_char c1,nkf_char c0) = NULL; /* flags */ static int unbuf_f = FALSE; @@ -389,49 +484,63 @@ static int x0201_f = TRUE; /* Assume JISX0201 kana */ static int x0201_f = NO_X0201; /* Assume NO JISX0201 */ #endif static int iso2022jp_f = FALSE; /* convert ISO-2022-JP */ -#ifdef UTF8_OUTPUT_ENABLE -static int unicode_bom_f= 0; /* Output Unicode BOM */ -static int w_oconv16_LE = 0; /* utf-16 little endian */ -static int ms_ucs_map_f = FALSE; /* Microsoft UCS Mapping Compatible */ -#endif - - -#ifdef NUMCHAR_OPTION -#define CLASS_MASK 0x0f000000 -#define CLASS_UTF16 0x01000000 +#ifdef UNICODE_NORMALIZATION +static int nfc_f = FALSE; +static nkf_char (*i_nfc_getc)(FILE *) = std_getc; /* input of ugetc */ +static nkf_char (*i_nfc_ungetc)(nkf_char c ,FILE *f) = std_ungetc; +static nkf_char nfc_getc(FILE *f); +static nkf_char nfc_ungetc(nkf_char c,FILE *f); #endif #ifdef INPUT_OPTION static int cap_f = FALSE; -static int (*i_cgetc)PROTO((FILE *)) = std_getc; /* input of cgetc */ -static int (*i_cungetc)PROTO((int c ,FILE *f)) = std_ungetc; -STATIC int cap_getc PROTO((FILE *f)); -STATIC int cap_ungetc PROTO((int c,FILE *f)); +static nkf_char (*i_cgetc)(FILE *) = std_getc; /* input of cgetc */ +static nkf_char (*i_cungetc)(nkf_char c ,FILE *f) = std_ungetc; +static nkf_char cap_getc(FILE *f); +static nkf_char cap_ungetc(nkf_char c,FILE *f); static int url_f = FALSE; -static int (*i_ugetc)PROTO((FILE *)) = std_getc; /* input of ugetc */ -static int (*i_uungetc)PROTO((int c ,FILE *f)) = std_ungetc; -STATIC int url_getc PROTO((FILE *f)); -STATIC int url_ungetc PROTO((int c,FILE *f)); +static nkf_char (*i_ugetc)(FILE *) = std_getc; /* input of ugetc */ +static nkf_char (*i_uungetc)(nkf_char c ,FILE *f) = std_ungetc; +static nkf_char url_getc(FILE *f); +static nkf_char url_ungetc(nkf_char c,FILE *f); +#endif +#if defined(INT_IS_SHORT) +#define NKF_INT32_C(n) (n##L) +#else +#define NKF_INT32_C(n) (n) +#endif +#define PREFIX_EUCG3 NKF_INT32_C(0x8F00) +#define CLASS_MASK NKF_INT32_C(0xFF000000) +#define CLASS_UNICODE NKF_INT32_C(0x01000000) +#define VALUE_MASK NKF_INT32_C(0x00FFFFFF) +#define UNICODE_MAX NKF_INT32_C(0x0010FFFF) +#define is_unicode_capsule(c) ((c & CLASS_MASK) == CLASS_UNICODE) +#define is_unicode_bmp(c) ((c & VALUE_MASK) <= NKF_INT32_C(0xFFFF)) + +#ifdef NUMCHAR_OPTION static int numchar_f = FALSE; -static int (*i_ngetc)PROTO((FILE *)) = std_getc; /* input of ugetc */ -static int (*i_nungetc)PROTO((int c ,FILE *f)) = std_ungetc; -STATIC int numchar_getc PROTO((FILE *f)); -STATIC int numchar_ungetc PROTO((int c,FILE *f)); +static nkf_char (*i_ngetc)(FILE *) = std_getc; /* input of ugetc */ +static nkf_char (*i_nungetc)(nkf_char c ,FILE *f) = std_ungetc; +static nkf_char numchar_getc(FILE *f); +static nkf_char numchar_ungetc(nkf_char c,FILE *f); #endif #ifdef CHECK_OPTION static int noout_f = FALSE; -STATIC void no_putc PROTO((int c)); -static int debug_f = FALSE; -STATIC void debug PROTO((char *str)); +static void no_putc(nkf_char c); +static nkf_char debug_f = FALSE; +static void debug(const char *str); +static nkf_char (*iconv_for_check)(nkf_char c2,nkf_char c1,nkf_char c0) = 0; #endif static int guess_f = FALSE; -STATIC void print_guessed_code PROTO((char *filename)); -STATIC void set_input_codename PROTO((char *codename)); +#if !defined PERL_XS +static void print_guessed_code(char *filename); +#endif +static void set_input_codename(char *codename); static int is_inputcode_mixed = FALSE; static int is_inputcode_set = FALSE; @@ -440,39 +549,43 @@ static int exec_f = 0; #endif #ifdef SHIFTJIS_CP932 -STATIC int cp932_f = TRUE; -#define CP932_TABLE_BEGIN (0xfa) -#define CP932_TABLE_END (0xfc) +/* invert IBM extended characters to others */ +static int cp51932_f = FALSE; -STATIC int cp932inv_f = TRUE; -#define CP932INV_TABLE_BEGIN (0xed) -#define CP932INV_TABLE_END (0xee) +/* invert NEC-selected IBM extended characters to IBM extended characters */ +static int cp932inv_f = TRUE; -/* STATIC int cp932_conv PROTO((int c2, int c1)); */ +/* static nkf_char cp932_conv(nkf_char c2, nkf_char c1); */ #endif /* SHIFTJIS_CP932 */ #ifdef X0212_ENABLE -STATIC int x0212_f = FALSE; -static int x0212_shift PROTO((int c)); -static int x0212_unshift PROTO((int c)); +static int x0212_f = FALSE; +static nkf_char x0212_shift(nkf_char c); +static nkf_char x0212_unshift(nkf_char c); #endif +static int x0213_f = FALSE; -STATIC unsigned char prefix_table[256]; - -STATIC void e_status PROTO((struct input_code *, int)); -STATIC void s_status PROTO((struct input_code *, int)); +static unsigned char prefix_table[256]; -#ifdef UTF8_INPUT_ENABLE -STATIC void w_status PROTO((struct input_code *, int)); -STATIC void w16_status PROTO((struct input_code *, int)); -static int utf16_mode = UTF16LE_INPUT; -#endif +static void set_code_score(struct input_code *ptr, nkf_char score); +static void clr_code_score(struct input_code *ptr, nkf_char score); +static void status_disable(struct input_code *ptr); +static void status_push_ch(struct input_code *ptr, nkf_char c); +static void status_clear(struct input_code *ptr); +static void status_reset(struct input_code *ptr); +static void status_reinit(struct input_code *ptr); +static void status_check(struct input_code *ptr, nkf_char c); +static void e_status(struct input_code *, nkf_char); +static void s_status(struct input_code *, nkf_char); struct input_code input_code_list[] = { {"EUC-JP", 0, 0, 0, {0, 0, 0}, e_status, e_iconv, 0}, {"Shift_JIS", 0, 0, 0, {0, 0, 0}, s_status, s_iconv, 0}, +#ifdef UTF8_INPUT_ENABLE {"UTF-8", 0, 0, 0, {0, 0, 0}, w_status, w_iconv, 0}, - {"UTF-16", 0, 0, 0, {0, 0, 0}, w16_status, w_iconv16, 0}, + {"UTF-16", 0, 0, 0, {0, 0, 0}, NULL, w_iconv16, 0}, + {"UTF-32", 0, 0, 0, {0, 0, 0}, NULL, w_iconv32, 0}, +#endif {0} }; @@ -515,38 +628,38 @@ static int fold_margin = FOLD_MARGIN; #endif /* process default */ -static void (*output_conv)PROTO((int c2,int c1)) = DEFAULT_CONV; +static void (*output_conv)(nkf_char c2,nkf_char c1) = DEFAULT_CONV; -static void (*oconv)PROTO((int c2,int c1)) = no_connection; +static void (*oconv)(nkf_char c2,nkf_char c1) = no_connection; /* s_iconv or oconv */ -static int (*iconv)PROTO((int c2,int c1,int c0)) = no_connection2; +static nkf_char (*iconv)(nkf_char c2,nkf_char c1,nkf_char c0) = no_connection2; -static void (*o_zconv)PROTO((int c2,int c1)) = no_connection; -static void (*o_fconv)PROTO((int c2,int c1)) = no_connection; -static void (*o_crconv)PROTO((int c2,int c1)) = no_connection; -static void (*o_rot_conv)PROTO((int c2,int c1)) = no_connection; -static void (*o_hira_conv)PROTO((int c2,int c1)) = no_connection; -static void (*o_base64conv)PROTO((int c2,int c1)) = no_connection; -static void (*o_iso2022jp_check_conv)PROTO((int c2,int c1)) = no_connection; +static void (*o_zconv)(nkf_char c2,nkf_char c1) = no_connection; +static void (*o_fconv)(nkf_char c2,nkf_char c1) = no_connection; +static void (*o_crconv)(nkf_char c2,nkf_char c1) = no_connection; +static void (*o_rot_conv)(nkf_char c2,nkf_char c1) = no_connection; +static void (*o_hira_conv)(nkf_char c2,nkf_char c1) = no_connection; +static void (*o_base64conv)(nkf_char c2,nkf_char c1) = no_connection; +static void (*o_iso2022jp_check_conv)(nkf_char c2,nkf_char c1) = no_connection; /* static redirections */ -static void (*o_putc)PROTO((int c)) = std_putc; +static void (*o_putc)(nkf_char c) = std_putc; -static int (*i_getc)PROTO((FILE *f)) = std_getc; /* general input */ -static int (*i_ungetc)PROTO((int c,FILE *f)) =std_ungetc; +static nkf_char (*i_getc)(FILE *f) = std_getc; /* general input */ +static nkf_char (*i_ungetc)(nkf_char c,FILE *f) =std_ungetc; -static int (*i_bgetc)PROTO((FILE *)) = std_getc; /* input of mgetc */ -static int (*i_bungetc)PROTO((int c ,FILE *f)) = std_ungetc; +static nkf_char (*i_bgetc)(FILE *) = std_getc; /* input of mgetc */ +static nkf_char (*i_bungetc)(nkf_char c ,FILE *f) = std_ungetc; -static void (*o_mputc)PROTO((int c)) = std_putc ; /* output of mputc */ +static void (*o_mputc)(nkf_char c) = std_putc ; /* output of mputc */ -static int (*i_mgetc)PROTO((FILE *)) = std_getc; /* input of mgetc */ -static int (*i_mungetc)PROTO((int c ,FILE *f)) = std_ungetc; +static nkf_char (*i_mgetc)(FILE *) = std_getc; /* input of mgetc */ +static nkf_char (*i_mungetc)(nkf_char c ,FILE *f) = std_ungetc; /* for strict mime */ -static int (*i_mgetc_buf)PROTO((FILE *)) = std_getc; /* input of mgetc_buf */ -static int (*i_mungetc_buf)PROTO((int c,FILE *f)) = std_ungetc; +static nkf_char (*i_mgetc_buf)(FILE *) = std_getc; /* input of mgetc_buf */ +static nkf_char (*i_mungetc_buf)(nkf_char c,FILE *f) = std_ungetc; /* Global states */ static int output_mode = ASCII, /* output kanji mode */ @@ -558,7 +671,7 @@ static int mime_decode_mode = FALSE; /* MIME mode B base64, Q hex */ /* X0201 kana conversion table */ /* 90-9F A0-DF */ -static +static const unsigned char cv[]= { 0x21,0x21,0x21,0x23,0x21,0x56,0x21,0x57, 0x21,0x22,0x21,0x26,0x25,0x72,0x25,0x21, @@ -581,7 +694,7 @@ unsigned char cv[]= { /* X0201 kana conversion table for daguten */ /* 90-9F A0-DF */ -static +static const unsigned char dv[]= { 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, @@ -603,7 +716,7 @@ unsigned char dv[]= { /* X0201 kana conversion table for han-daguten */ /* 90-9F A0-DF */ -static +static const unsigned char ev[]= { 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, @@ -626,7 +739,7 @@ unsigned char ev[]= { /* X0208 kigou conversion table */ /* 0x8140 - 0x819e */ -static +static const unsigned char fv[] = { 0x00,0x00,0x00,0x00,0x2c,0x2e,0x00,0x3a, @@ -646,28 +759,30 @@ unsigned char fv[] = { #define CRLF 1 -static int file_out = FALSE; +static int file_out_f = FALSE; #ifdef OVERWRITE -static int overwrite = FALSE; +static int overwrite_f = FALSE; +static int preserve_time_f = FALSE; +static int backup_f = FALSE; +static char *backup_suffix = ""; +static char *get_backup_filename(const char *suffix, const char *filename); #endif static int crmode_f = 0; /* CR, NL, CRLF */ +static nkf_char prev_cr = 0; #ifdef EASYWIN /*Easy Win */ static int end_check; #endif /*Easy Win */ #define STD_GC_BUFSIZE (256) -int std_gc_buf[STD_GC_BUFSIZE]; -int std_gc_ndx; +nkf_char std_gc_buf[STD_GC_BUFSIZE]; +nkf_char std_gc_ndx; #ifdef WIN32DLL #include "nkf32dll.c" #elif defined(PERL_XS) #else /* WIN32DLL */ -int -main(argc, argv) - int argc; - char **argv; +int main(int argc, char **argv) { FILE *fin; unsigned char *cp; @@ -714,7 +829,7 @@ main(argc, argv) x0201_f = ((!iso2022jp_f)? TRUE : NO_X0201); if (binmode_f == TRUE) -#ifdef __OS2__ +#if defined(__OS2__) && (defined(__IBMC__) || defined(__IBMCPP__)) if (freopen("","wb",stdout) == NULL) return (-1); #else @@ -724,16 +839,16 @@ main(argc, argv) if (unbuf_f) setbuf(stdout, (char *) NULL); else - setvbuffer(stdout, stdobuf, IOBUF_SIZE); + setvbuffer(stdout, (char *) stdobuf, IOBUF_SIZE); if (argc == 0) { if (binmode_f == TRUE) -#ifdef __OS2__ +#if defined(__OS2__) && (defined(__IBMC__) || defined(__IBMCPP__)) if (freopen("","rb",stdin) == NULL) return (-1); #else setbinmode(stdin); #endif - setvbuffer(stdin, stdibuf, IOBUF_SIZE); + setvbuffer(stdin, (char *) stdibuf, IOBUF_SIZE); if (nop_f) noconvert(stdin); else { @@ -742,13 +857,19 @@ main(argc, argv) } } else { int nfiles = argc; + int is_argument_error = FALSE; while (argc--) { is_inputcode_mixed = FALSE; is_inputcode_set = FALSE; input_codename = ""; +#ifdef CHECK_OPTION + iconv_for_check = 0; +#endif if ((fin = fopen((origfname = *argv++), "r")) == NULL) { perror(*--argv); - return(-1); + *argv++; + is_argument_error = TRUE; + continue; } else { #ifdef OVERWRITE int fd = 0; @@ -756,9 +877,9 @@ main(argc, argv) #endif /* reopen file for stdout */ - if (file_out == TRUE) { + if (file_out_f == TRUE) { #ifdef OVERWRITE - if (overwrite){ + if (overwrite_f){ outfname = malloc(strlen(origfname) + strlen(".nkftmpXXXXXX") + 1); @@ -780,7 +901,7 @@ main(argc, argv) } strcat(outfname, "ntXXXXXX"); mktemp(outfname); - fd = open(outfname, O_WRONLY | O_CREAT | O_TRUNC, + fd = open(outfname, O_WRONLY | O_CREAT | O_TRUNC | O_EXCL, S_IREAD | S_IWRITE); #else strcat(outfname, ".nkftmpXXXXXX"); @@ -807,7 +928,7 @@ main(argc, argv) return (-1); } if (binmode_f == TRUE) { -#ifdef __OS2__ +#if defined(__OS2__) && (defined(__IBMC__) || defined(__IBMCPP__)) if (freopen("","wb",stdout) == NULL) return (-1); #else @@ -816,13 +937,13 @@ main(argc, argv) } } if (binmode_f == TRUE) -#ifdef __OS2__ +#if defined(__OS2__) && (defined(__IBMC__) || defined(__IBMCPP__)) if (freopen("","rb",fin) == NULL) return (-1); #else setbinmode(fin); #endif - setvbuffer(fin, stdibuf, IOBUF_SIZE); + setvbuffer(fin, (char *) stdibuf, IOBUF_SIZE); if (nop_f) noconvert(fin); else { @@ -833,9 +954,9 @@ main(argc, argv) } fclose(fin); #ifdef OVERWRITE - if (overwrite) { + if (overwrite_f) { struct stat sb; -#if defined(MSDOS) && !defined(__MINGW32__) && !defined(__WIN32__) +#if defined(MSDOS) && !defined(__MINGW32__) && !defined(__WIN32__) && !defined(__WATCOMC__) && !defined(__EMX__) && !defined(__OS2__) && !defined(__DJGPP__) time_t tb[2]; #else struct utimbuf tb; @@ -855,23 +976,37 @@ main(argc, argv) } /* タイムスタンプを復元 */ -#if defined(MSDOS) && !defined(__MINGW32__) && !defined(__WIN32__) - tb[0] = tb[1] = sb.st_mtime; - if (utime(outfname, tb)) { - fprintf(stderr, "Can't set timestamp %s\n", outfname); - } + if(preserve_time_f){ +#if defined(MSDOS) && !defined(__MINGW32__) && !defined(__WIN32__) && !defined(__WATCOMC__) && !defined(__EMX__) && !defined(__OS2__) && !defined(__DJGPP__) + tb[0] = tb[1] = sb.st_mtime; + if (utime(outfname, tb)) { + fprintf(stderr, "Can't set timestamp %s\n", outfname); + } #else - tb.actime = sb.st_atime; - tb.modtime = sb.st_mtime; - if (utime(outfname, &tb)) { - fprintf(stderr, "Can't set timestamp %s\n", outfname); - } + tb.actime = sb.st_atime; + tb.modtime = sb.st_mtime; + if (utime(outfname, &tb)) { + fprintf(stderr, "Can't set timestamp %s\n", outfname); + } #endif + } + if(backup_f){ + char *backup_filename = get_backup_filename(backup_suffix, origfname); #ifdef MSDOS - if (unlink(origfname)){ - perror(origfname); - } + unlink(backup_filename); +#endif + if (rename(origfname, backup_filename)) { + perror(backup_filename); + fprintf(stderr, "Can't rename %s to %s\n", + origfname, backup_filename); + } + }else{ +#ifdef MSDOS + if (unlink(origfname)){ + perror(origfname); + } #endif + } if (rename(outfname, origfname)) { perror(origfname); fprintf(stderr, "Can't rename %s to %s\n", @@ -882,25 +1017,70 @@ main(argc, argv) #endif } } + if (is_argument_error) + return(-1); } #ifdef EASYWIN /*Easy Win */ - if (file_out == FALSE) + if (file_out_f == FALSE) scanf("%d",&end_check); else fclose(stdout); #else /* for Other OS */ - if (file_out == TRUE) + if (file_out_f == TRUE) fclose(stdout); #endif /*Easy Win */ return (0); } #endif /* WIN32DLL */ -static +#ifdef OVERWRITE +char *get_backup_filename(const char *suffix, const char *filename) +{ + char *backup_filename; + int asterisk_count = 0; + int i, j; + int filename_length = strlen(filename); + + for(i = 0; suffix[i]; i++){ + if(suffix[i] == '*') asterisk_count++; + } + + if(asterisk_count){ + backup_filename = malloc(strlen(suffix) + (asterisk_count * (filename_length - 1)) + 1); + if (!backup_filename){ + perror("Can't malloc backup filename."); + return NULL; + } + + for(i = 0, j = 0; suffix[i];){ + if(suffix[i] == '*'){ + backup_filename[j] = '\0'; + strncat(backup_filename, filename, filename_length); + i++; + j += filename_length; + }else{ + backup_filename[j++] = suffix[i++]; + } + } + backup_filename[j] = '\0'; + }else{ + j = strlen(suffix) + filename_length; + backup_filename = malloc( + 1); + strcpy(backup_filename, filename); + strcat(backup_filename, suffix); + backup_filename[j] = '\0'; + } + return backup_filename; +} +#endif + +static const struct { - char *name; - char *alias; + const char *name; + const char *alias; } long_option[] = { + {"ic=", ""}, + {"oc=", ""}, {"base64","jMB"}, {"euc","e"}, {"euc-input","E"}, @@ -930,13 +1110,28 @@ struct { {"utf8", "w"}, {"utf16", "w16"}, {"ms-ucs-map", ""}, + {"fb-skip", ""}, + {"fb-html", ""}, + {"fb-xml", ""}, + {"fb-perl", ""}, + {"fb-java", ""}, + {"fb-subchar", ""}, + {"fb-subchar=", ""}, #endif #ifdef UTF8_INPUT_ENABLE {"utf8-input", "W"}, {"utf16-input", "W16"}, + {"no-cp932ext", ""}, + {"no-best-fit-chars",""}, +#endif +#ifdef UNICODE_NORMALIZATION + {"utf8mac-input", ""}, #endif #ifdef OVERWRITE {"overwrite", ""}, + {"overwrite=", ""}, + {"in-place", ""}, + {"in-place=", ""}, #endif #ifdef INPUT_OPTION {"cap-input", ""}, @@ -961,47 +1156,353 @@ struct { static int option_mode = 0; -void -options(cp) - unsigned char *cp; +void options(unsigned char *cp) { - int i; - unsigned char *p = NULL; + nkf_char i, j; + unsigned char *p; + unsigned char *cp_back = NULL; + char codeset[32]; if (option_mode==1) return; - if (*cp++ != '-') - return; - while (*cp) { - if (p && !*cp) { - cp = p; - p = 0; + while(*cp && *cp++!='-'); + while (*cp || cp_back) { + if(!*cp){ + cp = cp_back; + cp_back = NULL; + continue; } + p = 0; switch (*cp++) { case '-': /* literal options */ - if (!*cp) { /* ignore the rest of arguments */ + if (!*cp || *cp == SPACE) { /* ignore the rest of arguments */ option_mode = 1; return; } for (i=0;iname){ - if (p->score < result->score){ + if (p->status_func && p->score < result->score){ result = p; } ++p; } - set_iconv(FALSE, result->iconv_func); + set_iconv(TRUE, result->iconv_func); } @@ -2271,13 +3073,13 @@ h_conv(f, c2, c1) ** Kanji codes by oconv and leave estab_f unchanged. **/ - c3=c1; - wc = 0; - while (wc < hold_count){ - c2 = hold_buf[wc++]; + ret = c1; + hold_index = 0; + while (hold_index < hold_count){ + c2 = hold_buf[hold_index++]; if (c2 <= DEL #ifdef NUMCHAR_OPTION - || (c2 & CLASS_MASK) == CLASS_UTF16 + || is_unicode_capsule(c2) #endif ){ (*iconv)(0, c2, 0); @@ -2286,8 +3088,8 @@ h_conv(f, c2, c1) (*iconv)(X0201, c2, 0); continue; } - if (wc < hold_count){ - c1 = hold_buf[wc++]; + if (hold_index < hold_count){ + c1 = hold_buf[hold_index++]; }else{ c1 = (*i_getc)(f); if (c1 == EOF){ @@ -2296,59 +3098,84 @@ h_conv(f, c2, c1) } code_status(c1); } - if ((*iconv)(c2, c1, 0) < 0){ - int c0; - if (wc < hold_count){ - c0 = hold_buf[wc++]; - }else{ - c0 = (*i_getc)(f); - if (c0 == EOF){ - c3 = EOF; - break; - } + c0 = 0; + switch ((*iconv)(c2, c1, 0)) { /* can be EUC/SJIS/UTF-8 */ + case -2: + /* 4 bytes UTF-8 */ + if (hold_index < hold_count){ + c0 = hold_buf[hold_index++]; + } else if ((c0 = (*i_getc)(f)) == EOF) { + ret = EOF; + break; + } else { + code_status(c0); + c0 <<= 8; + if (hold_index < hold_count){ + c3 = hold_buf[hold_index++]; + } else if ((c3 = (*i_getc)(f)) == EOF) { + c0 = ret = EOF; + break; + } else { + code_status(c3); + (*iconv)(c2, c1, c0|c3); + } + } + break; + case -1: + /* 3 bytes EUC or UTF-8 */ + if (hold_index < hold_count){ + c0 = hold_buf[hold_index++]; + } else if ((c0 = (*i_getc)(f)) == EOF) { + ret = EOF; + break; + } else { code_status(c0); } (*iconv)(c2, c1, c0); - c1 = c0; - } + break; + } + if (c0 == EOF) break; } - return c3; + return ret; } - - -int -push_hold_buf(c2) - int c2; +nkf_char push_hold_buf(nkf_char c2) { if (hold_count >= HOLD_SIZE*2) return (EOF); - hold_buf[hold_count++] = c2; + hold_buf[hold_count++] = (unsigned char)c2; return ((hold_count >= HOLD_SIZE*2) ? EOF : hold_count); } -int s2e_conv(c2, c1, p2, p1) - int c2, c1; - int *p2, *p1; +nkf_char s2e_conv(nkf_char c2, nkf_char c1, nkf_char *p2, nkf_char *p1) { - int val; +#if defined(SHIFTJIS_CP932) || defined(X0212_ENABLE) + nkf_char val; +#endif + static const nkf_char shift_jisx0213_s1a3_table[5][2] ={ { 1, 8}, { 3, 4}, { 5,12}, {13,14}, {15, 0} }; #ifdef SHIFTJIS_CP932 - if (cp932_f && CP932_TABLE_BEGIN <= c2 && c2 <= CP932_TABLE_END){ - extern unsigned short shiftjis_cp932[3][189]; + if (!cp932inv_f && is_ibmext_in_sjis(c2)){ val = shiftjis_cp932[c2 - CP932_TABLE_BEGIN][c1 - 0x40]; if (val){ c2 = val >> 8; c1 = val & 0xff; } } + if (cp932inv_f + && CP932INV_TABLE_BEGIN <= c2 && c2 <= CP932INV_TABLE_END){ + nkf_char c = cp932inv[c2 - CP932INV_TABLE_BEGIN][c1 - 0x40]; + if (c){ + c2 = c >> 8; + c1 = c & 0xff; + } + } #endif /* SHIFTJIS_CP932 */ #ifdef X0212_ENABLE - if (x0212_f && 0xfa <= c2 && c2 <= 0xfc){ - extern unsigned short shiftjis_x0212[3][189]; + if (!x0213_f && is_ibmext_in_sjis(c2)){ val = shiftjis_x0212[c2 - 0xfa][c1 - 0x40]; if (val){ - if (val & 0x8000){ - c2 = (0x8f << 8) | (val >> 8); + if (val > 0x7FFF){ + c2 = PREFIX_EUCG3 | ((val >> 8) & 0x7f); c1 = val & 0xff; }else{ c2 = val >> 8; @@ -2360,45 +3187,53 @@ int s2e_conv(c2, c1, p2, p1) } } #endif - c2 = c2 + c2 - ((c2 <= 0x9f) ? SJ0162 : SJ6394); - if (c1 < 0x9f) - c1 = c1 - ((c1 > DEL) ? SPACE : 0x1f); - else { - c1 = c1 - 0x7e; - c2++; + if(c2 >= 0x80){ + if(x0213_f && c2 >= 0xF0){ + if(c2 <= 0xF3 || (c2 == 0xF4 && c1 < 0x9F)){ /* k=1, 3<=k<=5, k=8, 12<=k<=15 */ + c2 = PREFIX_EUCG3 | 0x20 | shift_jisx0213_s1a3_table[c2 - 0xF0][0x9E < c1]; + }else{ /* 78<=k<=94 */ + c2 = PREFIX_EUCG3 | (c2 * 2 - 0x17B); + if (0x9E < c1) c2++; + } + }else{ + c2 = c2 + c2 - ((c2 <= 0x9F) ? SJ0162 : SJ6394); + if (0x9E < c1) c2++; + } + if (c1 < 0x9F) + c1 = c1 - ((c1 > DEL) ? SPACE : 0x1F); + else { + c1 = c1 - 0x7E; + } } #ifdef X0212_ENABLE - if (x0212_f){ - c2 = x0212_unshift(c2); - } + c2 = x0212_unshift(c2); #endif if (p2) *p2 = c2; if (p1) *p1 = c1; return 0; } -int -s_iconv(c2, c1, c0) - int c2, - c1, c0; +nkf_char s_iconv(nkf_char c2, nkf_char c1, nkf_char c0) { if (c2 == X0201) { c1 &= 0x7f; } else if ((c2 == EOF) || (c2 == 0) || c2 < SPACE) { /* NOP */ + } else if (!x0213_f && 0xF0 <= c2 && c2 <= 0xF9 && 0x40 <= c1 && c1 <= 0xFC) { + /* CP932 UDC */ + if(c1 == 0x7F) return 0; + c1 = (c2 - 0xF0) * 188 + (c1 - 0x40 - (0x7E < c1)) + 0xE000 + CLASS_UNICODE; + c2 = 0; } else { - int ret = s2e_conv(c2, c1, &c2, &c1); + nkf_char ret = s2e_conv(c2, c1, &c2, &c1); if (ret) return ret; } (*oconv)(c2, c1); return 0; } -int -e_iconv(c2, c1, c0) - int c2, - c1, c0; +nkf_char e_iconv(nkf_char c2, nkf_char c1, nkf_char c0) { if (c2 == X0201) { c1 &= 0x7f; @@ -2407,20 +3242,26 @@ e_iconv(c2, c1, c0) if (c0 == 0){ return -1; } - c2 = (c2 << 8) | (c1 & 0x7f); - c1 = c0 & 0x7f; + if (!cp51932_f && !x0213_f && 0xF5 <= c1 && c1 <= 0xFE && 0xA1 <= c0 && c0 <= 0xFE) { + /* encoding is eucJP-ms, so invert to Unicode Private User Area */ + c1 = (c1 - 0xF5) * 94 + c0 - 0xA1 + 0xE3AC + CLASS_UNICODE; + c2 = 0; + } else { + c2 = (c2 << 8) | (c1 & 0x7f); + c1 = c0 & 0x7f; #ifdef SHIFTJIS_CP932 - if (cp932_f){ - int s2, s1; - if (e2s_conv(c2, c1, &s2, &s1) == 0){ - s2e_conv(s2, s1, &c2, &c1); - if ((c2 & 0xff00) == 0){ - c1 &= 0x7f; - c2 &= 0x7f; - } - } - } + if (cp51932_f){ + nkf_char s2, s1; + if (e2s_conv(c2, c1, &s2, &s1) == 0){ + s2e_conv(s2, s1, &c2, &c1); + if (c2 < 0x100){ + c1 &= 0x7f; + c2 &= 0x7f; + } + } + } #endif /* SHIFTJIS_CP932 */ + } #endif /* X0212_ENABLE */ } else if (c2 == SSO){ c2 = X0201; @@ -2428,66 +3269,126 @@ e_iconv(c2, c1, c0) } else if ((c2 == EOF) || (c2 == 0) || c2 < SPACE) { /* NOP */ } else { - c1 &= 0x7f; - c2 &= 0x7f; + if (!cp51932_f && ms_ucs_map_f && 0xF5 <= c2 && c2 <= 0xFE && 0xA1 <= c1 && c1 <= 0xFE) { + /* encoding is eucJP-ms, so invert to Unicode Private User Area */ + c1 = (c2 - 0xF5) * 94 + c1 - 0xA1 + 0xE000 + CLASS_UNICODE; + c2 = 0; + } else { + c1 &= 0x7f; + c2 &= 0x7f; +#ifdef SHIFTJIS_CP932 + if (cp51932_f && 0x79 <= c2 && c2 <= 0x7c){ + nkf_char s2, s1; + if (e2s_conv(c2, c1, &s2, &s1) == 0){ + s2e_conv(s2, s1, &c2, &c1); + if (c2 < 0x100){ + c1 &= 0x7f; + c2 &= 0x7f; + } + } + } +#endif /* SHIFTJIS_CP932 */ + } } (*oconv)(c2, c1); return 0; } #ifdef UTF8_INPUT_ENABLE -int -w2e_conv(c2, c1, c0, p2, p1) - int c2, c1, c0; - int *p2, *p1; +nkf_char w2e_conv(nkf_char c2, nkf_char c1, nkf_char c0, nkf_char *p2, nkf_char *p1) { - extern unsigned short * utf8_to_euc_2bytes[]; - extern unsigned short ** utf8_to_euc_3bytes[]; - int ret = 0; + nkf_char ret = 0; - if (0xc0 <= c2 && c2 <= 0xef) { - unsigned short **pp; - - if (0xe0 <= c2) { - if (c0 == 0) return -1; - pp = utf8_to_euc_3bytes[c2 - 0x80]; - ret = w_iconv_common(c1, c0, pp, sizeof_utf8_to_euc_C2, p2, p1); - } else { - ret = w_iconv_common(c2, c1, utf8_to_euc_2bytes, sizeof_utf8_to_euc_2bytes, p2, p1); - } + if (!c1){ + *p2 = 0; + *p1 = c2; + }else if (0xc0 <= c2 && c2 <= 0xef) { + ret = unicode_to_jis_common(c2, c1, c0, p2, p1); #ifdef NUMCHAR_OPTION - if (ret){ + if (ret > 0){ if (p2) *p2 = 0; - if (p1) *p1 = CLASS_UTF16 | ww16_conv(c2, c1, c0); + if (p1) *p1 = CLASS_UNICODE | ww16_conv(c2, c1, c0); ret = 0; } #endif - return ret; - } else if (c2 == X0201) { - c1 &= 0x7f; } - if (p2) *p2 = c2; - if (p1) *p1 = c1; return ret; } -int -w_iconv(c2, c1, c0) - int c2, - c1, c0; +nkf_char w_iconv(nkf_char c2, nkf_char c1, nkf_char c0) { - int ret = w2e_conv(c2, c1, c0, &c2, &c1); + nkf_char ret = 0; + static const int w_iconv_utf8_1st_byte[] = + { /* 0xC0 - 0xFF */ + 20, 20, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, + 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, + 30, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 32, 33, 33, + 40, 41, 41, 41, 42, 43, 43, 43, 50, 50, 50, 50, 60, 60, 70, 70}; + + if (c2 < 0 || 0xff < c2) { + }else if (c2 == 0) { /* 0 : 1 byte*/ + c0 = 0; + } else if ((c2 & 0xc0) == 0x80) { /* 0x80-0xbf : trail byte */ + return 0; + } else{ + switch (w_iconv_utf8_1st_byte[c2 - 0xC0]) { + case 21: + if (c1 < 0x80 || 0xBF < c1) return 0; + break; + case 30: + if (c0 == 0) return -1; + if (c1 < 0xA0 || 0xBF < c1 || (c0 & 0xc0) != 0x80) + return 0; + break; + case 31: + case 33: + if (c0 == 0) return -1; + if ((c1 & 0xc0) != 0x80 || (c0 & 0xc0) != 0x80) + return 0; + break; + case 32: + if (c0 == 0) return -1; + if (c1 < 0x80 || 0x9F < c1 || (c0 & 0xc0) != 0x80) + return 0; + break; + case 40: + if (c0 == 0) return -2; + if (c1 < 0x90 || 0xBF < c1 || (c0 & 0xc0c0) != 0x8080) + return 0; + break; + case 41: + if (c0 == 0) return -2; + if (c1 < 0x80 || 0xBF < c1 || (c0 & 0xc0c0) != 0x8080) + return 0; + break; + case 42: + if (c0 == 0) return -2; + if (c1 < 0x80 || 0x8F < c1 || (c0 & 0xc0c0) != 0x8080) + return 0; + break; + default: + return 0; + break; + } + } + if (c2 == 0 || c2 == EOF){ + } else if ((c2 & 0xf8) == 0xf0) { /* 4 bytes */ + c1 = CLASS_UNICODE | ww16_conv(c2, c1, c0); + c2 = 0; + } else { + ret = w2e_conv(c2, c1, c0, &c2, &c1); + } if (ret == 0){ (*oconv)(c2, c1); } return ret; } +#endif -void -w16w_conv(val, p2, p1, p0) - unsigned short val; - int *p2, *p1, *p0; +#if defined(UTF8_INPUT_ENABLE) || defined(UTF8_OUTPUT_ENABLE) +void w16w_conv(nkf_char val, nkf_char *p2, nkf_char *p1, nkf_char *p0) { + val &= VALUE_MASK; if (val < 0x80){ *p2 = val; *p1 = 0; @@ -2496,19 +3397,35 @@ w16w_conv(val, p2, p1, p0) *p2 = 0xc0 | (val >> 6); *p1 = 0x80 | (val & 0x3f); *p0 = 0; - }else{ + } else if (val <= NKF_INT32_C(0xFFFF)) { *p2 = 0xe0 | (val >> 12); *p1 = 0x80 | ((val >> 6) & 0x3f); *p0 = 0x80 | (val & 0x3f); + } else if (val <= NKF_INT32_C(0x10FFFF)) { + *p2 = 0xe0 | (val >> 16); + *p1 = 0x80 | ((val >> 12) & 0x3f); + *p0 = 0x8080 | ((val << 2) & 0x3f00)| (val & 0x3f); + } else { + *p2 = 0; + *p1 = 0; + *p0 = 0; } } +#endif -int -ww16_conv(c2, c1, c0) - int c2, c1, c0; +#ifdef UTF8_INPUT_ENABLE +nkf_char ww16_conv(nkf_char c2, nkf_char c1, nkf_char c0) { - unsigned short val; - if (c2 >= 0xe0){ + nkf_char val; + if (c2 >= 0xf8) { + val = -1; + } else if (c2 >= 0xf0){ + /* c2: 1st, c1: 2nd, c0: 3rd/4th */ + val = (c2 & 0x0f) << 18; + val |= (c1 & 0x3f) << 12; + val |= (c0 & 0x3f00) >> 2; + val |= (c0 & 0x3f); + }else if (c2 >= 0xe0){ val = (c2 & 0x0f) << 12; val |= (c1 & 0x3f) << 6; val |= (c0 & 0x3f); @@ -2521,79 +3438,227 @@ ww16_conv(c2, c1, c0) return val; } -int -w16e_conv(val, p2, p1) - unsigned short val; - int *p2, *p1; +nkf_char w16e_conv(nkf_char val, nkf_char *p2, nkf_char *p1) { - extern unsigned short * utf8_to_euc_2bytes[]; - extern unsigned short ** utf8_to_euc_3bytes[]; - int c2, c1, c0; - unsigned short **pp; - int psize; - int ret = 0; - - w16w_conv(val, &c2, &c1, &c0); - if (c1){ - if (c0){ - pp = utf8_to_euc_3bytes[c2 - 0x80]; - psize = sizeof_utf8_to_euc_C2; - ret = w_iconv_common(c1, c0, pp, psize, p2, p1); - }else{ - pp = utf8_to_euc_2bytes; - psize = sizeof_utf8_to_euc_2bytes; - ret = w_iconv_common(c2, c1, pp, psize, p2, p1); - } + nkf_char c2, c1, c0; + nkf_char ret = 0; + val &= VALUE_MASK; + if (val < 0x80){ + *p2 = 0; + *p1 = val; + }else{ + w16w_conv(val, &c2, &c1, &c0); + ret = unicode_to_jis_common(c2, c1, c0, p2, p1); #ifdef NUMCHAR_OPTION - if (ret){ - *p2 = 0; - *p1 = CLASS_UTF16 | val; - ret = 0; - } + if (ret > 0){ + *p2 = 0; + *p1 = CLASS_UNICODE | val; + ret = 0; + } #endif - }else{ - *p2 = 0; - *p1 = c2; } return ret; } +#endif -int -w_iconv16(c2, c1, c0) - int c2, c1,c0; +#ifdef UTF8_INPUT_ENABLE +nkf_char w_iconv16(nkf_char c2, nkf_char c1, nkf_char c0) { - int ret; - - if (c2==0376 && c1==0377){ - utf16_mode = UTF16LE_INPUT; - return 0; - } else if (c2==0377 && c1==0376){ - utf16_mode = UTF16BE_INPUT; - return 0; - } - if (c2 != EOF && utf16_mode == UTF16BE_INPUT) { - int tmp; - tmp=c1; c1=c2; c2=tmp; - } + nkf_char ret = 0; if ((c2==0 && c1 < 0x80) || c2==EOF) { (*oconv)(c2, c1); return 0; + }else if (0xD8 <= c2 && c2 <= 0xDB) { + if (c0 < NKF_INT32_C(0xDC00) || NKF_INT32_C(0xDFFF) < c0) + return -2; + c1 = CLASS_UNICODE | ((c2 << 18) + (c1 << 10) + c0 - NKF_INT32_C(0x35FDC00)); + c2 = 0; + }else if ((c2>>3) == 27) { /* unpaired surrogate */ + /* + return 2; + */ + return 1; + }else ret = w16e_conv(((c2 & 0xff)<<8) + c1, &c2, &c1); + if (ret) return ret; + (*oconv)(c2, c1); + return 0; +} + +nkf_char w_iconv32(nkf_char c2, nkf_char c1, nkf_char c0) +{ + int ret = 0; + + if ((c2 == 0 && c1 < 0x80) || c2==EOF) { + } else if (is_unicode_bmp(c1)) { + ret = w16e_conv(c1, &c2, &c1); + } else { + c2 = 0; + c1 = CLASS_UNICODE | c1; } - ret = w16e_conv(((c2<<8)&0xff00) + c1, &c2, &c1); if (ret) return ret; (*oconv)(c2, c1); return 0; } -int -w_iconv_common(c1, c0, pp, psize, p2, p1) - int c1,c0; - unsigned short **pp; - int psize; - int *p2, *p1; +nkf_char unicode_to_jis_common(nkf_char c2, nkf_char c1, nkf_char c0, nkf_char *p2, nkf_char *p1) { - int c2; - unsigned short *p ; + const unsigned short *const *pp; + const unsigned short *const *const *ppp; + static const int no_best_fit_chars_table_C2[] = + {1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 0, 0, 1, 0, 0, 0, 0, 1, 1, 1, 2, 1, 1, 2, + 0, 0, 1, 1, 0, 1, 0, 1, 2, 1, 1, 1, 1, 1, 1, 1}; + static const int no_best_fit_chars_table_C2_ms[] = + {1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, + 1, 0, 1, 1, 0, 1, 1, 0, 0, 0, 0, 1, 1, 1, 0, 0, + 0, 0, 1, 1, 0, 1, 0, 1, 0, 1, 0, 1, 1, 1, 1, 0}; + static const int no_best_fit_chars_table_932_C2[] = + {1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 0, 1, 1, 0, 0, 1, 1, 1, 1, 1, 1, 1, + 0, 0, 1, 1, 0, 1, 0, 1, 1, 1, 1, 1, 0, 0, 0, 0}; + static const int no_best_fit_chars_table_932_C3[] = + {1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 0, 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 0, 1, 1, 1, 1, 1, 1, 1, 1}; + nkf_char ret = 0; + + if(c2 < 0x80){ + *p2 = 0; + *p1 = c2; + }else if(c2 < 0xe0){ + if(no_best_fit_chars_f){ + if(ms_ucs_map_f == UCS_MAP_CP932){ + switch(c2){ + case 0xC2: + if(no_best_fit_chars_table_932_C2[c1&0x3F]) return 1; + break; + case 0xC3: + if(no_best_fit_chars_table_932_C3[c1&0x3F]) return 1; + break; + } + }else if(!cp932inv_f){ + switch(c2){ + case 0xC2: + if(no_best_fit_chars_table_C2[c1&0x3F]) return 1; + break; + case 0xC3: + if(no_best_fit_chars_table_932_C3[c1&0x3F]) return 1; + break; + } + }else if(ms_ucs_map_f == UCS_MAP_MS){ + if(c2 == 0xC2 && no_best_fit_chars_table_C2_ms[c1&0x3F]) return 1; + }else if(ms_ucs_map_f == UCS_MAP_CP10001){ + switch(c2){ + case 0xC2: + switch(c1){ + case 0xA2: + case 0xA3: + case 0xA5: + case 0xA6: + case 0xAC: + case 0xAF: + case 0xB8: + return 1; + } + break; + } + } + } + pp = + ms_ucs_map_f == UCS_MAP_CP932 ? utf8_to_euc_2bytes_932 : + ms_ucs_map_f == UCS_MAP_MS ? utf8_to_euc_2bytes_ms : + ms_ucs_map_f == UCS_MAP_CP10001 ? utf8_to_euc_2bytes_mac : + utf8_to_euc_2bytes; + ret = w_iconv_common(c2, c1, pp, sizeof_utf8_to_euc_2bytes, p2, p1); + }else if(c0 < 0xF0){ + if(no_best_fit_chars_f){ + if(ms_ucs_map_f == UCS_MAP_CP932){ + if(c2 == 0xE3 && c1 == 0x82 && c0 == 0x94) return 1; + }else if(ms_ucs_map_f == UCS_MAP_MS){ + switch(c2){ + case 0xE2: + switch(c1){ + case 0x80: + if(c0 == 0x94 || c0 == 0x96 || c0 == 0xBE) return 1; + break; + case 0x88: + if(c0 == 0x92) return 1; + break; + } + break; + case 0xE3: + if(c1 == 0x80 || c0 == 0x9C) return 1; + break; + } + }else if(ms_ucs_map_f == UCS_MAP_CP10001){ + switch(c2){ + case 0xE3: + switch(c1){ + case 0x82: + if(c0 == 0x94) return 1; + break; + case 0x83: + if(c0 == 0xBB) return 1; + break; + } + break; + } + }else{ + switch(c2){ + case 0xE2: + switch(c1){ + case 0x80: + if(c0 == 0x95) return 1; + break; + case 0x88: + if(c0 == 0xA5) return 1; + break; + } + break; + case 0xEF: + switch(c1){ + case 0xBC: + if(c0 == 0x8D) return 1; + break; + case 0xBD: + if(c0 == 0x9E && !cp932inv_f) return 1; + break; + case 0xBF: + if(0xA0 <= c0 && c0 <= 0xA5) return 1; + break; + } + break; + } + } + } + ppp = + ms_ucs_map_f == UCS_MAP_CP932 ? utf8_to_euc_3bytes_932 : + ms_ucs_map_f == UCS_MAP_MS ? utf8_to_euc_3bytes_ms : + ms_ucs_map_f == UCS_MAP_CP10001 ? utf8_to_euc_3bytes_mac : + utf8_to_euc_3bytes; + ret = w_iconv_common(c1, c0, ppp[c2 - 0xE0], sizeof_utf8_to_euc_C2, p2, p1); + }else return -1; +#ifdef SHIFTJIS_CP932 + if (!ret && !cp932inv_f && is_eucg3(*p2)) { + nkf_char s2, s1; + if (e2s_conv(*p2, *p1, &s2, &s1) == 0) { + s2e_conv(s2, s1, p2, p1); + }else{ + ret = 1; + } + } +#endif + return ret; +} + +nkf_char w_iconv_common(nkf_char c1, nkf_char c0, const unsigned short *const *pp, nkf_char psize, nkf_char *p2, nkf_char *p1) +{ + nkf_char c2; + const unsigned short *p; unsigned short val; if (pp == 0) return 1; @@ -2604,14 +3669,18 @@ w_iconv_common(c1, c0, pp, psize, p2, p1) if (p == 0) return 1; c0 -= 0x80; - if (c0 < 0 || sizeof_utf8_to_euc_E5B8 <= c0) return 1; + if (c0 < 0 || sizeof_utf8_to_euc_C2 <= c0) return 1; val = p[c0]; if (val == 0) return 1; + if (no_cp932ext_f && ( + (val>>8) == 0x2D || /* NEC special characters */ + val > NKF_INT32_C(0xF300) /* IBM extended characters */ + )) return 1; c2 = val >> 8; - if (val & 0x8000){ + if (val > 0x7FFF){ c2 &= 0x7f; - c2 |= 0x8f00; + c2 |= PREFIX_EUCG3; } if (c2 == SO) c2 = X0201; c1 = val & 0x7f; @@ -2620,23 +3689,116 @@ w_iconv_common(c1, c0, pp, psize, p2, p1) return 0; } +void nkf_each_char_to_hex(void (*f)(nkf_char c2,nkf_char c1), nkf_char c) +{ + const char *hex = "0123456789ABCDEF"; + int shift = 20; + c &= VALUE_MASK; + while(shift >= 0){ + if(c >= 1<= 0){ + (*f)(0, hex[(c>>shift)&0xF]); + shift -= 4; + } + }else{ + shift -= 4; + } + } + return; +} + +void encode_fallback_html(nkf_char c) +{ + (*oconv)(0, '&'); + (*oconv)(0, '#'); + c &= VALUE_MASK; + if(c >= NKF_INT32_C(1000000)) + (*oconv)(0, 0x30+(c/NKF_INT32_C(1000000))%10); + if(c >= NKF_INT32_C(100000)) + (*oconv)(0, 0x30+(c/NKF_INT32_C(100000) )%10); + if(c >= 10000) + (*oconv)(0, 0x30+(c/10000 )%10); + if(c >= 1000) + (*oconv)(0, 0x30+(c/1000 )%10); + if(c >= 100) + (*oconv)(0, 0x30+(c/100 )%10); + if(c >= 10) + (*oconv)(0, 0x30+(c/10 )%10); + if(c >= 0) + (*oconv)(0, 0x30+ c %10); + (*oconv)(0, ';'); + return; +} + +void encode_fallback_xml(nkf_char c) +{ + (*oconv)(0, '&'); + (*oconv)(0, '#'); + (*oconv)(0, 'x'); + nkf_each_char_to_hex(oconv, c); + (*oconv)(0, ';'); + return; +} + +void encode_fallback_java(nkf_char c) +{ + const char *hex = "0123456789ABCDEF"; + (*oconv)(0, '\\'); + c &= VALUE_MASK; + if(!is_unicode_bmp(c)){ + (*oconv)(0, 'U'); + (*oconv)(0, '0'); + (*oconv)(0, '0'); + (*oconv)(0, hex[(c>>20)&0xF]); + (*oconv)(0, hex[(c>>16)&0xF]); + }else{ + (*oconv)(0, 'u'); + } + (*oconv)(0, hex[(c>>12)&0xF]); + (*oconv)(0, hex[(c>> 8)&0xF]); + (*oconv)(0, hex[(c>> 4)&0xF]); + (*oconv)(0, hex[ c &0xF]); + return; +} + +void encode_fallback_perl(nkf_char c) +{ + (*oconv)(0, '\\'); + (*oconv)(0, 'x'); + (*oconv)(0, '{'); + nkf_each_char_to_hex(oconv, c); + (*oconv)(0, '}'); + return; +} + +void encode_fallback_subchar(nkf_char c) +{ + c = unicode_subchar; + (*oconv)((c>>8)&0xFF, c&0xFF); + return; +} #endif #ifdef UTF8_OUTPUT_ENABLE -int -e2w_conv(c2, c1) - int c2, c1; +nkf_char e2w_conv(nkf_char c2, nkf_char c1) { - extern unsigned short euc_to_utf8_1byte[]; - extern unsigned short * euc_to_utf8_2bytes[]; - extern unsigned short * euc_to_utf8_2bytes_ms[]; - unsigned short *p; + const unsigned short *p; if (c2 == X0201) { + if (ms_ucs_map_f == UCS_MAP_CP10001) { + switch (c1) { + case 0x20: + return 0xA0; + case 0x7D: + return 0xA9; + } + } p = euc_to_utf8_1byte; #ifdef X0212_ENABLE - } else if (c2 >> 8 == 0x8f){ - extern unsigned short * x0212_to_utf8_2bytes[]; + } else if (is_eucg3(c2)){ + if(ms_ucs_map_f == UCS_MAP_ASCII&& c2 == NKF_INT32_C(0x8F22) && c1 == 0x43){ + return 0xA6; + } c2 = (c2&0x7f) - 0x21; if (0<=c2 && c2> 6)); + (*o_putc)(0x80 | (val & 0x3f)); + } else if (val <= NKF_INT32_C(0xFFFF)) { + (*o_putc)(0xE0 | (val >> 12)); + (*o_putc)(0x80 | ((val >> 6) & 0x3f)); + (*o_putc)(0x80 | (val & 0x3f)); + } else if (val <= NKF_INT32_C(0x10FFFF)) { + (*o_putc)(0xF0 | ( val>>18)); + (*o_putc)(0x80 | ((val>>12) & 0x3f)); + (*o_putc)(0x80 | ((val>> 6) & 0x3f)); + (*o_putc)(0x80 | ( val & 0x3f)); } return; } @@ -2695,9 +3869,8 @@ w_oconv(c2, c1) output_mode = ISO8859_1; (*o_putc)(c1 | 0x080); } else { - unsigned short val; output_mode = UTF8; - val = e2w_conv(c2, c1); + val = e2w_conv(c2, c1); if (val){ w16w_conv(val, &c2, &c1, &c0); (*o_putc)(c2); @@ -2709,41 +3882,59 @@ w_oconv(c2, c1) } } -void -w_oconv16(c2, c1) - int c2, - c1; +void w_oconv16(nkf_char c2, nkf_char c1) { - if (c2 == EOF) { - (*o_putc)(EOF); - return; - } - - if (unicode_bom_f==2) { - if (w_oconv16_LE){ + if (output_bom_f) { + output_bom_f = FALSE; + if (output_endian == ENDIAN_LITTLE){ (*o_putc)((unsigned char)'\377'); (*o_putc)('\376'); }else{ (*o_putc)('\376'); (*o_putc)((unsigned char)'\377'); } - unicode_bom_f=1; + } + + if (c2 == EOF) { + (*o_putc)(EOF); + return; } if (c2 == ISO8859_1) { c2 = 0; c1 |= 0x80; #ifdef NUMCHAR_OPTION - } else if (c2 == 0 && (c1 & CLASS_MASK) == CLASS_UTF16) { - c2 = (c1 >> 8) & 0xff; - c1 &= 0xff; + } else if (c2 == 0 && is_unicode_capsule(c1)) { + if (is_unicode_bmp(c1)) { + c2 = (c1 >> 8) & 0xff; + c1 &= 0xff; + } else { + c1 &= VALUE_MASK; + if (c1 <= UNICODE_MAX) { + c2 = (c1 >> 10) + NKF_INT32_C(0xD7C0); /* high surrogate */ + c1 = (c1 & 0x3FF) + NKF_INT32_C(0xDC00); /* low surrogate */ + if (output_endian == ENDIAN_LITTLE){ + (*o_putc)(c2 & 0xff); + (*o_putc)((c2 >> 8) & 0xff); + (*o_putc)(c1 & 0xff); + (*o_putc)((c1 >> 8) & 0xff); + }else{ + (*o_putc)((c2 >> 8) & 0xff); + (*o_putc)(c2 & 0xff); + (*o_putc)((c1 >> 8) & 0xff); + (*o_putc)(c1 & 0xff); + } + } + return; + } #endif } else if (c2) { - unsigned short val = e2w_conv(c2, c1); + nkf_char val = e2w_conv(c2, c1); c2 = (val >> 8) & 0xff; c1 = val & 0xff; + if (!val) return; } - if (w_oconv16_LE){ + if (output_endian == ENDIAN_LITTLE){ (*o_putc)(c1); (*o_putc)(c2); }else{ @@ -2752,18 +3943,78 @@ w_oconv16(c2, c1) } } +void w_oconv32(nkf_char c2, nkf_char c1) +{ + if (output_bom_f) { + output_bom_f = FALSE; + if (output_endian == ENDIAN_LITTLE){ + (*o_putc)((unsigned char)'\377'); + (*o_putc)('\376'); + (*o_putc)('\000'); + (*o_putc)('\000'); + }else{ + (*o_putc)('\000'); + (*o_putc)('\000'); + (*o_putc)('\376'); + (*o_putc)((unsigned char)'\377'); + } + } + + if (c2 == EOF) { + (*o_putc)(EOF); + return; + } + + if (c2 == ISO8859_1) { + c1 |= 0x80; +#ifdef NUMCHAR_OPTION + } else if (c2 == 0 && is_unicode_capsule(c1)) { + c1 &= VALUE_MASK; +#endif + } else if (c2) { + c1 = e2w_conv(c2, c1); + if (!c1) return; + } + if (output_endian == ENDIAN_LITTLE){ + (*o_putc)( c1 & NKF_INT32_C(0x000000FF)); + (*o_putc)((c1 & NKF_INT32_C(0x0000FF00)) >> 8); + (*o_putc)((c1 & NKF_INT32_C(0x00FF0000)) >> 16); + (*o_putc)('\000'); + }else{ + (*o_putc)('\000'); + (*o_putc)((c1 & NKF_INT32_C(0x00FF0000)) >> 16); + (*o_putc)((c1 & NKF_INT32_C(0x0000FF00)) >> 8); + (*o_putc)( c1 & NKF_INT32_C(0x000000FF)); + } +} #endif -void -e_oconv(c2, c1) - int c2, - c1; +void e_oconv(nkf_char c2, nkf_char c1) { #ifdef NUMCHAR_OPTION - if (c2 == 0 && (c1 & CLASS_MASK) == CLASS_UTF16){ + if (c2 == 0 && is_unicode_capsule(c1)){ w16e_conv(c1, &c2, &c1); - if (c2 == 0 && (c1 & CLASS_MASK) == CLASS_UTF16){ - return; + if (c2 == 0 && is_unicode_capsule(c1)){ + c2 = c1 & VALUE_MASK; + if (x0212_f && 0xE000 <= c2 && c2 <= 0xE757) { + /* eucJP-ms UDC */ + c1 &= 0xFFF; + c2 = c1 / 94; + c2 += c2 < 10 ? 0x75 : 0x8FEB; + c1 = 0x21 + c1 % 94; + if (is_eucg3(c2)){ + (*o_putc)(0x8f); + (*o_putc)((c2 & 0x7f) | 0x080); + (*o_putc)(c1 | 0x080); + }else{ + (*o_putc)((c2 & 0x7f) | 0x080); + (*o_putc)(c1 | 0x080); + } + return; + } else { + if (encode_fallback) (*encode_fallback)(c1); + return; + } } } #endif @@ -2780,17 +4031,20 @@ e_oconv(c2, c1) output_mode = ISO8859_1; (*o_putc)(c1 | 0x080); #ifdef X0212_ENABLE - } else if ((c2 & 0xff00) >> 8 == 0x8f){ + } else if (is_eucg3(c2)){ output_mode = JAPANESE_EUC; #ifdef SHIFTJIS_CP932 - if (cp932_f){ - int s2, s1; + if (!cp932inv_f){ + nkf_char s2, s1; if (e2s_conv(c2, c1, &s2, &s1) == 0){ s2e_conv(s2, s1, &c2, &c1); } } #endif - if ((c2 & 0xff00) >> 8 == 0x8f){ + if (c2 == 0) { + output_mode = ASCII; + (*o_putc)(c1); + }else if (is_eucg3(c2)){ if (x0212_f){ (*o_putc)(0x8f); (*o_putc)((c2 & 0x7f) | 0x080); @@ -2802,8 +4056,7 @@ e_oconv(c2, c1) } #endif } else { - if ((c1<0x21 || 0x7e> 1) + 0xec - ndx / 8 * 3; + if (p1) *p1 = c1 + ((ndx & 1) ? ((c1 < 0x60) ? 0x1f : 0x20) : 0x7e); + return 0; + }else if(0x6E <= ndx && ndx <= 0x7E){ + if (p2) *p2 = ((ndx - 1) >> 1) + 0xbe; + if (p1) *p1 = c1 + ((ndx & 1) ? ((c1 < 0x60) ? 0x1f : 0x20) : 0x7e); + return 0; + } + return 1; + } #ifdef X0212_ENABLE - if ((c2 & 0xff00) == 0x8f00){ - ndx = c2 & 0x7f; - if (0x21 <= ndx && ndx <= 0x7e){ - ptr = x0212_shiftjis[ndx - 0x21]; - if (ptr){ - val = ptr[(c1 & 0x7f) - 0x21]; - } - if (val){ - c2 = val >> 8; - c1 = val & 0xff; - if (p2) *p2 = c2; - if (p1) *p1 = c1; - return 0; - } - } - c2 = x0212_shift(c2); - } + else if(nkf_isgraph(ndx)){ + nkf_char val = 0; + const unsigned short *ptr; + ptr = x0212_shiftjis[ndx - 0x21]; + if (ptr){ + val = ptr[(c1 & 0x7f) - 0x21]; + } + if (val){ + c2 = val >> 8; + c1 = val & 0xff; + if (p2) *p2 = c2; + if (p1) *p1 = c1; + return 0; + } + c2 = x0212_shift(c2); + } #endif /* X0212_ENABLE */ - if ((c2 & 0xff00) == 0x8f00){ - return 1; } + if(0x7F < c2) return 1; if (p2) *p2 = ((c2 - 1) >> 1) + ((c2 <= 0x5e) ? 0x71 : 0xb1); if (p1) *p1 = c1 + ((c2 & 1) ? ((c1 < 0x60) ? 0x1f : 0x20) : 0x7e); return 0; } -void -s_oconv(c2, c1) - int c2, - c1; +void s_oconv(nkf_char c2, nkf_char c1) { #ifdef NUMCHAR_OPTION - if (c2 == 0 && (c1 & CLASS_MASK) == CLASS_UTF16){ + if (c2 == 0 && is_unicode_capsule(c1)){ w16e_conv(c1, &c2, &c1); + if (c2 == 0 && is_unicode_capsule(c1)){ + c2 = c1 & VALUE_MASK; + if (!x0213_f && 0xE000 <= c2 && c2 <= 0xE757) { + /* CP932 UDC */ + c1 &= 0xFFF; + c2 = c1 / 188 + 0xF0; + c1 = c1 % 188; + c1 += 0x40 + (c1 > 0x3e); + (*o_putc)(c2); + (*o_putc)(c1); + return; + } else { + if(encode_fallback)(*encode_fallback)(c1); + return; + } + } } #endif if (c2 == EOF) { @@ -2903,7 +4174,7 @@ s_oconv(c2, c1) output_mode = ISO8859_1; (*o_putc)(c1 | 0x080); #ifdef X0212_ENABLE - } else if ((c2 & 0xff00) >> 8 == 0x8f){ + } else if (is_eucg3(c2)){ output_mode = SHIFT_JIS; if (e2s_conv(c2, c1, &c2, &c1) == 0){ (*o_putc)(c2); @@ -2911,8 +4182,7 @@ s_oconv(c2, c1) } #endif } else { - if ((c1<0x20 || 0x7e> 8; c1 = c & 0xff; @@ -2939,14 +4208,23 @@ s_oconv(c2, c1) } } -void -j_oconv(c2, c1) - int c2, - c1; +void j_oconv(nkf_char c2, nkf_char c1) { #ifdef NUMCHAR_OPTION - if ((c1 & CLASS_MASK) == CLASS_UTF16){ + if (c2 == 0 && is_unicode_capsule(c1)){ w16e_conv(c1, &c2, &c1); + if (c2 == 0 && is_unicode_capsule(c1)){ + c2 = c1 & VALUE_MASK; + if (ms_ucs_map_f && 0xE000 <= c2 && c2 <= 0xE757) { + /* CP5022x UDC */ + c1 &= 0xFFF; + c2 = 0x7F + c1 / 94; + c1 = 0x21 + c1 % 94; + } else { + if (encode_fallback) (*encode_fallback)(c1); + return; + } + } } #endif if (c2 == EOF) { @@ -2958,13 +4236,23 @@ j_oconv(c2, c1) } (*o_putc)(EOF); #ifdef X0212_ENABLE - } else if ((c2 & 0xff00) >> 8 == 0x8f){ - if (output_mode!=X0212) { - output_mode = X0212; - (*o_putc)(ESC); - (*o_putc)('$'); - (*o_putc)('('); - (*o_putc)('D'); + } else if (is_eucg3(c2)){ + if(x0213_f){ + if(output_mode!=X0213_2){ + output_mode = X0213_2; + (*o_putc)(ESC); + (*o_putc)('$'); + (*o_putc)('('); + (*o_putc)(X0213_2&0x7F); + } + }else{ + if(output_mode!=X0212){ + output_mode = X0212; + (*o_putc)(ESC); + (*o_putc)('$'); + (*o_putc)('('); + (*o_putc)(X0212&0x7F); + } } (*o_putc)(c2 & 0x7f); (*o_putc)(c1); @@ -2992,39 +4280,41 @@ j_oconv(c2, c1) } (*o_putc)(c1); } else { - if (output_mode != X0208) { + if(ms_ucs_map_f + ? c2<0x20 || 0x920) { return broken_buf[--broken_counter]; @@ -3060,21 +4350,14 @@ FILE *f; } } -int -broken_ungetc(c,f) -int c; -FILE *f; +nkf_char broken_ungetc(nkf_char c, FILE *f) { if (broken_counter<2) broken_buf[broken_counter++]=c; return c; } -static int prev_cr = 0; - -void -cr_conv(c2,c1) -int c2,c1; +void cr_conv(nkf_char c2, nkf_char c1) { if (prev_cr) { prev_cr = 0; @@ -3121,12 +4404,10 @@ int c2,c1; #define char_size(c2,c1) (c2?2:1) -void -fold_conv(c2,c1) -int c2,c1; +void fold_conv(nkf_char c2, nkf_char c1) { - int prev0; - int fold_state=0; + nkf_char prev0; + nkf_char fold_state; if (c1== '\r' && !fold_preserve_f) { fold_state=0; /* ignore cr */ @@ -3174,8 +4455,6 @@ int c2,c1; } } else if (c1=='\f') { f_prev = '\n'; - if (f_line==0) - fold_state = 1; f_line = 0; fold_state = '\n'; /* output newline and clear */ } else if ( (c2==0 && c1==' ')|| @@ -3202,7 +4481,7 @@ int c2,c1; if (f_line<=fold_len) { /* normal case */ fold_state = 1; } else { - if (f_line>=fold_len+fold_margin) { /* too many kinsou suspension */ + if (f_line>fold_len+fold_margin) { /* too many kinsoku suspension */ f_line = char_size(c2,c1); fold_state = '\n'; /* We can't wait, do fold now */ } else if (c2==X0201) { @@ -3293,15 +4572,17 @@ int c2,c1; } } -int z_prev2=0,z_prev1=0; +nkf_char z_prev2=0,z_prev1=0; -void -z_conv(c2,c1) -int c2,c1; +void z_conv(nkf_char c2, nkf_char c1) { /* if (c2) c1 &= 0x7f; assertion */ + if (c2 == X0201 && (c1 == 0x20 || c1 == 0x7D || c1 == 0x7E)) { + (*o_zconv)(c2,c1); + return; + } if (x0201_f && z_prev2==X0201) { /* X0201 */ if (c1==(0xde&0x7f)) { /* 濁点 */ z_prev2=0; @@ -3386,9 +4667,7 @@ int c2,c1; c \ ) -void -rot_conv(c2,c1) -int c2,c1; +void rot_conv(nkf_char c2, nkf_char c1) { if (c2==0 || c2==X0201 || c2==ISO8859_1) { c1 = rot13(c1); @@ -3399,24 +4678,43 @@ int c2,c1; (*o_rot_conv)(c2,c1); } -void -hira_conv(c2,c1) -int c2,c1; +void hira_conv(nkf_char c2, nkf_char c1) { - if ((hira_f & 1) && c2==0x25 && 0x20= 0x00 && c2 <= 0x20 && c1 >= 0x7f && c1 <= 0xff) { c2 = GETA1; @@ -3463,43 +4761,43 @@ int c2, c1; /* This converts =?ISO-2022-JP?B?HOGE HOGE?= */ -unsigned char *mime_pattern[] = { - (unsigned char *)"\075?EUC-JP?B?", - (unsigned char *)"\075?SHIFT_JIS?B?", - (unsigned char *)"\075?ISO-8859-1?Q?", - (unsigned char *)"\075?ISO-8859-1?B?", - (unsigned char *)"\075?ISO-2022-JP?B?", - (unsigned char *)"\075?ISO-2022-JP?Q?", -#if defined(UTF8_INPUT_ENABLE) || defined(UTF8_OUTPUT_ENABLE) - (unsigned char *)"\075?UTF-8?B?", - (unsigned char *)"\075?UTF-8?Q?", -#endif - (unsigned char *)"\075?US-ASCII?Q?", - NULL +const unsigned char *mime_pattern[] = { + (const unsigned char *)"\075?EUC-JP?B?", + (const unsigned char *)"\075?SHIFT_JIS?B?", + (const unsigned char *)"\075?ISO-8859-1?Q?", + (const unsigned char *)"\075?ISO-8859-1?B?", + (const unsigned char *)"\075?ISO-2022-JP?B?", + (const unsigned char *)"\075?ISO-2022-JP?Q?", +#if defined(UTF8_INPUT_ENABLE) + (const unsigned char *)"\075?UTF-8?B?", + (const unsigned char *)"\075?UTF-8?Q?", +#endif + (const unsigned char *)"\075?US-ASCII?Q?", + NULL }; /* 該当するコードの優先度を上げるための目印 */ -int (*mime_priority_func[])PROTO((int c2, int c1, int c0)) = { +nkf_char (*mime_priority_func[])(nkf_char c2, nkf_char c1, nkf_char c0) = { e_iconv, s_iconv, 0, 0, 0, 0, -#if defined(UTF8_INPUT_ENABLE) || defined(UTF8_OUTPUT_ENABLE) +#if defined(UTF8_INPUT_ENABLE) w_iconv, w_iconv, #endif 0, }; -int mime_encode[] = { +const nkf_char mime_encode[] = { JAPANESE_EUC, SHIFT_JIS,ISO8859_1, ISO8859_1, X0208, X0201, -#if defined(UTF8_INPUT_ENABLE) || defined(UTF8_OUTPUT_ENABLE) +#if defined(UTF8_INPUT_ENABLE) UTF8, UTF8, #endif ASCII, 0 }; -int mime_encode_method[] = { +const nkf_char mime_encode_method[] = { 'B', 'B','Q', 'B', 'B', 'Q', -#if defined(UTF8_INPUT_ENABLE) || defined(UTF8_OUTPUT_ENABLE) +#if defined(UTF8_INPUT_ENABLE) 'B', 'Q', #endif 'Q', @@ -3509,17 +4807,7 @@ int mime_encode_method[] = { #define MAXRECOVER 20 -/* I don't trust portablity of toupper */ -#define nkf_toupper(c) (('a'<=c && c<='z')?(c-('a'-'A')):c) -#define nkf_isdigit(c) ('0'<=c && c<='9') -#define nkf_isxdigit(c) (nkf_isdigit(c) || ('a'<=c && c<='f') || ('A'<=c && c <= 'F')) -#define nkf_isblank(c) (c == SPACE || c == TAB) -#define nkf_isspace(c) (nkf_isblank(c) || c == CR || c == NL) -#define nkf_isalpha(c) (('a' <= c && c <= 'z') || ('A' <= c && c <= 'Z')) -#define nkf_isalnum(c) (nkf_isdigit(c) || nkf_isalpha(c)) - -void -switch_mime_getc() +void switch_mime_getc(void) { if (i_getc!=mime_getc) { i_mgetc = i_getc; i_getc = mime_getc; @@ -3531,8 +4819,7 @@ switch_mime_getc() } } -void -unswitch_mime_getc() +void unswitch_mime_getc(void) { if(mime_f==STRICT_MIME) { i_mgetc = i_mgetc_buf; @@ -3540,16 +4827,16 @@ unswitch_mime_getc() } i_getc = i_mgetc; i_ungetc = i_mungetc; + if(mime_iconv_back)set_iconv(FALSE, mime_iconv_back); + mime_iconv_back = NULL; } -int -mime_begin_strict(f) -FILE *f; +nkf_char mime_begin_strict(FILE *f) { - int c1 = 0; + nkf_char c1 = 0; int i,j,k; - unsigned char *p,*q; - int r[MAXRECOVER]; /* recovery buffer, max mime pattern lenght */ + const unsigned char *p,*q; + nkf_char r[MAXRECOVER]; /* recovery buffer, max mime pattern length */ mime_decode_mode = FALSE; /* =? has been checked */ @@ -3561,11 +4848,13 @@ FILE *f; if ( ((r[i] = c1 = (*i_getc)(f))==EOF) || nkf_toupper(c1) != p[i] ) { /* pattern fails, try next one */ q = p; - while ((p = mime_pattern[++j])) { + while (mime_pattern[++j]) { + p = mime_pattern[j]; for(k=2;k i */ if (p[k]!=q[k]) break; if (k==i && nkf_toupper(c1)==p[k]) break; } + p = mime_pattern[j]; if (p) continue; /* found next one, continue */ /* all fails, output from recovery buffer */ (*i_ungetc)(c1,f); @@ -3577,6 +4866,7 @@ FILE *f; } mime_decode_mode = p[i-2]; + mime_iconv_back = iconv; set_iconv(FALSE, mime_priority_func[j]); clr_code_score(find_inputcode_byfunc(mime_priority_func[j]), SCORE_iMIME); @@ -3592,9 +4882,7 @@ FILE *f; return c1; } -int -mime_getc_buf(f) -FILE *f; +nkf_char mime_getc_buf(FILE *f) { /* we don't keep eof of Fifo, becase it contains ?= as a terminator. It was checked in mime_integrity. */ @@ -3602,23 +4890,18 @@ FILE *f; (*i_mgetc_buf)(f):Fifo(mime_input++)); } -int -mime_ungetc_buf(c,f) -FILE *f; -int c; +nkf_char mime_ungetc_buf(nkf_char c, FILE *f) { if (mimebuf_f) (*i_mungetc_buf)(c,f); else - Fifo(--mime_input)=c; + Fifo(--mime_input) = (unsigned char)c; return c; } -int -mime_begin(f) -FILE *f; +nkf_char mime_begin(FILE *f) { - int c1; + nkf_char c1; int i,k; /* In NONSTRICT mode, only =? is checked. In case of failure, we */ @@ -3629,7 +4912,7 @@ FILE *f; Fifo(mime_last++)='='; Fifo(mime_last++)='?'; for(i=2;i 0){ (*u)(buf[i], f); @@ -3849,26 +5101,67 @@ numchar_getc(f) return buf[0]; } -int -numchar_ungetc(c, f) - int c; - FILE *f; +nkf_char numchar_ungetc(nkf_char c, FILE *f) { return (*i_nungetc)(c, f); } #endif +#ifdef UNICODE_NORMALIZATION + +/* Normalization Form C */ +nkf_char nfc_getc(FILE *f) +{ + nkf_char (*g)(FILE *f) = i_nfc_getc; + nkf_char (*u)(nkf_char c ,FILE *f) = i_nfc_ungetc; + int i=0, j, k=1, lower, upper; + nkf_char buf[9]; + const nkf_nfchar *array; + + buf[i] = (*g)(f); + while (k > 0 && ((buf[i] & 0xc0) != 0x80)){ + lower=0, upper=NORMALIZATION_TABLE_LENGTH-1; + while (upper >= lower) { + j = (lower+upper) / 2; + array = normalization_table[j].nfd; + for (k=0; k < NORMALIZATION_TABLE_NFD_LENGTH && array[k]; k++){ + if (array[k] != buf[k]){ + array[k] < buf[k] ? (lower = j + 1) : (upper = j - 1); + k = 0; + break; + } else if (k >= i) + buf[++i] = (*g)(f); + } + if (k > 0){ + array = normalization_table[j].nfc; + for (i=0; i < NORMALIZATION_TABLE_NFC_LENGTH && array[i]; i++) + buf[i] = (nkf_char)(array[i]); + i--; + break; + } + } + while (i > 0) + (*u)(buf[i--], f); + } + return buf[0]; +} + +nkf_char nfc_ungetc(nkf_char c, FILE *f) +{ + return (*i_nfc_ungetc)(c, f); +} +#endif /* UNICODE_NORMALIZATION */ + -int -mime_getc(f) -FILE *f; +nkf_char +mime_getc(FILE *f) { - int c1, c2, c3, c4, cc; - int t1, t2, t3, t4, mode, exit_mode; - int lwsp_count; + nkf_char c1, c2, c3, c4, cc; + nkf_char t1, t2, t3, t4, mode, exit_mode; + nkf_char lwsp_count; char *lwsp_buf; char *lwsp_buf_new; - int lwsp_size = 128; + nkf_char lwsp_size = 128; if (mime_top != mime_last) { /* Something is in FIFO */ return Fifo(mime_top++); @@ -3886,13 +5179,16 @@ FILE *f; if (mime_decode_mode == 'Q') { if ((c1 = (*i_mgetc)(f)) == EOF) return (EOF); restart_mime_q: - if (c1=='_') return ' '; - if (c1!='=' && c1!='?') { + if (c1=='_' && mimebuf_f != FIXED_MIME) return ' '; + if (c1<=' ' || DEL<=c1) { + mime_decode_mode = exit_mode; /* prepare for quit */ + return c1; + } + if (c1!='=' && (c1!='?' || mimebuf_f == FIXED_MIME)) { return c1; } mime_decode_mode = exit_mode; /* prepare for quit */ - if (c1<=' ') return c1; if ((c2 = (*i_mgetc)(f)) == EOF) return (EOF); if (c1=='?'&&c2=='=' && mimebuf_f != FIXED_MIME) { /* end Q encoding */ @@ -3932,13 +5228,12 @@ restart_mime_q: break; case SPACE: case TAB: - lwsp_buf[lwsp_count] = c1; + lwsp_buf[lwsp_count] = (unsigned char)c1; if (lwsp_count++>lwsp_size){ - lwsp_size *= 2; + lwsp_size <<= 1; lwsp_buf_new = realloc(lwsp_buf, (lwsp_size+5)*sizeof(char)); if (lwsp_buf_new==NULL) { free(lwsp_buf); - lwsp_buf = NULL; perror("can't realloc"); return -1; } @@ -3948,18 +5243,13 @@ restart_mime_q: } break; } - if (lwsp_count > 0) { - if (c1=='=' && (lwsp_buf[lwsp_count-1]==SPACE||lwsp_buf[lwsp_count-1]==TAB)) { - lwsp_count = 0; - } else { - i_ungetc(c1,f); - for(lwsp_count--;lwsp_count>0;lwsp_count--) - i_ungetc(lwsp_buf[lwsp_count],f); - c1 = lwsp_buf[0]; - } + if (lwsp_count > 0 && (c1 != '=' || (lwsp_buf[lwsp_count-1] != SPACE && lwsp_buf[lwsp_count-1] != TAB))) { + i_ungetc(c1,f); + for(lwsp_count--;lwsp_count>0;lwsp_count--) + i_ungetc(lwsp_buf[lwsp_count],f); + c1 = lwsp_buf[0]; } free(lwsp_buf); - lwsp_buf = NULL; return c1; } if (c1=='='&&c2<' ') { /* this is soft wrap */ @@ -3977,9 +5267,7 @@ restart_mime_q: if ((c3 = (*i_mgetc)(f)) == EOF) return (EOF); if (c2<=' ') return c2; mime_decode_mode = 'Q'; /* still in MIME */ -#define hex(c) (('0'<=c&&c<='9')?(c-'0'):\ - ('A'<=c&&c<='F')?(c-'A'+10):('a'<=c&&c<='f')?(c-'a'+10):0) - return ((hex(c2)<<4) + hex(c3)); + return ((hex2bin(c2)<<4) + hex2bin(c3)); } if (mime_decode_mode != 'B') { @@ -4051,13 +5339,12 @@ mime_c2_retry: break; case SPACE: case TAB: - lwsp_buf[lwsp_count] = c1; + lwsp_buf[lwsp_count] = (unsigned char)c1; if (lwsp_count++>lwsp_size){ - lwsp_size *= 2; + lwsp_size <<= 1; lwsp_buf_new = realloc(lwsp_buf, (lwsp_size+5)*sizeof(char)); if (lwsp_buf_new==NULL) { free(lwsp_buf); - lwsp_buf = NULL; perror("can't realloc"); return -1; } @@ -4067,18 +5354,13 @@ mime_c2_retry: } break; } - if (lwsp_count > 0) { - if (c1=='=' && (lwsp_buf[lwsp_count-1]==SPACE||lwsp_buf[lwsp_count-1]==TAB)) { - lwsp_count = 0; - } else { - i_ungetc(c1,f); - for(lwsp_count--;lwsp_count>0;lwsp_count--) - i_ungetc(lwsp_buf[lwsp_count],f); - c1 = lwsp_buf[0]; - } + if (lwsp_count > 0 && (c1 != '=' || (lwsp_buf[lwsp_count-1] != SPACE && lwsp_buf[lwsp_count-1] != TAB))) { + i_ungetc(c1,f); + for(lwsp_count--;lwsp_count>0;lwsp_count--) + i_ungetc(lwsp_buf[lwsp_count],f); + c1 = lwsp_buf[0]; } free(lwsp_buf); - lwsp_buf = NULL; return c1; } mime_c3_retry: @@ -4108,13 +5390,13 @@ mime_c4_retry: t4 = 0x3f & base64decode(c4); cc = ((t1 << 2) & 0x0fc) | ((t2 >> 4) & 0x03); if (c2 != '=') { - Fifo(mime_last++) = cc; + Fifo(mime_last++) = (unsigned char)cc; cc = ((t2 << 4) & 0x0f0) | ((t3 >> 2) & 0x0f); if (c3 != '=') { - Fifo(mime_last++) = cc; + Fifo(mime_last++) = (unsigned char)cc; cc = ((t3 << 6) & 0x0c0) | (t4 & 0x3f); if (c4 != '=') - Fifo(mime_last++) = cc; + Fifo(mime_last++) = (unsigned char)cc; } } else { return c1; @@ -4122,26 +5404,21 @@ mime_c4_retry: return Fifo(mime_top++); } -int -mime_ungetc(c,f) -int c; -FILE *f; +nkf_char mime_ungetc(nkf_char c, FILE *f) { - Fifo(--mime_top) = c; + Fifo(--mime_top) = (unsigned char)c; return c; } -int -mime_integrity(f,p) -FILE *f; -unsigned char *p; +nkf_char mime_integrity(FILE *f, const unsigned char *p) { - int c,d; + nkf_char c,d; unsigned int q; /* In buffered mode, read until =? or NL or buffer full */ mime_input = mime_top; mime_last = mime_top; + while(*p) Fifo(mime_input++) = *p++; d = 0; q = mime_input; @@ -4151,7 +5428,7 @@ unsigned char *p; } if (c=='=' && d=='?') { /* checked. skip header, start decode */ - Fifo(mime_input++) = c; + Fifo(mime_input++) = (unsigned char)c; /* mime_last_input = mime_input; */ mime_input = q; switch_mime_getc(); @@ -4160,20 +5437,18 @@ unsigned char *p; if (!( (c=='+'||c=='/'|| c=='=' || c=='?' || is_alnum(c)))) break; /* Should we check length mod 4? */ - Fifo(mime_input++) = c; + Fifo(mime_input++) = (unsigned char)c; d=c; } /* In case of Incomplete MIME, no MIME decode */ - Fifo(mime_input++) = c; + Fifo(mime_input++) = (unsigned char)c; mime_last = mime_input; /* point undecoded buffer */ mime_decode_mode = 1; /* no decode on Fifo last in mime_getc */ switch_mime_getc(); /* anyway we need buffered getc */ return 1; } -int -base64decode(c) - int c; +nkf_char base64decode(nkf_char c) { int i; if (c > '@') { @@ -4192,25 +5467,23 @@ base64decode(c) return (i); } -static char basis_64[] = +static const char basis_64[] = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/"; -static int b64c; +static nkf_char b64c; #define MIMEOUT_BUF_LENGTH (60) char mimeout_buf[MIMEOUT_BUF_LENGTH+1]; int mimeout_buf_count = 0; int mimeout_preserve_space = 0; #define itoh4(c) (c>=10?c+'A'-10:c+'0') -void -open_mime(mode) -int mode; +void open_mime(nkf_char mode) { - unsigned char *p; + const unsigned char *p; int i; int j; p = mime_pattern[0]; - for(i=0;mime_encode[i];i++) { + for(i=0;mime_pattern[i];i++) { if (mode == mime_encode[i]) { p = mime_pattern[i]; break; @@ -4257,8 +5530,7 @@ int mode; } } -void -close_mime() +void close_mime(void) { (*o_mputc)('?'); (*o_mputc)('='); @@ -4266,8 +5538,7 @@ close_mime() mimeout_mode = 0; } -void -eof_mime() +void eof_mime(void) { switch(mimeout_mode) { case 'Q': @@ -4293,19 +5564,14 @@ eof_mime() } } -void -mimeout_addchar(c) - int c; +void mimeout_addchar(nkf_char c) { switch(mimeout_mode) { case 'Q': - if(c==SPACE){ - (*o_mputc)('_'); - base64_count++; - } else if (c==CR||c==NL) { + if (c==CR||c==NL) { (*o_mputc)(c); base64_count = 0; - } else if(c 70) { + (*o_mputc)(NL); + base64_count = 0; + } + if (!nkf_isblank(c)) { + (*o_mputc)(SPACE); + base64_count++; + } } (*o_mputc)(c); base64_count++; @@ -4453,11 +5731,12 @@ mime_putc(c) base64_count++; } } - mimeout_buf[0] = c; + mimeout_buf[0] = (char)c; mimeout_buf_count = 1; }else{ if (base64_count > 1 - && base64_count + mimeout_buf_count > 76){ + && base64_count + mimeout_buf_count > 76 + && mimeout_buf[0] != CR && mimeout_buf[0] != NL){ (*o_mputc)(NL); base64_count = 0; if (!nkf_isspace(mimeout_buf[0])){ @@ -4465,7 +5744,7 @@ mime_putc(c) base64_count++; } } - mimeout_buf[mimeout_buf_count++] = c; + mimeout_buf[mimeout_buf_count++] = (char)c; if (mimeout_buf_count>MIMEOUT_BUF_LENGTH) { open_mime(output_mode); } @@ -4518,7 +5797,7 @@ mime_putc(c) mimeout_buf_count = 0; } } - mimeout_buf[mimeout_buf_count++] = c; + mimeout_buf[mimeout_buf_count++] = (char)c; if (mimeout_buf_count>MIMEOUT_BUF_LENGTH) { eof_mime(); for (i=0;i0 && SPACEMIMEOUT_BUF_LENGTH) { j = mimeout_buf_count; mimeout_buf_count = 0; @@ -4564,8 +5843,7 @@ mime_putc(c) #if defined(PERL_XS) || defined(WIN32DLL) -void -reinit() +void reinit(void) { { struct input_code *p = input_code_list; @@ -4593,10 +5871,22 @@ reinit() x0201_f = NO_X0201; #endif iso2022jp_f = FALSE; +#if defined(UTF8_INPUT_ENABLE) || defined(UTF8_OUTPUT_ENABLE) + ms_ucs_map_f = UCS_MAP_ASCII; +#endif +#ifdef UTF8_INPUT_ENABLE + no_cp932ext_f = FALSE; + no_best_fit_chars_f = FALSE; + encode_fallback = NULL; + unicode_subchar = '?'; + input_endian = ENDIAN_BIG; +#endif #ifdef UTF8_OUTPUT_ENABLE - unicode_bom_f = 0; - w_oconv16_LE = 0; - ms_ucs_map_f = FALSE; + output_bom_f = FALSE; + output_endian = ENDIAN_BIG; +#endif +#ifdef UNICODE_NORMALIZATION + nfc_f = FALSE; #endif #ifdef INPUT_OPTION cap_f = FALSE; @@ -4614,18 +5904,20 @@ reinit() exec_f = 0; #endif #ifdef SHIFTJIS_CP932 - cp932_f = TRUE; + cp51932_f = TRUE; cp932inv_f = TRUE; #endif +#ifdef X0212_ENABLE + x0212_f = FALSE; + x0213_f = FALSE; +#endif { int i; for (i = 0; i < 256; i++){ prefix_table[i] = 0; } } -#ifdef UTF8_INPUT_ENABLE - utf16_mode = UTF16LE_INPUT; -#endif + hold_count = 0; mimeout_buf_count = 0; mimeout_mode = 0; base64_count = 0; @@ -4660,7 +5952,7 @@ reinit() input_mode = ASCII; shift_mode = FALSE; mime_decode_mode = FALSE; - file_out = FALSE; + file_out_f = FALSE; crmode_f = 0; option_mode = 0; broken_counter = 0; @@ -4676,16 +5968,12 @@ reinit() } #endif -void -no_connection(c2,c1) -int c2,c1; +void no_connection(nkf_char c2, nkf_char c1) { no_connection2(c2,c1,0); } -int -no_connection2(c2,c1,c0) -int c2,c1,c0; +nkf_char no_connection2(nkf_char c2, nkf_char c1, nkf_char c0) { fprintf(stderr,"nkf internal module connection failure.\n"); exit(1); @@ -4696,79 +5984,87 @@ int c2,c1,c0; #ifdef WIN32DLL #define fprintf dllprintf #endif -void -usage() +void usage(void) { fprintf(stderr,"USAGE: nkf(nkf32,wnkf,nkf2) -[flags] [in file] .. [out file for -O flag]\n"); fprintf(stderr,"Flags:\n"); fprintf(stderr,"b,u Output is buffered (DEFAULT),Output is unbuffered\n"); #ifdef DEFAULT_CODE_SJIS - fprintf(stderr,"j,s,e,w Outout code is JIS 7 bit, Shift JIS (DEFAULT), AT&T JIS (EUC), UTF-8\n"); + fprintf(stderr,"j,s,e,w Output code is JIS 7 bit, Shift_JIS (DEFAULT), EUC-JP, UTF-8N\n"); #endif #ifdef DEFAULT_CODE_JIS - fprintf(stderr,"j,s,e,w Outout code is JIS 7 bit (DEFAULT), Shift JIS, AT&T JIS (EUC), UTF-8\n"); + fprintf(stderr,"j,s,e,w Output code is JIS 7 bit (DEFAULT), Shift JIS, EUC-JP, UTF-8N\n"); #endif #ifdef DEFAULT_CODE_EUC - fprintf(stderr,"j,s,e,w Outout code is JIS 7 bit, Shift JIS, AT&T JIS (EUC) (DEFAULT), UTF-8\n"); + fprintf(stderr,"j,s,e,w Output code is JIS 7 bit, Shift JIS, EUC-JP (DEFAULT), UTF-8N\n"); #endif #ifdef DEFAULT_CODE_UTF8 - fprintf(stderr,"j,s,e,w Outout code is JIS 7 bit, Shift JIS, AT&T JIS (EUC), UTF-8 (DEFAULT)\n"); + fprintf(stderr,"j,s,e,w Output code is JIS 7 bit, Shift JIS, EUC-JP, UTF-8N (DEFAULT)\n"); #endif #ifdef UTF8_OUTPUT_ENABLE - fprintf(stderr," After 'w' you can add more options. (80?|16((B|L)0?)?) \n"); + fprintf(stderr," After 'w' you can add more options. -w[ 8 [0], 16 [[BL] [0]] ]\n"); #endif - fprintf(stderr,"J,S,E,W Input assumption is JIS 7 bit , Shift JIS, AT&T JIS (EUC), UTF-8\n"); + fprintf(stderr,"J,S,E,W Input assumption is JIS 7 bit , Shift JIS, EUC-JP, UTF-8\n"); #ifdef UTF8_INPUT_ENABLE - fprintf(stderr," After 'W' you can add more options. (8|16(B|L)?) \n"); + fprintf(stderr," After 'W' you can add more options. -W[ 8, 16 [BL] ] \n"); #endif fprintf(stderr,"t no conversion\n"); - fprintf(stderr,"i_/o_ Output sequence to designate JIS-kanji/ASCII (DEFAULT B)\n"); + fprintf(stderr,"i[@B] Specify the Esc Seq for JIS X 0208-1978/83 (DEFAULT B)\n"); + fprintf(stderr,"o[BJH] Specify the Esc Seq for ASCII/Roman (DEFAULT B)\n"); fprintf(stderr,"r {de/en}crypt ROT13/47\n"); - fprintf(stderr,"h 1 hirakana->katakana, 2 katakana->hirakana,3 both\n"); + fprintf(stderr,"h 1 katakana->hiragana, 2 hiragana->katakana, 3 both\n"); fprintf(stderr,"v Show this usage. V: show version\n"); fprintf(stderr,"m[BQN0] MIME decode [B:base64,Q:quoted,N:non-strict,0:no decode]\n"); fprintf(stderr,"M[BQ] MIME encode [B:base64 Q:quoted]\n"); fprintf(stderr,"l ISO8859-1 (Latin-1) support\n"); fprintf(stderr,"f/F Folding: -f60 or -f or -f60-10 (fold margin 10) F preserve nl\n"); - fprintf(stderr,"Z[0-3] Convert X0208 alphabet to ASCII 1: Kankaku to space,2: 2 spaces,\n"); - fprintf(stderr," 3: Convert HTML Entity\n"); + fprintf(stderr,"Z[0-3] Convert X0208 alphabet to ASCII\n"); + fprintf(stderr," 1: Kankaku to 1 space 2: to 2 spaces 3: Convert to HTML Entity\n"); fprintf(stderr,"X,x Assume X0201 kana in MS-Kanji, -x preserves X0201\n"); fprintf(stderr,"B[0-2] Broken input 0: missing ESC,1: any X on ESC-[($]-X,2: ASCII on NL\n"); #ifdef MSDOS fprintf(stderr,"T Text mode output\n"); #endif fprintf(stderr,"O Output to File (DEFAULT 'nkf.out')\n"); - fprintf(stderr,"d,c Delete \\r in line feed and \\032, Add \\r in line feed\n"); fprintf(stderr,"I Convert non ISO-2022-JP charactor to GETA\n"); + fprintf(stderr,"d,c Convert line breaks -d: LF -c: CRLF\n"); fprintf(stderr,"-L[uwm] line mode u:LF w:CRLF m:CR (DEFAULT noconversion)\n"); - fprintf(stderr,"long name options\n"); - fprintf(stderr," --fj,--unix,--mac,--windows convert for the system\n"); - fprintf(stderr," --jis,--euc,--sjis,--utf8,--utf16,--mime,--base64 convert for the code\n"); - fprintf(stderr," --hiragana, --katakana Hiragana/Katakana Conversion\n"); - fprintf(stderr," --x0212 Convert JISX0212\n"); - fprintf(stderr," --cp932, --no-cp932 CP932 compatibility\n"); + fprintf(stderr,"\n"); + fprintf(stderr,"Long name options\n"); + fprintf(stderr," --ic= --oc=\n"); + fprintf(stderr," Specify the input or output codeset\n"); + fprintf(stderr," --fj --unix --mac --windows\n"); + fprintf(stderr," --jis --euc --sjis --utf8 --utf16 --mime --base64\n"); + fprintf(stderr," Convert for the system or code\n"); + fprintf(stderr," --hiragana --katakana --katakana-hiragana\n"); + fprintf(stderr," To Hiragana/Katakana Conversion\n"); + fprintf(stderr," --prefix= Insert escape before troublesome characters of Shift_JIS\n"); #ifdef INPUT_OPTION fprintf(stderr," --cap-input, --url-input Convert hex after ':' or '%%'\n"); #endif #ifdef NUMCHAR_OPTION fprintf(stderr," --numchar-input Convert Unicode Character Reference\n"); #endif -#ifdef UTF8_OUTPUT_ENABLE - fprintf(stderr," --ms-ucs-map Microsoft UCS Mapping Compatible\n"); +#ifdef UTF8_INPUT_ENABLE + fprintf(stderr," --fb-{skip, html, xml, perl, java, subchar}\n"); + fprintf(stderr," Specify how nkf handles unassigned characters\n"); #endif #ifdef OVERWRITE - fprintf(stderr," --overwrite Overwrite original listed files by filtered result\n"); -#endif - fprintf(stderr," -g, --guess Guess the input code\n"); - fprintf(stderr," --help,--version\n"); + fprintf(stderr," --in-place[=SUFFIX] --overwrite[=SUFFIX]\n"); + fprintf(stderr," Overwrite original listed files by filtered result\n"); + fprintf(stderr," --overwrite preserves timestamp of original files\n"); +#endif + fprintf(stderr," -g --guess Guess the input code\n"); + fprintf(stderr," --help --version Show this help/the version\n"); + fprintf(stderr," For more information, see also man nkf\n"); + fprintf(stderr,"\n"); version(); } -void -version() +void version(void) { fprintf(stderr,"Network Kanji Filter Version %s (%s) " -#if defined(MSDOS) && !defined(__WIN32__) && !defined(__WIN16__) +#if defined(MSDOS) && !defined(__WIN32__) && !defined(__WIN16__) && !defined(__OS2__) "for DOS" #endif #if defined(MSDOS) && defined(__WIN16__)