mirrors/zsh
1
0
Fork 0
mirror of git://git.code.sf.net/p/zsh/code synced 2025-09-25 17:41:19 +02:00
Code Releases Activity

27110: Only turn on MONITOR if set explicitly or INTERACTIVE

Browse source
This commit is contained in:
Peter Stephenson 2009-07-09 19:42:20 +00:00
parent b31ca21b46
commit aa563b1a3f
1 changed files with 7 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
Src/init.c
View file

@ -233,6 +233,11 @@ parseargs(char **argv)
* be changed. At the end of the function, a value of 2 gets *
* changed to 1. */
opts[INTERACTIVE] = isatty(0) ? 2 : 0;
/*
* MONITOR is similar: we initialise it to 2, and if it's
* still 2 at the end, we set it to the value of INTERACTIVE.
*/
opts[MONITOR] = 2; /* may be unset in init_io() */
opts[SHINSTDIN] = 0;
opts[SINGLECOMMAND] = 0;
@ -343,6 +348,8 @@ parseargs(char **argv)
if(isset(SINGLECOMMAND))
opts[INTERACTIVE] &= 1;
opts[INTERACTIVE] = !!opts[INTERACTIVE];
if (opts[MONITOR] == 2)
opts[MONITOR] = opts[INTERACTIVE];
pparams = x = (char **) zshcalloc((countlinknodes(paramlist) + 1) * sizeof(char *));
while ((*x++ = (char *)getlinknode(paramlist)));
@ -1395,7 +1402,6 @@ zsh_main(UNUSED(int argc), char **argv)
createoptiontable();
emulate(zsh_name, 1); /* initialises most options */
opts[LOGINSHELL] = (**argv == '-');
opts[MONITOR] = 1; /* may be unset in init_io() */
opts[PRIVILEGED] = (getuid() != geteuid() || getgid() != getegid());
opts[USEZLE] = 1; /* may be unset in init_io() */
parseargs(argv); /* sets INTERACTIVE, SHINSTDIN and SINGLECOMMAND */