From: Dragan Simic Date: Tue, 4 Jul 2023 09:14:30 +0000 (+0200) Subject: lib/pager: Apply pager-specific fixes only when needed X-Git-Tag: v2.40-rc1~341 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=c10ad975895372122f72c8d9da089b6ea69f778b;p=thirdparty%2Futil-linux.git lib/pager: Apply pager-specific fixes only when needed Currently defined output filter quirk fixes and environment variable tweaks apply to less(1) only, so let's don't apply them when the pager is actually configured to something else. While there, rename the less(1)-specific callback function to make clear what it applies to, and to make adding any posible additional pager-specific callback functions a bit easier. Signed-off-by: Dragan Simic --- diff --git a/lib/pager.c b/lib/pager.c index db7a989df4..98814b5492 100644 --- a/lib/pager.c +++ b/lib/pager.c @@ -85,7 +85,9 @@ static int start_command(struct child_process *cmd) close(cmd->in); } - cmd->preexec_cb(); + if (cmd->preexec_cb) + cmd->preexec_cb(); + execvp(cmd->argv[0], (char *const*) cmd->argv); errexec(cmd->argv[0]); } @@ -140,7 +142,7 @@ static int finish_command(struct child_process *cmd) return wait_or_whine(cmd->pid); } -static void pager_preexec(void) +static void pager_preexec_less(void) { /* * Work around bug in "less" by not starting it until we @@ -240,7 +242,11 @@ static void __setup_pager(void) pager_argv[2] = pager; pager_process.argv = pager_argv; pager_process.in = -1; - pager_process.preexec_cb = pager_preexec; + + if (!strncmp(pager, "less", 4)) + pager_process.preexec_cb = pager_preexec_less; + else + pager_process.preexec_cb = NULL; if (start_command(&pager_process)) return;