From 7315db0829c3845da10ace14a4f6b032429d6ebe Mon Sep 17 00:00:00 2001
From: hiro <hiro@ee746299-78ed-0310-b773-934348b2243d>
Date: Mon, 27 Feb 2006 09:58:03 +0000
Subject: win32: fixed encoding problem of command execution.

git-svn-id: svn://sylpheed.sraoss.jp/sylpheed/trunk@1015 ee746299-78ed-0310-b773-934348b2243d
---
 ChangeLog        |  5 +++++
 ChangeLog.ja     |  6 ++++++
 libsylph/utils.c | 64 ++++++++++++++++++++++++++++++++++++++++++++++++++++++--
 3 files changed, 73 insertions(+), 2 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 32a8e361..191e06af 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2006-02-27
+
+	* libsylph/utils.c: execute_async(), execute_sync(): win32: fixed
+	  encoding problem (GSpawn in GLib < 2.8.2 takes codepage arguments).
+
 2006-02-27
 
 	* version 2.2.1
diff --git a/ChangeLog.ja b/ChangeLog.ja
index 58bea59d..de8abd76 100644
--- a/ChangeLog.ja
+++ b/ChangeLog.ja
@@ -1,3 +1,9 @@
+2006-02-27
+
+	* libsylph/utils.c: execute_async(), execute_sync(): win32:
+	  エンコーディングの問題を修正(GLib < 2.8.2 の GSpawn はコードページ
+	  の引数をとる)。
+
 2006-02-27
 
 	* version 2.2.1
diff --git a/libsylph/utils.c b/libsylph/utils.c
index 296cd8d9..c9bdd83c 100644
--- a/libsylph/utils.c
+++ b/libsylph/utils.c
@@ -3274,8 +3274,49 @@ gchar *file_read_stream_to_str(FILE *fp)
 	return str;
 }
 
+#if defined(G_OS_WIN32) && !GLIB_CHECK_VERSION(2, 8, 2)
+static gchar **argv_utf8_to_locale(gchar **argv)
+{
+	gint argc = 0, i;
+	gchar **cp_argv;
+
+	while (argv[argc] != NULL)
+		argc++;
+
+	cp_argv = g_new(gchar *, argc + 1);
+
+	for (i = 0; i < argc; i++) {
+		cp_argv[i] = g_locale_from_utf8(argv[i], -1, NULL, NULL, NULL);
+		if (cp_argv[i] == NULL) {
+			g_warning("Failed to convert from UTF-8 to locale encoding: %s\n", argv[i]);
+			g_strfreev(cp_argv);
+			return NULL;
+		}
+	}
+	cp_argv[i] = NULL;
+
+	return cp_argv;
+}
+#endif
+
 gint execute_async(gchar *const argv[])
 {
+#if defined(G_OS_WIN32) && !GLIB_CHECK_VERSION(2, 8, 2)
+	gchar **cp_argv;
+
+	g_return_val_if_fail(argv != NULL && argv[0] != NULL, -1);
+
+	cp_argv = argv_utf8_to_locale((gchar **)argv);
+	if (!cp_argv)
+		return -1;
+	if (g_spawn_async(NULL, cp_argv, NULL, G_SPAWN_SEARCH_PATH,
+			  NULL, NULL, NULL, NULL) == FALSE) {
+		g_warning("Can't execute command: %s\n", argv[0]);
+		g_strfreev(cp_argv);
+		return -1;
+	}
+	g_strfreev(cp_argv);
+#else
 	g_return_val_if_fail(argv != NULL && argv[0] != NULL, -1);
 
 	if (g_spawn_async(NULL, (gchar **)argv, NULL, G_SPAWN_SEARCH_PATH,
@@ -3283,6 +3324,7 @@ gint execute_async(gchar *const argv[])
 		g_warning("Can't execute command: %s\n", argv[0]);
 		return -1;
 	}
+#endif
 
 	return 0;
 }
@@ -3290,10 +3332,27 @@ gint execute_async(gchar *const argv[])
 gint execute_sync(gchar *const argv[])
 {
 	gint status;
+#if defined(G_OS_WIN32) && !GLIB_CHECK_VERSION(2, 8, 2)
+	gchar **cp_argv;
+#endif
 
 	g_return_val_if_fail(argv != NULL && argv[0] != NULL, -1);
 
 #ifdef G_OS_WIN32
+#if !GLIB_CHECK_VERSION(2, 8, 2)
+	cp_argv = argv_utf8_to_locale((gchar **)argv);
+	if (!cp_argv)
+		return -1;
+	if (g_spawn_sync(NULL, cp_argv, NULL,
+			 G_SPAWN_SEARCH_PATH | G_SPAWN_CHILD_INHERITS_STDIN |
+			 G_SPAWN_LEAVE_DESCRIPTORS_OPEN,
+			 NULL, NULL, NULL, NULL, &status, NULL) == FALSE) {
+		g_warning("Can't execute command: %s\n", argv[0]);
+		g_strfreev(cp_argv);
+		return -1;
+	}
+	g_strfreev(cp_argv);
+#else /* !GLIB_CHECK_VERSION */
 	if (g_spawn_sync(NULL, (gchar **)argv, NULL,
 			 G_SPAWN_SEARCH_PATH | G_SPAWN_CHILD_INHERITS_STDIN |
 			 G_SPAWN_LEAVE_DESCRIPTORS_OPEN,
@@ -3301,9 +3360,10 @@ gint execute_sync(gchar *const argv[])
 		g_warning("Can't execute command: %s\n", argv[0]);
 		return -1;
 	}
+#endif /* !GLIB_CHECK_VERSION */
 
 	return status;
-#else
+#else /* G_OS_WIN32 */
 	if (g_spawn_sync(NULL, (gchar **)argv, NULL, G_SPAWN_SEARCH_PATH,
 			 NULL, NULL, NULL, NULL, &status, NULL) == FALSE) {
 		g_warning("Can't execute command: %s\n", argv[0]);
@@ -3314,7 +3374,7 @@ gint execute_sync(gchar *const argv[])
 		return WEXITSTATUS(status);
 	else
 		return -1;
-#endif
+#endif /* G_OS_WIN32 */
 }
 
 gint execute_command_line(const gchar *cmdline, gboolean async)
-- 
cgit v1.2.3