[LDAPsh-cvs] ldapsh ldapsh,1.54,1.55

[<j-d...@us...>]

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

Modified Files:
	ldapsh 
Log Message:
* Fix up warnings during non-psh operation.


Index: ldapsh
===================================================================
RCS file: /cvsroot/ldapsh/ldapsh/ldapsh,v
retrieving revision 1.54
retrieving revision 1.55
diff -C2 -d -r1.54 -r1.55
*** ldapsh	13 Mar 2004 10:59:19 -0000	1.54
--- ldapsh	19 Mar 2004 12:18:18 -0000	1.55
***************
*** 397,402 ****
  };
  
  our ($COLUMNS, $CONNPARAMS, $CWD, $DNSEP, $EDITOR, $ENTRIES, $G, $LDAPCONN, $OLDWD, $PROMPT, $LASTFILE);
! our ($LDAPSH_PARSER, $PERL_RL); # read-only values
  my ($Term, $TermAttribs, $OffLine);
  
--- 397,408 ----
  };
  
+ # read/write values
  our ($COLUMNS, $CONNPARAMS, $CWD, $DNSEP, $EDITOR, $ENTRIES, $G, $LDAPCONN, $OLDWD, $PROMPT, $LASTFILE);
! use vars qw($COLUMNS $CONNPARAMS $CWD $DNSEP $EDITOR $ENTRIES $G $LDAPCONN $OLDWD $PROMPT $LASTFILE);
! 
! # read-only values
! our ($LDAPSH_PARSER, $PERL_RL);
! use vars qw($LDAPSH_PARSER $PERL_RL);
! 
  my ($Term, $TermAttribs, $OffLine);
  
***************
*** 725,729 ****
  		my @dots = split(m{[,/]}, $1);
  		my @dn = reverse _splitdn($2, 0);
! 		my @pwd = _splitdn($CWD, 0);
  		while(scalar(@dots)) {
  			if (shift(@dots) =~ /^\.\.$/) {
--- 731,735 ----
  		my @dots = split(m{[,/]}, $1);
  		my @dn = reverse _splitdn($2, 0);
! 		my @pwd = _splitdn($Globals->{CWD}{VALUE}, 0);
  		while(scalar(@dots)) {
  			if (shift(@dots) =~ /^\.\.$/) {
***************
*** 2169,2174 ****
  	my ($fh, $tempfile);
  	if ($localArgs{X}) {
! 		if (defined($LASTFILE)) {
! 			$tempfile = $LASTFILE;
  			$fh = undef;
  		}
--- 2175,2180 ----
  	my ($fh, $tempfile);
  	if ($localArgs{X}) {
! 		if (length($Globals->{LASTFILE}{VALUE})) {
! 			$tempfile = $Globals->{LASTFILE}{VALUE};
  			$fh = undef;
  		}
***************
*** 2184,2188 ****
  		my @parts = _splitdn($dn,2);
  		if (scalar(@parts) == 1) {
! 			print $fh "dn: $dn, $CWD\n";
  		}
  		else {
--- 2190,2194 ----
  		my @parts = _splitdn($dn,2);
  		if (scalar(@parts) == 1) {
! 			print $fh "dn: $dn, ".$Globals->{CWD}{VALUE}."\n";
  		}
  		else {
***************
*** 2262,2266 ****
  	}
  
! 	$LASTFILE = undef;
  
  	my $mtime = (stat($tempfile))[9];
--- 2268,2272 ----
  	}
  
! 	$Globals->{LASTFILE}{VALUE} = undef;
  
  	my $mtime = (stat($tempfile))[9];
***************
*** 2302,2306 ****
  				}
  				else {
! 					$LASTFILE = $tempfile;
  					print STDERR "LDIF stored in $tempfile\n\n";
  				}
--- 2308,2312 ----
  				}
  				else {
! 					$Globals->{LASTFILE}{VALUE} = $tempfile;
  					print STDERR "LDIF stored in $tempfile\n\n";
  				}
***************
*** 2330,2334 ****
  	if ($cleanup) {
  		if ($localArgs{k}) {
! 			$LASTFILE = $tempfile;
  			print STDERR "LDIF stored in $tempfile\n\n";
  		}
--- 2336,2340 ----
  	if ($cleanup) {
  		if ($localArgs{k}) {
! 			$Globals->{LASTFILE}{VALUE} = $tempfile;
  			print STDERR "LDIF stored in $tempfile\n\n";
  		}
***************
*** 2342,2346 ****
  		}
  		else {
! 			$LASTFILE = $tempfile;
  			print STDERR "LDIF stored in $tempfile\n\n";
  		}
--- 2348,2352 ----
  		}
  		else {
! 			$Globals->{LASTFILE}{VALUE} = $tempfile;
  			print STDERR "LDIF stored in $tempfile\n\n";
  		}
***************
*** 2528,2532 ****
  =cut
  
! sub rename($$) {
  	my ($from, $to) = @_;
  	$from = "objectclass=*" if ($from eq "*");
--- 2534,2538 ----
  =cut
  
! sub rename {
  	my ($from, $to) = @_;
  	$from = "objectclass=*" if ($from eq "*");