Re: [bug-gettext] [PATCH 1/8] moop: Replace CR as well as NL with a space

[KO Myung-Hun]

KO Myung-Hun wrote:
> * gnulib-local/bulid-aux/moopp (func_check_header_syntax):
> Replace CR as well as NL with a space.
> ---
>  gnulib-local/build-aux/moopp | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
>  mode change 100755 => 100644 gnulib-local/build-aux/moopp
> 
> diff --git a/gnulib-local/build-aux/moopp b/gnulib-local/build-aux/moopp
> old mode 100755
> new mode 100644
> index 96a50a6..0e2dbb1
> --- a/gnulib-local/build-aux/moopp
> +++ b/gnulib-local/build-aux/moopp
> @@ -306,12 +306,12 @@ func_check_header_syntax ()
>    }
>    class_end_lineno=`expr $methods_lineno + $class_end_lineno`
>    sed_extract_methods="$class_end_lineno"',$d;1,'"$methods_lineno"'d'
> -  methods=`sed -e "$sed_remove_comments" < "$file" | sed -e 
> "$sed_extract_methods" | tr '\n' ' ' | tr ';' '\n' | sed -e 's,[         
> ]*$,,'`
> +  methods=`sed -e "$sed_remove_comments" < "$file" | sed -e 
> "$sed_extract_methods" | tr '\r\n' '  ' | tr ';' '\n' | sed -e 's,[      
> ]*$,,'`
>    sed_remove_valid_arg1_lines='/([   ]*'"$classname"'_t[     
> ]*[A-Za-z_0-9]*[        ]*[,)]/d'
>    sed_extract_method_name='s,^.*[^A-Za-z_0-9]\([A-Za-z_0-9][A-Za-z_0-9]*\)[  
> ]*(.*$,\1,'
>    methods_with_bad_arg1=`echo "$methods" | sed -e "$sed_remove_empty_lines" 
> -e "$sed_remove_valid_arg1_lines" -e "$sed_extract_method_name"`
>    if test -n "$methods_with_bad_arg1"; then
> -    methods_with_bad_arg1=`{ echo "$methods_with_bad_arg1" | sed -e 's/$/, 
> /' | tr -d '\n'; echo; } | sed -e 's/\(, \)*$//'`
> +    methods_with_bad_arg1=`{ echo "$methods_with_bad_arg1" | sed -e 's/$/, 
> /' | tr -d '\r\n'; echo; } | sed -e 's/\(, \)*$//'`
>      func_fatal_error "$file: some methods don't have a first argument of 
> type ${classname}_t: $methods_with_bad_arg1"
>    fi
>  }

Replaced '\r' with '\015'.

-- 
KO Myung-Hun

Using Mozilla SeaMonkey 2.7.2
Under OS/2 Warp 4 for Korean with FixPak #15
In VirtualBox v4.1.32 on Intel Core i7-3615QM 2.30GHz with 8GB RAM

Korean OS/2 User Community : http://www.ecomstation.co.kr

0001-moop-Replace-CR-as-well-as-LF-with-a-space.patch
Description: Source code patch