=================================================================== RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/ssh/sftp.c,v retrieving revision 1.7.2.6 retrieving revision 1.8 diff -u -r1.7.2.6 -r1.8 --- src/usr.bin/ssh/sftp.c 2002/03/08 17:04:43 1.7.2.6 +++ src/usr.bin/ssh/sftp.c 2001/02/28 05:36:28 1.8 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2001,2002 Damien Miller. All rights reserved. + * Copyright (c) 2001 Damien Miller. All rights reserved. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions @@ -24,27 +24,28 @@ #include "includes.h" -RCSID("$OpenBSD: sftp.c,v 1.7.2.6 2002/03/08 17:04:43 brad Exp $"); +RCSID("$OpenBSD: sftp.c,v 1.8 2001/02/28 05:36:28 deraadt Exp $"); +/* XXX: commandline mode */ +/* XXX: copy between two remote hosts (commandline) */ /* XXX: short-form remote directory listings (like 'ls -C') */ #include "buffer.h" #include "xmalloc.h" #include "log.h" #include "pathnames.h" -#include "misc.h" #include "sftp.h" #include "sftp-common.h" #include "sftp-client.h" #include "sftp-int.h" -FILE* infile; -size_t copy_buffer_len = 32768; -size_t num_requests = 16; +int use_ssh1 = 0; +char *ssh_program = _PATH_SSH_PROGRAM; +char *sftp_server = NULL; -static void -connect_to_server(char *path, char **args, int *in, int *out, pid_t *sshpid) +void +connect_to_server(char **args, int *in, int *out, pid_t *sshpid) { int c_in, c_out; #ifdef USE_PIPES @@ -75,8 +76,8 @@ close(*out); close(c_in); close(c_out); - execv(path, args); - fprintf(stderr, "exec: %s: %s\n", path, strerror(errno)); + execv(ssh_program, args); + fprintf(stderr, "exec: %s: %s\n", ssh_program, strerror(errno)); exit(1); } @@ -84,59 +85,94 @@ close(c_out); } -static void +char ** +make_ssh_args(char *add_arg) +{ + static char **args = NULL; + static int nargs = 0; + char debug_buf[4096]; + int i, use_subsystem = 1; + + /* no subsystem if protocol 1 or the server-spec contains a '/' */ + if (use_ssh1 || + (sftp_server != NULL && strchr(sftp_server, '/') != NULL)) + use_subsystem = 0; + + /* Init args array */ + if (args == NULL) { + nargs = use_subsystem ? 6 : 5; + i = 0; + args = xmalloc(sizeof(*args) * nargs); + args[i++] = "ssh"; + args[i++] = use_ssh1 ? "-oProtocol=1" : "-oProtocol=2"; + if (use_subsystem) + args[i++] = "-s"; + args[i++] = "-oForwardAgent=no"; + args[i++] = "-oForwardX11=no"; + args[i++] = NULL; + } + + /* If asked to add args, then do so and return */ + if (add_arg) { + i = nargs++ - 1; + args = xrealloc(args, sizeof(*args) * nargs); + args[i++] = add_arg; + args[i++] = NULL; + return(NULL); + } + + /* Otherwise finish up and return the arg array */ + if (sftp_server != NULL) + make_ssh_args(sftp_server); + else + make_ssh_args("sftp"); + + /* XXX: overflow - doesn't grow debug_buf */ + debug_buf[0] = '\0'; + for(i = 0; args[i]; i++) { + if (i) + strlcat(debug_buf, " ", sizeof(debug_buf)); + + strlcat(debug_buf, args[i], sizeof(debug_buf)); + } + debug("SSH args \"%s\"", debug_buf); + + return(args); +} + +void usage(void) { - 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); + fprintf(stderr, "usage: sftp [-1vC] [-osshopt=value] [user@]host\n"); exit(1); } int main(int argc, char **argv) { - int in, out, ch; + int in, out, ch, debug_level, compress_flag; pid_t sshpid; - 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; + char *host, *userhost; + LogLevel ll; extern int optind; extern char *optarg; - args.list = NULL; - 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 */ + debug_level = compress_flag = 0; - while ((ch = getopt(argc, argv, "1hvCo:s:S:b:B:F:P:R:")) != -1) { + while ((ch = getopt(argc, argv, "1hvCo:s:S:")) != -1) { switch (ch) { case 'C': - addargs(&args, "-C"); + compress_flag = 1; break; case 'v': - if (debug_level < 3) { - addargs(&args, "-v"); - ll = SYSLOG_LEVEL_DEBUG1 + debug_level; - } - debug_level++; + debug_level = MIN(3, debug_level + 1); break; - case 'F': case 'o': - addargs(&args, "-%c%s", ch, optarg); + make_ssh_args("-o"); + make_ssh_args(optarg); break; case '1': - sshver = 1; + use_ssh1 = 1; if (sftp_server == NULL) sftp_server = _PATH_SFTP_SERVER; break; @@ -146,93 +182,72 @@ case 'S': ssh_program = optarg; break; - case 'b': - if (infile == stdin) { - infile = fopen(optarg, "r"); - if (infile == NULL) - fatal("%s (%s).", strerror(errno), optarg); - } 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 (sftp_direct == NULL) { - if (optind == argc || argc > (optind + 2)) - usage(); + if (optind == argc || argc > (optind + 1)) + usage(); - userhost = xstrdup(argv[optind]); - file2 = argv[optind+1]; + userhost = argv[optind]; - if ((cp = colon(userhost)) != NULL) { - *cp++ = '\0'; - file1 = cp; + if ((host = strchr(userhost, '@')) == NULL) + host = userhost; + else { + *host = '\0'; + if (!userhost[0]) { + fprintf(stderr, "Missing username\n"); + usage(); } + make_ssh_args("-l"); + make_ssh_args(userhost); + host++; + } - if ((host = strchr(userhost, '@')) == NULL) - host = userhost; - else { - *host++ = '\0'; - if (!userhost[0]) { - fprintf(stderr, "Missing username\n"); - usage(); - } - addargs(&args, "-l%s",userhost); - } + if (!*host) { + fprintf(stderr, "Missing hostname\n"); + usage(); + } - host = cleanhostname(host); - if (!*host) { - fprintf(stderr, "Missing hostname\n"); - usage(); - } + /* Set up logging and debug '-d' arguments to ssh */ + ll = SYSLOG_LEVEL_INFO; + switch (debug_level) { + case 1: + ll = SYSLOG_LEVEL_DEBUG1; + make_ssh_args("-v"); + break; + case 2: + ll = SYSLOG_LEVEL_DEBUG2; + make_ssh_args("-v"); + make_ssh_args("-v"); + break; + case 3: + ll = SYSLOG_LEVEL_DEBUG3; + make_ssh_args("-v"); + make_ssh_args("-v"); + make_ssh_args("-v"); + break; + } - log_init(argv[0], ll, SYSLOG_FACILITY_USER, 1); - addargs(&args, "-oProtocol %d", sshver); + if (compress_flag) + make_ssh_args("-C"); - /* no subsystem if the server-spec contains a '/' */ - if (sftp_server == NULL || strchr(sftp_server, '/') == NULL) - addargs(&args, "-s"); + log_init(argv[0], ll, SYSLOG_FACILITY_USER, 1); - addargs(&args, "%s", host); - addargs(&args, "%s", (sftp_server != NULL ? - sftp_server : "sftp")); - args.list[0] = ssh_program; + make_ssh_args(host); - 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, "Connecting to %s...\n", host); - fprintf(stderr, "Attaching to %s...\n", sftp_direct); - connect_to_server(sftp_direct, args.list, &in, &out, - &sshpid); - } + connect_to_server(make_ssh_args(NULL), &in, &out, &sshpid); - interactive_loop(in, out, file1, file2); + do_init(in, out); + interactive_loop(in, out); + close(in); close(out); - if (infile != stdin) - fclose(infile); if (waitpid(sshpid, NULL, 0) == -1) fatal("Couldn't wait for ssh process: %s", strerror(errno));