kotovalexarian-likes-github/ruby--ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00
Code Releases Activity

* io.c (rb_io_check_readable, rb_io_check_writable): ensure not

Browse source 
closed at first.

* io.c (rb_io_getline): check readable always.  (ruby-bugs:PR#1069)

* io.c (rb_io_each_byte): ditto.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@4262 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nobu 2003-08-01 07:23:00 +00:00
parent 7162db6632
commit e36f44caa8
2 changed files with 14 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
ChangeLog
View file

@ -1,3 +1,12 @@
Fri Aug 1 16:22:57 2003 Nobuyoshi Nakada <nobu@ruby-lang.org>
* io.c (rb_io_check_readable, rb_io_check_writable): ensure not
closed at first.
* io.c (rb_io_getline): check readable always. (ruby-bugs:PR#1069)
* io.c (rb_io_each_byte): ditto.
Fri Aug 1 16:02:46 2003 Nobuyoshi Nakada <nobu@ruby-lang.org> Fri Aug 1 16:02:46 2003 Nobuyoshi Nakada <nobu@ruby-lang.org>
* io.c (READ_DATA_PENDING_PTR): cast to get rid of warnings. * io.c (READ_DATA_PENDING_PTR): cast to get rid of warnings.

11
io.c
View file

@ -219,6 +219,7 @@ void
rb_io_check_readable(fptr) rb_io_check_readable(fptr)
OpenFile *fptr; OpenFile *fptr;
{ {
rb_io_check_closed(fptr);
if (!(fptr->mode & FMODE_READABLE)) { if (!(fptr->mode & FMODE_READABLE)) {
rb_raise(rb_eIOError, "not opened for reading"); rb_raise(rb_eIOError, "not opened for reading");
} }
@ -236,6 +237,7 @@ void
rb_io_check_writable(fptr) rb_io_check_writable(fptr)
OpenFile *fptr; OpenFile *fptr;
{ {
rb_io_check_closed(fptr);
if (!(fptr->mode & FMODE_WRITABLE)) { if (!(fptr->mode & FMODE_WRITABLE)) {
rb_raise(rb_eIOError, "not opened for writing"); rb_raise(rb_eIOError, "not opened for writing");
} }
@ -1007,6 +1009,7 @@ rb_io_getline(rs, fptr)
{ {
VALUE str = Qnil; VALUE str = Qnil;
rb_io_check_readable(fptr);
if (NIL_P(rs)) { if (NIL_P(rs)) {
str = read_all(fptr, 0, Qnil); str = read_all(fptr, 0, Qnil);
} }
@ -1082,7 +1085,6 @@ rb_io_gets_m(argc, argv, io)
rb_scan_args(argc, argv, "1", &rs); rb_scan_args(argc, argv, "1", &rs);
} }
GetOpenFile(io, fptr); GetOpenFile(io, fptr);
rb_io_check_readable(fptr);
str = rb_io_getline(rs, fptr); str = rb_io_getline(rs, fptr);
if (!NIL_P(str)) { if (!NIL_P(str)) {
@ -1170,7 +1172,6 @@ rb_io_readlines(argc, argv, io)
rb_scan_args(argc, argv, "1", &rs); rb_scan_args(argc, argv, "1", &rs);
} }
GetOpenFile(io, fptr); GetOpenFile(io, fptr);
rb_io_check_readable(fptr);
ary = rb_ary_new(); ary = rb_ary_new();
while (!NIL_P(line = rb_io_getline(rs, fptr))) { while (!NIL_P(line = rb_io_getline(rs, fptr))) {
rb_ary_push(ary, line); rb_ary_push(ary, line);
@ -1195,7 +1196,6 @@ rb_io_each_line(argc, argv, io)
rb_scan_args(argc, argv, "1", &rs); rb_scan_args(argc, argv, "1", &rs);
} }
GetOpenFile(io, fptr); GetOpenFile(io, fptr);
rb_io_check_readable(fptr);
while (!NIL_P(str = rb_io_getline(rs, fptr))) { while (!NIL_P(str = rb_io_getline(rs, fptr))) {
rb_yield(str); rb_yield(str);
} }
@ -1211,10 +1211,10 @@ rb_io_each_byte(io)
int c; int c;
GetOpenFile(io, fptr); GetOpenFile(io, fptr);
rb_io_check_readable(fptr);
f = fptr->f;
for (;;) { for (;;) {
rb_io_check_readable(fptr);
f = fptr->f;
READ_CHECK(f); READ_CHECK(f);
TRAP_BEG; TRAP_BEG;
c = getc(f); c = getc(f);
@ -3092,7 +3092,6 @@ argf_getline(argc, argv)
rb_scan_args(argc, argv, "1", &rs); rb_scan_args(argc, argv, "1", &rs);
} }
GetOpenFile(current_file, fptr); GetOpenFile(current_file, fptr);
rb_io_check_readable(fptr);
line = rb_io_getline(rs, fptr); line = rb_io_getline(rs, fptr);
} }
if (NIL_P(line) && next_p != -1) { if (NIL_P(line) && next_p != -1) {