undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'jc/pager-cat' into next

Browse Source 
* jc/pager-cat:
  Do not fork PAGER=cat
  pager: do not fork a pager if PAGER is set to empty.
This commit is contained in:
Junio C Hamano 2006-04-16 01:49:13 -07:00
commit e4284db2c5
1 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
pager.c
View File

@ -5,22 +5,24 @@
* 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"); execlp(pager, pager, NULL);
if (!prog)
prog = "less";
setenv("LESS", "-S", 0);
execlp(prog, prog, NULL);
} }
void setup_pager(void) void setup_pager(void)
{ {
pid_t pid; pid_t pid;
int fd[2]; int fd[2];
const char *pager = getenv("PAGER");
if (!isatty(1)) if (!isatty(1))
return; return;
if (!pager)
pager = "less";
else if (!*pager || !strcmp(pager, "cat"))
return;
if (pipe(fd) < 0) if (pipe(fd) < 0)
return; return;
pid = fork(); pid = fork();
@ -43,6 +45,7 @@ void setup_pager(void)
close(fd[0]); close(fd[0]);
close(fd[1]); close(fd[1]);
run_pager(); setenv("LESS", "-S", 0);
run_pager(pager);
exit(255); exit(255);
} }