tyler.durden
/
openssh-portable
mirror of https://github.com/PowerShell/openssh-portable.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

- deraadt@cvs.openbsd.org 2001/02/04 08:23:08 

[sftp-client.c sftp-server.c]
     make gcc on the alpha even happier
This commit is contained in:
Kevin Steves 2001-02-05 15:39:22 +00:00
parent e27a5e05b3
commit ec1c140927
3 changed files with 14 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ChangeLog
View File

@ -54,6 +54,9 @@
- markus@cvs.openbsd.org 2001/01/31 13:48:09 - markus@cvs.openbsd.org 2001/01/31 13:48:09
[sshconnect2.c] [sshconnect2.c]
unused unused
- deraadt@cvs.openbsd.org 2001/02/04 08:23:08
[sftp-client.c sftp-server.c]
make gcc on the alpha even happier
20010104 20010104
- (bal) I think this is the last of the bsd-*.h that don't belong. - (bal) I think this is the last of the bsd-*.h that don't belong.

12
sftp-client.c
View File

@ -29,7 +29,7 @@
/* XXX: copy between two remote sites */ /* XXX: copy between two remote sites */
#include "includes.h" #include "includes.h"
RCSID("$OpenBSD: sftp-client.c,v 1.1 2001/02/04 11:11:54 djm Exp $"); RCSID("$OpenBSD: sftp-client.c,v 1.3 2001/02/04 15:32:25 stevesk Exp $");
#include "ssh.h" #include "ssh.h"
#include "buffer.h" #include "buffer.h"
@ -621,7 +621,7 @@ do_download(int fd_in, int fd_out, char *remote_path, char *local_path,
buffer_put_int(&msg, COPY_SIZE); buffer_put_int(&msg, COPY_SIZE);
send_msg(fd_out, &msg); send_msg(fd_out, &msg);
debug3("Sent message SSH2_FXP_READ I:%d O:%llu S:%u", debug3("Sent message SSH2_FXP_READ I:%d O:%llu S:%u",
id, offset, COPY_SIZE); id, (unsigned long long)offset, COPY_SIZE);
buffer_clear(&msg); buffer_clear(&msg);
@ -656,7 +656,8 @@ do_download(int fd_in, int fd_out, char *remote_path, char *local_path,
fatal("Received more data than asked for %d > %d", fatal("Received more data than asked for %d > %d",
len, COPY_SIZE); len, COPY_SIZE);
debug3("In read loop, got %d offset %lld", len, offset); debug3("In read loop, got %d offset %lld", len,
(unsigned long long)offset);
if (atomicio(write, local_fd, data, len) != len) { if (atomicio(write, local_fd, data, len) != len) {
error("Couldn't write to \"%s\": %s", local_path, error("Couldn't write to \"%s\": %s", local_path,
strerror(errno)); strerror(errno));
@ -763,7 +764,7 @@ do_upload(int fd_in, int fd_out, char *local_path, char *remote_path,
buffer_put_string(&msg, data, len); buffer_put_string(&msg, data, len);
send_msg(fd_out, &msg); send_msg(fd_out, &msg);
debug3("Sent message SSH2_FXP_WRITE I:%d O:%llu S:%u", debug3("Sent message SSH2_FXP_WRITE I:%d O:%llu S:%u",
id, offset, len); id, (unsigned long long)offset, len);
status = get_status(fd_in, id); status = get_status(fd_in, id);
if (status != SSH2_FX_OK) { if (status != SSH2_FX_OK) {
@ -774,7 +775,8 @@ do_upload(int fd_in, int fd_out, char *local_path, char *remote_path,
close(local_fd); close(local_fd);
return(-1); return(-1);
} }
debug3("In write loop, got %d offset %lld", len, offset); debug3("In write loop, got %d offset %llu", len,
(unsigned long long)offset);
offset += len; offset += len;
} }

6
sftp-server.c
View File

@ -401,7 +401,8 @@ process_read(void)
off = get_int64(); off = get_int64();
len = get_int(); len = get_int();
TRACE("read id %d handle %d off %lld len %d", id, handle, off, len); TRACE("read id %d handle %d off %llu len %d", id, handle,
(unsigned long long)off, len);
if (len > sizeof buf) { if (len > sizeof buf) {
len = sizeof buf; len = sizeof buf;
log("read change len %d", len); log("read change len %d", len);
@ -441,7 +442,8 @@ process_write(void)
off = get_int64(); off = get_int64();
data = get_string(&len); data = get_string(&len);
TRACE("write id %d handle %d off %lld len %d", id, handle, off, len); TRACE("write id %d handle %d off %llu len %d", id, handle,
(unsigned long long)off, len);
fd = handle_to_fd(handle); fd = handle_to_fd(handle);
if (fd >= 0) { if (fd >= 0) {
if (lseek(fd, off, SEEK_SET) < 0) { if (lseek(fd, off, SEEK_SET) < 0) {