[Mon-commit] monperl/Mon Client.pm,1.1.1.1,1.2 Protocol.pm,1.1.1.1,1.2

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

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

Modified Files:
	Client.pm Protocol.pm 
Log Message:
Removed all usage of Text::ParseWords, and changed the escaping helper
functions to escape the space character (ASCII 32).


Index: Protocol.pm
===================================================================
RCS file: /cvsroot/mon/monperl/Mon/Protocol.pm,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** Protocol.pm	14 Jun 2004 12:51:05 -0000	1.1.1.1
--- Protocol.pm	14 Jun 2004 13:25:03 -0000	1.2
***************
*** 101,105 ****
  use IO::File;
  use Socket;
- use Text::ParseWords;
  
  sub new;
--- 101,104 ----
***************
*** 326,330 ****
  # if $inquotes is true, backslashes are doubled, making
  #       the escaped string suitable to be enclosed in
! #       single quotes and later passed to Text::quotewords.
  #       For example,   var='quoted value'
  #
--- 325,329 ----
  # if $inquotes is true, backslashes are doubled, making
  #       the escaped string suitable to be enclosed in
! #       single quotes and later passed to split
  #       For example,   var='quoted value'
  #
***************
*** 339,343 ****
      	my $c = substr ($str, $i, 1);
  
! 	if (ord ($c) < 32 ||
  	    ord ($c) > 126 ||
  	    $c eq "\"" ||
--- 338,342 ----
      	my $c = substr ($str, $i, 1);
  
! 	if (ord ($c) <= 32 ||
  	    ord ($c) > 126 ||
  	    $c eq "\"" ||

Index: Client.pm
===================================================================
RCS file: /cvsroot/mon/monperl/Mon/Client.pm,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** Client.pm	14 Jun 2004 12:51:05 -0000	1.1.1.1
--- Client.pm	14 Jun 2004 13:25:03 -0000	1.2
***************
*** 29,33 ****
  use IO::File;
  use Socket;
- use Text::ParseWords;
  
  use vars qw(@ISA @EXPORT_OK);
--- 29,32 ----
***************
*** 596,600 ****
  	($group, $service, $desc) = split (/\s+/, $d, 3);
  	$desc{$group}{$service} =
! 	    _un_esc_str ((parse_line ('\s+', 0, $desc))[0]);
      }
  
--- 595,599 ----
  	($group, $service, $desc) = split (/\s+/, $d, 3);
  	$desc{$group}{$service} =
! 	    _un_esc_str (split /\s+/, $desc, 1);
      }
  
***************
*** 632,636 ****
  	if ($what eq "exp") {
  	    $dep{$group}->{$service}->{"expression"} =
! 	    	_un_esc_str ((parse_line ('\s+', 0, $l))[0]);
  
  	} elsif ($what eq "cmp") {
--- 631,635 ----
  	if ($what eq "exp") {
  	    $dep{$group}->{$service}->{"expression"} =
! 	        _un_esc_str (split /\s+/, $l, 1);
  
  	} elsif ($what eq "cmp") {
***************
*** 1164,1168 ****
      $var =~ s/^[^=]*=//;
  
!     return _un_esc_str ((parse_line ('\s+', 0, $var))[0]);
  }
  
--- 1163,1167 ----
      $var =~ s/^[^=]*=//;
  
!     return _un_esc_str (split /\s+/, $var, 1);
  }
  
***************
*** 1654,1658 ****
      	my $c = substr ($str, $i, 1);
  
! 	if (ord ($c) < 32 ||
  	    ord ($c) > 126 ||
  	    $c eq "\"" ||
--- 1653,1657 ----
      	my $c = substr ($str, $i, 1);
  
! 	if (ord ($c) <= 32 ||
  	    ord ($c) > 126 ||
  	    $c eq "\"" ||