summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDamien Miller <djm@mindrot.org>2000-09-23 14:58:32 +1100
committerDamien Miller <djm@mindrot.org>2000-09-23 14:58:32 +1100
commitf056e23dd6f7fad96afb9e0f5a64dce4f6045cc7 (patch)
tree86ed720c0ee2ed0cc241424b5ede9d90fcf043ed
parentb9c2ce8b3bbe71cf9cb5a127ed6d1cad633fc9f8 (diff)
- (djm) Use printf %lld instead of %qd in sftp-server.c. Fix from
Michael Stone <mstone@cs.loyola.edu>
-rw-r--r--ChangeLog2
-rw-r--r--sftp-server.c6
2 files changed, 5 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index a51215d8b..a20e9ad54 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -6,6 +6,8 @@
6 - (djm) Tweak password expiry checking at suggestion of Kevin Steves 6 - (djm) Tweak password expiry checking at suggestion of Kevin Steves
7 <stevesk@sweden.hp.com> 7 <stevesk@sweden.hp.com>
8 - (djm) NeXT patch from Ben Lindstrom <mouring@pconline.com> 8 - (djm) NeXT patch from Ben Lindstrom <mouring@pconline.com>
9 - (djm) Use printf %lld instead of %qd in sftp-server.c. Fix from
10 Michael Stone <mstone@cs.loyola.edu>
9 11
1020000920 1220000920
11 - (djm) Fix bad path substitution. Report from Andrew Miner 13 - (djm) Fix bad path substitution. Report from Andrew Miner
diff --git a/sftp-server.c b/sftp-server.c
index c5cd47b7d..538e5e267 100644
--- a/sftp-server.c
+++ b/sftp-server.c
@@ -545,7 +545,7 @@ process_read(void)
545 len = get_int(); 545 len = get_int();
546 546
547 off = (((u_int64_t) off_high) << 32) + off_low; 547 off = (((u_int64_t) off_high) << 32) + off_low;
548 TRACE("read id %d handle %d off %qd len %d", id, handle, off, len); 548 TRACE("read id %d handle %d off %lld len %d", id, handle, off, len);
549 if (len > sizeof buf) { 549 if (len > sizeof buf) {
550 len = sizeof buf; 550 len = sizeof buf;
551 log("read change len %d", len); 551 log("read change len %d", len);
@@ -587,7 +587,7 @@ process_write(void)
587 data = get_string(&len); 587 data = get_string(&len);
588 588
589 off = (((u_int64_t) off_high) << 32) + off_low; 589 off = (((u_int64_t) off_high) << 32) + off_low;
590 TRACE("write id %d handle %d off %qd len %d", id, handle, off, len); 590 TRACE("write id %d handle %d off %lld len %d", id, handle, off, len);
591 fd = handle_to_fd(handle); 591 fd = handle_to_fd(handle);
592 if (fd >= 0) { 592 if (fd >= 0) {
593 if (lseek(fd, off, SEEK_SET) < 0) { 593 if (lseek(fd, off, SEEK_SET) < 0) {
@@ -780,7 +780,7 @@ char *
780ls_file(char *name, struct stat *st) 780ls_file(char *name, struct stat *st)
781{ 781{
782 char buf[1024]; 782 char buf[1024];
783 snprintf(buf, sizeof buf, "0%o %d %d %qd %d %s", 783 snprintf(buf, sizeof buf, "0%o %d %d %lld %d %s",
784 st->st_mode, st->st_uid, st->st_gid, (long long)st->st_size,(int) st->st_mtime, 784 st->st_mode, st->st_uid, st->st_gid, (long long)st->st_size,(int) st->st_mtime,
785 name); 785 name);
786 return xstrdup(buf); 786 return xstrdup(buf);