summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTim Rice <tim@multitalents.net>2005-08-15 14:52:50 -0700
committerTim Rice <tim@multitalents.net>2005-08-15 14:52:50 -0700
commit027e8b10f520866dccfff08afb6ff12cac20ac7f (patch)
tree58e7e86418355eda3912b8792bd18ef982bab2bc
parent0e2c1028583da14b61e311fdcf8859f4335fc3be (diff)
- (tim) wrap el_end() in #ifdef USE_LIBEDIT
-rw-r--r--ChangeLog5
-rw-r--r--sftp.c2
2 files changed, 6 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index ee165a21..e1c55082 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,6 @@
+20050815
+ - (tim) wrap el_end() in #ifdef USE_LIBEDIT
+
20050812
- (djm) OpenBSD CVS Sync
- markus@cvs.openbsd.org 2005/07/28 17:36:22
@@ -2932,4 +2935,4 @@
- (djm) Trim deprecated options from INSTALL. Mention UsePAM
- (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu
-$Id: ChangeLog,v 1.3871 2005/08/12 12:16:22 djm Exp $
+$Id: ChangeLog,v 1.3872 2005/08/15 21:52:50 tim Exp $
diff --git a/sftp.c b/sftp.c
index 0f1aa4b5..9f6c88fb 100644
--- a/sftp.c
+++ b/sftp.c
@@ -1355,8 +1355,10 @@ interactive_loop(int fd_in, int fd_out, char *file1, char *file2)
}
xfree(pwd);
+#ifdef USE_LIBEDIT
if (el != NULL)
el_end(el);
+#endif /* USE_LIBEDIT */
/* err == 1 signifies normal "quit" exit */
return (err >= 0 ? 0 : -1);