- jakob@cvs.openbsd.org 2001/08/02 16:14:05

[openssh.git] / sftp-client.c

diff --git a/sftp-client.c b/sftp-client.c
index 9f77d366ccf9d3d698c5cfeec46c853aed4cb503..4f2a1e2800840406be251e3554126e1235b732f3 100644 (file)
--- a/sftp-client.c
+++ b/sftp-client.c
@@ -29,16 +29,14 @@
 /* XXX: copy between two remote sites */
 
 #include "includes.h"
-RCSID("$OpenBSD: sftp-client.c,v 1.12 2001/03/13 22:42:54 djm Exp $");
+RCSID("$OpenBSD: sftp-client.c,v 1.18 2001/07/14 15:10:16 stevesk Exp $");
 
-#include "ssh.h"
 #include "buffer.h"
 #include "bufaux.h"
 #include "getput.h"
 #include "xmalloc.h"
 #include "log.h"
 #include "atomicio.h"
-#include "pathnames.h"
 
 #include "sftp.h"
 #include "sftp-common.h"
@@ -51,7 +49,7 @@ RCSID("$OpenBSD: sftp-client.c,v 1.12 2001/03/13 22:42:54 djm Exp $");
 /* Message ID */
 static u_int msg_id = 1;
 
-void
+static void
 send_msg(int fd, Buffer *m)
 {
        int mlen = buffer_len(m);
@@ -70,14 +68,16 @@ send_msg(int fd, Buffer *m)
        buffer_free(&oqueue);
 }
 
-void
+static void
 get_msg(int fd, Buffer *m)
 {
        u_int len, msg_len;
        unsigned char buf[4096];
 
        len = atomicio(read, fd, buf, 4);
-       if (len != 4)
+       if (len == 0)
+               fatal("Connection closed");
+       else if (len == -1)
                fatal("Couldn't read packet: %s", strerror(errno));
 
        msg_len = GET_32BIT(buf);
@@ -86,7 +86,9 @@ get_msg(int fd, Buffer *m)
 
        while (msg_len) {
                len = atomicio(read, fd, buf, MIN(msg_len, sizeof(buf)));
-               if (len <= 0)
+               if (len == 0)
+                       fatal("Connection closed");
+               else if (len == -1)
                        fatal("Couldn't read packet: %s", strerror(errno));
 
                msg_len -= len;
@@ -94,7 +96,7 @@ get_msg(int fd, Buffer *m)
        }
 }
 
-void
+static void
 send_string_request(int fd, u_int id, u_int code, char *s,
     u_int len)
 {
@@ -109,7 +111,7 @@ send_string_request(int fd, u_int id, u_int code, char *s,
        buffer_free(&msg);
 }
 
-void
+static void
 send_string_attrs_request(int fd, u_int id, u_int code, char *s,
     u_int len, Attrib *a)
 {
@@ -125,7 +127,7 @@ send_string_attrs_request(int fd, u_int id, u_int code, char *s,
        buffer_free(&msg);
 }
 
-u_int
+static u_int
 get_status(int fd, int expected_id)
 {
        Buffer msg;
@@ -150,7 +152,7 @@ get_status(int fd, int expected_id)
        return(status);
 }
 
-char *
+static char *
 get_handle(int fd, u_int expected_id, u_int *len)
 {
        Buffer msg;
@@ -179,8 +181,8 @@ get_handle(int fd, u_int expected_id, u_int *len)
        return(handle);
 }
 
-Attrib *
-get_decode_stat(int fd, u_int expected_id)
+static Attrib *
+get_decode_stat(int fd, u_int expected_id, int quiet)
 {
        Buffer msg;
        u_int type, id;
@@ -198,7 +200,10 @@ get_decode_stat(int fd, u_int expected_id)
        if (type == SSH2_FXP_STATUS) {
                int status = buffer_get_int(&msg);
 
-               error("Couldn't stat remote file: %s", fx2txt(status));
+               if (quiet)
+                       debug("Couldn't stat remote file: %s", fx2txt(status));
+               else
+                       error("Couldn't stat remote file: %s", fx2txt(status));
                return(NULL);
        } else if (type != SSH2_FXP_ATTRS) {
                fatal("Expected SSH2_FXP_ATTRS(%d) packet, got %d",
@@ -276,12 +281,12 @@ do_close(int fd_in, int fd_out, char *handle, u_int handle_len)
 }
 
 
-int
-do_lsreaddir(int fd_in, int fd_out, char *path, int printflag, 
+static int
+do_lsreaddir(int fd_in, int fd_out, char *path, int printflag,
     SFTP_DIRENT ***dir)
 {
        Buffer msg;
-       u_int type, id, handle_len, i, expected_id, ents;
+       u_int type, id, handle_len, i, expected_id, ents = 0;
        char *handle;
 
        id = msg_id++;
@@ -363,7 +368,7 @@ do_lsreaddir(int fd_in, int fd_out, char *path, int printflag,
                                printf("%s\n", longname);
 
                        if (dir) {
-                               *dir = xrealloc(*dir, sizeof(**dir) * 
+                               *dir = xrealloc(*dir, sizeof(**dir) *
                                    (ents + 2));
                                (*dir)[ents] = xmalloc(sizeof(***dir));
                                (*dir)[ents]->filename = xstrdup(filename);
@@ -455,34 +460,33 @@ do_rmdir(int fd_in, int fd_out, char *path)
 }
 
 Attrib *
-do_stat(int fd_in, int fd_out, char *path)
+do_stat(int fd_in, int fd_out, char *path, int quiet)
 {
        u_int id;
 
        id = msg_id++;
        send_string_request(fd_out, id, SSH2_FXP_STAT, path, strlen(path));
-       return(get_decode_stat(fd_in, id));
+       return(get_decode_stat(fd_in, id, quiet));
 }
 
 Attrib *
-do_lstat(int fd_in, int fd_out, char *path)
+do_lstat(int fd_in, int fd_out, char *path, int quiet)
 {
        u_int id;
 
        id = msg_id++;
        send_string_request(fd_out, id, SSH2_FXP_LSTAT, path, strlen(path));
-       return(get_decode_stat(fd_in, id));
+       return(get_decode_stat(fd_in, id, quiet));
 }
 
 Attrib *
-do_fstat(int fd_in, int fd_out, char *handle,
-    u_int handle_len)
+do_fstat(int fd_in, int fd_out, char *handle, u_int handle_len, int quiet)
 {
        u_int id;
 
        id = msg_id++;
        send_string_request(fd_out, id, SSH2_FXP_FSTAT, handle, handle_len);
-       return(get_decode_stat(fd_in, id));
+       return(get_decode_stat(fd_in, id, quiet));
 }
 
 int
@@ -677,7 +681,7 @@ do_download(int fd_in, int fd_out, char *remote_path, char *local_path,
        Attrib junk, *a;
        int status;
 
-       a = do_stat(fd_in, fd_out, remote_path);
+       a = do_stat(fd_in, fd_out, remote_path, 0);
        if (a == NULL)
                return(-1);
 
@@ -687,11 +691,17 @@ do_download(int fd_in, int fd_out, char *remote_path, char *local_path,
        else
                mode = 0666;
 
+       if ((a->flags & SSH2_FILEXFER_ATTR_PERMISSIONS) &&
+           (a->perm & S_IFDIR)) {
+               error("Cannot download a directory: %s", remote_path);
+               return(-1);
+       }
+
        local_fd = open(local_path, O_WRONLY | O_CREAT | O_TRUNC, mode);
        if (local_fd == -1) {
                error("Couldn't open local file \"%s\" for writing: %s",
                    local_path, strerror(errno));
-               return(errno);
+               return(-1);
        }
 
        buffer_init(&msg);