Update libretro-common

Author: negativeExponent

libretro/libretro-common/compat/compat_posix_string.c

@@ -60,7 +60,7 @@ char *retro_strdup__(const char *orig)
    char *ret   = (char*)malloc(_len);
    if (!ret)
       return NULL;
-   strlcpy(ret, orig, _len);
+   memcpy(ret, orig, _len);
    return ret;
 }
 
@@ -99,5 +99,4 @@ char *retro_strtok_r__(char *str, const char *delim, char **saveptr)
 
    return first;
 }
-
 #endif

libretro/libretro-common/compat/compat_strl.c

@@ -27,19 +27,17 @@
 
 /* Implementation of strlcpy()/strlcat() based on OpenBSD. */
 
-#ifndef __MACH__
-size_t strlcpy(char *s, const char *source, size_t len)
+#if !(defined(__MACH__) && defined(__APPLE__))
+size_t strlcpy(char *s, const char *in, size_t len)
 {
-   size_t _len  = len;
-   size_t __len = 0;
-   if (_len)
-      while (--_len && (*s++ = *source++)) __len++;
-   if (!_len)
-   {
-      if (len) *s = '\0';
-      while (*source++) __len++;
-   }
-   return __len;
+    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 *s, const char *source, size_t len)

libretro/libretro-common/compat/fopen_utf8.c

@@ -23,9 +23,18 @@
 #include <compat/fopen_utf8.h>
 #include <encodings/utf.h>
 #include <stdio.h>
+#include <string.h>
 #include <stdlib.h>
+#include <boolean.h>
+#if defined(__WINRT__)
+#include <stdint.h>
+#include <windows.h>
+#include <fileapifromapp.h>
+#include <io.h>
+#include <fcntl.h>
+#endif
 
-#if defined(_WIN32_WINNT) && _WIN32_WINNT < 0x0500 || defined(_XBOX)
+#if defined(_WIN32_WINNT) && _WIN32_WINNT < 0x0500 || (defined(_XBOX) && !defined(__WINRT__))
 #ifndef LEGACY_WIN32
 #define LEGACY_WIN32
 #endif
@@ -49,12 +58,75 @@ void *fopen_utf8(const char * filename, const char * mode)
    if (filename_w)
    {
       FILE    *ret       = NULL;
+#if defined(__WINRT__)
+      HANDLE   file_handle = INVALID_HANDLE_VALUE;
+      DWORD    desired_access = 0;
+      DWORD    creation_disposition = OPEN_EXISTING;
+      int      open_flags = O_BINARY;
+      int      fd = -1;
+      bool     append = mode && strchr(mode, 'a');
+      bool     write = mode && strchr(mode, 'w');
+      bool     plus = mode && strchr(mode, '+');
+      wchar_t *path = filename_w;
+
+      while (*path)
+      {
+         if (*path == L'/')
+            *path = L'\\';
+         path++;
+      }
+
+      if (mode && strchr(mode, 'r'))
+         desired_access |= GENERIC_READ;
+      if (write || append || plus)
+         desired_access |= GENERIC_WRITE;
+      if (plus)
+         desired_access |= GENERIC_READ;
+
+      if (append)
+         creation_disposition = OPEN_ALWAYS;
+      else if (write)
+         creation_disposition = CREATE_ALWAYS;
+
+      if (plus)
+         open_flags |= O_RDWR;
+      else if (append || write)
+         open_flags |= O_WRONLY;
+      else
+         open_flags |= O_RDONLY;
+
+      if (append)
+         open_flags |= O_APPEND;
+      if (write || append)
+         open_flags |= O_CREAT;
+      if (write)
+         open_flags |= O_TRUNC;
+
+      file_handle = CreateFile2FromAppW(filename_w, desired_access,
+            FILE_SHARE_READ | FILE_SHARE_WRITE,
+            creation_disposition, NULL);
+      if (file_handle != INVALID_HANDLE_VALUE)
+      {
+         fd = _open_osfhandle((intptr_t)file_handle, open_flags);
+         if (fd != -1)
+            ret = _fdopen(fd, mode);
+
+         if (!ret)
+         {
+            if (fd != -1)
+               _close(fd);
+            else
+               CloseHandle(file_handle);
+         }
+      }
+#else
       wchar_t *mode_w    = utf8_to_utf16_string_alloc(mode);
       if (mode_w)
       {
          ret             = _wfopen(filename_w, mode_w);
          free(mode_w);
       }
+#endif
       free(filename_w);
       return ret;
    }