diff options
-rw-r--r-- | ChangeLog | 9 | ||||
-rw-r--r-- | openbsd-compat/bsd-snprintf.c | 8 |
2 files changed, 10 insertions, 7 deletions
@@ -1,6 +1,9 @@ | |||
1 | 20060318 | 1 | 20060318 |
2 | - (djm) [auth-pam.c] Fix memleak in error path, from Coverity via | 2 | - (djm) [auth-pam.c] Fix memleak in error path, from Coverity via |
3 | elad AT NetBSD.org | 3 | elad AT NetBSD.org |
4 | - (dtucker) [openbsd-compat/bsd-snprintf.c] Bug #1173: make fmtint() take | ||
5 | a LLONG rather than a long. Fixes scp'ing of large files on platforms | ||
6 | with missing/broken snprintfs. Patch from e.borovac at bom.gov.au. | ||
4 | 7 | ||
5 | 20060316 | 8 | 20060316 |
6 | - (dtucker) [entropy.c] Add headers for WIFEXITED and friends. | 9 | - (dtucker) [entropy.c] Add headers for WIFEXITED and friends. |
@@ -4186,4 +4189,4 @@ | |||
4186 | - (djm) Trim deprecated options from INSTALL. Mention UsePAM | 4189 | - (djm) Trim deprecated options from INSTALL. Mention UsePAM |
4187 | - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu | 4190 | - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu |
4188 | 4191 | ||
4189 | $Id: ChangeLog,v 1.4229 2006/03/18 12:04:49 djm Exp $ | 4192 | $Id: ChangeLog,v 1.4230 2006/03/18 13:07:07 dtucker Exp $ |
diff --git a/openbsd-compat/bsd-snprintf.c b/openbsd-compat/bsd-snprintf.c index e4ba154fd..571c61fc0 100644 --- a/openbsd-compat/bsd-snprintf.c +++ b/openbsd-compat/bsd-snprintf.c | |||
@@ -89,7 +89,7 @@ | |||
89 | 89 | ||
90 | #include "includes.h" | 90 | #include "includes.h" |
91 | 91 | ||
92 | RCSID("$Id: bsd-snprintf.c,v 1.11 2005/12/17 11:32:04 dtucker Exp $"); | 92 | RCSID("$Id: bsd-snprintf.c,v 1.12 2006/03/18 13:07:07 dtucker Exp $"); |
93 | 93 | ||
94 | #if defined(BROKEN_SNPRINTF) /* For those with broken snprintf() */ | 94 | #if defined(BROKEN_SNPRINTF) /* For those with broken snprintf() */ |
95 | # undef HAVE_SNPRINTF | 95 | # undef HAVE_SNPRINTF |
@@ -161,7 +161,7 @@ static size_t dopr(char *buffer, size_t maxlen, const char *format, | |||
161 | static void fmtstr(char *buffer, size_t *currlen, size_t maxlen, | 161 | static void fmtstr(char *buffer, size_t *currlen, size_t maxlen, |
162 | char *value, int flags, int min, int max); | 162 | char *value, int flags, int min, int max); |
163 | static void fmtint(char *buffer, size_t *currlen, size_t maxlen, | 163 | static void fmtint(char *buffer, size_t *currlen, size_t maxlen, |
164 | long value, int base, int min, int max, int flags); | 164 | LLONG value, int base, int min, int max, int flags); |
165 | static void fmtfp(char *buffer, size_t *currlen, size_t maxlen, | 165 | static void fmtfp(char *buffer, size_t *currlen, size_t maxlen, |
166 | LDOUBLE fvalue, int min, int max, int flags); | 166 | LDOUBLE fvalue, int min, int max, int flags); |
167 | static void dopr_outch(char *buffer, size_t *currlen, size_t maxlen, char c); | 167 | static void dopr_outch(char *buffer, size_t *currlen, size_t maxlen, char c); |
@@ -468,10 +468,10 @@ static void fmtstr(char *buffer, size_t *currlen, size_t maxlen, | |||
468 | /* Have to handle DP_F_NUM (ie 0x and 0 alternates) */ | 468 | /* Have to handle DP_F_NUM (ie 0x and 0 alternates) */ |
469 | 469 | ||
470 | static void fmtint(char *buffer, size_t *currlen, size_t maxlen, | 470 | static void fmtint(char *buffer, size_t *currlen, size_t maxlen, |
471 | long value, int base, int min, int max, int flags) | 471 | LLONG value, int base, int min, int max, int flags) |
472 | { | 472 | { |
473 | int signvalue = 0; | 473 | int signvalue = 0; |
474 | unsigned long uvalue; | 474 | unsigned LLONG uvalue; |
475 | char convert[20]; | 475 | char convert[20]; |
476 | int place = 0; | 476 | int place = 0; |
477 | int spadlen = 0; /* amount to space pad */ | 477 | int spadlen = 0; /* amount to space pad */ |