This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "GNU M4 source repository".
http://git.sv.gnu.org/gitweb/?p=m4.git;a=commitdiff;h=5116db0fcd37e4480062b4819dca17a98a7890d7 The branch, branch-1.4 has been updated via 5116db0fcd37e4480062b4819dca17a98a7890d7 (commit) from eed62f0d2729c243d7c081c48d789f9d86fa340f (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 5116db0fcd37e4480062b4819dca17a98a7890d7 Author: Eric Blake <[EMAIL PROTECTED]> Date: Thu Sep 25 06:32:26 2008 -0600 Tweak error message on command line failure. * src/m4.c (process_file): Match wording of include builtin. * src/freeze.c (produce_frozen_state): Likewise. * m4/gnulib-cache.m4: Regenerate. * doc/m4.texinfo (Command line files, Using frozen files): Update tests accordingly. Signed-off-by: Eric Blake <[EMAIL PROTECTED]> ----------------------------------------------------------------------- Summary of changes: ChangeLog | 9 +++++++++ doc/m4.texinfo | 4 ++-- m4/gnulib-cache.m4 | 2 +- src/freeze.c | 2 +- src/m4.c | 2 +- 5 files changed, 14 insertions(+), 5 deletions(-) diff --git a/ChangeLog b/ChangeLog index b2e6b57..c6d3b67 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,12 @@ +2008-09-25 Eric Blake <[EMAIL PROTECTED]> + + Tweak error message on command line failure. + * src/m4.c (process_file): Match wording of include builtin. + * src/freeze.c (produce_frozen_state): Likewise. + * m4/gnulib-cache.m4: Regenerate. + * doc/m4.texinfo (Command line files, Using frozen files): Update + tests accordingly. + 2008-09-24 Eric Blake <[EMAIL PROTECTED]> Unify error handling for reading directories. diff --git a/doc/m4.texinfo b/doc/m4.texinfo index 6fcd9f3..940bd9c 100644 --- a/doc/m4.texinfo +++ b/doc/m4.texinfo @@ -934,7 +934,7 @@ options. @comment xerr: ignore @comment options: Makefile/ @example [EMAIL PROTECTED]: Makefile/: Not a directory [EMAIL PROTECTED]: cannot open `Makefile/': Not a directory @end example @end ignore @@ -6843,7 +6843,7 @@ syscmd([echo 'changequote([,])pushdef([divnum],[hi])dnl' \ @example $ @kbd{m4 -F /none/such} ^D [EMAIL PROTECTED]: cannot open /none/such: No such file or directory [EMAIL PROTECTED]: cannot open `/none/such': No such file or directory @end example @end ignore diff --git a/m4/gnulib-cache.m4 b/m4/gnulib-cache.m4 index 96864de..f6cc1ac 100644 --- a/m4/gnulib-cache.m4 +++ b/m4/gnulib-cache.m4 @@ -15,7 +15,7 @@ # Specification in the form of a command-line invocation: -# gnulib-tool --import --dir=. --local-dir=local --lib=libm4 --source-base=lib --m4-base=m4 --doc-base=doc --aux-dir=build-aux --with-tests --no-libtool --macro-prefix=M4 announce-gen assert autobuild avltree-oset binary-io c-stack clean-temp cloexec close-stream closein config-h dirname error fdl fflush filenamecat fopen fopen-safer fseeko gendocs getopt git-version-gen gnumakefile gnupload gpl-3.0 intprops mkstemp obstack progname regex sigaction stdbool stdint stdlib-safer strsignal strstr strtod strtol unlocked-io verror version-etc version-etc-fsf xalloc xprintf xvasprintf-posix +# gnulib-tool --import --dir=. --local-dir=local --lib=libm4 --source-base=lib --m4-base=m4 --doc-base=doc --tests-base=tests --aux-dir=build-aux --with-tests --no-libtool --macro-prefix=M4 announce-gen assert autobuild avltree-oset binary-io c-stack clean-temp cloexec close-stream closein config-h dirname error fdl fflush filenamecat fopen fopen-safer fseeko gendocs getopt git-version-gen gnumakefile gnupload gpl-3.0 intprops mkstemp obstack progname regex sigaction stdbool stdint stdlib-safer strsignal strstr strtod strtol unlocked-io verror version-etc version-etc-fsf xalloc xprintf xvasprintf-posix # Specification in the form of a few gnulib-tool.m4 macro invocations: gl_LOCAL_DIR([local]) diff --git a/src/freeze.c b/src/freeze.c index 2a7ff30..ddc2e08 100644 --- a/src/freeze.c +++ b/src/freeze.c @@ -59,7 +59,7 @@ produce_frozen_state (const char *name) file = fopen (name, O_BINARY ? "wb" : "w"); if (!file) { - M4ERROR ((EXIT_FAILURE, errno, "cannot open %s", name)); + M4ERROR ((EXIT_FAILURE, errno, "cannot open `%s'", name)); return; } diff --git a/src/m4.c b/src/m4.c index ee0fe8a..a414086 100644 --- a/src/m4.c +++ b/src/m4.c @@ -332,7 +332,7 @@ process_file (const char *name) FILE *fp = m4_path_search (name, &full_name); if (fp == NULL) { - error (0, errno, "%s", name); + error (0, errno, "cannot open `%s'", name); /* Set the status to EXIT_FAILURE, even though we continue to process files after a missing file. */ retcode = EXIT_FAILURE; hooks/post-receive -- GNU M4 source repository
