editor.c: Libify launch_editor()
This patch removes exit()/die() calls and builtin-specific messages from launch_editor(), so that it can be used as a general libgit.a function to launch an editor. Signed-off-by: Stephan Beyer <s-beyer@gmx.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
parent
d82f33e20d
commit
7198203ae3
@ -646,7 +646,11 @@ static int prepare_to_commit(const char *index_file, const char *prefix)
|
||||
char index[PATH_MAX];
|
||||
const char *env[2] = { index, NULL };
|
||||
snprintf(index, sizeof(index), "GIT_INDEX_FILE=%s", index_file);
|
||||
launch_editor(git_path(commit_editmsg), NULL, env);
|
||||
if (launch_editor(git_path(commit_editmsg), NULL, env)) {
|
||||
fprintf(stderr,
|
||||
"Please supply the message using either -m or -F option.\n");
|
||||
exit(1);
|
||||
}
|
||||
}
|
||||
|
||||
if (!no_verify &&
|
||||
|
@ -295,7 +295,11 @@ static void create_tag(const unsigned char *object, const char *tag,
|
||||
write_or_die(fd, tag_template, strlen(tag_template));
|
||||
close(fd);
|
||||
|
||||
launch_editor(path, buf, NULL);
|
||||
if (launch_editor(path, buf, NULL)) {
|
||||
fprintf(stderr,
|
||||
"Please supply the message using either -m or -F option.\n");
|
||||
exit(1);
|
||||
}
|
||||
|
||||
unlink(path);
|
||||
free(path);
|
||||
|
24
editor.c
24
editor.c
@ -2,7 +2,7 @@
|
||||
#include "strbuf.h"
|
||||
#include "run-command.h"
|
||||
|
||||
void launch_editor(const char *path, struct strbuf *buffer, const char *const *env)
|
||||
int launch_editor(const char *path, struct strbuf *buffer, const char *const *env)
|
||||
{
|
||||
const char *editor, *terminal;
|
||||
|
||||
@ -15,12 +15,8 @@ void launch_editor(const char *path, struct strbuf *buffer, const char *const *e
|
||||
editor = getenv("EDITOR");
|
||||
|
||||
terminal = getenv("TERM");
|
||||
if (!editor && (!terminal || !strcmp(terminal, "dumb"))) {
|
||||
fprintf(stderr,
|
||||
"Terminal is dumb but no VISUAL nor EDITOR defined.\n"
|
||||
"Please supply the message using either -m or -F option.\n");
|
||||
exit(1);
|
||||
}
|
||||
if (!editor && (!terminal || !strcmp(terminal, "dumb")))
|
||||
return error("Terminal is dumb but no VISUAL nor EDITOR defined.");
|
||||
|
||||
if (!editor)
|
||||
editor = "vi";
|
||||
@ -28,6 +24,7 @@ void launch_editor(const char *path, struct strbuf *buffer, const char *const *e
|
||||
if (strcmp(editor, ":")) {
|
||||
size_t len = strlen(editor);
|
||||
int i = 0;
|
||||
int failed;
|
||||
const char *args[6];
|
||||
struct strbuf arg0;
|
||||
|
||||
@ -43,14 +40,17 @@ void launch_editor(const char *path, struct strbuf *buffer, const char *const *e
|
||||
args[i++] = path;
|
||||
args[i] = NULL;
|
||||
|
||||
if (run_command_v_opt_cd_env(args, 0, NULL, env))
|
||||
die("There was a problem with the editor %s.", editor);
|
||||
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;
|
||||
return 0;
|
||||
if (strbuf_read_file(buffer, path, 0) < 0)
|
||||
die("could not read message file '%s': %s",
|
||||
path, strerror(errno));
|
||||
return error("could not read file '%s': %s",
|
||||
path, strerror(errno));
|
||||
return 0;
|
||||
}
|
||||
|
2
strbuf.h
2
strbuf.h
@ -123,6 +123,6 @@ extern int strbuf_read_file(struct strbuf *sb, const char *path, size_t hint);
|
||||
extern int strbuf_getline(struct strbuf *, FILE *, int);
|
||||
|
||||
extern void stripspace(struct strbuf *buf, int skip_comments);
|
||||
extern void launch_editor(const char *path, struct strbuf *buffer, const char *const *env);
|
||||
extern int launch_editor(const char *path, struct strbuf *buffer, const char *const *env);
|
||||
|
||||
#endif /* STRBUF_H */
|
||||
|
Loading…
Reference in New Issue
Block a user