archive/ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2025-09-15 16:44:01 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

merges r21709, r21710 from trunk into ruby_1_9_1.

Browse source 
* include/ruby/io.h (FMODE_EOF): EOF flag on TTY.
* io.c (io_set_eof): sets EOF flag for TTY.
* io.c (io_seek): clears EOF flag.
* io.c (io_fillbuf): returns EOF if already met EOF.  [ruby-dev:37798]
* io.c (io_fillbuf, io_fread, io_getpartial): sets EOF.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_1@21816 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
yugui 2009-01-28 09:20:37 +00:00
parent 884264dc4d
commit 62b07ab133
3 changed files with 28 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

12
ChangeLog
View file

@ -1,3 +1,15 @@
Wed Jan 21 13:58:17 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
* include/ruby/io.h (FMODE_EOF): EOF flag on TTY.
* io.c (io_set_eof): sets EOF flag for TTY.
* io.c (io_seek): clears EOF flag.
* io.c (io_fillbuf): returns EOF if already met EOF. [ruby-dev:37798]
* io.c (io_fillbuf, io_fread, io_getpartial): sets EOF.
Wed Jan 21 14:41:48 2009 NAKAMURA Usaku <usa@ruby-lang.org> Wed Jan 21 14:41:48 2009 NAKAMURA Usaku <usa@ruby-lang.org>
* array.c (take_items): to_ary() raises ArgumentError if cannot to * array.c (take_items): to_ary() raises ArgumentError if cannot to

1
include/ruby/io.h
View file

@ -92,6 +92,7 @@ typedef struct rb_io_t {
#define FMODE_WSPLIT_INITIALIZED 0x00000400 #define FMODE_WSPLIT_INITIALIZED 0x00000400
#define FMODE_TRUNC 0x00000800 #define FMODE_TRUNC 0x00000800
#define FMODE_TEXTMODE 0x00001000 #define FMODE_TEXTMODE 0x00001000
#define FMODE_EOF 0x00002000
/* #define FMODE_PREP 0x00010000 */ /* #define FMODE_PREP 0x00010000 */
#define GetOpenFile(obj,fp) rb_io_check_closed((fp) = RFILE(rb_io_taint_check(obj))->fptr) #define GetOpenFile(obj,fp) rb_io_check_closed((fp) = RFILE(rb_io_taint_check(obj))->fptr)

18
io.c
View file

@ -353,7 +353,8 @@ flush_before_seek(rb_io_t *fptr)
return fptr; return fptr;
} }
#define io_seek(fptr, ofs, whence) lseek(flush_before_seek(fptr)->fd, ofs, whence) #define io_set_eof(fptr) (void)(((fptr)->mode & FMODE_TTY) && ((fptr)->mode |= FMODE_EOF))
#define io_seek(fptr, ofs, whence) (fptr->mode &= ~FMODE_EOF, lseek(flush_before_seek(fptr)->fd, ofs, whence))
#define io_tell(fptr) lseek(flush_before_seek(fptr)->fd, 0, SEEK_CUR) #define io_tell(fptr) lseek(flush_before_seek(fptr)->fd, 0, SEEK_CUR)
#ifndef SEEK_CUR #ifndef SEEK_CUR
@ -1147,6 +1148,9 @@ io_fillbuf(rb_io_t *fptr)
{ {
int r; int r;
if (fptr->mode & FMODE_EOF) {
return -1;
}
if (fptr->rbuf == NULL) { if (fptr->rbuf == NULL) {
fptr->rbuf_off = 0; fptr->rbuf_off = 0;
fptr->rbuf_len = 0; fptr->rbuf_len = 0;
@ -1165,9 +1169,11 @@ io_fillbuf(rb_io_t *fptr)
} }
fptr->rbuf_off = 0; fptr->rbuf_off = 0;
fptr->rbuf_len = r; fptr->rbuf_len = r;
if (r == 0) if (r == 0) {
io_set_eof(fptr);
return -1; /* EOF */ return -1; /* EOF */
} }
}
return 0; return 0;
} }
@ -1422,7 +1428,10 @@ io_fread(VALUE str, long offset, rb_io_t *fptr)
if (READ_DATA_PENDING(fptr) == 0) { if (READ_DATA_PENDING(fptr) == 0) {
while (n > 0) { while (n > 0) {
c = rb_read_internal(fptr->fd, RSTRING_PTR(str)+offset, n); c = rb_read_internal(fptr->fd, RSTRING_PTR(str)+offset, n);
if (c == 0) break; if (c == 0) {
io_set_eof(fptr);
break;
}
if (c < 0) { if (c < 0) {
rb_sys_fail_path(fptr->pathv); rb_sys_fail_path(fptr->pathv);
} }
@ -1729,6 +1738,9 @@ io_getpartial(int argc, VALUE *argv, VALUE io, int nonblock)
goto again; goto again;
rb_sys_fail_path(fptr->pathv); rb_sys_fail_path(fptr->pathv);
} }
else if (n == 0) {
io_set_eof(fptr);
}
} }
rb_str_resize(str, n); rb_str_resize(str, n);