SF.net SVN: geany:[3806] trunk

[eht16 at users.sourceforge.net]

Revision: 3806
          http://geany.svn.sourceforge.net/geany/?rev=3806&view=rev
Author:   eht16
Date:     2009-05-19 21:06:04 +0000 (Tue, 19 May 2009)

Log Message:
-----------
Fix quoting the build command string on Windows (closes #2791769). This broke when we made build commands run synchronously on Windows, now we don't need to special quote the commands anymore.

Modified Paths:
--------------
    trunk/ChangeLog
    trunk/src/build.c

Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog	2009-05-19 20:17:37 UTC (rev 3805)
+++ trunk/ChangeLog	2009-05-19 21:06:04 UTC (rev 3806)
@@ -6,6 +6,10 @@
  * src/editor.c, src/editor.h:
    Make some only locally used functions static.
    Fix wrong sanity check.
+ * src/build.c:
+   Fix quoting the build command string on Windows (closes #2791769).
+   This broke when we made build commands run synchronously on Windows,
+   now we don't need to special quote the commands anymore.
 
 
 2009-05-19  Nick Treleaven  <nick(dot)treleaven(at)btinternet(dot)com>

Modified: trunk/src/build.c
===================================================================
--- trunk/src/build.c	2009-05-19 20:17:37 UTC (rev 3805)
+++ trunk/src/build.c	2009-05-19 21:06:04 UTC (rev 3806)
@@ -507,13 +507,7 @@
 	g_free(executable);
 
 #ifdef G_OS_WIN32
-	/* due to g_shell_parse_argv() we need to enclose the command(first element) of cmd_string with
-	 * "" if the command contains a full path(i.e. backslashes) otherwise the backslashes will be
-	 * eaten by g_shell_parse_argv(). */
-	setptr(cmd_string, quote_executable(cmd_string));
-	if (! g_shell_parse_argv(cmd_string, NULL, &argv, NULL))
-		/* if automatic parsing failed, fall back to simple, unsafe argv creation */
-		argv = g_strsplit(cmd_string, " ", 0);
+	argv = g_strsplit(cmd_string, " ", 0);
 #else
 	argv = g_new0(gchar *, 4);
 	argv[0] = g_strdup("/bin/sh");


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.