ruby-changes:9222
From: akr <ko1@a...>
Date: Mon, 15 Dec 2008 21:25:21 +0900 (JST)
Subject: [ruby-changes:9222] Ruby:r20759 (trunk): * ext/pty/pty.c (get_device_once): use DEVICELEN instead of
akr 2008-12-15 21:25:03 +0900 (Mon, 15 Dec 2008) New Revision: 20759 http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=20759 Log: * ext/pty/pty.c (get_device_once): use DEVICELEN instead of sizeof SlaveName. Modified files: trunk/ChangeLog trunk/ext/pty/pty.c trunk/test/test_pty.rb Index: ChangeLog =================================================================== --- ChangeLog (revision 20758) +++ ChangeLog (revision 20759) @@ -1,3 +1,8 @@ +Mon Dec 15 21:24:01 2008 Tanaka Akira <akr@f...> + + * ext/pty/pty.c (get_device_once): use DEVICELEN instead of + sizeof SlaveName. + Mon Dec 15 21:01:46 2008 Tanaka Akira <akr@f...> * ext/pty/pty.c (chfunc): make it static. Index: ext/pty/pty.c =================================================================== --- ext/pty/pty.c (revision 20758) +++ ext/pty/pty.c (revision 20759) @@ -293,7 +293,7 @@ } *slave = open(name, O_RDWR); - strlcpy(SlaveName, name, sizeof SlaveName); + strlcpy(SlaveName, name, DEVICELEN); return 0; #else /* HAVE__GETPTY */ @@ -321,7 +321,7 @@ #endif *master = i; *slave = j; - strlcpy(SlaveName, pn, sizeof SlaveName); + strlcpy(SlaveName, pn, DEVICELEN); return 0; #if defined I_PUSH && !defined linux } @@ -343,7 +343,7 @@ snprintf(MasterName, sizeof MasterName, MasterDevice, *p); if ((i = open(MasterName,O_RDWR,0)) >= 0) { *master = i; - snprintf(SlaveName, sizeof SlaveName, SlaveDevice, *p); + snprintf(SlaveName, DEVICELEN, SlaveDevice, *p); if ((j = open(SlaveName,O_RDWR,0)) >= 0) { *slave = j; chown(SlaveName, getuid(), getgid()); Index: test/test_pty.rb =================================================================== --- test/test_pty.rb (revision 20758) +++ test/test_pty.rb (revision 20759) @@ -13,7 +13,6 @@ def test_spawn_without_block r, w, pid = PTY.spawn(RUBY, '-e', 'puts "a"') assert_equal("a\r\n", r.gets) - assert_raise(Errno::EIO) { r.gets } ensure Process.wait pid if pid end @@ -22,7 +21,6 @@ PTY.spawn(RUBY, '-e', 'puts "b"') {|r,w,pid| assert_equal("b\r\n", r.gets) Process.wait(pid) - assert_raise(Errno::EIO) { r.gets } } end @@ -31,7 +29,6 @@ PTY.spawn(commandline) {|r,w,pid| assert_equal("foo\r\n", r.gets) Process.wait(pid) - assert_raise(Errno::EIO) { r.gets } } end @@ -39,7 +36,6 @@ PTY.spawn([RUBY, "argv0"], '-e', 'puts "bar"') {|r,w,pid| assert_equal("bar\r\n", r.gets) Process.wait(pid) - assert_raise(Errno::EIO) { r.gets } } end end if defined? PTY -- ML: ruby-changes@q... Info: http://www.atdot.net/~ko1/quickml/