=================================================================== RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/ssh/sftp.c,v retrieving revision 1.21.2.4 retrieving revision 1.22 diff -u -r1.21.2.4 -r1.22 --- src/usr.bin/ssh/sftp.c 2002/10/11 14:53:07 1.21.2.4 +++ src/usr.bin/ssh/sftp.c 2001/12/19 07:18:56 1.22 @@ -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,8 +24,9 @@ #include "includes.h" -RCSID("$OpenBSD: sftp.c,v 1.21.2.4 2002/10/11 14:53:07 miod Exp $"); +RCSID("$OpenBSD: sftp.c,v 1.22 2001/12/19 07:18:56 deraadt Exp $"); +/* XXX: commandline mode */ /* XXX: short-form remote directory listings (like 'ls -C') */ #include "buffer.h" @@ -39,18 +40,15 @@ #include "sftp-client.h" #include "sftp-int.h" +char *ssh_program = _PATH_SSH_PROGRAM; FILE* infile; -size_t copy_buffer_len = 32768; -size_t num_requests = 16; static void -connect_to_server(char *path, char **args, int *in, int *out, pid_t *sshpid) +connect_to_server(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]; @@ -59,7 +57,6 @@ 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]; @@ -78,8 +75,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); } @@ -90,12 +87,9 @@ static 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); + "usage: sftp [-1Cv] [-b batchfile] [-F config] [-o option] [-s subsystem|path]\n" + " [-S program] [user@]host[:file [file]]\n"); exit(1); } @@ -107,7 +101,6 @@ 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; @@ -115,13 +108,14 @@ 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 */ - while ((ch = getopt(argc, argv, "1hvCo:s:S:b:B:F:P:R:")) != -1) { + while ((ch = getopt(argc, argv, "1hvCo:s:S:b:F:")) != -1) { switch (ch) { case 'C': addargs(&args, "-C"); @@ -156,80 +150,55 @@ } 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(); } } - log_init(argv[0], ll, SYSLOG_FACILITY_USER, 1); + if (optind == argc || argc > (optind + 2)) + usage(); - if (sftp_direct == NULL) { - if (optind == argc || argc > (optind + 2)) - usage(); + userhost = xstrdup(argv[optind]); + file2 = argv[optind+1]; - userhost = xstrdup(argv[optind]); - file2 = argv[optind+1]; + if ((cp = colon(userhost)) != NULL) { + *cp++ = '\0'; + file1 = cp; + } - 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(); - } - addargs(&args, "-l%s",userhost); - } - - host = cleanhostname(host); - if (!*host) { - fprintf(stderr, "Missing hostname\n"); + if ((host = strchr(userhost, '@')) == NULL) + host = userhost; + else { + *host++ = '\0'; + if (!userhost[0]) { + fprintf(stderr, "Missing username\n"); usage(); } + addargs(&args, "-l%s",userhost); + } - 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"); + log_init(argv[0], ll, SYSLOG_FACILITY_USER, 1); + 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); - connect_to_server(ssh_program, args.list, &in, &out, - &sshpid); - } else { - args.list = NULL; - addargs(&args, "sftp-server"); + addargs(&args, "%s", host); + addargs(&args, "%s", (sftp_server != NULL ? sftp_server : "sftp")); + args.list[0] = ssh_program; - fprintf(stderr, "Attaching to %s...\n", sftp_direct); - connect_to_server(sftp_direct, args.list, &in, &out, - &sshpid); - } + fprintf(stderr, "Connecting to %s...\n", host); + connect_to_server(args.list, &in, &out, &sshpid); + interactive_loop(in, out, file1, file2); close(in); @@ -237,10 +206,8 @@ if (infile != stdin) fclose(infile); - while (waitpid(sshpid, NULL, 0) == -1) - if (errno != EINTR) - fatal("Couldn't wait for ssh process: %s", - strerror(errno)); + if (waitpid(sshpid, NULL, 0) == -1) + fatal("Couldn't wait for ssh process: %s", strerror(errno)); exit(0); }