Attachment #44948 for bug #69434

Lines 1-5 Link Here

(-)readline/CVS/Entries (-5 lines)
1	/Makefile/1.2/Thu Jul 22 07:17:14 2004//
2	/distinfo/1.2/Thu Mar 18 18:00:19 2004//
3	/pkg-descr/1.1/Sun Dec 28 10:32:48 2003//
4	/pkg-plist/1.1/Sun Dec 28 10:32:48 2003//
5	D/files////

Line 1 Link Here

(-)readline/CVS/Repository (-1 lines)
1	ports/devel/readline

Line 1 Link Here

(-)readline/CVS/Root (-1 lines)
1	/usr/cvs

Lines 7-13 Link Here

(-)readline/Makefile (-1 / +1 lines)
7		7
8	PORTNAME= readline	8	PORTNAME= readline
9	PORTVERSION= 4.3	9	PORTVERSION= 4.3
10	PORTREVISION= 1	10	PORTREVISION= 2
11	CATEGORIES= devel	11	CATEGORIES= devel
12	MASTER_SITES= ftp://ftp.cwru.edu/pub/bash/	12	MASTER_SITES= ftp://ftp.cwru.edu/pub/bash/
13		13

Lines 1-2 Link Here

(-)readline/files/CVS/Entries (-2 lines)
1	/patch-aa/1.1/Thu Jul 22 07:17:14 2004//
2	D

Line 1 Link Here

(-)readline/files/CVS/Repository (-1 lines)
1	ports/devel/readline/files

Line 1 Link Here

(-)readline/files/CVS/Root (-1 lines)
1	/usr/cvs

Line 0 Link Here

(-)readline/files/patch-ab (+10 lines)
	1	*** readline-4.3/readline.c Wed Mar 13 17:10:46 2002
	2	--- readline.c Tue Jul 30 17:46:44 2002
	3	***************
	4	* 685,688 **
	5	--- 685,689 ----
	6	#if defined (VI_MODE)
	7	if (rl_editing_mode == vi_mode && _rl_keymap == vi_movement_keymap &&
	8	+ key != ANYOTHERKEY &&
	9	_rl_vi_textmod_command (key))
	10	_rl_vi_set_last (key, rl_numeric_arg, rl_arg_sign);




*** readline-4.3/mbutil.c	Tue Jun  4 11:54:29 2002
--- mbutil.c	Mon Aug  5 11:20:39 2002
***************
*** 206,210 ****
      {
        /* shorted to compose multibyte char */
!       memset (ps, 0, sizeof(mbstate_t));
        return -2;
      }
--- 206,211 ----
      {
        /* shorted to compose multibyte char */
!       if (ps)
! 	memset (ps, 0, sizeof(mbstate_t));
        return -2;
      }
***************
*** 213,217 ****
        /* invalid to compose multibyte char */
        /* initialize the conversion state */
!       memset (ps, 0, sizeof(mbstate_t));
        return -1;
      }
--- 214,219 ----
        /* invalid to compose multibyte char */
        /* initialize the conversion state */
!       if (ps)
! 	memset (ps, 0, sizeof(mbstate_t));
        return -1;
      }
***************
*** 226,232 ****
  int
  _rl_compare_chars (buf1, pos1, ps1, buf2, pos2, ps2)
!      char *buf1, *buf2;
!      mbstate_t *ps1, *ps2;
!      int pos1, pos2;
  {
    int i, w1, w2;
--- 228,237 ----
  int
  _rl_compare_chars (buf1, pos1, ps1, buf2, pos2, ps2)
!      char *buf1;
!      int pos1;
!      mbstate_t *ps1;
!      char *buf2;
!      int pos2;
!      mbstate_t *ps2;
  {
    int i, w1, w2;
***************
*** 277,282 ****
  	  /* clear the state of the byte sequence, because
  	     in this case effect of mbstate is undefined  */
! 	  memset (ps, 0, sizeof (mbstate_t));
  	}
        else
  	pos += tmp;
--- 282,290 ----
  	  /* clear the state of the byte sequence, because
  	     in this case effect of mbstate is undefined  */
! 	  if (ps)
! 	    memset (ps, 0, sizeof (mbstate_t));
  	}
+       else if (tmp == 0)
+ 	pos++;
        else
  	pos += tmp;




*** readline-4.3/display.c	Tue Jun  4 10:54:47 2002
--- display.c	Fri Sep 13 16:22:57 2002
***************
*** 71,75 ****
  
  #if defined (HANDLE_MULTIBYTE)
! static int _rl_col_width PARAMS((char *, int, int));
  static int *_rl_wrapped_line;
  #else
--- 71,75 ----
  
  #if defined (HANDLE_MULTIBYTE)
! static int _rl_col_width PARAMS((const char *, int, int));
  static int *_rl_wrapped_line;
  #else
***************
*** 1349,1355 ****
  	      _rl_output_some_chars (nfd + lendiff, temp - lendiff);
  #if 0
- 	      _rl_last_c_pos += _rl_col_width (nfd+lendiff, 0, temp-lendiff) - col_lendiff;
- #else
  	      _rl_last_c_pos += _rl_col_width (nfd+lendiff, 0, temp-col_lendiff);
  #endif
  	    }
--- 1349,1355 ----
  	      _rl_output_some_chars (nfd + lendiff, temp - lendiff);
  #if 0
  	      _rl_last_c_pos += _rl_col_width (nfd+lendiff, 0, temp-col_lendiff);
+ #else
+ 	      _rl_last_c_pos += _rl_col_width (nfd+lendiff, 0, temp-lendiff);
  #endif
  	    }
***************
*** 1511,1516 ****
    /* If we have multibyte characters, NEW is indexed by the buffer point in
       a multibyte string, but _rl_last_c_pos is the display position.  In
!      this case, NEW's display position is not obvious. */
!   if ((MB_CUR_MAX == 1 || rl_byte_oriented ) && _rl_last_c_pos == new) return;
  #else
    if (_rl_last_c_pos == new) return;
--- 1511,1523 ----
    /* If we have multibyte characters, NEW is indexed by the buffer point in
       a multibyte string, but _rl_last_c_pos is the display position.  In
!      this case, NEW's display position is not obvious and must be
!      calculated. */
!   if (MB_CUR_MAX == 1 || rl_byte_oriented)
!     {
!       if (_rl_last_c_pos == new)
! 	return;
!     }
!   else if (_rl_last_c_pos == _rl_col_width (data, 0, new))
!     return;
  #else
    if (_rl_last_c_pos == new) return;
***************
*** 1595,1603 ****
      {
        if (MB_CUR_MAX > 1 && rl_byte_oriented == 0)
! 	{
! 	  tputs (_rl_term_cr, 1, _rl_output_character_function);
! 	  for (i = 0; i < new; i++)
! 	    putc (data[i], rl_outstream);
! 	}
        else
  	_rl_backspace (_rl_last_c_pos - new);
--- 1602,1606 ----
      {
        if (MB_CUR_MAX > 1 && rl_byte_oriented == 0)
! 	_rl_backspace (_rl_last_c_pos - _rl_col_width (data, 0, new));
        else
  	_rl_backspace (_rl_last_c_pos - new);
***************
*** 2118,2122 ****
  static int
  _rl_col_width (str, start, end)
!      char *str;
       int start, end;
  {
--- 2121,2125 ----
  static int
  _rl_col_width (str, start, end)
!      const char *str;
       int start, end;
  {
***************
*** 2194,2196 ****
  }
  #endif /* HANDLE_MULTIBYTE */
- 	  
--- 2197,2198 ----

Line 0 Link Here

(-)readline/files/patch-ae (+31 lines)
	1	*** readline-4.3/vi_mode.c Thu May 23 13:27:58 2002
	2	--- vi_mode.c Tue Feb 4 15:11:07 2003
	3	***************
	4	* 681,685 **
	5	{
	6	wchar_t wc;
	7	! char mb[MB_LEN_MAX];
	8	mbstate_t ps;
	9
	10	--- 681,686 ----
	11	{
	12	wchar_t wc;
	13	! char mb[MB_LEN_MAX+1];
	14	! int mblen;
	15	mbstate_t ps;
	16
	17	***************
	18	* 704,708 **
	19	if (wc)
	20	{
	21	! wctomb (mb, wc);
	22	rl_begin_undo_group ();
	23	rl_delete (1, 0);
	24	--- 705,711 ----
	25	if (wc)
	26	{
	27	! mblen = wctomb (mb, wc);
	28	! if (mblen >= 0)
	29	! mb[mblen] = '\0';
	30	rl_begin_undo_group ();
	31	rl_delete (1, 0);

Return to bug 69434

Line 0 Link Here

(-)readline/files/patch-ac (+68 lines)
		1	*** readline-4.3/mbutil.c Tue Jun 4 11:54:29 2002
		2	--- mbutil.c Mon Aug 5 11:20:39 2002
		3	***************
		4	* 206,210 **
		5	{
		6	/* shorted to compose multibyte char */
		7	! memset (ps, 0, sizeof(mbstate_t));
		8	return -2;
		9	}
		10	--- 206,211 ----
		11	{
		12	/* shorted to compose multibyte char */
		13	! if (ps)
		14	! memset (ps, 0, sizeof(mbstate_t));
		15	return -2;
		16	}
		17	***************
		18	* 213,217 **
		19	/* invalid to compose multibyte char */
		20	/* initialize the conversion state */
		21	! memset (ps, 0, sizeof(mbstate_t));
		22	return -1;
		23	}
		24	--- 214,219 ----
		25	/* invalid to compose multibyte char */
		26	/* initialize the conversion state */
		27	! if (ps)
		28	! memset (ps, 0, sizeof(mbstate_t));
		29	return -1;
		30	}
		31	***************
		32	* 226,232 **
		33	int
		34	_rl_compare_chars (buf1, pos1, ps1, buf2, pos2, ps2)
		35	! char buf1, buf2;
		36	! mbstate_t ps1, ps2;
		37	! int pos1, pos2;
		38	{
		39	int i, w1, w2;
		40	--- 228,237 ----
		41	int
		42	_rl_compare_chars (buf1, pos1, ps1, buf2, pos2, ps2)
		43	! char *buf1;
		44	! int pos1;
		45	! mbstate_t *ps1;
		46	! char *buf2;
		47	! int pos2;
		48	! mbstate_t *ps2;
		49	{
		50	int i, w1, w2;
		51	***************
		52	* 277,282 **
		53	/* clear the state of the byte sequence, because
		54	in this case effect of mbstate is undefined */
		55	! memset (ps, 0, sizeof (mbstate_t));
		56	}
		57	else
		58	pos += tmp;
		59	--- 282,290 ----
		60	/* clear the state of the byte sequence, because
		61	in this case effect of mbstate is undefined */
		62	! if (ps)
		63	! memset (ps, 0, sizeof (mbstate_t));
		64	}
65	+ else if (tmp == 0)
66	+ pos++;
67	else
68	pos += tmp;

Line 0 Link Here

(-)readline/files/patch-ad (+90 lines)
		1	*** readline-4.3/display.c Tue Jun 4 10:54:47 2002
		2	--- display.c Fri Sep 13 16:22:57 2002
		3	***************
		4	* 71,75 **
		5
		6	#if defined (HANDLE_MULTIBYTE)
		7	! static int _rl_col_width PARAMS((char *, int, int));
		8	static int *_rl_wrapped_line;
		9	#else
		10	--- 71,75 ----
		11
		12	#if defined (HANDLE_MULTIBYTE)
		13	! static int _rl_col_width PARAMS((const char *, int, int));
		14	static int *_rl_wrapped_line;
		15	#else
		16	***************
		17	* 1349,1355 **
		18	_rl_output_some_chars (nfd + lendiff, temp - lendiff);
		19	#if 0
		20	- _rl_last_c_pos += _rl_col_width (nfd+lendiff, 0, temp-lendiff) - col_lendiff;
		21	- #else
		22	_rl_last_c_pos += _rl_col_width (nfd+lendiff, 0, temp-col_lendiff);
		23	#endif
		24	}
		25	--- 1349,1355 ----
		26	_rl_output_some_chars (nfd + lendiff, temp - lendiff);
		27	#if 0
		28	_rl_last_c_pos += _rl_col_width (nfd+lendiff, 0, temp-col_lendiff);
		29	+ #else
		30	+ _rl_last_c_pos += _rl_col_width (nfd+lendiff, 0, temp-lendiff);
		31	#endif
		32	}
		33	***************
		34	* 1511,1516 **
		35	/* If we have multibyte characters, NEW is indexed by the buffer point in
		36	a multibyte string, but _rl_last_c_pos is the display position. In
		37	! this case, NEW's display position is not obvious. */
		38	! if ((MB_CUR_MAX == 1 \|\| rl_byte_oriented ) && _rl_last_c_pos == new) return;
		39	#else
		40	if (_rl_last_c_pos == new) return;
		41	--- 1511,1523 ----
		42	/* If we have multibyte characters, NEW is indexed by the buffer point in
		43	a multibyte string, but _rl_last_c_pos is the display position. In
		44	! this case, NEW's display position is not obvious and must be
		45	! calculated. */
		46	! if (MB_CUR_MAX == 1 \|\| rl_byte_oriented)
		47	! {
		48	! if (_rl_last_c_pos == new)
		49	! return;
		50	! }
		51	! else if (_rl_last_c_pos == _rl_col_width (data, 0, new))
		52	! return;
		53	#else
		54	if (_rl_last_c_pos == new) return;
		55	***************
		56	* 1595,1603 **
		57	{
		58	if (MB_CUR_MAX > 1 && rl_byte_oriented == 0)
		59	! {
		60	! tputs (_rl_term_cr, 1, _rl_output_character_function);
		61	! for (i = 0; i < new; i++)
		62	! putc (data[i], rl_outstream);
		63	! }
		64	else
65	_rl_backspace (_rl_last_c_pos - new);
66	--- 1602,1606 ----
67	{
68	if (MB_CUR_MAX > 1 && rl_byte_oriented == 0)
69	! _rl_backspace (_rl_last_c_pos - _rl_col_width (data, 0, new));
70	else
71	_rl_backspace (_rl_last_c_pos - new);
72	***************
73	* 2118,2122 **
74	static int
75	_rl_col_width (str, start, end)
76	! char *str;
77	int start, end;
78	{
79	--- 2121,2125 ----
80	static int
81	_rl_col_width (str, start, end)
82	! const char *str;
83	int start, end;
84	{
85	***************
86	* 2194,2196 **
87	}
88	#endif /* HANDLE_MULTIBYTE */
89	-
90	--- 2197,2198 ----