1 Star 0 Fork 44

qjt0216/less

forked from src-openEuler/less 
加入 Gitee
与超过 1200万 开发者一起发现、参与优秀开源项目,私有仓库也完全免费 :)
免费加入
该仓库未声明开源许可证文件(LICENSE),使用请关注具体项目描述及其代码上游依赖。
克隆/下载
backport-Avoid-stealing-data-from-an-input-program-that-uses-.patch 1.27 KB
一键复制 编辑 原始数据 按行查看 历史
From c8df315c742fc470e766244ce8efe305a98d720a Mon Sep 17 00:00:00 2001
From: Mark Nudelman <markn@greenwoodsoftware.com>
Date: Sun, 28 May 2023 15:28:42 -0700
Subject: [PATCH] Avoid stealing data from an input program that uses the tty
at startup, like sudo.
---
os.c | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/os.c b/os.c
index af95834..7206277 100644
--- a/os.c
+++ b/os.c
@@ -114,6 +114,8 @@ static int check_poll(int fd, int tty)
{
struct pollfd poller[2] = { { fd, POLLIN, 0 }, { tty, POLLIN, 0 } };
int timeout = (waiting_for_data && !(scanning_eof && follow_mode == FOLLOW_NAME)) ? -1 : waiting_for_data_delay;
+ if (!any_data)
+ return (0);
poll(poller, 2, timeout);
#if LESSTEST
if (ttyin_name == NULL) /* Check for ^X only on a real tty. */
@@ -136,7 +138,7 @@ static int check_poll(int fd, int tty)
* to allow a program piping data into less to have temporary
* access to the tty (like sudo asking for a password).
*/
- if (any_data && (poller[0].revents & (POLLIN|POLLHUP|POLLERR)) == 0)
+ if ((poller[0].revents & (POLLIN|POLLHUP|POLLERR)) == 0)
/* No data available; let caller take action, then try again. */
return (READ_AGAIN);
/* There is data (or HUP/ERR) available. Safe to call read() without blocking. */
--
2.33.0
马建仓 AI 助手
尝试更多
代码解读
代码找茬
代码优化
1
https://gitee.com/qjt0216/less.git
git@gitee.com:qjt0216/less.git
qjt0216
less
less
master

搜索帮助