diff options
-rw-r--r-- | ChangeLog | 4 | ||||
-rw-r--r-- | sftp-client.c | 8 | ||||
-rw-r--r-- | sftp-server.c | 6 |
3 files changed, 10 insertions, 8 deletions
@@ -1,6 +1,8 @@ | |||
1 | 20010225 | 1 | 20010225 |
2 | - (djm) Use %{_libexecdir} rather than hardcoded path in RPM specfile | 2 | - (djm) Use %{_libexecdir} rather than hardcoded path in RPM specfile |
3 | Patch from Adrian Ho <lexfiend@usa.net> | 3 | Patch from Adrian Ho <lexfiend@usa.net> |
4 | - (bal) Replace 'unsigned long long' to 'u_int64_t' since not every | ||
5 | platform defines u_int64_t as being that. | ||
4 | 6 | ||
5 | 20010224 | 7 | 20010224 |
6 | - (bal) Missed part of the UNIX sockets patch. Patch by Corinna | 8 | - (bal) Missed part of the UNIX sockets patch. Patch by Corinna |
@@ -4124,4 +4126,4 @@ | |||
4124 | - Wrote replacements for strlcpy and mkdtemp | 4126 | - Wrote replacements for strlcpy and mkdtemp |
4125 | - Released 1.0pre1 | 4127 | - Released 1.0pre1 |
4126 | 4128 | ||
4127 | $Id: ChangeLog,v 1.820 2001/02/24 22:36:29 djm Exp $ | 4129 | $Id: ChangeLog,v 1.821 2001/02/25 02:02:43 mouring Exp $ |
diff --git a/sftp-client.c b/sftp-client.c index 7c234ce2d..5242cab03 100644 --- a/sftp-client.c +++ b/sftp-client.c | |||
@@ -613,7 +613,7 @@ do_download(int fd_in, int fd_out, char *remote_path, char *local_path, | |||
613 | buffer_put_int(&msg, COPY_SIZE); | 613 | buffer_put_int(&msg, COPY_SIZE); |
614 | send_msg(fd_out, &msg); | 614 | send_msg(fd_out, &msg); |
615 | debug3("Sent message SSH2_FXP_READ I:%d O:%llu S:%u", | 615 | debug3("Sent message SSH2_FXP_READ I:%d O:%llu S:%u", |
616 | id, (unsigned long long)offset, COPY_SIZE); | 616 | id, (u_int64_t)offset, COPY_SIZE); |
617 | 617 | ||
618 | buffer_clear(&msg); | 618 | buffer_clear(&msg); |
619 | 619 | ||
@@ -646,7 +646,7 @@ do_download(int fd_in, int fd_out, char *remote_path, char *local_path, | |||
646 | len, COPY_SIZE); | 646 | len, COPY_SIZE); |
647 | 647 | ||
648 | debug3("In read loop, got %d offset %llu", len, | 648 | debug3("In read loop, got %d offset %llu", len, |
649 | (unsigned long long)offset); | 649 | (u_int64_t)offset); |
650 | if (atomicio(write, local_fd, data, len) != len) { | 650 | if (atomicio(write, local_fd, data, len) != len) { |
651 | error("Couldn't write to \"%s\": %s", local_path, | 651 | error("Couldn't write to \"%s\": %s", local_path, |
652 | strerror(errno)); | 652 | strerror(errno)); |
@@ -767,7 +767,7 @@ do_upload(int fd_in, int fd_out, char *local_path, char *remote_path, | |||
767 | buffer_put_string(&msg, data, len); | 767 | buffer_put_string(&msg, data, len); |
768 | send_msg(fd_out, &msg); | 768 | send_msg(fd_out, &msg); |
769 | debug3("Sent message SSH2_FXP_WRITE I:%d O:%llu S:%u", | 769 | debug3("Sent message SSH2_FXP_WRITE I:%d O:%llu S:%u", |
770 | id, (unsigned long long)offset, len); | 770 | id, (u_int64_t)offset, len); |
771 | 771 | ||
772 | status = get_status(fd_in, id); | 772 | status = get_status(fd_in, id); |
773 | if (status != SSH2_FX_OK) { | 773 | if (status != SSH2_FX_OK) { |
@@ -778,7 +778,7 @@ do_upload(int fd_in, int fd_out, char *local_path, char *remote_path, | |||
778 | goto done; | 778 | goto done; |
779 | } | 779 | } |
780 | debug3("In write loop, got %d offset %llu", len, | 780 | debug3("In write loop, got %d offset %llu", len, |
781 | (unsigned long long)offset); | 781 | (u_int64_t)offset); |
782 | 782 | ||
783 | offset += len; | 783 | offset += len; |
784 | } | 784 | } |
diff --git a/sftp-server.c b/sftp-server.c index 0291da206..e959a5515 100644 --- a/sftp-server.c +++ b/sftp-server.c | |||
@@ -402,7 +402,7 @@ process_read(void) | |||
402 | len = get_int(); | 402 | len = get_int(); |
403 | 403 | ||
404 | TRACE("read id %d handle %d off %llu len %d", id, handle, | 404 | TRACE("read id %d handle %d off %llu len %d", id, handle, |
405 | (unsigned long long)off, len); | 405 | (u_int64_t)off, len); |
406 | if (len > sizeof buf) { | 406 | if (len > sizeof buf) { |
407 | len = sizeof buf; | 407 | len = sizeof buf; |
408 | log("read change len %d", len); | 408 | log("read change len %d", len); |
@@ -443,7 +443,7 @@ process_write(void) | |||
443 | data = get_string(&len); | 443 | data = get_string(&len); |
444 | 444 | ||
445 | TRACE("write id %d handle %d off %llu len %d", id, handle, | 445 | TRACE("write id %d handle %d off %llu len %d", id, handle, |
446 | (unsigned long long)off, len); | 446 | (u_int64_t)off, len); |
447 | fd = handle_to_fd(handle); | 447 | fd = handle_to_fd(handle); |
448 | if (fd >= 0) { | 448 | if (fd >= 0) { |
449 | if (lseek(fd, off, SEEK_SET) < 0) { | 449 | if (lseek(fd, off, SEEK_SET) < 0) { |
@@ -685,7 +685,7 @@ ls_file(char *name, struct stat *st) | |||
685 | if (sz == 0) | 685 | if (sz == 0) |
686 | tbuf[0] = '\0'; | 686 | tbuf[0] = '\0'; |
687 | snprintf(buf, sizeof buf, "%s %3d %-8.8s %-8.8s %8llu %s %s", mode, | 687 | snprintf(buf, sizeof buf, "%s %3d %-8.8s %-8.8s %8llu %s %s", mode, |
688 | st->st_nlink, user, group, (unsigned long long)st->st_size, tbuf, name); | 688 | st->st_nlink, user, group, (u_int64_t)st->st_size, tbuf, name); |
689 | return xstrdup(buf); | 689 | return xstrdup(buf); |
690 | } | 690 | } |
691 | 691 | ||