- deraadt@cvs.openbsd.org 2002/07/06 01:00:49

[openssh.git] / sftp.c

diff --git a/sftp.c b/sftp.c
index c2282b5025a5239ee5d33134da1e96a4eb1f9f67..fac2564ded5d0244ee0f78242477abad100cbd11 100644 (file)
--- a/sftp.c
+++ b/sftp.c
@@ -24,7 +24,7 @@
 
 #include "includes.h"
 
-RCSID("$OpenBSD: sftp.c,v 1.24 2002/02/05 00:00:46 djm Exp $");
+RCSID("$OpenBSD: sftp.c,v 1.30 2002/06/23 09:30:14 deraadt Exp $");
 
 /* XXX: short-form remote directory listings (like 'ls -C') */
 
@@ -47,13 +47,16 @@ char *__progname;
 
 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)
 {
        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];
@@ -62,6 +65,7 @@ connect_to_server(char *path, char **args, int *in, int *out, pid_t *sshpid)
        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];
@@ -92,10 +96,12 @@ connect_to_server(char *path, char **args, int *in, int *out, pid_t *sshpid)
 static void
 usage(void)
 {
+       extern char *__progname;
+
        fprintf(stderr,
-           "usage: sftp [-1Cv] [-b batchfile] [-F config] [-o option] [-s subsystem|path]\n"
-           "            [-P direct server path] [-S program] \n"
-           "            [-B buffer_size] [user@]host[:file [file]]\n");
+           "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);
 }
 
@@ -123,7 +129,7 @@ main(int argc, char **argv)
        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:")) != -1) {
+       while ((ch = getopt(argc, argv, "1hvCo:s:S:b:B:F:P:R:")) != -1) {
                switch (ch) {
                case 'C':
                        addargs(&args, "-C");
@@ -166,12 +172,20 @@ main(int argc, char **argv)
                        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 (sftp_direct == NULL) {
                if (optind == argc || argc > (optind + 2))
                        usage();
@@ -201,7 +215,6 @@ main(int argc, char **argv)
                        usage();
                }
 
-               log_init(argv[0], ll, SYSLOG_FACILITY_USER, 1);
                addargs(&args, "-oProtocol %d", sshver);
 
                /* no subsystem if the server-spec contains a '/' */
@@ -209,27 +222,27 @@ main(int argc, char **argv)
                        addargs(&args, "-s");
 
                addargs(&args, "%s", host);
-               addargs(&args, "%s", (sftp_server != NULL ? 
+               addargs(&args, "%s", (sftp_server != NULL ?
                    sftp_server : "sftp"));
                args.list[0] = ssh_program;
 
                fprintf(stderr, "Connecting to %s...\n", host);
-               connect_to_server(ssh_program, args.list, &in, &out, 
+               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, 
+               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);
@@ -237,8 +250,10 @@ main(int argc, char **argv)
        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);
 }