summaryrefslogtreecommitdiff
path: root/editor.c
diff options
context:
space:
mode:
authorJeff King <peff@peff.net>2009-12-30 10:56:16 (GMT)
committerJunio C Hamano <gitster@pobox.com>2010-01-06 07:41:51 (GMT)
commitbac8037081735a49bccdc3b3b1457129f9bcc451 (patch)
tree09294e39702ca4a901e93bd23703610a047a3e55 /editor.c
parentf445644fd28d31a828731a618e9a9c79be89efd2 (diff)
downloadgit-bac8037081735a49bccdc3b3b1457129f9bcc451.zip
git-bac8037081735a49bccdc3b3b1457129f9bcc451.tar.gz
git-bac8037081735a49bccdc3b3b1457129f9bcc451.tar.bz2
editor: use run_command's shell feature
Now that run_command implements the same code in a more general form, we can make use of it. Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'editor.c')
-rw-r--r--editor.c21
1 files changed, 2 insertions, 19 deletions
diff --git a/editor.c b/editor.c
index 615f575..d834003 100644
--- a/editor.c
+++ b/editor.c
@@ -36,26 +36,9 @@ int launch_editor(const char *path, struct strbuf *buffer, const char *const *en
return error("Terminal is dumb, but EDITOR unset");
if (strcmp(editor, ":")) {
- size_t len = strlen(editor);
- int i = 0;
- int failed;
- const char *args[6];
- struct strbuf arg0 = STRBUF_INIT;
+ const char *args[] = { editor, path, NULL };
- if (strcspn(editor, "|&;<>()$`\\\"' \t\n*?[#~=%") != len) {
- /* there are specials */
- strbuf_addf(&arg0, "%s \"$@\"", editor);
- args[i++] = "sh";
- args[i++] = "-c";
- args[i++] = arg0.buf;
- }
- args[i++] = editor;
- args[i++] = path;
- args[i] = NULL;
-
- failed = run_command_v_opt_cd_env(args, 0, NULL, env);
- strbuf_release(&arg0);
- if (failed)
+ if (run_command_v_opt_cd_env(args, RUN_USING_SHELL, NULL, env))
return error("There was a problem with the editor '%s'.",
editor);
}