tk 0.2.0 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: e3dda01b6b41bfb93fabae1a0f04c47cb9cc5cee
-  data.tar.gz: f92e1763b14b39edf8ea046b7c63637e64c212ad
+SHA256:
+  metadata.gz: de793924acb0bcb31d9cf7810b29ee8b955498771677127d14a8f84a0be28447
+  data.tar.gz: 624bf1e5f517b16c2147b43b840189f711f91c585edda293ba55585dde6d2901
 SHA512:
-  metadata.gz: 116138a07d5a38c51278ad930d30771c700a570d136c6e29ca384f35044f592a4408f3b08b79f830526de4715282d15f13625221b2d8523f752c0a6fabb87142
-  data.tar.gz: 6983ca5706d8a61e35a2ed0ef413fb66d1e679afcda3a0c028b2651727967745d8a20aa7f44a4cc061121ed09ea36e4e4c7f1ce3b7781a5390224c8aa06c9f00
+  metadata.gz: 496b71be86f3fad9951713a33c51cc2df0362914717adc915977d93b6197c5770938c82013cb84e97a1893e4489c549159ddbd96e2f1d42362d881ec50c6970e
+  data.tar.gz: 39d4d96c72e0484684f0048f01fd7df53ce8ad20158c9a14d82de0d93c1732f9eab52e83003d4d4084743bde9898c91044b909e82eebf0b098329a666cc1a111

data/.gitignore

@@ -7,4 +7,6 @@
 /pkg/
 /spec/reports/
 /tmp/
+/lib/*.so
+/*.gem
 *.bundle

data/MANUAL_tcltklib.eng

@@ -171,8 +171,6 @@ module TclTklib
        : a target event.
        : If set DONT_WAIT flag and no event for processing, returns
        : false immediately.
-       : If $SAFE >= 1 and the flag is tainted,
-       : force to set DONT_WAIT flag.
 
     set_eventloop_tick(timer_tick)
        : Define the interval of thread-switching with an integer

data/MANUAL_tcltklib.ja

@@ -272,8 +272,6 @@ require "tcltklib" すると, 以下のモジュール, クラスが利用可能
          : 象となっている種類のイベントが発生するまで待ち続ける．
          : DONT_WAIT を指定していた場合，処理対象イベントがなくても
          : すぐに終了し false を返す．
-         : $SAFE >= 1 かつ flag が汚染されているならば
-         : flag には DONT_WAIT が強制的に付けられる．
 
       set_eventloop_tick(timer_tick)
          : イベントループと同時に別スレッドが稼働している場合に，時

data/README.ActiveTcl

@@ -1,6 +1,6 @@
 ActiveTcl is ActiveState's quality-assured distribution of Tcl.
 
-# see <http://www.activestate.com/Products/ActiveTcl/>
+# see <https://www.activestate.com/products/tcl/tcl-tk-modules/>
 #     <http://www.tcl.tk/>
 
 First of all, please try to configure without any options.

data/README.md

@@ -18,6 +18,49 @@ Or install it yourself as:
 
     $ gem install tk
 
+## Documentation
+
+### Read this first
+
+If you want to use Ruby/Tk (tk.rb and so on), you must have tcltklib.so
+which is working correctly. When you have some troubles on compiling,
+please read [README.tcltklib] and [README.ActiveTcl].
+
+Even if there is a tcltklib.so on your Ruby library directory, it will not
+work without Tcl/Tk libraries (e.g. libtcl8.4.so) on your environment.
+You must also check that your Tcl/Tk is installed properly.
+
+--------------------------------------------
+
+Ruby/Tk (tk.rb など) を使いたい場合には，tcltklib.so が正しく動いていな
+ければなりません．コンパイル時に何か問題が生じた場合は，[README.tcltklib]
+や [README.ActiveTcl] を見てください．
+
+たとえ Ruby のライブラリディレクトリに tcltklib.so が存在していたとして
+も，実行環境に Tcl/Tk ライブラリ (libtcl8.4.so など) がなければ機能しま
+せん．Tcl/Tk が正しくインストールされているかもチェックしてください．
+
+<tt>==========================================================
+                Hidetoshi NAGAI (nagai@ai.kyutech.ac.jp)</tt>
+
+### Manual
+
+- [Manual tcltklib, in English](MANUAL_tcltklib.eng)
+- [Manual tcltklib, in Japanese](MANUAL_tcltklib.ja)
+
+### Other documents
+
+[README.tcltklib] for compilation instructions.
+
+[README.fork] is a note on forking.
+
+[README.macosx-aqua] is about MacOS X Aqua usage.
+
+[README.tcltklib]: README.tcltklib
+[README.ActiveTcl]: README.ActiveTcl
+[README.fork]: README.fork
+[README.macosx-aqua]: README.macosx-aqua
+
 ## Development
 
 After checking out the repo, run `bin/setup` to install dependencies. Then, run `rake test` to run the tests. You can also run `bin/console` for an interactive prompt that will allow you to experiment.

data/ext/tk/extconf.rb

@@ -5,6 +5,8 @@
 ##############################################################
 require 'mkmf'
 
+$CFLAGS << " -DNO_TAINT" if RUBY_VERSION >= '2.7'
+
 TkLib_Config = {}
 TkLib_Config['search_versions'] =
   # %w[8.9 8.8 8.7 8.6 8.5 8.4 8.3 8.2 8.1 8.0 7.6 4.2]
@@ -1810,8 +1812,8 @@ end
 # check header file
 print("check functions.")
 
-%w"ruby_native_thread_p rb_errinfo rb_safe_level rb_hash_lookup
- rb_proc_new rb_obj_untrust rb_obj_taint rb_set_safe_level_force
+%w"ruby_native_thread_p rb_errinfo rb_hash_lookup
+ rb_proc_new 
  rb_sourcefile rb_thread_alive_p rb_thread_check_trap_pending
  ruby_enc_find_basename
 ".each do |func|

data/ext/tk/old-extconf.rb

@@ -8,7 +8,6 @@ is_win32 = (/mswin|mingw|cygwin|bccwin/ =~ RUBY_PLATFORM)
 
 have_func("ruby_native_thread_p", "ruby.h")
 have_func("rb_errinfo", "ruby.h")
-have_func("rb_safe_level", "ruby.h")
 have_struct_member("struct RArray", "ptr", "ruby.h")
 have_struct_member("struct RArray", "len", "ruby.h")
 

data/ext/tk/tcltklib.c

@@ -46,11 +46,15 @@ int rb_thread_check_trap_pending(void);
 #define RARRAY_AREF(a, i) RARRAY_CONST_PTR(a)[i]
 #endif
 
+#ifdef NO_TAINT
+#define RbTk_OBJ_UNTRUST(x)  do {} while (0)
+#else
 #ifdef OBJ_UNTRUST
 #define RbTk_OBJ_UNTRUST(x)  do {OBJ_TAINT(x); OBJ_UNTRUST(x);} while (0)
 #else
 #define RbTk_OBJ_UNTRUST(x)  OBJ_TAINT(x)
 #endif
+#endif
 #define RbTk_ALLOC_N(type, n) (type *)ckalloc((int)(sizeof(type) * (n)))
 
 #if defined(HAVE_RB_PROC_NEW) && !defined(RUBY_VM)
@@ -97,9 +101,6 @@ extern VALUE rb_proc_new _((VALUE (*)(ANYARGS/* VALUE yieldarg[, VALUE procarg]
 #else
 VALUE rb_errinfo(void);
 #endif
-#ifndef HAVE_RB_SAFE_LEVEL
-#define rb_safe_level() (ruby_safe_level+0)
-#endif
 #ifndef HAVE_RB_SOURCEFILE
 #define rb_sourcefile() (ruby_sourcefile+0)
 #endif
@@ -255,7 +256,6 @@ static VALUE ip_invoke_real _((int, VALUE*, VALUE));
 static VALUE ip_invoke _((int, VALUE*, VALUE));
 static VALUE ip_invoke_with_position _((int, VALUE*, VALUE, Tcl_QueuePosition));
 static VALUE tk_funcall _((VALUE(), int, VALUE*, VALUE));
-static VALUE callq_safelevel_handler _((VALUE, VALUE));
 
 /* Tcl's object type */
 #if TCL_MAJOR_VERSION >= 8
@@ -420,7 +420,6 @@ struct invoke_queue {
 #endif
     VALUE interp;
     int *done;
-    int safe_level;
     VALUE result;
     VALUE thread;
 };
@@ -431,7 +430,6 @@ struct eval_queue {
     int len;
     VALUE interp;
     int *done;
-    int safe_level;
     VALUE result;
     VALUE thread;
 };
@@ -443,7 +441,6 @@ struct call_queue {
     VALUE *argv;
     VALUE interp;
     int *done;
-    int safe_level;
     VALUE result;
     VALUE thread;
 };
@@ -3620,10 +3617,10 @@ ip_ruby_cmd(clientData, interp, argc, argv)
         VALUE s;
 #if TCL_MAJOR_VERSION >= 8
         str = Tcl_GetStringFromObj(argv[i], &len);
-        s = rb_tainted_str_new(str, len);
+        s = rb_str_new(str, len);
 #else /* TCL_MAJOR_VERSION < 8 */
         str = argv[i];
-        s = rb_tainted_str_new2(str);
+        s = rb_str_new2(str);
 #endif
         DUMP2("arg:%s",str);
         rb_ary_push(args, s);
@@ -6254,19 +6251,25 @@ ip_init(argc, argv, self)
     st = ruby_tcl_stubs_init();
     /* from Tcl_AppInit() */
     if (with_tk) {
+        const char *error;
         DUMP1("Tk_Init");
         st = ruby_tk_stubs_init(ptr->ip);
+        if (st != TCLTK_STUBS_OK) {
+                error = Tcl_GetStringResult(ptr->ip);
+                ip_finalize(ptr->ip);
+                Tcl_DeleteInterp(ptr->ip);
+                Tcl_Release(ptr->ip);
+                ptr->ip = (Tcl_Interp*)NULL;
+        }
         switch(st) {
         case TCLTK_STUBS_OK:
             break;
         case NO_Tk_Init:
             rb_raise(rb_eLoadError, "tcltklib: can't find Tk_Init()");
         case FAIL_Tk_Init:
-            rb_raise(rb_eRuntimeError, "tcltklib: fail to Tk_Init(). %s",
-                     Tcl_GetStringResult(ptr->ip));
+            rb_raise(rb_eRuntimeError, "tcltklib: fail to Tk_Init(). %s", error);
         case FAIL_Tk_InitStubs:
-            rb_raise(rb_eRuntimeError, "tcltklib: fail to Tk_InitStubs(). %s",
-                     Tcl_GetStringResult(ptr->ip));
+            rb_raise(rb_eRuntimeError, "tcltklib: fail to Tk_InitStubs(). %s", error);
         default:
             rb_raise(rb_eRuntimeError, "tcltklib: unknown error(%d) on ruby_tk_stubs_init", st);
         }
@@ -6946,24 +6949,10 @@ ip_get_result_string_obj(interp)
     Tcl_DecrRefCount(retObj);
     return strval;
 #else
-    return rb_tainted_str_new2(interp->result);
+    return rb_str_new2(interp->result);
 #endif
 }
 
-/* call Tcl/Tk functions on the eventloop thread */
-static VALUE
-callq_safelevel_handler(arg, callq)
-    VALUE arg;
-    VALUE callq;
-{
-    struct call_queue *q;
-
-    Data_Get_Struct(callq, struct call_queue, q);
-    DUMP2("(safe-level handler) $SAFE = %d", q->safe_level);
-    rb_set_safe_level(q->safe_level);
-    return((q->func)(q->interp, q->argc, q->argv));
-}
-
 static int call_queue_handler _((Tcl_Event *, int));
 static int
 call_queue_handler(evPtr, flags)
@@ -7006,19 +6995,9 @@ call_queue_handler(evPtr, flags)
     /* incr internal handler mark */
     rbtk_internal_eventloop_handler++;
 
-    /* check safe-level */
-    if (rb_safe_level() != q->safe_level) {
-        /* q_dat = Data_Wrap_Struct(rb_cData,0,-1,q); */
-        q_dat = Data_Wrap_Struct(0,call_queue_mark,-1,q);
-        ret = rb_funcall(rb_proc_new(callq_safelevel_handler, q_dat),
-                         ID_call, 0);
-        rb_gc_force_recycle(q_dat);
-	q_dat = (VALUE)NULL;
-    } else {
-        DUMP2("call function (for caller thread:%"PRIxVALUE")", thread);
-        DUMP2("call function (current thread:%"PRIxVALUE")", rb_thread_current());
-        ret = (q->func)(q->interp, q->argc, q->argv);
-    }
+    DUMP2("call function (for caller thread:%"PRIxVALUE")", thread);
+    DUMP2("call function (current thread:%"PRIxVALUE")", rb_thread_current());
+    ret = (q->func)(q->interp, q->argc, q->argv);
 
     /* set result */
     RARRAY_ASET(q->result, 0, ret);
@@ -7155,7 +7134,6 @@ tk_funcall(func, argc, argv, obj)
     callq->interp = ip_obj;
     callq->result = result;
     callq->thread = current;
-    callq->safe_level = rb_safe_level();
     callq->ev.proc = call_queue_handler;
 
     /* add the handler to Tcl event queue */
@@ -7303,7 +7281,7 @@ ip_eval_real(self, cmd_str, cmd_len)
           Tcl_DecrRefCount(cmd);
           rb_thread_critical = thr_crit_bup;
           ptr->return_value = TCL_OK;
-          return rb_tainted_str_new2("");
+          return rb_str_new2("");
       } else {
           int status;
           struct call_eval_info inf;
@@ -7379,7 +7357,7 @@ ip_eval_real(self, cmd_str, cmd_len)
             Tcl_ResetResult(ptr->ip);
             rbtk_release_ip(ptr);
             rb_thread_critical = thr_crit_bup;
-            return rb_tainted_str_new2("");
+            return rb_str_new2("");
         }
     }
 
@@ -7395,7 +7373,7 @@ ip_eval_real(self, cmd_str, cmd_len)
     /* ip is deleted? */
     if (deleted_ip(ptr)) {
         ptr->return_value = TCL_OK;
-        return rb_tainted_str_new2("");
+        return rb_str_new2("");
     } else {
         /* Tcl_Preserve(ptr->ip); */
         rbtk_preserve_ip(ptr);
@@ -7438,19 +7416,6 @@ ip_eval_real(self, cmd_str, cmd_len)
 #endif
 }
 
-static VALUE
-evq_safelevel_handler(arg, evq)
-    VALUE arg;
-    VALUE evq;
-{
-    struct eval_queue *q;
-
-    Data_Get_Struct(evq, struct eval_queue, q);
-    DUMP2("(safe-level handler) $SAFE = %d", q->safe_level);
-    rb_set_safe_level(q->safe_level);
-    return ip_eval_real(q->interp, q->str, q->len);
-}
-
 int eval_queue_handler _((Tcl_Event *, int));
 int
 eval_queue_handler(evPtr, flags)
@@ -7493,24 +7458,7 @@ eval_queue_handler(evPtr, flags)
     /* incr internal handler mark */
     rbtk_internal_eventloop_handler++;
 
-    /* check safe-level */
-    if (rb_safe_level() != q->safe_level) {
-#ifdef HAVE_NATIVETHREAD
-#ifndef RUBY_USE_NATIVE_THREAD
-    if (!ruby_native_thread_p()) {
-      rb_bug("cross-thread violation on eval_queue_handler()");
-    }
-#endif
-#endif
-        /* q_dat = Data_Wrap_Struct(rb_cData,0,-1,q); */
-        q_dat = Data_Wrap_Struct(0,eval_queue_mark,-1,q);
-        ret = rb_funcall(rb_proc_new(evq_safelevel_handler, q_dat),
-                         ID_call, 0);
-        rb_gc_force_recycle(q_dat);
-	q_dat = (VALUE)NULL;
-    } else {
-        ret = ip_eval_real(q->interp, q->str, q->len);
-    }
+    ret = ip_eval_real(q->interp, q->str, q->len);
 
     /* set result */
     RARRAY_ASET(q->result, 0, ret);
@@ -7640,7 +7588,6 @@ ip_eval(self, str)
     evq->interp = ip_obj;
     evq->result = result;
     evq->thread = current;
-    evq->safe_level = rb_safe_level();
     evq->ev.proc = eval_queue_handler;
 
     position = TCL_QUEUE_TAIL;
@@ -7912,7 +7859,6 @@ lib_toUTF8_core(ip_obj, src, encodename)
 # endif
     Tcl_Encoding encoding;
     Tcl_DString dstr;
-    int taint_flag = OBJ_TAINTED(str);
     struct tcltkip *ptr;
     char *buf;
     int thr_crit_bup;
@@ -8033,13 +7979,12 @@ lib_toUTF8_core(ip_obj, src, encodename)
     /* Tcl_ExternalToUtfDString(encoding,buf,strlen(buf),&dstr); */
     Tcl_ExternalToUtfDString(encoding, buf, RSTRING_LENINT(str), &dstr);
 
-    /* str = rb_tainted_str_new2(Tcl_DStringValue(&dstr)); */
+    /* str = rb_str_new2(Tcl_DStringValue(&dstr)); */
     /* str = rb_str_new2(Tcl_DStringValue(&dstr)); */
     str = rb_str_new(Tcl_DStringValue(&dstr), Tcl_DStringLength(&dstr));
 #ifdef HAVE_RUBY_ENCODING_H
     rb_enc_associate_index(str, ENCODING_INDEX_UTF8);
 #endif
-    if (taint_flag) RbTk_OBJ_UNTRUST(str);
     rb_ivar_set(str, ID_at_enc, ENCODING_NAME_UTF8);
 
     /*
@@ -8098,7 +8043,6 @@ lib_fromUTF8_core(ip_obj, src, encodename)
     Tcl_Interp *interp;
     Tcl_Encoding encoding;
     Tcl_DString dstr;
-    int taint_flag = OBJ_TAINTED(str);
     char *buf;
     int thr_crit_bup;
 #endif
@@ -8182,7 +8126,7 @@ lib_fromUTF8_core(ip_obj, src, encodename)
             tclstr = Tcl_NewStringObj(RSTRING_PTR(str), RSTRING_LENINT(str));
 	    Tcl_IncrRefCount(tclstr);
             s = (char*)Tcl_GetByteArrayFromObj(tclstr, &len);
-            str = rb_tainted_str_new(s, len);
+            str = rb_str_new(s, len);
 	    s = (char*)NULL;
 	    Tcl_DecrRefCount(tclstr);
 #ifdef HAVE_RUBY_ENCODING_H
@@ -8211,7 +8155,7 @@ lib_fromUTF8_core(ip_obj, src, encodename)
 
     if (RSTRING_LEN(str) == 0) {
         rb_thread_critical = thr_crit_bup;
-        return rb_tainted_str_new2("");
+        return rb_str_new2("");
     }
 
     buf = ALLOC_N(char, RSTRING_LEN(str)+1);
@@ -8224,7 +8168,7 @@ lib_fromUTF8_core(ip_obj, src, encodename)
     /* Tcl_UtfToExternalDString(encoding,buf,strlen(buf),&dstr); */
     Tcl_UtfToExternalDString(encoding,buf,RSTRING_LENINT(str),&dstr);
 
-    /* str = rb_tainted_str_new2(Tcl_DStringValue(&dstr)); */
+    /* str = rb_str_new2(Tcl_DStringValue(&dstr)); */
     /* str = rb_str_new2(Tcl_DStringValue(&dstr)); */
     str = rb_str_new(Tcl_DStringValue(&dstr), Tcl_DStringLength(&dstr));
 #ifdef HAVE_RUBY_ENCODING_H
@@ -8241,7 +8185,6 @@ lib_fromUTF8_core(ip_obj, src, encodename)
     }
 #endif
 
-    if (taint_flag) RbTk_OBJ_UNTRUST(str);
     rb_ivar_set(str, ID_at_enc, encodename);
 
     /*
@@ -8297,7 +8240,6 @@ lib_UTF_backslash_core(self, str, all_bs)
 #ifdef TCL_UTF_MAX
     char *src_buf, *dst_buf, *ptr;
     int read_len = 0, dst_len = 0;
-    int taint_flag = OBJ_TAINTED(str);
     int thr_crit_bup;
 
     tcl_stubs_check();
@@ -8335,7 +8277,6 @@ lib_UTF_backslash_core(self, str, all_bs)
     }
 
     str = rb_str_new(dst_buf, dst_len);
-    if (taint_flag) RbTk_OBJ_UNTRUST(str);
 #ifdef HAVE_RUBY_ENCODING_H
     rb_enc_associate_index(str, ENCODING_INDEX_UTF8);
 #endif
@@ -8571,7 +8512,7 @@ ip_invoke_core(interp, argc, argv)
 
     /* ip is deleted? */
     if (deleted_ip(ptr)) {
-        return rb_tainted_str_new2("");
+        return rb_str_new2("");
     }
 
     /* Tcl_Preserve(ptr->ip); */
@@ -8606,7 +8547,7 @@ ip_invoke_core(interp, argc, argv)
                 Tcl_ResetResult(ptr->ip);
                 /* Tcl_Release(ptr->ip); */
                 rbtk_release_ip(ptr);
-                return rb_tainted_str_new2("");
+                return rb_str_new2("");
             }
         } else {
 #if TCL_MAJOR_VERSION >= 8
@@ -8801,7 +8742,7 @@ ip_invoke_core(interp, argc, argv)
                 rb_warn("%s (ignore)", Tcl_GetStringResult(ptr->ip));
             }
             Tcl_ResetResult(ptr->ip);
-            return rb_tainted_str_new2("");
+            return rb_str_new2("");
         }
     }
 
@@ -8928,7 +8869,7 @@ ip_invoke_real(argc, argv, interp)
 
     /* ip is deleted? */
     if (deleted_ip(ptr)) {
-        return rb_tainted_str_new2("");
+        return rb_str_new2("");
     }
 
     /* allocate memory for arguments */
@@ -8944,19 +8885,6 @@ ip_invoke_real(argc, argv, interp)
     return v;
 }
 
-VALUE
-ivq_safelevel_handler(arg, ivq)
-    VALUE arg;
-    VALUE ivq;
-{
-    struct invoke_queue *q;
-
-    Data_Get_Struct(ivq, struct invoke_queue, q);
-    DUMP2("(safe-level handler) $SAFE = %d", q->safe_level);
-    rb_set_safe_level(q->safe_level);
-    return ip_invoke_core(q->interp, q->argc, q->argv);
-}
-
 int invoke_queue_handler _((Tcl_Event *, int));
 int
 invoke_queue_handler(evPtr, flags)
@@ -8999,19 +8927,9 @@ invoke_queue_handler(evPtr, flags)
     /* incr internal handler mark */
     rbtk_internal_eventloop_handler++;
 
-    /* check safe-level */
-    if (rb_safe_level() != q->safe_level) {
-        /* q_dat = Data_Wrap_Struct(rb_cData,0,0,q); */
-        q_dat = Data_Wrap_Struct(0,invoke_queue_mark,-1,q);
-        ret = rb_funcall(rb_proc_new(ivq_safelevel_handler, q_dat),
-                         ID_call, 0);
-        rb_gc_force_recycle(q_dat);
-	q_dat = (VALUE)NULL;
-    } else {
-        DUMP2("call invoke_real (for caller thread:%"PRIxVALUE")", thread);
-        DUMP2("call invoke_real (current thread:%"PRIxVALUE")", rb_thread_current());
-        ret = ip_invoke_core(q->interp, q->argc, q->argv);
-    }
+    DUMP2("call invoke_real (for caller thread:%"PRIxVALUE")", thread);
+    DUMP2("call invoke_real (current thread:%"PRIxVALUE")", rb_thread_current());
+    ret = ip_invoke_core(q->interp, q->argc, q->argv);
 
     /* set result */
     RARRAY_ASET(q->result, 0, ret);
@@ -9141,7 +9059,6 @@ ip_invoke_with_position(argc, argv, obj, position)
     ivq->interp = ip_obj;
     ivq->result = result;
     ivq->thread = current;
-    ivq->safe_level = rb_safe_level();
     ivq->ev.proc = invoke_queue_handler;
 
     /* add the handler to Tcl event queue */
@@ -9239,7 +9156,7 @@ ip_retval(self)
 
     /* ip is deleted? */
     if (deleted_ip(ptr)) {
-        return rb_tainted_str_new2("");
+        return rb_str_new2("");
     }
 
     return (INT2FIX(ptr->return_value));
@@ -9296,7 +9213,7 @@ ip_get_variable2_core(interp, argc, argv)
         /* ip is deleted? */
         if (deleted_ip(ptr)) {
             rb_thread_critical = thr_crit_bup;
-            return rb_tainted_str_new2("");
+            return rb_str_new2("");
         } else {
             /* Tcl_Preserve(ptr->ip); */
             rbtk_preserve_ip(ptr);
@@ -9334,7 +9251,7 @@ ip_get_variable2_core(interp, argc, argv)
 
         /* ip is deleted? */
         if (deleted_ip(ptr)) {
-            return rb_tainted_str_new2("");
+            return rb_str_new2("");
         } else {
             /* Tcl_Preserve(ptr->ip); */
             rbtk_preserve_ip(ptr);
@@ -9352,7 +9269,7 @@ ip_get_variable2_core(interp, argc, argv)
             return exc;
         }
 
-        strval = rb_tainted_str_new2(ret);
+        strval = rb_str_new2(ret);
         /* Tcl_Release(ptr->ip); */
         rbtk_release_ip(ptr);
         rb_thread_critical = thr_crit_bup;
@@ -9382,7 +9299,7 @@ ip_get_variable2(self, varname, index, flag)
     retval = tk_funcall(ip_get_variable2_core, 3, argv, self);
 
     if (NIL_P(retval)) {
-        return rb_tainted_str_new2("");
+        return rb_str_new2("");
     } else {
         return retval;
     }
@@ -9433,7 +9350,7 @@ ip_set_variable2_core(interp, argc, argv)
         if (deleted_ip(ptr)) {
             Tcl_DecrRefCount(valobj);
             rb_thread_critical = thr_crit_bup;
-            return rb_tainted_str_new2("");
+            return rb_str_new2("");
         } else {
             /* Tcl_Preserve(ptr->ip); */
             rbtk_preserve_ip(ptr);
@@ -9474,7 +9391,7 @@ ip_set_variable2_core(interp, argc, argv)
 
         /* ip is deleted? */
         if (deleted_ip(ptr)) {
-            return rb_tainted_str_new2("");
+            return rb_str_new2("");
         } else {
             /* Tcl_Preserve(ptr->ip); */
             rbtk_preserve_ip(ptr);
@@ -9487,7 +9404,7 @@ ip_set_variable2_core(interp, argc, argv)
             return rb_exc_new2(rb_eRuntimeError, ptr->ip->result);
         }
 
-        strval = rb_tainted_str_new2(ret);
+        strval = rb_str_new2(ret);
 
         /* Tcl_Release(ptr->ip); */
         rbtk_release_ip(ptr);
@@ -9521,7 +9438,7 @@ ip_set_variable2(self, varname, index, value, flag)
     retval = tk_funcall(ip_set_variable2_core, 4, argv, self);
 
     if (NIL_P(retval)) {
-        return rb_tainted_str_new2("");
+        return rb_str_new2("");
     } else {
         return retval;
     }
@@ -9596,7 +9513,7 @@ ip_unset_variable2(self, varname, index, flag)
     retval = tk_funcall(ip_unset_variable2_core, 3, argv, self);
 
     if (NIL_P(retval)) {
-        return rb_tainted_str_new2("");
+        return rb_str_new2("");
     } else {
         return retval;
     }
@@ -9680,7 +9597,6 @@ lib_split_tklist_core(ip_obj, list_str)
     Tcl_Interp *interp;
     volatile VALUE ary, elem;
     int idx;
-    int taint_flag = OBJ_TAINTED(list_str);
 #ifdef HAVE_RUBY_ENCODING_H
     int list_enc_idx;
     volatile VALUE list_ivar_enc;
@@ -9735,13 +9651,11 @@ lib_split_tklist_core(ip_obj, list_str)
         rb_thread_critical = Qtrue;
 
         ary = rb_ary_new2(objc);
-        if (taint_flag) RbTk_OBJ_UNTRUST(ary);
 
         old_gc = rb_gc_disable();
 
         for(idx = 0; idx < objc; idx++) {
             elem = get_str_from_obj(objv[idx]);
-            if (taint_flag) RbTk_OBJ_UNTRUST(elem);
 
 #ifdef HAVE_RUBY_ENCODING_H
 	    if (rb_enc_get_index(elem) == ENCODING_INDEX_BINARY) {
@@ -9783,16 +9697,11 @@ lib_split_tklist_core(ip_obj, list_str)
         }
 
         ary = rb_ary_new2(argc);
-        if (taint_flag) RbTk_OBJ_UNTRUST(ary);
 
         old_gc = rb_gc_disable();
 
         for(idx = 0; idx < argc; idx++) {
-            if (taint_flag) {
-                elem = rb_tainted_str_new2(argv[idx]);
-            } else {
-                elem = rb_str_new2(argv[idx]);
-            }
+            elem = rb_str_new2(argv[idx]);
             /* rb_ivar_set(elem, ID_at_enc, rb_str_new2("binary")); */
             /* RARRAY(ary)->ptr[idx] = elem; */
 	    rb_ary_push(ary, elem)
@@ -9833,7 +9742,6 @@ lib_merge_tklist(argc, argv, obj)
     int  *flagPtr;
     char *dst, *result;
     volatile VALUE str;
-    int taint_flag = 0;
     int thr_crit_bup;
     VALUE old_gc;
 
@@ -9855,7 +9763,6 @@ lib_merge_tklist(argc, argv, obj)
     /* pass 1 */
     len = 1;
     for(num = 0; num < argc; num++) {
-        if (OBJ_TAINTED(argv[num])) taint_flag = 1;
         dst = StringValueCStr(argv[num]);
 #if TCL_MAJOR_VERSION >= 8
         len += Tcl_ScanCountedElement(dst, RSTRING_LENINT(argv[num]),
@@ -9903,7 +9810,6 @@ lib_merge_tklist(argc, argv, obj)
 
     /* create object */
     str = rb_str_new(result, dst - result - 1);
-    if (taint_flag) RbTk_OBJ_UNTRUST(str);
 #if 0 /* use Tcl_EventuallyFree */
     Tcl_EventuallyFree((ClientData)result, TCL_DYNAMIC); /* XXXXXXXX */
 #else
@@ -9928,7 +9834,6 @@ lib_conv_listelement(self, src)
 {
     int   len, scan_flag;
     volatile VALUE dst;
-    int   taint_flag = OBJ_TAINTED(src);
     int thr_crit_bup;
 
     tcl_stubs_check();
@@ -9951,7 +9856,6 @@ lib_conv_listelement(self, src)
 #endif
 
     rb_str_resize(dst, len);
-    if (taint_flag) RbTk_OBJ_UNTRUST(dst);
 
     rb_thread_critical = thr_crit_bup;
 
@@ -10417,12 +10321,6 @@ create_encoding_table_core(arg, interp)
   Tcl_Obj **objv;
   Tcl_Obj *enc_list;
 
-#ifdef HAVE_RB_SET_SAFE_LEVEL_FORCE
-  rb_set_safe_level_force(0);
-#else
-  rb_set_safe_level(0);
-#endif
-
   /* set 'binary' encoding */
   encobj = rb_enc_from_encoding(rb_enc_from_index(ENCODING_INDEX_BINARY));
   rb_hash_aset(table, ENCODING_NAME_BINARY, encobj);