Stefan Fiedler
20 years ago
4 changed files with 2 additions and 195 deletions
Split View
Diff Options
-
+0 -40package/base/readline/get-char-len-fix.patch
-
+0 -70package/base/readline/overwrite-fixes.patch
-
+2 -2package/base/readline/readline.desc
-
+0 -83package/base/readline/readline43-002.patch
@ -1,40 +0,0 @@ |
|||
# --- ROCK-COPYRIGHT-NOTE-BEGIN --- |
|||
# |
|||
# This copyright note is auto-generated by ./scripts/Create-CopyPatch. |
|||
# Please add additional copyright information _after_ the line containing |
|||
# the ROCK-COPYRIGHT-NOTE-END tag. Otherwise it might get removed by |
|||
# the ./scripts/Create-CopyPatch script. Do not edit this copyright text! |
|||
# |
|||
# ROCK Linux: rock-src/package/base/readline/get-char-len-fix.patch |
|||
# ROCK Linux is Copyright (C) 1998 - 2004 Clifford Wolf |
|||
# |
|||
# This patch file is dual-licensed. It is available under the license the |
|||
# patched project is licensed under, as long as it is an OpenSource license |
|||
# as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms |
|||
# of the GNU General Public License as published by the Free Software |
|||
# Foundation; either version 2 of the License, or (at your option) any later |
|||
# version. |
|||
# |
|||
# --- ROCK-COPYRIGHT-NOTE-END --- |
|||
|
|||
--- ./mbutil.c.orig 2002-06-04 18:54:29.000000000 +0300
|
|||
+++ ./mbutil.c 2002-12-20 20:38:45.000000000 +0200
|
|||
@@ -205,14 +205,16 @@
|
|||
if (tmp == (size_t)(-2)) |
|||
{ |
|||
/* shorted to compose multibyte char */ |
|||
- memset (ps, 0, sizeof(mbstate_t));
|
|||
+ if (ps)
|
|||
+ memset (ps, 0, sizeof(mbstate_t));
|
|||
return -2; |
|||
} |
|||
else if (tmp == (size_t)(-1)) |
|||
{ |
|||
/* invalid to compose multibyte char */ |
|||
/* initialize the conversion state */ |
|||
- memset (ps, 0, sizeof(mbstate_t));
|
|||
+ if (ps)
|
|||
+ memset (ps, 0, sizeof(mbstate_t));
|
|||
return -1; |
|||
} |
|||
else if (tmp == (size_t)0) |
|||
@ -1,70 +0,0 @@ |
|||
# --- ROCK-COPYRIGHT-NOTE-BEGIN --- |
|||
# |
|||
# This copyright note is auto-generated by ./scripts/Create-CopyPatch. |
|||
# Please add additional copyright information _after_ the line containing |
|||
# the ROCK-COPYRIGHT-NOTE-END tag. Otherwise it might get removed by |
|||
# the ./scripts/Create-CopyPatch script. Do not edit this copyright text! |
|||
# |
|||
# ROCK Linux: rock-src/package/base/readline/overwrite-fixes.patch |
|||
# ROCK Linux is Copyright (C) 1998 - 2004 Clifford Wolf |
|||
# |
|||
# This patch file is dual-licensed. It is available under the license the |
|||
# patched project is licensed under, as long as it is an OpenSource license |
|||
# as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms |
|||
# of the GNU General Public License as published by the Free Software |
|||
# Foundation; either version 2 of the License, or (at your option) any later |
|||
# version. |
|||
# |
|||
# --- ROCK-COPYRIGHT-NOTE-END --- |
|||
|
|||
--- ./text.c.orig 2002-05-30 20:46:13.000000000 +0300
|
|||
+++ ./text.c 2002-12-21 08:53:38.000000000 +0200
|
|||
@@ -801,13 +801,10 @@
|
|||
k = _rl_read_mbstring (c, mbkey, MB_LEN_MAX); |
|||
#endif |
|||
|
|||
+ rl_begin_undo_group ();
|
|||
+
|
|||
for (i = 0; i < count; i++) |
|||
{ |
|||
- rl_begin_undo_group ();
|
|||
-
|
|||
- if (rl_point < rl_end)
|
|||
- rl_delete (1, c);
|
|||
-
|
|||
#if defined (HANDLE_MULTIBYTE) |
|||
if (MB_CUR_MAX > 1 && rl_byte_oriented == 0) |
|||
rl_insert_text (mbkey); |
|||
@@ -815,9 +812,13 @@
|
|||
#endif |
|||
_rl_insert_char (1, c); |
|||
|
|||
- rl_end_undo_group ();
|
|||
+ if (rl_point < rl_end)
|
|||
+ rl_delete (1, c);
|
|||
+
|
|||
} |
|||
|
|||
+ rl_end_undo_group ();
|
|||
+
|
|||
return 0; |
|||
} |
|||
|
|||
@@ -934,10 +935,13 @@
|
|||
else |
|||
rl_delete_text (opoint, rl_point); |
|||
|
|||
- /* Emacs puts point at the beginning of the sequence of spaces. */
|
|||
- opoint = rl_point;
|
|||
- _rl_insert_char (l, ' ');
|
|||
- rl_point = opoint;
|
|||
+ if (rl_point < rl_end)
|
|||
+ {
|
|||
+ /* Emacs puts point at the beginning of the sequence of spaces. */
|
|||
+ opoint = rl_point;
|
|||
+ _rl_insert_char (l, ' ');
|
|||
+ rl_point = opoint;
|
|||
+ }
|
|||
|
|||
rl_end_undo_group (); |
|||
|
|||
@ -1,83 +0,0 @@ |
|||
# --- ROCK-COPYRIGHT-NOTE-BEGIN --- |
|||
# |
|||
# This copyright note is auto-generated by ./scripts/Create-CopyPatch. |
|||
# Please add additional copyright information _after_ the line containing |
|||
# the ROCK-COPYRIGHT-NOTE-END tag. Otherwise it might get removed by |
|||
# the ./scripts/Create-CopyPatch script. Do not edit this copyright text! |
|||
# |
|||
# ROCK Linux: rock-src/package/base/readline/readline43-002.patch |
|||
# ROCK Linux is Copyright (C) 1998 - 2004 Clifford Wolf |
|||
# |
|||
# This patch file is dual-licensed. It is available under the license the |
|||
# patched project is licensed under, as long as it is an OpenSource license |
|||
# as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms |
|||
# of the GNU General Public License as published by the Free Software |
|||
# Foundation; either version 2 of the License, or (at your option) any later |
|||
# version. |
|||
# |
|||
# --- ROCK-COPYRIGHT-NOTE-END --- |
|||
|
|||
Official patches from ftp://ftp.gnu.org/pub/gnu/readline/readline-4.3-patches/. |
|||
|
|||
|
|||
READLINE PATCH REPORT |
|||
===================== |
|||
|
|||
Readline-Release: 4.3 |
|||
Patch-ID: readline43-001 |
|||
|
|||
Bug-Reported-by: Thierry Vignaud <tvignaud@mandrakesoft.com> |
|||
Bug-Reference-ID: <m2wurdqvo0.fsf@vador.mandrakesoft.com> (bug-readline) |
|||
Bug-Reference-URL: |
|||
|
|||
Bug-Description: |
|||
|
|||
Pressing certain key sequences causes an infinite loop in _rl_dispatch_subseq |
|||
with the `key' argument set to 256. This eventually causes bash to exceed |
|||
the stack size limit and crash with a segmentation violation. |
|||
|
|||
Patch: |
|||
|
|||
*** ./bind.c Thu Jan 24 11:15:52 2002 |
|||
--- ./bind.c Wed Jul 31 09:11:18 2002
|
|||
*************** |
|||
*** 312,316 **** |
|||
and the function bound to `a' to be executed when the user |
|||
types `abx', leaving `bx' in the input queue. */ |
|||
! if (k.function /* && k.type == ISFUNC */)
|
|||
{ |
|||
map[ANYOTHERKEY] = k; |
|||
--- 312,316 ----
|
|||
and the function bound to `a' to be executed when the user |
|||
types `abx', leaving `bx' in the input queue. */ |
|||
! if (k.function && ((k.type == ISFUNC && k.function != rl_do_lowercase_version) || k.type == ISMACR))
|
|||
{ |
|||
map[ANYOTHERKEY] = k; |
|||
|
|||
|
|||
READLINE PATCH REPORT |
|||
===================== |
|||
|
|||
Readline-Release: 4.3 |
|||
Patch-ID: readline43-002 |
|||
|
|||
Bug-Reported-by: rwhron@earthlink.net |
|||
Bug-Reference-ID: <20020724000454.GA15210@rushmore> (bug-bash) |
|||
Bug-Reference-URL: http://mail.gnu.org/pipermail/bug-bash/2002-July/004856.html |
|||
|
|||
Bug-Description: |
|||
|
|||
Repeating an edit in vi-mode with `.' does not work. |
|||
|
|||
Patch: |
|||
|
|||
*** ./readline.c Wed Mar 13 17:10:46 2002 |
|||
--- ./readline.c Tue Jul 30 17:46:44 2002
|
|||
*************** |
|||
*** 685,688 **** |
|||
--- 685,689 ----
|
|||
#if defined (VI_MODE) |
|||
if (rl_editing_mode == vi_mode && _rl_keymap == vi_movement_keymap && |
|||
+ key != ANYOTHERKEY &&
|
|||
_rl_vi_textmod_command (key)) |
|||
_rl_vi_set_last (key, rl_numeric_arg, rl_arg_sign); |
|||