about summary refs log tree commit diff
diff options
context:
space:
mode:
authorPeter Stephenson <pws@users.sourceforge.net>2009-03-20 20:52:13 +0000
committerPeter Stephenson <pws@users.sourceforge.net>2009-03-20 20:52:13 +0000
commit249148d765d846f35d9e3805a89f978892c74208 (patch)
treed99b2f9dd7078240db9b925884c5ebabcad16c3a
parent06e22c93708a79e38477394501d8505489bd8685 (diff)
downloadzsh-249148d765d846f35d9e3805a89f978892c74208.tar.gz
zsh-249148d765d846f35d9e3805a89f978892c74208.tar.xz
zsh-249148d765d846f35d9e3805a89f978892c74208.zip
tidy up from 26625
-rw-r--r--ChangeLog6
-rw-r--r--Src/utils.c5
2 files changed, 7 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog
index 43cfd8c16..0d2254e5a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2009-03-20  Peter Stephenson  <p.w.stephenson@ntlworld.com>
+
+	* users/13593: Src/utils.c: tidy up from 26625.
+
 2009-03-20  Peter Stephenson  <pws@csr.com>
 
 	* Bart: 26761: Src/hist.c: typo in 26754.
@@ -11458,5 +11462,5 @@
 
 *****************************************************
 * This is used by the shell to define $ZSH_PATCHLEVEL
-* $Revision: 1.4628 $
+* $Revision: 1.4629 $
 *****************************************************
diff --git a/Src/utils.c b/Src/utils.c
index 340ceb857..e66d5bbf9 100644
--- a/Src/utils.c
+++ b/Src/utils.c
@@ -1442,14 +1442,13 @@ settyinfo(struct ttyinfo *ti)
 #  ifndef TCSADRAIN
 #   define TCSADRAIN 1	/* XXX Princeton's include files are screwed up */
 #  endif
-	tcsetattr(SHTTY, TCSADRAIN, &ti->tio);
 	while (tcsetattr(SHTTY, TCSADRAIN, &ti->tio) == -1 && errno == EINTR)
 	    ;
 # else
-	ioctl(SHTTY, TCSETS, &ti->tio);
 	while (ioctl(SHTTY, TCSETS, &ti->tio) == -1 && errno == EINTR)
+	    ;
 # endif
-	/*	zerr("settyinfo: %e",errno)*/ ;
+	/*	zerr("settyinfo: %e",errno);*/
 #else
 # ifdef HAVE_TERMIO_H
 	ioctl(SHTTY, TCSETA, &ti->tio);