From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: ARC-Seal: i=1; a=rsa-sha256; t=1516754322; cv=none; d=google.com; s=arc-20160816; b=gpBQ7U/FchSc6wuAm3BaYXvo/CaSNxHEbHZu7K94IZdWGqLLMtZN9x+uxXQsXKOR0G 5Fi550dwWS8qHRWvw0LtzdodgsYgTn1JiiIRhaJgPOEcwy4SoQxZci86433GYxzPi9WN IicFEGVRdPuqhxEHOQx5CTNIRdYl4gZ7zmSpidieL5rd3Y2ZjTPZzfmjgATZfi2CeO6g E4F1UW5rZIcgfkdcpv6n6npisxH6g3edPoUqEpo+gvKz8w7knSv1smB/20sDpBukEj2R 93+/3IYAQgeg1lJmgCYH6W/nSz/KiR8FMiIyEHTS1YdzT4E1RjphFGcMNaCbhfqqHK2q Hp1w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=user-agent:content-disposition:mime-version:message-id:subject:cc :to:from:date:arc-authentication-results; bh=0T78cxOaHYn+62eyuZBQLarxOE8UOReRSkP3o26pSUE=; b=wy2atEdOpd++QmIxEbJECwZMwDldLfE2Imeb2m8VymbjwSW1qFfpVhHqWlm+Gae7ib 0jez/8T+mkBCrdwqNsAS1gICzuB86fTLDsZOMcEJPiNtnDo7V0D0YfPYEVnw3GHeX6vi purfGXaXTura5KNWOjmZAWEcn3PirMKLCGH67YuT9vyAeBl5UZIa8mxxAYLnENJvWIIw CsRFuUPFDFFw0Na2/FycM4qTcl1uWNgYvY40sZ58AdG7c+TSNlqIcO8aRA1CeL4+VnDZ esGQU9WFXhCMBsbyeKj9jdsfQsvKk8mD+WJ6AUdPMgEJa6C20F9mhjGery2qjUmBQ7qO oIJA== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of niveditas98@gmail.com designates 209.85.220.65 as permitted sender) smtp.mailfrom=niveditas98@gmail.com Authentication-Results: mx.google.com; spf=pass (google.com: domain of niveditas98@gmail.com designates 209.85.220.65 as permitted sender) smtp.mailfrom=niveditas98@gmail.com X-Google-Smtp-Source: AH8x224xc3XDqRNLE6vYtwcinC1Zt9UMBQMDYWnUp6fsOuk/wJgG/dWP7NhLM+uUVUZcYuWa7F5ojw== Date: Tue, 23 Jan 2018 19:38:37 -0500 From: Arvind Sankar To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , Josh Poimboeuf Subject: [PATCH] tools: libsubcmd: Drop the less hack that was inherited from Git. Message-ID: <20180124003831.GA34667@rani.riverdale> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline User-Agent: Mutt/1.7.2 (2016-11-26) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: =?utf-8?q?1590432180841544172?= X-GMAIL-MSGID: =?utf-8?q?1590432180841544172?= X-Mailing-List: linux-kernel@vger.kernel.org List-ID: 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 --- 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