merge v1.20.0

1 files changed, 62 insertions, 0 deletions

diff --git a/common/strutils.cpp b/common/strutils.cpp
new file mode 100644
index 00000000..870a0ed3
--- /dev/null
+++ b/common/strutils.cpp
@@ -0,0 +1,62 @@
+
+#include "config.h"
+
+#include "strutils.h"
+
+#include <cstdlib>
+
+
+#ifdef _WIN32
+#define WIN32_LEAN_AND_MEAN
+#include <windows.h>
+
+std::string wstr_to_utf8(const WCHAR *wstr)
+{
+    std::string ret;
+
+    int len = WideCharToMultiByte(CP_UTF8, 0, wstr, -1, nullptr, 0, nullptr, nullptr);
+    if(len > 0)
+    {
+        ret.resize(len);
+        WideCharToMultiByte(CP_UTF8, 0, wstr, -1, &ret[0], len, nullptr, nullptr);
+        ret.pop_back();
+    }
+
+    return ret;
+}
+
+std::wstring utf8_to_wstr(const char *str)
+{
+    std::wstring ret;
+
+    int len = MultiByteToWideChar(CP_UTF8, 0, str, -1, nullptr, 0);
+    if(len > 0)
+    {
+        ret.resize(len);
+        MultiByteToWideChar(CP_UTF8, 0, str, -1, &ret[0], len);
+        ret.pop_back();
+    }
+
+    return ret;
+}
+#endif
+
+namespace al {
+
+al::optional<std::string> getenv(const char *envname)
+{
+    const char *str{std::getenv(envname)};
+    if(str && str[0] != '\0') return str;
+    return al::nullopt;
+}
+
+#ifdef _WIN32
+al::optional<std::wstring> getenv(const WCHAR *envname)
+{
+    const WCHAR *str{_wgetenv(envname)};
+    if(str && str[0] != L'\0') return str;
+    return al::nullopt;
+}
+#endif
+
+} // namespace al