Correct for widechar on Windows

Commit migrated from mono/mono@9100c24
godspeedu · Jun 3, 2016 · 5e53a23 · 5e53a23
1 parent c5bd789
commit 5e53a23
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 2 deletions.
diff --git a/src/mono/mono/utils/mono-log-common.c b/src/mono/mono/utils/mono-log-common.c
@@ -69,10 +69,19 @@ mono_log_open_logfile(const char *path, void *userData)
 	if (path == NULL) {
 		logFile = stdout;
 	} else {
+#ifndef HOST_WIN32
 		logFile = fopen(path, "w");
+#else
+		guinchar2 *wPath = g_utf8_to_utf16(path, -1, 0, 0, 0);
+		if (wPath != NULL) {
+			logFile = _wfopen((wchar_t *) wPath, L"w");
+			g_free (wPath);
+		}
+#endif
 		if (logFile == NULL) {
 			g_warning("opening of log file %s failed with %s - defaulting to stdout", 
 				  path, strerror(errno));
+			logFile = stdout;
 		}
 	}
 	logUserData = userData;

diff --git a/src/mono/mono/utils/mono-log-windows.c b/src/mono/mono/utils/mono-log-windows.c
@@ -27,7 +27,7 @@
 
 static FILE *logFile = NULL;
 static void *logUserData = NULL;
-static char logFileName[] = L".//mono.log";
+static wchar_t *logFileName = L".//mono.log";
 
 /**
  * mapSyslogLevel:
@@ -65,7 +65,7 @@ mapLogFileLevel(GLogLevelFlags level)
 void
 mono_log_open_syslog(const char *ident, void *userData)
 {
-	logFile = fopen(logFileName, "w");
+	logFile = _wfopen(logFileName, L"w");
 	if (logFile == NULL) {
 		g_warning("opening of log file %s failed with %s",
 			  strerror(errno));