Re: [patch-readline] history file reading

[Daniel Jacobowitz <drow@false.org>]

On Tue, Mar 21, 2006 at 09:47:30AM -0500, Chet Ramey wrote:
> Denis PILAT wrote:
> 
> >>
> > This new version of my patch changes the way we read history files to
> > allow "\r\n" in end-of-line.
> > I don't change any more the way we write history files.
> 
> I don't see any problem with including this, or a variant.

Fine by me too.

Denis, if you plan to continue submitting GDB patches, I think this is
the point where I talk about coding style :-)

On Tue, Mar 21, 2006 at 11:21:59AM +0100, Denis PILAT wrote:
> 2006-03-21  Denis Pilat <denis.pilat@st.com>
> 
>    * histfile.c (read_history_range): remove '\r' character from 
> history lines
>    to allow reading files with Windows like end-of-line on unix host.

Our ChangeLog entries have two spaces between date and name, and two
between name and date.  The indented portion starts with a tab on every
line.  The first character should usually be capitalized.  Also, they
cover only "what" and not "why".

2006-03-21  Denis Pilat  <denis.pilat@st.com>
 
	* histfile.c (read_history_range): Remove '\r' character from
	history lines.

> Index: histfile.c
> ===================================================================
> --- histfile.c	(revision 386)
> +++ histfile.c	(working copy)
> @@ -228,7 +228,11 @@
>    for (line_end = line_start; line_end < bufend; line_end++)
>      if (*line_end == '\n')
>        {
> -	*line_end = '\0';
> +	/* allow reading files with Windows like end-of-line */

Comments start with a capital, and end with a period and two spaces.
	/* Allow reading files with Windows-like end-of-line.  */

> +	if ( line_end - 1 >= line_start && *( line_end - 1 ) =='\r' )
> +	  *( line_end - 1 )  = '\0';

And you don't need the spaces inside the parentheses, but do usually
need spaces around operators:

	if (line_end - 1 >= line_start && *(line_end - 1) == '\r')
	  *(line_end - 1)  = '\0';

> +	else
> +	  *line_end = '\0';
>  
>  	if (*line_start)
>  	  add_history (line_start);

I've checked this in with formatting fixes.

-- 
Daniel Jacobowitz
CodeSourcery