diff options
author | Chris Larson <clarson@kergoth.com> | 2004-12-09 09:47:41 +0000 |
---|---|---|
committer | Chris Larson <clarson@kergoth.com> | 2004-12-09 09:47:41 +0000 |
commit | 2c5b8ec6d95cf68650265941530e5ce38c8dd6d9 (patch) | |
tree | bf879bea7ef8517ba8c3d1286ef300401d3d484c /bash/bash-2.05b/rl-slow-multibyte.patch | |
parent | 101e2f1623def0a355d20aacb8bd93810703e834 (diff) |
Merge oe-devel@oe-devel.bkbits.net:openembedded
into hyperion.kergoth.com:/home/kergoth/code/openembedded
2004/12/09 03:39:39-06:00 kergoth.com!kergoth
Break people's builds again.. this time moving the packages into a packages/ subdir to clean things up a bit.
BKrev: 41b81f3dvlp3rU7_8MUXLcI8LDdDoA
Diffstat (limited to 'bash/bash-2.05b/rl-slow-multibyte.patch')
-rw-r--r-- | bash/bash-2.05b/rl-slow-multibyte.patch | 49 |
1 files changed, 0 insertions, 49 deletions
diff --git a/bash/bash-2.05b/rl-slow-multibyte.patch b/bash/bash-2.05b/rl-slow-multibyte.patch deleted file mode 100644 index 9aafe9ea96..0000000000 --- a/bash/bash-2.05b/rl-slow-multibyte.patch +++ /dev/null @@ -1,49 +0,0 @@ ---- bash-2.05b.orig/lib/readline/display.c 2002-06-04 23:54:47.000000000 +0900 -+++ bash-2.05b/lib/readline/display.c 2002-12-12 16:31:06.000000000 +0900 -@@ -1129,16 +1129,24 @@ - memset (&ps_new, 0, sizeof(mbstate_t)); - memset (&ps_old, 0, sizeof(mbstate_t)); - -- new_offset = old_offset = 0; -- for (ofd = old, nfd = new; -- (ofd - old < omax) && *ofd && -- _rl_compare_chars(old, old_offset, &ps_old, new, new_offset, &ps_new); ) -- { -- old_offset = _rl_find_next_mbchar (old, old_offset, 1, MB_FIND_ANY); -- new_offset = _rl_find_next_mbchar (new, new_offset, 1, MB_FIND_ANY); -- ofd = old + old_offset; -- nfd = new + new_offset; -- } -+ if(omax == nmax && strncmp(new,old,omax) == 0) -+ { -+ ofd = old + omax; -+ nfd = new + nmax; -+ } -+ else -+ { -+ new_offset = old_offset = 0; -+ for (ofd = old, nfd = new; -+ (ofd - old < omax) && *ofd && -+ _rl_compare_chars(old, old_offset, &ps_old, new, new_offset, &ps_new); ) -+ { -+ old_offset = _rl_find_next_mbchar (old, old_offset, 1, MB_FIND_ANY); -+ new_offset = _rl_find_next_mbchar (new, new_offset, 1, MB_FIND_ANY); -+ ofd = old + old_offset; -+ nfd = new + new_offset; -+ } -+ } - } - else - #endif -@@ -1169,8 +1177,9 @@ - memset (&ps_old, 0, sizeof (mbstate_t)); - memset (&ps_new, 0, sizeof (mbstate_t)); - -- _rl_adjust_point (old, ols - old, &ps_old); -- _rl_adjust_point (new, nls - new, &ps_new); -+ /* these doesn't make sense */ -+ /* _rl_adjust_point (old, ols - old, &ps_old); */ -+ /* _rl_adjust_point (new, nls - new, &ps_new); */ - - if (_rl_compare_chars (old, ols - old, &ps_old, new, nls - new, &ps_new) == 0) - break; |