[CVS] OpenPKG: openpkg-tools/cmd/ bf-ui.pl

[Thomas Lotterer]

  OpenPKG CVS Repository
  http://cvs.openpkg.org/
  ____________________________________________________________________________

  Server: cvs.openpkg.org                  Name:   Thomas Lotterer
  Root:   /v/openpkg/cvs                   Email:  [EMAIL PROTECTED]
  Module: openpkg-tools                    Date:   27-Sep-2005 14:38:31
  Branch: HEAD                             Handle: 2005092713383000

  Modified files:
    openpkg-tools/cmd       bf-ui.pl

  Log:
    cleanup printlog function

  Summary:
    Revision    Changes     Path
    1.17        +17 -17     openpkg-tools/cmd/bf-ui.pl
  ____________________________________________________________________________

  patch -p0 <<'@@ .'
  Index: openpkg-tools/cmd/bf-ui.pl
  ============================================================================
  $ cvs diff -u -r1.16 -r1.17 bf-ui.pl
  --- openpkg-tools/cmd/bf-ui.pl        22 Sep 2005 11:42:33 -0000      1.16
  +++ openpkg-tools/cmd/bf-ui.pl        27 Sep 2005 12:38:30 -0000      1.17
  @@ -899,29 +899,29 @@
   
   sub printlog()
   {
  -    my ($logfile, $mode) = @_;
  +    my ($relfile, $mode) = @_;
   
       my $html;
  -    if ($logfile =~ m|\.\.| or $logfile =~ m |^/|) {
  -        die "PANIC:$0: Intruder detected";
  -    }
   
  -    if ( -f "$shared/log/$logfile" and -r "$shared/log/$logfile" and -s 
"$shared/log/$logfile" ) {
  -        my $file;
  -        my $io = new IO::File "<$shared/log/$logfile" or die "unable to read 
logfile \"$logfile\"";
  -        $file .= $_ while (<$io>);
  +    die "PANIC:$0: Intruder detected - file" if ($relfile =~ m|\.\.| or 
$relfile =~ m |^/|);
  +
  +    my $absfile = "$shared/log/$relfile";
  +    if ( -f "$absfile" and -r "$absfile" and -s "$absfile" ) {
  +        my $data;
  +        my $io = new IO::File "<$absfile" or die "unable to read log 
\"$relfile\"";
  +        $data .= $_ while (<$io>);
           $io->close();
  -        $file =~ s|&|&amp;|sg;
  -        $file =~ s|<|&lt;|sg;
  -        $file =~ s|>|&gt;|sg;
  -        $file =~ s;^(Executing\((%|--).+?\):.*?)$;<b>$1</b>;mg;
  -        $file =~ s|^(\+[^\n]*)$|<font color="#333399">$1</font>|mg;
  -        $file =~ s;^(.*warn.*)$;<font color="#660000"><b>$1</b></font>;mgi;
  -        $file =~ 
s;^(.*(error|abort|fail|fatal|bad|illegal|invalid|usage|denied).*)$;<font 
color="#cc3333"><b>$1</b></font>;mgi;
  -        $html .= "<pre>\n$file\n</pre>\n";
  +        $data =~ s|&|&amp;|sg;
  +        $data =~ s|<|&lt;|sg;
  +        $data =~ s|>|&gt;|sg;
  +        $data =~ s;^(Executing\((%|--).+?\):.*?)$;<b>$1</b>;mg;
  +        $data =~ s|^(\+[^\n]*)$|<font color="#333399">$1</font>|mg;
  +        $data =~ s;^(.*warn.*)$;<font color="#660000"><b>$1</b></font>;mgi;
  +        $data =~ 
s;^(.*(error|abort|fail|fatal|bad|illegal|invalid|usage|denied).*)$;<font 
color="#cc3333"><b>$1</b></font>;mgi;
  +        $html .= "<pre>\n$data\n</pre>\n";
       }
       else {
  -        $html .= "Sorry, the logfile \"$logfile\" does not exist\n";
  +        $html .= "Sorry, the log \"$relfile\" does not exist\n";
       }
       print STDOUT $html;
   }
  @@ .
______________________________________________________________________
The OpenPKG Project                                    www.openpkg.org
CVS Repository Commit List                     openpkg-cvs@openpkg.org