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=56bb38357ab4ecb8315283d813318174a6c3d45e The branch, branch-1.6 has been updated via 56bb38357ab4ecb8315283d813318174a6c3d45e (commit) from 3747d9b3026ff3372789f0c8f451791af966acfd (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 56bb38357ab4ecb8315283d813318174a6c3d45e Author: Eric Blake <[EMAIL PROTECTED]> Date: Thu Sep 25 22:16:57 2008 -0600 Tweak error message on command line failure. * src/m4.c (main, process_file): Match wording of include builtin. * src/freeze.c (produce_frozen_state, reload_frozen_state): Likewise. * src/input.c (push_file): Likewise. * src/builtin.c (m4_undivert, include, m4_debugfile): Likewise. * m4/gnulib-cache.m4: Regenerate. * doc/m4.texinfo (Command line files, Debugmode) (Using frozen files): Update tests accordingly. Signed-off-by: Eric Blake <[EMAIL PROTECTED]> (cherry picked from commit 5116db0fcd37e4480062b4819dca17a98a7890d7) ----------------------------------------------------------------------- Summary of changes: ChangeLog | 13 +++++++++++++ doc/m4.texinfo | 8 ++++---- m4/gnulib-cache.m4 | 2 +- src/builtin.c | 12 ++++++++---- src/freeze.c | 6 ++++-- src/input.c | 3 ++- src/m4.c | 10 +++++++--- 7 files changed, 39 insertions(+), 15 deletions(-) diff --git a/ChangeLog b/ChangeLog index 0786c2a..31219e4 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,16 @@ +2008-09-25 Eric Blake <[EMAIL PROTECTED]> + + Tweak error message on command line failure. + * src/m4.c (main, process_file): Match wording of include + builtin. + * src/freeze.c (produce_frozen_state, reload_frozen_state): + Likewise. + * src/input.c (push_file): Likewise. + * src/builtin.c (m4_undivert, include, m4_debugfile): Likewise. + * m4/gnulib-cache.m4: Regenerate. + * doc/m4.texinfo (Command line files, Debugmode) + (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 db80b60..87714cb 100644 --- a/doc/m4.texinfo +++ b/doc/m4.texinfo @@ -1020,7 +1020,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 @@ -4174,10 +4174,10 @@ to macro tracing. @comment options: -dip @example $ @kbd{m4 -dip -I examples} [EMAIL PROTECTED]: input read from stdin [EMAIL PROTECTED]: input read from `stdin' include(`foo')dnl @error{}m4debug: path search for `foo' found `examples/foo' [EMAIL PROTECTED]: input read from examples/foo [EMAIL PROTECTED]: input read from `examples/foo' @result{}bar @error{}m4debug: input reverted to stdin, line 1 ^D @@ -7298,7 +7298,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 @c Another test - can we properly freeze embedded NUL? diff --git a/m4/gnulib-cache.m4 b/m4/gnulib-cache.m4 index a738429..1b52a1c 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 clean-temp cloexec close-stream closein config-h dirname error fdl fflush filenamecat flexmember fopen fopen-safer fseeko gendocs getopt git-version-gen gnumakefile gnupload gpl-3.0 hash intprops memmem mkstemp obstack obstack-printf-posix progname quote regex stdbool stdint stdlib-safer strtod strtol unlocked-io vasnprintf-posix verror version-etc version-etc-fsf xalloc xmemdup0 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 clean-temp cloexec close-stream closein config-h dirname error fdl fflush filenamecat flexmember fopen fopen-safer fseeko gendocs getopt git-version-gen gnumakefile gnupload gpl-3.0 hash intprops memmem mkstemp obstack obstack-printf-posix progname quote regex stdbool stdint stdlib-safer strtod strtol unlocked-io vasnprintf-posix verror version-etc version-etc-fsf xalloc xmemdup0 xprintf xvasprintf-posix # Specification in the form of a few gnulib-tool.m4 macro invocations: gl_LOCAL_DIR([local]) diff --git a/src/builtin.c b/src/builtin.c index bf09756..267292c 100644 --- a/src/builtin.c +++ b/src/builtin.c @@ -1356,10 +1356,12 @@ m4_undivert (struct obstack *obs, int argc, macro_arguments *argv) { insert_file (fp); if (fclose (fp) == EOF) - m4_warn (errno, me, _("error undiverting `%s'"), str); + m4_warn (errno, me, _("error undiverting %s"), + quotearg_style (locale_quoting_style, str)); } else - m4_warn (errno, me, _("cannot undivert `%s'"), str); + m4_warn (errno, me, _("cannot undivert %s"), + quotearg_style (locale_quoting_style, str)); } } } @@ -1466,7 +1468,8 @@ include (int argc, macro_arguments *argv, bool silent) if (fp == NULL) { if (!silent) - m4_error (0, errno, me, _("cannot open `%s'"), ARG (1)); + m4_error (0, errno, me, _("cannot open %s"), + quotearg_style (locale_quoting_style, ARG (1))); return; } @@ -1792,7 +1795,8 @@ m4_debugfile (struct obstack *obs, int argc, macro_arguments *argv) if (argc == 1) debug_set_output (me, NULL); else if (!debug_set_output (me, ARG (1))) - m4_warn (errno, me, _("cannot set error file: `%s'"), ARG (1)); + m4_warn (errno, me, _("cannot set error file: %s"), + quotearg_style (locale_quoting_style, ARG (1))); } /* This section contains text processing macros: "len", "index", diff --git a/src/freeze.c b/src/freeze.c index c45722f..2648e39 100644 --- a/src/freeze.c +++ b/src/freeze.c @@ -124,7 +124,8 @@ produce_frozen_state (const char *name) file = fopen (name, O_BINARY ? "wb" : "w"); if (!file) { - m4_error (0, errno, NULL, _("cannot open %s"), name); + m4_error (0, errno, NULL, _("cannot open %s"), + quotearg_style (locale_quoting_style, name)); return; } @@ -288,7 +289,8 @@ reload_frozen_state (const char *name) file = m4_path_search (name, NULL); if (file == NULL) - m4_error (EXIT_FAILURE, errno, NULL, _("cannot open %s"), name); + m4_error (EXIT_FAILURE, errno, NULL, _("cannot open %s"), + quotearg_style (locale_quoting_style, name)); current_file = name; allocated[0] = 100; diff --git a/src/input.c b/src/input.c index 67f535c..822f55a 100644 --- a/src/input.c +++ b/src/input.c @@ -252,7 +252,8 @@ push_file (FILE *fp, const char *title, bool close_when_done) } if (debug_level & DEBUG_TRACE_INPUT) - debug_message ("input read from %s", title); + debug_message ("input read from %s", + quotearg_style (locale_quoting_style, title)); i = (input_block *) obstack_alloc (current_input, sizeof *i); i->type = INPUT_FILE; diff --git a/src/m4.c b/src/m4.c index 6a1ded9..bf8a657 100644 --- a/src/m4.c +++ b/src/m4.c @@ -360,7 +360,9 @@ process_file (const char *name) to read input from stdin twice, like GNU cat. Besides, there is no point closing stdin before wrapped text, to minimize bugs in syscmd called from wrapped text. */ - push_file (stdin, "stdin", false); + /* TRANSLATORS: This is a short name for `standard input', used + when a command line file was given as `-'. */ + push_file (stdin, _("stdin"), false); } else { @@ -368,7 +370,8 @@ 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", + quotearg_style (locale_quoting_style, name)); /* Set the status to EXIT_FAILURE, even though we continue to process files after a missing file. */ retcode = EXIT_FAILURE; @@ -584,7 +587,8 @@ main (int argc, char *const *argv, char *const *envp) /* Do the basic initializations. */ if (debugfile && !debug_set_output (NULL, debugfile)) - m4_error (0, errno, NULL, _("cannot set debug file `%s'"), debugfile); + m4_error (0, errno, NULL, _("cannot set debug file %s"), + quotearg_style (locale_quoting_style, debugfile)); input_init (); output_init (); hooks/post-receive -- GNU M4 source repository
