diff options
| author | Tim J. Robbins <tjr@FreeBSD.org> | 2002-10-12 04:38:35 +0000 |
|---|---|---|
| committer | Tim J. Robbins <tjr@FreeBSD.org> | 2002-10-12 04:38:35 +0000 |
| commit | bd26dcd10398fc7436ec5f3ee1a35ef5a7ae54dd (patch) | |
| tree | 38fe8de32996483c502f17a2f18fb48193a15b66 | |
| parent | cf56436d177b19030c8bcbdb013d72ec5dfa95ee (diff) | |
Notes
| -rw-r--r-- | lib/libc/stdlib/strfmon.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/lib/libc/stdlib/strfmon.c b/lib/libc/stdlib/strfmon.c index 6392e74034cd..8d80462be7f4 100644 --- a/lib/libc/stdlib/strfmon.c +++ b/lib/libc/stdlib/strfmon.c @@ -329,7 +329,7 @@ strfmon(char * __restrict s, size_t maxsize, const char * __restrict format, if (!(flags & SUPRESS_CURR_SYMBOL)) { if ((sign_posn == 3 && sep_by_space == 2) || (sep_by_space == 1 - && (sign_posn = 0 + && (sign_posn == 0 || sign_posn == 1 || sign_posn == 2 || sign_posn == 4))) @@ -354,7 +354,7 @@ strfmon(char * __restrict s, size_t maxsize, const char * __restrict format, if (dst - tmpptr < width) { if (flags & LEFT_JUSTIFY) { - while (dst - tmpptr <= width) + while (dst - tmpptr < width) PRINT(' '); } else { pad_size = dst-tmpptr; @@ -368,6 +368,8 @@ strfmon(char * __restrict s, size_t maxsize, const char * __restrict format, PRINT('\0'); va_end(ap); + free(asciivalue); + free(currency_symbol); return (dst - s - 1); /* return size of put data except trailing '\0' */ e2big_error: @@ -598,7 +600,7 @@ __format_grouped_double(double value, int *flags, memset(bufend, pad_char, padded); } - bufsize = bufsize - (rslt - bufend); + bufsize = bufsize - (bufend - rslt) + 1; memmove(rslt, bufend, bufsize); free(avalue); return (rslt); |