From: Jonathan Nieder Date: Fri, 30 Oct 2009 10:25:48 GMT Subject: [PATCH 2/8] Handle more shell metacharacters in editor names Message-ID: <20091030102548.GC1610@progeny.tock> In-Reply-To: <20091030101634.GA1610@progeny.tock> Pass the editor name to the shell if it contains any susv3 shell special character (globs, redirections, variable substitutions, escapes, etc). This way, the meaning of some characters will not meaninglessly change when others are added, and git commands implemented in C and in shell scripts will interpret editor names in the same way. This does not make the GIT_EDITOR setting any more expressive, since one could always use single quotes to force the editor to be passed to the shell. Signed-off-by: Jonathan Nieder --- editor.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/editor.c b/editor.c index 316d139..facd7f2 100644 --- a/editor.c +++ b/editor.c @@ -34,7 +34,7 @@ int launch_editor(const char *path, struct strbuf *buffer, const char *const *en const char *args[6]; struct strbuf arg0 = STRBUF_INIT; - if (strcspn(editor, "$ \t'") != len) { + if (strcspn(editor, "|&;<>()$`\\\"' \t\n*?[#~=%") != len) { /* there are specials */ strbuf_addf(&arg0, "%s \"$@\"", editor); args[i++] = "sh"; -- 1.6.5.2