summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDarren Tucker <dtucker@zip.com.au>2010-01-08 19:56:33 +1100
committerDarren Tucker <dtucker@zip.com.au>2010-01-08 19:56:33 +1100
commit843f0fa16d7e8aca36c1b14d933da2a1844d5a74 (patch)
treedbee363b5f51c7a279a3d687831c0c4fd2369ac2
parent1f5e3dc274fe4616435ff451b5216b5bde217c0d (diff)
- (dtucker) [sftp.c] Expand ifdef for libedit to cover complete_is_remote
too.
-rw-r--r--ChangeLog2
-rw-r--r--sftp.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 440c8318e..60162c088 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -161,6 +161,8 @@
161 don't have libedit. 161 don't have libedit.
162 - (dtucker) [configure.ac misc.c readconf.c servconf.c ssh-keyscan.c] Make 162 - (dtucker) [configure.ac misc.c readconf.c servconf.c ssh-keyscan.c] Make
163 RoutingDomain an unsupported option on platforms that don't have it. 163 RoutingDomain an unsupported option on platforms that don't have it.
164 - (dtucker) [sftp.c] Expand ifdef for libedit to cover complete_is_remote
165 too.
164 166
16520091226 16720091226
166 - (tim) [contrib/cygwin/Makefile] Install ssh-copy-id and ssh-copy-id.1 168 - (tim) [contrib/cygwin/Makefile] Install ssh-copy-id and ssh-copy-id.1
diff --git a/sftp.c b/sftp.c
index c994887e3..4b12fae4b 100644
--- a/sftp.c
+++ b/sftp.c
@@ -1645,7 +1645,6 @@ complete_cmd_parse(EditLine *el, char *cmd, int lastarg, char quote,
1645 1645
1646 return count; 1646 return count;
1647} 1647}
1648#endif
1649 1648
1650/* 1649/*
1651 * Determine whether a particular sftp command's arguments (if any) 1650 * Determine whether a particular sftp command's arguments (if any)
@@ -1666,7 +1665,6 @@ complete_is_remote(char *cmd) {
1666 return -1; 1665 return -1;
1667} 1666}
1668 1667
1669#ifdef USE_LIBEDIT
1670/* Autocomplete a filename "file" */ 1668/* Autocomplete a filename "file" */
1671static int 1669static int
1672complete_match(EditLine *el, struct sftp_conn *conn, char *remote_path, 1670complete_match(EditLine *el, struct sftp_conn *conn, char *remote_path,