diff options
author | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-04-14 19:33:32 +0000 |
---|---|---|
committer | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-04-14 19:33:32 +0000 |
commit | 8bb05ac73a5b448b339ce0bc8d396c82c459b47f (patch) | |
tree | 1fdda006866bca20d41cb206767ea5241e36852f /lib/pager.c | |
parent | Adding debian version 2.39.3-11. (diff) | |
download | util-linux-8bb05ac73a5b448b339ce0bc8d396c82c459b47f.tar.xz util-linux-8bb05ac73a5b448b339ce0bc8d396c82c459b47f.zip |
Merging upstream version 2.40.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to 'lib/pager.c')
-rw-r--r-- | lib/pager.c | 38 |
1 files changed, 27 insertions, 11 deletions
diff --git a/lib/pager.c b/lib/pager.c index 9429032..98814b5 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 @@ -178,35 +180,45 @@ static void wait_for_pager_signal(int signo) static int has_command(const char *cmd) { const char *path; - char *p, *s; + char *b, *c, *p, *s; int rc = 0; if (!cmd) goto done; - if (*cmd == '/') { - rc = access(cmd, X_OK) == 0; + + c = xstrdup(cmd); + if (!c) goto done; + b = strtok(c, " "); /* cmd may contain options */ + if (!b) + goto cleanup; + + if (*b == '/') { + rc = access(b, X_OK) == 0; + goto cleanup; } path = getenv("PATH"); if (!path) - goto done; + goto cleanup; p = xstrdup(path); if (!p) - goto done; + goto cleanup; - for(s = strtok(p, ":"); s; s = strtok(NULL, ":")) { + for (s = strtok(p, ":"); s; s = strtok(NULL, ":")) { int fd = open(s, O_RDONLY|O_CLOEXEC); if (fd < 0) continue; - rc = faccessat(fd, cmd, X_OK, 0) == 0; + rc = faccessat(fd, b, X_OK, 0) == 0; close(fd); if (rc) break; } free(p); +cleanup: + free(c); done: - /*fprintf(stderr, "has PAGER %s rc=%d\n", cmd, rc);*/ + /*fprintf(stderr, "has PAGER '%s': rc=%d\n", cmd, rc);*/ return rc; } @@ -230,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; |