diff options
| author | matz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 1999-10-04 04:51:08 +0000 |
|---|---|---|
| committer | matz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 1999-10-04 04:51:08 +0000 |
| commit | 52d12453a9941ff91fbcaf1b02914efcb5a7621b (patch) | |
| tree | a6ad21b14e176e9c3a39a775781b978950315543 /ext/nkf | |
| parent | 960c03333927ea7bc50a29b263e33331edff5460 (diff) | |
| download | ruby-52d12453a9941ff91fbcaf1b02914efcb5a7621b.tar.gz ruby-52d12453a9941ff91fbcaf1b02914efcb5a7621b.tar.xz ruby-52d12453a9941ff91fbcaf1b02914efcb5a7621b.zip | |
19991004
git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@536 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'ext/nkf')
| -rw-r--r-- | ext/nkf/nkf.c | 2 | ||||
| -rw-r--r-- | ext/nkf/nkf1.7/nkf.c | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/ext/nkf/nkf.c b/ext/nkf/nkf.c index 35d9295a7..80d0d2e4b 100644 --- a/ext/nkf/nkf.c +++ b/ext/nkf/nkf.c @@ -10,7 +10,7 @@ #undef getc #undef ungetc -#define getc(f) (input_ctr>i_len?-1:input[input_ctr++]) +#define getc(f) (input_ctr<i_len?input[input_ctr++]:-1) #define ungetc(c,f) input_ctr-- #undef putchar diff --git a/ext/nkf/nkf1.7/nkf.c b/ext/nkf/nkf1.7/nkf.c index 26ef65702..09419f40a 100644 --- a/ext/nkf/nkf1.7/nkf.c +++ b/ext/nkf/nkf1.7/nkf.c @@ -871,7 +871,7 @@ kanji_convert(f) } else if(c1 == SO) { shift_mode = TRUE; NEXT; - } else if(c1 == ESC ) { + } else if(c1 == ESC) { if((c1 = GETC(f)) == EOF) { (*oconv)(0, ESC); LAST; @@ -1826,6 +1826,7 @@ reinit() file_out = FALSE; add_cr = FALSE; del_cr = FALSE; + line = 0; } #ifndef PERL_XS |