summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog8
-rw-r--r--sftp-common.c4
2 files changed, 9 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index d5dcfba1e..5b2de4ee6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
120021109
2 - (bal) OpenBSD CVS Sync
3 - itojun@cvs.openbsd.org 2002/10/16 14:31:48
4 [sftp-common.c]
5 64bit pedant. %llu is "unsigned long long". markus ok
6
120021021 720021021
2 - (djm) Bug #400: Kill ssh-rand-helper children on timeout, patch from 8 - (djm) Bug #400: Kill ssh-rand-helper children on timeout, patch from
3 dtucker@zip.com.au 9 dtucker@zip.com.au
@@ -774,4 +780,4 @@
774 save auth method before monitor_reset_key_state(); bugzilla bug #284; 780 save auth method before monitor_reset_key_state(); bugzilla bug #284;
775 ok provos@ 781 ok provos@
776 782
777$Id: ChangeLog,v 1.2499 2002/10/21 10:26:16 djm Exp $ 783$Id: ChangeLog,v 1.2500 2002/11/09 15:40:34 mouring Exp $
diff --git a/sftp-common.c b/sftp-common.c
index 082345486..31d41385b 100644
--- a/sftp-common.c
+++ b/sftp-common.c
@@ -24,7 +24,7 @@
24 */ 24 */
25 25
26#include "includes.h" 26#include "includes.h"
27RCSID("$OpenBSD: sftp-common.c,v 1.7 2002/09/11 22:41:50 djm Exp $"); 27RCSID("$OpenBSD: sftp-common.c,v 1.8 2002/10/16 14:31:48 itojun Exp $");
28 28
29#include "buffer.h" 29#include "buffer.h"
30#include "bufaux.h" 30#include "bufaux.h"
@@ -208,6 +208,6 @@ ls_file(char *name, struct stat *st, int remote)
208 glen = MAX(strlen(group), 8); 208 glen = MAX(strlen(group), 8);
209 snprintf(buf, sizeof buf, "%s %3d %-*s %-*s %8llu %s %s", mode, 209 snprintf(buf, sizeof buf, "%s %3d %-*s %-*s %8llu %s %s", mode,
210 st->st_nlink, ulen, user, glen, group, 210 st->st_nlink, ulen, user, glen, group,
211 (u_int64_t)st->st_size, tbuf, name); 211 (unsigned long long)st->st_size, tbuf, name);
212 return xstrdup(buf); 212 return xstrdup(buf);
213} 213}