geemili
/
SDL
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

SDL_vsnprintf: string printer now honors the precision. (bug #4263.)

Ozkan Sezer 2018-09-26 10:40:02 +03:00
parent d0e9a36460
commit 69ab8541a9
1 changed files with 13 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/stdlib/SDL_string.c
View File

@ -1374,15 +1374,18 @@ static size_t
SDL_PrintString(char *text, size_t maxlen, SDL_FormatInfo *info, const char *string) SDL_PrintString(char *text, size_t maxlen, SDL_FormatInfo *info, const char *string)
{ {
size_t length = 0; size_t length = 0;
size_t slen; size_t slen, sz;
if (string == NULL) { if (string == NULL) {
string = "(null)"; string = "(null)";
} }
if (info && info->width && (size_t)info->width > SDL_strlen(string)) { sz = SDL_strlen(string);
if (info && info->width > 0 && (size_t)info->width > sz) {
char fill = info->pad_zeroes ? '0' : ' '; char fill = info->pad_zeroes ? '0' : ' ';
size_t width = info->width - SDL_strlen(string); size_t width = info->width - sz;
if (info->precision >= 0 && (size_t)info->precision < sz)
width += sz - (size_t)info->precision;
while (width-- > 0 && maxlen > 0) { while (width-- > 0 && maxlen > 0) {
*text++ = fill; *text++ = fill;
++length; ++length;
@ -1394,6 +1397,13 @@ SDL_PrintString(char *text, size_t maxlen, SDL_FormatInfo *info, const char *str
length += SDL_min(slen, maxlen); length += SDL_min(slen, maxlen);
if (info) { if (info) {
if (info->precision >= 0 && info->precision < sz) {
slen = info->precision;
if (slen < maxlen) {
text[slen] = 0;
length -= (sz - slen);
}
}
if (info->force_case == SDL_CASE_LOWER) { if (info->force_case == SDL_CASE_LOWER) {
SDL_strlwr(text); SDL_strlwr(text);
} else if (info->force_case == SDL_CASE_UPPER) { } else if (info->force_case == SDL_CASE_UPPER) {