[Nagios-checkins] nagios Changelog,1.128.2.7,1.128.2.8 p1.pl,1.7,1.7.2.1

[Ethan G. <ega...@us...>]

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

Modified Files:
      Tag: nagios-2-x-bugfixes
	Changelog p1.pl 
Log Message:
Bug fix for epn

Index: p1.pl
===================================================================
RCS file: /cvsroot/nagios/nagios/p1.pl,v
retrieving revision 1.7
retrieving revision 1.7.2.1
diff -C2 -d -r1.7 -r1.7.2.1
*** p1.pl	9 Jul 2005 20:55:33 -0000	1.7
--- p1.pl	21 Mar 2006 23:32:46 -0000	1.7.2.1
***************
*** 70,74 ****
  sub TIEHANDLE {
  	my ($class) = @_;
! 	my $me ;
  	bless \$me, $class;
  }
--- 70,74 ----
  sub TIEHANDLE {
  	my ($class) = @_;
! 	my $me = '';
  	bless \$me, $class;
  }
***************
*** 76,81 ****
  sub PRINT {
  	my $self = shift;
! 	$$self = substr(join('',@_), 0, 256) ;
! 	# $$self .= substr(join('',@_), 0, 256) ;
  }
  
--- 76,81 ----
  sub PRINT {
  	my $self = shift;
! 	# $$self = substr(join('',@_), 0, 256) ;
! 	$$self .= substr(join('',@_), 0, 256) ;
  }
  
***************
*** 83,94 ****
  	my $self = shift;
  	my $fmt = shift;
! 	$$self = substr(sprintf($fmt,@_), 0, 256) ;
! 	# $$self .= substr(sprintf($fmt,@_), 0, 256) ;
  }
  
  sub READLINE {
  	my $self = shift;
  								# Perl code other than plugins may print nothing; in this case return "(No output!)\n".
! 	return $$self ? $$self : "(No output!)\n" ;
  }
  
--- 83,96 ----
  	my $self = shift;
  	my $fmt = shift;
! 	# $$self = substr(sprintf($fmt,@_), 0, 256) ;
! 	$$self .= substr(sprintf($fmt,@_), 0, 256) ;
  }
  
  sub READLINE {
  	my $self = shift;
+ 								# Omit all lines after the first, per the nagios plugin guidelines
+         $$self = (split /\n/, $$self)[0];
  								# Perl code other than plugins may print nothing; in this case return "(No output!)\n".
! 	return $$self ? substr($$self, 0, 256) : "(No output!)\n" ;
  }
  

Index: Changelog
===================================================================
RCS file: /cvsroot/nagios/nagios/Changelog,v
retrieving revision 1.128.2.7
retrieving revision 1.128.2.8
diff -C2 -d -r1.128.2.7 -r1.128.2.8
*** Changelog	21 Mar 2006 22:21:51 -0000	1.128.2.7
--- Changelog	21 Mar 2006 23:32:46 -0000	1.128.2.8
***************
*** 15,18 ****
--- 15,19 ----
  * Bug fix with not deleting all comments associated with a service
  * Lowered max plugin output length from 348 to 332 chars to run on 64-bit systems without problems
+ * Minor fix to p1.pl for embedded Perl interpreter
  * Minor doc updates