/*
- * Copyright (c) 2001 Damien Miller. All rights reserved.
+ * Copyright (c) 2001,2002 Damien Miller. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
#include "includes.h"
-RCSID("$OpenBSD: sftp.c,v 1.17 2001/05/08 19:45:25 mouring Exp $");
+RCSID("$OpenBSD: sftp.c,v 1.30 2002/06/23 09:30:14 deraadt Exp $");
-/* XXX: commandline mode */
/* XXX: short-form remote directory listings (like 'ls -C') */
#include "buffer.h"
char *__progname;
#endif
-char *ssh_program = _PATH_SSH_PROGRAM;
FILE* infile;
+size_t copy_buffer_len = 32768;
+size_t num_requests = 16;
-void
-connect_to_server(char **args, int *in, int *out, pid_t *sshpid)
+static void
+connect_to_server(char *path, char **args, int *in, int *out, pid_t *sshpid)
{
int c_in, c_out;
+
#ifdef USE_PIPES
int pin[2], pout[2];
+
if ((pipe(pin) == -1) || (pipe(pout) == -1))
fatal("pipe: %s", strerror(errno));
*in = pin[0];
c_out = pin[1];
#else /* USE_PIPES */
int inout[2];
+
if (socketpair(AF_UNIX, SOCK_STREAM, 0, inout) == -1)
fatal("socketpair: %s", strerror(errno));
*in = *out = inout[0];
close(*out);
close(c_in);
close(c_out);
- execv(ssh_program, args);
- fprintf(stderr, "exec: %s: %s\n", ssh_program, strerror(errno));
+ execv(path, args);
+ fprintf(stderr, "exec: %s: %s\n", path, strerror(errno));
exit(1);
}
close(c_out);
}
-void
+static void
usage(void)
{
- fprintf(stderr, "usage: sftp [-1vC] [-b batchfile] [-osshopt=value] [user@]host[:file [file]]\n");
+ extern char *__progname;
+
+ fprintf(stderr,
+ "usage: %s [-vC1] [-b batchfile] [-o option] [-s subsystem|path] [-B buffer_size]\n"
+ " [-F config] [-P direct server path] [-S program]\n"
+ " [user@]host[:file [file]]\n", __progname);
exit(1);
}
char *host, *userhost, *cp, *file2;
int debug_level = 0, sshver = 2;
char *file1 = NULL, *sftp_server = NULL;
+ char *ssh_program = _PATH_SSH_PROGRAM, *sftp_direct = NULL;
LogLevel ll = SYSLOG_LEVEL_INFO;
arglist args;
extern int optind;
__progname = get_progname(argv[0]);
args.list = NULL;
- addargs(&args, "ssh"); /* overwritten with ssh_program */
+ addargs(&args, "ssh"); /* overwritten with ssh_program */
addargs(&args, "-oFallBackToRsh no");
addargs(&args, "-oForwardX11 no");
addargs(&args, "-oForwardAgent no");
+ addargs(&args, "-oClearAllForwardings yes");
ll = SYSLOG_LEVEL_INFO;
infile = stdin; /* Read from STDIN unless changed by -b */
- while ((ch = getopt(argc, argv, "1hvCo:s:S:b:")) != -1) {
+ while ((ch = getopt(argc, argv, "1hvCo:s:S:b:B:F:P:R:")) != -1) {
switch (ch) {
case 'C':
addargs(&args, "-C");
}
debug_level++;
break;
+ case 'F':
case 'o':
- addargs(&args, "-o%s", optarg);
+ addargs(&args, "-%c%s", ch, optarg);
break;
case '1':
sshver = 1;
} else
fatal("Filename already specified.");
break;
+ case 'P':
+ sftp_direct = optarg;
+ break;
+ case 'B':
+ copy_buffer_len = strtol(optarg, &cp, 10);
+ if (copy_buffer_len == 0 || *cp != '\0')
+ fatal("Invalid buffer size \"%s\"", optarg);
+ break;
+ case 'R':
+ num_requests = strtol(optarg, &cp, 10);
+ if (num_requests == 0 || *cp != '\0')
+ fatal("Invalid number of requests \"%s\"",
+ optarg);
+ break;
case 'h':
default:
usage();
}
}
- if (optind == argc || argc > (optind + 2))
- usage();
+ log_init(argv[0], ll, SYSLOG_FACILITY_USER, 1);
- userhost = xstrdup(argv[optind]);
- file2 = argv[optind+1];
+ if (sftp_direct == NULL) {
+ if (optind == argc || argc > (optind + 2))
+ usage();
- if ((cp = colon(userhost)) != NULL) {
- *cp++ = '\0';
- file1 = cp;
- }
+ userhost = xstrdup(argv[optind]);
+ file2 = argv[optind+1];
- if ((host = strchr(userhost, '@')) == NULL)
- host = userhost;
- else {
- *host++ = '\0';
- if (!userhost[0]) {
- fprintf(stderr, "Missing username\n");
- usage();
+ if ((cp = colon(userhost)) != NULL) {
+ *cp++ = '\0';
+ file1 = cp;
}
- addargs(&args, "-l%s",userhost);
- }
- host = cleanhostname(host);
- if (!*host) {
- fprintf(stderr, "Missing hostname\n");
- usage();
- }
+ if ((host = strchr(userhost, '@')) == NULL)
+ host = userhost;
+ else {
+ *host++ = '\0';
+ if (!userhost[0]) {
+ fprintf(stderr, "Missing username\n");
+ usage();
+ }
+ addargs(&args, "-l%s",userhost);
+ }
- log_init(argv[0], ll, SYSLOG_FACILITY_USER, 1);
- addargs(&args, "-oProtocol %d", sshver);
+ host = cleanhostname(host);
+ if (!*host) {
+ fprintf(stderr, "Missing hostname\n");
+ usage();
+ }
- /* no subsystem if the server-spec contains a '/' */
- if (sftp_server == NULL || strchr(sftp_server, '/') == NULL)
- addargs(&args, "-s");
+ addargs(&args, "-oProtocol %d", sshver);
- addargs(&args, "%s", host);
- addargs(&args, "%s", (sftp_server != NULL ? sftp_server : "sftp"));
- args.list[0] = ssh_program;
+ /* no subsystem if the server-spec contains a '/' */
+ if (sftp_server == NULL || strchr(sftp_server, '/') == NULL)
+ addargs(&args, "-s");
- fprintf(stderr, "Connecting to %s...\n", host);
+ addargs(&args, "%s", host);
+ addargs(&args, "%s", (sftp_server != NULL ?
+ sftp_server : "sftp"));
+ args.list[0] = ssh_program;
- connect_to_server(args.list, &in, &out, &sshpid);
+ fprintf(stderr, "Connecting to %s...\n", host);
+ connect_to_server(ssh_program, args.list, &in, &out,
+ &sshpid);
+ } else {
+ args.list = NULL;
+ addargs(&args, "sftp-server");
+
+ fprintf(stderr, "Attaching to %s...\n", sftp_direct);
+ connect_to_server(sftp_direct, args.list, &in, &out,
+ &sshpid);
+ }
interactive_loop(in, out, file1, file2);
#if !defined(USE_PIPES)
- shutdown(in, SHUT_RDWR);
- shutdown(out, SHUT_RDWR);
+ shutdown(in, SHUT_RDWR);
+ shutdown(out, SHUT_RDWR);
#endif
close(in);
if (infile != stdin)
fclose(infile);
- if (waitpid(sshpid, NULL, 0) == -1)
- fatal("Couldn't wait for ssh process: %s", strerror(errno));
+ while (waitpid(sshpid, NULL, 0) == -1)
+ if (errno != EINTR)
+ fatal("Couldn't wait for ssh process: %s",
+ strerror(errno));
exit(0);
}