From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Google-Smtp-Source: AH8x22599gLwdSuE5v8MdWQtGxxlXUxvJ9M6HvjvlxmPs/rToTF3clRw+f1fFXFj2Kb4jXTLTIXg ARC-Seal: i=1; a=rsa-sha256; t=1516868217; cv=none; d=google.com; s=arc-20160816; b=OoiGduDItNW8wvf2ChhYUlniPL85csWlASD7R2LEfM7XGBVGTZob1RwJ7Lazv3o7e9 ZRP7XAgkrH22YGrfB2nstJ+4Zr4ktrGQtZjaGspvfEuwcuwgxxeeyZ5V5/io3noSRWEA mEexR7YenQ7VE3wj0BHdHC7DLSdktYe+7G1KuxC9V3m/8TwLNWkG9SGVAj6UtIXeOsNT JwMU7QbRDiVBVO0n1k8vrNqNmAUBLj/LJLTpszVpBOasTJlYa6Nq7Q07PWVo3UKTJvvx D/a0dGWjJqCuOPW2wDpXuh43VkcdndJyPsIWJrlVE4cuPxKjDuSYqZEhz4SniHQ/IsAB QS4w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=user-agent:in-reply-to:content-disposition:mime-version:references :message-id:subject:cc:to:from:date:dmarc-filter :arc-authentication-results; bh=DrCFgvFjE2LE1jy9P2l8DEzUXOHl7nOhE7uNObao1oY=; b=bcQi2PV6ZsidkVcJuTB0Fveg0iN2DeO60Wadd8FJNpt6w5uf7GNngTW2giqwQORuou u5ij7lcY+g1Mbe47jZdiEXR7bo0vGZq4QRMhGL2CDbGx8qpIIjv+f0FwdDeNBHAif6wB dNiqqBz5DhXgYqPz/Jy7j3SaJJw3VYepX9MfpQL5fvTdqlLv+7UzIeHi+0YBPfOzcu2F ZC4FlHzTWHtwk2zJru1ws4jYAmjg5mc2NsQzSzyLOK54+UJL/Dm7+u9Jt23T7qGDl7DX 2rJPz0LqKV+kAUxR+nlogg7KBJl1CKjkXY7C6zb9OXyykwywlrj1PirmVLYyzFZAXbTj 5G7A== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of acme@kernel.org designates 198.145.29.99 as permitted sender) smtp.mailfrom=acme@kernel.org Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of acme@kernel.org designates 198.145.29.99 as permitted sender) smtp.mailfrom=acme@kernel.org DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 498A721778 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=kernel.org Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=acme@kernel.org Date: Thu, 25 Jan 2018 05:16:52 -0300 From: Arnaldo Carvalho de Melo To: Josh Poimboeuf Cc: Arvind Sankar , linux-kernel@vger.kernel.org, Greg Kroah-Hartman , Peter Zijlstra , Ingo Molnar Subject: Re: [PATCH] tools: libsubcmd: Drop the less hack that was inherited from Git. Message-ID: <20180125081652.GA23548@kernel.org> References: <20180124003831.GA34667@rani.riverdale> <20180124205411.lpzcpqnuw3nlyg4n@treble> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20180124205411.lpzcpqnuw3nlyg4n@treble> X-Url: http://acmel.wordpress.com User-Agent: Mutt/1.9.1 (2017-09-22) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: =?utf-8?q?1590432180841544172?= X-GMAIL-MSGID: =?utf-8?q?1590551607438747431?= X-Mailing-List: linux-kernel@vger.kernel.org List-ID: Em Wed, Jan 24, 2018 at 02:54:11PM -0600, Josh Poimboeuf escreveu: > On Tue, Jan 23, 2018 at 07:38:37PM -0500, Arvind Sankar wrote: > > We inherited this hack with the original code from the Git project. The > > select call is invalid as the two fd_set pointers should not be aliased. > > > > We could fix it, but the Git project removed this hack in 2012 in commit > > e8320f3 (pager: drop "wait for output to run less" hack). The bug it > > worked around was apparently fixed in less back in June 2007. > > > > So remove the hack from here as well. > > > > Signed-off-by: Arvind Sankar > > Looks good to me. > > Acked-by: Josh Poimboeuf > > Libsubcmd is used by perf and objtool, so adding the perf maintainers to > CC. Arnaldo, do you want to pick this one up? Sure, I'll put it in my perf/core branch. - Arnaldo > > --- > > tools/lib/subcmd/pager.c | 17 ----------------- > > tools/lib/subcmd/run-command.c | 2 -- > > tools/lib/subcmd/run-command.h | 1 - > > 3 files changed, 20 deletions(-) > > > > diff --git a/tools/lib/subcmd/pager.c b/tools/lib/subcmd/pager.c > > index 5ba754d17952..94d61d9b511f 100644 > > --- a/tools/lib/subcmd/pager.c > > +++ b/tools/lib/subcmd/pager.c > > @@ -1,5 +1,4 @@ > > // SPDX-License-Identifier: GPL-2.0 > > -#include > > #include > > #include > > #include > > @@ -23,21 +22,6 @@ void pager_init(const char *pager_env) > > subcmd_config.pager_env = pager_env; > > } > > > > -static void pager_preexec(void) > > -{ > > - /* > > - * Work around bug in "less" by not starting it until we > > - * have real input > > - */ > > - fd_set in; > > - > > - FD_ZERO(&in); > > - FD_SET(0, &in); > > - select(1, &in, NULL, &in, NULL); > > - > > - setenv("LESS", "FRSX", 0); > > -} > > - > > static const char *pager_argv[] = { "sh", "-c", NULL, NULL }; > > static struct child_process pager_process; > > > > @@ -84,7 +68,6 @@ void setup_pager(void) > > pager_argv[2] = pager; > > pager_process.argv = pager_argv; > > pager_process.in = -1; > > - pager_process.preexec_cb = pager_preexec; > > > > if (start_command(&pager_process)) > > return; > > diff --git a/tools/lib/subcmd/run-command.c b/tools/lib/subcmd/run-command.c > > index 5cdac2162532..9e9dca717ed7 100644 > > --- a/tools/lib/subcmd/run-command.c > > +++ b/tools/lib/subcmd/run-command.c > > @@ -120,8 +120,6 @@ int start_command(struct child_process *cmd) > > unsetenv(*cmd->env); > > } > > } > > - if (cmd->preexec_cb) > > - cmd->preexec_cb(); > > if (cmd->exec_cmd) { > > execv_cmd(cmd->argv); > > } else { > > diff --git a/tools/lib/subcmd/run-command.h b/tools/lib/subcmd/run-command.h > > index 17d969c6add3..6256268802b5 100644 > > --- a/tools/lib/subcmd/run-command.h > > +++ b/tools/lib/subcmd/run-command.h > > @@ -46,7 +46,6 @@ struct child_process { > > unsigned no_stderr:1; > > unsigned exec_cmd:1; /* if this is to be external sub-command */ > > unsigned stdout_to_stderr:1; > > - void (*preexec_cb)(void); > > }; > > > > int start_command(struct child_process *); > > -- > > 2.13.6 > > > > -- > Josh