--- rxvt-unicode/src/rxvtperl.xs	2006/01/16 08:48:09	1.68
+++ rxvt-unicode/src/rxvtperl.xs	2006/01/18 08:33:34	1.72
@@ -41,7 +41,7 @@
 
 #include "perlxsi.c"
 
-#if defined(HAVE_SCROLLBARS) || defined(MENUBAR)
+#ifdef HAVE_SCROLLBARS
 # define GRAB_CURSOR THIS->leftptr_cursor
 #else
 # define GRAB_CURSOR None
@@ -56,22 +56,6 @@
 
 /////////////////////////////////////////////////////////////////////////////
 
-static SV *
-taint (SV *sv)
-{
-  SvTAINT (sv);
-  return sv;
-}
-
-static SV *
-taint_if (SV *sv, SV *src)
-{
-  if (SvTAINTED (src))
-    SvTAINT (sv);
-
-  return sv;
-}
-
 static wchar_t *
 sv2wcs (SV *sv)
 {
@@ -420,14 +404,19 @@
 
       char *argv[] = {
         "",
-        "-T",
-        "-edo '" LIBDIR "/urxvt.pm' or ($@ and die $@) or exit 1",
+        "-e"
+        "BEGIN {"
+        "   urxvt->bootstrap;"
+        "   unshift @INC, '" LIBDIR "';"
+        "}"
+        ""
+        "use urxvt;"
       };
 
       perl = perl_alloc ();
       perl_construct (perl);
 
-      if (perl_parse (perl, xs_init, 3, argv, (char **)NULL)
+      if (perl_parse (perl, xs_init, 2, argv, (char **)NULL)
           || perl_run (perl))
         {
           rxvt_warn ("unable to initialize perl-interpreter, continuing without.\n");
@@ -442,9 +431,12 @@
       rxvt_pop_locale ();
     }
 
-  // runs outside of perls ENV
-  term->perl.self = (void *)newSVptr ((void *)term, "urxvt::term");
-  hv_store ((HV *)SvRV ((SV *)term->perl.self), "_overlay", 8, newRV_noinc ((SV *)newHV ()), 0);
+  if (perl)
+    {
+      // runs outside of perls ENV
+      term->perl.self = (void *)newSVptr ((void *)term, "urxvt::term");
+      hv_store ((HV *)SvRV ((SV *)term->perl.self), "_overlay", 8, newRV_noinc ((SV *)newHV ()), 0);
+    }
 }
 
 static void
@@ -517,7 +509,7 @@
                 break;
 
               case DT_STR:
-                XPUSHs (taint (sv_2mortal (newSVpv (va_arg (ap, char *), 0))));
+                XPUSHs (sv_2mortal (newSVpv (va_arg (ap, char *), 0)));
                 break;
 
               case DT_STR_LEN:
@@ -525,7 +517,7 @@
                   char *str = va_arg (ap, char *);
                   int len = va_arg (ap, int);
 
-                  XPUSHs (taint (sv_2mortal (newSVpvn (str, len))));
+                  XPUSHs (sv_2mortal (newSVpvn (str, len)));
                 }
                 break;
 
@@ -534,7 +526,7 @@
                   wchar_t *wstr = va_arg (ap, wchar_t *);
                   int wlen = va_arg (ap, int);
 
-                  XPUSHs (taint (sv_2mortal (wcs2sv (wstr, wlen))));
+                  XPUSHs (sv_2mortal (wcs2sv (wstr, wlen)));
                 }
                break;
 
@@ -781,24 +773,9 @@
 	CODE:
         rxvt_fatal ("%s", msg);
 
-SV *
-untaint (SV *sv)
-	CODE:
-        RETVAL = newSVsv (sv);
-        SvTAINTED_off (RETVAL);
-        OUTPUT:
-        RETVAL
-
 void
 _exit (int status)
 
-bool
-safe ()
-	CODE:
-        RETVAL = !rxvt_tainted ();
-        OUTPUT:
-        RETVAL
-
 NV
 NOW ()
 	CODE:
@@ -1073,7 +1050,7 @@
 
         free (wstr);
 
-        RETVAL = taint_if (newSVpv (mbstr, 0), str);
+        RETVAL = newSVpv (mbstr, 0);
         free (mbstr);
 }
 	OUTPUT:
@@ -1090,7 +1067,7 @@
         wchar_t *wstr = rxvt_mbstowcs (data, len);
         rxvt_pop_locale ();
 
-        RETVAL = taint_if (wcs2sv (wstr), octets);
+        RETVAL = wcs2sv (wstr);
         free (wstr);
 }
 	OUTPUT:
@@ -1252,7 +1229,7 @@
             for (int col = 0; col < THIS->ncol; col++)
               wstr [col] = l.t [col];
 
-            XPUSHs (taint (sv_2mortal (wcs2sv (wstr, THIS->ncol))));
+            XPUSHs (sv_2mortal (wcs2sv (wstr, THIS->ncol)));
 
             delete [] wstr;
           }
@@ -1383,7 +1360,7 @@
 
 	rxvt_pop_locale ();
 
-        RETVAL = taint_if (wcs2sv (rstr, r - rstr), string);
+        RETVAL = wcs2sv (rstr, r - rstr);
 
         delete [] rstr;
 }
@@ -1419,7 +1396,7 @@
           else
             *r++ = *s;
 
-        RETVAL = taint_if (wcs2sv (rstr, r - rstr), text);
+        RETVAL = wcs2sv (rstr, r - rstr);
 
         delete [] rstr;
 }
@@ -1451,7 +1428,7 @@
           croak ("requested out-of-bound resource %s+%d,", name, index - rs->value);
 
         if (GIMME_V != G_VOID)
-          XPUSHs (THIS->rs [index] ? sv_2mortal (taint (newSVpv (THIS->rs [index], 0))) : &PL_sv_undef);
+          XPUSHs (THIS->rs [index] ? sv_2mortal (newSVpv (THIS->rs [index], 0)) : &PL_sv_undef);
 
         if (newval)
           {
@@ -1468,8 +1445,6 @@
 
 const char *
 rxvt_term::x_resource (const char *name)
-	CLEANUP:
-        SvTAINTED_on (ST (0));
 
 bool
 rxvt_term::option (U32 optval, int set = -1)
@@ -1573,7 +1548,7 @@
 {
         if (GIMME_V != G_VOID)
           XPUSHs (THIS->selection.text
-                  ? taint (sv_2mortal (wcs2sv (THIS->selection.text, THIS->selection.len)))
+                  ? sv_2mortal (wcs2sv (THIS->selection.text, THIS->selection.len))
                   : &PL_sv_undef);
 
         if (newtext)