summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rw-r--r--Src/options.c11
2 files changed, 15 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index b1d9be91d..aa46ae286 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2006-08-22 Peter Stephenson <pws@csr.com>
+
+ * 22656: Src/options.c (slightly tweaked): improve handling of
+ monitor option a bit.
+
2006-08-21 Peter Stephenson <p.w.stephenson@ntlworld.com>
* zsh-users/10634: Completion/compinstall: attempt to fix up
diff --git a/Src/options.c b/Src/options.c
index 05e878687..d30553050 100644
--- a/Src/options.c
+++ b/Src/options.c
@@ -687,7 +687,16 @@ dosetopt(int optno, int value, int force)
setuid(getuid());
setgid(getgid());
#endif /* HAVE_SETUID */
-#ifndef JOB_CONTROL
+#ifdef JOB_CONTROL
+ } else if (!force && optno == MONITOR && value) {
+ if (opts[optno] == value)
+ return 0;
+ if (interact && (SHTTY != -1)) {
+ origpgrp = GETPGRP();
+ acquire_pgrp();
+ } else
+ return -1;
+#else
} else if(optno == MONITOR && value) {
return -1;
#endif /* not JOB_CONTROL */