[ViewVC] Diff of: cvs/deliantra/server/lib/cf.pm

Comparing deliantra/server/lib/cf.pm (file contents):
Revision 1.41 by root, Fri Aug 25 15:25:12 2006 UTC vs.
Revision 1.42 by root, Fri Aug 25 15:31:44 2006 UTC

 }
 #############################################################################
 # map scripting support
-our $safe = new Safe "ext";
+our $safe = new Safe "safe";
 our $safe_hole = new Safe::Hole;
 $SIG{FPE} = 'IGNORE';
 $safe->permit_only (Opcode::opset qw(:base_core :base_mem :base_orig :base_math sort time));
    $qcode =~ s/\n/\\n/g;
    local $_;
    local @safe::cf::_safe_eval_args = values %vars;
-   $code =
+   my $eval =
       "do {\n"
       . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n"
       . "#line 0 \"{$qcode}\"\n"
       . $code
       . "\n}"
    ;
    sub_generation_inc;
-   my @res = wantarray ? $safe->reval ($code) : scalar $safe->reval ($code);
+   my @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval);
    sub_generation_inc;
+   if ($@) {
+      warn "$@";
+      warn "while executing safe code '$code'\n";
+      warn "with arguments " . (join " ", %vars) . "\n";
+   }
    wantarray ? @res : $res[0]
 }
 sub register_script_function {

-–
+Removed lines
-+
+Added lines
-<
+Changed lines
->
+Changed lines