From adb7c36be35d8b1c42ea47287f7cc501ca2c15cc Mon Sep 17 00:00:00 2001
From: Ryan Lucia <ryan@luciaonline.net>
Date: Sat, 12 May 2018 03:06:01 -0400
Subject: [PATCH] Apply and update LuaJIT patches

---
 vendor/luajit/src/lib_io.c     | 30 +++++++++++++++++++++++++++++-
 vendor/luajit/src/lib_os.c     | 17 +++++++++++++++++
 vendor/luajit/unicode-io.patch |  6 +++---
 vendor/luajit/unicode-os.patch |  2 +-
 4 files changed, 50 insertions(+), 5 deletions(-)

diff --git a/vendor/luajit/src/lib_io.c b/vendor/luajit/src/lib_io.c
index 9cdcfcfcb..6858e6455 100644
--- a/vendor/luajit/src/lib_io.c
+++ b/vendor/luajit/src/lib_io.c
@@ -24,6 +24,16 @@
 #include "lj_ff.h"
 #include "lj_lib.h"
 
+#if LJ_TARGET_WINDOWS
+#define WIN32_LEAN_AND_MEAN
+#include <windows.h>
+
+static int widen(const char *in, wchar_t *out)
+{
+  return MultiByteToWideChar(CP_UTF8, 0, in, -1, out, MAX_PATH);
+}
+#endif
+
 /* Userdata payload for I/O file. */
 typedef struct IOFileUD {
   FILE *fp;		/* File handle. */
@@ -82,7 +92,15 @@ static IOFileUD *io_file_open(lua_State *L, const char *mode)
 {
   const char *fname = strdata(lj_lib_checkstr(L, 1));
   IOFileUD *iof = io_file_new(L);
+#if LJ_TARGET_WINDOWS
+  wchar_t wfname[MAX_PATH];
+  wchar_t wmode[MAX_PATH];
+  if (!widen(fname, wfname) || !widen(mode, wmode))
+    luaL_argerror(L, 1, lj_str_pushf(L, "%s: failed to convert path to utf-16", fname));
+  iof->fp = _wfopen(wfname, wmode);
+#else
   iof->fp = fopen(fname, mode);
+#endif
   if (iof->fp == NULL)
     luaL_argerror(L, 1, lj_str_pushf(L, "%s: %s", fname, strerror(errno)));
   return iof;
@@ -407,7 +425,14 @@ LJLIB_CF(io_open)
   GCstr *s = lj_lib_optstr(L, 2);
   const char *mode = s ? strdata(s) : "r";
   IOFileUD *iof = io_file_new(L);
+#if LJ_TARGET_WINDOWS
+  wchar_t wfname[MAX_PATH];
+  wchar_t wmode[MAX_PATH];
+  if (widen(fname, wfname) && widen(mode, wmode))
+    iof->fp = _wfopen(wfname, wmode);
+#else
   iof->fp = fopen(fname, mode);
+#endif
   return iof->fp != NULL ? 1 : luaL_fileresult(L, 0, fname);
 }
 
@@ -423,7 +448,10 @@ LJLIB_CF(io_popen)
   fflush(NULL);
   iof->fp = popen(fname, mode);
 #else
-  iof->fp = _popen(fname, mode);
+  wchar_t wfname[MAX_PATH];
+  wchar_t wmode[MAX_PATH];
+  if (widen(fname, wfname) && widen(mode, wmode))
+    iof->fp = _wpopen(wfname, wmode);
 #endif
   return iof->fp != NULL ? 1 : luaL_fileresult(L, 0, fname);
 #else
diff --git a/vendor/luajit/src/lib_os.c b/vendor/luajit/src/lib_os.c
index 8c96b86c7..05b324950 100644
--- a/vendor/luajit/src/lib_os.c
+++ b/vendor/luajit/src/lib_os.c
@@ -32,6 +32,23 @@
 
 /* ------------------------------------------------------------------------ */
 
+#if LJ_TARGET_WINDOWS
+#define WIN32_LEAN_AND_MEAN
+#include <windows.h>
+
+static wchar_t *widen_static(const char *narrow, int idx)
+{
+  __declspec(thread) static wchar_t buffer[2][MAX_PATH];
+  return MultiByteToWideChar(CP_UTF8, 0, narrow, -1, buffer[idx], MAX_PATH) ? buffer[idx] : L"";
+}
+
+#define remove(x) _wremove(widen_static(x, 0))
+#define system(x) _wsystem(widen_static(x, 0))
+#define rename(x, y) _wrename(widen_static(x, 0), widen_static(y, 1))
+#endif
+
+/* ------------------------------------------------------------------------ */
+
 #define LJLIB_MODULE_os
 
 LJLIB_CF(os_execute)
diff --git a/vendor/luajit/unicode-io.patch b/vendor/luajit/unicode-io.patch
index 08e2322ca..3d9873f59 100644
--- a/vendor/luajit/unicode-io.patch
+++ b/vendor/luajit/unicode-io.patch
@@ -1,5 +1,5 @@
 diff --git a/vendor/luajit/src/lib_io.c b/vendor/luajit/src/lib_io.c
-index 037aa28..8923e70 100644
+index 9cdcfcfcb..6858e6455 100644
 --- a/vendor/luajit/src/lib_io.c
 +++ b/vendor/luajit/src/lib_io.c
 @@ -24,6 +24,16 @@
@@ -35,7 +35,7 @@ index 037aa28..8923e70 100644
    if (iof->fp == NULL)
      luaL_argerror(L, 1, lj_str_pushf(L, "%s: %s", fname, strerror(errno)));
    return iof;
-@@ -399,7 +417,14 @@ LJLIB_CF(io_open)
+@@ -407,7 +425,14 @@ LJLIB_CF(io_open)
    GCstr *s = lj_lib_optstr(L, 2);
    const char *mode = s ? strdata(s) : "r";
    IOFileUD *iof = io_file_new(L);
@@ -50,7 +50,7 @@ index 037aa28..8923e70 100644
    return iof->fp != NULL ? 1 : luaL_fileresult(L, 0, fname);
  }
  
-@@ -415,7 +440,10 @@ LJLIB_CF(io_popen)
+@@ -423,7 +448,10 @@ LJLIB_CF(io_popen)
    fflush(NULL);
    iof->fp = popen(fname, mode);
  #else
diff --git a/vendor/luajit/unicode-os.patch b/vendor/luajit/unicode-os.patch
index 8bbee2341..5d69f7e9c 100644
--- a/vendor/luajit/unicode-os.patch
+++ b/vendor/luajit/unicode-os.patch
@@ -1,5 +1,5 @@
 diff --git a/vendor/luajit/src/lib_os.c b/vendor/luajit/src/lib_os.c
-index bb5a141..a2ed170 100644
+index 8c96b86c7..05b324950 100644
 --- a/vendor/luajit/src/lib_os.c
 +++ b/vendor/luajit/src/lib_os.c
 @@ -32,6 +32,23 @@