diff options
author | matz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 1999-03-24 08:52:35 +0000 |
---|---|---|
committer | matz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 1999-03-24 08:52:35 +0000 |
commit | 35247a52ef719584a59ae9c518523f0ee825c8e3 (patch) | |
tree | e14e2a884d3c40a86f93b8dcb4ec144f510fe35a /ext/nkf | |
parent | 1727010a3abf84fd06f0e44d44b1b8ef6cde588e (diff) |
990324
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_3@409 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'ext/nkf')
-rw-r--r-- | ext/nkf/MANIFEST | 2 | ||||
-rw-r--r-- | ext/nkf/nkf.c | 9 |
2 files changed, 6 insertions, 5 deletions
diff --git a/ext/nkf/MANIFEST b/ext/nkf/MANIFEST index 7e3345a6b7..5e01e6e237 100644 --- a/ext/nkf/MANIFEST +++ b/ext/nkf/MANIFEST @@ -3,5 +3,5 @@ depend extconf.rb lib/kconv.rb nkf.c -orig/nkf.c +1.7/nkf.c test.rb diff --git a/ext/nkf/nkf.c b/ext/nkf/nkf.c index 6b5db0fe70..2442973f2f 100644 --- a/ext/nkf/nkf.c +++ b/ext/nkf/nkf.c @@ -43,7 +43,7 @@ printf("[[%c][%c][%d]]\n", c, output[output_ctr - 1], output_ctr); } #define PERL_XS 1 -#include "orig/nkf.c" +#include "1.7/nkf.c" static VALUE rb_nkf_kconv(obj, opt, src) @@ -61,12 +61,12 @@ rb_nkf_kconv(obj, opt, src) } arguments(opt_ptr); } - dst = rb_str_new(0, RSTRING(src)->len*3 + 10); /* large enough? */ incsize = INCSIZE; input_ctr = 0; input = str2cstr(src, &i_len); + dst = rb_str_new(0, i_len*3 + 10); /* large enough? */ output_ctr = 0; output = RSTRING(dst)->ptr; @@ -106,12 +106,13 @@ rb_nkf_guess(obj, src) { unsigned char *p; unsigned char *pend; + int plen; int sequence_counter = 0; Check_Type(src, T_STRING); - p = RSTRING(src)->ptr; - pend = p + RSTRING(src)->len; + p = str2cstr(src, &plen); + pend = p + plen; #define INCR do {\ p++;\ |