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

* io.c (rb_io_gets_m): set lastline ($_) even when read line is

nil.  [ruby-dev:23663]


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@6427 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
matz 2004-06-04 09:56:25 +00:00
parent 14fa51aa0b
commit 4f127ee34b
5 changed files with 10 additions and 6 deletions

View file

@ -1,3 +1,8 @@
Wed Jun 2 12:41:53 2004 Yukihiro Matsumoto <matz@ruby-lang.org>
* io.c (rb_io_gets_m): set lastline ($_) even when read line is
nil. [ruby-dev:23663]
Fri May 28 11:20:31 2004 Nobuyoshi Nakada <nobu@ruby-lang.org> Fri May 28 11:20:31 2004 Nobuyoshi Nakada <nobu@ruby-lang.org>
* eval.c (rb_eval): bad influence on frame node. * eval.c (rb_eval): bad influence on frame node.

View file

@ -982,10 +982,11 @@ rb_big_eq(x, y)
break; break;
case T_FLOAT: case T_FLOAT:
{ {
double a, b; volatile double a, b;
a = RFLOAT(y)->value; a = RFLOAT(y)->value;
b = rb_big2dbl(x); b = rb_big2dbl(x);
if (isnan(a) || isnan(b)) return Qfalse;
return (a == b)?Qtrue:Qfalse; return (a == b)?Qtrue:Qfalse;
} }
default: default:

2
file.c
View file

@ -3970,7 +3970,7 @@ path_check_1(path)
#ifdef S_ISVTX #ifdef S_ISVTX
&& !(st.st_mode & S_ISVTX) && !(st.st_mode & S_ISVTX)
#endif #endif
) { && !access(p0, W_OK)) {
rb_warn("Insecure world writable dir %s, mode 0%o", p0, st.st_mode); rb_warn("Insecure world writable dir %s, mode 0%o", p0, st.st_mode);
if (p) *p = '/'; if (p) *p = '/';
return 0; return 0;

4
io.c
View file

@ -1367,10 +1367,8 @@ rb_io_gets_m(argc, argv, io)
} }
GetOpenFile(io, fptr); GetOpenFile(io, fptr);
str = rb_io_getline(rs, fptr); str = rb_io_getline(rs, fptr);
rb_lastline_set(str);
if (!NIL_P(str)) {
rb_lastline_set(str);
}
return str; return str;
} }

View file

@ -818,7 +818,7 @@ static VALUE
flo_eq(x, y) flo_eq(x, y)
VALUE x, y; VALUE x, y;
{ {
double a, b; volatile double a, b;
switch (TYPE(y)) { switch (TYPE(y)) {
case T_FIXNUM: case T_FIXNUM: