matz

matz · matz · commit 3597f08030aa · 2000-07-31T09:20:59.000Z
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_4@862 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
diff --git a/ChangeLog b/ChangeLog
@@ -1,3 +1,8 @@
+Sat Jul 29 23:42:04 2000  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* dir.c (dir_each): should check whether dir is closed during the
+	  block execution. (ruby-bugs:#PR47)
+
 Sat Jul 29 21:57:30 2000  WATANABE Hirofumi  <eban@os.rim.or.jp>
 
 	* ruby.c (rubylib_mangle): provide another buffer for the result.
diff --git a/configure.in b/configure.in
@@ -764,9 +764,12 @@ case "$host_os" in
 	openstep*)
     	CFLAGS="$CFLAGS -pipe"
 		;;
-	rhasody*)
+	rhapsody*)
     	CFLAGS="$CFLAGS -pipe -no-precomp"
 		;;
+	os2_emx)
+    	CFLAGS="$CFLAGS -DOS2"
+		;;
 	*)
 		;;	
 esac
diff --git a/defines.h b/defines.h
@@ -28,6 +28,8 @@
 #endif
 #define S_IXGRP 0000010         /* execute/search permission, group */
 #define S_IXOTH 0000001         /* execute/search permission, other */
+
+#define HAVE_SYS_WAIT_H         /* configure fails to find this */
 #endif /* NeXT */
 
 #ifdef NT
diff --git a/dir.c b/dir.c
@@ -305,6 +305,7 @@ dir_each(dir)
     for (dp = readdir(dirp); dp != NULL; dp = readdir(dirp)) {
 	file = rb_tainted_str_new(dp->d_name, NAMLEN(dp));
 	rb_yield(file);
+	if (DATA_PTR(dir) == NULL) dir_closed();
     }
     return dir;
 }
diff --git a/lib/weakref.rb b/lib/weakref.rb
@@ -45,7 +45,13 @@ def initialize(orig)
     @__id = orig.__id__
     ObjectSpace.call_finalizer orig
     ObjectSpace.call_finalizer self
-    ID_MAP[@__id] = [] unless ID_MAP[@__id]
+    begin
+      __old_status = Thread.critical
+      Thread.critical = true
+      ID_MAP[@__id] = [] unless ID_MAP[@__id]
+    ensure
+      Thread.critical = __old_status
+    end
     ID_MAP[@__id].push self.__id__
     ID_REV_MAP[self.id] = @__id
   end
diff --git a/regex.h b/regex.h
@@ -183,10 +183,6 @@ typedef struct
 } regmatch_t;
 
 
-#ifdef NeXT
-#define re_match rre_match
-#endif
-
 #ifdef __STDC__
 
 extern char *re_compile_pattern (const char *, int, struct re_pattern_buffer *);

Original file line number	Diff line number	Diff line change
`@@ -305,6 +305,7 @@ dir_each(dir)`
`305`	`305`	`for (dp = readdir(dirp); dp != NULL; dp = readdir(dirp)) {`
`306`	`306`	`file = rb_tainted_str_new(dp->d_name, NAMLEN(dp));`
`307`	`307`	`rb_yield(file);`
	`308`	`+ if (DATA_PTR(dir) == NULL) dir_closed();`
`308`	`309`	`}`
`309`	`310`	`return dir;`
`310`	`311`	`}`