19991013

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_4@539 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

5 files changed, 19 insertions, 5 deletions

diff --git a/ChangeLog b/ChangeLog
index 900a94ea97..4186ee7665 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+Tue Oct 12 22:29:04 1999  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* io.c (io_read): length may be 0 or negative.
+
+Tue Oct 12 13:26:27 1999  Jun-ichiro itojun Hagino  <itojun@itojun.org>
+
+	* signal.c (posix_signal): RETSIGTYPE may be void.
+
 Mon Oct 11 17:42:25 1999  Nobuyoshi Nakada  <nobu.nakada@nifty.ne.jp>
 
 	* parse.y (rb_intern): should generate distinct ID_ATTRSET symbols
diff --git a/io.c b/io.c
index c1c7d511db..1dba2ea69a 100644
--- a/io.c
+++ b/io.c
@@ -482,11 +482,15 @@ io_read(argc, argv, io)
     }
 
     len = NUM2INT(length);
+    if (len < 0) {
+	rb_raise(rb_eArgError, "negative length %d given", len);
+    }
     GetOpenFile(io, fptr);
     rb_io_check_readable(fptr);
 
     if (feof(fptr->f)) return Qnil;
     str = rb_str_new(0, len);
+    if (len == 0) return str;
 
     READ_CHECK(fptr->f);
     n = io_fread(RSTRING(str)->ptr, len, fptr->f);
diff --git a/rubytest.rb b/rubytest.rb
index 7b886fd3f4..20032e303e 100644
--- a/rubytest.rb
+++ b/rubytest.rb
@@ -9,6 +9,8 @@ if File.exist? CONFIG['LIBRUBY_SO']
     dldpath = "SHLIB_PATH"
   when /-aix/
     dldpath = "LIBPATH"
+  when /-beos/
+    dldpath = "LIBRARY_PATH"
   else
     dldpath = "LD_LIBRARY_PATH"
   end
diff --git a/signal.c b/signal.c
index 6489760bc6..fe1107d46d 100644
--- a/signal.c
+++ b/signal.c
@@ -298,7 +298,7 @@ posix_signal(signum, handler)
     sigact.sa_flags |= SA_RESTART; /* SVR4, 4.3+BSD */
 #endif
 #ifdef SA_NOCLDWAIT
-    if (signum == SIGCHLD && handler == (RETSIGTYPE)SIG_IGN)
+    if (signum == SIGCHLD && handler == SIG_IGN)
 	sigact.sa_flags |= SA_NOCLDWAIT;
 #endif
     sigaction(signum, &sigact, 0);
diff --git a/version.h b/version.h
index 0d5ed1f1eb..8a410a75f7 100644
--- a/version.h
+++ b/version.h
@@ -1,4 +1,4 @@
-#define RUBY_VERSION "1.4.2"
-#define RUBY_RELEASE_DATE "1999-09-18"
-#define RUBY_VERSION_CODE 142
-#define RUBY_RELEASE_CODE 19990918
+#define RUBY_VERSION "1.4.3"
+#define RUBY_RELEASE_DATE "1999-10-12"
+#define RUBY_VERSION_CODE 143
+#define RUBY_RELEASE_CODE 19991012