Branch: refs/heads/master Author: Enrico Tröger enrico.troeger@uvena.de Committer: Enrico Tröger enrico.troeger@uvena.de Date: Sun, 21 Feb 2016 23:40:55 UTC Commit: c60667deb7348cea8bd69aace1a8b2e39adb0d4b https://github.com/geany/geany-plugins/commit/c60667deb7348cea8bd69aace1a8b2...

Log Message: ----------- Use new spawn API to fix broken Win32 ctags.exe command execution

Since the new spawn API, which is used by utils_spawn_sync() as well, passing a whole command line in argv[0] doesn't work any longer. So use the new spawn API directly which conveniently offers to pass the command either as command line or as argv.

Modified Paths: -------------- geanyctags/src/geanyctags.c

Modified: geanyctags/src/geanyctags.c 24 lines changed, 11 insertions(+), 13 deletions(-) =================================================================== @@ -46,7 +46,7 @@ #endif

-PLUGIN_VERSION_CHECK(211) +PLUGIN_VERSION_CHECK(226) PLUGIN_SET_INFO("GeanyCtags", _("Ctags generation and search plugin for geany projects"), VERSION, @@ -118,13 +118,14 @@ void plugin_help (void) static void spawn_cmd(const gchar *cmd, const gchar *dir) { GError *error = NULL; - gchar **argv; + gchar **argv = NULL; gchar *working_dir; gchar *utf8_working_dir; gchar *utf8_cmd_string; gchar *out; gint exitcode; gboolean success; + GString *output;

#ifndef G_OS_WIN32 /* run within shell so we can use pipes */ @@ -133,13 +134,8 @@ static void spawn_cmd(const gchar *cmd, const gchar *dir) argv[1] = g_strdup("-c"); argv[2] = g_strdup(cmd); argv[3] = NULL; -#else - /* no shell on windows */ - argv = g_new0(gchar *, 2); - argv[0] = g_strdup(cmd); - argv[1] = NULL; #endif - + utf8_cmd_string = utils_get_utf8_from_locale(cmd); utf8_working_dir = g_strdup(dir); working_dir = utils_get_locale_from_utf8(utf8_working_dir); @@ -149,14 +145,16 @@ static void spawn_cmd(const gchar *cmd, const gchar *dir) msgwin_msg_add(COLOR_BLUE, -1, NULL, _("%s (in directory: %s)"), utf8_cmd_string, utf8_working_dir); g_free(utf8_working_dir); g_free(utf8_cmd_string); - + + output = g_string_new(NULL); #ifndef G_OS_WIN32 - success = utils_spawn_sync(working_dir, argv, NULL, G_SPAWN_SEARCH_PATH, - NULL, NULL, NULL, &out, &exitcode, &error); + success = spawn_sync(working_dir, NULL, argv, NULL, + NULL, NULL, output, &exitcode, &error); #else - success = utils_spawn_sync(working_dir, argv, NULL, G_SPAWN_SEARCH_PATH, - NULL, NULL, &out, NULL, &exitcode, &error); + success = spawn_sync(working_dir, cmd, NULL, NULL, + NULL, output, NULL, &exitcode, &error); #endif + out = g_string_free(output, FALSE); if (!success || exitcode != 0) { if (error != NULL)

-------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).