[geany/geany] fd06d4: Merge pull request #548 from techee/run_script_escape
Colomban Wendling
git-noreply at xxxxx
Sat Jul 11 13:10:59 UTC 2015
Branch: refs/heads/master
Author: Colomban Wendling <ban at herbesfolles.org>
Committer: Colomban Wendling <ban at herbesfolles.org>
Date: Sat, 11 Jul 2015 13:10:59 UTC
Commit: fd06d47c7bec0659e0ce338ac6eee82de6ca9542
https://github.com/geany/geany/commit/fd06d47c7bec0659e0ce338ac6eee82de6ca9542
Log Message:
-----------
Merge pull request #548 from techee/run_script_escape
Properly escape working directory in run script
Closes #554.
Modified Paths:
--------------
src/build.c
Modified: src/build.c
4 lines changed, 2 insertions(+), 2 deletions(-)
===================================================================
@@ -1088,9 +1088,9 @@ static gchar *build_create_shellscript(const gchar *working_dir, const gchar *cm
str = g_strdup_printf("cd \"%s\"\n\n%s\n\n%s\ndel \"%%0\"\n\npause\n", working_dir, expanded_cmd, (autoclose) ? "" : "pause");
g_free(expanded_cmd);
#else
- escaped_dir = g_strescape(working_dir, NULL);
+ escaped_dir = g_shell_quote(working_dir);
str = g_strdup_printf(
- "#!/bin/sh\n\nrm $0\n\ncd \'%s\'\n\n%s\n\necho \"\n\n------------------\n(program exited with code: $?)\" \
+ "#!/bin/sh\n\nrm $0\n\ncd %s\n\n%s\n\necho \"\n\n------------------\n(program exited with code: $?)\" \
\n\n%s\n", escaped_dir, cmd, (autoclose) ? "" :
"\necho \"Press return to continue\"\n#to be more compatible with shells like "
"dash\ndummy_var=\"\"\nread dummy_var");
--------------
This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).
More information about the Commits
mailing list