proxmox-mirrors/mirror_frr
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_frr synced 2025-08-14 04:26:12 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

From: Sergiy Vyshnevetskiy <serg@vostok.net>

Browse Source 
Subject: [zebra 18941] Re: [PATCH] misc patch

Program shouldn't terminate on pager execution failure. We can also use
"PAGER" environment variable - it's very common.
This commit is contained in:
paul 2003-05-01 14:29:48 +00:00
parent 6cbbc3cc9f
commit a805cc2d70
1 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
vtysh/vtysh.c
View File

@ -349,6 +349,8 @@ void
vtysh_pager_init ()
{
vtysh_pager_name = getenv ("VTYSH_PAGER");
if (! vtysh_pager_name)
vtysh_pager_name = getenv ("PAGER");
if (! vtysh_pager_name)
vtysh_pager_name = "more";
}
@ -361,6 +363,7 @@ vtysh_execute_func (char *line, int pager)
vector vline;
struct cmd_element *cmd;
FILE *fp = NULL;
int closepager=0;
/* Split readline string up into the vector */
vline = cmd_make_strvec (line);
@ -394,9 +397,11 @@ vtysh_execute_func (char *line, int pager)
fp = popen (vtysh_pager_name, "w");
if (fp == NULL)
{
perror ("popen");
exit (1);
perror ("popen failed for pager");
fp = stdout;
}
else
closepager=1;
}
else
fp = stdout;
@ -425,12 +430,11 @@ vtysh_execute_func (char *line, int pager)
if (vline == NULL)
{
if (pager && vtysh_pager_name && fp)
if (pager && vtysh_pager_name && fp && closepager)
{
if (pclose (fp) == -1)
{
perror ("pclose");
exit (1);
perror ("pclose failed for pager");
}
fp = NULL;
}
@ -478,12 +482,11 @@ vtysh_execute_func (char *line, int pager)
(*cmd->func) (cmd, vty, 0, NULL);
}
}
if (pager && vtysh_pager_name && fp)
if (pager && vtysh_pager_name && fp && closepager)
{
if (pclose (fp) == -1)
{
perror ("pclose");
exit (1);
perror ("pclose failed for pager");
}
fp = NULL;
}