From mboxrd@z Thu Jan 1 00:00:00 1970 From: Jeff King Subject: [PATCH 2/5] launch_editor: refactor to use start/finish_command Date: Fri, 30 Nov 2012 17:41:04 -0500 Message-ID: <20121130224104.GB23772@sigill.intra.peff.net> References: <20121130223943.GA27120@sigill.intra.peff.net> Mime-Version: 1.0 Content-Type: text/plain; charset=utf-8 Cc: Junio C Hamano , Paul Fox , Krzysztof Mazur To: git@vger.kernel.org X-From: git-owner@vger.kernel.org Fri Nov 30 23:41:30 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 1TeZGx-000888-J0 for gcvg-git-2@plane.gmane.org; Fri, 30 Nov 2012 23:41:27 +0100 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754101Ab2K3WlI (ORCPT ); Fri, 30 Nov 2012 17:41:08 -0500 Received: from 75-15-5-89.uvs.iplsin.sbcglobal.net ([75.15.5.89]:47988 "EHLO peff.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754045Ab2K3WlH (ORCPT ); Fri, 30 Nov 2012 17:41:07 -0500 Received: (qmail 6962 invoked by uid 107); 30 Nov 2012 22:42:03 -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; Fri, 30 Nov 2012 17:42:03 -0500 Received: by sigill.intra.peff.net (sSMTP sendmail emulation); Fri, 30 Nov 2012 17:41:04 -0500 Content-Disposition: inline In-Reply-To: <20121130223943.GA27120@sigill.intra.peff.net> Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org Archived-At: The launch_editor function uses the convenient run_command_* interface. Let's use the more flexible start_command and finish_command functions, which will let us manipulate the parent state while we're waiting for the child to finish. Signed-off-by: Jeff King --- editor.c | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/editor.c b/editor.c index d834003..842f782 100644 --- a/editor.c +++ b/editor.c @@ -37,8 +37,16 @@ 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; - if (run_command_v_opt_cd_env(args, RUN_USING_SHELL, NULL, env)) + memset(&p, 0, sizeof(p)); + p.argv = args; + p.env = env; + p.use_shell = 1; + if (start_command(&p) < 0) + return error("unable to start editor '%s'", editor); + + if (finish_command(&p)) return error("There was a problem with the editor '%s'.", editor); } -- 1.8.0.1.620.g558b0aa