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

* ruby.c (proc_options): should not adjust argc/argv if -e option

Browse source 
is supplied.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_6@1726 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
matz 2001-09-05 06:53:33 +00:00
parent dabb7728c6
commit 0986c82926
8 changed files with 39 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
ChangeLog
View file

@ -2,6 +2,11 @@ Mon Sep 3 20:26:08 2001 Nobuyoshi Nakada <nobu.nakada@nifty.ne.jp>
* intern.h (rb_find_file_ext): changed from rb_find_file_noext(). * intern.h (rb_find_file_ext): changed from rb_find_file_noext().
Mon Sep 3 15:12:49 2001 Yukihiro Matsumoto <matz@ruby-lang.org>
* ruby.c (proc_options): should not adjust argc/argv if -e option
is supplied.
Mon Sep 3 14:38:24 2001 WATANABE Hirofumi <eban@ruby-lang.org> Mon Sep 3 14:38:24 2001 WATANABE Hirofumi <eban@ruby-lang.org>
* eval.c (rb_f_require): should check static linked libraries * eval.c (rb_f_require): should check static linked libraries
@ -104,6 +109,12 @@ Fri Aug 17 00:49:51 2001 Yukihiro Matsumoto <matz@ruby-lang.org>
* parse.y (parse_regx): handle backslash escaping of delimiter here. * parse.y (parse_regx): handle backslash escaping of delimiter here.
Thu Aug 16 23:03:40 2001 Koji Arai <JCA02266@nifty.ne.jp>
* io.c: prevent recursive malloc calls on NEC UX/4800.
* ext/socket/socket.c: ditto.
Thu Aug 16 19:53:19 2001 Akinori MUSHA <knu@iDaemons.org> Thu Aug 16 19:53:19 2001 Akinori MUSHA <knu@iDaemons.org>
* lib/resolv.rb, lib/resolv-replace.rb: Copy from 1.7. * lib/resolv.rb, lib/resolv-replace.rb: Copy from 1.7.

8
ext/socket/socket.c
View file

@ -450,8 +450,8 @@ s_recvfrom(sock, argc, argv, from)
str = rb_tainted_str_new(0, NUM2INT(len)); str = rb_tainted_str_new(0, NUM2INT(len));
rb_thread_wait_fd(fd);
retry: retry:
rb_thread_wait_fd(fd);
TRAP_BEG; TRAP_BEG;
RSTRING(str)->len = recvfrom(fd, RSTRING(str)->ptr, RSTRING(str)->len, flags, RSTRING(str)->len = recvfrom(fd, RSTRING(str)->ptr, RSTRING(str)->len, flags,
(struct sockaddr*)buf, &alen); (struct sockaddr*)buf, &alen);
@ -467,7 +467,6 @@ s_recvfrom(sock, argc, argv, from)
#if EAGAIN != EWOULDBLOCK #if EAGAIN != EWOULDBLOCK
case EAGAIN: case EAGAIN:
#endif #endif
rb_thread_wait_fd(fd);
goto retry; goto retry;
} }
rb_sys_fail("recvfrom(2)"); rb_sys_fail("recvfrom(2)");
@ -1066,9 +1065,13 @@ s_accept(class, fd, sockaddr, len)
rb_secure(3); rb_secure(3);
retry: retry:
rb_thread_wait_fd(fd); rb_thread_wait_fd(fd);
#if defined(_nec_ews)
fd2 = accept(fd, sockaddr, len);
#else
TRAP_BEG; TRAP_BEG;
fd2 = accept(fd, sockaddr, len); fd2 = accept(fd, sockaddr, len);
TRAP_END; TRAP_END;
#endif
if (fd2 < 0) { if (fd2 < 0) {
switch (errno) { switch (errno) {
case EMFILE: case EMFILE:
@ -1085,7 +1088,6 @@ s_accept(class, fd, sockaddr, len)
#if EAGAIN != EWOULDBLOCK #if EAGAIN != EWOULDBLOCK
case EAGAIN: case EAGAIN:
#endif #endif
rb_thread_wait_fd(fd);
goto retry; goto retry;
} }
rb_sys_fail(0); rb_sys_fail(0);

6
ext/tk/lib/tk.rb
View file

@ -2233,7 +2233,7 @@ class TkObject<TkKernel
def cget(slot) def cget(slot)
case slot case slot
when 'text', 'label', 'show', 'data', 'flie' when 'text', 'label', 'show', 'data', 'file'
tk_call path, 'cget', "-#{slot}" tk_call path, 'cget', "-#{slot}"
else else
tk_tcl2ruby tk_call path, 'cget', "-#{slot}" tk_tcl2ruby tk_call path, 'cget', "-#{slot}"
@ -2273,7 +2273,7 @@ class TkObject<TkKernel
else else
if slot if slot
case slot case slot
when 'text', 'label', 'show', 'data', 'flie' when 'text', 'label', 'show', 'data', 'file'
conf = tk_split_simplelist(tk_send('configure', "-#{slot}") ) conf = tk_split_simplelist(tk_send('configure', "-#{slot}") )
else else
conf = tk_split_list(tk_send('configure', "-#{slot}") ) conf = tk_split_list(tk_send('configure', "-#{slot}") )
@ -2285,7 +2285,7 @@ class TkObject<TkKernel
conf = tk_split_simplelist(conflist) conf = tk_split_simplelist(conflist)
conf[0] = conf[0][1..-1] conf[0] = conf[0][1..-1]
case conf[0] case conf[0]
when 'text', 'label', 'show', 'data', 'flie' when 'text', 'label', 'show', 'data', 'file'
else else
if conf[3] if conf[3]
if conf[3].index('{') if conf[3].index('{')

2
ext/tk/lib/tkcanvas.rb
View file

@ -876,7 +876,7 @@ class TkPhotoImage<TkImage
def cget(option) def cget(option)
case option case option
when 'data', 'flie' when 'data', 'file'
tk_send 'cget', option tk_send 'cget', option
else else
tk_tcl2ruby tk_send 'cget', option tk_tcl2ruby tk_send 'cget', option

20
ext/tk/lib/tktext.rb
View file

@ -279,7 +279,7 @@ class TkText<TkTextWin
def tag_cget(tag, key) def tag_cget(tag, key)
case key case key
when 'text', 'label', 'show', 'data', 'flie' when 'text', 'label', 'show', 'data', 'file'
tk_call @path, 'tag', 'cget', tag, "-#{key}" tk_call @path, 'tag', 'cget', tag, "-#{key}"
else else
tk_tcl2ruby tk_call @path, 'tag', 'cget', tag, "-#{key}" tk_tcl2ruby tk_call @path, 'tag', 'cget', tag, "-#{key}"
@ -308,7 +308,7 @@ class TkText<TkTextWin
def tag_configinfo(tag, key=nil) def tag_configinfo(tag, key=nil)
if key if key
case key case key
when 'text', 'label', 'show', 'data', 'flie' when 'text', 'label', 'show', 'data', 'file'
conf = tk_split_simplelist(tk_send('tag','configure',tag,"-#{key}")) conf = tk_split_simplelist(tk_send('tag','configure',tag,"-#{key}"))
else else
conf = tk_split_list(tk_send('tag','configure',tag,"-#{key}")) conf = tk_split_list(tk_send('tag','configure',tag,"-#{key}"))
@ -320,7 +320,7 @@ class TkText<TkTextWin
conf = tk_split_simplelist(conflist) conf = tk_split_simplelist(conflist)
conf[0] = conf[0][1..-1] conf[0] = conf[0][1..-1]
case conf[0] case conf[0]
when 'text', 'label', 'show', 'data', 'flie' when 'text', 'label', 'show', 'data', 'file'
else else
if conf[3] if conf[3]
if conf[3].index('{') if conf[3].index('{')
@ -712,7 +712,7 @@ class TkTextTag<TkObject
def cget(key) def cget(key)
case key case key
when 'text', 'label', 'show', 'data', 'flie' when 'text', 'label', 'show', 'data', 'file'
tk_call @t.path, 'tag', 'cget', @id, "-#{key}" tk_call @t.path, 'tag', 'cget', @id, "-#{key}"
else else
tk_tcl2ruby tk_call @t.path, 'tag', 'cget', @id, "-#{key}" tk_tcl2ruby tk_call @t.path, 'tag', 'cget', @id, "-#{key}"
@ -896,7 +896,7 @@ class TkTextWindow<TkObject
def cget(slot) def cget(slot)
case slot case slot
when 'text', 'label', 'show', 'data', 'flie' when 'text', 'label', 'show', 'data', 'file'
tk_call @t.path, 'window', 'cget', @index, "-#{slot}" tk_call @t.path, 'window', 'cget', @index, "-#{slot}"
else else
tk_tcl2ruby tk_call @t.path, 'window', 'cget', @index, "-#{slot}" tk_tcl2ruby tk_call @t.path, 'window', 'cget', @index, "-#{slot}"
@ -947,7 +947,7 @@ class TkTextWindow<TkObject
def configinfo(slot = nil) def configinfo(slot = nil)
if slot if slot
case slot case slot
when 'text', 'label', 'show', 'data', 'flie' when 'text', 'label', 'show', 'data', 'file'
conf = tk_split_simplelist(tk_call @t.path, 'window', 'configure', conf = tk_split_simplelist(tk_call @t.path, 'window', 'configure',
@index, "-#{slot}") @index, "-#{slot}")
else else
@ -962,7 +962,7 @@ class TkTextWindow<TkObject
conf = tk_split_simplelist(conflist) conf = tk_split_simplelist(conflist)
conf[0] = conf[0][1..-1] conf[0] = conf[0][1..-1]
case conf[0] case conf[0]
when 'text', 'label', 'show', 'data', 'flie' when 'text', 'label', 'show', 'data', 'file'
else else
if conf[3] if conf[3]
if conf[3].index('{') if conf[3].index('{')
@ -1017,7 +1017,7 @@ class TkTextImage<TkObject
def cget(slot) def cget(slot)
case slot case slot
when 'text', 'label', 'show', 'data', 'flie' when 'text', 'label', 'show', 'data', 'file'
tk_call @t.path, 'image', 'cget', @index, "-#{slot}" tk_call @t.path, 'image', 'cget', @index, "-#{slot}"
else else
tk_tcl2ruby tk_call @t.path, 'image', 'cget', @index, "-#{slot}" tk_tcl2ruby tk_call @t.path, 'image', 'cget', @index, "-#{slot}"
@ -1046,7 +1046,7 @@ class TkTextImage<TkObject
def configinfo(slot = nil) def configinfo(slot = nil)
if slot if slot
case slot case slot
when 'text', 'label', 'show', 'data', 'flie' when 'text', 'label', 'show', 'data', 'file'
conf = tk_split_simplelist(tk_call @t.path, 'image', 'configure', conf = tk_split_simplelist(tk_call @t.path, 'image', 'configure',
@index, "-#{slot}") @index, "-#{slot}")
else else
@ -1061,7 +1061,7 @@ class TkTextImage<TkObject
conf = tk_split_simplelist(conflist) conf = tk_split_simplelist(conflist)
conf[0] = conf[0][1..-1] conf[0] = conf[0][1..-1]
case conf[0] case conf[0]
when 'text', 'label', 'show', 'data', 'flie' when 'text', 'label', 'show', 'data', 'file'
else else
if conf[3] if conf[3]
if conf[3].index('{') if conf[3].index('{')

2
io.c
View file

@ -27,7 +27,7 @@
# define NO_LONG_FNAME # define NO_LONG_FNAME
#endif #endif
#if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__) || defined(sun) #if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__) || defined(sun) || defined(_nec_ews)
# define USE_SETVBUF # define USE_SETVBUF
#endif #endif

3
lib/resolv.rb
View file

@ -48,6 +48,7 @@ class Resolv
def initialize(filename = DefaultFileName) def initialize(filename = DefaultFileName)
@filename = filename @filename = filename
@mutex = Mutex.new @mutex = Mutex.new
@initialized = nil
end end
def lazy_initialize def lazy_initialize
@ -106,6 +107,7 @@ class Resolv
def initialize(config="/etc/resolv.conf") def initialize(config="/etc/resolv.conf")
@mutex = Mutex.new @mutex = Mutex.new
@config = Config.new(config) @config = Config.new(config)
@initialized = nil
end end
def lazy_initialize def lazy_initialize
@ -385,6 +387,7 @@ class Resolv
def initialize(filename="/etc/resolv.conf") def initialize(filename="/etc/resolv.conf")
@mutex = Mutex.new @mutex = Mutex.new
@filename = filename @filename = filename
@initialized = nil
end end
def lazy_initialize def lazy_initialize

8
version.h
View file

@ -1,4 +1,4 @@
#define RUBY_VERSION "1.6.4" #define RUBY_VERSION "1.6.5"
#define RUBY_RELEASE_DATE "2001-09-03" #define RUBY_RELEASE_DATE "2001-09-05"
#define RUBY_VERSION_CODE 164 #define RUBY_VERSION_CODE 165
#define RUBY_RELEASE_CODE 20010903 #define RUBY_RELEASE_CODE 20010905