From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Google-Smtp-Source: AH8x226fJbAW0mwc7A9Lhos32InWlDPojjaeOcxunmMByT7wWDEcb6Ise6sqat8TJ8LfHt/xZBVL ARC-Seal: i=1; a=rsa-sha256; t=1518139052; cv=none; d=google.com; s=arc-20160816; b=l3IBXOSQ1oi+MPM8bxNOeNzRYYLd6MMsdeNLv1TR9dhpJlmOlEyLjMxoD0okR1D3KP AMUQXyKiSZSpNOb9f10eAfGIRaZE559NprRjfO4YWP/cFpfADks8uexWu1RrEaEHunA2 lLRyUz5mQTN0xe2NZRZQxUc1HXTjLAo0El5QnxzWuIZ2MYl9eKrffJ6H8pL19he19t/z EabbUe3ROCz1zVtqRwpH2YefXB81Pa3CibH2sFr+z16TzNa42C5Q7WbeuMI5p2SGT1RG 76x9i/R2NhgZnWWme4nfMcUEVzdooUIB4y7UEL2ERCe7uY7lW8Am3Vbyq30wLstFvd92 mz9Q== 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=n5oSBjD7fi0rFoD2jEcdMOoz3owsqUevA03Fm3L2Trc=; b=lOvD1cUjp6rdajJdS2dF/c50SxhxSMN3pevTpPRLynSm8UuX03ybyxIhFghaA6gxRU SjKDvveg3hWWM4WdGffQdf0dukWMGpWl6lpg6cgDGtO43dC4ReHclvJCa/3ByZ1GLFHR 4YSHcGGPfmYPRMevUz8qW6YgHaProk/ZLLS0mxhhwhoZm2B0ka0um5ZYUtlSNhBJ7IXW 2pXP0St7fO6MkCV9toI+YRCQsAdvbNngWTBpfoKJzaGErYtcs6AqIiDMkxSCpO6fxhEJ 57mQQwS7LvYaqnMJosDMgKOy8aVucVJPNJJaaoPk3eEfhNUkgQCBZRAs+qjTr0aeyvNj YZYQ== 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 C98CA21789 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, 8 Feb 2018 22:17:28 -0300 From: Arnaldo Carvalho de Melo To: Arvind Sankar Cc: Josh Poimboeuf , 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: <20180209011728.GB5132@kernel.org> References: <20180124003831.GA34667@rani.riverdale> <20180124205411.lpzcpqnuw3nlyg4n@treble> <20180125081652.GA23548@kernel.org> <20180209000009.GA54330@rani.riverdale> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20180209000009.GA54330@rani.riverdale> 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?1591884174700997265?= X-Mailing-List: linux-kernel@vger.kernel.org List-ID: Em Thu, Feb 08, 2018 at 07:00:10PM -0500, Arvind Sankar escreveu: > 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. Ok, so e8320f3 was merged directly by Linus, I'll wait till perf/urgent pulls from upstream and then will merge this, Thanks, - Arnaldo > Signed-off-by: Arvind Sankar > --- > - Merge with commit ad343a98 (tools/lib/subcmd/pager.c: do not alias > select() params) by Sergey > > tools/lib/subcmd/pager.c | 20 -------------------- > tools/lib/subcmd/run-command.c | 2 -- > tools/lib/subcmd/run-command.h | 1 - > 3 files changed, 23 deletions(-) > > diff --git a/tools/lib/subcmd/pager.c b/tools/lib/subcmd/pager.c > index 9997a8805a82..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,24 +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_set exception; > - > - FD_ZERO(&in); > - FD_ZERO(&exception); > - FD_SET(0, &in); > - FD_SET(0, &exception); > - select(1, &in, NULL, &exception, NULL); > - > - setenv("LESS", "FRSX", 0); > -} > - > static const char *pager_argv[] = { "sh", "-c", NULL, NULL }; > static struct child_process pager_process; > > @@ -87,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