ldapsh-cvs

[<po...@us...>]

Update of /cvsroot/ldapsh/ldapsh
In directory sc8-pr-cvs1:/tmp/cvs-serv19418

Modified Files:
	ldapsh 
Log Message:
Fix for readline-issues (patch 643018)

Index: ldapsh
===================================================================
RCS file: /cvsroot/ldapsh/ldapsh/ldapsh,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** ldapsh	13 Sep 2002 11:53:54 -0000	1.10
--- ldapsh	27 May 2003 12:00:38 -0000	1.11
***************
*** 207,220 ****
      _InitReadLine();
  
!     $SIG{INT} = \&_resetTermRealine;
  }
  
! sub _resetTermRealine() {
      if (_isGnuReadLine()) {
- 	$Term->crlf;
  	$Term->free_line_state();
  	$Term->cleanup_after_signal();
- 	$Term->reset_after_signal();
- 	$Term->forced_update_display();
      }
  }
--- 207,218 ----
      _InitReadLine();
  
!     $SIG{INT} = 'IGNORE';
!     $SIG{__DIE__} = \&_resetTermReadline;
  }
  
! sub _resetTermReadline() {
      if (_isGnuReadLine()) {
  	$Term->free_line_state();
  	$Term->cleanup_after_signal();
      }
  }
***************
*** 257,261 ****
  sub _debug(@) {
      printf STDERR "\nvvvvvvvvvvvvvvvv\n" . join('', map {"'$_'\n"} @_) . "^^^^^^^^^^^^^^^^\n";
-     _resetTermRealine();
  }
  
--- 255,258 ----
***************
*** 286,290 ****
  	print STDERR "Binding...\n";
  	bind;
- 	_resetTermRealine;
      }
      return 1 if defined($Globals->{_EFFECTIVECONNPARAMS}{VALUE}{BINDDN});
--- 283,286 ----
***************
*** 401,405 ****
      if ($substr =~ /^\s*$/) {
  	help();
- 	_resetTermRealine;
  	return 1;
      }
--- 397,400 ----
***************
*** 414,418 ****
  	my $cmd = reverse($1);
  	help($cmd);
- 	_resetTermRealine;
  	return 1;
      } else {
--- 409,412 ----
***************
*** 842,846 ****
      if ($result->is_error) {
          warn $result->error;
- 	_resetTermRealine;
          return 1;
      }
--- 836,839 ----
***************
*** 982,986 ****
  
  sub reset {
!     _resetTermRealine();
      $Term->crlf if _isGnuReadLine();
  }
--- 975,979 ----
  
  sub reset {
!     _resetTermReadline();
      $Term->crlf if _isGnuReadLine();
  }