Update libretro-common to latest upstream (2025)

Update vendored libretro-common from ~Oct 2021 to current upstream.
Brings 4+ years of bug fixes, new API support, platform compatibility
improvements, and security fixes.

Refs #105

Co-Authored-By: Claude Opus 4.6 <[email protected]>

Author: JoeMatt

libretro-common/compat/compat_posix_string.c

@@ -56,12 +56,11 @@ int retro_strcasecmp__(const char *a, const char *b)
 
 char *retro_strdup__(const char *orig)
 {
-   size_t len = strlen(orig) + 1;
-   char *ret  = (char*)malloc(len);
+   size_t _len = strlen(orig) + 1;
+   char *ret   = (char*)malloc(_len);
    if (!ret)
       return NULL;
-
-   strlcpy(ret, orig, len);
+   memcpy(ret, orig, _len);
    return ret;
 }
 
@@ -100,5 +99,4 @@ char *retro_strtok_r__(char *str, const char *delim, char **saveptr)
 
    return first;
 }
-
 #endif

libretro-common/compat/compat_snprintf.c

@@ -35,49 +35,43 @@
 
 static int c89_vscprintf_retro__(const char *fmt, va_list pargs)
 {
-   int retval;
+   int _len;
    va_list argcopy;
    va_copy(argcopy, pargs);
-   retval = vsnprintf(NULL, 0, fmt, argcopy);
+   _len = vsnprintf(NULL, 0, fmt, argcopy);
    va_end(argcopy);
-   return retval;
+   return _len;
 }
 #endif
 
 /* http://stackoverflow.com/questions/2915672/snprintf-and-visual-studio-2010 */
 
 int c99_vsnprintf_retro__(char *s, size_t len, const char *fmt, va_list ap)
 {
-   int count = -1;
-
+   int _len = -1;
    if (len != 0)
    {
 #if (_MSC_VER <= 1310)
-      count = _vsnprintf(s, len - 1, fmt, ap);
+      _len = _vsnprintf(s, len - 1, fmt, ap);
 #else
-      count = _vsnprintf_s(s, len, len - 1, fmt, ap);
+      _len = _vsnprintf_s(s, len, len - 1, fmt, ap);
 #endif
    }
-
-   if (count == -1)
-       count = _vscprintf(fmt, ap);
-
+   if (_len == -1)
+       _len = _vscprintf(fmt, ap);
    /* there was no room for a NULL, so truncate the last character */
-   if (count == len && len)
+   if (_len == len && len)
       s[len - 1] = '\0';
-
-   return count;
+   return _len;
 }
 
 int c99_snprintf_retro__(char *s, size_t len, const char *fmt, ...)
 {
-   int count;
+   int _len;
    va_list ap;
-
    va_start(ap, fmt);
-   count = c99_vsnprintf_retro__(s, len, fmt, ap);
+   _len = c99_vsnprintf_retro__(s, len, fmt, ap);
    va_end(ap);
-
-   return count;
+   return _len;
 }
 #endif

libretro-common/compat/compat_strcasestr.c

@@ -42,17 +42,15 @@ static int casencmp(const char *a, const char *b, size_t n)
 
 char *strcasestr_retro__(const char *haystack, const char *needle)
 {
-   size_t i, search_off;
-   size_t hay_len    = strlen(haystack);
-   size_t needle_len = strlen(needle);
-
-   if (needle_len > hay_len)
-      return NULL;
-
-   search_off = hay_len - needle_len;
-   for (i = 0; i <= search_off; i++)
-      if (!casencmp(haystack + i, needle, needle_len))
-         return (char*)haystack + i;
-
+   size_t _len  = strlen(needle);
+   size_t __len = strlen(haystack);
+   if (_len <= __len)
+   {
+      size_t i;
+      __len -= _len; /* offset */
+      for (i = 0; i <= __len; i++)
+         if (!casencmp(haystack + i, needle, _len))
+            return (char*)haystack + i;
+   }
    return NULL;
 }

libretro-common/compat/compat_strl.c

@@ -27,43 +27,27 @@
 
 /* Implementation of strlcpy()/strlcat() based on OpenBSD. */
 
-#ifndef __MACH__
-
-size_t strlcpy(char *dest, const char *source, size_t size)
+#if !(defined(__MACH__) && defined(__APPLE__))
+size_t strlcpy(char *s, const char *in, size_t len)
 {
-   size_t src_size = 0;
-   size_t        n = size;
-
-   if (n)
-      while (--n && (*dest++ = *source++)) src_size++;
-
-   if (!n)
-   {
-      if (size) *dest = '\0';
-      while (*source++) src_size++;
-   }
-
-   return src_size;
+    size_t _len = strlen(in);
+    if (len)
+    {
+        size_t __len = _len < len - 1 ? _len : len - 1;
+        memcpy(s, in, __len);
+        s[__len] = '\0';
+    }
+    return _len;
 }
 
-size_t strlcat(char *dest, const char *source, size_t size)
+size_t strlcat(char *s, const char *source, size_t len)
 {
-   size_t len = strlen(dest);
-
-   dest += len;
-
-   if (len > size)
-      size = 0;
+   size_t _len = strlen(s);
+   s += _len;
+   if (_len > len)
+      len = 0;
    else
-      size -= len;
-
-   return len + strlcpy(dest, source, size);
+      len -= _len;
+   return _len + strlcpy(s, source, len);
 }
 #endif
-
-char *strldup(const char *s, size_t n)
-{
-   char *dst = (char*)malloc(sizeof(char) * (n + 1));
-   strlcpy(dst, s, n);
-   return dst;
-}

libretro-common/compat/fopen_utf8.c

@@ -37,27 +37,28 @@
 void *fopen_utf8(const char * filename, const char * mode)
 {
 #if defined(LEGACY_WIN32)
-   FILE             *ret = NULL;
    char * filename_local = utf8_to_local_string_alloc(filename);
-
-   if (!filename_local)
-      return NULL;
-   ret = fopen(filename_local, mode);
    if (filename_local)
+   {
+      FILE *ret          = fopen(filename_local, mode);
       free(filename_local);
-   return ret;
+      return ret;
+   }
 #else
-   wchar_t * filename_w = utf8_to_utf16_string_alloc(filename);
-   wchar_t * mode_w = utf8_to_utf16_string_alloc(mode);
-   FILE* ret = NULL;
-
-   if (filename_w && mode_w)
-      ret = _wfopen(filename_w, mode_w);
+   wchar_t * filename_w  = utf8_to_utf16_string_alloc(filename);
    if (filename_w)
+   {
+      FILE    *ret       = NULL;
+      wchar_t *mode_w    = utf8_to_utf16_string_alloc(mode);
+      if (mode_w)
+      {
+         ret             = _wfopen(filename_w, mode_w);
+         free(mode_w);
+      }
       free(filename_w);
-   if (mode_w)
-      free(mode_w);
-   return ret;
+      return ret;
+   }
 #endif
+   return NULL;
 }
 #endif