[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[SCM] GNU M4 source repository branch, master, updated. cvs-readonly-297
|
From: |
Gary V. Vaughan |
|
Subject: |
[SCM] GNU M4 source repository branch, master, updated. cvs-readonly-297-g425b0ac |
|
Date: |
Wed, 18 Sep 2013 13:56:30 +0000 |
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=425b0ac01f3bbe0a8cfe6ed53018972edd2117a4
The branch, master has been updated
via 425b0ac01f3bbe0a8cfe6ed53018972edd2117a4 (commit)
via 7044c45b704482ee62d1edf3a2f3dc81c6115d60 (commit)
via 0b85e7900bcb0fda336c7516f76ad205fbd1d864 (commit)
via ddcce81a92b0fb9bf03fa7ac26dd6276b2f8d850 (commit)
via fac1526740ee9b4b9c1e44b52197586e5cbef42c (commit)
via 845013907b194e5de4d30e777b21d6e9708e7b4c (commit)
via b3c0e2e14e34699b513661ae07dc3aba1628cfb5 (commit)
via 2695c2e9865c662667a96dc653317f729c1ea461 (commit)
via 32e2df2076b380916a3cb0d3ec2b0478cce38c21 (commit)
via 4c0e23155dbd417bc6ede1d03107e8870aca60fc (commit)
via 2bacbb871b9dd05362405cf2ceedb32a0f6d14e2 (commit)
via 390d259efe8e1c7e4b6babb4738fef7427416857 (commit)
via deda5d4549291f15579b9c8ae4f9b1f862bc73bb (commit)
via 2f206e2b7a583a8d2df39156b481a641d9393439 (commit)
via f9cece52f95847352a2a7e3bf9e3f59a5ae90816 (commit)
via 0585a54b4a126cdd35df9e4a9a234cce94a17ff6 (commit)
via f9abad38cf4bf42d32c6c8b48250f1483374786e (commit)
via ab19c9ba16801de7dbb6b94cbd3af427d46461e1 (commit)
via 6d0394c1c23957e387e4d860478ed06a3f5f5fed (commit)
via d3ac3947560b01e468796e4160b57b12970c4eb7 (commit)
via aef4d681e405d840aa2b6c5dcebdcd809dbf6c79 (commit)
via e926b57609bc28600396e482d6f4598816d0dc87 (commit)
via cbc2d84210a693a84e74f6524f754673182374c6 (commit)
via f59ca8a7e78ebfebb6be24e6b731e7da795ae7aa (commit)
via fbcce6f63f9c2dc2f0a54f5217cfb4c4ed4d8a28 (commit)
from e651af07a6e61976af131dba3d028bcf73312a6e (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 425b0ac01f3bbe0a8cfe6ed53018972edd2117a4
Author: Michael Witten <address@hidden>
Date: Thu Aug 8 03:34:15 2013 +0000
doc: fix SVR3/4 references.
Consider:
$ git grep SVR4 861325a84f231a2a2da307b53ef5ff527d67e876 | cut -c 42-
ChangeLog: that Jim developped stackovf.c on a 486 running SVR4.0
(ESIX), and
ChangeLog: `boolean'. This tag conflicts with <sys/types.h> on
SVR4.
README:processor. It is mostly SVR4 compatible, although it has some
doc/m4.texinfo:processor. It is mostly SVR4 compatible, although it has
some
examples/WWW/m4lib/whatis.m4:version, and SVR4, although it has some
extensions (for example,
src/stackovf.c: signal stacks using either SVR4 or BSD interfaces.
src/stackovf.c: 1. The siginfo parameter (with siginfo.h, i.e.,
SVR4).
src/stackovf.c:/* SVR4. */
In particular:
doc/m4.texinfo:processor. It is mostly SVR4 compatible, although it has
some
Elsewhere in `doc/m4.texinfo', only `Release 3' is referenced:
$ git grep Release 861325a84f231a2a2da307b53ef5ff527d67e876 --
doc/m4.texinfo | cut -c 42-
doc/m4.texinfo:System V, Release 3 version, except for some minor
differences.
doc/m4.texinfo:UNIX, such as System V Release 3, Solaris, and
@acronym{BSD} flavors.
This commit simply changes those last 2 lines by replacing `Release 3'
with `Release 4'.
* doc/m4.texinfo: Note that m4 is mostly compatible with SVR4.
Signed-off-by: Michael Witten <address@hidden>
commit 7044c45b704482ee62d1edf3a2f3dc81c6115d60
Author: Eric Blake <address@hidden>
Date: Tue Mar 12 17:23:30 2013 -0600
build: avoid test failure on HPUX
POSIX permits implementations to open fd 0, 1, and 2 on exec(), even
when the user tried to close them. HPUX-11.23 is one of the
implementations that does not allow closed standard descriptors,
leading to a failure of test 005.command_li. But a test that makes
sure we behave gracefully in the face of closed standard descriptors
makes no sense on a platform where we can never have them closed, so
add some code to skip the test on "helpful" platforms.
Note - HPUX opens any closed standard descriptor as O_WRONLY on
/dev/null. This means that attempts to close stdout generally
result in silent success, but attempts to close stdin often still
result in failure when it is not possible to read from the O_WRONLY
stdin.
* doc/m4.texi (Command line files): Skip tests on systems where it
is impossible to start with stdin/out closed.
Reported by Gary V. Vaughan.
Signed-off-by: Eric Blake <address@hidden>
commit 0b85e7900bcb0fda336c7516f76ad205fbd1d864
Author: Eric Blake <address@hidden>
Date: Sat Mar 9 18:04:59 2013 -0700
build: fix large diversions on mingw
Gnulib's clean-temp module defaults to using _O_TEMPORARY on mingw,
which has the effect of deleting a file the first time it is closed.
This resulted in a testsuite failure in 146.diversions, with m4
complaining that it could not create a temporary file for holding a
diversion. In reality, m4 was trying to rename the file, but
because mingw does not allow renaming an open file, we have to close
it first - but closing it first deleted the file.
For now, we will just work around the gnulib issue by disabling the
use of _O_TEMPORARY.
This was probably introduced in commit da5f6db (1.4.13), although
my testing environment was painfully slow to confirm this, so I
did not call out a 'regression since xyz' in the NEWS entry.
* gl/lib/clean-temp.c.diff: New file.
Signed-off-by: Eric Blake <address@hidden>
commit ddcce81a92b0fb9bf03fa7ac26dd6276b2f8d850
Author: Gary V. Vaughan <address@hidden>
Date: Wed Sep 18 20:05:20 2013 +0700
maint: either fix or disable failing syntax-check rules.
* cfg.mk (local-checks-to-skip): Skip bindtextdomain until I
understand it!
(old_NEWS_hash): Update.
(exclude_file_name_regexp--sc_prohibit_always_true_header_tests)
(exclude_file_name_regexp--sc_prohibit_strncpy)
(exclude_file_name_regexp--update_copyright): Exclude failing
files.
* doc/Makefile.am: Remove trailing blank line.
* m4/path.c: Remove trailing whitespace.
* doc/m4.texi: Fix some errors flagged by syntax checks.
* m4/input.c, m4/macro.c, m4/output.c, m4/stackovf.c: Don't use
`main ()', which confuses syntax-checks.
Signed-off-by: Gary V. Vaughan <address@hidden>
commit fac1526740ee9b4b9c1e44b52197586e5cbef42c
Author: Eric Blake <address@hidden>
Date: Sat Dec 22 07:18:15 2012 -0700
maint: move syntax check exemptions into cfg.mk
It's easier to maintain exemptions in a single file than it is
to maintain a bunch of hidden .x files.
* .x-sc_cast_of_argument_to_free: Delete file.
* .x-sc_prohibit_tab_based_indentation: Likewise.
* .x-sc_require_config_h: Likewise.
* .x-sc_require_config_h_first: Likewise.
* Makefile.am (syntax_check_exceptions): Delete rule.
* cfg.mk (exclude_file_name_regexp): Move exemptions here.
Signed-off-by: Eric Blake <address@hidden>
commit 845013907b194e5de4d30e777b21d6e9708e7b4c
Author: Eric Blake <address@hidden>
Date: Mon Nov 19 14:17:53 2012 -0700
build: avoid problematic gcc 4.4 warnings
Warnings that make sense under newer gcc can cause spurious
failures under older gcc; it's nice to allow out-of-the-box
development on stable releases while still getting the benefit
of improved warning detection in bleeding-edge setups.
* configure.ac (nw): Disable gcc warnings that cause build
failures under RHEL 6.3.
* gnulib: Update to latest.
Signed-off-by: Eric Blake <address@hidden>
commit b3c0e2e14e34699b513661ae07dc3aba1628cfb5
Author: Paul Eggert <address@hidden>
Date: Wed Nov 14 17:39:28 2012 -0800
doc: improve prehistory discussion
* doc/m4.texinfo (History): Describe M6 and related processors.
From a suggestion by Doug McIlroy in
<http://lists.gnu.org/archive/html/m4-discuss/2012-05/msg00004.html>.
Also, improve citation quality by giving URLs and so forth.
commit 2695c2e9865c662667a96dc653317f729c1ea461
Author: Eric Blake <address@hidden>
Date: Tue Sep 4 16:18:59 2012 -0600
maint: drop CVS cruft
These days, no one is complaining about using git as the primary
interface. Anyone still using CVS can maintain their own ignore files.
* bootstrap.conf (vc_ignore): Drop .cvsignore.
Signed-off-by: Eric Blake <address@hidden>
commit 32e2df2076b380916a3cb0d3ec2b0478cce38c21
Author: Eric Blake <address@hidden>
Date: Sat Sep 1 12:35:00 2012 -0600
build: add more compiler checking
Enable a bit more gcc warning coverage.
* configure.ac (nw): Turn on some warnings that no longer trigger
a gcc warning, or where we reduce the scope of unwarned code.
Signed-off-by: Eric Blake <address@hidden>
commit 4c0e23155dbd417bc6ede1d03107e8870aca60fc
Author: Eric Blake <address@hidden>
Date: Tue Sep 4 16:53:19 2012 -0600
build: mark several pure functions
Found by using gcc 4.7.0's -Wsuggest-attribute=pure.
* m4/system_.h (M4_GNUC_PURE): New macro.
* m4/builtin.c (m4_builtin_find_by_name, m4_builtin_find_by_func):
Mark pure.
Signed-off-by: Eric Blake <address@hidden>
commit 2bacbb871b9dd05362405cf2ceedb32a0f6d14e2
Author: Eric Blake <address@hidden>
Date: Sat Sep 1 10:46:38 2012 -0700
doc: fix misuse of @xref
Texinfo states that @xref must start a sentence.
* doc/m4.texinfo (Inhibiting Invocation): Reword.
Signed-off-by: Eric Blake <address@hidden>
commit 390d259efe8e1c7e4b6babb4738fef7427416857
Author: Eric Blake <address@hidden>
Date: Mon Jun 25 22:03:04 2012 -0600
build: deal with newer glibc vs. FORTIFY_SOURCE
Recent glibc (for whatever stupid reason) decided to issue a #warning
when FORTIFY_SOURCE is requested but not possible, due to compilation
without optimization. But when debugging sources, we don't want our
use of -Werror to kill compilation just because glibc wants to be
chatty; when debugging, we don't care about source fortification.
* configure.ac (FORTIFY_SOURCE): Make conditional on optimization.
Signed-off-by: Eric Blake <address@hidden>
commit deda5d4549291f15579b9c8ae4f9b1f862bc73bb
Author: Eric Blake <address@hidden>
Date: Sat Apr 30 17:50:21 2011 -0600
gnulib: improve SIGPIPE emulation on mingw
On mingw, even doing 'm4 --help | sed 1q' would result in
warnings about EINVAL, because mingw has odd pipe behavior
and doesn't fail with EPIPE when no one is reading the
other end. Gnulib works around most of this.
* m4/gnulib-cache.m4: Import sigpipe module.
Signed-off-by: Eric Blake <address@hidden>
commit 2f206e2b7a583a8d2df39156b481a641d9393439
Author: Gary V. Vaughan <address@hidden>
Date: Wed Sep 18 16:27:34 2013 +0700
gnulib: remove obsolete strtol module.
* ltdl/m4/gnulib-cache.m4: Regenerate.
Signed-off-by: Gary V. Vaughan <address@hidden>
commit f9cece52f95847352a2a7e3bf9e3f59a5ae90816
Author: Eric Blake <address@hidden>
Date: Sat Feb 26 17:07:33 2011 -0700
index: fix another regression from faulty strstr
* doc/m4.texinfo (Index macro): Test for the bug.
* THANKS: Update.
Reported by Mike Stump, with additional analysis from Ralf
Wildenhues and Jim Meyering.
Signed-off-by: Eric Blake <address@hidden>
commit 0585a54b4a126cdd35df9e4a9a234cce94a17ff6
Author: Gary V. Vaughan <address@hidden>
Date: Wed Sep 18 15:12:19 2013 +0700
gnulib: use manywarnings module.
* ltdl/m4/gnulib-cache.m4: Import manywarnings. Regenerate.
* configure.ac: Support --enable-gcc-warnings configure option.
* Makeflie.am (AM_CFLAGS): Honor --enable-gcc-warnings setting.
Signed-off-by: Gary V. Vaughan <address@hidden>
commit f9abad38cf4bf42d32c6c8b48250f1483374786e
Author: Gary V. Vaughan <address@hidden>
Date: Wed Sep 18 15:00:52 2013 +0700
gnulib: import fclose module.
* ltdl/m4/gnulib-cache.m4: Regenerate.
Signed-off-by: Gary V. Vaughan <address@hidden>
commit ab19c9ba16801de7dbb6b94cbd3af427d46461e1
Author: Eric Blake <address@hidden>
Date: Sat Feb 5 15:55:17 2011 -0700
maint: speed up normal configure.
* configure.ac (gl_ASSERT_NO_GNULIB_POSIXCHECK): Speed up normal
configure runs (and document how to rerun GNULIB_POSIXCHECK).
* HACKING: Document GNULIB_POSIXCHECK.
Signed-off-by: Eric Blake <address@hidden>
commit 6d0394c1c23957e387e4d860478ed06a3f5f5fed
Author: Eric Blake <address@hidden>
Date: Mon Feb 7 09:48:11 2011 -0700
maint: update http git cloning instructions
* HACKING: Git http doesn't like the redirect at git.sv.gnu.org.
* THANKS: Update.
Reported by Mike Dupont.
Signed-off-by: Eric Blake <address@hidden>
commit d3ac3947560b01e468796e4160b57b12970c4eb7
Author: Gary V. Vaughan <address@hidden>
Date: Wed Sep 18 13:38:55 2013 +0700
maint: prefer STREQ/STRNEQ to strcmp contortions.
* m4/m4private (STRNEQ): New macro.
* m4/path.c (m4_load_filename): Use it.
* src/freeze.c (produce_frozen_state): Likewise.
Signed-off-by: Gary V. Vaughan <address@hidden>
commit aef4d681e405d840aa2b6c5dcebdcd809dbf6c79
Author: Eric Blake <address@hidden>
Date: Tue Jan 25 19:33:53 2011 -0700
maint: reflect recent copyright assignments
* AUTHORS: Update.
Signed-off-by: Eric Blake <address@hidden>
commit e926b57609bc28600396e482d6f4598816d0dc87
Author: Gary V. Vaughan <address@hidden>
Date: Wed Sep 18 13:19:16 2013 +0700
maint: update copyright year.
* all files: Run 'make update-copyright' to add 2013 to list of
copyright years.
Signed-off-by: Gary V. Vaughan <address@hidden>
commit cbc2d84210a693a84e74f6524f754673182374c6
Author: Eric Blake <address@hidden>
Date: Mon Jan 3 15:58:49 2011 -0700
maint: document use of copyright ranges
* README: Copy coreutils wording for allowing copyright year
ranges.
* cfg.mk (UPDATE_COPYRIGHT_USE_INTERVALS): Now that GNU Coding
Standards permit it, prefer shorthand copyright.
* NEWS: 1.4.16 will be in 2011.
* doc/m4.texinfo (History): Likewise.
Signed-off-by: Eric Blake <address@hidden>
commit f59ca8a7e78ebfebb6be24e6b731e7da795ae7aa
Author: Eric Blake <address@hidden>
Date: Fri Dec 24 13:20:48 2010 -0700
build: pull in various gnulib fixes
* m4/gnulib-cache.m4: Reflect spawn-pipe module name change.
* modules/gnu.c (includes): Likewise.
Signed-off-by: Eric Blake <address@hidden>
commit fbcce6f63f9c2dc2f0a54f5217cfb4c4ed4d8a28
Author: Eric Blake <address@hidden>
Date: Fri Dec 24 13:17:32 2010 -0700
maint: reflect recent copyright assignment
* AUTHORS: Add Raphael Poss.
Signed-off-by: Eric Blake <address@hidden>
-----------------------------------------------------------------------
Summary of changes:
.x-sc_cast_of_argument_to_free | 1 -
.x-sc_prohibit_tab_based_indentation | 5 -
.x-sc_require_config_h | 2 -
.x-sc_require_config_h_first | 2 -
AUTHORS | 6 +-
COPYING | 2 +-
ChangeLog.old | 4 +-
HACKING | 10 ++-
Makefile.am | 15 +---
NEWS | 5 +-
README | 13 +++-
README-alpha | 2 +-
THANKS | 5 +-
TODO | 4 +-
bootstrap.conf | 4 +-
cfg.mk | 31 ++++++--
configure.ac | 78 ++++++++++++++++++-
doc/Makefile.am | 3 +-
doc/STYLE | 2 +-
doc/m4.texi | 139 ++++++++++++++++++++++++++++------
examples/COPYING | 2 +-
examples/WWW/COPYING | 2 +-
examples/WWW/m4lib/COPYING | 2 +-
examples/WWW/m4lib/test.m4 | 1 -
examples/modtest.m4 | 2 +-
examples/shadow.m4 | 2 +-
examples/stdlib.m4 | 2 +-
examples/time.m4 | 2 +-
examples/time2.m4 | 2 +-
gl/lib/clean-temp.c.diff | 14 ++++
ltdl/m4/debug.m4 | 2 +-
ltdl/m4/gmp.m4 | 2 +-
ltdl/m4/gnulib-cache.m4 | 8 +-
ltdl/m4/m4-error.m4 | 4 +-
ltdl/m4/m4-getopt.m4 | 2 +-
ltdl/m4/m4-gettext.m4 | 4 +-
ltdl/m4/m4-obstack.m4 | 4 +-
ltdl/m4/m4-regex.m4 | 4 +-
ltdl/m4/m4-rename.m4 | 2 +-
ltdl/m4/m4-syscmd.m4 | 2 +-
ltdl/m4/stackovf.m4 | 4 +-
m4/builtin.c | 8 +-
m4/debug.c | 4 +-
m4/hash.c | 3 +-
m4/hash.h | 3 +-
m4/input.c | 6 +-
m4/m4.c | 4 +-
m4/m4module.h | 5 +-
m4/m4private.h | 5 +-
m4/macro.c | 6 +-
m4/module.c | 5 +-
m4/output.c | 6 +-
m4/path.c | 8 +-
m4/resyntax.c | 2 +-
m4/symtab.c | 4 +-
m4/syntax.c | 4 +-
m4/system_.h | 3 +-
m4/utility.c | 4 +-
modules/README | 2 +-
modules/evalparse.c | 4 +-
modules/format.c | 4 +-
modules/gnu.c | 5 +-
modules/import.c | 2 +-
modules/load.c | 4 +-
modules/m4.c | 4 +-
modules/m4.h | 2 +-
modules/modtest.c | 4 +-
modules/mpeval.c | 2 +-
modules/perl.c | 2 +-
modules/perl.m4 | 2 +-
modules/shadow.c | 2 +-
modules/stdlib.c | 4 +-
modules/time.c | 4 +-
modules/traditional.c | 2 +-
src/freeze.c | 8 +-
src/m4.h | 4 +-
src/main.c | 5 +-
src/stackovf.c | 8 +-
tests/atlocal.in | 4 +-
tests/builtins.at | 3 +-
tests/freeze.at | 3 +-
tests/generate.awk | 4 +-
tests/iso8859.m4 | Bin 1445 -> 1450 bytes
tests/m4.in | 2 +-
tests/macros.at | 2 +-
tests/modules.at | 2 +-
tests/options.at | 3 +-
tests/others.at | 3 +-
tests/stackovf.test | 3 +-
tests/testsuite.at | 3 +-
90 files changed, 386 insertions(+), 202 deletions(-)
delete mode 100644 .x-sc_cast_of_argument_to_free
delete mode 100644 .x-sc_prohibit_tab_based_indentation
delete mode 100644 .x-sc_require_config_h
delete mode 100644 .x-sc_require_config_h_first
create mode 100644 gl/lib/clean-temp.c.diff
diff --git a/.x-sc_cast_of_argument_to_free b/.x-sc_cast_of_argument_to_free
deleted file mode 100644
index ad761ae..0000000
--- a/.x-sc_cast_of_argument_to_free
+++ /dev/null
@@ -1 +0,0 @@
-m4/m4private.h
diff --git a/.x-sc_prohibit_tab_based_indentation
b/.x-sc_prohibit_tab_based_indentation
deleted file mode 100644
index bd9127e..0000000
--- a/.x-sc_prohibit_tab_based_indentation
+++ /dev/null
@@ -1,5 +0,0 @@
-^GNUMakefile$
-Makefile\.am$
-\.mk$
-^HACKING$
-ChangeLog.*
diff --git a/.x-sc_require_config_h b/.x-sc_require_config_h
deleted file mode 100644
index 053cd3f..0000000
--- a/.x-sc_require_config_h
+++ /dev/null
@@ -1,2 +0,0 @@
-modules/evalparse.c
-modules/format.c
diff --git a/.x-sc_require_config_h_first b/.x-sc_require_config_h_first
deleted file mode 100644
index 053cd3f..0000000
--- a/.x-sc_require_config_h_first
+++ /dev/null
@@ -1,2 +0,0 @@
-modules/evalparse.c
-modules/format.c
diff --git a/AUTHORS b/AUTHORS
index c431e55..5ee0104 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -26,11 +26,13 @@ John Brzustowski address@hidden
2006-03-06
Ralf Wildenhues address@hidden 2006-03-20
Markus Duft address@hidden 2006-08-03
Joel E. Denny address@hidden 2009-08-18
-David Warme address@hidden 2010-02-10
+David Warme address@hidden 2010-03-10
+Raphael Poss address@hidden 2010-10-04
+Tim Rice address@hidden 2011-01-24
========================================================================
-Copyright (C) 2000, 2006, 2007, 2010 Free Software Foundation, Inc.
+Copyright (C) 2000, 2006-2007, 2010, 2013 Free Software Foundation, Inc.
Permission is granted to copy, distribute and/or modify this document
under the terms of the GNU Free Documentation License, Version 1.3 or
diff --git a/COPYING b/COPYING
index 94a9ed0..03239ae 100644
--- a/COPYING
+++ b/COPYING
@@ -1,7 +1,7 @@
GNU GENERAL PUBLIC LICENSE
Version 3, 29 June 2007
- Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
+ Copyright (C) 2007, 2013 Free Software Foundation, Inc. <http://fsf.org/>
Everyone is permitted to copy and distribute verbatim copies
of this license document, but changing it is not allowed.
diff --git a/ChangeLog.old b/ChangeLog.old
index d5f2ad7..9f0643c 100644
--- a/ChangeLog.old
+++ b/ChangeLog.old
@@ -12316,8 +12316,8 @@
coding: utf-8
End:
- Copyright (C) 1990, 1991, 1992, 1993, 1994, 2000, 2001, 2003,
- 2005, 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc.
+ Copyright (C) 1990-1994, 2000-2001, 2003, 2005-2010, 2013 Free
+ Software Foundation, Inc.
Copying and distribution of this file, with or without
modification, are permitted provided the copyright notice
diff --git a/HACKING b/HACKING
index e19cde5..695bf17 100644
--- a/HACKING
+++ b/HACKING
@@ -109,7 +109,7 @@ and is not part of a release distribution.
If you are behind a firewall that blocks the git protocol, you may
find it useful to do:
- git config --global url.http://git.sv.gnu.org/r/.insteadof \
+ git config --global url.http://git.savannah.gnu.org/r/.insteadof \
git://git.sv.gnu.org/
to force git to transparently rewrite all savannah git references to
instead use http.
@@ -132,6 +132,11 @@ and is not part of a release distribution.
version of build-aux files with their newer counterpart; the fix to
this is updating the submodule to a newer gnulib version.
+* If you would like to check that you are not missing out on any useful
+ gnulib modules, comment out the gl_ASSERT_NO_GNULIB_POSIXCHECK in
+ configure.ac, then run 'make CFLAGS='-DGNULIB_POSIXCHECK=1' with gcc,
+ and look at the resulting warnings.
+
4. Test Suite
=============
@@ -354,8 +359,7 @@ yyyy-mm-dd Name of Author <address@hidden> (tiny change)
that needs to be updated.
-----------
-Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free Software
-Foundation, Inc.
+Copyright (C) 2004-2010, 2013 Free Software Foundation, Inc.
The canonical source of this file is maintained with the
GNU M4 package. Report bugs to address@hidden
diff --git a/Makefile.am b/Makefile.am
index 924aeb0..5a0ed3c 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,7 +1,7 @@
## Makefile.am - template for generating Makefile via Automake
##
-## Copyright (C) 2000, 2001, 2003, 2004, 2005, 2006, 2007, 2008, 2009,
-## 2010 Free Software Foundation, Inc.
+## Copyright (C) 2000-2001, 2003-2010, 2013 Free Software Foundation,
+## Inc.
##
## This file is part of GNU M4.
##
@@ -40,6 +40,7 @@ changelog_old = $(srcdir)/ChangeLog.old
# Revisit this if libtool on cygwin improves.
# See http://lists.gnu.org/archive/html/libtool-patches/2007-02/msg00062.html
AM_CPPFLAGS =
+AM_CFLAGS = $(WARN_CFLAGS) $(WERROR_CFLAGS)
AM_LDFLAGS = -export-dynamic -export-symbols-regex ".*"
EXTRA_DIST =
BUILT_SOURCES =
@@ -57,18 +58,10 @@ include ltdl/Makefile.inc
# Additional configuration. Version management comes from suggestions
# given in build-aux/git-version-gen.
-syntax_check_exceptions = \
- .x-sc_cast_of_argument_to_free \
- .x-sc_prohibit_tab_based_indentation \
- .x-sc_require_config_h \
- .x-sc_require_config_h_first \
- .x-update-copyright
-
AM_CPPFLAGS += -Ignu -I$(srcdir)/gnu \
-Im4 -I$(srcdir)/m4
EXTRA_DIST += bootstrap cfg.mk maint.mk .version .prev-version \
- $(config_macro_dir)/gnulib-cache.m4 \
- $(syntax_check_exceptions) $(gitlog_to_changelog)
+ $(config_macro_dir)/gnulib-cache.m4 $(gitlog_to_changelog)
BUILT_SOURCES += .version
.version:
echo $(VERSION) > address@hidden && mv address@hidden $@
diff --git a/NEWS b/NEWS
index 09f7103..f1b74b3 100644
--- a/NEWS
+++ b/NEWS
@@ -1,6 +1,6 @@
GNU M4 NEWS - History of user-visible changes. -*- outline -*-
-* Noteworthy changes in Version 1.9b (200x-??-??) [beta]
+* Noteworthy changes in Version 1.9b (201x-??-??) [beta]
Released by ????, based on git version 1.9a-*
NOTE - there are still a number of FIXMEs to resolve before this can be
@@ -1208,8 +1208,7 @@ Local Variables:
fill-column: 75
End:
-Copyright (C) 1992, 1993, 1994, 1998, 2000, 2001, 2006, 2007, 2008,
-2009, 2010 Free Software Foundation, Inc.
+Copyright (C) 1992-1994, 2004-2011, 2013 Free Software Foundation, Inc.
Permission is granted to copy, distribute and/or modify this document
under the terms of the GNU Free Documentation License, Version 1.3 or
diff --git a/README b/README
index 3caf6c6..c07737c 100644
--- a/README
+++ b/README
@@ -25,7 +25,12 @@ files, ranging from trivial test files to rather advanced
macros. If
you intend to use m4 seriously, you might find useful material down
there.
-See file `COPYING' for copying conditions.
+See file `COPYING' for copying conditions. Note that M4 is distributed
+under the GNU Public License version 3 or later. Some files in the
+distribution are copied from the gnulib project, and hence bear the
+designation version 2 or later because they are unmodified from gnulib;
+however, if you modify these files using M4 rather than gnulib as the
+source, you must update the license to be GPLv3 or later.
See file `INSTALL' for compilation and installation instructions.
See file `ABOUT-NLS' for how to customize this program to your language.
See file `NEWS' for a list of major changes in the current release.
@@ -83,10 +88,12 @@ make check TESTSUITEFLAGS='-v -d -x 12'
The testsuite understands --help to tell you more about the current
set of tests.
+For any copyright year range specified as YYYY-ZZZZ in this package
+note that the range specifies every single year in that closed interval.
+
========================================================================
-Copyright (C) 2000, 2005, 2006, 2007, 2009, 2010 Free Software
-Foundation, Inc.
+Copyright (C) 2000, 2005-2011, 2013 Free Software Foundation, Inc.
Permission is granted to copy, distribute and/or modify this document
under the terms of the GNU Free Documentation License, Version 1.3 or
diff --git a/README-alpha b/README-alpha
index 9d1b394..216452c 100644
--- a/README-alpha
+++ b/README-alpha
@@ -13,7 +13,7 @@ GNU m4 has a web-site at http://www.gnu.org/software/m4/
========================================================================
-Copyright (C) 2000, 2006, 2010 Free Software Foundation, Inc.
+Copyright (C) 2000, 2006, 2010, 2013 Free Software Foundation, Inc.
Permission is granted to copy, distribute and/or modify this document
under the terms of the GNU Free Documentation License, Version 1.3 or
diff --git a/THANKS b/THANKS
index 62c1b74..70e0354 100644
--- a/THANKS
+++ b/THANKS
@@ -102,10 +102,12 @@ Mehul Sanghvi address@hidden
Michael Fetterman address@hidden
Michael L. Welcome address@hidden
Mike Andrews address@hidden
+Mike Dupont address@hidden
Mike Frysinger address@hidden
Mike Howard address@hidden
Mike Lijewski address@hidden
Mike R. address@hidden
+Mike Stump address@hidden
Mikhail Teterin address@hidden
Nelson H. F. Beebe address@hidden
Nick S. Kanakakorn address@hidden
@@ -165,8 +167,7 @@ Local Variables:
coding: utf-8
End:
-Copyright (C) 2000, 2006, 2007, 2008, 2009, 2010 Free Software
-Foundation, Inc.
+Copyright (C) 2000, 2006-2010, 2013 Free Software Foundation, Inc.
Permission is granted to copy, distribute and/or modify this document
under the terms of the GNU Free Documentation License, Version 1.3 or
diff --git a/TODO b/TODO
index 06d2247..b52a8ed 100644
--- a/TODO
+++ b/TODO
@@ -1,6 +1,6 @@
GNU m4 TODO - Tasks that need implementing. -*- outline -*-
-Copyright (C) 2000, 2001, 2006, 2007, 2008, 2010 Free Software
-Foundation, Inc.
+Copyright (C) 2000-2001, 2006-2008, 2010, 2013 Free Software Foundation,
+Inc.
Tell the maintainers at <address@hidden> if you feel like volunteering
for any of these ideas or if you have others to add.
diff --git a/bootstrap.conf b/bootstrap.conf
index 4dbf5ea..9b3034d 100644
--- a/bootstrap.conf
+++ b/bootstrap.conf
@@ -1,7 +1,7 @@
# bootstrap.conf (GNU M4) version 2010-09-10
# Written by Gary V. Vaughan, 2010
-# Copyright (C) 2010 Free Software Foundation, Inc.
+# Copyright (C) 2010, 2013 Free Software Foundation, Inc.
# This file is part of GNU M4.
#
@@ -64,7 +64,7 @@ xstrtol
'
# What ignore files to maintain.
-vc_ignore=".cvsignore .gitignore"
+vc_ignore=".gitignore"
## --------------- ##
diff --git a/cfg.mk b/cfg.mk
index d03f1bc..8bb9078 100644
--- a/cfg.mk
+++ b/cfg.mk
@@ -1,5 +1,5 @@
# Customize maint.mk. -*- makefile -*-
-# Copyright (C) 2003-2010 Free Software Foundation, Inc.
+# Copyright (C) 2003-2011, 2013 Free Software Foundation, Inc.
# This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
@@ -17,28 +17,43 @@
# Used in maint.mk's web-manual rule
manual_title = GNU macro processor
+# Always use shorthand copyrights.
+update-copyright-env = \
+ UPDATE_COPYRIGHT_USE_INTERVALS=1 \
+ UPDATE_COPYRIGHT_MAX_LINE_LENGTH=72
+
# Tests not to run as part of "make syntax-check".
# M4 intentionally uses a coding style that compiles under C++.
# sc_proper_name_utf8_requires_ICONV doesn't work with non-recursive Makefile
# 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
-
-# Always use longhand copyrights.
-update-copyright-env = \
- UPDATE_COPYRIGHT_USE_INTERVALS=0 \
- UPDATE_COPYRIGHT_MAX_LINE_LENGTH=72
+old_NEWS_hash = bbccada98ce08092a9f24b508c399051
# Indent only with spaces.
sc_prohibit_tab_based_indentation:
@re='^ * ' \
msg='TAB in indentation; use only spaces' \
$(_prohibit_regexp)
+
+# 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 = \
+ ^(doc/m4\.texi|ltdl/m4/gnulib-cache.m4)$$
diff --git a/configure.ac b/configure.ac
index 2489824..904f624 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,6 +1,6 @@
# Configure template for GNU m4. -*-Autoconf-*-
-# Copyright (C) 1991, 1992, 1993, 1994, 2000, 2001, 2002, 2004, 2005,
-# 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc.
+# Copyright (C) 1991-1994, 2000-2002, 2004-2013 Free Software
+# Foundation, Inc.
#
# This file is part of GNU M4.
#
@@ -67,6 +67,11 @@ AC_PROG_CC
AC_DEFUN([gl_CXX_CHOICE_DEFAULT_NO])
M4_EARLY
+# Maintainer note - comment this line out if you plan to rerun
+# GNULIB_POSIXCHECK testing to see if M4 should be using more modules.
+# Leave it uncommented for normal releases, for faster ./configure.
+gl_ASSERT_NO_GNULIB_POSIXCHECK
+
AC_SYS_LARGEFILE
AC_PROG_CPP
AM_PROG_CC_C_O
@@ -94,6 +99,75 @@ if test "x$with_included_ltdl" != "xyes"; then
CFLAGS="$save_CFLAGS"
fi
+AC_ARG_ENABLE([gcc-warnings],
+ [AS_HELP_STRING([--enable-gcc-warnings],
+ [turn on lots of GCC warnings (for developers)])],
+ [case $enableval in
+ yes|no) ;;
+ *) AC_MSG_ERROR([bad value $enableval for gcc-warnings option]) ;;
+ esac
+ gl_gcc_warnings=$enableval],
+ [gl_gcc_warnings=no]
+)
+
+if test "$gl_gcc_warnings" = yes; then
+ gl_WARN_ADD([-Werror], [WERROR_CFLAGS])
+ AC_SUBST([WERROR_CFLAGS])
+
+ # This, $nw, is the list of warnings we disable.
+ nw=
+ nw="$nw -Waggregate-return" # K&R is anachronistic
+ nw="$nw -Wtraditional-conversion" # K&R is anachronistic
+ nw="$nw -Wundef" # K&R is anachronistic
+ nw="$nw -Wlong-long" # C90 is anachronistic
+ nw="$nw -Wsystem-headers" # Don't let system headers trigger warnings
+ nw="$nw -Wpadded" # Our structs are not packed
+ nw="$nw -Wformat-nonliteral" # Needed in builtin.c
+ nw="$nw -Wconversion" # Too many warnings for now
+ nw="$nw -Wsign-conversion" # Too many warnings for now
+ nw="$nw -Wcast-qual" # Too many warnings for now
+ nw="$nw -Wswitch-enum" # Too many warnings for now
+ # gcc 4.4.6 complains enum-compare is C++ only; gcc 4.7.0 implies it in -Wall
+ nw="$nw -Wenum-compare"
+
+ # Gnulib uses '#pragma GCC diagnostic push' to silence some
+ # warnings, but older gcc doesn't support this.
+ AC_CACHE_CHECK([whether pragma GCC diagnostic push works],
+ [M4_cv_gcc_pragma_push_works], [
+ save_CFLAGS=$CFLAGS
+ CFLAGS='-Wunknown-pragmas -Werror'
+ AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
+ #pragma GCC diagnostic push
+ #pragma GCC diagnostic pop
+ ]])],
+ [M4_cv_gcc_pragma_push_works=yes],
+ [M4_cv_gcc_pragma_push_works=no])
+ CFLAGS=$save_CFLAGS])
+ if test $M4_cv_gcc_pragma_push_works = no; then
+ nw="$nw -Wmissing-prototypes"
+ nw="$nw -Wmissing-declarations"
+ nw="$nw -Wunreachable-code"
+ fi
+
+ gl_MANYWARN_ALL_GCC([ws])
+ gl_MANYWARN_COMPLEMENT([ws], [$ws], [$nw])
+ for w in $ws; do
+ gl_WARN_ADD([$w])
+ done
+
+ gl_WARN_ADD([-fdiagnostics-show-option])
+ gl_WARN_ADD([-funit-at-a-time])
+
+ AC_SUBST([WARN_CFLAGS])
+
+ AH_VERBATIM([FORTIFY_SOURCE],
+ [/* Enable compile-time and run-time bounds-checking, and some warnings,
+ without upsetting newer glibc. */
+ #if defined __OPTIMIZE__ && __OPTIMIZE__
+ # define _FORTIFY_SOURCE 2
+ #endif
+ ])
+fi
# Use gcc's -pipe option if available: for faster compilation.
case "$CFLAGS" in
diff --git a/doc/Makefile.am b/doc/Makefile.am
index d1b8ab9..88787ea 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -1,6 +1,6 @@
## Makefile.am - template for generating Makefile via Automake
##
-## Copyright (C) 2009, 2010 Free Software Foundation, Inc.
+## Copyright (C) 2009-2010, 2013 Free Software Foundation, Inc.
##
## This file is part of GNU M4.
##
@@ -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/STYLE b/doc/STYLE
index 14ef976..c05af68 100644
--- a/doc/STYLE
+++ b/doc/STYLE
@@ -89,7 +89,7 @@ following restrictions on coding style apply:
========================================================================
-Copyright (C) 2003, 2006, 2010 Free Software Foundation, Inc.
+Copyright (C) 2003, 2006, 2010, 2013 Free Software Foundation, Inc.
Permission is granted to copy, distribute and/or modify this document
under the terms of the GNU Free Documentation License, Version 1.3 or
diff --git a/doc/m4.texi b/doc/m4.texi
index dbda71b..7def990 100644
--- a/doc/m4.texi
+++ b/doc/m4.texi
@@ -45,9 +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, 1998, 1999,
-2000, 2001, 2004, 2005, 2006, 2007, 2008, 2009, 2010 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
@@ -351,7 +349,7 @@ popularity of GNU Autoconf, which requires GNU
@code{m4} for @emph{generating} @file{configure} scripts, is an incentive
for many to install it, while these people will not themselves
program in @code{m4}. GNU @code{m4} is mostly compatible with the
-System V, Release 3 version, except for some minor differences.
+System V, Release 4 version, except for some minor differences.
@xref{Compatibility}, for more details.
Some people find @code{m4} to be fairly addictive. They first use
@@ -367,19 +365,42 @@ debugging their @code{m4} scripts than doing real work.
Beware that
@cindex history of @code{m4}
@cindex GNU M4, history of
address@hidden was an important ancestor of @code{m4}. See
-C. Strachey: ``A General Purpose Macro generator'', Computer Journal
-8,3 (1965), pp.@: 225 ff. @code{GPM} is also succinctly described into
-David Gries classic ``Compiler Construction for Digital Computers''.
-
-The classic B. Kernighan and P.J. Plauger: ``Software Tools'',
-Addison-Wesley, Inc.@: (1976) describes and implements a Unix
+Macro languages were invented early in the history of computing. In the
+1950s Alan Perlis suggested that the macro language be independent of the
+language being processed. Techniques such as conditional and recursive
+macros, and using macros to define other macros, were described by Doug
+McIlroy of Bell Labs in ``Macro Instruction Extensions of Compiler
+Languages'', @emph{Communications of the ACM} 3, 4 (1960), 214--20,
address@hidden://dx.doi.org/10.1145/367177.367223}.
+
+An important precursor of @code{m4} was GPM; see C. Strachey,
address@hidden The title uses lower case and has no space between "macro" and
"generator".
+``A general purpose macrogenerator'', @emph{Computer Journal} 8, 3
+(1965), 225--41, @url{http://dx.doi.org/10.1093/comjnl/8.3.225}. GPM is
+also succinctly described in David Gries's book @emph{Compiler
+Construction for Digital Computers}, Wiley (1971). Strachey was a
+brilliant programmer: GPM fit into 250 machine instructions!
+
+Inspired by GPM while visiting Strachey's Lab in 1968, McIlroy wrote a
+model preprocessor in that fit into a page of Snobol 3 code, and McIlroy
+and Robert Morris developed a series of further models at Bell Labs.
+Andrew D. Hall followed up with M6, a general purpose macro processor
+used to port the Fortran source code of the Altran computer algebra
+system; see Hall's ``The M6 Macro Processor'', Computing Science
+Technical Report #2, Bell Labs (1972),
address@hidden://cm.bell-labs.com/cm/cs/cstr/2.pdf}. M6's source code
+consisted of about 600 Fortran statements. Its name was the first of
+the @code{m4} line.
+
+The Brian Kernighan and P.J. Plauger book @emph{Software Tools},
+Addison-Wesley (1976), describes and implements a Unix
macro-processor language, which inspired Dennis Ritchie to write
@code{m3}, a macro processor for the AP-3 minicomputer.
Kernighan and Ritchie then joined forces to develop the original
address@hidden, as described in ``The M4 Macro Processor'', Bell
-Laboratories (1977). It had only 21 builtin macros.
address@hidden, described in ``The M4 Macro Processor'', Bell Laboratories
+(1977), @url{http://wolfram.schneider.org/bsd/7thEdManVol2/m4/m4.pdf}.
+It had only 21 builtin macros.
While @code{GPM} was more @emph{pure}, @code{m4} is meant to deal with
the true intricacies of real life: macros can be recognized without
@@ -417,10 +438,10 @@ released 1.4.3 and 1.4.4. And in 2006, Eric Blake joined
the team and
prepared patches for the release of 1.4.5, 1.4.6, 1.4.7, and 1.4.8.
More bug fixes were incorporated in 2007, with releases 1.4.9 and
1.4.10. Eric continued with some portability fixes for 1.4.11 and
-1.4.12 in 2008, 1.4.13 in 2009, 1.4.14, 1.4.15 and 1.4.16 in 2010.
-Following a long hiatus, Gary released 1.4.17 after upgrading to the
-latest autotools (and gnulib) along with all the small fixes they had
-accumulated.
+1.4.12 in 2008, 1.4.13 in 2009, 1.4.14 and 1.4.15 in 2010, and 1.4.16
+in 2011. Following a long hiatus, Gary released 1.4.17 after upgrading
+to the latest autotools (and gnulib) along with all the small fixes they
+had accumulated.
Additionally, in 2008, Eric rewrote the scanning engine to reduce
recursive evaluation from quadratic to linear complexity. This was
@@ -1108,6 +1129,70 @@ If you need to read a file whose name starts with a
@file{-}, you can
specify it as @samp{./-file}, or use @option{--} to mark the end of
options.
address@hidden
address@hidden Test that 'm4 file/' detects that file is not a directory; we
address@hidden can assume that the current directory contains a Makefile.
address@hidden mingw fails with EINVAL rather than ENOTDIR.
+
address@hidden status: 1
address@hidden xerr: ignore
address@hidden options: Makefile/
address@hidden
address@hidden: cannot open file 'Makefile/': No such file or directory
address@hidden example
+
address@hidden Test that closed stderr does not cause a crash. Not all
address@hidden systems have the same message for EBADF.
+
address@hidden xerr: ignore
address@hidden
+ifdef(`__unix__', ,
+ `errprint(` skipping: syscmd does not have unix semantics
+')m4exit(`77')')dnl
+syscmd(`echo | cat >&- 2>/dev/null')ifelse(sysval, `0',
+ `errprint(` skipping: system does not allow closing stdout
+')m4exit(`77')')dnl
+changequote(`[', `]')dnl
+syscmd([echo | ']__program__[' >&-])dnl
address@hidden: write error: Bad file descriptor
+sysval
address@hidden
address@hidden example
+
address@hidden
+ifdef(`__unix__', ,
+ `errprint(` skipping: syscmd does not have unix semantics
+')m4exit(`77')')dnl
+syscmd(`echo | cat >&- 2>/dev/null')ifelse(sysval, `0',
+ `errprint(` skipping: system does not allow closing stdout
+')m4exit(`77')')dnl
+changequote(`[', `]')dnl
+syscmd([echo 'esyscmd(echo hi >&2 && echo err"print(bye
+)d"nl)dnl' > tmp.m4 \
+ && ']__program__[' tmp.m4 <&- >&- \
+ && rm tmp.m4])sysval
address@hidden
address@hidden
address@hidden
address@hidden example
+
address@hidden Test that we obey POSIX semantics with -D interspersed with
address@hidden files, even with POSIXLY_CORRECT (BSD getopt gets it wrong).
+
+$ @kbd{m4 }
address@hidden
+ifdef(`__unix__', ,
+ `errprint(` skipping: syscmd does not have unix semantics
+')m4exit(`77')')dnl
+changequote(`[', `]')dnl
+syscmd([POSIXLY_CORRECT=1 ']__program__[' -Dbar=hello foo -Dbar=world foo])dnl
address@hidden
address@hidden
+sysval
address@hidden
address@hidden example
address@hidden ignore
+
@node Syntax
@chapter Lexical and syntactic conventions
@@ -1540,9 +1625,9 @@ m4_eval(`1')
@end example
Another alternative is to redefine problematic macros to a name less
-likely to cause conflicts, @xref{Definitions}. Or the parsing engine
-can be changed to redefine what constitutes a valid macro name,
address@hidden
+likely to cause conflicts, using @ref{Definitions}. Or the parsing
+engine can be changed to redefine what constitutes a valid macro name,
+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
@@ -6060,8 +6145,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.
@@ -6897,6 +6982,14 @@
index(`;:11-:12-:12-:12-:12-:12-:12-:12-:12.:12.:12.:12.:12.:12.:12.:12.:12-:',
`:12-:12-:12-:12-:12-:12-:12-:12-')
@result{}-1
@end example
+
address@hidden Expose a bug in the gnulib replacement strstr() algorithm
address@hidden present from Jun 2010 to Feb 2011, including m4 1.4.15.
+
address@hidden
+index(`..wi.d.', `.d.')
address@hidden
address@hidden example
@end ignore
@node Regexp
@@ -9106,7 +9199,7 @@ named by @var{str3}.
@cindex compatibility
This chapter describes the many of the differences between this
implementation of @code{m4}, and of other implementations found under
-UNIX, such as System V Release 3, Solaris, and BSD flavors.
+UNIX, such as System V Release 4, Solaris, and BSD flavors.
In particular, it lists the known differences and extensions to
POSIX. However, the list is not necessarily comprehensive.
diff --git a/examples/COPYING b/examples/COPYING
index 452416d..0b2d09e 100644
--- a/examples/COPYING
+++ b/examples/COPYING
@@ -2,7 +2,7 @@ The files in this directory provide example uses of GNU M4.
The following copyright notice applies to each of these
description files.
-Copyright (C) 2006, 2010 Free Software Foundation, Inc.
+Copyright (C) 2006, 2010, 2013 Free Software Foundation, Inc.
This file is free software; the Free Software Foundation
gives unlimited permission to copy and/or distribute it,
with or without modifications, as long as this notice is preserved.
diff --git a/examples/WWW/COPYING b/examples/WWW/COPYING
index 452416d..0b2d09e 100644
--- a/examples/WWW/COPYING
+++ b/examples/WWW/COPYING
@@ -2,7 +2,7 @@ The files in this directory provide example uses of GNU M4.
The following copyright notice applies to each of these
description files.
-Copyright (C) 2006, 2010 Free Software Foundation, Inc.
+Copyright (C) 2006, 2010, 2013 Free Software Foundation, Inc.
This file is free software; the Free Software Foundation
gives unlimited permission to copy and/or distribute it,
with or without modifications, as long as this notice is preserved.
diff --git a/examples/WWW/m4lib/COPYING b/examples/WWW/m4lib/COPYING
index 452416d..0b2d09e 100644
--- a/examples/WWW/m4lib/COPYING
+++ b/examples/WWW/m4lib/COPYING
@@ -2,7 +2,7 @@ The files in this directory provide example uses of GNU M4.
The following copyright notice applies to each of these
description files.
-Copyright (C) 2006, 2010 Free Software Foundation, Inc.
+Copyright (C) 2006, 2010, 2013 Free Software Foundation, Inc.
This file is free software; the Free Software Foundation
gives unlimited permission to copy and/or distribute it,
with or without modifications, as long as this notice is preserved.
diff --git a/examples/WWW/m4lib/test.m4 b/examples/WWW/m4lib/test.m4
index 90d63a6..110cf12 100644
--- a/examples/WWW/m4lib/test.m4
+++ b/examples/WWW/m4lib/test.m4
@@ -27,4 +27,3 @@ include(`setup.m4')
\undivert(1)
\defn([_ideas])
-
diff --git a/examples/modtest.m4 b/examples/modtest.m4
index f3aa2b8..c61ed6f 100644
--- a/examples/modtest.m4
+++ b/examples/modtest.m4
@@ -1,4 +1,4 @@
-dnl Copyright (C) 2006, 2010 Free Software Foundation, Inc.
+dnl Copyright (C) 2006, 2010, 2013 Free Software Foundation, Inc.
dnl This file is free software; the Free Software Foundation
dnl gives unlimited permission to copy and/or distribute it
dnl with or without modifications, as long as this notice is preserved.
diff --git a/examples/shadow.m4 b/examples/shadow.m4
index 0790e6d..f13b7df 100644
--- a/examples/shadow.m4
+++ b/examples/shadow.m4
@@ -1,4 +1,4 @@
-dnl Copyright (C) 2006, 2010 Free Software Foundation, Inc.
+dnl Copyright (C) 2006, 2010, 2013 Free Software Foundation, Inc.
dnl This file is free software; the Free Software Foundation
dnl gives unlimited permission to copy and/or distribute it
dnl with or without modifications, as long as this notice is preserved.
diff --git a/examples/stdlib.m4 b/examples/stdlib.m4
index dd482bd..df0a91d 100644
--- a/examples/stdlib.m4
+++ b/examples/stdlib.m4
@@ -1,4 +1,4 @@
-dnl Copyright (C) 2006, 2010 Free Software Foundation, Inc.
+dnl Copyright (C) 2006, 2010, 2013 Free Software Foundation, Inc.
dnl This file is free software; the Free Software Foundation
dnl gives unlimited permission to copy and/or distribute it
dnl with or without modifications, as long as this notice is preserved.
diff --git a/examples/time.m4 b/examples/time.m4
index b42aa30..7734130 100644
--- a/examples/time.m4
+++ b/examples/time.m4
@@ -1,4 +1,4 @@
-dnl Copyright (C) 2006, 2010 Free Software Foundation, Inc.
+dnl Copyright (C) 2006, 2010, 2013 Free Software Foundation, Inc.
dnl This file is free software; the Free Software Foundation
dnl gives unlimited permission to copy and/or distribute it
dnl with or without modifications, as long as this notice is preserved.
diff --git a/examples/time2.m4 b/examples/time2.m4
index 7235889..b0d17b3 100644
--- a/examples/time2.m4
+++ b/examples/time2.m4
@@ -1,4 +1,4 @@
-dnl Copyright (C) 2006, 2010 Free Software Foundation, Inc.
+dnl Copyright (C) 2006, 2010, 2013 Free Software Foundation, Inc.
dnl This file is free software; the Free Software Foundation
dnl gives unlimited permission to copy and/or distribute it
dnl with or without modifications, as long as this notice is preserved.
diff --git a/gl/lib/clean-temp.c.diff b/gl/lib/clean-temp.c.diff
new file mode 100644
index 0000000..2eafde6
--- /dev/null
+++ b/gl/lib/clean-temp.c.diff
@@ -0,0 +1,14 @@
+diff --git i/lib/clean-temp.c w/lib/clean-temp.c
+index 40ec02f..1053312 100644
+--- i/lib/clean-temp.c
++++ w/lib/clean-temp.c
+@@ -582,6 +582,9 @@ static bool
+ supports_delete_on_close ()
+ {
+ static int known; /* 1 = yes, -1 = no, 0 = unknown */
++ /* M4 wants to close and later reopen a temporary file, so
++ delete-on-close must not be used. */
++ known = -1;
+ if (!known)
+ {
+ OSVERSIONINFO v;
diff --git a/ltdl/m4/debug.m4 b/ltdl/m4/debug.m4
index 0f388dc..2bb5739 100644
--- a/ltdl/m4/debug.m4
+++ b/ltdl/m4/debug.m4
@@ -1,7 +1,7 @@
## -*- Autoconf -*-
## debug.m4 -- massage compiler flags for debugging/optimisation
##
-## Copyright (C) 2000, 2001, 2003, 2005, 2006, 2007, 2010 Free Software
+## Copyright (C) 2000-2001, 2003, 2005-2007, 2010, 2013 Free Software
## Foundation, Inc.
## Copyright (C) 1999-2000 Ralf S. Engelschall
## Written by <address@hidden>
diff --git a/ltdl/m4/gmp.m4 b/ltdl/m4/gmp.m4
index 4f70304..36e6051 100644
--- a/ltdl/m4/gmp.m4
+++ b/ltdl/m4/gmp.m4
@@ -1,5 +1,5 @@
## -*- Autoconf -*-
-## Copyright (C) 2000, 2001, 2003, 2006, 2007, 2008, 2010 Free Software
+## Copyright (C) 2000-2001, 2003, 2006-2008, 2010, 2013 Free Software
## Foundation, Inc.
##
## This file is part of GNU M4.
diff --git a/ltdl/m4/gnulib-cache.m4 b/ltdl/m4/gnulib-cache.m4
index d0acf3f..ef070c4 100644
--- a/ltdl/m4/gnulib-cache.m4
+++ b/ltdl/m4/gnulib-cache.m4
@@ -27,7 +27,7 @@
# Specification in the form of a command-line invocation:
-# gnulib-tool --import --dir=. --local-dir=gl --lib=libgnu --source-base=gnu
--m4-base=ltdl/m4 --doc-base=doc --tests-base=tests/gnu --aux-dir=build-aux
--with-tests --with-c++-tests --no-conditional-dependencies --libtool
--macro-prefix=M4 assert autobuild avltree-oset binary-io bitrotate clean-temp
cloexec close-stream closein config-h configmake dirname error execute fdl-1.3
fflush filenamecat flexmember fopen fopen-safer freadptr freadseek fseeko
gendocs gettext git-version-gen gitlog-to-changelog gnumakefile gnupload
gpl-3.0 intprops inttypes maintainer-makefile memchr2 memcmp2 memmem mkstemp
obstack obstack-printf-posix pipe progname propername quote regex
regexprops-generic rename setenv snprintf-posix sprintf-posix stdbool
stdlib-safer strnlen strtod strtol tempname unlocked-io unsetenv
update-copyright vasnprintf-posix verify verror wait-process xalloc xalloc-die
xmemdup0 xoset xprintf-posix xstrndup xvasprintf-posix
+# gnulib-tool --import --dir=. --local-dir=gl --lib=libgnu --source-base=gnu
--m4-base=ltdl/m4 --doc-base=doc --tests-base=tests/gnu --aux-dir=build-aux
--with-tests --with-c++-tests --no-conditional-dependencies --libtool
--macro-prefix=M4 assert autobuild avltree-oset binary-io bitrotate clean-temp
cloexec close-stream closein config-h configmake dirname error execute fclose
fdl-1.3 fflush filenamecat flexmember fopen fopen-safer freadptr freadseek
fseeko gendocs gettext git-version-gen gitlog-to-changelog gnumakefile gnupload
gpl-3.0 intprops inttypes maintainer-makefile manywarnings memchr2 memcmp2
memmem mkstemp obstack obstack-printf-posix progname propername quote regex
regexprops-generic rename setenv sigpipe snprintf-posix spawn-pipe
sprintf-posix stdbool stdlib-safer strnlen strtod tempname unlocked-io unsetenv
update-copyright vasnprintf-posix verify verror wait-process xalloc xalloc-die
xmemdup0 xoset xprintf-posix xstrndup xvasprintf-posix
# Specification in the form of a few gnulib-tool.m4 macro invocations:
gl_LOCAL_DIR([gl])
@@ -46,6 +46,7 @@ gl_MODULES([
dirname
error
execute
+ fclose
fdl-1.3
fflush
filenamecat
@@ -65,13 +66,13 @@ gl_MODULES([
intprops
inttypes
maintainer-makefile
+ manywarnings
memchr2
memcmp2
memmem
mkstemp
obstack
obstack-printf-posix
- pipe
progname
propername
quote
@@ -79,13 +80,14 @@ gl_MODULES([
regexprops-generic
rename
setenv
+ sigpipe
snprintf-posix
+ spawn-pipe
sprintf-posix
stdbool
stdlib-safer
strnlen
strtod
- strtol
tempname
unlocked-io
unsetenv
diff --git a/ltdl/m4/m4-error.m4 b/ltdl/m4/m4-error.m4
index 24138f9..27695cb 100644
--- a/ltdl/m4/m4-error.m4
+++ b/ltdl/m4/m4-error.m4
@@ -2,8 +2,8 @@
# m4-error.m4 -- Use the installed version of error.h if available.
# Written by Gary V. Vaughan <address@hidden>
#
-# Copyright (C) 2003, 2004, 2006, 2007, 2010 Free Software Foundation,
-# Inc.
+# Copyright (C) 2003-2004, 2006-2007, 2010, 2013 Free Software
+# Foundation, Inc.
#
# This file is part of GNU M4.
#
diff --git a/ltdl/m4/m4-getopt.m4 b/ltdl/m4/m4-getopt.m4
index 12fe306..a2d3a4e 100644
--- a/ltdl/m4/m4-getopt.m4
+++ b/ltdl/m4/m4-getopt.m4
@@ -2,7 +2,7 @@
# m4-getopt.m4 -- Use the installed version of getopt.h if available.
# Written by Gary V. Vaughan <address@hidden>
#
-# Copyright (C) 2005, 2006, 2007, 2009, 2010 Free Software Foundation,
+# Copyright (C) 2005-2007, 2009-2010, 2013 Free Software Foundation,
# Inc.
#
# This file is part of GNU M4.
diff --git a/ltdl/m4/m4-gettext.m4 b/ltdl/m4/m4-gettext.m4
index 694c29e..3c40d73 100644
--- a/ltdl/m4/m4-gettext.m4
+++ b/ltdl/m4/m4-gettext.m4
@@ -2,8 +2,8 @@
# m4-gettext.m4 -- Use the installed version of GNU gettext if available.
# Written by Gary V. Vaughan <address@hidden>
#
-# Copyright (C) 2003, 2004, 2006, 2007, 2010 Free Software Foundation,
-# Inc.
+# Copyright (C) 2003-2004, 2006-2007, 2010, 2013 Free Software
+# Foundation, Inc.
#
# This file is part of GNU M4.
#
diff --git a/ltdl/m4/m4-obstack.m4 b/ltdl/m4/m4-obstack.m4
index 23464cc..fab387b 100644
--- a/ltdl/m4/m4-obstack.m4
+++ b/ltdl/m4/m4-obstack.m4
@@ -1,8 +1,8 @@
# -*- Autoconf -*-
# m4-obstack.m4 -- the libc supplied version of obstacks if available.
#
-# Copyright (C) 2000, 2001, 2003, 2004, 2006, 2007, 2010 Free Software
-# Foundation, Inc.
+# Copyright (C) 2000-2001, 2003-2004, 2006-2007, 2010, 2013 Free
+# Software Foundation, Inc.
# Written by Gary V. Vaughan <address@hidden>
#
# This file is part of GNU M4.
diff --git a/ltdl/m4/m4-regex.m4 b/ltdl/m4/m4-regex.m4
index 9b9854b..e7fa38a 100644
--- a/ltdl/m4/m4-regex.m4
+++ b/ltdl/m4/m4-regex.m4
@@ -2,8 +2,8 @@
# m4-regex.m4 -- Use the installed regex if it is good enough.
# Written by Gary V. Vaughan <address@hidden>
#
-# Copyright (C) 2003, 2004, 2006, 2007, 2010 Free Software Foundation,
-# Inc.
+# Copyright (C) 2003-2004, 2006-2007, 2010, 2013 Free Software
+# Foundation, Inc.
#
# This file is part of GNU M4.
#
diff --git a/ltdl/m4/m4-rename.m4 b/ltdl/m4/m4-rename.m4
index 1f5d2a6..4062cde 100644
--- a/ltdl/m4/m4-rename.m4
+++ b/ltdl/m4/m4-rename.m4
@@ -2,7 +2,7 @@
# m4-rename.m4 -- Test the abilities of rename.
# Written by Eric Blake <address@hidden>
#
-# Copyright (C) 2008, 2010 Free Software Foundation, Inc.
+# Copyright (C) 2008, 2010, 2013 Free Software Foundation, Inc.
#
# This file is part of GNU M4.
#
diff --git a/ltdl/m4/m4-syscmd.m4 b/ltdl/m4/m4-syscmd.m4
index d676155..514201f 100644
--- a/ltdl/m4/m4-syscmd.m4
+++ b/ltdl/m4/m4-syscmd.m4
@@ -2,7 +2,7 @@
# m4-syscmd.m4 -- Allow choice of syscmd shell.
# Written by Eric Blake <address@hidden>
#
-# Copyright (C) 2009, 2010 Free Software Foundation, Inc.
+# Copyright (C) 2009-2010, 2013 Free Software Foundation, Inc.
#
# This file is part of GNU M4.
#
diff --git a/ltdl/m4/stackovf.m4 b/ltdl/m4/stackovf.m4
index 3bf57ad..d181223 100644
--- a/ltdl/m4/stackovf.m4
+++ b/ltdl/m4/stackovf.m4
@@ -1,8 +1,8 @@
# -*- Autoconf -*-
# stackovf.m4 -- how do we deal with stack overflow?
#
-# Copyright (C) 2000, 2003, 2006, 2007, 2010 Free Software Foundation,
-# Inc.
+# Copyright (C) 2000, 2003, 2006-2007, 2010, 2013 Free Software
+# Foundation, Inc.
#
# This file is part of GNU M4.
#
diff --git a/m4/builtin.c b/m4/builtin.c
index cac3062..51f636e 100644
--- a/m4/builtin.c
+++ b/m4/builtin.c
@@ -1,6 +1,6 @@
/* GNU m4 -- A simple macro processor
- Copyright (C) 1989, 1990, 1991, 1992, 1993, 1994, 1999, 2000, 2005,
- 2006, 2007, 2008, 2010 Free Software Foundation, Inc.
+ Copyright (C) 1989-1994, 1999-2000, 2005-2008, 2010, 2013 Free
+ Software Foundation, Inc.
This file is part of GNU M4.
@@ -38,7 +38,7 @@ compare_builtin_name_CB (const void *name, const void *b)
search only in MODULE's builtin table. The result is a malloc'd
symbol value, suitable for use in the symbol table or for an
argument to m4_push_builtin. */
-m4_symbol_value *
+m4_symbol_value * M4_GNUC_PURE
m4_builtin_find_by_name (m4_module *module, const char *name)
{
m4_module *cur = module ? module : m4__module_next (NULL);
@@ -64,7 +64,7 @@ m4_builtin_find_by_name (m4_module *module, const char *name)
then search only in MODULE's builtin table. The result is a
malloc'd symbol value, suitable for use in the symbol table or for
an argument to m4_push_builtin. */
-m4_symbol_value *
+m4_symbol_value * M4_GNUC_PURE
m4_builtin_find_by_func (m4_module *module, m4_builtin_func *func)
{
m4_module *cur = module ? module : m4__module_next (NULL);
diff --git a/m4/debug.c b/m4/debug.c
index db95032..8cff4fe 100644
--- a/m4/debug.c
+++ b/m4/debug.c
@@ -1,6 +1,6 @@
/* GNU m4 -- A simple macro processor
- Copyright (C) 1991, 1992, 1993, 1994, 2006, 2007, 2008, 2009, 2010
- Free Software Foundation, Inc.
+ Copyright (C) 1991-1994, 2006-2010, 2013 Free Software Foundation,
+ Inc.
This file is part of GNU M4.
diff --git a/m4/hash.c b/m4/hash.c
index 9f00e7c..a113e08 100644
--- a/m4/hash.c
+++ b/m4/hash.c
@@ -1,6 +1,5 @@
/* GNU m4 -- A simple macro processor
- Copyright (C) 2001, 2006, 2007, 2008, 2009, 2010 Free Software
- Foundation, Inc.
+ Copyright (C) 2001, 2006-2010, 2013 Free Software Foundation, Inc.
Written by Gary V. Vaughan <address@hidden>
This file is part of GNU M4.
diff --git a/m4/hash.h b/m4/hash.h
index 4dc9540..8852c82 100644
--- a/m4/hash.h
+++ b/m4/hash.h
@@ -1,5 +1,6 @@
/* GNU m4 -- A simple macro processor
- Copyright (C) 2001, 2006, 2007, 2010 Free Software Foundation, Inc.
+ Copyright (C) 2001, 2006-2007, 2010, 2013 Free Software Foundation,
+ Inc.
Written by Gary V. Vaughan <address@hidden>
This file is part of GNU M4.
diff --git a/m4/input.c b/m4/input.c
index f9e75e9..07ca373 100644
--- a/m4/input.c
+++ b/m4/input.c
@@ -1,6 +1,6 @@
/* GNU m4 -- A simple macro processor
- Copyright (C) 1989, 1990, 1991, 1992, 1993, 1994, 2006, 2007, 2008,
- 2009, 2010 Free Software Foundation, Inc.
+ Copyright (C) 1989-1994, 2006-2010, 2013 Free Software Foundation,
+ Inc.
This file is part of GNU M4.
@@ -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
diff --git a/m4/m4.c b/m4/m4.c
index 1ba5a6c..0497799 100644
--- a/m4/m4.c
+++ b/m4/m4.c
@@ -1,6 +1,6 @@
/* GNU m4 -- A simple macro processor
- Copyright (C) 1989, 1990, 1991, 1992, 1993, 1994, 2001, 2004, 2006,
- 2007, 2008, 2010 Free Software Foundation, Inc.
+ Copyright (C) 1989-1994, 2001, 2004, 2006-2008, 2010, 2013 Free
+ Software Foundation, Inc.
This file is part of GNU M4.
diff --git a/m4/m4module.h b/m4/m4module.h
index e6d348a..8c249f0 100644
--- a/m4/m4module.h
+++ b/m4/m4module.h
@@ -1,7 +1,6 @@
/* GNU m4 -- A simple macro processor
- Copyright (C) 1989, 1990, 1991, 1992, 1993, 1994, 1999, 2000, 2003,
- 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free Software Foundation,
- Inc.
+ Copyright (C) 1989-1994, 1999-2000, 2003-2010, 2013 Free Software
+ Foundation, Inc.
This file is part of GNU M4.
diff --git a/m4/m4private.h b/m4/m4private.h
index f7b47f8..7dc207a 100644
--- a/m4/m4private.h
+++ b/m4/m4private.h
@@ -1,6 +1,6 @@
/* GNU m4 -- A simple macro processor
- Copyright (C) 1989, 1990, 1991, 1992, 1993, 1994, 1998, 1999, 2004,
- 2005, 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc.
+ Copyright (C) 1989-1994, 1998-1999, 2004-2010, 2013 Free Software
+ Foundation, Inc.
This file is part of GNU M4.
@@ -621,6 +621,7 @@ extern void m4__include_init (m4 *);
/* Avoid negative logic when comparing two strings. */
#define STREQ(a, b) (strcmp (a, b) == 0)
+#define STRNEQ(a, b) (strcmp (a, b) != 0)
#if DEBUG
diff --git a/m4/macro.c b/m4/macro.c
index d414781..40aadd0 100644
--- a/m4/macro.c
+++ b/m4/macro.c
@@ -1,6 +1,6 @@
/* GNU m4 -- A simple macro processor
- Copyright (C) 1989, 1990, 1991, 1992, 1993, 1994, 2001, 2006, 2007,
- 2008, 2009, 2010 Free Software Foundation, Inc.
+ Copyright (C) 1989-1994, 2001, 2006-2010, 2013 Free Software
+ Foundation, Inc.
This file is part of GNU M4.
@@ -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/module.c b/m4/module.c
index 6a05479..6256bca 100644
--- a/m4/module.c
+++ b/m4/module.c
@@ -1,7 +1,6 @@
/* GNU m4 -- A simple macro processor
- Copyright (C) 1989, 1990, 1991, 1992, 1993, 1994, 1998, 1999, 2002,
- 2003, 2004, 2005, 2006, 2007, 2008, 2010 Free Software Foundation,
- Inc.
+ Copyright (C) 1989-1994, 1998-1999, 2002-2008, 2010, 2013 Free
+ Software Foundation, Inc.
This file is part of GNU M4.
diff --git a/m4/output.c b/m4/output.c
index 3106734..b1e82ff 100644
--- a/m4/output.c
+++ b/m4/output.c
@@ -1,6 +1,6 @@
/* GNU m4 -- A simple macro processor
- Copyright (C) 1989, 1990, 1991, 1992, 1993, 1994, 1998, 2002, 2004,
- 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc.
+ Copyright (C) 1989-1994, 1998, 2002, 2004, 2006-2010, 2013 Free
+ Software Foundation, Inc.
This file is part of GNU M4.
@@ -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)
diff --git a/m4/path.c b/m4/path.c
index 2c6796f..37115d0 100644
--- a/m4/path.c
+++ b/m4/path.c
@@ -1,6 +1,6 @@
/* GNU m4 -- A simple macro processor
- Copyright (C) 1989, 1990, 1991, 1992, 1993, 1998, 2004, 2006, 2007,
- 2008, 2009, 2010 Free Software Foundation, Inc.
+ Copyright (C) 1989-1993, 1998, 2004, 2006-2010, 2013 Free Software
+ Foundation, Inc.
This file is part of GNU M4.
@@ -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);
@@ -296,7 +296,7 @@ m4_load_filename (m4 *context, const m4_call_info *caller,
if (!m4_get_posixly_correct_opt (context)
&& suffix
- && (!strcmp (suffix, LT_MODULE_EXT) || !strcmp (suffix, ".la")))
+ && (STREQ (suffix, LT_MODULE_EXT) || STREQ (suffix, ".la")))
{
m4_module_load (context, filepath, obs);
}
diff --git a/m4/resyntax.c b/m4/resyntax.c
index 6f6a379..a0f8d0d 100644
--- a/m4/resyntax.c
+++ b/m4/resyntax.c
@@ -1,5 +1,5 @@
/* GNU m4 -- A simple macro processor
- Copyright (C) 2006, 2007, 2008, 2010 Free Software Foundation, Inc.
+ Copyright (C) 2006-2008, 2010, 2013 Free Software Foundation, Inc.
This file is part of GNU M4.
diff --git a/m4/symtab.c b/m4/symtab.c
index 3ab0353..e7d0f27 100644
--- a/m4/symtab.c
+++ b/m4/symtab.c
@@ -1,6 +1,6 @@
/* GNU m4 -- A simple macro processor
- Copyright (C) 1989, 1990, 1991, 1992, 1993, 1994, 2001, 2005, 2006,
- 2007, 2008, 2010 Free Software Foundation, Inc.
+ Copyright (C) 1989-1994, 2001, 2005-2008, 2010, 2013 Free Software
+ Foundation, Inc.
This file is part of GNU M4.
diff --git a/m4/syntax.c b/m4/syntax.c
index 792a97f..adbb6e0 100644
--- a/m4/syntax.c
+++ b/m4/syntax.c
@@ -1,6 +1,6 @@
/* GNU m4 -- A simple macro processor
- Copyright (C) 1989, 1990, 1991, 1992, 1993, 1994, 2002, 2004, 2006,
- 2007, 2008, 2009, 2010 Free Software Foundation, Inc.
+ Copyright (C) 1989-1994, 2002, 2004, 2006-2010, 2013 Free Software
+ Foundation, Inc.
This file is part of GNU M4.
diff --git a/m4/system_.h b/m4/system_.h
index aa28247..01b8e05 100644
--- a/m4/system_.h
+++ b/m4/system_.h
@@ -1,5 +1,5 @@
/* GNU m4 -- A simple macro processor
- Copyright (C) 2000, 2001, 2003, 2006, 2007, 2008, 2010 Free Software
+ Copyright (C) 2000-2001, 2003, 2006-2008, 2010, 2013 Free Software
Foundation, Inc.
This file is part of GNU M4.
@@ -144,6 +144,7 @@ BEGIN_C_DECLS
#define M4_GNUC_NORETURN M4_GNUC_ATTRIBUTE ((__noreturn__))
#define M4_GNUC_CONST M4_GNUC_ATTRIBUTE ((__const__))
#define M4_GNUC_UNUSED M4_GNUC_ATTRIBUTE ((__unused__))
+#define M4_GNUC_PURE M4_GNUC_ATTRIBUTE ((__pure__))
diff --git a/m4/utility.c b/m4/utility.c
index 137f6fc..fe65649 100644
--- a/m4/utility.c
+++ b/m4/utility.c
@@ -1,6 +1,6 @@
/* GNU m4 -- A simple macro processor
- Copyright (C) 1989, 1990, 1991, 1992, 1993, 1994, 1998, 1999, 2003,
- 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc.
+ Copyright (C) 1989-1994, 1998-1999, 2003, 2006-2010, 2013 Free
+ Software Foundation, Inc.
This file is part of GNU M4.
diff --git a/modules/README b/modules/README
index c53a6ae..14d642e 100644
--- a/modules/README
+++ b/modules/README
@@ -92,7 +92,7 @@ or in the case of time2.m4
========================================================================
-Copyright (C) 2000, 2001, 2006, 2010 Free Software Foundation, Inc.
+Copyright (C) 2000-2001, 2006, 2010, 2013 Free Software Foundation, Inc.
Permission is granted to copy, distribute and/or modify this document
under the terms of the GNU Free Documentation License, Version 1.3 or
diff --git a/modules/evalparse.c b/modules/evalparse.c
index 166ad5c..8df809b 100644
--- a/modules/evalparse.c
+++ b/modules/evalparse.c
@@ -1,6 +1,6 @@
/* GNU m4 -- A simple macro processor
- Copyright (C) 1989, 1990, 1991, 1992, 1993, 1994, 2001, 2006, 2007,
- 2008, 2009, 2010 Free Software Foundation, Inc.
+ Copyright (C) 1989-1994, 2001, 2006-2010, 2013 Free Software
+ Foundation, Inc.
This file is part of GNU M4.
diff --git a/modules/format.c b/modules/format.c
index 92e2d47..267c3e6 100644
--- a/modules/format.c
+++ b/modules/format.c
@@ -1,6 +1,6 @@
/* GNU m4 -- A simple macro processor
- Copyright (C) 1989, 1990, 1991, 1992, 1993, 1994, 2001, 2006, 2007,
- 2008, 2009, 2010 Free Software Foundation, Inc.
+ Copyright (C) 1989-1994, 2001, 2006-2010, 2013 Free Software
+ Foundation, Inc.
This file is part of GNU M4.
diff --git a/modules/gnu.c b/modules/gnu.c
index 5aa4e74..c69862e 100644
--- a/modules/gnu.c
+++ b/modules/gnu.c
@@ -1,6 +1,5 @@
/* GNU m4 -- A simple macro processor
- Copyright (C) 2000, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free
- Software Foundation, Inc.
+ Copyright (C) 2000, 2004-2010, 2013 Free Software Foundation, Inc.
This file is part of GNU M4.
@@ -29,8 +28,8 @@
#endif
#include "modules/m4.h"
-#include "pipe.h"
#include "quotearg.h"
+#include "spawn-pipe.h"
#include "wait-process.h"
/* Rename exported symbols for dlpreload()ing. */
diff --git a/modules/import.c b/modules/import.c
index 1fdf8e1..ebce6e4 100644
--- a/modules/import.c
+++ b/modules/import.c
@@ -1,5 +1,5 @@
/* GNU m4 -- A simple macro processor
- Copyright (C) 2003, 2006, 2007, 2008, 2010 Free Software Foundation,
+ Copyright (C) 2003, 2006-2008, 2010, 2013 Free Software Foundation,
Inc.
This file is part of GNU M4.
diff --git a/modules/load.c b/modules/load.c
index 7702acf..0b0eb1b 100644
--- a/modules/load.c
+++ b/modules/load.c
@@ -1,6 +1,6 @@
/* GNU m4 -- A simple macro processor
- Copyright (C) 2000, 2005, 2006, 2007, 2008, 2010 Free Software
- Foundation, Inc.
+ Copyright (C) 2000, 2005-2008, 2010, 2013 Free Software Foundation,
+ Inc.
This file is part of GNU M4.
diff --git a/modules/m4.c b/modules/m4.c
index 305fb76..64abdae 100644
--- a/modules/m4.c
+++ b/modules/m4.c
@@ -1,6 +1,6 @@
/* GNU m4 -- A simple macro processor
- Copyright (C) 2000, 2002, 2003, 2004, 2006, 2007, 2008, 2009, 2010
- Free Software Foundation, Inc.
+ Copyright (C) 2000, 2002-2004, 2006-2010, 2013 Free Software
+ Foundation, Inc.
This file is part of GNU M4.
diff --git a/modules/m4.h b/modules/m4.h
index 0636188..928bc10 100644
--- a/modules/m4.h
+++ b/modules/m4.h
@@ -1,5 +1,5 @@
/* GNU m4 -- A simple macro processor
- Copyright (C) 2003, 2006, 2007, 2008, 2010 Free Software Foundation,
+ Copyright (C) 2003, 2006-2008, 2010, 2013 Free Software Foundation,
Inc.
This file is part of GNU M4.
diff --git a/modules/modtest.c b/modules/modtest.c
index 0043019..5febf08 100644
--- a/modules/modtest.c
+++ b/modules/modtest.c
@@ -1,6 +1,6 @@
/* GNU m4 -- A simple macro processor
- Copyright (C) 1999, 2000, 2001, 2003, 2004, 2006, 2007, 2008, 2010
- Free Software Foundation, Inc.
+ Copyright (C) 1999-2001, 2003-2004, 2006-2008, 2010, 2013 Free
+ Software Foundation, Inc.
This file is part of GNU M4.
diff --git a/modules/mpeval.c b/modules/mpeval.c
index ae620cb..7928a28 100644
--- a/modules/mpeval.c
+++ b/modules/mpeval.c
@@ -1,5 +1,5 @@
/* GNU m4 -- A simple macro processor
- Copyright (C) 2000, 2001, 2006, 2007, 2008, 2010 Free Software
+ Copyright (C) 2000-2001, 2006-2008, 2010, 2013 Free Software
Foundation, Inc.
This file is part of GNU M4.
diff --git a/modules/perl.c b/modules/perl.c
index e823c8b..edccecf 100644
--- a/modules/perl.c
+++ b/modules/perl.c
@@ -1,5 +1,5 @@
/* GNU m4 -- A simple macro processor
- Copyright (C) 1999, 2000, 2006, 2007, 2008, 2010 Free Software
+ Copyright (C) 1999-2000, 2006-2008, 2010, 2013 Free Software
Foundation, Inc.
This file is part of GNU M4.
diff --git a/modules/perl.m4 b/modules/perl.m4
index 5f0da4d..d3308a0 100644
--- a/modules/perl.m4
+++ b/modules/perl.m4
@@ -1,4 +1,4 @@
-dnl Copyright (C) 2006, 2010 Free Software Foundation, Inc.
+dnl Copyright (C) 2006, 2010, 2013 Free Software Foundation, Inc.
dnl This file is free software; the Free Software Foundation
dnl gives unlimited permission to copy and/or distribute it
dnl with or without modifications, as long as this notice is preserved.
diff --git a/modules/shadow.c b/modules/shadow.c
index 6f137b3..16260f1 100644
--- a/modules/shadow.c
+++ b/modules/shadow.c
@@ -1,5 +1,5 @@
/* GNU m4 -- A simple macro processor
- Copyright (C) 1999, 2000, 2006, 2007, 2008, 2010 Free Software
+ Copyright (C) 1999-2000, 2006-2008, 2010, 2013 Free Software
Foundation, Inc.
This file is part of GNU M4.
diff --git a/modules/stdlib.c b/modules/stdlib.c
index f080e71..d8f839c 100644
--- a/modules/stdlib.c
+++ b/modules/stdlib.c
@@ -1,6 +1,6 @@
/* GNU m4 -- A simple macro processor
- Copyright (C) 1999, 2000, 2001, 2006, 2007, 2008, 2009, 2010 Free
- Software Foundation, Inc.
+ Copyright (C) 1999-2001, 2006-2010, 2013 Free Software Foundation,
+ Inc.
This file is part of GNU M4.
diff --git a/modules/time.c b/modules/time.c
index 3c8e5b5..573d14d 100644
--- a/modules/time.c
+++ b/modules/time.c
@@ -1,6 +1,6 @@
/* GNU m4 -- A simple macro processor
- Copyright (C) 1999, 2000, 2001, 2006, 2007, 2008, 2009, 2010 Free
- Software Foundation, Inc.
+ Copyright (C) 1999-2001, 2006-2010, 2013 Free Software Foundation,
+ Inc.
This file is part of GNU M4.
diff --git a/modules/traditional.c b/modules/traditional.c
index ab6ce5b..cb9a32b 100644
--- a/modules/traditional.c
+++ b/modules/traditional.c
@@ -1,5 +1,5 @@
/* GNU m4 -- A simple macro processor
- Copyright (C) 2000, 2006, 2007, 2008, 2010 Free Software Foundation,
+ Copyright (C) 2000, 2006-2008, 2010, 2013 Free Software Foundation,
Inc.
This file is part of GNU M4.
diff --git a/src/freeze.c b/src/freeze.c
index 965f0d4..9f36e8c 100644
--- a/src/freeze.c
+++ b/src/freeze.c
@@ -1,6 +1,6 @@
/* GNU m4 -- A simple macro processor
- Copyright (C) 1989, 1990, 1991, 1992, 1993, 1994, 2004, 2005, 2006,
- 2007, 2008, 2009, 2010 Free Software Foundation, Inc.
+ Copyright (C) 1989-1994, 2004-2010, 2013 Free Software Foundation,
+ Inc.
This file is part of GNU M4.
@@ -290,7 +290,7 @@ produce_frozen_state (m4 *context, const char *name)
/* Dump quote delimiters. */
pair = m4_get_syntax_quotes (M4SYNTAX);
- if (strcmp (pair->str1, DEF_LQUOTE) || strcmp (pair->str2, DEF_RQUOTE))
+ if (STRNEQ (pair->str1, DEF_LQUOTE) || STRNEQ (pair->str2, DEF_RQUOTE))
{
xfprintf (file, "Q%zu,%zu\n", pair->len1, pair->len2);
produce_mem_dump (file, pair->str1, pair->len1);
@@ -301,7 +301,7 @@ produce_frozen_state (m4 *context, const char *name)
/* Dump comment delimiters. */
pair = m4_get_syntax_comments (M4SYNTAX);
- if (strcmp (pair->str1, DEF_BCOMM) || strcmp (pair->str2, DEF_ECOMM))
+ if (STRNEQ (pair->str1, DEF_BCOMM) || STRNEQ (pair->str2, DEF_ECOMM))
{
xfprintf (file, "C%zu,%zu\n", pair->len1, pair->len2);
produce_mem_dump (file, pair->str1, pair->len1);
diff --git a/src/m4.h b/src/m4.h
index 674d639..ab07e99 100644
--- a/src/m4.h
+++ b/src/m4.h
@@ -1,6 +1,6 @@
/* GNU m4 -- A simple macro processor
- Copyright (C) 1989, 1990, 1991, 1992, 1993, 1994, 2006, 2007, 2010
- Free Software Foundation, Inc.
+ Copyright (C) 1989-1994, 2006-2007, 2010, 2013 Free Software
+ Foundation, Inc.
This file is part of GNU M4.
diff --git a/src/main.c b/src/main.c
index 9bbd5b9..1e3e706 100644
--- a/src/main.c
+++ b/src/main.c
@@ -1,8 +1,7 @@
/* GNU m4 -- A simple macro processor
- Copyright (C) 1989, 1990, 1991, 1992, 1993, 1994, 1999, 2000, 2003,
- 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free Software Foundation,
- Inc.
+ Copyright (C) 1989-1994, 1999-2000, 2003-2010, 2013 Free Software
+ Foundation, Inc.
This file is part of GNU M4.
diff --git a/src/stackovf.c b/src/stackovf.c
index fb2aa1a..39d6f5e 100644
--- a/src/stackovf.c
+++ b/src/stackovf.c
@@ -1,6 +1,6 @@
/* Detect stack overflow (when getrlimit and sigaction or sigvec are available)
- Copyright (C) 1993, 1994, 2006, 2007, 2010 Free Software Foundation,
- Inc.
+ Copyright (C) 1993-1994, 2006-2007, 2010, 2013 Free Software
+ Foundation, Inc.
Jim Avera <address@hidden>, October 1993.
This file is part of GNU M4.
@@ -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. */
diff --git a/tests/atlocal.in b/tests/atlocal.in
index 7e0ec1f..b307e3f 100644
--- a/tests/atlocal.in
+++ b/tests/atlocal.in
@@ -1,8 +1,8 @@
# -*- shell-script -*-
# @configure_input@
# Configurable variable values for M4 test suite.
-# Copyright (C) 2000, 2001, 2006, 2008, 2010 Free Software Foundation,
-# Inc.
+# Copyright (C) 2000-2001, 2006, 2008, 2010, 2013 Free Software
+# Foundation, Inc.
# This file is part of GNU M4.
#
diff --git a/tests/builtins.at b/tests/builtins.at
index 48309cf..d53ffc4 100644
--- a/tests/builtins.at
+++ b/tests/builtins.at
@@ -1,6 +1,5 @@
# Hand crafted tests for GNU M4. -*- Autotest -*-
-# Copyright (C) 2001, 2006, 2007, 2008, 2009, 2010 Free Software
-# Foundation, Inc.
+# Copyright (C) 2001, 2006-2010, 2013 Free Software Foundation, Inc.
# This file is part of GNU M4.
#
diff --git a/tests/freeze.at b/tests/freeze.at
index 4ac25d7..15afcd2 100644
--- a/tests/freeze.at
+++ b/tests/freeze.at
@@ -1,6 +1,5 @@
# Hand crafted tests for GNU M4. -*- Autotest -*-
-# Copyright (C) 2006, 2007, 2008, 2009, 2010 Free Software Foundation,
-# Inc.
+# Copyright (C) 2006-2010, 2013 Free Software Foundation, Inc.
# This file is part of GNU M4.
#
diff --git a/tests/generate.awk b/tests/generate.awk
index ab25661..424663d 100755
--- a/tests/generate.awk
+++ b/tests/generate.awk
@@ -1,7 +1,7 @@
# Extract all examples from the manual source. -*- AWK -*-
-# Copyright (C) 1992, 2000, 2001, 2006, 2007, 2008, 2009, 2010 Free
-# Software Foundation, Inc.
+# Copyright (C) 1992, 2000-2001, 2006-2010, 2013 Free Software
+# Foundation, Inc.
#
# This file is part of GNU M4.
#
diff --git a/tests/iso8859.m4 b/tests/iso8859.m4
index eff4178..1f7dbdd 100644
Binary files a/tests/iso8859.m4 and b/tests/iso8859.m4 differ
diff --git a/tests/m4.in b/tests/m4.in
index 7d34a00..2a9b7f3 100644
--- a/tests/m4.in
+++ b/tests/m4.in
@@ -2,7 +2,7 @@
# @configure_input@
# Wrapper around a non installed m4 to make it work as an installed one.
#
-# Copyright (C) 2001, 2002, 2006, 2007, 2008, 2010 Free Software
+# Copyright (C) 2001-2002, 2006-2008, 2010, 2013 Free Software
# Foundation, Inc.
#
# This file is part of GNU M4.
diff --git a/tests/macros.at b/tests/macros.at
index 312a606..dedc44d 100644
--- a/tests/macros.at
+++ b/tests/macros.at
@@ -1,5 +1,5 @@
# Hand crafted tests for GNU M4. -*- Autotest -*-
-# Copyright (C) 2001, 2006, 2007, 2008, 2010 Free Software Foundation,
+# Copyright (C) 2001, 2006-2008, 2010, 2013 Free Software Foundation,
# Inc.
# This file is part of GNU M4.
diff --git a/tests/modules.at b/tests/modules.at
index e31e33e..623f531 100644
--- a/tests/modules.at
+++ b/tests/modules.at
@@ -1,5 +1,5 @@
# Hand crafted tests for GNU M4. -*- Autotest -*-
-# Copyright (C) 2001, 2006, 2007, 2008, 2010 Free Software Foundation,
+# Copyright (C) 2001, 2006-2008, 2010, 2013 Free Software Foundation,
# Inc.
# This file is part of GNU M4.
diff --git a/tests/options.at b/tests/options.at
index 66abc42..921c6fe 100644
--- a/tests/options.at
+++ b/tests/options.at
@@ -1,6 +1,5 @@
# Hand crafted tests for GNU M4. -*- Autotest -*-
-# Copyright (C) 2001, 2006, 2007, 2008, 2009, 2010 Free Software Foundation,
-# Inc.
+# Copyright (C) 2001, 2006-2010, 2013 Free Software Foundation, Inc.
# This file is part of GNU M4.
#
diff --git a/tests/others.at b/tests/others.at
index b2985a5..dd5c99a 100644
--- a/tests/others.at
+++ b/tests/others.at
@@ -1,6 +1,5 @@
# Hand crafted tests for GNU M4. -*- Autotest -*-
-# Copyright (C) 2001, 2006, 2007, 2008, 2009, 2010 Free Software
-# Foundation, Inc.
+# Copyright (C) 2001, 2006-2010, 2013 Free Software Foundation, Inc.
# This file is part of GNU M4.
#
diff --git a/tests/stackovf.test b/tests/stackovf.test
index c26c396..b5913e0 100755
--- a/tests/stackovf.test
+++ b/tests/stackovf.test
@@ -1,6 +1,7 @@
#!/bin/sh
# This file is part of the GNU m4 testsuite
-# Copyright (C) 2000, 2003, 2007, 2010 Free Software Foundation, Inc.
+# Copyright (C) 2000, 2003, 2007, 2010, 2013 Free Software Foundation,
+# Inc.
#
# This file is part of GNU M4.
#
diff --git a/tests/testsuite.at b/tests/testsuite.at
index 0d65042..26d8346 100644
--- a/tests/testsuite.at
+++ b/tests/testsuite.at
@@ -1,8 +1,7 @@
# Process with autom4te to create an -*- Autotest -*- test suite.
# Test suite for GNU M4.
-# Copyright (C) 2001, 2006, 2007, 2008, 2009, 2010 Free Software
-# Foundation, Inc.
+# Copyright (C) 2001, 2006-2010, 2013 Free Software Foundation, Inc.
# This file is part of GNU M4.
#
hooks/post-receive
--
GNU M4 source repository
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [SCM] GNU M4 source repository branch, master, updated. cvs-readonly-297-g425b0ac,
Gary V. Vaughan <=