Attachment 168673 Details for Bug 208320 – [patch] upstream fix for potential tty corruption

[patch] [patch] upstream fix for potential tty corruption

pr-pipefix.diff (text/plain), 2.27 KB, created by John Hein on 2016-03-27 09:10:20 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: John Hein

Created: 2016-03-27 09:10:20 UTC

Size: 2.27 KB

patch

obsolete

>Index: Makefile
>===================================================================
>--- Makefile	(revision 411150)
>+++ Makefile	(working copy)
>@@ -4,7 +4,7 @@
> PORTNAME=	libedit
> PORTVERSION=	${EDITVERSION}.${EDITDATE}
> DISTVERSION=	${EDITDATE}-${EDITVERSION}
>-PORTREVISION=	1
>+PORTREVISION=	2
> CATEGORIES=	devel
> MASTER_SITES=	http://thrysoee.dk/editline/
> 
>Index: files/patch-netbsd-pr-50863
>===================================================================
>--- files/patch-netbsd-pr-50863	(revision 0)
>+++ files/patch-netbsd-pr-50863	(working copy)
>@@ -0,0 +1,53 @@
>+http://gnats.netbsd.org/cgi-bin/query-pr-single.pl?number=50863
>+
>+--- src/tty.c.orig	2014-06-18 19:07:45 UTC
>++++ src/tty.c
>+@@ -499,6 +499,9 @@ tty_setup(EditLine *el)
>+ 	if (el->el_flags & EDIT_DISABLED)
>+ 		return 0;
>+ 
>++	if (el->el_tty.t_initialized)
>++		return -1;
>++
>+ 	if (!isatty(el->el_outfd)) {
>+ #ifdef DEBUG_TTY
>+ 		(void) fprintf(el->el_errfile, "%s: isatty: %s\n", __func__,
>+@@ -558,6 +561,7 @@ tty_setup(EditLine *el)
>+ 
>+ 	tty__setchar(&el->el_tty.t_ed, el->el_tty.t_c[ED_IO]);
>+ 	tty_bind_char(el, 1);
>++	el->el_tty.t_initialized = 1;
>+ 	return 0;
>+ }
>+ 
>+@@ -567,6 +571,7 @@ tty_init(EditLine *el)
>+ 
>+ 	el->el_tty.t_mode = EX_IO;
>+ 	el->el_tty.t_vdisable = _POSIX_VDISABLE;
>++	el->el_tty.t_initialized = 0;
>+ 	(void) memcpy(el->el_tty.t_t, ttyperm, sizeof(ttyperm_t));
>+ 	(void) memcpy(el->el_tty.t_c, ttychar, sizeof(ttychar_t));
>+ 	return tty_setup(el);
>+@@ -580,6 +585,9 @@ protected void
>+ /*ARGSUSED*/
>+ tty_end(EditLine *el)
>+ {
>++	if (!el->el_tty.t_initialized)
>++		return;
>++
>+ 	if (tty_setty(el, TCSAFLUSH, &el->el_tty.t_or) == -1) {
>+ #ifdef DEBUG_TTY
>+ 		(void) fprintf(el->el_errfile,
>+--- src/tty.h.orig	2014-06-18 16:05:56 UTC
>++++ src/tty.h
>+@@ -474,8 +474,9 @@ typedef struct {
>+     int t_tabs;
>+     int t_eight;
>+     speed_t t_speed;
>+-    int t_mode;
>++    unsigned char t_mode;
>+     unsigned char t_vdisable;
>++    unsigned char t_initialized;
>+ } el_tty_t;
>+ 
>+ 
>
>Property changes on: files/patch-netbsd-pr-50863
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property

Actions: View | Diff

Attachments on bug 208320: 168673