diff options
| author | Damien Miller <djm@mindrot.org> | 2001-04-16 10:26:41 +0200 |
|---|---|---|
| committer | Damien Miller <djm@mindrot.org> | 2001-04-16 10:26:41 +0200 |
| commit | 21134b5b09ad480a2283f1b63c0c1e3a68515274 (patch) | |
| tree | 30267755775b3bebba8b8fe0bc627f1e95924c7b /sftp.c | |
| parent | - stevesk@cvs.openbsd.org 2001/04/15 21:28:35 (diff) | |
| download | openssh-21134b5b09ad480a2283f1b63c0c1e3a68515274.tar.xz openssh-21134b5b09ad480a2283f1b63c0c1e3a68515274.zip | |
- (djm) OpenBSD CVS Sync
- mouring@cvs.openbsd.org 2001/04/16 02:31:44
[scp.c sftp.c]
IPv6 support for sftp (which I bungled in my last patch) which is
borrowed from scp.c. Thanks to Markus@ for pointing it out.
Diffstat (limited to 'sftp.c')
| -rw-r--r-- | sftp.c | 8 |
1 files changed, 5 insertions, 3 deletions
@@ -24,10 +24,9 @@ #include "includes.h" -RCSID("$OpenBSD: sftp.c,v 1.14 2001/04/12 23:17:54 mouring Exp $"); +RCSID("$OpenBSD: sftp.c,v 1.15 2001/04/16 02:31:44 mouring Exp $"); /* XXX: commandline mode */ -/* XXX: copy between two remote hosts (commandline) */ /* XXX: short-form remote directory listings (like 'ls -C') */ #include "buffer.h" @@ -46,6 +45,8 @@ extern char *__progname; char *__progname; #endif +#include "scp-common.h" + int use_ssh1 = 0; char *ssh_program = _PATH_SSH_PROGRAM; char *sftp_server = NULL; @@ -209,7 +210,7 @@ main(int argc, char **argv) userhost = xstrdup(argv[optind]); file2 = argv[optind+1]; - if ((cp = strchr(userhost, ':')) != NULL) { + if ((cp = colon(userhost)) != NULL) { *cp++ = '\0'; file1 = cp; } @@ -226,6 +227,7 @@ main(int argc, char **argv) make_ssh_args(userhost); } + host = cleanhostname(host); if (!*host) { fprintf(stderr, "Missing hostname\n"); usage(); |