diff options
author | ache <ache@FreeBSD.org> | 2004-10-18 07:10:33 +0000 |
---|---|---|
committer | ache <ache@FreeBSD.org> | 2004-10-18 07:10:33 +0000 |
commit | 7f4559154082ddd2fb4c290837f22b108c4eefb3 (patch) | |
tree | 2d21ab334e0c6cea3f19e86785adaa8232258828 /contrib/libreadline | |
parent | 7676c420a2c32cc3ce038b024e09a7aa05573d50 (diff) | |
parent | 70654d1bd2d8d44f5d5a552c7360ddefb3a17736 (diff) | |
download | FreeBSD-src-7f4559154082ddd2fb4c290837f22b108c4eefb3.zip FreeBSD-src-7f4559154082ddd2fb4c290837f22b108c4eefb3.tar.gz |
This commit was generated by cvs2svn to compensate for changes in r136647,
which included commits to RCS files with non-trunk default branches.
Diffstat (limited to 'contrib/libreadline')
-rw-r--r-- | contrib/libreadline/mbutil.c | 4 | ||||
-rw-r--r-- | contrib/libreadline/misc.c | 6 |
2 files changed, 2 insertions, 8 deletions
diff --git a/contrib/libreadline/mbutil.c b/contrib/libreadline/mbutil.c index 9a8f17c..695845a 100644 --- a/contrib/libreadline/mbutil.c +++ b/contrib/libreadline/mbutil.c @@ -126,11 +126,11 @@ _rl_find_next_mbchar_internal (string, seed, count, find_non_zero) if (find_non_zero) { tmp = mbrtowc (&wc, string + point, strlen (string + point), &ps); - while (wcwidth (wc) == 0) + while (tmp > 0 && wcwidth (wc) == 0) { point += tmp; tmp = mbrtowc (&wc, string + point, strlen (string + point), &ps); - if (tmp == (size_t)(0) || tmp == (size_t)(-1) || tmp == (size_t)(-2)) + if (MB_NULLWCH (tmp) || MB_INVALIDCH (tmp)) break; } } diff --git a/contrib/libreadline/misc.c b/contrib/libreadline/misc.c index ab1e133..403313a 100644 --- a/contrib/libreadline/misc.c +++ b/contrib/libreadline/misc.c @@ -276,12 +276,6 @@ rl_maybe_save_line () _rl_saved_line_for_history->line = savestring (rl_line_buffer); _rl_saved_line_for_history->data = (char *)rl_undo_list; } - else if (STREQ (rl_line_buffer, _rl_saved_line_for_history->line) == 0) - { - free (_rl_saved_line_for_history->line); - _rl_saved_line_for_history->line = savestring (rl_line_buffer); - _rl_saved_line_for_history->data = (char *)rl_undo_list; /* XXX possible memleak */ - } return 0; } |