builtin-apply.c: Skip filenames without enough components

diff --git a/editor.c b/editor.c
index 483b62d2ce2bd913edcfedf2ee4bc908db7e6adc..615f5754d66ba7ea611a4837b1ff802f9f9de598 100644 (file)
--- a/editor.c
+++ b/editor.c
@@ -2,37 +2,47 @@
 #include "strbuf.h"
 #include "run-command.h"
 
-void launch_editor(const char *path, struct strbuf *buffer, const char *const *env)
+#ifndef DEFAULT_EDITOR
+#define DEFAULT_EDITOR "vi"
+#endif
+
+const char *git_editor(void)
 {
-       const char *editor, *terminal;
+       const char *editor = getenv("GIT_EDITOR");
+       const char *terminal = getenv("TERM");
+       int terminal_is_dumb = !terminal || !strcmp(terminal, "dumb");
 
-       editor = getenv("GIT_EDITOR");
        if (!editor && editor_program)
                editor = editor_program;
-       if (!editor)
+       if (!editor && !terminal_is_dumb)
                editor = getenv("VISUAL");
        if (!editor)
                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_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)
-               editor = "vi";
+               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;
+               struct strbuf arg0 = STRBUF_INIT;
 
-               strbuf_init(&arg0, 0);
-               if (strcspn(editor, "$ \t'") != len) {
+               if (strcspn(editor, "|&;<>()$`\\\"' \t\n*?[#~=%") != len) {
                        /* there are specials */
                        strbuf_addf(&arg0, "%s \"$@\"", editor);
                        args[i++] = "sh";
@@ -43,14 +53,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;
 }