diff options
| author | yugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2009-01-20 09:53:38 +0000 |
|---|---|---|
| committer | yugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2009-01-20 09:53:38 +0000 |
| commit | b1d012a3bd9221ee83f0387d596765a910811254 (patch) | |
| tree | ce66e42ad12611aadd43f1743e47da94e6a28f89 | |
| parent | d564ee3e7a0f9750f109d2614393358ff066b2cb (diff) | |
merges r21679 from trunk into ruby_1_9_1.
* ext/nkf/nkf-utf8/nkf.c (nkf_buf_push): maybe a bug.
* ext/nkf/nkf-utf8/nkf.c (options): no need to support help option.
git-svn-id: http://svn.ruby-lang.org/repos/ruby/branches/ruby_1_9_1@21694 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | ext/nkf/nkf-utf8/nkf.c | 4 |
2 files changed, 9 insertions, 1 deletions
@@ -1,3 +1,9 @@ +Tue Jan 20 09:26:05 2009 NAKAMURA Usaku <usa@ruby-lang.org> + + * ext/nkf/nkf-utf8/nkf.c (nkf_buf_push): maybe a bug. + + * ext/nkf/nkf-utf8/nkf.c (options): no need to support help option. + Tue Jan 20 06:48:56 2009 Nobuyoshi Nakada <nobu@ruby-lang.org> * array.c (take_items), enum.c (enum_zip): tries to convert to diff --git a/ext/nkf/nkf-utf8/nkf.c b/ext/nkf/nkf-utf8/nkf.c index d1d23ebcf..c96392a18 100644 --- a/ext/nkf/nkf-utf8/nkf.c +++ b/ext/nkf/nkf-utf8/nkf.c @@ -841,7 +841,7 @@ nkf_buf_clear(nkf_buf_t *buf) } static void -nkf_buf_push(nkf_buf_t *buf, unsigned char c) +nkf_buf_push(nkf_buf_t *buf, nkf_char c) { if (buf->capa <= buf->len) { exit(EXIT_FAILURE); @@ -5842,10 +5842,12 @@ options(unsigned char *cp) cp_back = cp; cp = (unsigned char *)long_option[i].alias; }else{ +#ifndef PERL_XS if (strcmp(long_option[i].name, "help") == 0){ usage(); exit(EXIT_SUCCESS); } +#endif if (strcmp(long_option[i].name, "ic=") == 0){ enc = nkf_enc_find((char *)p); if (!enc) continue; |