diff options
author | akr <akr@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-01-03 15:40:45 +0000 |
---|---|---|
committer | akr <akr@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-01-03 15:40:45 +0000 |
commit | 1aaf8b171373f6862fa8c523923b98ef6feb1c65 (patch) | |
tree | 80cb96397af780182e3b341c92e1b42741ab8f69 | |
parent | f905704727b20865f71a10fbc34ed032346a7f93 (diff) | |
download | ruby-1aaf8b171373f6862fa8c523923b98ef6feb1c65.tar.gz |
* io.c (io_ungetc): move data in buffer if it is required to store the
argument.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@14873 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r-- | ChangeLog | 5 | ||||
-rw-r--r-- | io.c | 8 |
2 files changed, 12 insertions, 1 deletions
@@ -1,3 +1,8 @@ +Fri Jan 4 00:20:47 2008 Tanaka Akira <akr@fsij.org> + + * io.c (io_ungetc): move data in buffer if it is required to store the + argument. + Thu Jan 3 21:56:07 2008 Tanaka Akira <akr@fsij.org> * include/ruby/ruby.h (st_strcasecmp): declared for STRCASECMP. @@ -320,9 +320,15 @@ io_ungetc(VALUE str, rb_io_t *fptr) fptr->rbuf_capa = 8192; fptr->rbuf = ALLOC_N(char, fptr->rbuf_capa); } - if (fptr->rbuf_off < len) { + if (fptr->rbuf_capa < len + fptr->rbuf_len) { rb_raise(rb_eIOError, "ungetc failed"); } + if (fptr->rbuf_off < len) { + MEMMOVE(fptr->rbuf+fptr->rbuf_capa-fptr->rbuf_len, + fptr->rbuf+fptr->rbuf_off, + char, fptr->rbuf_len); + fptr->rbuf_off = fptr->rbuf_capa-fptr->rbuf_len; + } fptr->rbuf_off-=len; fptr->rbuf_len+=len; MEMMOVE(fptr->rbuf+fptr->rbuf_off, RSTRING_PTR(str), char, len); |