projects
/
git.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'jc/mailinfo'
[git.git]
/
pager.c
diff --git
a/pager.c
b/pager.c
index
1364e15
..
9a30939
100644
(file)
--- a/
pager.c
+++ b/
pager.c
@@
-5,22
+5,25
@@
* something different on Windows, for example.
*/
* something different on Windows, for example.
*/
-static void run_pager(
void
)
+static void run_pager(
const char *pager
)
{
{
- const char *prog = getenv("PAGER");
- if (!prog)
- prog = "less";
- setenv("LESS", "-S", 0);
- execlp(prog, prog, NULL);
+ execlp(pager, pager, NULL);
+ execl("/bin/sh", "sh", "-c", pager, NULL);
}
void setup_pager(void)
{
pid_t pid;
int fd[2];
}
void setup_pager(void)
{
pid_t pid;
int fd[2];
+ const char *pager = getenv("PAGER");
if (!isatty(1))
return;
if (!isatty(1))
return;
+ if (!pager)
+ pager = "less";
+ else if (!*pager || !strcmp(pager, "cat"))
+ return;
+
if (pipe(fd) < 0)
return;
pid = fork();
if (pipe(fd) < 0)
return;
pid = fork();
@@
-43,6
+46,8
@@
void setup_pager(void)
close(fd[0]);
close(fd[1]);
close(fd[0]);
close(fd[1]);
- run_pager();
+ setenv("LESS", "-S", 0);
+ run_pager(pager);
+ die("unable to execute pager '%s'", pager);
exit(255);
}
exit(255);
}