- strings.h is really not the right header to include.

- TCSASOFT is useless here; we have the right values for {i,o}speed and cflag.
  In addition it is not portable, so kill it.
- keep the previous unsigned char fix.

2 files changed, 45 insertions, 6 deletions

diff --git a/textproc/qsubst/distinfo b/textproc/qsubst/distinfo
index 1fcc0641d7f..6a252e6d206 100644
--- a/textproc/qsubst/distinfo
+++ b/textproc/qsubst/distinfo
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.4 2005/02/24 14:48:48 agc Exp $
+$NetBSD: distinfo,v 1.5 2005/03/24 16:27:40 christos Exp $
 
 SHA1 (qsubst-20010422.tar.gz) = 9602b274ff10266b94a96adc90ded003f8cdeda8
 RMD160 (qsubst-20010422.tar.gz) = 443d5d5d2a014a286f436685c9e188255b6acd0a
 Size (qsubst-20010422.tar.gz) = 5965 bytes
 SHA1 (patch-aa) = d7ff425da3ddfaca2385e5d849457e74c89acfff
-SHA1 (patch-ab) = c8d92c140ad737a9912101dfecf048984c979fb4
+SHA1 (patch-ab) = 913cbd6afe72636a3e6d157ecf4f6fc6cb6269bb
diff --git a/textproc/qsubst/patches/patch-ab b/textproc/qsubst/patches/patch-ab
index 49d6f378de8..5baf1c53505 100644
--- a/textproc/qsubst/patches/patch-ab
+++ b/textproc/qsubst/patches/patch-ab
@@ -1,8 +1,29 @@
-$NetBSD: patch-ab,v 1.1 2004/12/04 12:03:42 wiz Exp $
+$NetBSD: patch-ab,v 1.2 2005/03/24 16:27:40 christos Exp $
 
---- qsubst.c.orig	2001-04-22 07:35:35.000000000 +0200
-+++ qsubst.c
-@@ -181,7 +181,7 @@ static void limit_above_below(void)
+--- qsubst.c.orig	2001-04-22 01:35:35.000000000 -0400
++++ qsubst.c	2005-03-24 11:23:34.000000000 -0500
+@@ -105,7 +105,7 @@
+ #include <signal.h>
+ #include <stdio.h>
+ #include <stdlib.h>
+-#include <strings.h>
++#include <string.h>
+ #include <termcap.h>
+ #include <termios.h>
+ #include <unistd.h>
+@@ -166,9 +166,9 @@
+   { tstp_self();
+     return;
+   }
+- tcsetattr(0,TCSAFLUSH|TCSASOFT,&orig_tio);
++ tcsetattr(0,TCSAFLUSH,&orig_tio);
+  tstp_self();
+- tcsetattr(0,TCSADRAIN|TCSASOFT,&tio);
++ tcsetattr(0,TCSADRAIN,&tio);
+ }
+ 
+ static void limit_above_below(void)
+@@ -181,7 +181,7 @@
    }
  }
  
@@ -11,3 +32,21 @@ $NetBSD: patch-ab,v 1.1 2004/12/04 12:03:42 wiz Exp $
  {
   return( isascii(c) &&
  	 ( isalnum(c) ||
+@@ -231,7 +231,7 @@
+  tio.c_lflag &= ~(ICANON|ECHOKE|ECHOE|ECHO|ECHONL);
+  tio.c_cc[VMIN] = 1;
+  tio.c_cc[VTIME] = 0;
+- tcsetattr(0,TCSANOW|TCSASOFT,&tio);
++ tcsetattr(0,TCSANOW,&tio);
+  switch (read(0,&c,1))
+   { case -1:
+        break;
+@@ -240,7 +240,7 @@
+     case 1:
+        break;
+   }
+- tcsetattr(0,TCSANOW|TCSASOFT,&otio);
++ tcsetattr(0,TCSANOW,&otio);
+  return(c);
+ }
+