summaryrefslogtreecommitdiff
path: root/editor.c
diff options
context:
space:
mode:
authorJeff King <peff@peff.net>2012-11-30 22:41:50 (GMT)
committerJunio C Hamano <gitster@pobox.com>2012-12-02 10:07:08 (GMT)
commit1250857c6c2695020bce6669a4ff43d57a507d91 (patch)
tree35e0444e367f30239f161d78c4d483f8ae568991 /editor.c
parenta2767c5c91ebda3c083419c80a7f64248c5ec175 (diff)
downloadgit-1250857c6c2695020bce6669a4ff43d57a507d91.zip
git-1250857c6c2695020bce6669a4ff43d57a507d91.tar.gz
git-1250857c6c2695020bce6669a4ff43d57a507d91.tar.bz2
launch_editor: propagate signals from editor to git
We block SIGINT and SIGQUIT while the editor runs so that git is not killed accidentally by a stray "^C" meant for the editor or its subprocesses. This works because most editors ignore SIGINT. However, some editor wrappers, like emacsclient, expect to die due to ^C. We detect the signal death in the editor and properly exit, but not before writing a useless error message to stderr. Instead, let's notice when the editor was killed by a terminal signal and just raise the signal on ourselves. This skips the message and looks to our parent like we received SIGINT ourselves. The end effect is that if the user's editor ignores SIGINT, we will, too. And if it does not, then we will behave as if we did not ignore it. That should make all users happy. Note that in the off chance that another part of git has ignored SIGINT while calling launch_editor, we will still properly detect and propagate the failed return code from the editor (i.e., the worst case is that we generate the useless error, not fail to notice the editor's death). 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.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/editor.c b/editor.c
index c892a81..065a7ab 100644
--- a/editor.c
+++ b/editor.c
@@ -39,7 +39,7 @@ int launch_editor(const char *path, struct strbuf *buffer, const char *const *en
if (strcmp(editor, ":")) {
const char *args[] = { editor, path, NULL };
struct child_process p;
- int ret;
+ int ret, sig;
memset(&p, 0, sizeof(p));
p.argv = args;
@@ -51,8 +51,11 @@ int launch_editor(const char *path, struct strbuf *buffer, const char *const *en
sigchain_push(SIGINT, SIG_IGN);
sigchain_push(SIGQUIT, SIG_IGN);
ret = finish_command(&p);
+ sig = ret + 128;
sigchain_pop(SIGINT);
sigchain_pop(SIGQUIT);
+ if (sig == SIGINT || sig == SIGQUIT)
+ raise(sig);
if (ret)
return error("There was a problem with the editor '%s'.",
editor);