diff options
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | scp.c | 6 |
2 files changed, 8 insertions, 4 deletions
@@ -1,6 +1,10 @@ 20010317 - Support usrinfo() on AIX. Based on patch from Gert Doering <gert@greenie.muc.de> + - OpenBSD CVS Sync + - markus@cvs.openbsd.org 2001/03/15 15:05:59 + [scp.c] + use %lld in printf, ok millert@/deraadt@; report from ssh@client.fi 20010315 - OpenBSD CVS Sync @@ -4563,4 +4567,4 @@ - Wrote replacements for strlcpy and mkdtemp - Released 1.0pre1 -$Id: ChangeLog,v 1.961 2001/03/16 23:29:50 djm Exp $ +$Id: ChangeLog,v 1.962 2001/03/17 00:10:20 mouring Exp $ @@ -75,7 +75,7 @@ */ #include "includes.h" -RCSID("$OpenBSD: scp.c,v 1.60 2001/03/02 18:54:31 deraadt Exp $"); +RCSID("$OpenBSD: scp.c,v 1.61 2001/03/15 15:05:59 markus Exp $"); #include "xmalloc.h" #include "atomicio.h" @@ -545,9 +545,9 @@ syserr: run_err("%s: %s", name, strerror(errno)); goto next; } #define FILEMODEMASK (S_ISUID|S_ISGID|S_IRWXU|S_IRWXG|S_IRWXO) - snprintf(buf, sizeof buf, "C%04o %lu %s\n", + snprintf(buf, sizeof buf, "C%04o %lld %s\n", (u_int) (stb.st_mode & FILEMODEMASK), - (u_long) stb.st_size, last); + stb.st_size, last); if (verbose_mode) { fprintf(stderr, "Sending file modes: %s", buf); fflush(stderr); |