|
|
|
#include "cache.h"
|
|
|
|
#include "strbuf.h"
|
|
|
|
#include "run-command.h"
|
|
|
|
|
|
|
|
#ifndef DEFAULT_EDITOR
|
|
|
|
#define DEFAULT_EDITOR "vi"
|
|
|
|
#endif
|
|
|
|
|
|
|
|
const char *git_editor(void)
|
|
|
|
{
|
Do not use VISUAL editor on dumb terminals
Refuse to use $VISUAL and fall back to $EDITOR if TERM is unset
or set to "dumb". Traditionally, VISUAL is set to a screen
editor and EDITOR to a line-based editor, which should be more
useful in that situation.
vim, for example, is happy to assume a terminal supports ANSI
sequences even if TERM is dumb (e.g., when running from a text
editor like Acme). git already refuses to fall back to vi on a
dumb terminal if GIT_EDITOR, core.editor, VISUAL, and EDITOR are
unset, but without this patch, that check is suppressed by
VISUAL=vi.
Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
15 years ago
|
|
|
const char *editor = getenv("GIT_EDITOR");
|
|
|
|
const char *terminal = getenv("TERM");
|
|
|
|
int terminal_is_dumb = !terminal || !strcmp(terminal, "dumb");
|
|
|
|
|
|
|
|
if (!editor && editor_program)
|
|
|
|
editor = editor_program;
|
Do not use VISUAL editor on dumb terminals
Refuse to use $VISUAL and fall back to $EDITOR if TERM is unset
or set to "dumb". Traditionally, VISUAL is set to a screen
editor and EDITOR to a line-based editor, which should be more
useful in that situation.
vim, for example, is happy to assume a terminal supports ANSI
sequences even if TERM is dumb (e.g., when running from a text
editor like Acme). git already refuses to fall back to vi on a
dumb terminal if GIT_EDITOR, core.editor, VISUAL, and EDITOR are
unset, but without this patch, that check is suppressed by
VISUAL=vi.
Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
15 years ago
|
|
|
if (!editor && !terminal_is_dumb)
|
|
|
|
editor = getenv("VISUAL");
|
|
|
|
if (!editor)
|
|
|
|
editor = getenv("EDITOR");
|
|
|
|
|
Do not use VISUAL editor on dumb terminals
Refuse to use $VISUAL and fall back to $EDITOR if TERM is unset
or set to "dumb". Traditionally, VISUAL is set to a screen
editor and EDITOR to a line-based editor, which should be more
useful in that situation.
vim, for example, is happy to assume a terminal supports ANSI
sequences even if TERM is dumb (e.g., when running from a text
editor like Acme). git already refuses to fall back to vi on a
dumb terminal if GIT_EDITOR, core.editor, VISUAL, and EDITOR are
unset, but without this patch, that check is suppressed by
VISUAL=vi.
Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
15 years ago
|
|
|
if (!editor && terminal_is_dumb)
|
|
|
|
return NULL;
|
|
|
|
|
|
|
|
if (!editor)
|
|
|
|
editor = DEFAULT_EDITOR;
|
|
|
|
|
|
|
|
return editor;
|
|
|
|
}
|
|
|
|
|
|
|
|
int launch_editor(const char *path, struct strbuf *buffer, const char *const *env)
|
|
|
|
{
|
|
|
|
const char *editor = git_editor();
|
|
|
|
|
|
|
|
if (!editor)
|
|
|
|
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;
|
|
|
|
|
|
|
|
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)
|
|
|
|
return error("There was a problem with the editor '%s'.",
|
|
|
|
editor);
|
|
|
|
}
|
|
|
|
|
|
|
|
if (!buffer)
|
|
|
|
return 0;
|
|
|
|
if (strbuf_read_file(buffer, path, 0) < 0)
|
|
|
|
return error("could not read file '%s': %s",
|
|
|
|
path, strerror(errno));
|
|
|
|
return 0;
|
|
|
|
}
|