1
0
Fork 0
mirror of git://git.code.sf.net/p/zsh/code synced 2025-09-26 18:01:03 +02:00

27100: Allow MONITOR option in non-interactive shells for testing.

This commit is contained in:
Peter Stephenson 2009-07-08 17:06:02 +00:00
parent c6a3ccc8d7
commit b31ca21b46
3 changed files with 9 additions and 3 deletions

View file

@ -1,3 +1,9 @@
2009-07-08 Peter Stephenson <pws@csr.com>
* 27100: Allow MONITOR option in non-interactive shells.
Not properly test it, but you only get if you ask for it,
so worth committing to allow it to be further investigated.
2009-07-06 Peter Stephenson <p.w.stephenson@ntlworld.com> 2009-07-06 Peter Stephenson <p.w.stephenson@ntlworld.com>
* 27092: Src/parse.c, Test/A01grammar.ztst: "if" didn't check * 27092: Src/parse.c, Test/A01grammar.ztst: "if" didn't check
@ -11910,5 +11916,5 @@
***************************************************** *****************************************************
* This is used by the shell to define $ZSH_PATCHLEVEL * This is used by the shell to define $ZSH_PATCHLEVEL
* $Revision: 1.4728 $ * $Revision: 1.4729 $
***************************************************** *****************************************************

View file

@ -486,7 +486,7 @@ init_io(void)
* process group leader. * process group leader.
*/ */
mypid = (zlong)getpid(); mypid = (zlong)getpid();
if (opts[MONITOR] && interact && (SHTTY != -1)) { if (opts[MONITOR] && (SHTTY != -1)) {
origpgrp = GETPGRP(); origpgrp = GETPGRP();
acquire_pgrp(); /* might also clear opts[MONITOR] */ acquire_pgrp(); /* might also clear opts[MONITOR] */
} else } else

View file

@ -730,7 +730,7 @@ dosetopt(int optno, int value, int force)
} else if (!force && optno == MONITOR && value) { } else if (!force && optno == MONITOR && value) {
if (opts[optno] == value) if (opts[optno] == value)
return 0; return 0;
if (interact && (SHTTY != -1)) { if (SHTTY != -1) {
origpgrp = GETPGRP(); origpgrp = GETPGRP();
acquire_pgrp(); acquire_pgrp();
} else } else