[PATCH 1/3] Makefile.am: fix regular expression can not adapt whitespace

[JingPiao Chen]

>> When I decode ustat syscall
> # include DEF_MPERS_TYPE(ustat_t) will fault
> >  Makefile.am | 2 +- >  1 file changed, 1 insertion(+), 1 deletion(-)
>
>Nice catch.  Would you write a changelog entry for this fix, please?

Makefile.am: fix regular expression can not tolerate extra whitespace

If have whitespace between pound and include, the regular expression
will not match.

* Makefile.am (m%_type_defs.h): Fix regular expression.

>> diff --git a/Makefile.am b/Makefile.am
>> index afc3dd2..a7d7006 100644
>> --- a/Makefile.am
>> +++ b/Makefile.am
>> @@ -880,7 +880,7 @@ mpers-m%.stamp: $(srcdir_mpers_source_files) |
printers.h
>>
>>  m%_type_defs.h: $(srcdir_mpers_source_files)
>>       for f in $^; do \
>> -             sed -r -n 's/^#include DEF_MPERS_TYPE\(([^)]+)\)/#ifdef
MPERS_$(mpers_PREFIX)\1\n# define \1 MPERS_$(mpers_PREFIX)\1\n#endif/p' $$f
|| exit; \
>> +             sed -r -n 's/^#[[:space:]]*include
DEF_MPERS_TYPE\(([^)]+)\)/#ifdef MPERS_$(mpers_PREFIX)\1\n# define \1
MPERS_$(mpers_PREFIX)\1\n#endif/p' $$f || exit; \
>>       done > $@-t
>>       echo '#undef MPERS_PRINTER_NAME' >> $@-t
>>       echo '#define MPERS_PRINTER_NAME(printer_name) printer_name' >>
$@-t

--
JingPiao Chen
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.strace.io/pipermail/strace-devel/attachments/20170118/c99b84da/attachment.html>