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>

diff --git a/builtin-commit.c b/builtin-commit.c
index 6a9dc0e30fc23d79df099fbd05b69bacf54238be..9a11ca0bcd402d9bd4488df6e3526e4a24617b30 100644 (file)
--- a/builtin-commit.c
+++ b/builtin-commit.c
@@ -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);
                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 &&
        }
 
        if (!no_verify &&

diff --git a/builtin-tag.c b/builtin-tag.c
index 219f51d6fc56d1d4a7623cd921e9f18dc7e0ca90..325b1b2632e44121c23bc6df556bf3aa4e32ba04 100644 (file)
--- a/builtin-tag.c
+++ b/builtin-tag.c
@@ -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);
 
                        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);
 
                unlink(path);
                free(path);

diff --git a/editor.c b/editor.c
index 483b62d2ce2bd913edcfedf2ee4bc908db7e6adc..eebc3e95fe0c7e61f7c29fa5412ea9d4a5900f92 100644 (file)
--- a/editor.c
+++ b/editor.c
@@ -2,7 +2,7 @@
 #include "strbuf.h"
 #include "run-command.h"
 
 #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;
 
 {
        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");
                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";
 
        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;
        if (strcmp(editor, ":")) {
                size_t len = strlen(editor);
                int i = 0;

+               int failed;

                const char *args[6];
                struct strbuf arg0;
 
                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;
 
                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);
                strbuf_release(&arg0);

+               if (failed)
+                       return error("There was a problem with the editor '%s'.",
+                                       editor);

        }
 
        if (!buffer)
        }
 
        if (!buffer)

-               return;
+               return 0;

        if (strbuf_read_file(buffer, path, 0) < 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;

 }
 }

diff --git a/strbuf.h b/strbuf.h
index 0c6ffad53a8f0362a9d5fe9b0685aeaa96346076..eba7ba423a2d3a383ef93f663c95695438269edf 100644 (file)
--- a/strbuf.h
+++ b/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 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 */
 
 #endif /* STRBUF_H */