summaryrefslogtreecommitdiff
path: root/devel/libedit/files/patch-netbsd-pr-50863
diff options
context:
space:
mode:
authorBaptiste Daroussin <bapt@FreeBSD.org>2016-06-19 19:55:49 +0000
committerBaptiste Daroussin <bapt@FreeBSD.org>2016-06-19 19:55:49 +0000
commit989f98d4ce55b641069b2e9d2a0fb0c5bfbd1484 (patch)
treeedb31a1f196f6c95e9437d39d99666cf30eb9d26 /devel/libedit/files/patch-netbsd-pr-50863
parentRemove portrevision forgotten in previous commit (diff)
backout libedit update it breaks all mysql clients
Reported by: antoine
Notes
Notes: svn path=/head/; revision=417132
Diffstat (limited to 'devel/libedit/files/patch-netbsd-pr-50863')
-rw-r--r--devel/libedit/files/patch-netbsd-pr-5086353
1 files changed, 53 insertions, 0 deletions
diff --git a/devel/libedit/files/patch-netbsd-pr-50863 b/devel/libedit/files/patch-netbsd-pr-50863
new file mode 100644
index 000000000000..72383f9c2b12
--- /dev/null
+++ b/devel/libedit/files/patch-netbsd-pr-50863
@@ -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;
+
+