From: root <root>
Date: Fri, 22 Aug 2008 15:36:45 +0000 (+0000)
Subject: *** empty log message ***
X-Git-Url: http://git.openbox.org/?a=commitdiff_plain;h=a24d2891e4beaf183006aeb6ab2abe8b89216cb9;p=dana%2Furxvt.git

*** empty log message ***
---

diff --git a/Changes b/Changes
index ae16c3ac..96200c4a 100644
--- a/Changes
+++ b/Changes
@@ -21,6 +21,7 @@ DUMB: support tex fonts
 
 TODO:   /*TODO: the xlceararea/xfillrectangle below don't take scroll offste into account, ask mikachu for details */
 
+	- perl 5.10 needs PELR_SYS_INIT3 on hppa.
 	- ignore byte-order marks and do not treat them like combining characters.
         - fix build issue when CURSOR_BLINK is not defined (Emanuele Giaquinta).
         - do some µ-optimisations to the character fast path.
diff --git a/src/rxvtperl.xs b/src/rxvtperl.xs
index 8fbd6355..6cf7e833 100644
--- a/src/rxvtperl.xs
+++ b/src/rxvtperl.xs
@@ -312,6 +312,7 @@ rxvt_perl_interp::~rxvt_perl_interp ()
     {
       perl_destruct (perl);
       perl_free (perl);
+      PERL_SYS_TERM ();
     }
 }
 
@@ -325,7 +326,7 @@ rxvt_perl_interp::init (rxvt_term *term)
       perl_environ = rxvt_environ;
       swap (perl_environ, environ);
 
-      char *argv[] = {
+      char *args[] = {
         "",
         "-e"
         "BEGIN {"
@@ -335,11 +336,14 @@ rxvt_perl_interp::init (rxvt_term *term)
         ""
         "use urxvt;"
       };
+      int argc = sizeof (args) / sizeof (args[0]);
+      char **argv = args;
 
+      PERL_SYS_INIT3 (&argc, &argv, &environ);
       perl = perl_alloc ();
       perl_construct (perl);
 
-      if (perl_parse (perl, xs_init, 2, argv, (char **)NULL)
+      if (perl_parse (perl, xs_init, argc, argv, (char **)NULL)
           || perl_run (perl))
         {
           rxvt_warn ("unable to initialize perl-interpreter, continuing without.\n");