diff options
| -rw-r--r-- | cfg.mk | 11 | ||||
| -rw-r--r-- | doc/Makefile.am | 1 | ||||
| -rw-r--r-- | doc/m4.texi | 11 | ||||
| -rw-r--r-- | examples/WWW/m4lib/test.m4 | 1 | ||||
| -rw-r--r-- | m4/input.c | 2 | ||||
| -rw-r--r-- | m4/macro.c | 2 | ||||
| -rw-r--r-- | m4/output.c | 2 | ||||
| -rw-r--r-- | m4/path.c | 2 | ||||
| -rw-r--r-- | po/Makevars | 2 | ||||
| -rw-r--r-- | src/stackovf.c | 4 |
10 files changed, 19 insertions, 19 deletions
@@ -28,14 +28,15 @@ update-copyright-env = \ # sc_po_check assumes a directory layout that we don't quite provide local-checks-to-skip = sc_cast_of_x_alloc_return_value \ sc_proper_name_utf8_requires_ICONV \ - sc_po_check + sc_po_check \ + sc_bindtextdomain # PRAGMA_SYSTEM_HEADER includes #, which does not work through a # Makefile variable, so we exempt it. _makefile_at_at_check_exceptions = ' && !/PRAGMA_SYSTEM_HEADER/' # Hash of NEWS contents, to ensure we don't add entries to wrong section. -old_NEWS_hash = 63ea02337d29e0ce5574ec04d87df4f9 +old_NEWS_hash = bbccada98ce08092a9f24b508c399051 # Indent only with spaces. sc_prohibit_tab_based_indentation: @@ -45,10 +46,14 @@ sc_prohibit_tab_based_indentation: # List all syntax-check exemptions: exclude_file_name_regexp--sc_cast_of_argument_to_free = ^m4/m4private.h$ +exclude_file_name_regexp--sc_prohibit_always_true_header_tests = \ + ^Makefile.am$$ +exclude_file_name_regexp--sc_prohibit_strncpy = ^m4/path.c$$ exclude_file_name_regexp--sc_prohibit_tab_based_indentation = \ (^(GNU)?Makefile(\.am)?|\.mk|^HACKING|^ChangeLog.*)$$ exclude_file_name_regexp--sc_require_config_h = \ ^modules/(evalparse|format)\.c$$ exclude_file_name_regexp--sc_require_config_h_first = \ ^modules/(evalparse|format)\.c$$ -exclude_file_name_regexp--update_copyright = ^ltdl/m4/gnulib-cache.m4$$ +exclude_file_name_regexp--update_copyright = \ + ^(doc/m4\.texi|ltdl/m4/gnulib-cache.m4)$$ diff --git a/doc/Makefile.am b/doc/Makefile.am index 70b9853e..88787ea5 100644 --- a/doc/Makefile.am +++ b/doc/Makefile.am @@ -41,4 +41,3 @@ TAGS_DEPENDENCIES = $(TAGS_FILES) ETAGS_ARGS = --language=none --regex='/@node \([^,]*\)/\1/' $(TAGS_FILES) MAINTAINERCLEANFILES += $(dist_man_MANS) - diff --git a/doc/m4.texi b/doc/m4.texi index 6debc4af..f262a7b4 100644 --- a/doc/m4.texi +++ b/doc/m4.texi @@ -45,8 +45,7 @@ This manual (@value{UPDATED}) is for GNU M4 (version @value{VERSION}), a package containing an implementation of the m4 macro language. -Copyright @copyright{} 1989, 1990, 1991, 1992, 1993, 1994, 2004, 2005, -2006, 2007, 2008, 2009, 2010, 2011, 2013 Free Software Foundation, Inc. +Copyright @copyright{} 1989-1994, 2004-2011, 2013 Free Software Foundation, Inc. @quotation Permission is granted to copy, distribute and/or modify this document @@ -1562,9 +1561,9 @@ m4_eval(`1') @end example Another alternative is to redefine problematic macros to a name less -likely to cause conflicts, using @xref{Definitions}. Or the parsing +likely to cause conflicts, using @ref{Definitions}. Or the parsing engine can be changed to redefine what constitutes a valid macro name, -using @xref{Changesyntax}. +using @ref{Changesyntax}. Of course, the simplest way to prevent a name from being interpreted as a call to an existing macro is to quote it. The remainder of @@ -6082,8 +6081,8 @@ files on the command line. In GNU M4, an alternative method of reading files is using @code{undivert} (@pxref{Undivert}) on a named file. -In addition, as a GNU M4 extension, if the included file can -not be found exactly as given, various standard suffixes are appended. +In addition, as a GNU M4 extension, if the included file cannot +be found exactly as given, various standard suffixes are appended. If the included file name is absolute (a full path from the root directory is given) then additional search directories are not examined, although suffixes will be tried if the file is not found exactly as given. diff --git a/examples/WWW/m4lib/test.m4 b/examples/WWW/m4lib/test.m4 index 90d63a69..110cf12b 100644 --- a/examples/WWW/m4lib/test.m4 +++ b/examples/WWW/m4lib/test.m4 @@ -27,4 +27,3 @@ include(`setup.m4') \undivert(1) \defn([_ideas]) - @@ -1247,7 +1247,7 @@ pop_input (m4 *context, bool cleanup) return true; } -/* To switch input over to the wrapup stack, main () calls pop_wrapup. +/* To switch input over to the wrapup stack, main calls pop_wrapup. Since wrapup text can install new wrapup text, pop_wrapup () returns true if there is more wrapped text to parse. */ bool @@ -25,8 +25,6 @@ #include "m4private.h" -#include "intprops.h" - /* Define this to 1 see runtime debug info. Implied by DEBUG. */ /*#define DEBUG_INPUT 1 */ #ifndef DEBUG_MACRO diff --git a/m4/output.c b/m4/output.c index b75ced1d..b1e82ff8 100644 --- a/m4/output.c +++ b/m4/output.c @@ -1041,7 +1041,7 @@ m4_insert_diversion (m4 *context, int divnum) } } -/* Get back all diversions. This is done just before exiting from main (), +/* Get back all diversions. This is done just before exiting from main, and from m4_undivert (), if called without arguments. */ void m4_undivert_all (m4 *context) @@ -254,7 +254,7 @@ m4_fopen (m4 *context, const char *file, const char *mode) { struct stat st; int fd; - + fp = fopen (file, mode); fd = fileno (fp); diff --git a/po/Makevars b/po/Makevars index 118868e6..fb241d66 100644 --- a/po/Makevars +++ b/po/Makevars @@ -41,4 +41,4 @@ MSGID_BUGS_ADDRESS = bug-m4@gnu.org # This is the list of locale categories, beyond LC_MESSAGES, for which the # message catalogs shall be used. It is usually empty. -EXTRA_LOCALE_CATEGORIES = +EXTRA_LOCALE_CATEGORIES = diff --git a/src/stackovf.c b/src/stackovf.c index 649b9da4..39d6f5e6 100644 --- a/src/stackovf.c +++ b/src/stackovf.c @@ -277,14 +277,14 @@ sigsegv_handler (int signo) /* Arrange to trap a stack-overflow and call a specified handler. The call is on a dedicated signal stack. - argv and envp are as passed to main(). + argv and envp are as passed to main. If a stack overflow is not detected, then the SIGSEGV is re-raised with action set to SIG_DFL, causing an abort and coredump in the usual way. Detection of a stack overflow depends on the trap address being near - the stack limit address. The stack limit can not be directly + the stack limit address. The stack limit cannot be directly determined in a portable way, but we make an estimate based on the address of the argv and environment vectors, their contents, and the maximum stack size obtained using getrlimit. */ |