X-Git-Url: http://git.sourceforge.jp/view?p=nkf%2Fnkf.git;a=blobdiff_plain;f=nkf.c;h=b2a963197a73affdd42c71df764351c3b11ae327;hp=6d32401bc0e475acfea7053486668ede296a17ab;hb=31a6ee409f17e7c1c9cf92e033329636b0cb1720;hpb=78ec90570b4c2adbc91541211b647c6417f58ce9 diff --git a/nkf.c b/nkf.c index 6d32401..b2a9631 100644 --- a/nkf.c +++ b/nkf.c @@ -1,7 +1,7 @@ /** Network Kanji Filter. (PDS Version) ************************************************************************ ** Copyright (C) 1987, Fujitsu LTD. (Itaru ICHIKAWA) -** 連絡先： （株）富士通研究所　ソフト３研　市川　至 +** 連絡先： （株）富士通研究所　ソフト３研　市川　至 ** （E-Mail Address: ichikawa@flab.fujitsu.co.jp） ** Copyright (C) 1996,1998 ** Copyright (C) 2002 @@ -17,85 +17,29 @@ ** バイナリの配布の際にはversion messageを保存することを条件とします。 ** このプログラムについては特に何の保証もしない、悪しからず。 ** -** Everyone is permitted to do anything on this program +** Everyone is permitted to do anything on this program ** including copying, modifying, improving, ** as long as you don't try to pretend that you wrote it. -** i.e., the above copyright notice has to appear in all copies. +** i.e., the above copyright notice has to appear in all copies. ** Binary distribution requires original version messages. ** You don't have to ask before copying, redistribution or publishing. ** THE AUTHOR DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE. ***********************************************************************/ /*********************************************************************** -** UTF-8 サポートについて -** 従来の nkf と入れかえてそのまま使えるようになっています -** nkf -e などとして起動すると、自動判別で UTF-8 と判定されれば、 -** そのまま euc-jp に変換されます -** -** まだバグがある可能性が高いです。 -** (特に自動判別、コード混在、エラー処理系) -** -** 何か問題を見つけたら、 -** E-Mail: furukawa@tcp-ip.or.jp -** まで御連絡をお願いします。 + * 現在、nkf は SorceForge にてメンテナンスが続けられています。 + * http://sourceforge.jp/projects/nkf/ ***********************************************************************/ -/* $Id: nkf.c,v 1.77 2005/08/10 20:48:31 naruse Exp $ */ -#define NKF_VERSION "2.0.5" -#define NKF_RELEASE_DATE "2005-08-11" -#include "config.h" - +/* $Id: nkf.c,v 1.137 2007/10/01 14:29:21 naruse Exp $ */ +#define NKF_VERSION "2.0.8" +#define NKF_RELEASE_DATE "2007-10-01" #define COPY_RIGHT \ - "Copyright (C) 1987, FUJITSU LTD. (I.Ichikawa),2000 S. Kono, COW, 2002-2005 Kono, Furukawa, Naruse" - - -/* -** -** -** -** USAGE: nkf [flags] [file] -** -** Flags: -** b Output is buffered (DEFAULT) -** u Output is unbuffered -** -** t no operation -** -** j Outout 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) -** l Output code is JIS 7bit and ISO8859-1 Latin-1 -** -** m MIME conversion for ISO-2022-JP -** I Convert non ISO-2022-JP charactor to GETA by Pekoe -** i_ Output sequence to designate JIS-kanji (DEFAULT_J) -** o_ Output sequence to designate single-byte roman characters (DEFAULT_R) -** M MIME output conversion -** -** r {de/en}crypt ROT13/47 -** -** v display Version -** -** T Text mode output (for MS-DOS) -** -** x Do not convert X0201 kana into X0208 -** Z Convert X0208 alphabet to ASCII -** -** f60 fold option -** -** m MIME decode -** B try to fix broken JIS, missing Escape -** B[1-9] broken level -** -** O Output to 'nkf.out' file or last file name -** d Delete \r in line feed -** c Add \r in line feed -** -- other long option -** -- ignore following option (don't use with -O ) -** -**/ + "Copyright (C) 1987, FUJITSU LTD. (I.Ichikawa),2000 S. Kono, COW\n" \ + "Copyright (C) 2002-2007 Kono, Furukawa, Naruse, mastodon" -#if (defined(__TURBOC__) || defined(_MSC_VER) || defined(LSI_C) || defined(__MINGW32__)) && !defined(MSDOS) +#include "config.h" +#include "utf8tbl.h" +#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__ @@ -113,21 +57,38 @@ #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 */ @@ -145,10 +106,17 @@ #ifdef OVERWRITE /* added by satoru@isoternet.org */ +#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 +125,7 @@ #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,16 +133,12 @@ #endif /* (__WIN32__) */ #endif #endif -#endif - -#ifdef INT_IS_SHORT -#define int long #endif #define FALSE 0 #define TRUE 1 -/* state of output_mode and input_mode +/* state of output_mode and input_mode c2 0 means ASCII X0201 @@ -190,11 +154,14 @@ #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 +175,15 @@ #define UTF8 12 #define UTF8_INPUT 13 -#define UTF16BE_INPUT 14 -#define UTF16LE_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 @@ -217,10 +191,10 @@ #define BS 0x08 #define TAB 0x09 -#define NL 0x0a +#define LF 0x0a #define CR 0x0d #define ESC 0x1b -#define SPACE 0x20 +#define SP 0x20 #define AT 0x40 #define SSP 0xa0 #define DEL 0x7f @@ -228,12 +202,40 @@ #define SO 0x0e #define SSO 0x8e #define SS3 0x8f +#define CRLF 0x0D0A #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 == SP || c == TAB) +#define nkf_isspace(c) (nkf_isblank(c) || c == CR || c == LF) +#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) (SP<=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 bin2hex(c) ("0123456789ABCDEF"[c&15]) +#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' @@ -247,13 +249,12 @@ #if defined(UTF8_OUTPUT_ENABLE) || defined(UTF8_INPUT_ENABLE) -#define sizeof_euc_utf8 94 #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 */ @@ -262,266 +263,297 @@ extern POINT _BufferSize; #endif -/* function prototype */ - -#ifdef ANSI_C_PROTOTYPE -#define PROTO(x) x -#define STATIC static -#define CONST const -#else -#define PROTO(x) () -#define STATIC -#define CONST -#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 = NULL; /* NULL: unestablished, "": BINARY */ #ifndef PERL_XS -STATIC const char *CopyRight = COPY_RIGHT; +static const char *CopyRight = COPY_RIGHT; #endif #if !defined(PERL_XS) && !defined(WIN32DLL) -STATIC int noconvert PROTO((FILE *f)); -#endif -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)); +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,const unsigned short *const *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,const 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 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 nl_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 PROTO(()); -STATIC void version PROTO(()); +static void usage(void); +static void version(void); #endif -STATIC void options PROTO((unsigned char *c)); +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]; +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 unsigned char hold_buf[HOLD_SIZE*2]; +static int hold_count = 0; /* MIME preprocessor fifo */ #define MIME_BUF_SIZE (1024) /* 2^n ring buffer */ -#define MIME_BUF_MASK (MIME_BUF_SIZE-1) +#define MIME_BUF_MASK (MIME_BUF_SIZE-1) #define Fifo(n) mime_buf[(n)&MIME_BUF_MASK] -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 int (*mime_iconv_back)PROTO((int c2,int c1,int c0)) = NULL; +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; -STATIC int estab_f = FALSE; -STATIC int nop_f = FALSE; -STATIC int binmode_f = TRUE; /* binary mode */ -STATIC int rot_f = FALSE; /* rot14/43 mode */ -STATIC int hira_f = FALSE; /* hira/kata henkan */ -STATIC int input_f = FALSE; /* non fixed input code */ -STATIC int alpha_f = FALSE; /* convert JIx0208 alphbet to ASCII */ -STATIC int mime_f = STRICT_MIME; /* convert MIME B base64 or Q */ -STATIC int mime_decode_f = FALSE; /* mime decode is explicitly on */ -STATIC int mimebuf_f = FALSE; /* MIME buffered input */ -STATIC int broken_f = FALSE; /* convert ESC-less broken JIS */ -STATIC int iso8859_f = FALSE; /* ISO8859 through */ -STATIC int mimeout_f = FALSE; /* base64 mode */ -#if defined(MSDOS) || defined(__OS2__) -STATIC int x0201_f = TRUE; /* Assume JISX0201 kana */ +static int unbuf_f = FALSE; +static int estab_f = FALSE; +static int nop_f = FALSE; +static int binmode_f = TRUE; /* binary mode */ +static int rot_f = FALSE; /* rot14/43 mode */ +static int hira_f = FALSE; /* hira/kata henkan */ +static int input_f = FALSE; /* non fixed input code */ +static int alpha_f = FALSE; /* convert JIx0208 alphbet to ASCII */ +static int mime_f = STRICT_MIME; /* convert MIME B base64 or Q */ +static int mime_decode_f = FALSE; /* mime decode is explicitly on */ +static int mimebuf_f = FALSE; /* MIME buffered input */ +static int broken_f = FALSE; /* convert ESC-less broken JIS */ +static int iso8859_f = FALSE; /* ISO8859 through */ +static int mimeout_f = FALSE; /* base64 mode */ +#if defined(MSDOS) || defined(__OS2__) +static int x0201_f = TRUE; /* Assume JISX0201 kana */ #else -STATIC int x0201_f = NO_X0201; /* Assume NO JISX0201 */ -#endif -STATIC int iso2022jp_f = FALSE; /* convert ISO-2022-JP */ -#if defined(UTF8_OUTPUT_ENABLE) && defined(UTF8_INPUT_ENABLE) -STATIC int internal_unicode_f = FALSE; /* Internal Unicode Processing */ -#endif -#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 */ +static int x0201_f = NO_X0201; /* Assume NO JISX0201 */ #endif +static int iso2022jp_f = FALSE; /* convert ISO-2022-JP */ #ifdef UNICODE_NORMALIZATION -STATIC int nfc_f = FALSE; -STATIC int (*i_nfc_getc)PROTO((FILE *)) = std_getc; /* input of ugetc */ -STATIC int (*i_nfc_ungetc)PROTO((int c ,FILE *f)) = std_ungetc; -STATIC int nfc_getc PROTO((FILE *f)); -STATIC int nfc_ungetc PROTO((int c,FILE *f)); +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 int cap_f = FALSE; +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 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 -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)); +#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 -#define CLASS_MASK 0x0f000000 -#define CLASS_UTF16 0x01000000 -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 int numchar_f = FALSE; +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((const char *str)); -STATIC int (*iconv_for_check)() = 0; +static int noout_f = FALSE; +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 int guess_f = FALSE; #if !defined PERL_XS -STATIC void print_guessed_code PROTO((char *filename)); +static void print_guessed_code(char *filename); #endif -STATIC void set_input_codename PROTO((char *codename)); -STATIC int is_inputcode_mixed = FALSE; -STATIC int is_inputcode_set = FALSE; +static void set_input_codename(char *codename); +static int is_inputcode_mixed = FALSE; #ifdef EXEC_IO -STATIC int exec_f = 0; +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 unsigned char prefix_table[256]; -STATIC void e_status PROTO((struct input_code *, int)); -STATIC void s_status PROTO((struct input_code *, int)); - -#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 = UTF16BE_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} }; -STATIC int mimeout_mode = 0; -STATIC int base64_count = 0; +static int mimeout_mode = 0; +static int base64_count = 0; /* X0208 -> ASCII converter */ /* fold parameter */ -STATIC int f_line = 0; /* chars in line */ -STATIC int f_prev = 0; -STATIC int fold_preserve_f = FALSE; /* preserve new lines */ -STATIC int fold_f = FALSE; -STATIC int fold_len = 0; +static int f_line = 0; /* chars in line */ +static int f_prev = 0; +static int fold_preserve_f = FALSE; /* preserve new lines */ +static int fold_f = FALSE; +static int fold_len = 0; /* options */ -STATIC unsigned char kanji_intro = DEFAULT_J; -STATIC unsigned char ascii_intro = DEFAULT_R; +static unsigned char kanji_intro = DEFAULT_J; +static unsigned char ascii_intro = DEFAULT_R; /* Folding */ #define FOLD_MARGIN 10 #define DEFAULT_FOLD 60 -STATIC int fold_margin = FOLD_MARGIN; +static int fold_margin = FOLD_MARGIN; /* converters */ @@ -539,51 +571,50 @@ 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_nlconv)(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 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 */ +static int output_mode = ASCII, /* output kanji mode */ input_mode = ASCII, /* input kanji mode */ shift_mode = FALSE; /* TRUE shift out, or X0201 */ -STATIC int mime_decode_mode = FALSE; /* MIME mode B base64, Q hex */ +static int mime_decode_mode = FALSE; /* MIME mode B base64, Q hex */ /* X0201 / X0208 conversion tables */ /* X0201 kana conversion table */ /* 90-9F A0-DF */ -STATIC const -unsigned char cv[]= { +static const unsigned char cv[]= { 0x21,0x21,0x21,0x23,0x21,0x56,0x21,0x57, 0x21,0x22,0x21,0x26,0x25,0x72,0x25,0x21, 0x25,0x23,0x25,0x25,0x25,0x27,0x25,0x29, @@ -605,8 +636,7 @@ unsigned char cv[]= { /* X0201 kana conversion table for daguten */ /* 90-9F A0-DF */ -STATIC const -unsigned char dv[]= { +static const unsigned char dv[]= { 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, @@ -627,8 +657,7 @@ unsigned char dv[]= { /* X0201 kana conversion table for han-daguten */ /* 90-9F A0-DF */ -STATIC const -unsigned char ev[]= { +static const unsigned char ev[]= { 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, @@ -650,8 +679,7 @@ unsigned char ev[]= { /* X0208 kigou conversion table */ /* 0x8140 - 0x819e */ -STATIC const -unsigned char fv[] = { +static const unsigned char fv[] = { 0x00,0x00,0x00,0x00,0x2c,0x2e,0x00,0x3a, 0x3b,0x3f,0x21,0x00,0x00,0x27,0x60,0x00, @@ -668,30 +696,31 @@ 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 int nlmode_f = 0; /* CR, LF, CRLF */ +static nkf_char prev_cr = 0; #ifdef EASYWIN /*Easy Win */ -STATIC int end_check; +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; @@ -738,8 +767,8 @@ main(argc, argv) x0201_f = ((!iso2022jp_f)? TRUE : NO_X0201); if (binmode_f == TRUE) -#ifdef __OS2__ - if (freopen("","wb",stdout) == NULL) +#if defined(__OS2__) && (defined(__IBMC__) || defined(__IBMCPP__)) + if (freopen("","wb",stdout) == NULL) return (-1); #else setbinmode(stdout); @@ -748,16 +777,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 { @@ -766,16 +795,18 @@ main(argc, argv) } } else { int nfiles = argc; + int is_argument_error = FALSE; while (argc--) { is_inputcode_mixed = FALSE; - is_inputcode_set = FALSE; - input_codename = ""; + input_codename = NULL; #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; @@ -783,9 +814,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); @@ -807,7 +838,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"); @@ -822,7 +853,7 @@ main(argc, argv) } }else #endif - if(argc == 1 ) { + if(argc == 1) { outfname = *argv++; argc--; } else { @@ -834,8 +865,8 @@ main(argc, argv) return (-1); } if (binmode_f == TRUE) { -#ifdef __OS2__ - if (freopen("","wb",stdout) == NULL) +#if defined(__OS2__) && (defined(__IBMC__) || defined(__IBMCPP__)) + if (freopen("","wb",stdout) == NULL) return (-1); #else setbinmode(stdout); @@ -843,13 +874,13 @@ main(argc, argv) } } if (binmode_f == TRUE) -#ifdef __OS2__ - if (freopen("","rb",fin) == NULL) +#if defined(__OS2__) && (defined(__IBMC__) || defined(__IBMCPP__)) + if (freopen("","rb",fin) == NULL) return (-1); #else setbinmode(fin); -#endif - setvbuffer(fin, stdibuf, IOBUF_SIZE); +#endif + setvbuffer(fin, (char *) stdibuf, IOBUF_SIZE); if (nop_f) noconvert(fin); else { @@ -860,9 +891,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; @@ -882,23 +913,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", @@ -909,25 +954,69 @@ 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 + 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 const -struct { +#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 { const char *name; const char *alias; } long_option[] = { + {"ic=", ""}, + {"oc=", ""}, {"base64","jMB"}, {"euc","e"}, {"euc-input","E"}, @@ -953,23 +1042,32 @@ struct { #ifdef X0212_ENABLE {"x0212", ""}, #endif -#if defined(UTF8_OUTPUT_ENABLE) && defined(UTF8_INPUT_ENABLE) - {"internal-unicode", ""}, -#endif #ifdef UTF8_OUTPUT_ENABLE {"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", ""}, @@ -992,46 +1090,355 @@ struct { {"prefix=", ""}, }; -STATIC int option_mode = 0; +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; while(*cp && *cp++!='-'); - while (*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 == SP) { /* ignore the rest of arguments */ option_mode = 1; return; } for (i=0;iname); +#ifdef CHECK_OPTION + debug(result->name); +#endif } } return 1; } -int -h_conv(f, c2, c1) - FILE *f; - int c1, - c2; +nkf_char +h_conv(FILE *f, nkf_char c2, nkf_char c1) { - int wc,c3; + nkf_char ret, c3, c0; + int hold_index; /** it must NOT be in the kanji shifte sequence */ @@ -2290,7 +2977,6 @@ h_conv(f, c2, c1) hold_count = 0; push_hold_buf(c2); push_hold_buf(c1); - c2 = 0; while ((c1 = (*i_getc)(f)) != EOF) { if (c1 == ESC){ @@ -2310,12 +2996,12 @@ h_conv(f, c2, c1) code_status(c1); } while (p->name){ - 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); } @@ -2328,13 +3014,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); @@ -2343,8 +3029,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){ @@ -2353,61 +3039,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) { #if defined(SHIFTJIS_CP932) || defined(X0212_ENABLE) - int val; + nkf_char val; #endif + static const 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 const 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 const 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; @@ -2419,45 +3128,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) ? SP : 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) { + } else if ((c2 == EOF) || (c2 == 0) || c2 < SP) { /* 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; @@ -2466,106 +3183,139 @@ 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; c1 &= 0x7f; - } else if ((c2 == EOF) || (c2 == 0) || c2 < SPACE) { + } else if ((c2 == EOF) || (c2 == 0) || c2 < SP) { /* 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 const unsigned short *const utf8_to_euc_2bytes[]; - extern const unsigned short *const *const utf8_to_euc_3bytes[]; - int ret = 0; + nkf_char ret = 0; - if (0xc0 <= c2 && c2 <= 0xef) { - const unsigned short *const *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 = 0; - - if (c0 == 0){ - if (c2 == 0) /* 0x00-0x7f */ - ; /* 1byte */ - else if ((c2 & 0xe0) == 0xc0) /* 0xc0-0xdf */ - ; /* 2ytes */ - else if ((c2 & 0xf0) == 0xe0) /* 0xe0-0xef */ - return -1; /* 3bytes */ -#ifdef __COMMENT__ - else if (0xf0 <= c2) - return 0; /* 4,5,6bytes */ - else if ((c2 & 0xc0) == 0x80) /* 0x80-0xbf */ - return 0; /* trail byte */ -#endif - else return 0; - } - if (c2 == EOF); - else if (c2 == 0xef && c1 == 0xbb && c0 == 0xbf) { - return 0; /* throw BOM */ -#if defined(UTF8_OUTPUT_ENABLE) && defined(UTF8_INPUT_ENABLE) - } else if (internal_unicode_f && (output_conv == w_oconv || output_conv == w_oconv16)){ - unsigned short val = 0; - if(c2 == 0){ - c2 = c1; - c1 = 0; + nkf_char ret = 0; + static const char 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; } - val = ww16_conv(c2, c1, c0); - c2 = (val >> 8) & 0xff; - c1 = val & 0xff; -#endif + } + 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); } @@ -2574,12 +3324,12 @@ w_iconv(c2, c1, c0) } 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; @@ -2588,19 +3338,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); @@ -2613,81 +3379,226 @@ 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 const unsigned short *const utf8_to_euc_2bytes[]; - extern const unsigned short *const *const utf8_to_euc_3bytes[]; - int c2, c1, c0; - const unsigned short *const *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 = 0; - - if (c2==0376 && c1==0377){ - utf16_mode = UTF16BE_INPUT; - return 0; - } else if (c2==0377 && c1==0376){ - utf16_mode = UTF16LE_INPUT; - return 0; - } - if (c2 != EOF && utf16_mode == UTF16LE_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; + } + if (ret) return ret; + (*oconv)(c2, c1); + return 0; +} + +nkf_char unicode_to_jis_common(nkf_char c2, nkf_char c1, nkf_char c0, nkf_char *p2, nkf_char *p1) +{ + const unsigned short *const *pp; + const unsigned short *const *const *ppp; + static const char 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 char 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 char 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 char 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; + } } -#if defined(UTF8_OUTPUT_ENABLE) && defined(UTF8_INPUT_ENABLE) - if (internal_unicode_f && (output_conv == w_oconv || output_conv == w_oconv16)); #endif - else ret = w16e_conv(((c2<<8)&0xff00) + c1, &c2, &c1); - if (ret) return ret; - (*oconv)(c2, c1); - return 0; + return ret; } -int -w_iconv_common(c1, c0, pp, psize, p2, p1) - int c1,c0; - const unsigned short *const *pp; - int psize; - int *p2, *p1; +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) { - int c2; + nkf_char c2; const unsigned short *p; unsigned short val; @@ -2699,14 +3610,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; @@ -2715,23 +3630,114 @@ 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) +{ + int shift = 20; + c &= VALUE_MASK; + while(shift >= 0){ + if(c >= 1<= 0){ + (*f)(0, bin2hex(c>>shift)); + 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) +{ + (*oconv)(0, '\\'); + c &= VALUE_MASK; + if(!is_unicode_bmp(c)){ + (*oconv)(0, 'U'); + (*oconv)(0, '0'); + (*oconv)(0, '0'); + (*oconv)(0, bin2hex(c>>20)); + (*oconv)(0, bin2hex(c>>16)); + }else{ + (*oconv)(0, 'u'); + } + (*oconv)(0, bin2hex(c>>12)); + (*oconv)(0, bin2hex(c>> 8)); + (*oconv)(0, bin2hex(c>> 4)); + (*oconv)(0, bin2hex(c )); + 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 const unsigned short euc_to_utf8_1byte[]; - extern const unsigned short *const euc_to_utf8_2bytes[]; - extern const unsigned short *const euc_to_utf8_2bytes_ms[]; 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 const unsigned short *const 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; } #endif - if (c2 == 0) { + if (c2 == 0) { output_mode = ASCII; (*o_putc)(c1); } else if (c2 == ISO8859_1) { @@ -2792,9 +3809,7 @@ w_oconv(c2, c1) (*o_putc)(c1 | 0x080); } else { output_mode = UTF8; - if (internal_unicode_f && (iconv == w_iconv || iconv == w_iconv16)) - val = ((c2<<8)&0xff00) + c1; - else val = e2w_conv(c2, c1); + val = e2w_conv(c2, c1); if (val){ w16w_conv(val, &c2, &c1, &c0); (*o_putc)(c2); @@ -2806,42 +3821,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 (internal_unicode_f && (iconv == w_iconv || iconv == w_iconv16)){ - } else if (c2 == ISO8859_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{ @@ -2850,25 +3882,85 @@ 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 if (c2 == EOF) { (*o_putc)(EOF); return; - } else if (c2 == 0) { + } else if (c2 == 0) { output_mode = ASCII; (*o_putc)(c1); } else if (c2 == X0201) { @@ -2878,17 +3970,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); @@ -2900,8 +3995,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 - int val = 0; - const unsigned short *ptr; - int ndx; - extern const unsigned short *const x0212_shiftjis[]; - 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) { @@ -3001,7 +4113,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); @@ -3009,8 +4121,7 @@ s_oconv(c2, c1) } #endif } else { - if ((c1<0x20 || 0x7e> 8; c1 = c & 0xff; @@ -3037,14 +4147,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) { @@ -3056,13 +4175,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); @@ -3077,7 +4206,7 @@ j_oconv(c2, c1) (*o_putc)(c1); } else if (c2==ISO8859_1) { /* iso8859 introduction, or 8th bit on */ - /* Can we convert in 7bit form using ESC-'-'-A ? + /* Can we convert in 7bit form using ESC-'-'-A ? Is this popular? */ output_mode = ISO8859_1; (*o_putc)(c1|0x80); @@ -3090,57 +4219,59 @@ 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]; } c= (*i_bgetc)(f); - if (c=='$' && broken_last != ESC + if (c=='$' && broken_last != ESC && (input_mode==ASCII || input_mode==X0201)) { c1= (*i_bgetc)(f); broken_last = 0; if (c1=='@'|| c1=='B') { - broken_buf[0]=c1; broken_buf[1]=c; + broken_buf[0]=c1; broken_buf[1]=c; broken_counter=2; return ESC; } else { (*i_bungetc)(c1,f); return c; } - } else if (c=='(' && broken_last != ESC + } else if (c=='(' && broken_last != ESC && (input_mode==X0208 || input_mode==X0201)) { /* ) */ c1= (*i_bgetc)(f); broken_last = 0; @@ -3158,60 +4289,53 @@ 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 nl_conv(nkf_char c2, nkf_char c1) { if (prev_cr) { prev_cr = 0; - if (! (c2==0&&c1==NL) ) { - cr_conv(0,'\n'); + if (! (c2==0&&c1==LF)) { + nl_conv(0,LF); } } if (c2) { - (*o_crconv)(c2,c1); - } else if (c1=='\r') { + (*o_nlconv)(c2,c1); + } else if (c1==CR) { prev_cr = c1; - } else if (c1=='\n') { - if (crmode_f==CRLF) { - (*o_crconv)(0,'\r'); - } else if (crmode_f==CR) { - (*o_crconv)(0,'\r'); + } else if (c1==LF) { + if (nlmode_f==CRLF) { + (*o_nlconv)(0,CR); + } else if (nlmode_f==CR) { + (*o_nlconv)(0,CR); return; - } - (*o_crconv)(0,NL); - } else if (c1!='\032' || crmode_f!=NL){ - (*o_crconv)(c2,c1); + } + (*o_nlconv)(0,LF); + } else if (c1!='\032' || nlmode_f!=LF){ + (*o_nlconv)(c2,c1); } } -/* +/* Return value of fold_conv() - \n add newline and output char - \r add newline and output nothing - ' ' space - 0 skip - 1 (or else) normal output + LF add newline and output char + CR add newline and output nothing + SP space + 0 skip + 1 (or else) normal output fold state in prev (previous character) >0x80 Japanese (X0208/X0201) <0x80 ASCII - \n new line - ' ' space + LF new line + SP space This fold algorthm does not preserve heading space in a line. This is the main difference from fmt. @@ -3219,37 +4343,35 @@ int c2,c1; #define char_size(c2,c1) (c2?2:1) -void -fold_conv(c2,c1) -int c2,c1; -{ - int prev0; - int fold_state=0; +void fold_conv(nkf_char c2, nkf_char c1) +{ + nkf_char prev0; + nkf_char fold_state; - if (c1== '\r' && !fold_preserve_f) { + if (c1== CR && !fold_preserve_f) { fold_state=0; /* ignore cr */ - }else if (c1== '\n'&&f_prev=='\r' && fold_preserve_f) { - f_prev = '\n'; + }else if (c1== LF&&f_prev==CR && fold_preserve_f) { + f_prev = LF; fold_state=0; /* ignore cr */ } else if (c1== BS) { if (f_line>0) f_line--; fold_state = 1; } else if (c2==EOF && f_line != 0) { /* close open last line */ - fold_state = '\n'; - } else if ((c1=='\n' && !fold_preserve_f) - || ((c1=='\r'||(c1=='\n'&&f_prev!='\r')) + fold_state = LF; + } else if ((c1==LF && !fold_preserve_f) + || ((c1==CR||(c1==LF&&f_prev!=CR)) && fold_preserve_f)) { /* new line */ - if (fold_preserve_f) { + if (fold_preserve_f) { f_prev = c1; f_line = 0; - fold_state = '\r'; + fold_state = CR; } else if ((f_prev == c1 && !fold_preserve_f) - || (f_prev == '\n' && fold_preserve_f) + || (f_prev == LF && fold_preserve_f) ) { /* duplicate newline */ if (f_line) { f_line = 0; - fold_state = '\n'; /* output two newline */ + fold_state = LF; /* output two newline */ } else { f_line = 0; fold_state = 1; @@ -3258,43 +4380,41 @@ int c2,c1; if (f_prev&0x80) { /* Japanese? */ f_prev = c1; fold_state = 0; /* ignore given single newline */ - } else if (f_prev==' ') { + } else if (f_prev==SP) { fold_state = 0; } else { f_prev = c1; - if (++f_line<=fold_len) - fold_state = ' '; + if (++f_line<=fold_len) + fold_state = SP; else { f_line = 0; - fold_state = '\r'; /* fold and output nothing */ + fold_state = CR; /* fold and output nothing */ } } } } else if (c1=='\f') { - f_prev = '\n'; - if (f_line==0) - fold_state = 1; + f_prev = LF; f_line = 0; - fold_state = '\n'; /* output newline and clear */ - } else if ( (c2==0 && c1==' ')|| - (c2==0 && c1=='\t')|| + fold_state = LF; /* output newline and clear */ + } else if ( (c2==0 && c1==SP)|| + (c2==0 && c1==TAB)|| (c2=='!'&& c1=='!')) { /* X0208 kankaku or ascii space */ - if (f_prev == ' ') { + if (f_prev == SP) { fold_state = 0; /* remove duplicate spaces */ } else { - f_prev = ' '; - if (++f_line<=fold_len) - fold_state = ' '; /* output ASCII space only */ + f_prev = SP; + if (++f_line<=fold_len) + fold_state = SP; /* output ASCII space only */ else { - f_prev = ' '; f_line = 0; - fold_state = '\r'; /* fold and output nothing */ + f_prev = SP; f_line = 0; + fold_state = CR; /* fold and output nothing */ } } } else { prev0 = f_prev; /* we still need this one... , but almost done */ f_prev = c1; - if (c2 || c2==X0201) + if (c2 || c2==X0201) f_prev |= 0x80; /* this is Japanese */ f_line += char_size(c2,c1); if (f_line<=fold_len) { /* normal case */ @@ -3302,7 +4422,7 @@ int c2,c1; } else { 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 */ + fold_state = LF; /* We can't wait, do fold now */ } else if (c2==X0201) { /* simple kinsoku rules return 1 means no folding */ if (c1==(0xde&0x7f)) fold_state = 1; /* ゛*/ @@ -3311,15 +4431,15 @@ int c2,c1; else if (c1==(0xa3&0x7f)) fold_state = 1; /* ，*/ else if (c1==(0xa1&0x7f)) fold_state = 1; /* 」*/ else if (c1==(0xb0&0x7f)) fold_state = 1; /* - */ - else if (SPACE<=c1 && c1<=(0xdf&0x7f)) { /* X0201 */ + else if (SP<=c1 && c1<=(0xdf&0x7f)) { /* X0201 */ f_line = 1; - fold_state = '\n';/* add one new f_line before this character */ + fold_state = LF;/* add one new f_line before this character */ } else { f_line = 1; - fold_state = '\n';/* add one new f_line before this character */ + fold_state = LF;/* add one new f_line before this character */ } } else if (c2==0) { - /* kinsoku point in ASCII */ + /* kinsoku point in ASCII */ if ( c1==')'|| /* { [ ( */ c1==']'|| c1=='}'|| @@ -3329,17 +4449,17 @@ int c2,c1; c1=='?'|| c1=='/'|| c1==':'|| - c1==';' ) { + c1==';') { fold_state = 1; /* just after special */ } else if (!is_alnum(prev0)) { f_line = char_size(c2,c1); - fold_state = '\n'; - } else if ((prev0==' ') || /* ignored new f_line */ - (prev0=='\n')|| /* ignored new f_line */ + fold_state = LF; + } else if ((prev0==SP) || /* ignored new f_line */ + (prev0==LF)|| /* ignored new f_line */ (prev0&0x80)) { /* X0208 - ASCII */ f_line = char_size(c2,c1); - fold_state = '\n';/* add one new f_line before this character */ + fold_state = LF;/* add one new f_line before this character */ } else { fold_state = 1; /* default no fold in ASCII */ } @@ -3358,14 +4478,14 @@ int c2,c1; else if (c1=='+') fold_state = 1; /* ゛ */ else if (c1==',') fold_state = 1; /* ゜ */ /* default no fold in kinsoku */ - else { - fold_state = '\n'; + else { + fold_state = LF; f_line = char_size(c2,c1); /* add one new f_line before this character */ } } else { f_line = char_size(c2,c1); - fold_state = '\n'; + fold_state = LF; /* add one new f_line before this character */ } } @@ -3373,102 +4493,180 @@ int c2,c1; } /* terminator process */ switch(fold_state) { - case '\n': - (*o_fconv)(0,'\n'); + case LF: + (*o_fconv)(0,LF); (*o_fconv)(c2,c1); break; - case 0: + case 0: return; - case '\r': - (*o_fconv)(0,'\n'); + case CR: + (*o_fconv)(0,LF); break; - case '\t': - case ' ': - (*o_fconv)(0,' '); + case TAB: + case SP: + (*o_fconv)(0,SP); break; default: (*o_fconv)(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 (x0201_f && z_prev2==X0201) { /* X0201 */ - if (c1==(0xde&0x7f)) { /* 濁点 */ - z_prev2=0; - (*o_zconv)(dv[(z_prev1-SPACE)*2],dv[(z_prev1-SPACE)*2+1]); - return; - } else if (c1==(0xdf&0x7f)&&ev[(z_prev1-SPACE)*2]) { /* 半濁点 */ - z_prev2=0; - (*o_zconv)(ev[(z_prev1-SPACE)*2],ev[(z_prev1-SPACE)*2+1]); - return; - } else { - z_prev2=0; - (*o_zconv)(cv[(z_prev1-SPACE)*2],cv[(z_prev1-SPACE)*2+1]); - } + if (c2 == X0201 && (c1 == 0x20 || c1 == 0x7D || c1 == 0x7E)) { + (*o_zconv)(c2,c1); + return; } - if (c2==EOF) { - (*o_zconv)(c2,c1); - return; + if (x0201_f) { + if (z_prev2 == X0201) { + if (c2 == X0201) { + if (c1 == (0xde&0x7f)) { /* 濁点 */ + z_prev2 = 0; + (*o_zconv)(dv[(z_prev1-SP)*2], dv[(z_prev1-SP)*2+1]); + return; + } else if (c1 == (0xdf&0x7f) && ev[(z_prev1-SP)*2]) { /* 半濁点 */ + z_prev2 = 0; + (*o_zconv)(ev[(z_prev1-SP)*2], ev[(z_prev1-SP)*2+1]); + return; + } + } + z_prev2 = 0; + (*o_zconv)(cv[(z_prev1-SP)*2], cv[(z_prev1-SP)*2+1]); + } + if (c2 == X0201) { + if (dv[(c1-SP)*2] || ev[(c1-SP)*2]) { + /* wait for 濁点 or 半濁点 */ + z_prev1 = c1; + z_prev2 = c2; + return; + } else { + (*o_zconv)(cv[(c1-SP)*2], cv[(c1-SP)*2+1]); + return; + } + } } - if (x0201_f && c2==X0201) { - if (dv[(c1-SPACE)*2]||ev[(c1-SPACE)*2]) { - /* wait for 濁点 or 半濁点 */ - z_prev1 = c1; z_prev2 = c2; - return; - } else { - (*o_zconv)(cv[(c1-SPACE)*2],cv[(c1-SPACE)*2+1]); - return; - } + if (c2 == EOF) { + (*o_zconv)(c2, c1); + return; } - /* JISX0208 Alphabet */ - if (alpha_f && c2 == 0x23 ) { + if (alpha_f&1 && c2 == 0x23) { + /* JISX0208 Alphabet */ c2 = 0; - } else if (alpha_f && c2 == 0x21 ) { - /* JISX0208 Kigou */ + } else if (c2 == 0x21) { + /* JISX0208 Kigou */ if (0x21==c1) { - if (alpha_f&0x2) { - c1 = ' '; + if (alpha_f&2) { c2 = 0; - } else if (alpha_f&0x4) { - (*o_zconv)(0,' '); - (*o_zconv)(0,' '); + c1 = SP; + } else if (alpha_f&4) { + (*o_zconv)(0, SP); + (*o_zconv)(0, SP); return; - } - } else if (0x20': entity = ">"; break; - case '<': entity = "<"; break; - case '\"': entity = """; break; - case '&': entity = "&"; break; - } - if (entity){ - while (*entity) (*o_zconv)(0, *entity++); - return; - } } - } + } else if (alpha_f&1 && 0x20': entity = ">"; break; + case '<': entity = "<"; break; + case '\"': entity = """; break; + case '&': entity = "&"; break; + } + if (entity){ + while (*entity) (*o_zconv)(0, *entity++); + return; + } + } + + if (alpha_f & 16) { + /* JIS X 0208 Katakana to JIS X 0201 Katakana */ + if (c2 == 0x21) { + char c = 0; + switch (c1) { + case 0x23: + /* U+3002 (0x8142) Ideographic Full Stop -> U+FF61 (0xA1) Halfwidth Ideographic Full Stop */ + c = 0xA1; + break; + case 0x56: + /* U+300C (0x8175) Left Corner Bracket -> U+FF62 (0xA2) Halfwidth Left Corner Bracket */ + c = 0xA2; + break; + case 0x57: + /* U+300D (0x8176) Right Corner Bracket -> U+FF63 (0xA3) Halfwidth Right Corner Bracket */ + c = 0xA3; + break; + case 0x22: + /* U+3001 (0x8141) Ideographic Comma -> U+FF64 (0xA4) Halfwidth Ideographic Comma */ + c = 0xA4; + break; + case 0x26: + /* U+30FB (0x8145) Katakana Middle Dot -> U+FF65 (0xA5) Halfwidth Katakana Middle Dot */ + c = 0xA5; + break; + case 0x3C: + /* U+30FC (0x815B) Katakana-Hiragana Prolonged Sound Mark -> U+FF70 (0xB0) Halfwidth Katakana-Hiragana Prolonged Sound Mark */ + c = 0xB0; + break; + case 0x2B: + /* U+309B (0x814A) Katakana-Hiragana Voiced Sound Mark -> U+FF9E (0xDE) Halfwidth Katakana Voiced Sound Mark */ + c = 0xDE; + break; + case 0x2C: + /* U+309C (0x814B) Katakana-Hiragana Semi-Voiced Sound Mark -> U+FF9F (0xDF) Halfwidth Katakana Semi-Voiced Sound Mark */ + c = 0xDF; + break; + } + if (c) { + (*o_zconv)(X0201, c); + return; + } + } else if (c2 == 0x25) { + /* JISX0208 Katakana */ + static const int fullwidth_to_halfwidth[] = + { + 0x0000, 0x2700, 0x3100, 0x2800, 0x3200, 0x2900, 0x3300, 0x2A00, + 0x3400, 0x2B00, 0x3500, 0x3600, 0x365E, 0x3700, 0x375E, 0x3800, + 0x385E, 0x3900, 0x395E, 0x3A00, 0x3A5E, 0x3B00, 0x3B5E, 0x3C00, + 0x3C5E, 0x3D00, 0x3D5E, 0x3E00, 0x3E5E, 0x3F00, 0x3F5E, 0x4000, + 0x405E, 0x4100, 0x415E, 0x2F00, 0x4200, 0x425E, 0x4300, 0x435E, + 0x4400, 0x445E, 0x4500, 0x4600, 0x4700, 0x4800, 0x4900, 0x4A00, + 0x4A5E, 0x4A5F, 0x4B00, 0x4B5E, 0x4B5F, 0x4C00, 0x4C5E, 0x4C5F, + 0x4D00, 0x4D5E, 0x4D5F, 0x4E00, 0x4E5E, 0x4E5F, 0x4F00, 0x5000, + 0x5100, 0x5200, 0x5300, 0x2C00, 0x5400, 0x2D00, 0x5500, 0x2E00, + 0x5600, 0x5700, 0x5800, 0x5900, 0x5A00, 0x5B00, 0x0000, 0x5C00, + 0x0000, 0x0000, 0x2600, 0x5D00, 0x335E, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000 + }; + if (fullwidth_to_halfwidth[c1-0x20]){ + c2 = fullwidth_to_halfwidth[c1-0x20]; + (*o_zconv)(X0201, c2>>8); + if (c2 & 0xFF) { + (*o_zconv)(X0201, c2&0xFF); + } + return; + } + } } (*o_zconv)(c2,c1); } #define rot13(c) ( \ - ( c < 'A' ) ? c: \ + ( c < 'A') ? c: \ (c <= 'M') ? (c + 13): \ (c <= 'Z') ? (c - 13): \ (c < 'a') ? (c): \ @@ -3478,15 +4676,13 @@ int c2,c1; ) #define rot47(c) ( \ - ( c < '!' ) ? c: \ - ( c <= 'O' ) ? (c + 47) : \ - ( c <= '~' ) ? (c - 47) : \ + ( c < '!') ? c: \ + ( c <= 'O') ? (c + 47) : \ + ( c <= '~') ? (c - 47) : \ 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); @@ -3497,24 +4693,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; @@ -3561,14 +4776,14 @@ int c2, c1; /* This converts =?ISO-2022-JP?B?HOGE HOGE?= */ -const unsigned char *mime_pattern[] = { +static 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) || defined(UTF8_OUTPUT_ENABLE) +#if defined(UTF8_INPUT_ENABLE) (const unsigned char *)"\075?UTF-8?B?", (const unsigned char *)"\075?UTF-8?Q?", #endif @@ -3578,26 +4793,26 @@ const unsigned char *mime_pattern[] = { /* 該当するコードの優先度を上げるための目印 */ -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, }; -const int mime_encode[] = { +static 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 }; -const int mime_encode_method[] = { +static 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', @@ -3607,17 +4822,7 @@ const 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; @@ -3629,8 +4834,7 @@ switch_mime_getc() } } -void -unswitch_mime_getc() +void unswitch_mime_getc(void) { if(mime_f==STRICT_MIME) { i_mgetc = i_mgetc_buf; @@ -3642,14 +4846,12 @@ unswitch_mime_getc() 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; const unsigned char *p,*q; - int r[MAXRECOVER]; /* recovery buffer, max mime pattern lenght */ + nkf_char r[MAXRECOVER]; /* recovery buffer, max mime pattern length */ mime_decode_mode = FALSE; /* =? has been checked */ @@ -3657,15 +4859,17 @@ FILE *f; p = mime_pattern[j]; r[0]='='; r[1]='?'; - for(i=2;p[i]>' ';i++) { /* start at =? */ - if ( ((r[i] = c1 = (*i_getc)(f))==EOF) || nkf_toupper(c1) != p[i] ) { + for(i=2;p[i]>SP;i++) { /* start at =? */ + 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); @@ -3686,16 +4890,14 @@ FILE *f; if (!unbuf_f) { /* do MIME integrity check */ return mime_integrity(f,mime_pattern[j]); - } + } } switch_mime_getc(); mimebuf_f = TRUE; 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. */ @@ -3703,23 +4905,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; + else + 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 */ @@ -3730,9 +4927,9 @@ FILE *f; Fifo(mime_last++)='='; Fifo(mime_last++)='?'; for(i=2;i 0){ (*u)(buf[i], f); @@ -3950,10 +5114,7 @@ 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); } @@ -3962,17 +5123,14 @@ numchar_ungetc(c, f) #ifdef UNICODE_NORMALIZATION /* Normalization Form C */ -int -nfc_getc(f) - FILE *f; +nkf_char nfc_getc(FILE *f) { - int (*g)() = i_nfc_getc; - int (*u)() = i_nfc_ungetc; + 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; - int buf[9]; - const int *array = NULL; - extern const struct normalization_pair normalization_table[]; - + 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; @@ -3990,7 +5148,7 @@ nfc_getc(f) if (k > 0){ array = normalization_table[j].nfc; for (i=0; i < NORMALIZATION_TABLE_NFC_LENGTH && array[i]; i++) - buf[i] = array[i]; + buf[i] = (nkf_char)(array[i]); i--; break; } @@ -4001,26 +5159,22 @@ nfc_getc(f) return buf[0]; } -int -nfc_ungetc(c, f) - int c; - FILE *f; +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++); @@ -4038,15 +5192,15 @@ FILE *f; if (mime_decode_mode == 'Q') { if ((c1 = (*i_mgetc)(f)) == EOF) return (EOF); restart_mime_q: - if (c1=='_') return ' '; - if (c1<=' ' || DEL<=c1) { + if (c1=='_' && mimebuf_f != FIXED_MIME) return SP; + if (c1<=SP || DEL<=c1) { mime_decode_mode = exit_mode; /* prepare for quit */ return c1; } - if (c1!='=' && c1!='?') { + if (c1!='=' && (c1!='?' || mimebuf_f == FIXED_MIME)) { return c1; } - + mime_decode_mode = exit_mode; /* prepare for quit */ if ((c2 = (*i_mgetc)(f)) == EOF) return (EOF); if (c1=='?'&&c2=='=' && mimebuf_f != FIXED_MIME) { @@ -4060,40 +5214,39 @@ restart_mime_q: } while ((c1=(*i_getc)(f))!=EOF) { switch (c1) { - case NL: + case LF: case CR: - if (c1==NL) { - if ((c1=(*i_getc)(f))!=EOF && (c1==SPACE||c1==TAB)) { - i_ungetc(SPACE,f); + if (c1==LF) { + if ((c1=(*i_getc)(f))!=EOF && (c1==SP||c1==TAB)) { + i_ungetc(SP,f); continue; } else { i_ungetc(c1,f); } - c1 = NL; + c1 = LF; } else { - if ((c1=(*i_getc)(f))!=EOF && c1 == NL) { - if ((c1=(*i_getc)(f))!=EOF && (c1==SPACE||c1==TAB)) { - i_ungetc(SPACE,f); + if ((c1=(*i_getc)(f))!=EOF && c1 == LF) { + if ((c1=(*i_getc)(f))!=EOF && (c1==SP||c1==TAB)) { + i_ungetc(SP,f); continue; } else { i_ungetc(c1,f); } - i_ungetc(NL,f); + i_ungetc(LF,f); } else { i_ungetc(c1,f); } c1 = CR; } break; - case SPACE: + case SP: 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; } @@ -4103,22 +5256,17 @@ 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] != SP && 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 */ - while((c1 = (*i_mgetc)(f)) <=' ') { + if (c1=='='&&c2 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] != SP && 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: - if ((c3 = (*i_mgetc)(f))<=' ') { + if ((c3 = (*i_mgetc)(f))<=SP) { if (c3==EOF) return (EOF); if (mime_f != STRICT_MIME) goto mime_c3_retry; - if (mimebuf_f!=FIXED_MIME) input_mode = ASCII; + if (mimebuf_f!=FIXED_MIME) input_mode = ASCII; return c3; } mime_c4_retry: - if ((c4 = (*i_mgetc)(f))<=' ') { + if ((c4 = (*i_mgetc)(f))<=SP) { if (c4==EOF) return (EOF); if (mime_f != STRICT_MIME) goto mime_c4_retry; - if (mimebuf_f!=FIXED_MIME) input_mode = ASCII; + if (mimebuf_f!=FIXED_MIME) input_mode = ASCII; return c4; } @@ -4263,13 +5403,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; + if (c4 != '=') + Fifo(mime_last++) = (unsigned char)cc; } } else { return c1; @@ -4277,27 +5417,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; - const 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; @@ -4307,29 +5441,27 @@ mime_integrity(f,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; + mime_input = q; switch_mime_getc(); return 1; } 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 > '@') { @@ -4348,51 +5480,49 @@ base64decode(c) return (i); } -STATIC const 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) { 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; } } mimeout_mode = mime_encode_method[i]; - + i = 0; if (base64_count>45) { if (mimeout_buf_count>0 && nkf_isblank(mimeout_buf[i])){ (*o_mputc)(mimeout_buf[i]); i++; } - (*o_mputc)(NL); - (*o_mputc)(SPACE); + (*o_mputc)(LF); + (*o_mputc)(SP); base64_count = 1; if (!mimeout_preserve_space && mimeout_buf_count>0 - && (mimeout_buf[i]==SPACE || mimeout_buf[i]==TAB - || mimeout_buf[i]==CR || mimeout_buf[i]==NL )) { + && (mimeout_buf[i]==SP || mimeout_buf[i]==TAB + || mimeout_buf[i]==CR || mimeout_buf[i]==LF)) { i++; } } if (!mimeout_preserve_space) { for (;i 71){ - if (c!=CR && c!=NL) { + if (c!=CR && c!=LF) { (*o_mputc)('='); - (*o_mputc)(NL); + (*o_mputc)(LF); } base64_count = 0; } }else{ if (base64_count > 71){ eof_mime(); - (*o_mputc)(NL); + (*o_mputc)(LF); base64_count = 0; } if (c == EOF) { /* c==EOF */ @@ -4555,33 +5680,56 @@ mime_putc(c) } return; } - + /* mimeout_f != FIXED_MIME */ if (c == EOF) { /* c==EOF */ j = mimeout_buf_count; mimeout_buf_count = 0; i = 0; - for (;i 70) { + (*o_mputc)(LF); + base64_count = 0; + } + if (!nkf_isblank(c)) { + (*o_mputc)(SP); + base64_count++; + } } (*o_mputc)(c); base64_count++; @@ -4598,63 +5746,64 @@ mime_putc(c) if (!mimeout_mode) { if (c <= DEL && (output_mode==ASCII ||output_mode == ISO8859_1)) { if (nkf_isspace(c)) { - if (c==CR || c==NL) { + if (c==CR || c==LF) { base64_count=0; } for (i=0;i 1 - && base64_count + mimeout_buf_count > 76){ - (*o_mputc)(NL); + && base64_count + mimeout_buf_count > 76 + && mimeout_buf[0] != CR && mimeout_buf[0] != LF){ + (*o_mputc)(LF); base64_count = 0; if (!nkf_isspace(mimeout_buf[0])){ - (*o_mputc)(SPACE); + (*o_mputc)(SP); 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); } } return; }else{ - if (lastchar==CR || lastchar == NL){ + if (lastchar==CR || lastchar == LF){ for (i=0;iMIMEOUT_BUF_LENGTH) { eof_mime(); for (i=0;i0 && SPACE0 && SPMIMEOUT_BUF_LENGTH) { j = mimeout_buf_count; mimeout_buf_count = 0; @@ -4702,7 +5851,7 @@ mime_putc(c) j = mimeout_buf_count; mimeout_buf_count = 0; for (i=0;ihiragana, 2 hiragana->katakana, 3 both\n"); fprintf(stderr,"v Show this usage. V: show version\n"); @@ -4892,49 +6043,54 @@ usage() 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-4] Default/0: Convert JISX0208 Alphabet to ASCII\n"); + fprintf(stderr," 1: Kankaku to one space 2: to two spaces 3: HTML Entity\n"); + fprintf(stderr," 4: JISX0208 Katakana to JISX0201 Katakana\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," --prefix= Insert escape before troublesome characters of Shift_JIS\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 UNICODE_NORMALIZATION - fprintf(stderr," --utf8mac-input UTF-8-MAC input\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__) @@ -4950,19 +6106,3 @@ version() fprintf(stderr,"\n%s\n",CopyRight); } #endif /*PERL_XS*/ - -/** - ** パッチ制作者 - ** void@merope.pleiades.or.jp (Kusakabe Youichi) - ** NIDE Naoyuki - ** ohta@src.ricoh.co.jp (Junn Ohta) - ** inouet@strl.nhk.or.jp (Tomoyuki Inoue) - ** kiri@pulser.win.or.jp (Tetsuaki Kiriyama) - ** Kimihiko Sato - ** a_kuroe@kuroe.aoba.yokohama.jp (Akihiko Kuroe) - ** kono@ie.u-ryukyu.ac.jp (Shinji Kono) - ** GHG00637@nifty-serve.or.jp (COW) - ** - **/ - -/* end */