From 03d1c9cd8238af6f1063ea4eb98d17fa2a511107 Mon Sep 17 00:00:00 2001
From: matz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Sat, 14 Jul 2001 15:17:19 +0000
Subject: * regex.c (re_search): should consider reverse search.

* dir.c (dir_s_chdir): warn only when invoked from multiple
  threads or block is not given.

* object.c (rb_convert_type): should use rb_rescue(), not rb_rescue2().

* range.c (range_init): ditto.

* object.c (rb_obj_dup): should free generic_ivar if original owns
  them.

* string.c (rb_str_each_line): should propagate taint mark.

* ext/nkf/nkf.c (rb_nkf_kconv): ditto.

* eval.c (rb_f_require): revamp for simpler implementation.

* file.c (rb_find_file_noext): use String object, instead of
  passing char* around.

* file.c (rb_find_file): ditto.

* dln.c (dln_load): should use NSLINKMODULE_OPTION_BINDNOW.

* ruby.c (load_file): local variables 'c' remain uninitialized on
  xflag.

* regex.c (re_match): prefetched escaped character too early.

* eval.c (rb_call0): add argument check for attr_readers.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@1612 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 dir.c | 15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)

(limited to 'dir.c')

diff --git a/dir.c b/dir.c
index d2c2796c47..e0c3d42ecb 100644
--- a/dir.c
+++ b/dir.c
@@ -399,12 +399,15 @@ dir_chdir(path)
 }
 
 static int chdir_blocking = 0;
+static VALUE chdir_thread = Qnil;
 
 static VALUE
 chdir_restore(path)
     const char *path;
 {
     chdir_blocking--;
+    if (chdir_blocking == 0)
+	chdir_thread = Qnil;
     dir_chdir(path);
     return Qnil;
 }
@@ -436,14 +439,18 @@ dir_s_chdir(argc, argv, obj)
 	}
     }
 
-    if (chdir_blocking > 0)
-	rb_warn("chdir during chdir block");
+    if (chdir_blocking > 0) {
+	if (!rb_block_given_p() || rb_thread_current() != chdir_thread)
+	    rb_warn("conflicting chdir during another chdir block");
+    }
 
     if (rb_block_given_p()) {
 	char cwd[MAXPATHLEN];
 
 	GETCWD(cwd);
 	chdir_blocking++;
+	if (chdir_thread == Qnil)
+	    chdir_thread = rb_thread_current();
 	dir_chdir(dist);
 	return rb_ensure(rb_yield, path, chdir_restore, (VALUE)cwd);
     }
@@ -618,7 +625,7 @@ static void
 glob_helper(path, flags, func, arg)
     char *path;
     int flags;
-    void (*func)();
+    void (*func) _((const char*, VALUE));
     VALUE arg;
 {
     struct stat st;
@@ -763,7 +770,7 @@ rb_glob(path, func, arg)
 void
 rb_globi(path, func, arg)
     char *path;
-    void (*func)();
+    void (*func) _((const char*, VALUE));
     VALUE arg;
 {
     glob_helper(path, FNM_PERIOD|FNM_CASEFOLD, func, arg);
-- 
cgit v1.2.3