From 66f0441da3d12c9a68787ff24315cdbd513d14ad Mon Sep 17 00:00:00 2001 From: "Joel E. Denny" Date: Sat, 10 Nov 2007 01:36:54 +0000 Subject: [PATCH] * data/bison.m4 (b4_cat): Put a newline after the end delimiter of the here document and before the EOF so that BSD's implementation of Bourne shell doesn't parse the delimiter as part of the here document. * doc/.cvsignore: Add cross-options.texi. * src/getargs.c (usage): Add a blank line after the warning categories. --- ChangeLog | 8 ++++++++ data/bison.m4 | 3 ++- doc/.cvsignore | 1 + src/getargs.c | 1 + 4 files changed, 12 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index a522abcd..a24f3c53 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +2007-11-09 Joel E. Denny + + * data/bison.m4 (b4_cat): Put a newline after the end delimiter of the + here document and before the EOF so that BSD's implementation of Bourne + shell doesn't parse the delimiter as part of the here document. + * doc/.cvsignore: Add cross-options.texi. + * src/getargs.c (usage): Add a blank line after the warning categories. + 2007-11-08 Paolo Bonzini * data/lalr1.java (Lexer): Remove usage of b4_pure_if. diff --git a/data/bison.m4 b/data/bison.m4 index 75c9b753..6e1922b1 100644 --- a/data/bison.m4 +++ b/data/bison.m4 @@ -74,7 +74,8 @@ version 2.2 of Bison.])]) m4_define([b4_cat], [m4_syscmd([cat <<'_m4eof' ]m4_bpatsubst(m4_dquote($1), [_m4eof], [_m4@`eof])[@ -_m4eof])dnl +_m4eof +])dnl m4_if(m4_sysval, [0], [], [m4_fatal([$0: cannot write to stdout])])]) # b4_error(KIND, FORMAT, [ARG1], [ARG2], ...) diff --git a/doc/.cvsignore b/doc/.cvsignore index 15442d89..f3d7a603 100644 --- a/doc/.cvsignore +++ b/doc/.cvsignore @@ -20,3 +20,4 @@ Makefile.in *.info* stamp-vti version.texi +cross-options.texi diff --git a/src/getargs.c b/src/getargs.c index fca4401b..48103c68 100644 --- a/src/getargs.c +++ b/src/getargs.c @@ -298,6 +298,7 @@ Warning categories include:\n\ `no-CATEGORY' turn off warnings in CATEGORY\n\ `none' turn off all the warnings\n\ `error' treat warnings as errors\n\ +\n\ "), stdout); fputs (_("\ -- 2.45.2