diff options
| author | KO Myung-Hun <komh78@gmail.com> | 2016-01-12 11:35:47 +0900 |
|---|---|---|
| committer | Daiki Ueno <ueno@gnu.org> | 2016-01-20 11:37:18 +0900 |
| commit | 9c6af038865c4ad8644b5b5a10afc7f7972ecd66 (patch) | |
| tree | 9f989006bc30cdaf949ded039b216f3047a4b444 | |
| parent | 4d475fa2986e089b22ce63d42fdccdd1ea337afd (diff) | |
| download | external_gettext-9c6af038865c4ad8644b5b5a10afc7f7972ecd66.zip external_gettext-9c6af038865c4ad8644b5b5a10afc7f7972ecd66.tar.gz external_gettext-9c6af038865c4ad8644b5b5a10afc7f7972ecd66.tar.bz2 | |
moop: Replace CR as well as LF with a space
On OS/2, EOL marker is CR+LF.
* gnulib-local/bulid-aux/moopp (func_check_header_syntax):
Replace CR as well as LF with a space.
| -rw-r--r--[-rwxr-xr-x] | gnulib-local/build-aux/moopp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/gnulib-local/build-aux/moopp b/gnulib-local/build-aux/moopp index 4ab00c9..c155d93 100755..100644 --- 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 '\015\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 '\015\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 } |