1 files changed, 12 insertions, 16 deletions

diff --git a/sftp-client.c b/sftp-client.c
index f2ce9deb7..2f9793778 100644
--- a/sftp-client.c
+++ b/sftp-client.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: sftp-client.c,v 1.103 2013/08/09 03:39:13 djm Exp $ */
+/* $OpenBSD: sftp-client.c,v 1.108 2013/11/08 00:39:15 djm Exp $ */
 /*
  * Copyright (c) 2001-2004 Damien Miller <djm@openbsd.org>
  *
@@ -337,8 +337,7 @@ do_init(int fd_in, int fd_out, u_int transfer_buflen, u_int num_requests,
         Buffer msg;
         struct sftp_conn *ret;
 
-        ret = xcalloc(1, sizeof(*ret));
-        ret->msg_id = 1;
+        ret = xmalloc(sizeof(*ret));
         ret->fd_in = fd_in;
         ret->fd_out = fd_out;
         ret->transfer_buflen = transfer_buflen;
@@ -472,7 +471,7 @@ do_lsreaddir(struct sftp_conn *conn, char *path, int printflag,
 
         if (dir) {
                 ents = 0;
-                *dir = xmalloc(sizeof(**dir));
+                *dir = xcalloc(1, sizeof(**dir));
                 (*dir)[0] = NULL;
         }
 
@@ -546,7 +545,7 @@ do_lsreaddir(struct sftp_conn *conn, char *path, int printflag,
 
                         if (dir) {
                                 *dir = xrealloc(*dir, ents + 2, sizeof(**dir));
-                                (*dir)[ents] = xmalloc(sizeof(***dir));
+                                (*dir)[ents] = xcalloc(1, sizeof(***dir));
                                 (*dir)[ents]->filename = xstrdup(filename);
                                 (*dir)[ents]->longname = xstrdup(longname);
                                 memcpy(&(*dir)[ents]->a, a, sizeof(*a));
@@ -565,7 +564,7 @@ do_lsreaddir(struct sftp_conn *conn, char *path, int printflag,
         /* Don't return partial matches on interrupt */
         if (interrupted && dir != NULL && *dir != NULL) {
                 free_sftp_dirents(*dir);
-                *dir = xmalloc(sizeof(**dir));
+                *dir = xcalloc(1, sizeof(**dir));
                 **dir = NULL;
         }
 
@@ -769,18 +768,16 @@ do_realpath(struct sftp_conn *conn, char *path)
 }
 
 int
-do_rename(struct sftp_conn *conn, char *oldpath, char *newpath,
-    int force_legacy)
+do_rename(struct sftp_conn *conn, char *oldpath, char *newpath)
 {
         Buffer msg;
         u_int status, id;
-        int use_ext = (conn->exts & SFTP_EXT_POSIX_RENAME) && !force_legacy;
 
         buffer_init(&msg);
 
         /* Send rename request */
         id = conn->msg_id++;
-        if (use_ext) {
+        if ((conn->exts & SFTP_EXT_POSIX_RENAME)) {
                 buffer_put_char(&msg, SSH2_FXP_EXTENDED);
                 buffer_put_int(&msg, id);
                 buffer_put_cstring(&msg, "posix-rename@openssh.com");
@@ -792,8 +789,8 @@ do_rename(struct sftp_conn *conn, char *oldpath, char *newpath,
         buffer_put_cstring(&msg, newpath);
         send_msg(conn, &msg);
         debug3("Sent message %s \"%s\" -> \"%s\"",
-            use_ext ? "posix-rename@openssh.com" : "SSH2_FXP_RENAME",
-            oldpath, newpath);
+            (conn->exts & SFTP_EXT_POSIX_RENAME) ? "posix-rename@openssh.com" :
+            "SSH2_FXP_RENAME", oldpath, newpath);
         buffer_free(&msg);
 
         status = get_status(conn, id);
@@ -1108,7 +1105,7 @@ do_download(struct sftp_conn *conn, char *remote_path, char *local_path,
                             (unsigned long long)offset,
                             (unsigned long long)offset + buflen - 1,
                             num_req, max_req);
-                        req = xmalloc(sizeof(*req));
+                        req = xcalloc(1, sizeof(*req));
                         req->id = conn->msg_id++;
                         req->len = buflen;
                         req->offset = offset;
@@ -1222,7 +1219,6 @@ do_download(struct sftp_conn *conn, char *remote_path, char *local_path,
         if (read_error) {
                 error("Couldn't read from remote file \"%s\" : %s",
                     remote_path, fx2txt(status));
-                status = -1;
                 do_close(conn, handle, handle_len);
         } else if (write_error) {
                 error("Couldn't write to \"%s\": %s", local_path,
@@ -1231,7 +1227,7 @@ do_download(struct sftp_conn *conn, char *remote_path, char *local_path,
                 do_close(conn, handle, handle_len);
         } else {
                 status = do_close(conn, handle, handle_len);
-                if (interrupted || status != SSH2_FX_OK)
+                if (interrupted)
                         status = -1;
                 /* Override umask and utimes if asked */
 #ifdef HAVE_FCHMOD
@@ -1467,7 +1463,7 @@ do_upload(struct sftp_conn *conn, char *local_path, char *remote_path,
                             strerror(errno));
 
                 if (len != 0) {
-                        ack = xmalloc(sizeof(*ack));
+                        ack = xcalloc(1, sizeof(*ack));
                         ack->id = ++id;
                         ack->offset = offset;
                         ack->len = len;