ruby-changes:6094
From: shyouhei <ko1@a...>
Date: Fri, 27 Jun 2008 17:33:00 +0900 (JST)
Subject: [ruby-changes:6094] Ruby:r17606 (ruby_1_8_6): merge revision(s) 16870:
shyouhei 2008-06-27 17:32:44 +0900 (Fri, 27 Jun 2008) New Revision: 17606 Modified files: branches/ruby_1_8_6/ChangeLog branches/ruby_1_8_6/io.c branches/ruby_1_8_6/version.h Log: merge revision(s) 16870: * io.c (rb_open_file, rb_io_s_sysopen): fmode should be unsigned int. fixed [ruby-dev:34979] http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/branches/ruby_1_8_6/ChangeLog?r1=17606&r2=17605&diff_format=u http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/branches/ruby_1_8_6/version.h?r1=17606&r2=17605&diff_format=u http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/branches/ruby_1_8_6/io.c?r1=17606&r2=17605&diff_format=u Index: ruby_1_8_6/ChangeLog =================================================================== --- ruby_1_8_6/ChangeLog (revision 17605) +++ ruby_1_8_6/ChangeLog (revision 17606) @@ -1,3 +1,8 @@ +Fri Jun 27 17:28:39 2008 NAKAMURA Usaku <usa@r...> + + * io.c (rb_open_file, rb_io_s_sysopen): fmode should be unsigned int. + fixed [ruby-dev:34979] + Fri Jun 27 17:20:40 2008 NAKAMURA Usaku <usa@r...> * win32/win32.h: include ws2tcpip.h. fixed [ruby-Bugs-20528] Index: ruby_1_8_6/version.h =================================================================== --- ruby_1_8_6/version.h (revision 17605) +++ ruby_1_8_6/version.h (revision 17606) @@ -2,7 +2,7 @@ #define RUBY_RELEASE_DATE "2008-06-27" #define RUBY_VERSION_CODE 186 #define RUBY_RELEASE_CODE 20080627 -#define RUBY_PATCHLEVEL 234 +#define RUBY_PATCHLEVEL 235 #define RUBY_VERSION_MAJOR 1 #define RUBY_VERSION_MINOR 8 Index: ruby_1_8_6/io.c =================================================================== --- ruby_1_8_6/io.c (revision 17605) +++ ruby_1_8_6/io.c (revision 17606) @@ -3285,7 +3285,8 @@ { VALUE fname, vmode, perm; char *path, *mode; - int flags, fmode; + int flags; + unsigned int fmode; rb_scan_args(argc, argv, "12", &fname, &vmode, &perm); SafeStringValue(fname); @@ -3299,7 +3300,7 @@ SafeStringValue(vmode); flags = rb_io_mode_modenum(RSTRING(vmode)->ptr); } - fmode = NIL_P(perm) ? 0666 : NUM2INT(perm); + fmode = NIL_P(perm) ? 0666 : NUM2UINT(perm); rb_file_sysopen_internal(io, path, flags, fmode); } @@ -3355,7 +3356,8 @@ VALUE *argv; { VALUE fname, vmode, perm; - int flags, fmode, fd; + int flags, fd; + unsigned int fmode; char *path; rb_scan_args(argc, argv, "12", &fname, &vmode, &perm); @@ -3368,7 +3370,7 @@ flags = rb_io_mode_modenum(RSTRING(vmode)->ptr); } if (NIL_P(perm)) fmode = 0666; - else fmode = NUM2INT(perm); + else fmode = NUM2UINT(perm); path = ALLOCA_N(char, strlen(RSTRING(fname)->ptr)+1); strcpy(path, RSTRING(fname)->ptr); -- ML: ruby-changes@q... Info: http://www.atdot.net/~ko1/quickml/