[ruby-dev:3838] Re: ruby 1.1d0 released

ふなばです。

dbm などでエラーになります。ruby-dev:3828 に倣って直すとこんなかな。


--- ext/curses/curses.c.orig	Wed Nov 18 14:11:54 1998
+++ ext/curses/curses.c	Thu Dec 17 00:21:03 1998
@@ -360,7 +360,7 @@
 {
     char rtn[1024]; /* This should be big enough.. I hope */
     getstr(rtn);
-    return rb_str_taint(rb_str_new2(rtn));
+    return rb_tainted_str_new2(rtn);
 }
 
 /* def delch */
@@ -729,7 +729,7 @@
     
     GetWINDOW(obj, winp);
     wgetstr(winp->window, rtn);
-    return rb_str_taint(rb_str_new2(rtn));
+    return rb_tainted_str_new2(rtn);
 }
 
 /* def delch */
--- ext/dbm/dbm.c.orig	Tue Oct  6 12:28:18 1998
+++ ext/dbm/dbm.c	Thu Dec 17 00:17:05 1998
@@ -121,7 +121,7 @@
     if (value.dptr == 0) {
 	return Qnil;
     }
-    return rb_str_taint(rb_str_new(value.dptr, value.dsize));
+    return rb_tainted_str_new(value.dptr, value.dsize);
 }
 
 static VALUE
@@ -191,8 +191,8 @@
     val = dbm_fetch(dbm, key);
     dbm_delete(dbm, key);
 
-    keystr = rb_str_taint(rb_str_new(key.dptr, key.dsize));
-    valstr = rb_str_taint(rb_str_new(val.dptr, val.dsize));
+    keystr = rb_tainted_str_new(key.dptr, key.dsize);
+    valstr = rb_tainted_str_new(val.dptr, val.dsize);
     return rb_assoc_new(keystr, valstr);
 }
 
@@ -210,8 +210,8 @@
     dbm = dbmp->di_dbm;
     for (key = dbm_firstkey(dbm); key.dptr; key = dbm_nextkey(dbm)) {
 	val = dbm_fetch(dbm, key);
-	keystr = rb_str_taint(rb_str_new(key.dptr, key.dsize));
-	valstr = rb_str_taint(rb_str_new(val.dptr, val.dsize));
+	keystr = rb_tainted_str_new(key.dptr, key.dsize);
+	valstr = rb_tainted_str_new(val.dptr, val.dsize);
 	if (RTEST(rb_yield(rb_assoc_new(keystr, valstr)))) {
 	    if (dbm_delete(dbm, key)) {
 		rb_raise(rb_eRuntimeError, "dbm_delete failed");
@@ -255,8 +255,8 @@
     dbm = dbmp->di_dbm;
     for (key = dbm_firstkey(dbm); key.dptr; key = dbm_nextkey(dbm)) {
 	val = dbm_fetch(dbm, key);
-	keystr = rb_str_taint(rb_str_new(key.dptr, key.dsize));
-	valstr = rb_str_taint(rb_str_new(val.dptr, val.dsize));
+	keystr = rb_tainted_str_new(key.dptr, key.dsize);
+	valstr = rb_tainted_str_new(val.dptr, val.dsize);
 	rb_hash_aset(hash, valstr, keystr);
     }
     return obj;
@@ -396,7 +396,7 @@
     dbm = dbmp->di_dbm;
     for (key = dbm_firstkey(dbm); key.dptr; key = dbm_nextkey(dbm)) {
 	val = dbm_fetch(dbm, key);
-	rb_yield(rb_str_taint(rb_str_new(val.dptr, val.dsize)));
+	rb_yield(rb_tainted_str_new(val.dptr, val.dsize));
     }
     return obj;
 }
@@ -412,7 +412,7 @@
     GetDBM(obj, dbmp);
     dbm = dbmp->di_dbm;
     for (key = dbm_firstkey(dbm); key.dptr; key = dbm_nextkey(dbm)) {
-	rb_yield(rb_str_taint(rb_str_new(key.dptr, key.dsize)));
+	rb_yield(rb_tainted_str_new(key.dptr, key.dsize));
     }
     return obj;
 }
@@ -431,8 +431,8 @@
 
     for (key = dbm_firstkey(dbm); key.dptr; key = dbm_nextkey(dbm)) {
 	val = dbm_fetch(dbm, key);
-	keystr = rb_str_taint(rb_str_new(key.dptr, key.dsize));
-	valstr = rb_str_taint(rb_str_new(val.dptr, val.dsize));
+	keystr = rb_tainted_str_new(key.dptr, key.dsize);
+	valstr = rb_tainted_str_new(val.dptr, val.dsize);
 	rb_yield(rb_assoc_new(keystr, valstr));
     }
 
@@ -453,7 +453,7 @@
 
     ary = rb_ary_new();
     for (key = dbm_firstkey(dbm); key.dptr; key = dbm_nextkey(dbm)) {
-	rb_ary_push(ary, rb_str_taint(rb_str_new(key.dptr, key.dsize)));
+	rb_ary_push(ary, rb_tainted_str_new(key.dptr, key.dsize));
     }
 
     return ary;
@@ -474,7 +474,7 @@
     ary = rb_ary_new();
     for (key = dbm_firstkey(dbm); key.dptr; key = dbm_nextkey(dbm)) {
 	val = dbm_fetch(dbm, key);
-	rb_ary_push(ary, rb_str_taint(rb_str_new(val.dptr, val.dsize)));
+	rb_ary_push(ary, rb_tainted_str_new(val.dptr, val.dsize));
     }
 
     return ary;
@@ -537,8 +537,8 @@
     ary = rb_ary_new();
     for (key = dbm_firstkey(dbm); key.dptr; key = dbm_nextkey(dbm)) {
 	val = dbm_fetch(dbm, key);
-	rb_ary_push(ary, rb_assoc_new(rb_str_taint(rb_str_new(key.dptr, key.dsize)),
-				rb_str_taint(rb_str_new(val.dptr, val.dsize))));
+	rb_ary_push(ary, rb_assoc_new(rb_tainted_str_new(key.dptr, key.dsize),
+				rb_tainted_str_new(val.dptr, val.dsize)));
     }
 
     return ary;
--- ext/gtk/gtk.c.orig	Wed Dec 16 16:30:34 1998
+++ ext/gtk/gtk.c	Thu Dec 17 00:21:30 1998
@@ -8005,7 +8005,7 @@
     }
 
     for (i=1;i<argc;i++) {
-	RARRAY(rb_argv)->ptr[i-1] = rb_str_taint(rb_str_new2(argv[i]));
+	RARRAY(rb_argv)->ptr[i-1] = rb_tainted_str_new2(argv[i]);
     }
     RARRAY(rb_argv)->len = argc-1;
 

--Tadayoshi Funaba