about summary refs log tree commit diff
diff options
context:
space:
mode:
authorSven Wischnowsky <wischnow@users.sourceforge.net>2000-05-05 09:12:49 +0000
committerSven Wischnowsky <wischnow@users.sourceforge.net>2000-05-05 09:12:49 +0000
commit27f895df41af61a8ba678c390a5ef405109e8187 (patch)
tree9cead0794c9f2ad334d867d39bf416c9cd323767
parentd4d35a114c5a776448be67089c998825a5db5422 (diff)
downloadzsh-27f895df41af61a8ba678c390a5ef405109e8187.tar.gz
zsh-27f895df41af61a8ba678c390a5ef405109e8187.tar.xz
zsh-27f895df41af61a8ba678c390a5ef405109e8187.zip
make zpty -r stoppable even when SIGINT is caught (and the handler calls return or some such) (11181)
-rw-r--r--ChangeLog3
-rw-r--r--Src/Modules/zpty.c2
2 files changed, 4 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 215cd6fc5..cf51c9458 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2000-05-05  Sven Wischnowsky  <wischnow@informatik.hu-berlin.de>
 
+	* 11181: Src/Modules/zpty.c: make zpty -r stoppable even when
+ 	SIGINT is caught (and the handler calls return or some such)
+	
 	* 11177: Functions/Misc/nslookup: make nslookup page it's output
  	if too long for screen
 	
diff --git a/Src/Modules/zpty.c b/Src/Modules/zpty.c
index 23b1f4209..01cc4dd3e 100644
--- a/Src/Modules/zpty.c
+++ b/Src/Modules/zpty.c
@@ -486,7 +486,7 @@ ptyread(char *nam, Ptycmd cmd, char **args)
 
 	if (!prog && !ret)
 	    break;
-    } while (!errflag &&
+    } while (!errflag && !breaks && !retflag && !contflag &&
 	     (prog ? (used < READ_MAX && (!ret || !pattry(prog, buf))) :
 	      (used < READ_LEN)));