Attachment 909200 Details for Bug 1109946 – [PATCH] patch for Fedora 20 to fix the problem described

[patch] [PATCH] patch for Fedora 20 to fix the problem described

0001-input-fix-rl_read_key-slowness-when-rl_event_hook-is.patch (text/plain), 3.61 KB, created by Jirka Klimes on 2014-06-16 17:34:20 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jirka Klimes

Created: 2014-06-16 17:34:20 UTC

Size: 3.61 KB

patch

obsolete

>From 6120742537ab5171e038dc2208d8cce97fda7af2 Mon Sep 17 00:00:00 2001
>From: =?UTF-8?q?Ji=C5=99=C3=AD=20Klime=C5=A1?= <jklimes@redhat.com>
>Date: Mon, 16 Jun 2014 15:28:33 +0200
>Subject: [PATCH] input: fix rl_read_key() slowness when rl_event_hook is used
> (rh #1109946)
>MIME-Version: 1.0
>Content-Type: text/plain; charset=UTF-8
>Content-Transfer-Encoding: 8bit
>
>https://lists.gnu.org/archive/html/bug-readline/2012-06/msg00008.html
>
>https://bugzilla.redhat.com/show_bug.cgi?id=1109946
>
>Signed-off-by: JiÅÃ KlimeÅ¡ <jklimes@redhat.com>
>---
> readline-6.2-slow-event-hook.patch | 62 ++++++++++++++++++++++++++++++++++++++
> readline.spec                      | 10 +++++-
> 2 files changed, 71 insertions(+), 1 deletion(-)
> create mode 100644 readline-6.2-slow-event-hook.patch
>
>diff --git a/readline-6.2-slow-event-hook.patch b/readline-6.2-slow-event-hook.patch
>new file mode 100644
>index 0000000..9045e27
>--- /dev/null
>+++ b/readline-6.2-slow-event-hook.patch
>@@ -0,0 +1,62 @@
>+From e8b937f06bb4a88d68e96c81f63ead20892ea9b8 Mon Sep 17 00:00:00 2001
>+From: Chet Ramey <chet.ramey@case.edu>
>+Date: Tue, 10 Jul 2012 09:47:21 -0400
>+Subject: [PATCH] Readline-6.2 patch 3
>+MIME-Version: 1.0
>+Content-Type: text/plain; charset=UTF-8
>+Content-Transfer-Encoding: 8bit
>+
>+
>+Signed-off-by: JiÅÃ KlimeÅ¡ <jklimes@redhat.com>
>+---
>+ input.c    | 12 ++++++++----
>+ patchlevel |  2 +-
>+ 2 files changed, 9 insertions(+), 5 deletions(-)
>+
>+diff --git a/input.c b/input.c
>+index 7c74c99..b49af88 100644
>+--- a/input.c
>++++ b/input.c
>+@@ -409,7 +409,7 @@ rl_clear_pending_input ()
>+ int
>+ rl_read_key ()
>+ {
>+-  int c;
>++  int c, r;
>+ 
>+   rl_key_sequence_length++;
>+ 
>+@@ -429,14 +429,18 @@ rl_read_key ()
>+ 	{
>+ 	  while (rl_event_hook)
>+ 	    {
>+-	      if (rl_gather_tyi () < 0)	/* XXX - EIO */
>++	      if (rl_get_char (&c) != 0)
>++		break;
>++		
>++	      if ((r = rl_gather_tyi ()) < 0)	/* XXX - EIO */
>+ 		{
>+ 		  rl_done = 1;
>+ 		  return ('\n');
>+ 		}
>++	      else if (r == 1)			/* read something */
>++		continue;
>++
>+ 	      RL_CHECK_SIGNALS ();
>+-	      if (rl_get_char (&c) != 0)
>+-		break;
>+ 	      if (rl_done)		/* XXX - experimental */
>+ 		return ('\n');
>+ 	      (*rl_event_hook) ();
>+diff --git a/patchlevel b/patchlevel
>+index 7cbda82..ce3e355 100644
>+--- a/patchlevel
>++++ b/patchlevel
>+@@ -1,3 +1,3 @@
>+ # Do not edit -- exists only for use by patch
>+ 
>+-1
>++2
>+-- 
>+1.7.11.7
>+
>diff --git a/readline.spec b/readline.spec
>index 53892c1..3fd7dee 100644
>--- a/readline.spec
>+++ b/readline.spec
>@@ -1,7 +1,7 @@
> Summary: A library for editing typed command lines
> Name: readline
> Version: 6.2
>-Release: 9%{?dist}
>+Release: 10%{?dist}
> License: GPLv3+
> Group: System Environment/Libraries
> URL: http://cnswww.cns.cwru.edu/php/chet/readline/rltop.html
>@@ -21,6 +21,10 @@ Patch23:  readline-6.2-gdb.patch
> Patch24: readline-aarch64.patch
> # BZ1077026, security fix for temporary file
> Patch25: readline-6.2-debug_fncs_security_fix.patch
>+# fix slow processing when using rl_event_hook
>+# https://lists.gnu.org/archive/html/bug-readline/2012-06/msg00008.html
>+Patch26: readline-6.2-slow-event-hook.patch
>+
> Requires(post): /sbin/install-info
> Requires(preun): /sbin/install-info
> BuildRequires: ncurses-devel
>@@ -66,6 +70,7 @@ library.
> %patch23 -p1 -b .gdb
> %patch24 -p1 -b .arm
> %patch25 -p1 -b .debug_fncs_security_fix
>+%patch26 -p1 -b .rl_read_key
> 
> pushd examples
> rm -f rlfe/configure
>@@ -143,6 +148,9 @@ fi
> %{_libdir}/lib*.a
> 
> %changelog
>+* Mon Jun 16 2014 JiÅÃ KlimeÅ¡ <jklimes@redhat.com> 6.2-10
>+- input: fix rl_read_key slowness when using rl_event_hook
>+
> * Mon May 26 2014 jchaloup <jchaloup@redhat.com> - 6.2-9
> - resolves: #1077026
>   Security patch for debug functions
>-- 
>1.7.11.7
>

Actions: View | Diff

Attachments on bug 1109946: 909200