summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog14
-rw-r--r--eval.c4
-rw-r--r--ext/pty/MANIFEST1
-rw-r--r--ext/socket/getnameinfo.c2
-rw-r--r--instruby.rb2
-rw-r--r--regex.c2
-rw-r--r--ruby.c2
-rw-r--r--time.c2
8 files changed, 22 insertions, 7 deletions
diff --git a/ChangeLog b/ChangeLog
index 3f361fdee0a..55ed4c9ee99 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,17 @@
+Fri May 14 12:46:56 1999 Yukihiro Matsumoto <matz@netlab.co.jp>
+
+ * time.c (time_load): a bug in old marshal format support.
+
+ * instruby.rb: make site_ruby directory.
+
+Fri May 14 10:18:02 1999 WATANABE Tetsuya <tetsu@jpn.hp.com>
+
+ * regex.c (re_match): a bug in inline `.*' etc.
+
+Fri May 14 09:58:46 1999 Minero Aoki <aamine@dp.u-netsurf.ne.jp>
+
+ * ruby.c (addpath): should have specified string length.
+
Thu May 13 10:40:44 1999 Yukihiro Matsumoto <matz@netlab.co.jp>
* eval.c (rb_eval_string_wrap): new function.
diff --git a/eval.c b/eval.c
index 2d05ebe60c4..7545a03ac44 100644
--- a/eval.c
+++ b/eval.c
@@ -1143,10 +1143,10 @@ rb_eval_string_wrap(str, state)
POP_CLASS();
if (state) {
+ *state = status;
if (status == 0) {
- JUMP_TAG(state);
+ JUMP_TAG(status);
}
- *state = status;
}
return val;
}
diff --git a/ext/pty/MANIFEST b/ext/pty/MANIFEST
index be6ab42f99a..5e5af7dd6be 100644
--- a/ext/pty/MANIFEST
+++ b/ext/pty/MANIFEST
@@ -1,5 +1,4 @@
MANIFEST
-Makefile
README
README.expect
README.expect.jp
diff --git a/ext/socket/getnameinfo.c b/ext/socket/getnameinfo.c
index 89245d324fd..d4d6bcf595a 100644
--- a/ext/socket/getnameinfo.c
+++ b/ext/socket/getnameinfo.c
@@ -86,7 +86,7 @@ struct sockinet {
static const char *
inet_ntop(af, addr, numaddr, numaddr_len)
int af;
- __const void *addr;
+ const void *addr;
char *numaddr;
size_t numaddr_len;
{
diff --git a/instruby.rb b/instruby.rb
index 338ec566fc7..d708ee015e5 100644
--- a/instruby.rb
+++ b/instruby.rb
@@ -49,6 +49,8 @@ end
Dir.chdir wdir
File.makedirs pkglibdir, true
File.makedirs archdir, true
+File.makedirs pkglibdir+"/site_ruby", true
+File.makedirs pkglibdir+"/site_ruby/"+CONFIG["arch"], true
if PLATFORM =~ /-aix/
File.install "ruby.imp", archdir, 0644, true
diff --git a/regex.c b/regex.c
index c6167b04bae..52094fe87bb 100644
--- a/regex.c
+++ b/regex.c
@@ -3636,7 +3636,7 @@ re_match(bufp, string_arg, size, pos, regs)
goto fail;
SET_REGS_MATCHED;
d += mbclen(*d);
- break;
+ continue;
}
if (!(options&RE_OPTION_POSIXLINE) &&
(TRANSLATE_P() ? translate[*d] : *d) == '\n')
diff --git a/ruby.c b/ruby.c
index 4f6dcea00b4..d832dc44818 100644
--- a/ruby.c
+++ b/ruby.c
@@ -203,7 +203,7 @@ addpath(path)
while (*p) {
while (*p == sep) p++;
if (s = strchr(p, sep)) {
- rb_ary_push(ary, rb_str_new2(rubylib_mangle(p, (int)(s-p))));
+ rb_ary_push(ary, rb_str_new(rubylib_mangle(p, (int)(s-p)), (int)(s-p)));
p = s + 1;
}
else {
diff --git a/time.c b/time.c
index 2645b3ce0f6..d3e588c3689 100644
--- a/time.c
+++ b/time.c
@@ -944,7 +944,7 @@ time_load(klass, str)
}
if ((p & (1<<31)) == 0) {
- return time_new_internal(klass, sec, usec);
+ return time_new_internal(klass, p, s);
}
p &= ~(1<<31);
tm.tm_year = (p >> 14) & 0x1ffff;