From mboxrd@z Thu Jan 1 00:00:00 1970 From: Jeff King Subject: [PATCH 2/5] launch_editor: ignore SIGINT while the editor has control Date: Sun, 11 Nov 2012 11:58:56 -0500 Message-ID: <20121111165855.GA19962@sigill.intra.peff.net> References: <20121111163100.GB13188@sigill.intra.peff.net> Mime-Version: 1.0 Content-Type: text/plain; charset=utf-8 Cc: Paul Fox , git@vger.kernel.org To: Kalle Olavi Niemitalo X-From: git-owner@vger.kernel.org Sun Nov 11 17:59:12 2012 Return-path: Envelope-to: gcvg-git-2@plane.gmane.org Received: from vger.kernel.org ([209.132.180.67]) by plane.gmane.org with esmtp (Exim 4.69) (envelope-from ) id 1TXasK-0004wZ-2Q for gcvg-git-2@plane.gmane.org; Sun, 11 Nov 2012 17:59:12 +0100 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752577Ab2KKQ67 (ORCPT ); Sun, 11 Nov 2012 11:58:59 -0500 Received: from 75-15-5-89.uvs.iplsin.sbcglobal.net ([75.15.5.89]:43978 "EHLO peff.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751212Ab2KKQ66 (ORCPT ); Sun, 11 Nov 2012 11:58:58 -0500 Received: (qmail 1255 invoked by uid 107); 11 Nov 2012 16:59:45 -0000 Received: from sigill.intra.peff.net (HELO sigill.intra.peff.net) (10.0.0.7) (smtp-auth username relayok, mechanism cram-md5) by peff.net (qpsmtpd/0.84) with ESMTPA; Sun, 11 Nov 2012 11:59:45 -0500 Received: by sigill.intra.peff.net (sSMTP sendmail emulation); Sun, 11 Nov 2012 11:58:56 -0500 Content-Disposition: inline In-Reply-To: <20121111163100.GB13188@sigill.intra.peff.net> Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org Archived-At: From: Paul Fox The user's editor likely catches SIGINT (ctrl-C). but if the user spawns a command from the editor and uses ctrl-C to kill that command, the SIGINT will likely also kill git itself (depending on the editor, this can leave the terminal in an unusable state). Signed-off-by: Paul Fox Signed-off-by: Jeff King --- Whoops, my original sending of this actually had Paul in the email's >From field, not in the pseudo-header of the commit. Apologies if you receive an extra forged copy. editor.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/editor.c b/editor.c index 842f782..28aae85 100644 --- a/editor.c +++ b/editor.c @@ -1,6 +1,7 @@ #include "cache.h" #include "strbuf.h" #include "run-command.h" +#include "sigchain.h" #ifndef DEFAULT_EDITOR #define DEFAULT_EDITOR "vi" @@ -38,6 +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; memset(&p, 0, sizeof(p)); p.argv = args; @@ -46,7 +48,10 @@ int launch_editor(const char *path, struct strbuf *buffer, const char *const *en if (start_command(&p) < 0) return error("unable to start editor '%s'", editor); - if (finish_command(&p)) + sigchain_push(SIGINT, SIG_IGN); + ret = finish_command(&p); + sigchain_pop(SIGINT); + if (ret) return error("There was a problem with the editor '%s'.", editor); } -- 1.8.0.207.gdf2154c