From 9cd2e9ec8fc0127393dfce9c0359d500c8c238be Mon Sep 17 00:00:00 2001
From: Edward Rudd <urkle@outoforder.cc>
Date: Tue, 09 Apr 2019 02:22:50 +0000
Subject: [PATCH] updae source to 2.0.9 source
---
source/src/stdlib/SDL_string.c | 132 +++++++++++++++++++++++++++++++++++++++----
1 files changed, 118 insertions(+), 14 deletions(-)
diff --git a/source/src/stdlib/SDL_string.c b/source/src/stdlib/SDL_string.c
index 444ae6d..a563adf 100644
--- a/source/src/stdlib/SDL_string.c
+++ b/source/src/stdlib/SDL_string.c
@@ -271,12 +271,16 @@
size_t left;
Uint32 *dstp4;
Uint8 *dstp1 = (Uint8 *) dst;
- Uint32 value4 = (c | (c << 8) | (c << 16) | (c << 24));
- Uint8 value1 = (Uint8) c;
+ Uint8 value1;
+ Uint32 value4;
+
+ /* The value used in memset() is a byte, passed as an int */
+ c &= 0xff;
/* The destination pointer needs to be aligned on a 4-byte boundary to
* execute a 32-bit set. Set first bytes manually if needed until it is
* aligned. */
+ value1 = (Uint8)c;
while ((intptr_t)dstp1 & 0x3) {
if (len--) {
*dstp1++ = value1;
@@ -285,6 +289,7 @@
}
}
+ value4 = (c | (c << 8) | (c << 16) | (c << 24));
dstp4 = (Uint32 *) dstp1;
left = (len % 4);
len /= 4;
@@ -414,6 +419,17 @@
}
return len;
#endif /* HAVE_STRLEN */
+}
+
+wchar_t *
+SDL_wcsdup(const wchar_t *string)
+{
+ size_t len = ((SDL_wcslen(string) + 1) * sizeof(wchar_t));
+ wchar_t *newstr = (wchar_t *)SDL_malloc(len);
+ if (newstr) {
+ SDL_memcpy(newstr, string, len);
+ }
+ return newstr;
}
size_t
@@ -562,7 +578,7 @@
SDL_strdup(const char *string)
{
size_t len = SDL_strlen(string) + 1;
- char *newstr = SDL_malloc(len);
+ char *newstr = (char *)SDL_malloc(len);
if (newstr) {
SDL_memcpy(newstr, string, len);
}
@@ -1319,7 +1335,18 @@
return retval;
}
-#ifdef HAVE_VSNPRINTF
+#if defined(HAVE_LIBC) && defined(__WATCOMC__)
+/* _vsnprintf() doesn't ensure nul termination */
+int SDL_vsnprintf(SDL_OUT_Z_CAP(maxlen) char *text, size_t maxlen, const char *fmt, va_list ap)
+{
+ int retval;
+ if (!fmt) fmt = "";
+ retval = _vsnprintf(text, maxlen, fmt, ap);
+ if (maxlen > 0) text[maxlen-1] = '\0';
+ if (retval < 0) retval = (int) maxlen;
+ return retval;
+}
+#elif defined(HAVE_VSNPRINTF)
int SDL_vsnprintf(SDL_OUT_Z_CAP(maxlen) char *text, size_t maxlen, const char *fmt, va_list ap)
{
if (!fmt) {
@@ -1338,9 +1365,9 @@
typedef struct
{
- SDL_bool left_justify;
+ SDL_bool left_justify; /* for now: ignored. */
SDL_bool force_sign;
- SDL_bool force_type;
+ SDL_bool force_type; /* for now: used only by float printer, ignored otherwise. */
SDL_bool pad_zeroes;
SDL_letter_case force_case;
int width;
@@ -1352,15 +1379,18 @@
SDL_PrintString(char *text, size_t maxlen, SDL_FormatInfo *info, const char *string)
{
size_t length = 0;
- size_t slen;
+ size_t slen, sz;
if (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' : ' ';
- 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) {
*text++ = fill;
++length;
@@ -1372,6 +1402,13 @@
length += SDL_min(slen, maxlen);
if (info) {
+ if (info->precision >= 0 && (size_t)info->precision < sz) {
+ slen = (size_t)info->precision;
+ if (slen < maxlen) {
+ text[slen] = 0;
+ length -= (sz - slen);
+ }
+ }
if (info->force_case == SDL_CASE_LOWER) {
SDL_strlwr(text);
} else if (info->force_case == SDL_CASE_UPPER) {
@@ -1381,12 +1418,54 @@
return length;
}
+static void
+SDL_IntPrecisionAdjust(char *num, size_t maxlen, SDL_FormatInfo *info)
+{/* left-pad num with zeroes. */
+ size_t sz, pad, have_sign;
+
+ if (!info)
+ return;
+
+ have_sign = 0;
+ if (*num == '-' || *num == '+') {
+ have_sign = 1;
+ ++num;
+ --maxlen;
+ }
+ sz = SDL_strlen(num);
+ if (info->precision > 0 && sz < (size_t)info->precision) {
+ pad = (size_t)info->precision - sz;
+ if (pad + sz + 1 <= maxlen) { /* otherwise ignore the precision */
+ SDL_memmove(num + pad, num, sz + 1);
+ SDL_memset(num, '0', pad);
+ }
+ }
+ info->precision = -1;/* so that SDL_PrintString() doesn't make a mess. */
+
+ if (info->pad_zeroes && info->width > 0 && (size_t)info->width > sz + have_sign) {
+ /* handle here: spaces are added before the sign
+ but zeroes must be placed _after_ the sign. */
+ /* sz hasn't changed: we ignore pad_zeroes if a precision is given. */
+ pad = (size_t)info->width - sz - have_sign;
+ if (pad + sz + 1 <= maxlen) {
+ SDL_memmove(num + pad, num, sz + 1);
+ SDL_memset(num, '0', pad);
+ }
+ info->width = 0; /* so that SDL_PrintString() doesn't make a mess. */
+ }
+}
+
static size_t
SDL_PrintLong(char *text, size_t maxlen, SDL_FormatInfo *info, long value)
{
- char num[130];
+ char num[130], *p = num;
- SDL_ltoa(value, num, info ? info->radix : 10);
+ if (info->force_sign && value >= 0L) {
+ *p++ = '+';
+ }
+
+ SDL_ltoa(value, p, info ? info->radix : 10);
+ SDL_IntPrecisionAdjust(num, maxlen, info);
return SDL_PrintString(text, maxlen, info, num);
}
@@ -1396,15 +1475,21 @@
char num[130];
SDL_ultoa(value, num, info ? info->radix : 10);
+ SDL_IntPrecisionAdjust(num, maxlen, info);
return SDL_PrintString(text, maxlen, info, num);
}
static size_t
SDL_PrintLongLong(char *text, size_t maxlen, SDL_FormatInfo *info, Sint64 value)
{
- char num[130];
+ char num[130], *p = num;
- SDL_lltoa(value, num, info ? info->radix : 10);
+ if (info->force_sign && value >= (Sint64)0) {
+ *p++ = '+';
+ }
+
+ SDL_lltoa(value, p, info ? info->radix : 10);
+ SDL_IntPrecisionAdjust(num, maxlen, info);
return SDL_PrintString(text, maxlen, info, num);
}
@@ -1414,6 +1499,7 @@
char num[130];
SDL_ulltoa(value, num, info ? info->radix : 10);
+ SDL_IntPrecisionAdjust(num, maxlen, info);
return SDL_PrintString(text, maxlen, info, num);
}
@@ -1571,12 +1657,22 @@
if (*fmt >= '0' && *fmt <= '9') {
info.width = SDL_strtol(fmt, (char **)&fmt, 0);
}
+ else if (*fmt == '*') {
+ ++fmt;
+ info.width = va_arg(ap, int);
+ }
if (*fmt == '.') {
++fmt;
if (*fmt >= '0' && *fmt <= '9') {
info.precision = SDL_strtol(fmt, (char **)&fmt, 0);
+ } else if (*fmt == '*') {
+ ++fmt;
+ info.precision = va_arg(ap, int);
} else {
+ info.precision = 0;
+ }
+ if (info.precision < 0) {
info.precision = 0;
}
}
@@ -1614,6 +1710,9 @@
break;
case 'i':
case 'd':
+ if (info.precision >= 0) {
+ info.pad_zeroes = SDL_FALSE;
+ }
switch (inttype) {
case DO_INT:
len = SDL_PrintLong(text, left, &info,
@@ -1651,7 +1750,10 @@
}
/* Fall through to unsigned handling */
case 'u':
- info.pad_zeroes = SDL_TRUE;
+ info.force_sign = SDL_FALSE;
+ if (info.precision >= 0) {
+ info.pad_zeroes = SDL_FALSE;
+ }
switch (inttype) {
case DO_INT:
len = SDL_PrintUnsignedLong(text, left, &info,
@@ -1678,12 +1780,14 @@
/* In practice this is used on Windows for WCHAR strings */
wchar_t *wide_arg = va_arg(ap, wchar_t *);
char *arg = SDL_iconv_string("UTF-8", "UTF-16LE", (char *)(wide_arg), (SDL_wcslen(wide_arg)+1)*sizeof(*wide_arg));
+ info.pad_zeroes = SDL_FALSE;
len = SDL_PrintString(text, left, &info, arg);
SDL_free(arg);
done = SDL_TRUE;
}
break;
case 's':
+ info.pad_zeroes = SDL_FALSE;
len = SDL_PrintString(text, left, &info, va_arg(ap, char *));
done = SDL_TRUE;
break;
--
Gitblit v1.9.3