[Mon-commit] mon mon,1.4.2.3,1.4.2.4

[David N. <vi...@us...>]

Update of /cvsroot/mon/mon
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27938

Modified Files:
      Tag: mon-1-0-0pre1
	mon 
Log Message:
remove usage of parse_line in trap processing
(backported from mon 1.1 code)


Index: mon
===================================================================
RCS file: /cvsroot/mon/mon/mon,v
retrieving revision 1.4.2.3
retrieving revision 1.4.2.4
diff -C2 -d -r1.4.2.3 -r1.4.2.4
*** mon	18 Jun 2004 00:51:51 -0000	1.4.2.3
--- mon	18 Jun 2004 20:31:29 -0000	1.4.2.4
***************
*** 3732,3747 ****
  #
  
!     foreach my $l (split (/\n/, $buf))
      {
!     	if ($l =~ /^(\w+)=(.*)/)
  	{
  	    my $trap_val = $2;
  	    chomp $trap_val;
! 	    $trap{$1} = un_esc_str ((parse_line ('\s+', 0, $trap_val))[0]);
  	}
! 
  	else
  	{
! 	    syslog ('err', "unspecified tag in trap: $l");
  	}
      }
--- 3732,3749 ----
  #
  
!     foreach my $line (split (/\n/, $buf))
      {
! 	if ($line =~ /^(\w+)=(.*)/)
  	{
+ 	    my $trap_name = $1;
  	    my $trap_val = $2;
  	    chomp $trap_val;
! 	    $trap_val =~ s/^\'(.*)\'$/\1/;
! 	    $trap{$trap_name} = un_esc_str ($trap_val);
  	}
! 	
  	else
  	{
! 	    syslog ('err', "unspecified tag in trap: $line");
  	}
      }