X-Git-Url: http://git.sourceforge.jp/view?a=blobdiff_plain;ds=sidebyside;f=nkf.c;h=f169c4c93e24704854635455a0fb453b401d6376;hb=4436098004f2427671350e5a09abfbb8d2496fbe;hp=1c1c3265765f166850f9188916754a59d427f9e7;hpb=f34a9e7c411d506f5e60f52a2787367f7041a658;p=nkf%2Fnkf.git diff --git a/nkf.c b/nkf.c index 1c1c326..f169c4c 100644 --- a/nkf.c +++ b/nkf.c @@ -39,13 +39,15 @@ ** E-Mail: furukawa@tcp-ip.or.jp ** まで御連絡をお願いします。 ***********************************************************************/ -/* $Id: nkf.c,v 1.87 2006/01/05 08:45:32 naruse Exp $ */ -#define NKF_VERSION "2.0.5" -#define NKF_RELEASE_DATE "2005-12-08" +/* $Id: nkf.c,v 1.101 2006/06/11 09:00:51 naruse Exp $ */ +#define NKF_VERSION "2.0.7" +#define NKF_RELEASE_DATE "2006-05-06" #include "config.h" +#include "utf8tbl.h" #define COPY_RIGHT \ - "Copyright (C) 1987, FUJITSU LTD. (I.Ichikawa),2000 S. Kono, COW, 2002-2005 Kono, Furukawa, Naruse" + "Copyright (C) 1987, FUJITSU LTD. (I.Ichikawa),2000 S. Kono, COW\n" \ + " 2002-2006 Kono, Furukawa, Naruse, mastodon" /* @@ -95,7 +97,7 @@ ** **/ -#if (defined(__TURBOC__) || defined(_MSC_VER) || defined(LSI_C) || defined(__MINGW32__)) && !defined(MSDOS) +#if (defined(__TURBOC__) || defined(_MSC_VER) || defined(LSI_C) || defined(__MINGW32__) || defined(__EMX__) || defined(__MSDOS__) || defined(__WINDOWS__) || defined(__DOS__) || defined(__OS2__)) && !defined(MSDOS) #define MSDOS #if (defined(__Win32__) || defined(_WIN32)) && !defined(__WIN32__) #define __WIN32__ @@ -113,21 +115,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 +164,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 +183,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,10 +191,6 @@ #endif /* (__WIN32__) */ #endif #endif -#endif - -#ifdef INT_IS_SHORT -#define int long #endif #define FALSE 0 @@ -190,7 +212,9 @@ #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 */ @@ -244,7 +268,11 @@ #define hex2bin(x) ( nkf_isdigit(x) ? x - '0' : nkf_toupper(x) - 'A' + 10) #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' @@ -258,7 +286,6 @@ #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 @@ -273,252 +300,262 @@ 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 = ""; #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 + */ +#define UCS_MAP_ASCII 0 +#define UCS_MAP_MS 1 +#define UCS_MAP_CP932 2 +static int ms_ucs_map_f = UCS_MAP_ASCII; +#endif #ifdef UTF8_INPUT_ENABLE -/* don't convert characters when the mapping is not defined in the standard */ -STATIC int strict_mapping_f = TRUE; -/* disable NEC special, NEC-selected IBM extended and IBM extended characters */ -STATIC int disable_cp932ext_f = FALSE; +/* 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 ignore_zwnbsp_f = TRUE; -/* don't convert characters that can't secure round trip convertion */ -STATIC int unicode_round_trip_f = FALSE; -STATIC void encode_fallback_html PROTO((int c)); -STATIC void encode_fallback_xml PROTO((int c)); -STATIC void encode_fallback_java PROTO((int c)); -STATIC void encode_fallback_perl PROTO((int c)); -STATIC void encode_fallback_subchar PROTO((int c)); -STATIC void (*encode_fallback)PROTO((int c)) = NULL; -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 unicode_to_jis_common PROTO((int c2,int c1,int c0,int *p2,int *p1)); -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)); -STATIC int w16e_conv PROTO((unsigned short val,int *p2,int *p1)); +static int ignore_zwnbsp_f = TRUE; +static int no_best_fit_chars_f = FALSE; +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 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); #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 unicode_bom_f= 0; /* Output Unicode BOM */ +static int w_oconv16_LE = 0; /* utf-16 little endian */ +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); +#endif +static void e_oconv(nkf_char c2,nkf_char c1); +static nkf_char e2s_conv(nkf_char c2, nkf_char c1, nkf_char *p2, nkf_char *p1); +static void s_oconv(nkf_char c2,nkf_char c1); +static void j_oconv(nkf_char c2,nkf_char c1); +static void fold_conv(nkf_char c2,nkf_char c1); +static void cr_conv(nkf_char c2,nkf_char c1); +static void z_conv(nkf_char c2,nkf_char c1); +static void rot_conv(nkf_char c2,nkf_char c1); +static void hira_conv(nkf_char c2,nkf_char c1); +static void base64_conv(nkf_char c2,nkf_char c1); +static void iso2022jp_check_conv(nkf_char c2,nkf_char c1); +static void no_connection(nkf_char c2,nkf_char c1); +static nkf_char no_connection2(nkf_char c2,nkf_char c1,nkf_char c0); + +static void code_score(struct input_code *ptr); +static void code_status(nkf_char c); + +static void std_putc(nkf_char c); +static nkf_char std_getc(FILE *f); +static nkf_char std_ungetc(nkf_char c,FILE *f); + +static nkf_char broken_getc(FILE *f); +static nkf_char broken_ungetc(nkf_char c,FILE *f); + +static nkf_char mime_begin(FILE *f); +static nkf_char mime_getc(FILE *f); +static nkf_char mime_ungetc(nkf_char c,FILE *f); + +static void switch_mime_getc(void); +static void unswitch_mime_getc(void); +static nkf_char mime_begin_strict(FILE *f); +static nkf_char mime_getc_buf(FILE *f); +static nkf_char mime_ungetc_buf(nkf_char c,FILE *f); +static nkf_char mime_integrity(FILE *f,const unsigned char *p); + +static nkf_char base64decode(nkf_char c); +static void mime_prechar(nkf_char c2, nkf_char c1); +static void mime_putc(nkf_char c); +static void open_mime(nkf_char c); +static void close_mime(void); +static void eof_mime(void); +static void mimeout_addchar(nkf_char c); #ifndef PERL_XS -STATIC void usage 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; /* MIME preprocessor fifo */ #define MIME_BUF_SIZE (1024) /* 2^n ring buffer */ #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 */ +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 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 unicode_subchar = '?'; /* the regular substitution character */ +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 int (*i_ugetc)PROTO((FILE *)) = std_getc; /* input of ugetc */ -STATIC int (*i_uungetc)PROTO((int c ,FILE *f)) = std_ungetc; -STATIC int url_getc PROTO((FILE *f)); -STATIC int url_ungetc PROTO((int c,FILE *f)); +static 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 #ifdef NUMCHAR_OPTION +#ifdef INT_IS_SHORT +#define CLASS_MASK 0x0f000000L +#define CLASS_UTF16 0x01000000L +#else #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)); +#endif +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; +static int is_inputcode_set = FALSE; #ifdef EXEC_IO -STATIC int exec_f = 0; +static int exec_f = 0; #endif #ifdef SHIFTJIS_CP932 -/* invert IBM extended characters to others - and controls some UCS mapping for Microsoft Code Page */ -STATIC int cp51932_f = TRUE; +/* invert IBM extended characters to others */ +static int cp51932_f = TRUE; #define CP932_TABLE_BEGIN (0xfa) #define CP932_TABLE_END (0xfc) /* invert NEC-selected IBM extended characters to IBM extended characters */ -STATIC int cp932inv_f = TRUE; +static int cp932inv_f = TRUE; #define CP932INV_TABLE_BEGIN (0xed) #define CP932INV_TABLE_END (0xee) -/* 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)); +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); #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; +static void w_status(struct input_code *, nkf_char); +static void w16_status(struct input_code *, nkf_char); +static int utf16_mode = UTF16BE_INPUT; #endif struct input_code input_code_list[] = { @@ -531,28 +568,28 @@ struct input_code input_code_list[] = { {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 */ @@ -570,50 +607,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_crconv)(nkf_char c2,nkf_char c1) = no_connection; +static void (*o_rot_conv)(nkf_char c2,nkf_char c1) = no_connection; +static void (*o_hira_conv)(nkf_char c2,nkf_char c1) = no_connection; +static void (*o_base64conv)(nkf_char c2,nkf_char c1) = no_connection; +static void (*o_iso2022jp_check_conv)(nkf_char c2,nkf_char c1) = no_connection; -/* STATIC redirections */ +/* static 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 +static const unsigned char cv[]= { 0x21,0x21,0x21,0x23,0x21,0x56,0x21,0x57, 0x21,0x22,0x21,0x26,0x25,0x72,0x25,0x21, @@ -636,7 +673,7 @@ unsigned char cv[]= { /* X0201 kana conversion table for daguten */ /* 90-9F A0-DF */ -STATIC const +static const unsigned char dv[]= { 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, @@ -658,7 +695,7 @@ unsigned char dv[]= { /* X0201 kana conversion table for han-daguten */ /* 90-9F A0-DF */ -STATIC const +static const unsigned char ev[]= { 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, @@ -681,7 +718,7 @@ unsigned char ev[]= { /* X0208 kigou conversion table */ /* 0x8140 - 0x819e */ -STATIC const +static const unsigned char fv[] = { 0x00,0x00,0x00,0x00,0x2c,0x2e,0x00,0x3a, @@ -701,28 +738,29 @@ 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 crmode_f = 0; /* CR, NL, CRLF */ #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; @@ -769,7 +807,7 @@ main(argc, argv) x0201_f = ((!iso2022jp_f)? TRUE : NO_X0201); if (binmode_f == TRUE) -#ifdef __OS2__ +#if defined(__OS2__) && (defined(__IBMC__) || defined(__IBMCPP__)) if (freopen("","wb",stdout) == NULL) return (-1); #else @@ -779,16 +817,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 { @@ -814,9 +852,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); @@ -838,7 +876,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"); @@ -865,7 +903,7 @@ main(argc, argv) return (-1); } if (binmode_f == TRUE) { -#ifdef __OS2__ +#if defined(__OS2__) && (defined(__IBMC__) || defined(__IBMCPP__)) if (freopen("","wb",stdout) == NULL) return (-1); #else @@ -874,13 +912,13 @@ main(argc, argv) } } if (binmode_f == TRUE) -#ifdef __OS2__ +#if defined(__OS2__) && (defined(__IBMC__) || defined(__IBMCPP__)) if (freopen("","rb",fin) == NULL) return (-1); #else setbinmode(fin); #endif - setvbuffer(fin, stdibuf, IOBUF_SIZE); + setvbuffer(fin, (char *) stdibuf, IOBUF_SIZE); if (nop_f) noconvert(fin); else { @@ -891,9 +929,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; @@ -913,23 +951,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", @@ -942,19 +994,60 @@ main(argc, argv) } } #ifdef EASYWIN /*Easy Win */ - if (file_out == FALSE) + if (file_out_f == FALSE) scanf("%d",&end_check); else fclose(stdout); #else /* for Other OS */ - if (file_out == TRUE) + if (file_out_f == TRUE) fclose(stdout); #endif /*Easy Win */ return (0); } #endif /* WIN32DLL */ -STATIC const +#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; @@ -986,9 +1079,6 @@ 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"}, @@ -1004,15 +1094,17 @@ struct { #ifdef UTF8_INPUT_ENABLE {"utf8-input", "W"}, {"utf16-input", "W16"}, - {"disable-cp932ext", ""}, - {"strict-mapping", ""}, - {"enable-round-trip",""}, + {"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", ""}, @@ -1035,16 +1127,14 @@ 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, j; - unsigned char *p = NULL; + nkf_char i, j; + unsigned char *p; unsigned char *cp_back = NULL; - unsigned char codeset[32]; + char codeset[32]; if (option_mode==1) return; @@ -1082,20 +1172,38 @@ options(cp) codeset[i] = nkf_toupper(p[i]); } codeset[i] = 0; - if(strcmp(codeset, "ISO-2022-JP") == 0){ + if(strcmp(codeset, "ISO-2022-JP") == 0 || + strcmp(codeset, "X-ISO2022JP-CP932") == 0 || + strcmp(codeset, "CP50220") == 0 || + strcmp(codeset, "CP50221") == 0 || + strcmp(codeset, "CP50222") == 0 || + strcmp(codeset, "ISO-2022-JP-MS") == 0){ + input_f = JIS_INPUT; + }else if(strcmp(codeset, "ISO-2022-JP-1") == 0){ + input_f = JIS_INPUT; +#ifdef X0212_ENABLE + x0212_f = TRUE; +#endif + }else if(strcmp(codeset, "ISO-2022-JP-3") == 0){ input_f = JIS_INPUT; +#ifdef X0212_ENABLE + x0212_f = TRUE; +#endif + x0213_f = TRUE; }else if(strcmp(codeset, "SHIFT_JIS") == 0){ input_f = SJIS_INPUT; if (x0201_f==NO_X0201) x0201_f=TRUE; - }else if(strcmp(codeset, "CP932") == 0){ + }else if(strcmp(codeset, "WINDOWS-31J") == 0 || + strcmp(codeset, "CSWINDOWS31J") == 0 || + strcmp(codeset, "CP932") == 0 || + strcmp(codeset, "MS932") == 0){ input_f = SJIS_INPUT; x0201_f = FALSE; #ifdef SHIFTJIS_CP932 - cp51932_f = TRUE; - cp932inv_f = TRUE; + cp51932_f = TRUE; #endif #ifdef UTF8_OUTPUT_ENABLE - ms_ucs_map_f = TRUE; + ms_ucs_map_f = UCS_MAP_CP932; #endif }else if(strcmp(codeset, "EUCJP") == 0 || strcmp(codeset, "EUC-JP") == 0){ @@ -1104,33 +1212,49 @@ options(cp) input_f = JIS_INPUT; x0201_f = FALSE; #ifdef SHIFTJIS_CP932 - cp51932_f = TRUE; - cp932inv_f = TRUE; + cp51932_f = TRUE; #endif #ifdef UTF8_OUTPUT_ENABLE - ms_ucs_map_f = TRUE; + ms_ucs_map_f = UCS_MAP_CP932; #endif }else if(strcmp(codeset, "EUC-JP-MS") == 0 || - strcmp(codeset, "EUCJP-MS") == 0){ + strcmp(codeset, "EUCJP-MS") == 0 || + strcmp(codeset, "EUCJPMS") == 0){ input_f = JIS_INPUT; x0201_f = FALSE; #ifdef SHIFTJIS_CP932 - cp51932_f = FALSE; - cp932inv_f = TRUE; + cp51932_f = FALSE; #endif #ifdef UTF8_OUTPUT_ENABLE - ms_ucs_map_f = TRUE; + ms_ucs_map_f = UCS_MAP_MS; #endif }else if(strcmp(codeset, "EUC-JP-ASCII") == 0 || strcmp(codeset, "EUCJP-ASCII") == 0){ input_f = JIS_INPUT; x0201_f = FALSE; #ifdef SHIFTJIS_CP932 - cp51932_f = FALSE; - cp932inv_f = TRUE; + cp51932_f = FALSE; #endif #ifdef UTF8_OUTPUT_ENABLE - ms_ucs_map_f = FALSE; + ms_ucs_map_f = UCS_MAP_ASCII; +#endif + }else if(strcmp(codeset, "SHIFT_JISX0213") == 0 || + strcmp(codeset, "SHIFT_JIS-2004") == 0){ + input_f = SJIS_INPUT; + x0213_f = TRUE; +#ifdef SHIFTJIS_CP932 + cp51932_f = FALSE; + cp932inv_f = FALSE; +#endif + if (x0201_f==NO_X0201) x0201_f=TRUE; + }else if(strcmp(codeset, "EUC-JISX0213") == 0 || + strcmp(codeset, "EUC-JIS-2004") == 0){ + input_f = JIS_INPUT; + x0201_f = FALSE; + x0213_f = TRUE; +#ifdef SHIFTJIS_CP932 + cp51932_f = FALSE; + cp932inv_f = FALSE; #endif #ifdef UTF8_INPUT_ENABLE }else if(strcmp(codeset, "UTF-8") == 0 || @@ -1163,19 +1287,56 @@ options(cp) codeset[i] = nkf_toupper(p[i]); } codeset[i] = 0; - if(strcmp(codeset, "ISO-2022-JP") == 0){ + if(strcmp(codeset, "ISO-2022-JP") == 0 || + strcmp(codeset, "CP50220") == 0){ + output_conv = j_oconv; + }else if(strcmp(codeset, "X-ISO2022JP-CP932") == 0){ output_conv = j_oconv; + no_cp932ext_f = TRUE; + }else if(strcmp(codeset, "CP50221") == 0 || + strcmp(codeset, "ISO-2022-JP-MS") == 0){ + output_conv = j_oconv; + x0201_f = FALSE; + }else if(strcmp(codeset, "ISO-2022-JP-1") == 0){ + output_conv = j_oconv; +#ifdef X0212_ENABLE + x0212_f = TRUE; +#endif +#ifdef SHIFTJIS_CP932 + cp51932_f = FALSE; +#endif + }else if(strcmp(codeset, "ISO-2022-JP-3") == 0){ + output_conv = j_oconv; +#ifdef X0212_ENABLE + x0212_f = TRUE; +#endif + x0213_f = TRUE; +#ifdef SHIFTJIS_CP932 + cp51932_f = FALSE; +#endif + }else if(strcmp(codeset, "ISO-2022-JP-MS") == 0){ + output_conv = j_oconv; + x0201_f = FALSE; +#ifdef X0212_ENABLE + x0212_f = TRUE; +#endif +#ifdef SHIFTJIS_CP932 + cp51932_f = FALSE; +#endif }else if(strcmp(codeset, "SHIFT_JIS") == 0){ output_conv = s_oconv; - }else if(strcmp(codeset, "CP932") == 0){ + }else if(strcmp(codeset, "WINDOWS-31J") == 0 || + strcmp(codeset, "CSWINDOWS31J") == 0 || + strcmp(codeset, "CP932") == 0 || + strcmp(codeset, "MS932") == 0){ output_conv = s_oconv; x0201_f = FALSE; #ifdef SHIFTJIS_CP932 - cp51932_f = TRUE; - cp932inv_f = TRUE; + cp51932_f = TRUE; + cp932inv_f = TRUE; #endif #ifdef UTF8_OUTPUT_ENABLE - ms_ucs_map_f = TRUE; + ms_ucs_map_f = UCS_MAP_CP932; #endif }else if(strcmp(codeset, "EUCJP") == 0 || strcmp(codeset, "EUC-JP") == 0){ @@ -1184,33 +1345,54 @@ options(cp) output_conv = e_oconv; x0201_f = FALSE; #ifdef SHIFTJIS_CP932 - cp51932_f = TRUE; - cp932inv_f = TRUE; + cp51932_f = TRUE; #endif #ifdef UTF8_OUTPUT_ENABLE - ms_ucs_map_f = TRUE; + ms_ucs_map_f = UCS_MAP_CP932; #endif }else if(strcmp(codeset, "EUC-JP-MS") == 0 || - strcmp(codeset, "EUCJP-MS") == 0){ + strcmp(codeset, "EUCJP-MS") == 0 || + strcmp(codeset, "EUCJPMS") == 0){ output_conv = e_oconv; x0201_f = FALSE; +#ifdef X0212_ENABLE x0212_f = TRUE; +#endif #ifdef SHIFTJIS_CP932 - cp51932_f = FALSE; + cp51932_f = FALSE; #endif #ifdef UTF8_OUTPUT_ENABLE - ms_ucs_map_f = TRUE; + ms_ucs_map_f = UCS_MAP_MS; #endif }else if(strcmp(codeset, "EUC-JP-ASCII") == 0 || strcmp(codeset, "EUCJP-ASCII") == 0){ output_conv = e_oconv; x0201_f = FALSE; +#ifdef X0212_ENABLE x0212_f = TRUE; +#endif #ifdef SHIFTJIS_CP932 - cp51932_f = FALSE; + cp51932_f = FALSE; #endif #ifdef UTF8_OUTPUT_ENABLE - ms_ucs_map_f = FALSE; + ms_ucs_map_f = UCS_MAP_ASCII; +#endif + }else if(strcmp(codeset, "SHIFT_JISX0213") == 0 || + strcmp(codeset, "SHIFT_JIS-2004") == 0){ + output_conv = s_oconv; + x0213_f = TRUE; +#ifdef SHIFTJIS_CP932 + cp932inv_f = FALSE; +#endif + }else if(strcmp(codeset, "EUC-JISX0213") == 0 || + strcmp(codeset, "EUC-JIS-2004") == 0){ + output_conv = e_oconv; +#ifdef X0212_ENABLE + x0212_f = TRUE; +#endif + x0213_f = TRUE; +#ifdef SHIFTJIS_CP932 + cp51932_f = FALSE; #endif #ifdef UTF8_OUTPUT_ENABLE }else if(strcmp(codeset, "UTF-8") == 0){ @@ -1242,10 +1424,35 @@ options(cp) } #ifdef OVERWRITE if (strcmp(long_option[i].name, "overwrite") == 0){ - file_out = TRUE; - overwrite = TRUE; + file_out_f = TRUE; + overwrite_f = TRUE; + preserve_time_f = TRUE; continue; } + if (strcmp(long_option[i].name, "overwrite=") == 0){ + file_out_f = TRUE; + overwrite_f = TRUE; + preserve_time_f = TRUE; + backup_f = TRUE; + backup_suffix = malloc(strlen((char *) p) + 1); + strcpy(backup_suffix, (char *) p); + continue; + } + if (strcmp(long_option[i].name, "in-place") == 0){ + file_out_f = TRUE; + overwrite_f = TRUE; + preserve_time_f = FALSE; + continue; + } + if (strcmp(long_option[i].name, "in-place=") == 0){ + file_out_f = TRUE; + overwrite_f = TRUE; + preserve_time_f = FALSE; + backup_f = TRUE; + backup_suffix = malloc(strlen((char *) p) + 1); + strcpy(backup_suffix, (char *) p); + continue; + } #endif #ifdef INPUT_OPTION if (strcmp(long_option[i].name, "cap-input") == 0){ @@ -1279,7 +1486,7 @@ options(cp) cp932inv_f = TRUE; #endif #ifdef UTF8_OUTPUT_ENABLE - ms_ucs_map_f = TRUE; + ms_ucs_map_f = UCS_MAP_CP932; #endif continue; } @@ -1289,7 +1496,7 @@ options(cp) cp932inv_f = FALSE; #endif #ifdef UTF8_OUTPUT_ENABLE - ms_ucs_map_f = FALSE; + ms_ucs_map_f = UCS_MAP_ASCII; #endif continue; } @@ -1318,16 +1525,12 @@ options(cp) } #endif #if defined(UTF8_OUTPUT_ENABLE) && defined(UTF8_INPUT_ENABLE) - if (strcmp(long_option[i].name, "internal-unicode") == 0){ - internal_unicode_f = TRUE; + if (strcmp(long_option[i].name, "no-cp932ext") == 0){ + no_cp932ext_f = TRUE; continue; } - if (strcmp(long_option[i].name, "disable-cp932ext") == 0){ - disable_cp932ext_f = TRUE; - continue; - } - if (strcmp(long_option[i].name, "enable-round-trip") == 0){ - unicode_round_trip_f = TRUE; + if (strcmp(long_option[i].name, "no-best-fit-chars") == 0){ + no_best_fit_chars_f = TRUE; continue; } if (strcmp(long_option[i].name, "fb-skip") == 0){ @@ -1383,7 +1586,7 @@ options(cp) #endif #ifdef UTF8_OUTPUT_ENABLE if (strcmp(long_option[i].name, "ms-ucs-map") == 0){ - ms_ucs_map_f = TRUE; + ms_ucs_map_f = UCS_MAP_MS; continue; } #endif @@ -1411,7 +1614,21 @@ options(cp) unbuf_f = TRUE; continue; case 't': /* transparent mode */ - nop_f = TRUE; + if (*cp=='1') { + /* alias of -t */ + nop_f = TRUE; + *cp++; + } else if (*cp=='2') { + /* + * -t with put/get + * + * nkf -t2MB hoge.bin | nkf -t2mB | diff -s - hoge.bin + * + */ + nop_f = 2; + *cp++; + } else + nop_f = TRUE; continue; case 'j': /* JIS output */ case 'n': @@ -1605,7 +1822,7 @@ options(cp) continue; #ifndef PERL_XS case 'O':/* for Output file */ - file_out = TRUE; + file_out_f = TRUE; continue; #endif case 'c':/* add cr code */ @@ -1645,10 +1862,10 @@ options(cp) } #ifdef ANSI_C_PROTOTYPE -struct input_code * find_inputcode_byfunc(int (*iconv_func)(int c2,int c1,int c0)) +struct input_code * find_inputcode_byfunc(nkf_char (*iconv_func)(nkf_char c2,nkf_char c1,nkf_char c0)) #else struct input_code * find_inputcode_byfunc(iconv_func) - int (*iconv_func)(); + nkf_char (*iconv_func)(); #endif { if (iconv_func){ @@ -1663,13 +1880,7 @@ struct input_code * find_inputcode_byfunc(iconv_func) return 0; } -#ifdef ANSI_C_PROTOTYPE -void set_iconv(int f, int (*iconv_func)(int c2,int c1,int c0)) -#else -void set_iconv(f, iconv_func) - int f; - int (*iconv_func)(); -#endif +void set_iconv(nkf_char f, nkf_char (*iconv_func)(nkf_char c2,nkf_char c1,nkf_char c0)) { #ifdef INPUT_CODE_FIX if (f || !input_f) @@ -1711,44 +1922,39 @@ void set_iconv(f, iconv_func) #define SCORE_INIT (SCORE_iMIME) -const int score_table_A0[] = { +const nkf_char score_table_A0[] = { 0, 0, 0, 0, 0, 0, 0, 0, 0, SCORE_DEPEND, SCORE_DEPEND, SCORE_DEPEND, SCORE_DEPEND, SCORE_DEPEND, SCORE_DEPEND, SCORE_NO_EXIST, }; -const int score_table_F0[] = { +const nkf_char score_table_F0[] = { SCORE_L2, SCORE_L2, SCORE_L2, SCORE_L2, SCORE_L2, SCORE_DEPEND, SCORE_NO_EXIST, SCORE_NO_EXIST, SCORE_DEPEND, SCORE_DEPEND, SCORE_DEPEND, SCORE_DEPEND, SCORE_DEPEND, SCORE_NO_EXIST, SCORE_NO_EXIST, SCORE_ERROR, }; -void set_code_score(ptr, score) - struct input_code *ptr; - int score; +void set_code_score(struct input_code *ptr, nkf_char score) { if (ptr){ ptr->score |= score; } } -void clr_code_score(ptr, score) - struct input_code *ptr; - int score; +void clr_code_score(struct input_code *ptr, nkf_char score) { if (ptr){ ptr->score &= ~score; } } -void code_score(ptr) - struct input_code *ptr; +void code_score(struct input_code *ptr) { - int c2 = ptr->buf[0]; + nkf_char c2 = ptr->buf[0]; #ifdef UTF8_OUTPUT_ENABLE - int c1 = ptr->buf[1]; + nkf_char c1 = ptr->buf[1]; #endif if (c2 < 0){ set_code_score(ptr, SCORE_ERROR); @@ -1767,8 +1973,7 @@ void code_score(ptr) } } -void status_disable(ptr) -struct input_code *ptr; +void status_disable(struct input_code *ptr) { ptr->stat = -1; ptr->buf[0] = -1; @@ -1776,46 +1981,37 @@ struct input_code *ptr; if (iconv == ptr->iconv_func) set_iconv(FALSE, 0); } -void status_push_ch(ptr, c) - struct input_code *ptr; - int c; +void status_push_ch(struct input_code *ptr, nkf_char c) { ptr->buf[ptr->index++] = c; } -void status_clear(ptr) - struct input_code *ptr; +void status_clear(struct input_code *ptr) { ptr->stat = 0; ptr->index = 0; } -void status_reset(ptr) - struct input_code *ptr; +void status_reset(struct input_code *ptr) { status_clear(ptr); ptr->score = SCORE_INIT; } -void status_reinit(ptr) - struct input_code *ptr; +void status_reinit(struct input_code *ptr) { status_reset(ptr); ptr->_file_stat = 0; } -void status_check(ptr, c) - struct input_code *ptr; - int c; +void status_check(struct input_code *ptr, nkf_char c) { if (c <= DEL && estab_f){ status_reset(ptr); } } -void s_status(ptr, c) - struct input_code *ptr; - int c; +void s_status(struct input_code *ptr, nkf_char c) { switch(ptr->stat){ case -1: @@ -1874,14 +2070,12 @@ void s_status(ptr, c) #endif /* SHIFTJIS_CP932 */ #ifndef X0212_ENABLE status_disable(ptr); - break; #endif + break; } } -void e_status(ptr, c) - struct input_code *ptr; - int c; +void e_status(struct input_code *ptr, nkf_char c) { switch (ptr->stat){ case -1: @@ -1928,9 +2122,7 @@ void e_status(ptr, c) } #ifdef UTF8_INPUT_ENABLE -void w16_status(ptr, c) - struct input_code *ptr; - int c; +void w16_status(struct input_code *ptr, nkf_char c) { switch (ptr->stat){ case -1: @@ -1976,9 +2168,7 @@ void w16_status(ptr, c) } } -void w_status(ptr, c) - struct input_code *ptr; - int c; +void w_status(struct input_code *ptr, nkf_char c) { switch (ptr->stat){ case -1: @@ -2023,9 +2213,7 @@ void w_status(ptr, c) } #endif -void -code_status(c) - int c; +void code_status(nkf_char c) { int action_flag = 1; struct input_code *result = 0; @@ -2058,9 +2246,7 @@ code_status(c) } #ifndef WIN32DLL -int -std_getc(f) -FILE *f; +nkf_char std_getc(FILE *f) { if (std_gc_ndx){ return std_gc_buf[--std_gc_ndx]; @@ -2069,10 +2255,7 @@ FILE *f; } #endif /*WIN32DLL*/ -int -std_ungetc(c,f) -int c; -FILE *f; +nkf_char std_ungetc(nkf_char c, FILE *f) { if (std_gc_ndx == STD_GC_BUFSIZE){ return EOF; @@ -2082,9 +2265,7 @@ FILE *f; } #ifndef WIN32DLL -void -std_putc(c) -int c; +void std_putc(nkf_char c) { if(c!=EOF) putchar(c); @@ -2092,20 +2273,20 @@ int c; #endif /*WIN32DLL*/ #if !defined(PERL_XS) && !defined(WIN32DLL) -int -noconvert(f) - FILE *f; +nkf_char noconvert(FILE *f) { - int c; + nkf_char c; + if (nop_f == 2) + module_connection(); while ((c = (*i_getc)(f)) != EOF) (*o_putc)(c); + (*o_putc)(EOF); return 1; } #endif -void -module_connection() +void module_connection(void) { oconv = output_conv; o_putc = std_putc; @@ -2208,11 +2389,9 @@ module_connection() Conversion main loop. Code detection only. */ -int -kanji_convert(f) - FILE *f; +nkf_char kanji_convert(FILE *f) { - int c1, + nkf_char c1, c2, c3; int is_8bit = FALSE; @@ -2221,7 +2400,7 @@ kanji_convert(f) if(input_f == SJIS_INPUT #ifdef UTF8_INPUT_ENABLE - || input_f == UTF8_INPUT || input_f == UTF16BE_INPUT + || input_f == UTF8_INPUT || input_f == UTF16BE_INPUT || input_f == UTF16LE_INPUT #endif ){ is_8bit = TRUE; @@ -2237,7 +2416,10 @@ kanji_convert(f) #define LAST break /* end of loop, go closing */ while ((c1 = (*i_getc)(f)) != EOF) { - code_status(c1); +#ifdef INPUT_CODE_FIX + if (!input_f) +#endif + code_status(c1); if (c2) { /* second byte */ if (c2 > DEL) { @@ -2347,7 +2529,8 @@ kanji_convert(f) /* look like bogus code */ NEXT; } - } else if (input_mode == X0208) { + } else if (input_mode == X0208 || input_mode == X0212 || + input_mode == X0213_1 || input_mode == X0213_2) { /* in case of Kanji shifted */ c2 = c1; NEXT; @@ -2421,6 +2604,14 @@ kanji_convert(f) shift_mode = FALSE; NEXT; #endif /* X0212_ENABLE */ + } else if (c1 == (X0213_1&0x7F)){ + input_mode = X0213_1; + shift_mode = FALSE; + NEXT; + } else if (c1 == (X0213_2&0x7F)){ + input_mode = X0213_2; + shift_mode = FALSE; + NEXT; } else { /* could be some special code */ (*oconv)(0, ESC); @@ -2516,21 +2707,39 @@ kanji_convert(f) SEND; } /* send: */ - if (input_mode == X0208) - (*oconv)(c2, c1); /* this is JIS, not SJIS/EUC case */ + switch(input_mode){ + case ASCII: + if ((*iconv)(c2, c1, 0) < 0){ /* can be EUC/SJIS */ + nkf_char c0 = (*i_getc)(f); + if (c0 != EOF){ + code_status(c0); + (*iconv)(c2, c1, c0); + } + } + break; + case X0208: + case X0213_1: + (*oconv)(c2, c1); /* this is JIS, not SJIS/EUC case */ + break; #ifdef X0212_ENABLE - else if (input_mode == X0212) - (*oconv)((0x8f << 8) | c2, c1); + case X0212: +#if defined(INT_IS_SHORT) + (*oconv)(0x8f00L | c2, c1); +#else + (*oconv)((0x8f << 8) | c2, c1); +#endif + break; #endif /* X0212_ENABLE */ - else if (input_mode) - (*oconv)(input_mode, c1); /* other special case */ - else if ((*iconv)(c2, c1, 0) < 0){ /* can be EUC/SJIS */ - int c0 = (*i_getc)(f); - if (c0 != EOF){ - code_status(c0); - (*iconv)(c2, c1, c0); - } - } + case X0213_2: +#if defined(INT_IS_SHORT) + (*oconv)(0x8f00L | c2, c1); +#else + (*oconv)((0x8f << 8) | c2, c1); +#endif + break; + default: + (*oconv)(input_mode, c1); /* other special case */ + } c2 = 0; continue; @@ -2554,13 +2763,10 @@ kanji_convert(f) 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 wc,c3; /** it must NOT be in the kanji shifte sequence */ @@ -2570,7 +2776,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){ @@ -2634,7 +2839,7 @@ h_conv(f, c2, c1) code_status(c1); } if ((*iconv)(c2, c1, 0) < 0){ - int c0; + nkf_char c0; if (wc < hold_count){ c0 = hold_buf[wc++]; }else{ @@ -2646,7 +2851,6 @@ h_conv(f, c2, c1) code_status(c0); } (*iconv)(c2, c1, c0); - c1 = c0; } } return c3; @@ -2654,26 +2858,26 @@ h_conv(f, c2, c1) -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 nkf_char shift_jisx0213_s1a3_table[5][2] ={ { 1, 8}, { 3, 4}, { 5,12}, {13,14}, {15, 0} }; #ifdef SHIFTJIS_CP932 if (cp51932_f && CP932_TABLE_BEGIN <= c2 && c2 <= CP932_TABLE_END){ +#if 0 extern const unsigned short shiftjis_cp932[3][189]; +#endif val = shiftjis_cp932[c2 - CP932_TABLE_BEGIN][c1 - 0x40]; if (val){ c2 = val >> 8; @@ -2682,11 +2886,17 @@ int s2e_conv(c2, c1, p2, p1) } #endif /* SHIFTJIS_CP932 */ #ifdef X0212_ENABLE - if (x0212_f && 0xfa <= c2 && c2 <= 0xfc){ + if (!x0213_f && 0xfa <= c2 && c2 <= 0xfc){ +#if 0 extern const unsigned short shiftjis_x0212[3][189]; +#endif val = shiftjis_x0212[c2 - 0xfa][c1 - 0x40]; if (val){ +#if defined(INT_IS_SHORT) + if (val & 0x8000L){ +#else if (val & 0x8000){ +#endif c2 = (0x8f << 8) | (val >> 8); c1 = val & 0xff; }else{ @@ -2700,46 +2910,55 @@ int s2e_conv(c2, c1, p2, p1) } #endif if(c2 >= 0x80){ - c2 = c2 + c2 - ((c2 <= 0x9f) ? SJ0162 : SJ6394); - if (c1 < 0x9f) - c1 = c1 - ((c1 > DEL) ? SPACE : 0x1f); + if(x0213_f && c2 >= 0xF0){ + if(c2 <= 0xF3 || (c2 == 0xF4 && c1 < 0x9F)){ /* k=1, 3<=k<=5, k=8, 12<=k<=15 */ +#if defined(INT_IS_SHORT) + c2 = 0x8F20L + shift_jisx0213_s1a3_table[c2 - 0xF0][0x9E < c1]; +#else + c2 = 0x8F20 + shift_jisx0213_s1a3_table[c2 - 0xF0][0x9E < c1]; +#endif + }else{ /* 78<=k<=94 */ +#if defined(INT_IS_SHORT) + c2 = 0x8F00L | (c2 * 2 - 0x17B); +#else + c2 = 0x8F00 | (c2 * 2 - 0x17B); +#endif + if (0x9E < c1) c2++; + } + }else{ + c2 = c2 + c2 - ((c2 <= 0x9F) ? SJ0162 : SJ6394); + if (0x9E < c1) c2++; + } + if (c1 < 0x9F) + c1 = c1 - ((c1 > DEL) ? SPACE : 0x1F); else { - c1 = c1 - 0x7e; - c2++; + c1 = c1 - 0x7E; } } #ifdef X0212_ENABLE - if (x0212_f){ - c2 = x0212_unshift(c2); - } + c2 = x0212_unshift(c2); #endif if (p2) *p2 = c2; if (p1) *p1 = c1; return 0; } -int -s_iconv(c2, c1, c0) - int c2, - c1, c0; +nkf_char s_iconv(nkf_char c2, nkf_char c1, nkf_char c0) { if (c2 == X0201) { c1 &= 0x7f; } else if ((c2 == EOF) || (c2 == 0) || c2 < SPACE) { /* NOP */ } else { - 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; @@ -2752,10 +2971,14 @@ e_iconv(c2, c1, c0) c1 = c0 & 0x7f; #ifdef SHIFTJIS_CP932 if (cp51932_f){ - int s2, s1; + nkf_char s2, s1; if (e2s_conv(c2, c1, &s2, &s1) == 0){ s2e_conv(s2, s1, &c2, &c1); +#if defined(INT_IS_SHORT) + if ((c2 & 0xff00L) == 0){ +#else if ((c2 & 0xff00) == 0){ +#endif c1 &= 0x7f; c2 &= 0x7f; } @@ -2777,12 +3000,9 @@ e_iconv(c2, c1, c0) } #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) { - int ret = 0; + nkf_char ret = 0; if (!c1){ *p2 = 0; @@ -2800,12 +3020,9 @@ w2e_conv(c2, c1, c0, p2, p1) 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; + nkf_char ret = 0; /* throw away ZERO WIDTH NO-BREAK SPACE (U+FEFF) */ if(ignore_zwnbsp_f){ @@ -2843,17 +3060,6 @@ w_iconv(c2, c1, c0) }else return 0; } if (c2 == 0 || c2 == EOF){ -#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; - } - val = ww16_conv(c2, c1, c0); - c2 = (val >> 8) & 0xff; - c1 = val & 0xff; -#endif } else { ret = w2e_conv(c2, c1, c0, &c2, &c1); } @@ -2862,12 +3068,16 @@ 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) { +#if defined(INT_IS_SHORT) + val &= 0xFFFFFFL; +#else + val &= 0xFFFFFF; +#endif if (val < 0x80){ *p2 = val; *p1 = 0; @@ -2882,12 +3092,12 @@ w16w_conv(val, p2, p1, p0) *p0 = 0x80 | (val & 0x3f); } } +#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; + nkf_char val; if (c2 >= 0xf0){ val = -1; }else if (c2 >= 0xe0){ @@ -2903,33 +3113,19 @@ 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) { - int c2, c1, c0; - int ret = 0; - + nkf_char c2, c1, c0; + nkf_char ret = 0; +#if defined(INT_IS_SHORT) + val &= 0xFFFFFFL; +#else + val &= 0xFFFFFF; +#endif if (val < 0x80){ *p2 = 0; *p1 = val; }else{ - if(!ms_ucs_map_f){ - /* eucJP-ascii */ - switch(val){ - case 0x203E: - *p2 = 0x21; - *p1 = 0x31; - return ret; - break; - case 0xFF5E: - *p2 = 0x8F22; - *p1 = 0x37; - return ret; - break; - } - } w16w_conv(val, &c2, &c1, &c0); ret = unicode_to_jis_common(c2, c1, c0, p2, p1); #ifdef NUMCHAR_OPTION @@ -2942,12 +3138,12 @@ w16e_conv(val, p2, p1) } 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; + nkf_char ret; /* throw away ZERO WIDTH NO-BREAK SPACE (U+FEFF) */ if(ignore_zwnbsp_f){ @@ -2961,7 +3157,7 @@ w_iconv16(c2, c1, c0) } } if (c2 != EOF && utf16_mode == UTF16LE_INPUT) { - int tmp; + nkf_char tmp; tmp=c1; c1=c2; c2=tmp; } if ((c2==0 && c1 < 0x80) || c2==EOF) { @@ -2969,154 +3165,156 @@ w_iconv16(c2, c1, c0) return 0; }else if((c2>>3)==27){ /* surrogate pair */ return 1; -#ifdef UTF8_OUTPUT_ENABLE - }else if (internal_unicode_f && (output_conv == w_oconv || output_conv == w_oconv16)){ -#endif +#if defined(INT_IS_SHORT) + }else ret = w16e_conv(((c2 & 0xff)<<8) + c1, &c2, &c1); +#else }else ret = w16e_conv(((c2<<8)&0xff00) + c1, &c2, &c1); +#endif if (ret) return ret; (*oconv)(c2, c1); return 0; } -int -unicode_to_jis_common(c2, c1, c0, p2, p1) - int c2, c1, c0; - int *p2, *p1; +nkf_char unicode_to_jis_common(nkf_char c2, nkf_char c1, nkf_char c0, nkf_char *p2, nkf_char *p1) { +#if 0 extern const unsigned short *const utf8_to_euc_2bytes[]; + extern const unsigned short *const utf8_to_euc_2bytes_ms[]; + extern const unsigned short *const utf8_to_euc_2bytes_932[]; extern const unsigned short *const *const utf8_to_euc_3bytes[]; - int ret = 0; - - if(c2 < 0xe0){ - if (ms_ucs_map_f && cp51932_f){ - /* CP932/CP51932: U+00A6 (BROKEN BAR) -> not 0x8fa2c3, but 0x7c */ - if(c2 == 0xC2){ - switch(c1){ - case 0xA5: - if (p2) *p2 = 0; - if (p1) *p1 = 0x5C; - return 0; - case 0xA6: - if (p2) *p2 = 0; - if (p1) *p1 = 0x7C; - return 0; - } - } - }else if(strict_mapping_f){ - switch(c2){ - case 0xC2: - switch(c1){ - case 0xAB: case 0xAD: case 0xB2: case 0xB3: - case 0xB5: case 0xB7: case 0xB9: case 0xBB: - return 1; - } - break; - case 0xC3: - switch(c1){ - case 0x90: - return 1; - } - break; - } - } - ret = w_iconv_common(c2, c1, utf8_to_euc_2bytes, sizeof_utf8_to_euc_2bytes, p2, p1); - if(!ret && !ms_ucs_map_f && !x0212_f){ - if(*p2 == 0 && *p1 < 0x80){ - return 1; - }else if(*p2 > 0xFF){ - int s2, s1; - if (e2s_conv(*p2, *p1, &s2, &s1) == 0){ - s2e_conv(s2, s1, p2, p1); - if(*p2 == 0 && *p1 < 0x80) - return 1; - }else return 1; - } - } - }else if(c0){ - if(unicode_round_trip_f){ - switch(c2){ - case 0xE2: - switch(c1){ - case 0x80: - if(c0 == 0x95) return 1; + extern const unsigned short *const *const utf8_to_euc_3bytes_ms[]; + extern const unsigned short *const *const utf8_to_euc_3bytes_932[]; +#endif + const unsigned short *const *pp; + const unsigned short *const *const *ppp; + static const int no_best_fit_chars_table_C2[] = + {1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 0, 0, 1, 0, 0, 0, 0, 1, 1, 1, 2, 1, 1, 2, + 0, 0, 1, 1, 0, 1, 0, 1, 2, 1, 1, 1, 1, 1, 1, 1}; + static const int no_best_fit_chars_table_C2_ms[] = + {1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, + 1, 0, 1, 1, 0, 1, 1, 0, 0, 0, 0, 1, 1, 1, 0, 0, + 0, 0, 1, 1, 0, 1, 0, 1, 0, 1, 0, 1, 1, 1, 1, 0}; + static const int no_best_fit_chars_table_932_C2[] = + {1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 0, 1, 1, 0, 0, 1, 1, 1, 1, 1, 1, 1, + 0, 0, 1, 1, 0, 1, 0, 1, 1, 1, 1, 1, 0, 0, 0, 0}; + static const int no_best_fit_chars_table_932_C3[] = + {1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 0, 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 0, 1, 1, 1, 1, 1, 1, 1, 1}; + nkf_char ret = 0; + + if(c2 < 0x80){ + *p2 = 0; + *p1 = c2; + }else if(c2 < 0xe0){ + if(no_best_fit_chars_f){ + if(ms_ucs_map_f == UCS_MAP_CP932){ + switch(c2){ + case 0xC2: + if(no_best_fit_chars_table_932_C2[c1&0x3F]) return 1; break; - case 0x88: - if(c0 == 0xA5) return 1; + case 0xC3: + if(no_best_fit_chars_table_932_C3[c1&0x3F]) return 1; break; } - break; - case 0xEF: - switch(c1){ - case 0xBB: - if(c0 == 0xBF) return 1; + }else if(cp51932_f){ + switch(c2){ + case 0xC2: + if(no_best_fit_chars_table_C2[c1&0x3F]) return 1; break; - case 0xBC: - if(c0 == 0x8D) return 1; - break; - case 0xBF: - if(0xA0 <= c0 && c0 <= 0xA5) return 1; + case 0xC3: + if(no_best_fit_chars_table_932_C3[c1&0x3F]) return 1; break; } - break; - } - } - if(!ms_ucs_map_f){ - /* eucJP-ascii */ - if(c2 == 0xE2 && c1 == 0x80 && c0 == 0xBE){ - if (p2) *p2 = 0x21; - if (p1) *p1 = 0x31; - return ret; - }else if(c2 == 0xEF && c1 == 0xBD && c0 == 0x9E){ - if (p2) *p2 = 0x8F22; - if (p1) *p1 = 0x37; - return ret; + }else if(ms_ucs_map_f == UCS_MAP_MS){ + if(c2 == 0xC2 && no_best_fit_chars_table_C2_ms[c1&0x3F]) return 1; } } - if(!strict_mapping_f); - else if(ms_ucs_map_f && cp51932_f){ - /* Microsoft Code Page */ - switch(c2){ - case 0xE2: - switch(c1){ - case 0x80: - switch(c0){ - case 0x94: case 0x96: case 0xBE: - return 1; + 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 : + utf8_to_euc_2bytes; + ret = w_iconv_common(c2, c1, pp, sizeof_utf8_to_euc_2bytes, p2, p1); + }else if(c0){ + 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 0x88: - if(c0 == 0x92) - return 1; + case 0xE3: + if(c1 == 0x80 || c0 == 0x9C) return 1; break; } - break; - case 0xE3: - switch(c1){ - case 0x80: - if(c0 == 0x9C) - return 1; + }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 && cp51932_f) return 1; + break; + case 0xBF: + if(0xA0 <= c0 && c0 <= 0xA5) return 1; + break; + } break; } - break; } - }else{ - /* eucJP-open */ - if(c2 == 0xE3 && c1 == 0x82 && c0 == 0x94) - return 1; } - ret = w_iconv_common(c1, c0, utf8_to_euc_3bytes[c2 - 0xE0], sizeof_utf8_to_euc_C2, p2, p1); + 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 : + 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 defined(INT_IS_SHORT) + if (!ret && cp51932_f && ((unsigned short)(*p2) >> 8) == 0x8f) { +#else + if (!ret && cp51932_f && (*p2 & 0xff00) >> 8 == 0x8f) { +#endif + nkf_char s2, s1; + if (e2s_conv(*p2, *p1, &s2, &s1) == 0) { + s2e_conv(s2, s1, p2, p1); + }else{ + ret = 1; + } + } +#endif 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; @@ -3128,19 +3326,30 @@ 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 (disable_cp932ext_f && ( - (val>>8) == 0x2D || /* disable NEC special characters */ - val > 0xF300 /* disable NEC special characters */ + if (no_cp932ext_f && ( + (val>>8) == 0x2D || /* NEC special characters */ +#if defined(INT_IS_SHORT) + val > 0xF300L /* NEC special characters */ +#else + val > 0xF300 /* NEC special characters */ +#endif )) return 1; c2 = val >> 8; - if (val & 0x8000){ +#if defined(INT_IS_SHORT) + if (val & 0x8000L){ + c2 &= 0x7f; + c2 |= 0x8f00L; + } +#else + if (val & 0x8000){ c2 &= 0x7f; c2 |= 0x8f00; } +#endif if (c2 == SO) c2 = X0201; c1 = val & 0x7f; if (p2) *p2 = c2; @@ -3148,17 +3357,15 @@ w_iconv_common(c1, c0, pp, psize, p2, p1) return 0; } -#endif - -#ifdef UTF8_OUTPUT_ENABLE -void -nkf_each_char_to_hex(f, c) - void (*f)PROTO((int c2,int c1)); - int c; +void nkf_each_char_to_hex(void (*f)(nkf_char c2,nkf_char c1), nkf_char c) { const char *hex = "0123456789ABCDEF"; - c &= 0x00FFFFFF; int shift = 20; +#if defined(INT_IS_SHORT) + c &= 0x00FFFFFFL; +#else + c &= 0x00FFFFFF; +#endif while(shift >= 0){ if(c >= 1<= 0){ @@ -3172,17 +3379,23 @@ nkf_each_char_to_hex(f, c) return; } -void -encode_fallback_html(c) - int c; +void encode_fallback_html(nkf_char c) { (*oconv)(0, '&'); (*oconv)(0, '#'); +#if defined(INT_IS_SHORT) + c &= 0x00FFFFFFL; + if(c >= 1000000L) + (*oconv)(0, 0x30+(c/1000000L)%10); + if(c >= 100000L) + (*oconv)(0, 0x30+(c/100000L )%10); +#else c &= 0x00FFFFFF; if(c >= 1000000) (*oconv)(0, 0x30+(c/1000000)%10); if(c >= 100000) (*oconv)(0, 0x30+(c/100000 )%10); +#endif if(c >= 10000) (*oconv)(0, 0x30+(c/10000 )%10); if(c >= 1000) @@ -3197,9 +3410,7 @@ encode_fallback_html(c) return; } -void -encode_fallback_xml(c) - int c; +void encode_fallback_xml(nkf_char c) { (*oconv)(0, '&'); (*oconv)(0, '#'); @@ -3209,13 +3420,15 @@ encode_fallback_xml(c) return; } -void -encode_fallback_java(c) - int c; +void encode_fallback_java(nkf_char c) { const char *hex = "0123456789ABCDEF"; (*oconv)(0, '\\'); +#if defined(INT_IS_SHORT) + if((c&0x00FFFFFFL) > 0xFFFFL){ +#else if((c&0x00FFFFFF) > 0xFFFF){ +#endif (*oconv)(0, 'U'); (*oconv)(0, '0'); (*oconv)(0, '0'); @@ -3231,9 +3444,7 @@ encode_fallback_java(c) return; } -void -encode_fallback_perl(c) - int c; +void encode_fallback_perl(nkf_char c) { (*oconv)(0, '\\'); (*oconv)(0, 'x'); @@ -3243,44 +3454,36 @@ encode_fallback_perl(c) return; } -void -encode_fallback_subchar(c) - int c; +void encode_fallback_subchar(nkf_char c) { c = unicode_subchar; (*oconv)((c>>8)&0xFF, c&0xFF); return; - int shift = 16; - while(shift >= 0){ - if(c >= 1<= 0){ - (*oconv)(0, (c>>shift)&0xFF); - shift -= 8; - } - }else{ - shift -= 8; - } - } - return; } +#endif -int -e2w_conv(c2, c1) - int c2, c1; +#ifdef UTF8_OUTPUT_ENABLE +nkf_char e2w_conv(nkf_char c2, nkf_char c1) { +#if 0 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[]; + extern const unsigned short *const x0212_to_utf8_2bytes[]; +#endif const unsigned short *p; if (c2 == X0201) { p = euc_to_utf8_1byte; #ifdef X0212_ENABLE } else if (c2 >> 8 == 0x8f){ - if(!ms_ucs_map_f && c2 == 0x8F22 && c1 == 0x43){ +#if defined(INT_IS_SHORT) + if(ms_ucs_map_f == UCS_MAP_ASCII&& c2 == 0x8F22L && c1 == 0x43){ +#else + if(ms_ucs_map_f == UCS_MAP_ASCII&& c2 == 0x8F22 && c1 == 0x43){ +#endif return 0xA6; } - extern const unsigned short *const x0212_to_utf8_2bytes[]; c2 = (c2&0x7f) - 0x21; if (0<=c2 && c2> 8) & 0xff; c1 = val & 0xff; } @@ -3401,10 +3595,7 @@ w_oconv16(c2, c1) #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){ @@ -3428,11 +3619,15 @@ e_oconv(c2, c1) output_mode = ISO8859_1; (*o_putc)(c1 | 0x080); #ifdef X0212_ENABLE +#if defined(INT_IS_SHORT) + } else if (((unsigned short)c2 >> 8) == 0x8f){ +#else } else if ((c2 & 0xff00) >> 8 == 0x8f){ +#endif output_mode = JAPANESE_EUC; #ifdef SHIFTJIS_CP932 if (cp51932_f){ - int s2, s1; + nkf_char s2, s1; if (e2s_conv(c2, c1, &s2, &s1) == 0){ s2e_conv(s2, s1, &c2, &c1); } @@ -3441,7 +3636,11 @@ e_oconv(c2, c1) if (c2 == 0) { output_mode = ASCII; (*o_putc)(c1); +#if defined(INT_IS_SHORT) + }else if (((unsigned short)c2 >> 8) == 0x8f){ +#else }else if ((c2 & 0xff00) >> 8 == 0x8f){ +#endif if (x0212_f){ (*o_putc)(0x8f); (*o_putc)((c2 & 0x7f) | 0x080); @@ -3465,12 +3664,15 @@ e_oconv(c2, c1) } #ifdef X0212_ENABLE -int x0212_shift(c) - int c; +nkf_char x0212_shift(nkf_char c) { - int ret = c; + nkf_char ret = c; c &= 0x7f; +#if defined(INT_IS_SHORT) + if ((ret & 0xff00L) == 0x8f00L){ +#else if ((ret & 0xff00) == 0x8f00){ +#endif if (0x75 <= c && c <= 0x7f){ ret = c + (0x109 - 0x75); } @@ -3483,10 +3685,9 @@ int x0212_shift(c) } -int x0212_unshift(c) - int c; +nkf_char x0212_unshift(nkf_char c) { - int ret = c; + nkf_char ret = c; if (0x7f <= c && c <= 0x88){ ret = c + (0x75 - 0x7f); }else if (0x89 <= c && c <= 0x92){ @@ -3496,45 +3697,56 @@ int x0212_unshift(c) } #endif /* X0212_ENABLE */ -int -e2s_conv(c2, c1, p2, p1) - int c2, c1, *p2, *p1; +nkf_char e2s_conv(nkf_char c2, nkf_char c1, nkf_char *p2, nkf_char *p1) { -#ifdef X0212_ENABLE - int val = 0; - const unsigned short *ptr; - int ndx; - extern const unsigned short *const x0212_shiftjis[]; + nkf_char ndx; +#if defined(INT_IS_SHORT) + if ((c2 & 0xff00L) == 0x8f00L){ +#else 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); - } +#endif + ndx = c2 & 0xff; + if (x0213_f){ + if((0x21 <= ndx && ndx <= 0x2F)){ + if (p2) *p2 = ((ndx - 1) >> 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 + else if(0x21 <= ndx && ndx <= 0x7e){ + nkf_char val = 0; + const unsigned short *ptr; +#if 0 + extern const unsigned short *const x0212_shiftjis[]; +#endif + 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){ @@ -3558,7 +3770,11 @@ s_oconv(c2, c1) output_mode = ISO8859_1; (*o_putc)(c1 | 0x080); #ifdef X0212_ENABLE +#if defined(INT_IS_SHORT) + } else if (((unsigned short)c2 >> 8) == 0x8f){ +#else } else if ((c2 & 0xff00) >> 8 == 0x8f){ +#endif output_mode = SHIFT_JIS; if (e2s_conv(c2, c1, &c2, &c1) == 0){ (*o_putc)(c2); @@ -3577,8 +3793,10 @@ s_oconv(c2, c1) #ifdef SHIFTJIS_CP932 if (cp932inv_f && CP932INV_TABLE_BEGIN <= c2 && c2 <= CP932INV_TABLE_END){ +#if 0 extern const unsigned short cp932inv[2][189]; - int c = cp932inv[c2 - CP932INV_TABLE_BEGIN][c1 - 0x40]; +#endif + nkf_char c = cp932inv[c2 - CP932INV_TABLE_BEGIN][c1 - 0x40]; if (c){ c2 = c >> 8; c1 = c & 0xff; @@ -3594,10 +3812,7 @@ 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 (c2 == 0 && (c1 & CLASS_MASK) == CLASS_UTF16){ @@ -3617,13 +3832,27 @@ j_oconv(c2, c1) } (*o_putc)(EOF); #ifdef X0212_ENABLE +#if defined(INT_IS_SHORT) + } else if (((unsigned short)c2 >> 8) == 0x8f){ +#else } else if ((c2 & 0xff00) >> 8 == 0x8f){ - if (output_mode!=X0212) { - output_mode = X0212; - (*o_putc)(ESC); - (*o_putc)('$'); - (*o_putc)('('); - (*o_putc)('D'); +#endif + 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); @@ -3651,39 +3880,39 @@ j_oconv(c2, c1) } (*o_putc)(c1); } else { - if (output_mode != X0208) { + if(c2<0x20 || 0x7e0) { return broken_buf[--broken_counter]; @@ -3719,21 +3948,16 @@ 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; +static nkf_char prev_cr = 0; -void -cr_conv(c2,c1) -int c2,c1; +void cr_conv(nkf_char c2, nkf_char c1) { if (prev_cr) { prev_cr = 0; @@ -3780,12 +4004,10 @@ int c2,c1; #define char_size(c2,c1) (c2?2:1) -void -fold_conv(c2,c1) -int c2,c1; +void fold_conv(nkf_char c2, nkf_char c1) { - int prev0; - int fold_state=0; + nkf_char prev0; + nkf_char fold_state; if (c1== '\r' && !fold_preserve_f) { fold_state=0; /* ignore cr */ @@ -3833,8 +4055,6 @@ int c2,c1; } } else if (c1=='\f') { f_prev = '\n'; - if (f_line==0) - fold_state = 1; f_line = 0; fold_state = '\n'; /* output newline and clear */ } else if ( (c2==0 && c1==' ')|| @@ -3952,11 +4172,9 @@ int c2,c1; } } -int z_prev2=0,z_prev1=0; +nkf_char z_prev2=0,z_prev1=0; -void -z_conv(c2,c1) -int c2,c1; +void z_conv(nkf_char c2, nkf_char c1) { /* if (c2) c1 &= 0x7f; assertion */ @@ -4045,9 +4263,7 @@ int c2,c1; c \ ) -void -rot_conv(c2,c1) -int c2,c1; +void rot_conv(nkf_char c2, nkf_char c1) { if (c2==0 || c2==X0201 || c2==ISO8859_1) { c1 = rot13(c1); @@ -4058,24 +4274,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; @@ -4129,7 +4364,7 @@ const unsigned char *mime_pattern[] = { (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 @@ -4139,26 +4374,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[] = { +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[] = { +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', @@ -4168,8 +4403,7 @@ const int mime_encode_method[] = { #define MAXRECOVER 20 -void -switch_mime_getc() +void switch_mime_getc(void) { if (i_getc!=mime_getc) { i_mgetc = i_getc; i_getc = mime_getc; @@ -4181,8 +4415,7 @@ switch_mime_getc() } } -void -unswitch_mime_getc() +void unswitch_mime_getc(void) { if(mime_f==STRICT_MIME) { i_mgetc = i_mgetc_buf; @@ -4194,14 +4427,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 */ @@ -4213,11 +4444,13 @@ FILE *f; if ( ((r[i] = c1 = (*i_getc)(f))==EOF) || nkf_toupper(c1) != p[i] ) { /* pattern fails, try next one */ q = p; - while ((p = mime_pattern[++j])) { + while (mime_pattern[++j]) { + p = mime_pattern[j]; for(k=2;k i */ if (p[k]!=q[k]) break; if (k==i && nkf_toupper(c1)==p[k]) break; } + p = mime_pattern[j]; if (p) continue; /* found next one, continue */ /* all fails, output from recovery buffer */ (*i_ungetc)(c1,f); @@ -4245,9 +4478,7 @@ FILE *f; return c1; } -int -mime_getc_buf(f) -FILE *f; +nkf_char mime_getc_buf(FILE *f) { /* we don't keep eof of Fifo, becase it contains ?= as a terminator. It was checked in mime_integrity. */ @@ -4255,23 +4486,18 @@ FILE *f; (*i_mgetc_buf)(f):Fifo(mime_input++)); } -int -mime_ungetc_buf(c,f) -FILE *f; -int c; +nkf_char mime_ungetc_buf(nkf_char c, FILE *f) { if (mimebuf_f) (*i_mungetc_buf)(c,f); else - Fifo(--mime_input)=c; + Fifo(--mime_input) = (unsigned char)c; return c; } -int -mime_begin(f) -FILE *f; +nkf_char mime_begin(FILE *f) { - int c1; + nkf_char c1; int i,k; /* In NONSTRICT mode, only =? is checked. In case of failure, we */ @@ -4282,7 +4508,7 @@ FILE *f; Fifo(mime_last++)='='; Fifo(mime_last++)='?'; for(i=2;i 0 && ((buf[i] & 0xc0) != 0x80)){ @@ -4534,7 +4729,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; } @@ -4545,26 +4740,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++); @@ -4582,12 +4773,12 @@ FILE *f; if (mime_decode_mode == 'Q') { if ((c1 = (*i_mgetc)(f)) == EOF) return (EOF); restart_mime_q: - if (c1=='_') return ' '; + if (c1=='_' && mimebuf_f != FIXED_MIME) return ' '; if (c1<=' ' || DEL<=c1) { mime_decode_mode = exit_mode; /* prepare for quit */ return c1; } - if (c1!='=' && c1!='?') { + if (c1!='=' && (c1!='?' || mimebuf_f == FIXED_MIME)) { return c1; } @@ -4631,13 +4822,12 @@ restart_mime_q: break; case SPACE: case TAB: - lwsp_buf[lwsp_count] = c1; + lwsp_buf[lwsp_count] = (unsigned char)c1; if (lwsp_count++>lwsp_size){ - lwsp_size *= 2; + lwsp_size <<= 1; lwsp_buf_new = realloc(lwsp_buf, (lwsp_size+5)*sizeof(char)); if (lwsp_buf_new==NULL) { free(lwsp_buf); - lwsp_buf = NULL; perror("can't realloc"); return -1; } @@ -4647,18 +4837,13 @@ restart_mime_q: } break; } - if (lwsp_count > 0) { - if (c1=='=' && (lwsp_buf[lwsp_count-1]==SPACE||lwsp_buf[lwsp_count-1]==TAB)) { - lwsp_count = 0; - } else { - i_ungetc(c1,f); - for(lwsp_count--;lwsp_count>0;lwsp_count--) - i_ungetc(lwsp_buf[lwsp_count],f); - c1 = lwsp_buf[0]; - } + if (lwsp_count > 0 && (c1 != '=' || (lwsp_buf[lwsp_count-1] != SPACE && lwsp_buf[lwsp_count-1] != TAB))) { + i_ungetc(c1,f); + for(lwsp_count--;lwsp_count>0;lwsp_count--) + i_ungetc(lwsp_buf[lwsp_count],f); + c1 = lwsp_buf[0]; } free(lwsp_buf); - lwsp_buf = NULL; return c1; } if (c1=='='&&c2<' ') { /* this is soft wrap */ @@ -4750,13 +4935,12 @@ mime_c2_retry: break; case SPACE: case TAB: - lwsp_buf[lwsp_count] = c1; + lwsp_buf[lwsp_count] = (unsigned char)c1; if (lwsp_count++>lwsp_size){ - lwsp_size *= 2; + lwsp_size <<= 1; lwsp_buf_new = realloc(lwsp_buf, (lwsp_size+5)*sizeof(char)); if (lwsp_buf_new==NULL) { free(lwsp_buf); - lwsp_buf = NULL; perror("can't realloc"); return -1; } @@ -4766,18 +4950,13 @@ mime_c2_retry: } break; } - if (lwsp_count > 0) { - if (c1=='=' && (lwsp_buf[lwsp_count-1]==SPACE||lwsp_buf[lwsp_count-1]==TAB)) { - lwsp_count = 0; - } else { - i_ungetc(c1,f); - for(lwsp_count--;lwsp_count>0;lwsp_count--) - i_ungetc(lwsp_buf[lwsp_count],f); - c1 = lwsp_buf[0]; - } + if (lwsp_count > 0 && (c1 != '=' || (lwsp_buf[lwsp_count-1] != SPACE && lwsp_buf[lwsp_count-1] != TAB))) { + i_ungetc(c1,f); + for(lwsp_count--;lwsp_count>0;lwsp_count--) + i_ungetc(lwsp_buf[lwsp_count],f); + c1 = lwsp_buf[0]; } free(lwsp_buf); - lwsp_buf = NULL; return c1; } mime_c3_retry: @@ -4807,13 +4986,13 @@ mime_c4_retry: t4 = 0x3f & base64decode(c4); cc = ((t1 << 2) & 0x0fc) | ((t2 >> 4) & 0x03); if (c2 != '=') { - Fifo(mime_last++) = cc; + Fifo(mime_last++) = (unsigned char)cc; cc = ((t2 << 4) & 0x0f0) | ((t3 >> 2) & 0x0f); if (c3 != '=') { - Fifo(mime_last++) = cc; + Fifo(mime_last++) = (unsigned char)cc; cc = ((t3 << 6) & 0x0c0) | (t4 & 0x3f); if (c4 != '=') - Fifo(mime_last++) = cc; + Fifo(mime_last++) = (unsigned char)cc; } } else { return c1; @@ -4821,21 +5000,15 @@ 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 */ @@ -4851,7 +5024,7 @@ 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; switch_mime_getc(); @@ -4860,20 +5033,18 @@ mime_integrity(f,p) if (!( (c=='+'||c=='/'|| c=='=' || c=='?' || is_alnum(c)))) break; /* Should we check length mod 4? */ - Fifo(mime_input++) = c; + Fifo(mime_input++) = (unsigned char)c; d=c; } /* In case of Incomplete MIME, no MIME decode */ - Fifo(mime_input++) = c; + Fifo(mime_input++) = (unsigned char)c; mime_last = mime_input; /* point undecoded buffer */ mime_decode_mode = 1; /* no decode on Fifo last in mime_getc */ switch_mime_getc(); /* anyway we need buffered getc */ return 1; } -int -base64decode(c) - int c; +nkf_char base64decode(nkf_char c) { int i; if (c > '@') { @@ -4892,19 +5063,17 @@ 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; @@ -4957,8 +5126,7 @@ int mode; } } -void -close_mime() +void close_mime(void) { (*o_mputc)('?'); (*o_mputc)('='); @@ -4966,8 +5134,7 @@ close_mime() mimeout_mode = 0; } -void -eof_mime() +void eof_mime(void) { switch(mimeout_mode) { case 'Q': @@ -4993,19 +5160,14 @@ eof_mime() } } -void -mimeout_addchar(c) - int c; +void mimeout_addchar(nkf_char c) { switch(mimeout_mode) { case 'Q': - if(c==SPACE){ - (*o_mputc)('_'); - base64_count++; - } else if (c==CR||c==NL) { + if (c==CR||c==NL) { (*o_mputc)(c); base64_count = 0; - } else if(c 1 @@ -5165,7 +5328,7 @@ mime_putc(c) base64_count++; } } - mimeout_buf[mimeout_buf_count++] = c; + mimeout_buf[mimeout_buf_count++] = (char)c; if (mimeout_buf_count>MIMEOUT_BUF_LENGTH) { open_mime(output_mode); } @@ -5218,7 +5381,7 @@ mime_putc(c) mimeout_buf_count = 0; } } - mimeout_buf[mimeout_buf_count++] = c; + mimeout_buf[mimeout_buf_count++] = (char)c; if (mimeout_buf_count>MIMEOUT_BUF_LENGTH) { eof_mime(); for (i=0;i0 && SPACEMIMEOUT_BUF_LENGTH) { j = mimeout_buf_count; mimeout_buf_count = 0; @@ -5264,8 +5427,7 @@ mime_putc(c) #if defined(PERL_XS) || defined(WIN32DLL) -void -reinit() +void reinit(void) { { struct input_code *p = input_code_list; @@ -5293,20 +5455,20 @@ reinit() x0201_f = NO_X0201; #endif iso2022jp_f = FALSE; -#if defined(UTF8_OUTPUT_ENABLE) && defined(UTF8_INPUT_ENABLE) - internal_unicode_f = FALSE; +#if defined(UTF8_INPUT_ENABLE) || defined(UTF8_OUTPUT_ENABLE) + ms_ucs_map_f = UCS_MAP_ASCII; #endif -#ifdef UTF8_OUTPUT_ENABLE - unicode_bom_f = 0; - w_oconv16_LE = 0; - ms_ucs_map_f = FALSE; - strict_mapping_f = TRUE; - disable_cp932ext_f = FALSE; +#ifdef UTF8_INPUT_ENABLE + no_cp932ext_f = FALSE; ignore_zwnbsp_f = TRUE; - unicode_round_trip_f = FALSE; + no_best_fit_chars_f = FALSE; encode_fallback = NULL; unicode_subchar = '?'; #endif +#ifdef UTF8_OUTPUT_ENABLE + unicode_bom_f = 0; + w_oconv16_LE = 0; +#endif #ifdef UNICODE_NORMALIZATION nfc_f = FALSE; #endif @@ -5331,6 +5493,7 @@ reinit() #endif #ifdef X0212_ENABLE x0212_f = FALSE; + x0213_f = FALSE; #endif { int i; @@ -5375,7 +5538,7 @@ reinit() input_mode = ASCII; shift_mode = FALSE; mime_decode_mode = FALSE; - file_out = FALSE; + file_out_f = FALSE; crmode_f = 0; option_mode = 0; broken_counter = 0; @@ -5391,16 +5554,12 @@ reinit() } #endif -void -no_connection(c2,c1) -int c2,c1; +void no_connection(nkf_char c2, nkf_char c1) { no_connection2(c2,c1,0); } -int -no_connection2(c2,c1,c0) -int c2,c1,c0; +nkf_char no_connection2(nkf_char c2, nkf_char c1, nkf_char c0) { fprintf(stderr,"nkf internal module connection failure.\n"); exit(1); @@ -5411,33 +5570,33 @@ int c2,c1,c0; #ifdef WIN32DLL #define fprintf dllprintf #endif -void -usage() +void usage(void) { fprintf(stderr,"USAGE: nkf(nkf32,wnkf,nkf2) -[flags] [in file] .. [out file for -O flag]\n"); fprintf(stderr,"Flags:\n"); fprintf(stderr,"b,u Output is buffered (DEFAULT),Output is unbuffered\n"); #ifdef DEFAULT_CODE_SJIS - fprintf(stderr,"j,s,e,w Outout code is JIS 7 bit, Shift JIS (DEFAULT), AT&T JIS (EUC), UTF-8N\n"); + fprintf(stderr,"j,s,e,w Outout code is JIS 7 bit, Shift_JIS (DEFAULT), EUC-JP, UTF-8N\n"); #endif #ifdef DEFAULT_CODE_JIS - fprintf(stderr,"j,s,e,w Outout code is JIS 7 bit (DEFAULT), Shift JIS, AT&T JIS (EUC), UTF-8N\n"); + fprintf(stderr,"j,s,e,w Outout code is JIS 7 bit (DEFAULT), Shift JIS, EUC-JP, UTF-8N\n"); #endif #ifdef DEFAULT_CODE_EUC - fprintf(stderr,"j,s,e,w Outout code is JIS 7 bit, Shift JIS, AT&T JIS (EUC) (DEFAULT), UTF-8N\n"); + fprintf(stderr,"j,s,e,w Outout code is JIS 7 bit, Shift JIS, EUC-JP (DEFAULT), UTF-8N\n"); #endif #ifdef DEFAULT_CODE_UTF8 - fprintf(stderr,"j,s,e,w Outout code is JIS 7 bit, Shift JIS, AT&T JIS (EUC), UTF-8N (DEFAULT)\n"); + fprintf(stderr,"j,s,e,w Outout code is JIS 7 bit, Shift JIS, EUC-JP, UTF-8N (DEFAULT)\n"); #endif #ifdef UTF8_OUTPUT_ENABLE - fprintf(stderr," After 'w' you can add more options. (80?|16((B|L)0?)?) \n"); + fprintf(stderr," After 'w' you can add more options. -w[ 8 [0], 16 [[BL] [0]] ]\n"); #endif - fprintf(stderr,"J,S,E,W Input assumption is JIS 7 bit , Shift JIS, AT&T JIS (EUC), UTF-8\n"); + fprintf(stderr,"J,S,E,W Input assumption is JIS 7 bit , Shift JIS, EUC-JP, UTF-8\n"); #ifdef UTF8_INPUT_ENABLE - fprintf(stderr," After 'W' you can add more options. (8|16(B|L)?) \n"); + fprintf(stderr," After 'W' you can add more options. -W[ 8, 16 [BL] ] \n"); #endif fprintf(stderr,"t no conversion\n"); - fprintf(stderr,"i_/o_ Output sequence to designate JIS-kanji/ASCII (DEFAULT B)\n"); + fprintf(stderr,"i[@B] Specify the Esc Seq for JIS X 0208-1978/83 (DEFAULT B)\n"); + fprintf(stderr,"o[BJH] Specify the Esc Seq for ASCII/Roman (DEFAULT B)\n"); fprintf(stderr,"r {de/en}crypt ROT13/47\n"); fprintf(stderr,"h 1 katakana->hiragana, 2 hiragana->katakana, 3 both\n"); fprintf(stderr,"v Show this usage. V: show version\n"); @@ -5445,23 +5604,27 @@ 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-3] Convert X0208 alphabet to ASCII\n"); + fprintf(stderr," 1: Kankaku to 1 space 2: to 2 spaces 3: Convert to HTML Entity\n"); fprintf(stderr,"X,x Assume X0201 kana in MS-Kanji, -x preserves X0201\n"); fprintf(stderr,"B[0-2] Broken input 0: missing ESC,1: any X on ESC-[($]-X,2: ASCII on NL\n"); #ifdef MSDOS fprintf(stderr,"T Text mode output\n"); #endif fprintf(stderr,"O Output to File (DEFAULT 'nkf.out')\n"); - fprintf(stderr,"d,c Delete \\r in line feed and \\032, Add \\r in line feed\n"); fprintf(stderr,"I Convert non ISO-2022-JP charactor to GETA\n"); + fprintf(stderr,"d,c Convert line breaks -d: LF -c: CRLF\n"); fprintf(stderr,"-L[uwm] line mode u:LF w:CRLF m:CR (DEFAULT noconversion)\n"); - fprintf(stderr,"long name options\n"); - fprintf(stderr," --ic= --oc= set the input or output codeset\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," --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 @@ -5470,21 +5633,24 @@ usage() #endif #ifdef UTF8_INPUT_ENABLE fprintf(stderr," --fb-{skip, html, xml, perl, java, subchar}\n"); - fprintf(stderr," set the way nkf handles unassigned characters\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__)