X-Git-Url: http://git.sourceforge.jp/view?p=nkf%2Fnkf.git;a=blobdiff_plain;f=nkf.c;h=7154927a9955732ea304fe8783b2e0a3666d368e;hp=cafb0c4c45f3ff8eff42d34c27b2860e287facda;hb=c278d5b872e306b46d9a6bb2014d814652b344a1;hpb=6af6940e58650ffcae94e3a37083b6c70c3bee75 diff --git a/nkf.c b/nkf.c index cafb0c4..7154927 100644 --- a/nkf.c +++ b/nkf.c @@ -39,13 +39,14 @@ ** E-Mail: furukawa@tcp-ip.or.jp ** まで御連絡をお願いします。 ***********************************************************************/ -/* $Id: nkf.c,v 1.81 2005/11/06 20:17:01 naruse Exp $ */ -#define NKF_VERSION "2.0.5" -#define NKF_RELEASE_DATE "2005-11-07" +/* $Id: nkf.c,v 1.99 2006/05/06 11:55:07 naruse Exp $ */ +#define NKF_VERSION "2.0.7" +#define NKF_RELEASE_DATE "2006-04-22" #include "config.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 +96,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 +114,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 +163,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 +182,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 +190,6 @@ #endif /* (__WIN32__) */ #endif #endif -#endif - -#ifdef INT_IS_SHORT -#define int long #endif #define FALSE 0 @@ -190,7 +211,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 */ @@ -258,13 +281,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 */ @@ -273,242 +295,257 @@ 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)); + void (*status_func)(struct input_code *, int); + int (*iconv_func)(int c2, int c1, int 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 int noconvert(FILE *f); +#endif +static void module_connection(void); +static int kanji_convert(FILE *f); +static int h_conv(FILE *f,int c2,int c1); +static int push_hold_buf(int c2); +static void set_iconv(int f, int (*iconv_func)(int c2,int c1,int c0)); +static int s_iconv(int c2,int c1,int c0); +static int s2e_conv(int c2, int c1, int *p2, int *p1); +static int e_iconv(int c2,int c1,int 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 -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 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)); +/* 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; +static int no_best_fit_chars_f = FALSE; +static int unicode_subchar = '?'; /* the regular substitution character */ +static void nkf_each_char_to_hex(void (*f)(int c2,int c1), int c); +static void encode_fallback_html(int c); +static void encode_fallback_xml(int c); +static void encode_fallback_java(int c); +static void encode_fallback_perl(int c); +static void encode_fallback_subchar(int c); +static void (*encode_fallback)(int c) = NULL; +static int w2e_conv(int c2,int c1,int c0,int *p2,int *p1); +static int w_iconv(int c2,int c1,int c0); +static int w_iconv16(int c2,int c1,int c0); +static int unicode_to_jis_common(int c2,int c1,int c0,int *p2,int *p1); +static int w_iconv_common(int c1,int c0,const unsigned short *const *pp,int psize,int *p2,int *p1); +static void w16w_conv(int val, int *p2, int *p1, int *p0); +static int ww16_conv(int c2, int c1, int c0); +static int w16e_conv(int val,int *p2,int *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 int e2w_conv(int c2,int c1); +static void w_oconv(int c2,int c1); +static void w_oconv16(int c2,int c1); +#endif +static void e_oconv(int c2,int c1); +static int e2s_conv(int c2, int c1, int *p2, int *p1); +static void s_oconv(int c2,int c1); +static void j_oconv(int c2,int c1); +static void fold_conv(int c2,int c1); +static void cr_conv(int c2,int c1); +static void z_conv(int c2,int c1); +static void rot_conv(int c2,int c1); +static void hira_conv(int c2,int c1); +static void base64_conv(int c2,int c1); +static void iso2022jp_check_conv(int c2,int c1); +static void no_connection(int c2,int c1); +static int no_connection2(int c2,int c1,int c0); + +static void code_score(struct input_code *ptr); +static void code_status(int c); + +static void std_putc(int c); +static int std_getc(FILE *f); +static int std_ungetc(int c,FILE *f); + +static int broken_getc(FILE *f); +static int broken_ungetc(int c,FILE *f); + +static int mime_begin(FILE *f); +static int mime_getc(FILE *f); +static int mime_ungetc(int c,FILE *f); + +static void switch_mime_getc(void); +static void unswitch_mime_getc(void); +static int mime_begin_strict(FILE *f); +static int mime_getc_buf(FILE *f); +static int mime_ungetc_buf(int c,FILE *f); +static int mime_integrity(FILE *f,const unsigned char *p); + +static int base64decode(int c); +static void mime_prechar(int c2, int c1); +static void mime_putc(int c); +static void open_mime(int c); +static void close_mime(void); +static void eof_mime(void); +static void mimeout_addchar(int 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 int (*mime_iconv_back)(int c2,int c1,int 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 int (*i_nfc_getc)(FILE *) = std_getc; /* input of ugetc */ +static int (*i_nfc_ungetc)(int c ,FILE *f) = std_ungetc; +static int nfc_getc(FILE *f); +static int nfc_ungetc(int 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 int (*i_cgetc)(FILE *) = std_getc; /* input of cgetc */ +static int (*i_cungetc)(int c ,FILE *f) = std_ungetc; +static int cap_getc(FILE *f); +static int cap_ungetc(int 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 int (*i_ugetc)(FILE *) = std_getc; /* input of ugetc */ +static int (*i_uungetc)(int c ,FILE *f) = std_ungetc; +static int url_getc(FILE *f); +static int url_ungetc(int c,FILE *f); #endif #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 int (*i_ngetc)(FILE *) = std_getc; /* input of ugetc */ +static int (*i_nungetc)(int c ,FILE *f) = std_ungetc; +static int numchar_getc(FILE *f); +static int numchar_ungetc(int 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(int c); +static int debug_f = FALSE; +static void debug(const char *str); +static int (*iconv_for_check)(int c2,int c1,int 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 */ -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 int cp932_conv(int c2, int 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 int x0212_shift(int c); +static int x0212_unshift(int 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, int score); +static void clr_code_score(struct input_code *ptr, int score); +static void status_disable(struct input_code *ptr); +static void status_push_ch(struct input_code *ptr, int 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, int c); +static void e_status(struct input_code *, int); +static void s_status(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; +static void w_status(struct input_code *, int); +static void w16_status(struct input_code *, int); +static int utf16_mode = UTF16BE_INPUT; #endif struct input_code input_code_list[] = { @@ -521,28 +558,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 */ @@ -560,50 +597,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)(int c2,int c1) = DEFAULT_CONV; -STATIC void (*oconv)PROTO((int c2,int c1)) = no_connection; +static void (*oconv)(int c2,int c1) = no_connection; /* s_iconv or oconv */ -STATIC int (*iconv)PROTO((int c2,int c1,int c0)) = no_connection2; +static int (*iconv)(int c2,int c1,int 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)(int c2,int c1) = no_connection; +static void (*o_fconv)(int c2,int c1) = no_connection; +static void (*o_crconv)(int c2,int c1) = no_connection; +static void (*o_rot_conv)(int c2,int c1) = no_connection; +static void (*o_hira_conv)(int c2,int c1) = no_connection; +static void (*o_base64conv)(int c2,int c1) = no_connection; +static void (*o_iso2022jp_check_conv)(int c2,int c1) = no_connection; -/* STATIC redirections */ +/* static redirections */ -STATIC void (*o_putc)PROTO((int c)) = std_putc; +static void (*o_putc)(int 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 int (*i_getc)(FILE *f) = std_getc; /* general input */ +static int (*i_ungetc)(int 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 int (*i_bgetc)(FILE *) = std_getc; /* input of mgetc */ +static int (*i_bungetc)(int c ,FILE *f) = std_ungetc; -STATIC void (*o_mputc)PROTO((int c)) = std_putc ; /* output of mputc */ +static void (*o_mputc)(int 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 int (*i_mgetc)(FILE *) = std_getc; /* input of mgetc */ +static int (*i_mungetc)(int 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 int (*i_mgetc_buf)(FILE *) = std_getc; /* input of mgetc_buf */ +static int (*i_mungetc_buf)(int 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, @@ -626,7 +663,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, @@ -648,7 +685,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, @@ -671,7 +708,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, @@ -691,14 +728,18 @@ 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) @@ -709,10 +750,7 @@ int std_gc_ndx; #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; @@ -759,7 +797,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 @@ -769,16 +807,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 { @@ -804,9 +842,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); @@ -828,7 +866,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"); @@ -855,7 +893,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 @@ -864,13 +902,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 { @@ -881,9 +919,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; @@ -903,23 +941,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", @@ -932,19 +984,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; @@ -976,9 +1069,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"}, @@ -994,12 +1084,17 @@ struct { #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", ""}, @@ -1022,16 +1117,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; + unsigned char *p; unsigned char *cp_back = NULL; - unsigned char codeset[32]; + char codeset[32]; if (option_mode==1) return; @@ -1069,43 +1162,89 @@ 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 || - strcmp(codeset, "CP51932") == 0){ + strcmp(codeset, "EUC-JP") == 0){ + input_f = JIS_INPUT; + }else if(strcmp(codeset, "CP51932") == 0){ 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 = 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; #endif #ifdef UTF8_OUTPUT_ENABLE - ms_ucs_map_f = TRUE; + 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 || @@ -1113,7 +1252,8 @@ options(cp) strcmp(codeset, "UTF-8-BOM") == 0){ input_f = UTF8_INPUT; #ifdef UNICODE_NORMALIZATION - }else if(strcmp(codeset, "UTF8-MAC") == 0){ + }else if(strcmp(codeset, "UTF8-MAC") == 0 || + strcmp(codeset, "UTF-8-MAC") == 0){ input_f = UTF8_INPUT; nfc_f = TRUE; #endif @@ -1137,42 +1277,112 @@ 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 || - strcmp(codeset, "CP51932") == 0){ + strcmp(codeset, "EUC-JP") == 0){ + output_conv = e_oconv; + }else if(strcmp(codeset, "CP51932") == 0){ 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; +#endif +#ifdef UTF8_OUTPUT_ENABLE + 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){ @@ -1183,12 +1393,11 @@ options(cp) }else if(strcmp(codeset, "UTF-8-BOM") == 0){ output_conv = w_oconv; unicode_bom_f=2; - }else if(strcmp(codeset, "UTF-16") == 0){ - output_conv = w_oconv16; }else if(strcmp(codeset, "UTF-16BE") == 0){ output_conv = w_oconv16; unicode_bom_f=1; - }else if(strcmp(codeset, "UTF-16BE-BOM") == 0){ + }else if(strcmp(codeset, "UTF-16") == 0 || + strcmp(codeset, "UTF-16BE-BOM") == 0){ output_conv = w_oconv16; unicode_bom_f=2; }else if(strcmp(codeset, "UTF-16LE") == 0){ @@ -1205,10 +1414,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){ @@ -1242,7 +1476,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; } @@ -1252,7 +1486,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; } @@ -1281,10 +1515,14 @@ 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, "no-best-fit-chars") == 0){ + no_best_fit_chars_f = TRUE; + continue; + } if (strcmp(long_option[i].name, "fb-skip") == 0){ encode_fallback = NULL; continue; @@ -1338,7 +1576,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 @@ -1366,7 +1604,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': @@ -1560,7 +1812,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 */ @@ -1618,13 +1870,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 { #ifdef INPUT_CODE_FIX if (f || !input_f) @@ -1680,26 +1926,21 @@ const int score_table_F0[] = { 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, int 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, int 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]; #ifdef UTF8_OUTPUT_ENABLE @@ -1722,8 +1963,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; @@ -1731,46 +1971,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, int 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, int 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, int c) { switch(ptr->stat){ case -1: @@ -1829,14 +2060,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, int c) { switch (ptr->stat){ case -1: @@ -1883,9 +2112,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, int c) { switch (ptr->stat){ case -1: @@ -1931,9 +2158,7 @@ void w16_status(ptr, c) } } -void w_status(ptr, c) - struct input_code *ptr; - int c; +void w_status(struct input_code *ptr, int c) { switch (ptr->stat){ case -1: @@ -1978,9 +2203,7 @@ void w_status(ptr, c) } #endif -void -code_status(c) - int c; +void code_status(int c) { int action_flag = 1; struct input_code *result = 0; @@ -2013,9 +2236,7 @@ code_status(c) } #ifndef WIN32DLL -int -std_getc(f) -FILE *f; +int std_getc(FILE *f) { if (std_gc_ndx){ return std_gc_buf[--std_gc_ndx]; @@ -2024,10 +2245,7 @@ FILE *f; } #endif /*WIN32DLL*/ -int -std_ungetc(c,f) -int c; -FILE *f; +int std_ungetc(int c, FILE *f) { if (std_gc_ndx == STD_GC_BUFSIZE){ return EOF; @@ -2037,9 +2255,7 @@ FILE *f; } #ifndef WIN32DLL -void -std_putc(c) -int c; +void std_putc(int c) { if(c!=EOF) putchar(c); @@ -2047,20 +2263,20 @@ int c; #endif /*WIN32DLL*/ #if !defined(PERL_XS) && !defined(WIN32DLL) -int -noconvert(f) - FILE *f; +int noconvert(FILE *f) { int 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; @@ -2163,9 +2379,7 @@ module_connection() Conversion main loop. Code detection only. */ -int -kanji_convert(f) - FILE *f; +int kanji_convert(FILE *f) { int c1, c2, c3; @@ -2174,6 +2388,14 @@ kanji_convert(f) module_connection(); c2 = 0; + if(input_f == SJIS_INPUT +#ifdef UTF8_INPUT_ENABLE + || input_f == UTF8_INPUT || input_f == UTF16BE_INPUT || input_f == UTF16LE_INPUT +#endif + ){ + is_8bit = TRUE; + } + input_mode = ASCII; output_mode = ASCII; @@ -2184,7 +2406,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) { @@ -2294,7 +2519,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; @@ -2368,6 +2594,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); @@ -2463,21 +2697,31 @@ 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 */ + int 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: + (*oconv)((0x8f << 8) | c2, c1); + 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: + (*oconv)((0x8f << 8) | c2, c1); + break; + default: + (*oconv)(input_mode, c1); /* other special case */ + } c2 = 0; continue; @@ -2502,10 +2746,7 @@ kanji_convert(f) } int -h_conv(f, c2, c1) - FILE *f; - int c1, - c2; +h_conv(FILE *f, int c2, int c1) { int wc,c3; @@ -2517,7 +2758,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){ @@ -2593,7 +2833,6 @@ h_conv(f, c2, c1) code_status(c0); } (*iconv)(c2, c1, c0); - c1 = c0; } } return c3; @@ -2602,22 +2841,20 @@ h_conv(f, c2, c1) int -push_hold_buf(c2) - int c2; +push_hold_buf(int 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; +int s2e_conv(int c2, int c1, int *p2, int *p1) { #if defined(SHIFTJIS_CP932) || defined(X0212_ENABLE) int val; #endif + static const int 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){ extern const unsigned short shiftjis_cp932[3][189]; @@ -2629,7 +2866,7 @@ 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){ extern const unsigned short shiftjis_x0212[3][189]; val = shiftjis_x0212[c2 - 0xfa][c1 - 0x40]; if (val){ @@ -2647,29 +2884,33 @@ 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 */ + c2 = 0x8F20 + shift_jisx0213_s1a3_table[c2 - 0xF0][0x9E < c1]; + }else{ /* 78<=k<=94 */ + c2 = 0x8F00 | (c2 * 2 - 0x17B); + if (0x9E < c1) c2++; + } + }else{ + c2 = c2 + c2 - ((c2 <= 0x9F) ? SJ0162 : SJ6394); + if (0x9E < c1) c2++; + } + if (c1 < 0x9F) + c1 = c1 - ((c1 > DEL) ? SPACE : 0x1F); else { - c1 = c1 - 0x7e; - 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; +int s_iconv(int c2, int c1, int c0) { if (c2 == X0201) { c1 &= 0x7f; @@ -2683,10 +2924,7 @@ s_iconv(c2, c1, c0) return 0; } -int -e_iconv(c2, c1, c0) - int c2, - c1, c0; +int e_iconv(int c2, int c1, int c0) { if (c2 == X0201) { c1 &= 0x7f; @@ -2724,54 +2962,44 @@ e_iconv(c2, c1, c0) } #ifdef UTF8_INPUT_ENABLE -int -w2e_conv(c2, c1, c0, p2, p1) - int c2, c1, c0; - int *p2, *p1; +int w2e_conv(int c2, int c1, int c0, int *p2, int *p1) { - extern const unsigned short *const utf8_to_euc_2bytes[]; - extern const unsigned short *const *const utf8_to_euc_3bytes[]; int 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); 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; +int w_iconv(int c2, int c1, int 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 */ + /* throw away ZERO WIDTH NO-BREAK SPACE (U+FEFF) */ + if(ignore_zwnbsp_f){ + ignore_zwnbsp_f = FALSE; + if(c2 == 0xef && c1 == 0xbb && c0 == 0xbf) + return 0; + } + + if (c2 == 0) /* 0x00-0x7f */ + c1 &= 0x7F; /* 1byte */ + else if (c0 == 0){ + if ((c2 & 0xe0) == 0xc0){ /* 0xc0-0xdf */ + /* 2ytes */ + if((c2 & 0xFE) == 0xC0 || c1 < 0x80 || 0xBF < c1) return 0; + }else if ((c2 & 0xf0) == 0xe0) /* 0xe0-0xef */ return -1; /* 3bytes */ #ifdef __COMMENT__ else if (0xf0 <= c2) @@ -2780,21 +3008,20 @@ w_iconv(c2, c1, c0) 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; - } - val = ww16_conv(c2, c1, c0); - c2 = (val >> 8) & 0xff; - c1 = val & 0xff; -#endif + }else{ + /* must be 3bytes */ + if(c2 == 0xE0){ + if(c1 < 0xA0 || 0xBF < c1 || c0 < 0x80 || 0xBF < c0) + return 0; + }else if(c2 == 0xED){ + if(c1 < 0x80 || 0x9F < c1 || c0 < 0x80 || 0xBF < c0) + return 0; + }else if((c2 & 0xf0) == 0xe0){ + if(c1 < 0x80 || 0xBF < c1 || c0 < 0x80 || 0xBF < c0) + return 0; + }else return 0; + } + if (c2 == 0 || c2 == EOF){ } else { ret = w2e_conv(c2, c1, c0, &c2, &c1); } @@ -2803,12 +3030,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(int val, int *p2, int *p1, int *p0) { + val &= 0xFFFFFF; if (val < 0x80){ *p2 = val; *p1 = 0; @@ -2823,13 +3050,15 @@ 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 +int ww16_conv(int c2, int c1, int c0) { - unsigned short val; - if (c2 >= 0xe0){ + int val; + if (c2 >= 0xf0){ + val = -1; + }else if (c2 >= 0xe0){ val = (c2 & 0x0f) << 12; val |= (c1 & 0x3f) << 6; val |= (c0 & 0x3f); @@ -2842,55 +3071,44 @@ ww16_conv(c2, c1, c0) return val; } -int -w16e_conv(val, p2, p1) - unsigned short val; - int *p2, *p1; +int w16e_conv(int val, int *p2, int *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); - } + val &= 0xFFFFFF; + 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_UTF16 | 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 +int w_iconv16(int c2, int c1, int c0) { - int ret = 0; + int ret; - if (c2==0376 && c1==0377){ - utf16_mode = UTF16BE_INPUT; - return 0; - } else if (c2==0377 && c1==0376){ - utf16_mode = UTF16LE_INPUT; - return 0; + /* throw away ZERO WIDTH NO-BREAK SPACE (U+FEFF) */ + if(ignore_zwnbsp_f){ + ignore_zwnbsp_f = FALSE; + 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; @@ -2899,34 +3117,151 @@ w_iconv16(c2, c1, c0) if ((c2==0 && c1 < 0x80) || c2==EOF) { (*oconv)(c2, c1); return 0; - } -#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); + }else if((c2>>3)==27){ /* surrogate pair */ + return 1; + }else ret = w16e_conv(((c2<<8)&0xff00) + c1, &c2, &c1); if (ret) return ret; (*oconv)(c2, c1); return 0; } -int -w_iconv_common(c1, c0, pp, psize, p2, p1) - int c1,c0; +int unicode_to_jis_common(int c2, int c1, int c0, int *p2, int *p1) +{ + 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[]; + extern const unsigned short *const *const utf8_to_euc_3bytes_ms[]; + extern const unsigned short *const *const utf8_to_euc_3bytes_932[]; const unsigned short *const *pp; - int psize; - int *p2, *p1; + 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}; + int 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(cp51932_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; + } + } + 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 0xE3: + if(c1 == 0x80 || c0 == 0x9C) return 1; + 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 && cp51932_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 : + 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 && cp51932_f && (*p2 & 0xff00) >> 8 == 0x8f) { + int 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(int c1, int c0, const unsigned short *const *pp, int psize, int *p2, int *p1) { int c2; const unsigned short *p; unsigned short val; - /* CP932/CP51932: U+00A6 (BROKEN BAR) -> not 0x8fa2c3, but 0x7c */ - if (cp51932_f && c1 == 0xC2 && c0 == 0xA6){ - if (p2) *p2 = 0; - if (p1) *p1 = 0x7C; - return 0; - } - if (pp == 0) return 1; c1 -= 0x80; @@ -2935,9 +3270,13 @@ 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 > 0xF300 /* NEC special characters */ + )) return 1; c2 = val >> 8; if (val & 0x8000){ @@ -2951,17 +3290,11 @@ 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)(int c2,int c1), int c) { const char *hex = "0123456789ABCDEF"; - c &= 0x00FFFFFF; int shift = 20; + c &= 0x00FFFFFF; while(shift >= 0){ if(c >= 1<= 0){ @@ -2975,9 +3308,7 @@ nkf_each_char_to_hex(f, c) return; } -void -encode_fallback_html(c) - int c; +void encode_fallback_html(int c) { (*oconv)(0, '&'); (*oconv)(0, '#'); @@ -3000,9 +3331,7 @@ encode_fallback_html(c) return; } -void -encode_fallback_xml(c) - int c; +void encode_fallback_xml(int c) { (*oconv)(0, '&'); (*oconv)(0, '#'); @@ -3012,9 +3341,7 @@ encode_fallback_xml(c) return; } -void -encode_fallback_java(c) - int c; +void encode_fallback_java(int c) { const char *hex = "0123456789ABCDEF"; (*oconv)(0, '\\'); @@ -3034,9 +3361,7 @@ encode_fallback_java(c) return; } -void -encode_fallback_perl(c) - int c; +void encode_fallback_perl(int c) { (*oconv)(0, '\\'); (*oconv)(0, 'x'); @@ -3046,41 +3371,30 @@ encode_fallback_perl(c) return; } -void -encode_fallback_subchar(c) - int c; +void encode_fallback_subchar(int 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 +int e2w_conv(int c2, int 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[]; + extern const unsigned short *const x0212_to_utf8_2bytes[]; const unsigned short *p; if (c2 == X0201) { p = euc_to_utf8_1byte; #ifdef X0212_ENABLE } else if (c2 >> 8 == 0x8f){ - extern const unsigned short *const x0212_to_utf8_2bytes[]; + if(ms_ucs_map_f == UCS_MAP_ASCII&& c2 == 0x8F22 && c1 == 0x43){ + return 0xA6; + } c2 = (c2&0x7f) - 0x21; if (0<=c2 && c2> 8) & 0xff; c1 = val & 0xff; } @@ -3201,10 +3506,7 @@ w_oconv16(c2, c1) #endif -void -e_oconv(c2, c1) - int c2, - c1; +void e_oconv(int c2, int c1) { #ifdef NUMCHAR_OPTION if (c2 == 0 && (c1 & CLASS_MASK) == CLASS_UTF16){ @@ -3265,8 +3567,7 @@ e_oconv(c2, c1) } #ifdef X0212_ENABLE -int x0212_shift(c) - int c; +int x0212_shift(int c) { int ret = c; c &= 0x7f; @@ -3283,8 +3584,7 @@ int x0212_shift(c) } -int x0212_unshift(c) - int c; +int x0212_unshift(int c) { int ret = c; if (0x7f <= c && c <= 0x88){ @@ -3296,45 +3596,50 @@ int x0212_unshift(c) } #endif /* X0212_ENABLE */ -int -e2s_conv(c2, c1, p2, p1) - int c2, c1, *p2, *p1; +int e2s_conv(int c2, int c1, int *p2, int *p1) { -#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); - } + 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){ + int val = 0; + const unsigned short *ptr; + extern const unsigned short *const x0212_shiftjis[]; + 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(int c2, int c1) { #ifdef NUMCHAR_OPTION if (c2 == 0 && (c1 & CLASS_MASK) == CLASS_UTF16){ @@ -3394,10 +3699,7 @@ s_oconv(c2, c1) } } -void -j_oconv(c2, c1) - int c2, - c1; +void j_oconv(int c2, int c1) { #ifdef NUMCHAR_OPTION if (c2 == 0 && (c1 & CLASS_MASK) == CLASS_UTF16){ @@ -3418,12 +3720,22 @@ 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'); + 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); @@ -3451,37 +3763,37 @@ j_oconv(c2, c1) } (*o_putc)(c1); } else { - if (output_mode != X0208) { + if(c2<0x20 || 0x7e 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); @@ -4045,9 +4338,7 @@ FILE *f; return c1; } -int -mime_getc_buf(f) -FILE *f; +int mime_getc_buf(FILE *f) { /* we don't keep eof of Fifo, becase it contains ?= as a terminator. It was checked in mime_integrity. */ @@ -4055,21 +4346,16 @@ FILE *f; (*i_mgetc_buf)(f):Fifo(mime_input++)); } -int -mime_ungetc_buf(c,f) -FILE *f; -int c; +int mime_ungetc_buf(int 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; +int mime_begin(FILE *f) { int c1; int i,k; @@ -4082,7 +4368,7 @@ FILE *f; Fifo(mime_last++)='='; Fifo(mime_last++)='?'; for(i=2;ilwsp_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; } @@ -4447,18 +4695,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 */ @@ -4550,13 +4793,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; } @@ -4566,18 +4808,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: @@ -4607,13 +4844,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; @@ -4621,19 +4858,13 @@ mime_c4_retry: return Fifo(mime_top++); } -int -mime_ungetc(c,f) -int c; -FILE *f; +int mime_ungetc(int 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; +int mime_integrity(FILE *f, const unsigned char *p) { int c,d; unsigned int q; @@ -4651,7 +4882,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(); @@ -4660,20 +4891,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; +int base64decode(int c) { int i; if (c > '@') { @@ -4692,19 +4921,17 @@ base64decode(c) return (i); } -STATIC const char basis_64[] = +static const char basis_64[] = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/"; -STATIC int b64c; +static int 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(int mode) { const unsigned char *p; int i; @@ -4757,8 +4984,7 @@ int mode; } } -void -close_mime() +void close_mime(void) { (*o_mputc)('?'); (*o_mputc)('='); @@ -4766,8 +4992,7 @@ close_mime() mimeout_mode = 0; } -void -eof_mime() +void eof_mime(void) { switch(mimeout_mode) { case 'Q': @@ -4793,19 +5018,14 @@ eof_mime() } } -void -mimeout_addchar(c) - int c; +void mimeout_addchar(int 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(cMIMEOUT_BUF_LENGTH) { j = mimeout_buf_count; mimeout_buf_count = 0; @@ -5064,8 +5285,7 @@ mime_putc(c) #if defined(PERL_XS) || defined(WIN32DLL) -void -reinit() +void reinit(void) { { struct input_code *p = input_code_list; @@ -5093,15 +5313,19 @@ 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_INPUT_ENABLE + no_cp932ext_f = FALSE; + ignore_zwnbsp_f = TRUE; + no_best_fit_chars_f = FALSE; + encode_fallback = NULL; + unicode_subchar = '?'; #endif #ifdef UTF8_OUTPUT_ENABLE unicode_bom_f = 0; w_oconv16_LE = 0; - ms_ucs_map_f = FALSE; - encode_fallback = NULL; - unicode_subchar = '?'; #endif #ifdef UNICODE_NORMALIZATION nfc_f = FALSE; @@ -5127,6 +5351,7 @@ reinit() #endif #ifdef X0212_ENABLE x0212_f = FALSE; + x0213_f = FALSE; #endif { int i; @@ -5171,7 +5396,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; @@ -5187,16 +5412,12 @@ reinit() } #endif -void -no_connection(c2,c1) -int c2,c1; +void no_connection(int c2, int c1) { no_connection2(c2,c1,0); } -int -no_connection2(c2,c1,c0) -int c2,c1,c0; +int no_connection2(int c2, int c1, int c0) { fprintf(stderr,"nkf internal module connection failure.\n"); exit(1); @@ -5207,33 +5428,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"); @@ -5241,53 +5462,53 @@ 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," --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_INPUT_ENABLE fprintf(stderr," --fb-{skip, html, xml, perl, java, subchar}\n"); - fprintf(stderr," set the way nkf handles unassigned characters\n"); -#endif -#ifdef UTF8_OUTPUT_ENABLE - fprintf(stderr," --ms-ucs-map Microsoft UCS Mapping Compatible\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__)