From ed@hoeg.nl  Fri Mar 16 09:59:43 2007
Return-Path: <ed@hoeg.nl>
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
	by hub.freebsd.org (Postfix) with ESMTP id 41F5816A405
	for <FreeBSD-gnats-submit@freebsd.org>; Fri, 16 Mar 2007 09:59:43 +0000 (UTC)
	(envelope-from ed@hoeg.nl)
Received: from palm.hoeg.nl (palm.hoeg.nl [83.98.131.212])
	by mx1.freebsd.org (Postfix) with ESMTP id 0D1C213C465
	for <FreeBSD-gnats-submit@freebsd.org>; Fri, 16 Mar 2007 09:59:43 +0000 (UTC)
	(envelope-from ed@hoeg.nl)
Received: by palm.hoeg.nl (Postfix, from userid 1000)
	id 6FE711CD42; Fri, 16 Mar 2007 10:59:42 +0100 (CET)
Message-Id: <20070316095942.6FE711CD42@palm.hoeg.nl>
Date: Fri, 16 Mar 2007 10:59:42 +0100 (CET)
From: Ed Schouten <ed@fxq.nl>
Reply-To: Ed Schouten <ed@fxq.nl>
To: FreeBSD-gnats-submit@freebsd.org
Cc:
Subject: [textproc/ispell] Use <termios.h> instead of <sgtty.h>
X-Send-Pr-Version: 3.113
X-GNATS-Notify:

>Number:         110384
>Category:       ports
>Synopsis:       textproc/ispell: Use <termios.h> instead of <sgtty.h>
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    jmz
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          sw-bug
>Submitter-Id:   current-users
>Arrival-Date:   Fri Mar 16 10:00:16 GMT 2007
>Closed-Date:    Sat Apr 14 12:12:01 GMT 2007
>Last-Modified:  Sat Apr 14 12:20:08 GMT 2007
>Originator:     Ed Schouten
>Release:        FreeBSD 6.2-STABLE i386
>Organization:
>Environment:
System: FreeBSD palm.hoeg.nl 6.2-STABLE FreeBSD 6.2-STABLE #0: Sun Feb 11 22:32:09 CET 2007 root@palm.hoeg.nl:/usr/obj/usr/src/sys/PALM i386
>Description:
Ispell only allows you to use termio or sgtty. The folks from Red Hat
have been using a patch for a long time to make ispell use termios.
>How-To-Repeat:
>Fix:
--- term.c	Wed Jul 25 23:51:46 2001
+++ term.c	Fri Mar 16 10:52:35 2007
@@ -80,8 +80,10 @@
 #include "ispell.h"
 #include "proto.h"
 #include "msgs.h"
+#define USG
 #ifdef USG
-#include <termio.h>
+#include <unistd.h>
+#include <termios.h>
 #else
 #include <sgtty.h>
 #endif
@@ -152,8 +154,8 @@
     }
 
 #ifdef USG
-static struct termio	sbuf;
-static struct termio	osbuf;
+static struct termios	sbuf;
+static struct termios	osbuf;
 #else
 static struct sgttyb	sbuf;
 static struct sgttyb	osbuf;
@@ -263,7 +265,7 @@
 	(void) fprintf (stderr, TERM_C_NO_BATCH);
 	exit (1);
 	}
-    (void) ioctl (0, TCGETA, (char *) &osbuf);
+    tcgetattr(STDIN_FILENO, &osbuf);
     termchanged = 1;
 
     sbuf = osbuf;
@@ -272,7 +274,7 @@
     sbuf.c_iflag &= ~(INLCR | IGNCR | ICRNL);
     sbuf.c_cc[VMIN] = 1;
     sbuf.c_cc[VTIME] = 1;
-    (void) ioctl (0, TCSETAW, (char *) &sbuf);
+    tcsetattr(STDIN_FILENO, TCSANOW, &sbuf);
 
     uerasechar = osbuf.c_cc[VERASE];
     ukillchar = osbuf.c_cc[VKILL];
@@ -360,7 +362,7 @@
 	if (te)
 	    tputs (te, 1, putch);
 #ifdef USG
-	(void) ioctl (0, TCSETAW, (char *) &osbuf);
+	tcsetattr(STDIN_FILENO, TCSANOW, &osbuf);
 #else
 	(void) ioctl (0, TIOCSETP, (char *) &osbuf);
 #ifdef TIOCSLTC
@@ -376,7 +378,7 @@
     int		signo;
     {
 #ifdef USG
-    (void) ioctl (0, TCSETAW, (char *) &osbuf);
+    tcsetattr(STDIN_FILENO, TCSANOW, &osbuf);
 #else
     (void) ioctl (0, TIOCSETP, (char *) &osbuf);
 #ifdef TIOCSLTC
@@ -391,7 +393,7 @@
     /* stop here until continued */
     (void) signal (signo, onstop);
 #ifdef USG
-    (void) ioctl (0, TCSETAW, (char *) &sbuf);
+    tcsetattr(STDIN_FILENO, TCSANOW, &sbuf);
 #else
     (void) ioctl (0, TIOCSETP, (char *) &sbuf);
 #ifdef TIOCSLTC
@@ -451,7 +453,7 @@
     argv[i] = NULL;
 
 #ifdef USG
-    (void) ioctl (0, TCSETAW, (char *) &osbuf);
+    tcsetattr(STDIN_FILENO, TCSANOW, &osbuf);
 #else
     (void) ioctl (0, TIOCSETP, (char *) &osbuf);
 #ifdef TIOCSLTC
@@ -497,7 +499,7 @@
 #endif
 
 #ifdef USG
-    (void) ioctl (0, TCSETAW, (char *) &sbuf);
+    tcsetattr(STDIN_FILENO, TCSANOW, &sbuf);
 #else
     (void) ioctl (0, TIOCSETP, (char *) &sbuf);
 #ifdef TIOCSLTC
@@ -530,7 +532,7 @@
 #endif
 
 #ifdef USG
-    (void) ioctl (0, TCSETAW, (char *) &osbuf);
+    tcsetattr(STDIN_FILENO, TCSANOW, &osbuf);
 #else
     (void) ioctl (0, TIOCSETP, (char *) &osbuf);
 #ifdef TIOCSLTC
@@ -562,7 +564,7 @@
 #endif
 
 #ifdef USG
-    (void) ioctl (0, TCSETAW, (char *) &sbuf);
+    tcsetattr(STDIN_FILENO, TCSANOW, &sbuf);
 #else
     (void) ioctl (0, TIOCSETP, (char *) &sbuf);
 #ifdef TIOCSLTC
>Release-Note:
>Audit-Trail:
Responsible-Changed-From-To: freebsd-ports-bugs->jmz 
Responsible-Changed-By: edwin 
Responsible-Changed-When: Fri Mar 16 10:00:27 UTC 2007 
Responsible-Changed-Why:  
Over to maintainer 

http://www.freebsd.org/cgi/query-pr.cgi?pr=110384 
State-Changed-From-To: open->closed 
State-Changed-By: jmz 
State-Changed-When: Sat Apr 14 12:11:36 UTC 2007 
State-Changed-Why:  
Committed. Thanks! 

http://www.freebsd.org/cgi/query-pr.cgi?pr=110384 

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: ports/110384: commit references a PR
Date: Sat, 14 Apr 2007 12:11:29 +0000 (UTC)

 jmz         2007-04-14 12:11:24 UTC
 
   FreeBSD ports repository
 
   Modified files:
     textproc/ispell      Makefile 
   Added files:
     textproc/ispell/files patch-term.c 
   Log:
   Use <termios.h> instead of <sgtty.h>
   
   PR:             ports/110384
   Submitted by:   Ed Schouten <ed@fxq.nl>
   
   Revision  Changes    Path
   1.106     +1 -1      ports/textproc/ispell/Makefile
   1.1       +106 -0    ports/textproc/ispell/files/patch-term.c (new)
 _______________________________________________
 cvs-all@freebsd.org mailing list
 http://lists.freebsd.org/mailman/listinfo/cvs-all
 To unsubscribe, send any mail to "cvs-all-unsubscribe@freebsd.org"
 

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: ports/110384: commit references a PR
Date: Sat, 14 Apr 2007 12:18:03 +0000 (UTC)

 jmz         2007-04-14 12:17:55 UTC
 
   FreeBSD ports repository
 
   Modified files:
     misc/mshell          Makefile 
     misc/mshell/files    patch-ab patch-ag 
   Log:
   Use <termios.h> instead of <sgtty.h>
   
   PR:             ports/110384
   Submitted by:   Ed Schouten <ed@fxq.nl>
   
   Revision  Changes    Path
   1.23      +1 -1      ports/misc/mshell/Makefile
   1.2       +37 -46    ports/misc/mshell/files/patch-ab
   1.2       +4 -2      ports/misc/mshell/files/patch-ag
 _______________________________________________
 cvs-all@freebsd.org mailing list
 http://lists.freebsd.org/mailman/listinfo/cvs-all
 To unsubscribe, send any mail to "cvs-all-unsubscribe@freebsd.org"
 
>Unformatted:
