[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[SCM] GNU gss branch, master, updated. gss-1-0-2-42-gf057c1b
|
From: |
Simon Josefsson |
|
Subject: |
[SCM] GNU gss branch, master, updated. gss-1-0-2-42-gf057c1b |
|
Date: |
Thu, 09 Oct 2014 13:44:10 +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 gss".
http://git.savannah.gnu.org/cgit/gss.git/commit/?id=f057c1b05ecfae1ae18d4bb773f26bcb5f1b37b7
The branch, master has been updated
via f057c1b05ecfae1ae18d4bb773f26bcb5f1b37b7 (commit)
via 242c1571b2f09be1ec552a422121aba78c229004 (commit)
via 91b5031be1e436344f2b5136f6853716227d4436 (commit)
via 366a84ae31f5111b10d559255a001ebf43d1b2ac (commit)
via aa2b8b9648599a1b4374850914e1df1e564eedd0 (commit)
via 4c03e557c8d826610b4e0f7d4e491fb6fa82b09f (commit)
via 40fb11f4f00432a80a7c7d06ce72cb73375d623a (commit)
via 54d60222cc4fee162c687498a13ee65f941254ff (commit)
via 319838e843e7994b9ef3f9fba937f72672edba95 (commit)
via 57421ea90166d5f73ce1daed2842950a205acb23 (commit)
via 1d31692d642230dc159d11d8fb481314ff959136 (commit)
from 90e3686019373b75e0e10b9b32758639eead1f6a (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 f057c1b05ecfae1ae18d4bb773f26bcb5f1b37b7
Author: Simon Josefsson <address@hidden>
Date: Thu Oct 9 15:44:04 2014 +0200
Generated.
commit 242c1571b2f09be1ec552a422121aba78c229004
Author: Simon Josefsson <address@hidden>
Date: Thu Oct 9 15:36:40 2014 +0200
Fix web rule.
commit 91b5031be1e436344f2b5136f6853716227d4436
Author: Simon Josefsson <address@hidden>
Date: Thu Oct 9 15:34:50 2014 +0200
Fix syntax check nits.
commit 366a84ae31f5111b10d559255a001ebf43d1b2ac
Author: Simon Josefsson <address@hidden>
Date: Thu Oct 9 15:31:31 2014 +0200
Autoconf fixes.
commit aa2b8b9648599a1b4374850914e1df1e564eedd0
Author: Simon Josefsson <address@hidden>
Date: Thu Oct 9 15:29:21 2014 +0200
Fix make warning.
commit 4c03e557c8d826610b4e0f7d4e491fb6fa82b09f
Author: Simon Josefsson <address@hidden>
Date: Thu Oct 9 15:28:47 2014 +0200
Version 1.0.3.
commit 40fb11f4f00432a80a7c7d06ce72cb73375d623a
Author: Simon Josefsson <address@hidden>
Date: Thu Oct 9 15:28:17 2014 +0200
PGP key fixes.
commit 54d60222cc4fee162c687498a13ee65f941254ff
Author: Simon Josefsson <address@hidden>
Date: Thu Oct 9 15:25:55 2014 +0200
Update copyright files.
commit 319838e843e7994b9ef3f9fba937f72672edba95
Author: Simon Josefsson <address@hidden>
Date: Thu Oct 9 15:24:19 2014 +0200
Sync with TP.
commit 57421ea90166d5f73ce1daed2842950a205acb23
Author: Simon Josefsson <address@hidden>
Date: Thu Oct 9 13:30:04 2014 +0200
Fix.
commit 1d31692d642230dc159d11d8fb481314ff959136
Author: Simon Josefsson <address@hidden>
Date: Thu Oct 9 13:28:28 2014 +0200
Update gnulib files.
-----------------------------------------------------------------------
Summary of changes:
.clcopying | 2 +-
AUTHORS | 857 +++++++-----------------
ChangeLog | 327 +++++++++-
GNUmakefile | 2 +-
Makefile.am | 2 +-
NEWS | 4 +-
README | 2 +-
README-alpha | 2 +-
THANKS | 2 +-
build-aux/config.rpath | 18 +-
build-aux/gendocs.sh | 351 +++++++----
build-aux/gnupload | 40 +-
build-aux/pmccabe2html | 20 +-
build-aux/snippet/arg-nonnull.h | 2 +-
build-aux/snippet/c++defs.h | 2 +-
build-aux/snippet/warn-on-use.h | 4 +-
build-aux/update-copyright | 6 +-
build-aux/useless-if-before-free | 2 +-
build-aux/vc-list-files | 2 +-
cfg.mk | 13 +-
configure.ac | 10 +-
doc/Makefile.am | 2 +-
doc/Makefile.gdoci | 2 +-
doc/cyclo/Makefile.am | 2 +-
doc/fdl-1.3.texi | 2 +-
doc/gdoc | 2 +-
doc/gendocs_template | 24 +-
doc/gss.texi | 2 +-
gl/Makefile.am | 4 +-
gl/dummy.c | 2 +-
gl/m4/00gnulib.m4 | 22 +-
gl/m4/autobuild.m4 | 2 +-
gl/m4/gnulib-cache.m4 | 2 +-
gl/m4/gnulib-common.m4 | 122 +++-
gl/m4/gnulib-comp.m4 | 35 +-
gl/m4/gnulib-tool.m4 | 2 +-
gl/m4/ld-version-script.m4 | 2 +-
gl/m4/lib-ld.m4 | 60 +-
gl/m4/lib-link.m4 | 2 +-
gl/m4/lib-prefix.m4 | 2 +-
gl/m4/manywarnings.m4 | 212 ++++---
gl/m4/valgrind-tests.m4 | 6 +-
gl/m4/warnings.m4 | 32 +-
gss.pc.in | 2 +-
lib/Makefile.am | 2 +-
lib/asn1.c | 2 +-
lib/context.c | 2 +-
lib/cred.c | 2 +-
lib/error.c | 2 +-
lib/ext.c | 2 +-
lib/gl/Makefile.am | 13 +-
lib/gl/dummy.c | 2 +-
lib/gl/gettext.h | 2 +-
lib/gl/m4/00gnulib.m4 | 22 +-
lib/gl/m4/absolute-header.m4 | 102 +++
lib/gl/m4/extensions.m4 | 51 +-
lib/gl/m4/extern-inline.m4 | 99 +++
lib/gl/m4/gnulib-cache.m4 | 2 +-
lib/gl/m4/gnulib-common.m4 | 122 +++-
lib/gl/m4/gnulib-comp.m4 | 29 +-
lib/gl/m4/gnulib-tool.m4 | 2 +-
lib/gl/m4/include_next.m4 | 55 +--
lib/gl/m4/ld-output-def.m4 | 2 +-
lib/gl/m4/stddef_h.m4 | 2 +-
lib/gl/m4/string_h.m4 | 2 +-
lib/gl/m4/strverscmp.m4 | 2 +-
lib/gl/m4/warn-on-use.m4 | 2 +-
lib/gl/m4/wchar_t.m4 | 2 +-
lib/gl/stddef.in.h | 2 +-
lib/gl/string.in.h | 2 +-
lib/gl/strverscmp.c | 2 +-
lib/headers/gss.h.in | 2 +-
lib/headers/gss/ext.h | 2 +-
lib/headers/gss/krb5-ext.h | 2 +-
lib/headers/gss/krb5.h | 2 +-
lib/internal.h | 2 +-
lib/krb5/Makefile.am | 2 +-
lib/krb5/checksum.c | 2 +-
lib/krb5/checksum.h | 2 +-
lib/krb5/context.c | 2 +-
lib/krb5/cred.c | 2 +-
lib/krb5/error.c | 2 +-
lib/krb5/k5internal.h | 2 +-
lib/krb5/msg.c | 2 +-
lib/krb5/name.c | 2 +-
lib/krb5/oid.c | 2 +-
lib/krb5/protos.h | 2 +-
lib/krb5/utils.c | 2 +-
lib/libgss.map | 2 +-
lib/meta.c | 2 +-
lib/meta.h | 2 +-
lib/misc.c | 2 +-
lib/msg.c | 2 +-
lib/name.c | 2 +-
lib/obsolete.c | 2 +-
lib/oid.c | 2 +-
lib/saslname.c | 2 +-
lib/version.c | 2 +-
maint.mk | 232 ++++---
po/LINGUAS | 2 +
po/{hr.po.in => de.po.in} | 154 +++---
po/{hr.po.in => hu.po.in} | 151 +++---
src/Makefile.am | 2 +-
src/gl/Makefile.am | 143 ++++-
src/gl/base64.c | 51 ++-
src/gl/base64.h | 2 +-
src/gl/errno.in.h | 7 +-
src/gl/error.c | 27 +-
src/gl/error.h | 2 +-
src/gl/getopt.c | 2 +-
src/gl/getopt.in.h | 4 +-
src/gl/getopt1.c | 2 +-
src/gl/getopt_int.h | 2 +-
src/gl/gettext.h | 2 +-
src/gl/intprops.h | 5 +-
src/gl/m4/00gnulib.m4 | 22 +-
src/gl/m4/absolute-header.m4 | 102 +++
src/gl/m4/base64.m4 | 5 +-
src/gl/m4/errno_h.m4 | 7 +-
src/gl/m4/error.m4 | 3 +-
src/gl/m4/extensions.m4 | 51 +-
src/gl/m4/extern-inline.m4 | 99 +++
src/gl/m4/getopt.m4 | 2 +-
src/gl/m4/gnulib-cache.m4 | 2 +-
src/gl/m4/gnulib-common.m4 | 122 +++-
src/gl/m4/gnulib-comp.m4 | 148 +++--
src/gl/m4/gnulib-tool.m4 | 2 +-
src/gl/m4/include_next.m4 | 55 +--
src/gl/m4/memchr.m4 | 2 +-
src/gl/m4/mmap-anon.m4 | 2 +-
src/gl/m4/msvc-inval.m4 | 2 +-
src/gl/m4/msvc-nothrow.m4 | 2 +-
src/gl/m4/nocrash.m4 | 2 +-
src/gl/m4/off_t.m4 | 2 +-
src/gl/m4/ssize_t.m4 | 2 +-
src/gl/m4/stdarg.m4 | 2 +-
src/gl/m4/stdbool.m4 | 2 +-
src/gl/m4/stddef_h.m4 | 2 +-
src/gl/m4/stdio_h.m4 | 194 ++++++
src/gl/m4/strerror.m4 | 2 +-
src/gl/m4/string_h.m4 | 2 +-
src/gl/m4/sys_socket_h.m4 | 5 +-
src/gl/m4/sys_types_h.m4 | 6 +-
src/gl/m4/unistd_h.m4 | 6 +-
src/gl/m4/version-etc.m4 | 2 +-
src/gl/m4/warn-on-use.m4 | 2 +-
src/gl/m4/wchar_t.m4 | 2 +-
src/gl/memchr.c | 2 +-
src/gl/msvc-inval.c | 8 +-
src/gl/msvc-inval.h | 2 +-
src/gl/msvc-nothrow.c | 2 +-
src/gl/msvc-nothrow.h | 2 +-
src/gl/progname.c | 2 +-
src/gl/progname.h | 2 +-
src/gl/stdarg.in.h | 2 +-
src/gl/stdbool.in.h | 53 +-
src/gl/stddef.in.h | 2 +-
src/gl/stdio.in.h | 1353 ++++++++++++++++++++++++++++++++++++++
src/gl/strerror-override.c | 7 +-
src/gl/strerror-override.h | 7 +-
src/gl/strerror.c | 2 +-
src/gl/string.in.h | 2 +-
src/gl/sys_types.in.h | 4 +-
src/gl/unistd.c | 3 +
src/gl/unistd.in.h | 64 ++-
src/gl/verify.h | 136 +++--
src/gl/version-etc.c | 4 +-
src/gl/version-etc.h | 2 +-
src/gss.c | 6 +-
src/gss.ggo | 2 +-
tests/Makefile.am | 2 +-
tests/basic.c | 2 +-
tests/krb5context.c | 2 +-
tests/saslname.c | 2 +-
tests/threadsafety | 2 +-
175 files changed, 4407 insertions(+), 1723 deletions(-)
create mode 100644 lib/gl/m4/absolute-header.m4
create mode 100644 lib/gl/m4/extern-inline.m4
copy po/{hr.po.in => de.po.in} (57%)
copy po/{hr.po.in => hu.po.in} (57%)
create mode 100644 src/gl/m4/absolute-header.m4
create mode 100644 src/gl/m4/extern-inline.m4
create mode 100644 src/gl/m4/stdio_h.m4
create mode 100644 src/gl/stdio.in.h
create mode 100644 src/gl/unistd.c
diff --git a/.clcopying b/.clcopying
index 298e6e6..c6817fe 100644
--- a/.clcopying
+++ b/.clcopying
@@ -1,6 +1,6 @@
-----
- Copyright (C) 2003-2013 Simon Josefsson
+ Copyright (C) 2003-2014 Simon Josefsson
Copying and distribution of this file, with or without
modification, are permitted provided the copyright notice
diff --git a/AUTHORS b/AUTHORS
index f42ef76..f25bea1 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -1,621 +1,258 @@
GSS AUTHORS -- Information about the authors.
-Copyright (C) 2003-2013 Simon Josefsson
+Copyright (C) 2003-2014 Simon Josefsson
See the end for copying conditions.
Simon Josefsson <address@hidden>
Designed and implemented GSS.
-----BEGIN PGP PUBLIC KEY BLOCK-----
-URL: http://josefsson.org/key.txt
-Comment: This 0xB565716F key is used to sign releases of GSS.
+URL: http://josefsson.org/54265e8c.txt
+Comment: This key is used to sign releases of GSS.
-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
-3YhGBBARAgAGBQJEc4b8AAoJEAixI47drUe278gAn15puEaeLjlpaTndlvxT+LAH
-/951AJ9b0Hlo7Py6F9c1liLsMNWNDnyvZ4j7BBMBAgBFAhsDBAsHAwIDFQIDAxYC
-AQIeAQIXgCIYZG5zOnNpbW9uLmpvc2Vmc3Nvbi5vcmc/dHlwZT1DRVJUBQJD8ykB
-BQkIC2/UAAoJEO2iHpS1ZXFvrF0FAJLVqSWQ2fYNGCvBH4xRS4n2LruzdubmzNuC
-IZrc75M+RfTvYeHwCNDY8H+PggYuXMT8armHvFvyL7jln864M9LTX4TwROrqKlkN
-gOkfxdSgOz4QE9RHxxooF1GMl1yhxCoumixYE5w0z0LGYRKy/Xzd3+VMcUaFXvEq
-Y6Q+cnQoqChCvKRmsIFhF4b4SAqzRePdx6U3PBpC4FbIlkQkpbaIRgQQEQIABgUC
-RYwLkgAKCRApqihSMz58I53iAJ47ZGEOrZrMqV6WKmfKa8+5907zeQCeI9LFETr1
-SK3IHx/7S7RlQhoqAzeI+wQTAQIARQIbAwQLBwMCAxUCAwMWAgECHgECF4AiGGRu
-czpzaW1vbi5qb3NlZnNzb24ub3JnP3R5cGU9Q0VSVAUCRObocwUJCP8vSAAKCRDt
-oh6UtWVxb9fhBQCRE0dBfP855Vv2fPCzIxnu1I0GM9BjmAC4uMNdW6o7I4yQMXNY
-pP8RdxDzPTon1JYQZqQW77EdqtwjFeguScudF8+85I2FtKDmzl0NNubmX6ckxdCb
-uUmOk2VuH0IQ8O0f1htk0h4dQB97YA8zu9AtqyASkdCDbRC7RgoaeUaV7N7v8RM3
-KpEJm6pceQT1DLqOQIFAp/cDa76xXK2Xrd4IiGsEEBECACsFAkXhdvUFgwKHjGMe
-Gmh0dHA6Ly93d3cuY2FjZXJ0Lm9yZy9jcHMucGhwAAoJENK7DQFl0P1YbgMAnj34
-VvAwJhWnZ79fbgSY9O7CIBJFAKCJEs0DbASutepLJhiysH3J61b5D4hGBBARAgAG
-BQJF4sLAAAoJEKrPs4YhG27v90UAoKBHaY3RXOkwk5YL58jSYoOWltJ/AKDTwdKS
-URBZ3RTeGkriWGZRy2sfd4kCHAQQAQIABgUCReGU9AAKCRAmSeYoxdNNBWHAD/4+
-/J4V7cM1dMrr6rpaggfgRa7d121f4n+KVn69fmxBr6vMkGP+8Aor4xMGvkL6HYJv
-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
-aKrAtf+zpargt/BDloG7q1MrK6WQPihnxAw=
-=fGHK
+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
+DNs=
+=mzYz
-----END PGP PUBLIC KEY BLOCK-----
----------------------------------------------------------------------
diff --git a/ChangeLog b/ChangeLog
index 5b46462..d2fa03d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,328 @@
+2014-10-09 Simon Josefsson <address@hidden>
+
+ * cfg.mk: Fix web rule.
+
+2014-10-09 Simon Josefsson <address@hidden>
+
+ * cfg.mk, src/gss.c: Fix syntax check nits.
+
+2014-10-09 Simon Josefsson <address@hidden>
+
+ * configure.ac: Autoconf fixes.
+
+2014-10-09 Simon Josefsson <address@hidden>
+
+ * cfg.mk: Fix make warning.
+
+2014-10-09 Simon Josefsson <address@hidden>
+
+ * NEWS: Version 1.0.3.
+
+2014-10-09 Simon Josefsson <address@hidden>
+
+ * AUTHORS, cfg.mk: PGP key fixes.
+
+2014-10-09 Simon Josefsson <address@hidden>
+
+ * .clcopying, AUTHORS, ChangeLog, Makefile.am, NEWS, README,
+ README-alpha, THANKS, cfg.mk, doc/Makefile.am, doc/Makefile.gdoci,
+ doc/cyclo/Makefile.am, doc/gdoc, doc/gss.texi, gss.pc.in,
+ lib/Makefile.am, lib/asn1.c, lib/context.c, lib/cred.c,
+ lib/error.c, lib/ext.c, lib/headers/gss.h.in,
+ lib/headers/gss/ext.h, lib/headers/gss/krb5-ext.h,
+ lib/headers/gss/krb5.h, lib/internal.h, lib/krb5/Makefile.am,
+ lib/krb5/checksum.c, lib/krb5/checksum.h, lib/krb5/context.c,
+ lib/krb5/cred.c, lib/krb5/error.c, lib/krb5/k5internal.h,
+ lib/krb5/msg.c, lib/krb5/name.c, lib/krb5/oid.c, lib/krb5/protos.h,
+ lib/krb5/utils.c, lib/libgss.map, lib/meta.c, lib/meta.h,
+ lib/misc.c, lib/msg.c, lib/name.c, lib/obsolete.c, lib/oid.c,
+ lib/saslname.c, lib/version.c, src/Makefile.am, src/gss.c,
+ src/gss.ggo, tests/Makefile.am, tests/basic.c, tests/krb5context.c,
+ tests/saslname.c, tests/threadsafety: Update copyright files.
+
+2014-10-09 Simon Josefsson <address@hidden>
+
+ * po/LINGUAS, po/de.po.in, po/hu.po.in: Sync with TP.
+
+2014-10-09 Simon Josefsson <address@hidden>
+
+ * configure.ac: Fix.
+
+2014-10-09 Simon Josefsson <address@hidden>
+
+ * GNUmakefile, build-aux/config.rpath, build-aux/gendocs.sh,
+ build-aux/gnupload, build-aux/pmccabe2html,
+ build-aux/snippet/arg-nonnull.h, build-aux/snippet/c++defs.h,
+ build-aux/snippet/warn-on-use.h, build-aux/update-copyright,
+ build-aux/useless-if-before-free, build-aux/vc-list-files,
+ doc/fdl-1.3.texi, doc/gendocs_template, gl/Makefile.am, gl/dummy.c,
+ gl/m4/00gnulib.m4, gl/m4/autobuild.m4, gl/m4/gnulib-cache.m4,
+ gl/m4/gnulib-common.m4, gl/m4/gnulib-comp.m4, gl/m4/gnulib-tool.m4,
+ gl/m4/ld-version-script.m4, gl/m4/lib-ld.m4, gl/m4/lib-link.m4,
+ gl/m4/lib-prefix.m4, gl/m4/manywarnings.m4,
+ gl/m4/valgrind-tests.m4, gl/m4/warnings.m4, lib/gl/Makefile.am,
+ lib/gl/dummy.c, lib/gl/gettext.h, lib/gl/m4/00gnulib.m4,
+ lib/gl/m4/absolute-header.m4, lib/gl/m4/extensions.m4,
+ lib/gl/m4/extern-inline.m4, lib/gl/m4/gnulib-cache.m4,
+ lib/gl/m4/gnulib-common.m4, lib/gl/m4/gnulib-comp.m4,
+ lib/gl/m4/gnulib-tool.m4, lib/gl/m4/include_next.m4,
+ lib/gl/m4/ld-output-def.m4, lib/gl/m4/stddef_h.m4,
+ lib/gl/m4/string_h.m4, lib/gl/m4/strverscmp.m4,
+ lib/gl/m4/warn-on-use.m4, lib/gl/m4/wchar_t.m4, lib/gl/stddef.in.h,
+ lib/gl/string.in.h, lib/gl/strverscmp.c, maint.mk,
+ src/gl/Makefile.am, src/gl/base64.c, src/gl/base64.h,
+ src/gl/errno.in.h, src/gl/error.c, src/gl/error.h, src/gl/getopt.c,
+ src/gl/getopt.in.h, src/gl/getopt1.c, src/gl/getopt_int.h,
+ src/gl/gettext.h, src/gl/intprops.h, src/gl/m4/00gnulib.m4,
+ src/gl/m4/absolute-header.m4, src/gl/m4/base64.m4,
+ src/gl/m4/errno_h.m4, src/gl/m4/error.m4, src/gl/m4/extensions.m4,
+ src/gl/m4/extern-inline.m4, src/gl/m4/getopt.m4,
+ src/gl/m4/gnulib-cache.m4, src/gl/m4/gnulib-common.m4,
+ src/gl/m4/gnulib-comp.m4, src/gl/m4/gnulib-tool.m4,
+ src/gl/m4/include_next.m4, src/gl/m4/memchr.m4,
+ src/gl/m4/mmap-anon.m4, src/gl/m4/msvc-inval.m4,
+ src/gl/m4/msvc-nothrow.m4, src/gl/m4/nocrash.m4,
+ src/gl/m4/off_t.m4, src/gl/m4/ssize_t.m4, src/gl/m4/stdarg.m4,
+ src/gl/m4/stdbool.m4, src/gl/m4/stddef_h.m4, src/gl/m4/stdio_h.m4,
+ src/gl/m4/strerror.m4, src/gl/m4/string_h.m4,
+ src/gl/m4/sys_socket_h.m4, src/gl/m4/sys_types_h.m4,
+ src/gl/m4/unistd_h.m4, src/gl/m4/version-etc.m4,
+ src/gl/m4/warn-on-use.m4, src/gl/m4/wchar_t.m4, src/gl/memchr.c,
+ src/gl/msvc-inval.c, src/gl/msvc-inval.h, src/gl/msvc-nothrow.c,
+ src/gl/msvc-nothrow.h, src/gl/progname.c, src/gl/progname.h,
+ src/gl/stdarg.in.h, src/gl/stdbool.in.h, src/gl/stddef.in.h,
+ src/gl/stdio.in.h, src/gl/strerror-override.c,
+ src/gl/strerror-override.h, src/gl/strerror.c, src/gl/string.in.h,
+ src/gl/sys_types.in.h, src/gl/unistd.c, src/gl/unistd.in.h,
+ src/gl/verify.h, src/gl/version-etc.c, src/gl/version-etc.h: Update
+ gnulib files.
+
+2014-10-09 Simon Josefsson <address@hidden>
+
+ * lib/headers/gss/api.h: Simplify api.h copyright notice.
+
+2012-09-06 Simon Josefsson <address@hidden>
+
+ * .clcopying, AUTHORS, ChangeLog, Makefile.am, NEWS, README,
+ README-alpha, THANKS, cfg.mk, configure.ac, doc/Makefile.am,
+ doc/Makefile.gdoci, doc/cyclo/Makefile.am, doc/gdoc, doc/gss.texi,
+ gss.pc.in, lib/Makefile.am, lib/asn1.c, lib/context.c, lib/cred.c,
+ lib/error.c, lib/ext.c, lib/headers/gss.h.in,
+ lib/headers/gss/api.h, lib/headers/gss/ext.h,
+ lib/headers/gss/krb5-ext.h, lib/headers/gss/krb5.h, lib/internal.h,
+ lib/krb5/Makefile.am, lib/krb5/checksum.c, lib/krb5/checksum.h,
+ lib/krb5/context.c, lib/krb5/cred.c, lib/krb5/error.c,
+ lib/krb5/k5internal.h, lib/krb5/msg.c, lib/krb5/name.c,
+ lib/krb5/oid.c, lib/krb5/protos.h, lib/krb5/utils.c,
+ lib/libgss.map, lib/meta.c, lib/meta.h, lib/misc.c, lib/msg.c,
+ lib/name.c, lib/obsolete.c, lib/oid.c, lib/saslname.c,
+ lib/version.c, src/Makefile.am, src/gss.c, src/gss.ggo,
+ tests/Makefile.am, tests/basic.c, tests/krb5context.c,
+ tests/saslname.c, tests/threadsafety: Update copyright years.
+
+2012-08-15 Simon Josefsson <address@hidden>
+
+ * src/gss.c: Doc fix.
+
+2012-08-15 Simon Josefsson <address@hidden>
+
+ * doc/gss.texi: Doc fix.
+
+2012-08-15 Simon Josefsson <address@hidden>
+
+ * src/gss.c, src/gss.ggo: gss: For accept, support flexible
+ acquire_cred.
+
+2012-08-14 Simon Josefsson <address@hidden>
+
+ * tests/saslname.c: Fix non-shishi builds.
+
+2012-08-14 Simon Josefsson <address@hidden>
+
+ * lib/asn1.c, lib/context.c, lib/internal.h: Find mechanism by
+ looking at context token.
+
+2012-08-14 Simon Josefsson <address@hidden>
+
+ * .gitignore: Ignore more.
+
+2012-08-14 Simon Josefsson <address@hidden>
+
+ * configure.ac: Cleanup ./configure output.
+
+2012-08-14 Simon Josefsson <address@hidden>
+
+ * doc/reference/Makefile.am: Regenerate gtk-doc header ignore.
+
+2012-08-14 Simon Josefsson <address@hidden>
+
+ * NEWS, doc/gss.texi, src/gss.c, src/gss.ggo: gss: Support security
+ contexts.
+
+2012-08-14 Simon Josefsson <address@hidden>
+
+ * lib/krb5/cred.c: acquire_cred: Don't crash on NULL desired_name.
+
+2012-08-14 Simon Josefsson <address@hidden>
+
+ * lib/krb5/context.c: Don't crash on NULL target_name.
+
+2012-08-14 Simon Josefsson <address@hidden>
+
+ * src/gl/Makefile.am, src/gl/base64.c, src/gl/base64.h,
+ src/gl/m4/base64.m4, src/gl/m4/gnulib-cache.m4,
+ src/gl/m4/gnulib-comp.m4, src/gl/m4/memchr.m4,
+ src/gl/m4/mmap-anon.m4, src/gl/m4/stdbool.m4, src/gl/memchr.c,
+ src/gl/memchr.valgrind, src/gl/stdbool.in.h, src/gss.c, src/gss.ggo:
+ Add base64 gnulib module.
+
+2012-08-14 Simon Josefsson <address@hidden>
+
+ * gl/Makefile.am, gl/m4/gnulib-cache.m4, gl/m4/gnulib-common.m4,
+ lib/gl/m4/extensions.m4, lib/gl/m4/gnulib-cache.m4,
+ lib/gl/m4/gnulib-common.m4, lib/gl/override/lib/gettext.h.diff,
+ maint.mk, src/gl/m4/extensions.m4, src/gl/m4/getopt.m4,
+ src/gl/m4/gnulib-cache.m4, src/gl/m4/gnulib-common.m4,
+ src/gl/m4/nocrash.m4, src/gl/override/lib/gettext.h.diff,
+ src/gl/unistd.in.h, src/gl/verify.h: Update gnulib files.
+
+2012-08-13 Simon Josefsson <address@hidden>
+
+ * po/LINGUAS, po/hr.po.in: Sync with TP.
+
+2012-06-11 Simon Josefsson <address@hidden>
+
+ * po/id.po.in: Sync with TP.
+
+2012-06-01 Simon Josefsson <address@hidden>
+
+ * build-aux/gnupload, gl/m4/gnulib-common.m4, gl/m4/gnulib-comp.m4,
+ gl/m4/manywarnings.m4, gl/m4/warnings.m4,
+ lib/gl/m4/gnulib-common.m4, maint.mk, src/gl/Makefile.am,
+ src/gl/errno.in.h, src/gl/m4/errno_h.m4,
+ src/gl/m4/gnulib-common.m4, src/gl/m4/gnulib-comp.m4,
+ src/gl/m4/off_t.m4, src/gl/m4/strerror.m4,
+ src/gl/m4/sys_types_h.m4, src/gl/m4/unistd_h.m4,
+ src/gl/strerror-override.c, src/gl/strerror-override.h,
+ src/gl/sys_types.in.h, src/gl/unistd.in.h: Update gnulib files.
+
+2012-05-14 Simon Josefsson <address@hidden>
+
+ * tests/saslname.c: Fix make check when Kerberos V5 is disabled.
+
+2012-05-14 Simon Josefsson <address@hidden>
+
+ * configure.ac: Add -Wno-array-bounds for meta.c false positive.
+
+2012-04-12 Simon Josefsson <address@hidden>
+
+ * NEWS, configure.ac: Bump versions.
+
+2012-04-03 Simon Josefsson <address@hidden>
+
+ * po/vi.po.in: Sync with TP.
+
+2012-04-03 Simon Josefsson <address@hidden>
+
+ * cfg.mk: Force copyright updates.
+
+2012-04-03 Simon Josefsson <address@hidden>
+
+ * GNUmakefile, build-aux/gnupload, gl/m4/warnings.m4,
+ lib/gl/gettext.h, lib/gl/m4/warn-on-use.m4, lib/gl/stddef.in.h,
+ lib/gl/string.in.h, lib/gl/strverscmp.c, maint.mk,
+ src/gl/errno.in.h, src/gl/gettext.h, src/gl/m4/warn-on-use.m4,
+ src/gl/msvc-inval.c, src/gl/msvc-inval.h, src/gl/msvc-nothrow.c,
+ src/gl/msvc-nothrow.h, src/gl/stdarg.in.h, src/gl/stddef.in.h,
+ src/gl/string.in.h, src/gl/unistd.in.h: Update gnulib files.
+
+2012-02-08 Simon Josefsson <address@hidden>
+
+ * cfg.mk: Fix ignore rule.
+
+2012-02-08 Simon Josefsson <address@hidden>
+
+ * doc/Makefile.am, doc/gpl-3.0.texi, doc/gss.texi, gl/Makefile.am,
+ gl/m4/gnulib-cache.m4, gl/m4/gnulib-comp.m4: Drop GPL copy from
+ manual.
+
+2012-02-08 Simon Josefsson <address@hidden>
+
+ * .clcopying, AUTHORS, ChangeLog, Makefile.am, NEWS, README,
+ README-alpha, THANKS, cfg.mk, configure.ac, doc/Makefile.am,
+ doc/Makefile.gdoci, doc/cyclo/Makefile.am, doc/gdoc, doc/gss.texi,
+ gss.pc.in, lib/Makefile.am, lib/asn1.c, lib/context.c, lib/cred.c,
+ lib/error.c, lib/ext.c, lib/headers/gss.h.in,
+ lib/headers/gss/api.h, lib/headers/gss/ext.h,
+ lib/headers/gss/krb5-ext.h, lib/headers/gss/krb5.h, lib/internal.h,
+ lib/krb5/Makefile.am, lib/krb5/checksum.c, lib/krb5/checksum.h,
+ lib/krb5/context.c, lib/krb5/cred.c, lib/krb5/error.c,
+ lib/krb5/k5internal.h, lib/krb5/msg.c, lib/krb5/name.c,
+ lib/krb5/oid.c, lib/krb5/protos.h, lib/krb5/utils.c,
+ lib/libgss.map, lib/meta.c, lib/meta.h, lib/misc.c, lib/msg.c,
+ lib/name.c, lib/obsolete.c, lib/oid.c, lib/saslname.c,
+ lib/version.c, src/Makefile.am, src/gss.c, src/gss.ggo,
+ tests/Makefile.am, tests/basic.c, tests/krb5context.c,
+ tests/saslname.c, tests/threadsafety: Update copyright years.
+
+2012-02-08 Simon Josefsson <address@hidden>
+
+ * GNUmakefile, build-aux/config.rpath, build-aux/gnupload,
+ build-aux/pmccabe.css, build-aux/pmccabe2html,
+ build-aux/snippet/arg-nonnull.h, build-aux/snippet/c++defs.h,
+ build-aux/snippet/warn-on-use.h, build-aux/update-copyright,
+ build-aux/useless-if-before-free, build-aux/vc-list-files,
+ doc/fdl-1.3.texi, doc/gendocs_template, gl/Makefile.am, gl/dummy.c,
+ gl/m4/00gnulib.m4, gl/m4/autobuild.m4, gl/m4/gnulib-cache.m4,
+ gl/m4/gnulib-common.m4, gl/m4/gnulib-comp.m4, gl/m4/gnulib-tool.m4,
+ gl/m4/ld-version-script.m4, gl/m4/lib-ld.m4, gl/m4/lib-link.m4,
+ gl/m4/lib-prefix.m4, gl/m4/manywarnings.m4,
+ gl/m4/valgrind-tests.m4, gl/m4/warnings.m4, lib/gl/Makefile.am,
+ lib/gl/dummy.c, lib/gl/gettext.h, lib/gl/m4/00gnulib.m4,
+ lib/gl/m4/extensions.m4, lib/gl/m4/gnulib-cache.m4,
+ lib/gl/m4/gnulib-common.m4, lib/gl/m4/gnulib-comp.m4,
+ lib/gl/m4/gnulib-tool.m4, lib/gl/m4/include_next.m4,
+ lib/gl/m4/ld-output-def.m4, lib/gl/m4/stddef_h.m4,
+ lib/gl/m4/string_h.m4, lib/gl/m4/strverscmp.m4,
+ lib/gl/m4/warn-on-use.m4, lib/gl/m4/wchar_t.m4, lib/gl/stddef.in.h,
+ lib/gl/string.in.h, lib/gl/strverscmp.c, maint.mk,
+ src/gl/Makefile.am, src/gl/errno.in.h, src/gl/error.c,
+ src/gl/error.h, src/gl/getopt.c, src/gl/getopt.in.h,
+ src/gl/getopt1.c, src/gl/getopt_int.h, src/gl/gettext.h,
+ src/gl/intprops.h, src/gl/m4/00gnulib.m4, src/gl/m4/errno_h.m4,
+ src/gl/m4/error.m4, src/gl/m4/extensions.m4, src/gl/m4/getopt.m4,
+ src/gl/m4/gnulib-cache.m4, src/gl/m4/gnulib-common.m4,
+ src/gl/m4/gnulib-comp.m4, src/gl/m4/gnulib-tool.m4,
+ src/gl/m4/include_next.m4, src/gl/m4/msvc-inval.m4,
+ src/gl/m4/msvc-nothrow.m4, src/gl/m4/nocrash.m4,
+ src/gl/m4/ssize_t.m4, src/gl/m4/stdarg.m4, src/gl/m4/stddef_h.m4,
+ src/gl/m4/strerror.m4, src/gl/m4/string_h.m4,
+ src/gl/m4/sys_socket_h.m4, src/gl/m4/unistd_h.m4,
+ src/gl/m4/version-etc.m4, src/gl/m4/warn-on-use.m4,
+ src/gl/m4/wchar_t.m4, src/gl/msvc-inval.c, src/gl/msvc-inval.h,
+ src/gl/msvc-nothrow.c, src/gl/msvc-nothrow.h, src/gl/progname.c,
+ src/gl/progname.h, src/gl/stdarg.in.h, src/gl/stddef.in.h,
+ src/gl/strerror-override.c, src/gl/strerror-override.h,
+ src/gl/strerror.c, src/gl/string.in.h, src/gl/unistd.in.h,
+ src/gl/verify.h, src/gl/version-etc.c, src/gl/version-etc.h: Update
+ gnulib files.
+
+2012-02-08 Simon Josefsson <address@hidden>
+
+ * po/LINGUAS, po/sr.po.in: Sync with TP.
+
+2011-11-25 Simon Josefsson <address@hidden>
+
+ * doc/announce.txt: Update for 1.0.2.
+
+2011-11-25 Simon Josefsson <address@hidden>
+
+ * .gitignore: Ignore more.
+
+2011-11-25 Simon Josefsson <address@hidden>
+
+ * ChangeLog: Generated.
+
2011-11-25 Simon Josefsson <address@hidden>
* NEWS: Version 1.0.2.
@@ -6787,7 +7112,7 @@
-----
- Copyright (C) 2003-2013 Simon Josefsson
+ Copyright (C) 2003-2014 Simon Josefsson
Copying and distribution of this file, with or without
modification, are permitted provided the copyright notice
diff --git a/GNUmakefile b/GNUmakefile
index 58f2ead..4ab6429 100644
--- a/GNUmakefile
+++ b/GNUmakefile
@@ -5,7 +5,7 @@
# It is necessary if you want to build targets usually of interest
# only to the maintainer.
-# Copyright (C) 2001, 2003, 2006-2012 Free Software Foundation, Inc.
+# Copyright (C) 2001, 2003, 2006-2014 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
diff --git a/Makefile.am b/Makefile.am
index 64d2b45..1149e2a 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,5 +1,5 @@
## Process this file with automake to produce Makefile.in
-# Copyright (C) 2003-2013 Simon Josefsson
+# Copyright (C) 2003-2014 Simon Josefsson
#
# This file is part of the Generic Security Service (GSS).
#
diff --git a/NEWS b/NEWS
index 8fb39fb..9ae159c 100644
--- a/NEWS
+++ b/NEWS
@@ -1,8 +1,8 @@
GSS NEWS -- History of user-visible changes. -*- outline -*-
-Copyright (C) 2003-2013 Simon Josefsson
+Copyright (C) 2003-2014 Simon Josefsson
See the end for copying conditions.
-* Version 1.0.3 (unreleased)
+* Version 1.0.3 (released 2014-10-09)
** gss: The command line tool can now initialize and accept security contexts.
This is useful for debugging. See the section "Invoking gss" in the
diff --git a/README b/README
index 18e0e1f..66d0d48 100644
--- a/README
+++ b/README
@@ -1,5 +1,5 @@
GSS README -- Important introductory notes.
-Copyright (C) 2003-2013 Simon Josefsson
+Copyright (C) 2003-2014 Simon Josefsson
See the end for copying conditions.
This directory holds the Generic Security Service Library (GSSLib).
diff --git a/README-alpha b/README-alpha
index 71fb422..a361d4c 100644
--- a/README-alpha
+++ b/README-alpha
@@ -1,5 +1,5 @@
GSS README-alpha -- Information for developers. -*- outline -*-
-Copyright (C) 2009-2013 Simon Josefsson
+Copyright (C) 2009-2014 Simon Josefsson
See the end for copying conditions.
This file contains instructions for developers and advanced users that
diff --git a/THANKS b/THANKS
index 08c7704..9be2c54 100644
--- a/THANKS
+++ b/THANKS
@@ -1,5 +1,5 @@
GSS THANKS -- Acknowledgements.
-Copyright (C) 2003-2013 Simon Josefsson
+Copyright (C) 2003-2014 Simon Josefsson
See the end for copying conditions.
Bug reports, patches, translations, test vectors and/or suggestions
diff --git a/build-aux/config.rpath b/build-aux/config.rpath
index 1a07018..b625621 100755
--- a/build-aux/config.rpath
+++ b/build-aux/config.rpath
@@ -2,7 +2,7 @@
# Output a system dependent set of variables, describing how to set the
# run time search path of shared libraries in an executable.
#
-# Copyright 1996-2012 Free Software Foundation, Inc.
+# Copyright 1996-2014 Free Software Foundation, Inc.
# Taken from GNU libtool, 2001
# Originally by Gordon Matzigkeit <address@hidden>, 1996
#
@@ -367,11 +367,7 @@ else
dgux*)
hardcode_libdir_flag_spec='-L$libdir'
;;
- freebsd2.2*)
- hardcode_libdir_flag_spec='-R$libdir'
- hardcode_direct=yes
- ;;
- freebsd2*)
+ freebsd2.[01]*)
hardcode_direct=yes
hardcode_minus_L=yes
;;
@@ -548,13 +544,11 @@ case "$host_os" in
dgux*)
library_names_spec='$libname$shrext'
;;
+ freebsd[23].*)
+ library_names_spec='$libname$shrext$versuffix'
+ ;;
freebsd* | dragonfly*)
- case "$host_os" in
- freebsd[123]*)
- library_names_spec='$libname$shrext$versuffix' ;;
- *)
- library_names_spec='$libname$shrext' ;;
- esac
+ library_names_spec='$libname$shrext'
;;
gnu*)
library_names_spec='$libname$shrext'
diff --git a/build-aux/gendocs.sh b/build-aux/gendocs.sh
index c8abd55..b2e7b09 100755
--- a/build-aux/gendocs.sh
+++ b/build-aux/gendocs.sh
@@ -2,10 +2,10 @@
# gendocs.sh -- generate a GNU manual in many formats. This script is
# mentioned in maintain.texi. See the help message below for usage details.
-scriptversion=2011-04-08.14
+scriptversion=2014-05-01.10
-# Copyright 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free Software
-# Foundation, Inc.
+# Copyright 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 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
@@ -30,6 +30,12 @@ scriptversion=2011-04-08.14
#
# An up-to-date copy is also maintained in Gnulib (gnu.org/software/gnulib).
+# TODO:
+# - image importation was only implemented for HTML generated by
+# makeinfo. But it should be simple enough to adjust.
+# - images are not imported in the source tarball. All the needed
+# formats (PDF, PNG, etc.) should be included.
+
prog=`basename "$0"`
srcdir=`pwd`
@@ -39,38 +45,50 @@
templateurl="http://savannah.gnu.org/cgi-bin/viewcvs/~checkout~/texinfo/texinfo/
: ${SETLANG="env LANG= LC_MESSAGES= LC_ALL= LANGUAGE="}
: ${MAKEINFO="makeinfo"}
: ${TEXI2DVI="texi2dvi -t @finalout"}
-: ${DVIPS="dvips"}
: ${DOCBOOK2HTML="docbook2html"}
: ${DOCBOOK2PDF="docbook2pdf"}
-: ${DOCBOOK2PS="docbook2ps"}
: ${DOCBOOK2TXT="docbook2txt"}
: ${GENDOCS_TEMPLATE_DIR="."}
+: ${PERL='perl'}
: ${TEXI2HTML="texi2html"}
unset CDPATH
unset use_texi2html
version="gendocs.sh $scriptversion
-Copyright 2010 Free Software Foundation, Inc.
+Copyright 2013 Free Software Foundation, Inc.
There is NO warranty. You may redistribute this software
under the terms of the GNU General Public License.
For more information about these matters, see the files named COPYING."
usage="Usage: $prog [OPTION]... PACKAGE MANUAL-TITLE
-Generate various output formats from PACKAGE.texinfo (or .texi or .txi) source.
-See the GNU Maintainers document for a more extensive discussion:
+Generate output in various formats from PACKAGE.texinfo (or .texi or
+.txi) source. See the GNU Maintainers document for a more extensive
+discussion:
http://www.gnu.org/prep/maintain_toc.html
Options:
- -s SRCFILE read Texinfo from SRCFILE, instead of PACKAGE.{texinfo|texi|txi}
- -o OUTDIR write files into OUTDIR, instead of manual/.
- --email ADR use ADR as contact in generated web pages.
- --docbook convert to DocBook too (xml, txt, html, pdf and ps).
- --html ARG pass indicated ARG to makeinfo or texi2html for HTML targets.
- --texi2html use texi2html to generate HTML targets.
- --help display this help and exit successfully.
- --version display version information and exit successfully.
+ --email ADR use ADR as contact in generated web pages; always give this.
+
+ -s SRCFILE read Texinfo from SRCFILE, instead of PACKAGE.{texinfo|texi|txi}
+ -o OUTDIR write files into OUTDIR, instead of manual/.
+ -I DIR append DIR to the Texinfo search path.
+ --common ARG pass ARG in all invocations.
+ --html ARG pass ARG to makeinfo or texi2html for HTML targets.
+ --info ARG pass ARG to makeinfo for Info, instead of --no-split.
+ --no-ascii skip generating the plain text output.
+ --no-html skip generating the html output.
+ --no-info skip generating the info output.
+ --no-tex skip generating the dvi and pdf output.
+ --source ARG include ARG in tar archive of sources.
+ --split HOW make split HTML by node, section, chapter; default node.
+
+ --texi2html use texi2html to make HTML target, with all split versions.
+ --docbook convert through DocBook too (xml, txt, html, pdf).
+
+ --help display this help and exit successfully.
+ --version display version information and exit successfully.
Simple example: $prog --email address@hidden emacs \"GNU Emacs Manual\"
@@ -80,12 +98,12 @@ Typical sequence:
wget \"$templateurl\"
$prog --email BUGLIST MANUAL \"GNU MANUAL - One-line description\"
-Output will be in a new subdirectory \"manual\" (by default, use -o OUTDIR
-to override). Move all the new files into your web CVS tree, as
-explained in the Web Pages node of maintain.texi.
+Output will be in a new subdirectory \"manual\" (by default;
+use -o OUTDIR to override). Move all the new files into your web CVS
+tree, as explained in the Web Pages node of maintain.texi.
-Please use the --email ADDRESS option to specify your bug-reporting
-address in the generated HTML pages.
+Please use the --email ADDRESS option so your own bug-reporting
+address will be used in the generated HTML pages.
MANUAL-TITLE is included as part of the HTML <title> of the overall
manual/index.html file. It should include the name of the package being
@@ -102,11 +120,14 @@ If a manual's Texinfo sources are spread across several
directories,
first copy or symlink all Texinfo sources into a single directory.
(Part of the script's work is to make a tar.gz of the sources.)
-You can set the environment variables MAKEINFO, TEXI2DVI, TEXI2HTML, and
-DVIPS to control the programs that get executed, and
+As implied above, by default monolithic Info files are generated.
+If you want split Info, or other Info options, use --info to override.
+
+You can set the environment variables MAKEINFO, TEXI2DVI, TEXI2HTML,
+and PERL to control the programs that get executed, and
GENDOCS_TEMPLATE_DIR to control where the gendocs_template file is
looked for. With --docbook, the environment variables DOCBOOK2HTML,
-DOCBOOK2PDF, DOCBOOK2PS, and DOCBOOK2TXT are also respected.
+DOCBOOK2PDF, and DOCBOOK2TXT are also consulted.
By default, makeinfo and texi2dvi are run in the default (English)
locale, since that's the language of most Texinfo manuals. If you
@@ -116,29 +137,43 @@ SETLANG setting in the source.
Email bug reports or enhancement requests to address@hidden
"
-calcsize()
-{
- size=`ls -ksl $1 | awk '{print $1}'`
- echo $size
-}
-
MANUAL_TITLE=
PACKAGE=
address@hidden # please override with --email
+commonarg= # passed to all makeinfo/texi2html invcations.
+dirargs= # passed to all tools (-I dir).
+dirs= # -I directories.
htmlarg=
+infoarg=--no-split
+generate_ascii=true
+generate_html=true
+generate_info=true
+generate_tex=true
outdir=manual
+source_extra=
+split=node
srcfile=
while test $# -gt 0; do
case $1 in
- --email) shift; EMAIL=$1;;
- --help) echo "$usage"; exit 0;;
- --version) echo "$version"; exit 0;;
- -s) shift; srcfile=$1;;
- -o) shift; outdir=$1;;
- --docbook) docbook=yes;;
- --html) shift; htmlarg=$1;;
+ -s) shift; srcfile=$1;;
+ -o) shift; outdir=$1;;
+ -I) shift; dirargs="$dirargs -I '$1'"; dirs="$dirs $1";;
+ --common) shift; commonarg=$1;;
+ --docbook) docbook=yes;;
+ --email) shift; EMAIL=$1;;
+ --html) shift; htmlarg=$1;;
+ --info) shift; infoarg=$1;;
+ --no-ascii) generate_ascii=false;;
+ --no-html) generate_ascii=false;;
+ --no-info) generate_info=false;;
+ --no-tex) generate_tex=false;;
+ --source) shift; source_extra=$1;;
+ --split) shift; split=$1;;
--texi2html) use_texi2html=1;;
+
+ --help) echo "$usage"; exit 0;;
+ --version) echo "$version"; exit 0;;
-*)
echo "$0: Unknown option \`$1'." >&2
echo "$0: Try \`--help' for more information." >&2
@@ -156,6 +191,9 @@ while test $# -gt 0; do
shift
done
+# makeinfo uses the dirargs, but texi2dvi doesn't.
+commonarg=" $dirargs $commonarg"
+
# For most of the following, the base name is just $PACKAGE
base=$PACKAGE
@@ -183,57 +221,119 @@ if test ! -r $GENDOCS_TEMPLATE_DIR/gendocs_template; then
exit 1
fi
+# Function to return size of $1 in something resembling kilobytes.
+calcsize()
+{
+ size=`ls -ksl $1 | awk '{print $1}'`
+ echo $size
+}
+
+# copy_images OUTDIR HTML-FILE...
+# -------------------------------
+# Copy all the images needed by the HTML-FILEs into OUTDIR.
+# Look for them in . and the -I directories; this is simpler than what
+# makeinfo supports with -I, but hopefully it will suffice.
+copy_images()
+{
+ local odir
+ odir=$1
+ shift
+ $PERL -n -e "
+BEGIN {
+ \$me = '$prog';
+ \$odir = '$odir';
+ @dirs = qw(. $dirs);
+}
+" -e '
+/<img src="(.*?)"/g && ++$need{$1};
+
+END {
+ #print "$me: @{[keys %need]}\n"; # for debugging, show images found.
+ FILE: for my $f (keys %need) {
+ for my $d (@dirs) {
+ if (-f "$d/$f") {
+ use File::Basename;
+ my $dest = dirname ("$odir/$f");
+ #
+ use File::Path;
+ -d $dest || mkpath ($dest)
+ || die "$me: cannot mkdir $dest: $!\n";
+ #
+ use File::Copy;
+ copy ("$d/$f", $dest)
+ || die "$me: cannot copy $d/$f to $dest: $!\n";
+ next FILE;
+ }
+ }
+ die "$me: $ARGV: cannot find image $f\n";
+ }
+}
+' -- "$@" || exit 1
+}
+
case $outdir in
/*) abs_outdir=$outdir;;
*) abs_outdir=$srcdir/$outdir;;
esac
-echo Generating output formats for $srcfile
-
-cmd="$SETLANG $MAKEINFO -o $PACKAGE.info \"$srcfile\""
-echo "Generating info files... ($cmd)"
-eval "$cmd"
+echo "Making output for $srcfile"
+echo " in `pwd`"
mkdir -p "$outdir/"
-tar czf "$outdir/$PACKAGE.info.tar.gz" $PACKAGE.info*
-info_tgz_size=`calcsize "$outdir/$PACKAGE.info.tar.gz"`
-# do not mv the info files, there's no point in having them available
-# separately on the web.
-
-cmd="$SETLANG ${TEXI2DVI} \"$srcfile\""
-echo "Generating dvi ... ($cmd)"
-eval "$cmd"
-
-# now, before we compress dvi:
-echo Generating postscript...
-${DVIPS} $PACKAGE -o
-gzip -f -9 $PACKAGE.ps
-ps_gz_size=`calcsize $PACKAGE.ps.gz`
-mv $PACKAGE.ps.gz "$outdir/"
-
-# compress/finish dvi:
-gzip -f -9 $PACKAGE.dvi
-dvi_gz_size=`calcsize $PACKAGE.dvi.gz`
-mv $PACKAGE.dvi.gz "$outdir/"
-
-cmd="$SETLANG ${TEXI2DVI} --pdf \"$srcfile\""
-echo "Generating pdf ... ($cmd)"
-eval "$cmd"
-pdf_size=`calcsize $PACKAGE.pdf`
-mv $PACKAGE.pdf "$outdir/"
-
-cmd="$SETLANG $MAKEINFO -o $PACKAGE.txt --no-split --no-headers \"$srcfile\""
-echo "Generating ASCII... ($cmd)"
-eval "$cmd"
-ascii_size=`calcsize $PACKAGE.txt`
-gzip -f -9 -c $PACKAGE.txt >"$outdir/$PACKAGE.txt.gz"
-ascii_gz_size=`calcsize "$outdir/$PACKAGE.txt.gz"`
-mv $PACKAGE.txt "$outdir/"
+#
+if $generate_info; then
+ cmd="$SETLANG $MAKEINFO -o $PACKAGE.info $commonarg $infoarg \"$srcfile\""
+ echo "Generating info... ($cmd)"
+ rm -f $PACKAGE.info* # get rid of any strays
+ eval "$cmd"
+ tar czf "$outdir/$PACKAGE.info.tar.gz" $PACKAGE.info*
+ ls -l "$outdir/$PACKAGE.info.tar.gz"
+ info_tgz_size=`calcsize "$outdir/$PACKAGE.info.tar.gz"`
+ # do not mv the info files, there's no point in having them available
+ # separately on the web.
+fi # end info
+
+#
+if $generate_tex; then
+ cmd="$SETLANG $TEXI2DVI $dirargs \"$srcfile\""
+ printf "\nGenerating dvi... ($cmd)\n"
+ eval "$cmd"
+ # compress/finish dvi:
+ gzip -f -9 $PACKAGE.dvi
+ dvi_gz_size=`calcsize $PACKAGE.dvi.gz`
+ mv $PACKAGE.dvi.gz "$outdir/"
+ ls -l "$outdir/$PACKAGE.dvi.gz"
+
+ cmd="$SETLANG $TEXI2DVI --pdf $dirargs \"$srcfile\""
+ printf "\nGenerating pdf... ($cmd)\n"
+ eval "$cmd"
+ pdf_size=`calcsize $PACKAGE.pdf`
+ mv $PACKAGE.pdf "$outdir/"
+ ls -l "$outdir/$PACKAGE.pdf"
+fi # end tex (dvi + pdf)
+
+#
+if $generate_ascii; then
+ opt="-o $PACKAGE.txt --no-split --no-headers $commonarg"
+ cmd="$SETLANG $MAKEINFO $opt \"$srcfile\""
+ printf "\nGenerating ascii... ($cmd)\n"
+ eval "$cmd"
+ ascii_size=`calcsize $PACKAGE.txt`
+ gzip -f -9 -c $PACKAGE.txt >"$outdir/$PACKAGE.txt.gz"
+ ascii_gz_size=`calcsize "$outdir/$PACKAGE.txt.gz"`
+ mv $PACKAGE.txt "$outdir/"
+ ls -l "$outdir/$PACKAGE.txt" "$outdir/$PACKAGE.txt.gz"
+fi
+
+#
+
+if $generate_html; then
+# Split HTML at level $1. Used for texi2html.
html_split()
{
- opt="--split=$1 $htmlarg --node-files"
+ opt="--split=$1 --node-files $commonarg $htmlarg"
cmd="$SETLANG $TEXI2HTML --output $PACKAGE.html $opt \"$srcfile\""
- echo "Generating html by $1... ($cmd)"
+ printf "\nGenerating html by $1... ($cmd)\n"
eval "$cmd"
split_html_dir=$PACKAGE.html
(
@@ -249,32 +349,48 @@ html_split()
}
if test -z "$use_texi2html"; then
- opt="--no-split --html -o $PACKAGE.html $htmlarg"
+ opt="--no-split --html -o $PACKAGE.html $commonarg $htmlarg"
cmd="$SETLANG $MAKEINFO $opt \"$srcfile\""
- echo "Generating monolithic html... ($cmd)"
+ printf "\nGenerating monolithic html... ($cmd)\n"
rm -rf $PACKAGE.html # in case a directory is left over
eval "$cmd"
html_mono_size=`calcsize $PACKAGE.html`
gzip -f -9 -c $PACKAGE.html >"$outdir/$PACKAGE.html.gz"
html_mono_gz_size=`calcsize "$outdir/$PACKAGE.html.gz"`
+ copy_images "$outdir/" $PACKAGE.html
mv $PACKAGE.html "$outdir/"
-
- cmd="$SETLANG $MAKEINFO --html -o $PACKAGE.html $htmlarg \"$srcfile\""
- echo "Generating html by node... ($cmd)"
+ ls -l "$outdir/$PACKAGE.html" "$outdir/$PACKAGE.html.gz"
+
+ # Before Texinfo 5.0, makeinfo did not accept a --split=HOW option,
+ # it just always split by node. So if we're splitting by node anyway,
+ # leave it out.
+ if test "x$split" = xnode; then
+ split_arg=
+ else
+ split_arg=--split=$split
+ fi
+ #
+ opt="--html -o $PACKAGE.html $split_arg $commonarg $htmlarg"
+ cmd="$SETLANG $MAKEINFO $opt \"$srcfile\""
+ printf "\nGenerating html by $split... ($cmd)\n"
eval "$cmd"
split_html_dir=$PACKAGE.html
+ copy_images $split_html_dir/ $split_html_dir/*.html
(
- cd ${split_html_dir} || exit 1
- tar -czf "$abs_outdir/${PACKAGE}.html_node.tar.gz" -- *.html
+ cd $split_html_dir || exit 1
+ tar -czf "$abs_outdir/$PACKAGE.html_$split.tar.gz" -- *
)
- html_node_tgz_size=`calcsize "$outdir/${PACKAGE}.html_node.tar.gz"`
- rm -f "$outdir"/html_node/*.html
- mkdir -p "$outdir/html_node/"
- mv ${split_html_dir}/*.html "$outdir/html_node/"
- rmdir ${split_html_dir}
-else
- cmd="$SETLANG $TEXI2HTML --output $PACKAGE.html $htmlarg \"$srcfile\""
- echo "Generating monolithic html... ($cmd)"
+ eval \
+ html_${split}_tgz_size=`calcsize "$outdir/$PACKAGE.html_$split.tar.gz"`
+ rm -rf "$outdir/html_$split/"
+ mv $split_html_dir "$outdir/html_$split/"
+ du -s "$outdir/html_$split/"
+ ls -l "$outdir/$PACKAGE.html_$split.tar.gz"
+
+else # use texi2html:
+ opt="--output $PACKAGE.html $commonarg $htmlarg"
+ cmd="$SETLANG $TEXI2HTML $opt \"$srcfile\""
+ printf "\nGenerating monolithic html with texi2html... ($cmd)\n"
rm -rf $PACKAGE.html # in case a directory is left over
eval "$cmd"
html_mono_size=`calcsize $PACKAGE.html`
@@ -286,19 +402,25 @@ else
html_split chapter
html_split section
fi
+fi # end html
-echo Making .tar.gz for sources...
+#
+printf "\nMaking .tar.gz for sources...\n"
d=`dirname $srcfile`
(
cd "$d"
- srcfiles=`ls *.texinfo *.texi *.txi *.eps 2>/dev/null` || true
- tar cvzfh "$abs_outdir/$PACKAGE.texi.tar.gz" $srcfiles
+ srcfiles=`ls -d *.texinfo *.texi *.txi *.eps $source_extra 2>/dev/null` ||
true
+ tar czfh "$abs_outdir/$PACKAGE.texi.tar.gz" $srcfiles
+ ls -l "$abs_outdir/$PACKAGE.texi.tar.gz"
)
texi_tgz_size=`calcsize "$outdir/$PACKAGE.texi.tar.gz"`
+#
+# Do everything again through docbook.
if test -n "$docbook"; then
- cmd="$SETLANG $MAKEINFO -o - --docbook \"$srcfile\" >
${srcdir}/$PACKAGE-db.xml"
- echo "Generating docbook XML... ($cmd)"
+ opt="-o - --docbook $commonarg"
+ cmd="$SETLANG $MAKEINFO $opt \"$srcfile\" >${srcdir}/$PACKAGE-db.xml"
+ printf "\nGenerating docbook XML... ($cmd)\n"
eval "$cmd"
docbook_xml_size=`calcsize $PACKAGE-db.xml`
gzip -f -9 -c $PACKAGE-db.xml >"$outdir/$PACKAGE-db.xml.gz"
@@ -306,8 +428,9 @@ if test -n "$docbook"; then
mv $PACKAGE-db.xml "$outdir/"
split_html_db_dir=html_node_db
- cmd="${DOCBOOK2HTML} -o $split_html_db_dir \"${outdir}/$PACKAGE-db.xml\""
- echo "Generating docbook HTML... ($cmd)"
+ opt="$commonarg -o $split_html_db_dir"
+ cmd="$DOCBOOK2HTML $opt \"${outdir}/$PACKAGE-db.xml\""
+ printf "\nGenerating docbook HTML... ($cmd)\n"
eval "$cmd"
(
cd ${split_html_db_dir} || exit 1
@@ -319,33 +442,29 @@ if test -n "$docbook"; then
mv ${split_html_db_dir}/*.html "$outdir/html_node_db/"
rmdir ${split_html_db_dir}
- cmd="${DOCBOOK2TXT} \"${outdir}/$PACKAGE-db.xml\""
- echo "Generating docbook ASCII... ($cmd)"
+ cmd="$DOCBOOK2TXT \"${outdir}/$PACKAGE-db.xml\""
+ printf "\nGenerating docbook ASCII... ($cmd)\n"
eval "$cmd"
docbook_ascii_size=`calcsize $PACKAGE-db.txt`
mv $PACKAGE-db.txt "$outdir/"
- cmd="${DOCBOOK2PS} \"${outdir}/$PACKAGE-db.xml\""
- echo "Generating docbook PS... ($cmd)"
- eval "$cmd"
- gzip -f -9 -c $PACKAGE-db.ps >"$outdir/$PACKAGE-db.ps.gz"
- docbook_ps_gz_size=`calcsize "$outdir/$PACKAGE-db.ps.gz"`
- mv $PACKAGE-db.ps "$outdir/"
-
- cmd="${DOCBOOK2PDF} \"${outdir}/$PACKAGE-db.xml\""
- echo "Generating docbook PDF... ($cmd)"
+ cmd="$DOCBOOK2PDF \"${outdir}/$PACKAGE-db.xml\""
+ printf "\nGenerating docbook PDF... ($cmd)\n"
eval "$cmd"
docbook_pdf_size=`calcsize $PACKAGE-db.pdf`
mv $PACKAGE-db.pdf "$outdir/"
fi
-echo "Writing index file..."
+#
+printf "\nMaking index.html for $PACKAGE...\n"
if test -z "$use_texi2html"; then
- CONDS="/%%IF *HTML_SECTION%%/,/%%ENDIF *HTML_SECTION%%/d;\
- /%%IF *HTML_CHAPTER%%/,/%%ENDIF *HTML_CHAPTER%%/d"
+ CONDS="/%%IF *HTML_SECTION%%/,/%%ENDIF *HTML_SECTION%%/d;\
+ /%%IF *HTML_CHAPTER%%/,/%%ENDIF *HTML_CHAPTER%%/d"
else
- CONDS="/%%ENDIF.*%%/d;/%%IF *HTML_SECTION%%/d;/%%IF *HTML_CHAPTER%%/d"
+ # should take account of --split here.
+ CONDS="/%%ENDIF.*%%/d;/%%IF *HTML_SECTION%%/d;/%%IF *HTML_CHAPTER%%/d"
fi
+
curdate=`$SETLANG date '+%B %d, %Y'`
sed \
-e "s!%%TITLE%%!$MANUAL_TITLE!g" \
@@ -360,13 +479,11 @@ sed \
-e "s!%%INFO_TGZ_SIZE%%!$info_tgz_size!g" \
-e "s!%%DVI_GZ_SIZE%%!$dvi_gz_size!g" \
-e "s!%%PDF_SIZE%%!$pdf_size!g" \
- -e "s!%%PS_GZ_SIZE%%!$ps_gz_size!g" \
-e "s!%%ASCII_SIZE%%!$ascii_size!g" \
-e "s!%%ASCII_GZ_SIZE%%!$ascii_gz_size!g" \
-e "s!%%TEXI_TGZ_SIZE%%!$texi_tgz_size!g" \
-e "s!%%DOCBOOK_HTML_NODE_TGZ_SIZE%%!$html_node_db_tgz_size!g" \
-e "s!%%DOCBOOK_ASCII_SIZE%%!$docbook_ascii_size!g" \
- -e "s!%%DOCBOOK_PS_GZ_SIZE%%!$docbook_ps_gz_size!g" \
-e "s!%%DOCBOOK_PDF_SIZE%%!$docbook_pdf_size!g" \
-e "s!%%DOCBOOK_XML_SIZE%%!$docbook_xml_size!g" \
-e "s!%%DOCBOOK_XML_GZ_SIZE%%!$docbook_xml_gz_size!g" \
diff --git a/build-aux/gnupload b/build-aux/gnupload
index a0e5c7b..2da97d8 100755
--- a/build-aux/gnupload
+++ b/build-aux/gnupload
@@ -1,9 +1,9 @@
#!/bin/sh
# Sign files and upload them.
-scriptversion=2012-06-11.00; # UTC
+scriptversion=2013-03-19.17; # UTC
-# Copyright (C) 2004-2012 Free Software Foundation, Inc.
+# Copyright (C) 2004-2014 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
@@ -39,9 +39,8 @@ nl='
usage="Usage: $0 [OPTION]... [CMD] FILE... [[CMD] FILE...]
-Sign all FILES, and process them at selected destinations according to CMD.
-<http://www.gnu.org/prep/maintain/html_node/Automated-FTP-Uploads.html>
-explains further.
+Sign all FILES, and process them at the destinations specified with --to.
+If CMD is not given, it defaults to uploading. See examples below.
Commands:
--delete delete FILES from destination
@@ -50,8 +49,7 @@ Commands:
-- treat the remaining arguments as files to upload
Options:
- --help print this help text and exit
- --to DEST specify one destination for FILES
+ --to DEST specify a destination DEST for FILES
(multiple --to options are allowed)
--user NAME sign with key NAME
--replace allow replacements of existing files
@@ -59,10 +57,10 @@ Options:
--dry-run do nothing, show what would have been done
(including the constructed directive file)
--version output version information and exit
+ --help print this help text and exit
If --symlink-regex is given without EXPR, then the link target name
is created by replacing the version information with '-latest', e.g.:
-
foo-1.3.4.tar.gz -> foo-latest.tar.gz
Recognized destinations are:
@@ -80,6 +78,9 @@ in the current working directory, its contents are prepended
to the
actual command line options. Use this to keep your defaults. Comments
(#) and empty lines in $conffile are allowed.
+<http://www.gnu.org/prep/maintain/html_node/Automated-FTP-Uploads.html>
+gives some further background.
+
Examples:
1. Upload foobar-1.0.tar.gz to ftp.gnu.org:
gnupload --to ftp.gnu.org:foobar foobar-1.0.tar.gz
@@ -104,7 +105,7 @@ Examples:
--delete oopsbar-0.9.91.tar.gz \\
-- foobar-0.9.91.tar.gz
-gnupload uses the ncftpput program to do the transfers; if you don't
+gnupload executes a program ncftpput to do the transfers; if you don't
happen to have an ncftp package installed, the ncftpput-ftp script in
the build-aux/ directory of the gnulib package
(http://savannah.gnu.org/projects/gnulib) may serve as a replacement.
@@ -132,6 +133,12 @@ while test -n "$1"; do
if test -z "$2"; then
echo "$0: Missing argument for --to" 1>&2
exit 1
+ elif echo "$2" | grep 'ftp-upload\.gnu\.org' >/dev/null; then
+ echo "$0: Use ftp.gnu.org:PKGNAME or alpha.gnu.org:PKGNAME" >&2
+ echo "$0: for the destination, not ftp-upload.gnu.org (which" >&2
+ echo "$0: is used for direct ftp uploads, not with gnupload)." >&2
+ echo "$0: See --help and its examples if need be." >&2
+ exit 1
else
to="$to $2"
shift
@@ -242,6 +249,8 @@ fi
# Make sure passphrase is not exported in the environment.
unset passphrase
+unset passphrase_fd_0
+GNUPGHOME=${GNUPGHOME:-$HOME/.gnupg}
# Reset PATH to be sure that echo is a built-in. We will later use
# 'echo $passphrase' to output the passphrase, so it is important that
@@ -249,12 +258,13 @@ unset passphrase
# listings with their arguments...).
# Remember this script runs with 'set -e', so if echo is not built-in
# it will exit now.
-if $dry_run; then :; else
+if $dry_run || grep -q "^use-agent" $GNUPGHOME/gpg.conf; then :; else
PATH=/empty echo -n "Enter GPG passphrase: "
stty -echo
read -r passphrase
stty echo
echo
+ passphrase_fd_0="--passphrase-fd 0"
fi
if test $# -ne 0; then
@@ -262,7 +272,7 @@ if test $# -ne 0; then
do
echo "Signing $file ..."
rm -f $file.sig
- echo "$passphrase" | $dbg $GPG --passphrase-fd 0 -ba -o $file.sig $file
+ echo "$passphrase" | $dbg $GPG $passphrase_fd_0 -ba -o $file.sig $file
done
fi
@@ -320,12 +330,12 @@ upload ()
case $dest in
alpha.gnu.org:*)
mkdirective "$destdir" "$base" "$file" "$stmt"
- echo "$passphrase" | $dbg $GPG --passphrase-fd 0 --clearsign
$base.directive
+ echo "$passphrase" | $dbg $GPG $passphrase_fd_0 --clearsign
$base.directive
$dbg ncftpput ftp-upload.gnu.org /incoming/alpha $files
$base.directive.asc
;;
ftp.gnu.org:*)
mkdirective "$destdir" "$base" "$file" "$stmt"
- echo "$passphrase" | $dbg $GPG --passphrase-fd 0 --clearsign
$base.directive
+ echo "$passphrase" | $dbg $GPG $passphrase_fd_0 --clearsign
$base.directive
$dbg ncftpput ftp-upload.gnu.org /incoming/ftp $files $base.directive.asc
;;
savannah.gnu.org:*)
@@ -344,7 +354,7 @@ upload ()
destdir_p1=`echo "$destdir" | sed 's,^[^/]*/,,'`
destdir_topdir=`echo "$destdir" | sed 's,/.*,,'`
mkdirective "$destdir_p1" "$base" "$file" "$stmt"
- echo "$passphrase" | $dbg $GPG --passphrase-fd 0 --clearsign
$base.directive
+ echo "$passphrase" | $dbg $GPG $passphrase_fd_0 --clearsign
$base.directive
for f in $files $base.directive.asc
do
echo put $f
@@ -353,7 +363,7 @@ upload ()
/*)
dest_host=`echo "$dest" | sed 's,:.*,,'`
mkdirective "$destdir" "$base" "$file" "$stmt"
- echo "$passphrase" | $dbg $GPG --passphrase-fd 0 --clearsign
$base.directive
+ echo "$passphrase" | $dbg $GPG $passphrase_fd_0 --clearsign
$base.directive
$dbg cp $files $base.directive.asc $dest_host
;;
*)
diff --git a/build-aux/pmccabe2html b/build-aux/pmccabe2html
index 7cf8df7..81dd932 100644
--- a/build-aux/pmccabe2html
+++ b/build-aux/pmccabe2html
@@ -1,6 +1,6 @@
# pmccabe2html - AWK script to convert pmccabe output to html -*- awk -*-
-# Copyright (C) 2007-2012 Free Software Foundation, Inc.
+# Copyright (C) 2007-2014 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
@@ -47,6 +47,10 @@
# Prologue & configuration
BEGIN {
+ # Portable lookup of present time.
+ "date +%s" | getline epoch_time
+ "date" | getline chronos_time
+
section_global_stats_p = 1
section_function_cyclo_p = 1
@@ -69,7 +73,7 @@ BEGIN {
Copyright (c) 2007, 2008 Free Software Foundation, Inc."
html_doctype = "<!DOCTYPE html PUBLIC \"-//W3C//DTD HTML 4.01
Transitional//EN\" \
\"http://www.w3.org/TR/html401/loose.dtd\";>"
- html_comment = "<!-- Generated by gnulib's pmccabe2html at " systime() "
-->"
+ html_comment = "<!-- Generated by gnulib's pmccabe2html at " epoch_time "
-->"
html_title = "Cyclomatic Complexity report for " package_name
# Wiki options
@@ -211,7 +215,7 @@ function html_header ()
print cssline
}
print "-->"
- print "</style />"
+ print "</style>"
close(css)
}
print "</head>"
@@ -418,9 +422,9 @@ function html_fnc (nfun,
while ((getline codeline < (fname nfun "_fn.txt")) > 0)
{
- sub(/\\</, "<", codeline)
- sub(/\\>/, ">", codeline)
- sub(/&/, "&", codeline)
+ gsub(/&/, "\&", codeline) # Must come first.
+ gsub(/</, "\<", codeline)
+ gsub(/>/, "\>", codeline)
print codeline
}
@@ -852,12 +856,12 @@ END {
if (output_lang == "html")
{
print "<div class=\"page_title\">" package_name " Cyclomatic
Complexity Report</div>"
- print "<p>Report generated at: <span class=\"report_timestamp\">"
strftime() "</div></p>"
+ print "<p>Report generated at: <span class=\"report_timestamp\">"
chronos_time "</span></p>"
}
if (output_lang == "wiki")
{
print "==" package_name " Cyclomatic Complexity Report=="
- print "Report generated at: '''" strftime() "'''"
+ print "Report generated at: '''" chronos_time "'''"
}
if (section_global_stats_p)
diff --git a/build-aux/snippet/arg-nonnull.h b/build-aux/snippet/arg-nonnull.h
index 3a9dd26..9ee8b15 100644
--- a/build-aux/snippet/arg-nonnull.h
+++ b/build-aux/snippet/arg-nonnull.h
@@ -1,5 +1,5 @@
/* A C macro for declaring that specific arguments must not be NULL.
- Copyright (C) 2009-2012 Free Software Foundation, Inc.
+ Copyright (C) 2009-2014 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
diff --git a/build-aux/snippet/c++defs.h b/build-aux/snippet/c++defs.h
index 96da94b..67b1233 100644
--- a/build-aux/snippet/c++defs.h
+++ b/build-aux/snippet/c++defs.h
@@ -1,5 +1,5 @@
/* C++ compatible function declaration macros.
- Copyright (C) 2010-2012 Free Software Foundation, Inc.
+ Copyright (C) 2010-2014 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
diff --git a/build-aux/snippet/warn-on-use.h b/build-aux/snippet/warn-on-use.h
index d4cb94f..1c4d7bd 100644
--- a/build-aux/snippet/warn-on-use.h
+++ b/build-aux/snippet/warn-on-use.h
@@ -1,5 +1,5 @@
/* A C macro for emitting warnings if a function is used.
- Copyright (C) 2010-2012 Free Software Foundation, Inc.
+ Copyright (C) 2010-2014 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
@@ -55,7 +55,7 @@
rather than issue the nice warning, but the end result of informing
the developer about their portability problem is still achieved):
#if HAVE_RAW_DECL_ENVIRON
- static inline char ***rpl_environ (void) { return &environ; }
+ static char ***rpl_environ (void) { return &environ; }
_GL_WARN_ON_USE (rpl_environ, "environ is not always properly declared");
# undef environ
# define environ (*rpl_environ ())
diff --git a/build-aux/update-copyright b/build-aux/update-copyright
index 082b749..90624e9 100755
--- a/build-aux/update-copyright
+++ b/build-aux/update-copyright
@@ -3,9 +3,9 @@ eval '(exit $?0)' && eval 'exec perl -wS -0777 -pi "$0"
${1+"$@"}'
if 0;
# Update an FSF copyright year list to include the current year.
-my $VERSION = '2012-02-05.21:39'; # UTC
+my $VERSION = '2013-01-03.09:41'; # UTC
-# Copyright (C) 2009-2012 Free Software Foundation, Inc.
+# Copyright (C) 2009-2014 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
@@ -192,7 +192,7 @@ if (defined $stmt_re)
if ($final_year != $this_year)
{
# Update the year.
- $stmt =~ s/$final_year_orig/$final_year, $this_year/;
+ $stmt =~ s/\b$final_year_orig\b/$final_year, $this_year/;
}
if ($final_year != $this_year || $ENV{'UPDATE_COPYRIGHT_FORCE'})
{
diff --git a/build-aux/useless-if-before-free b/build-aux/useless-if-before-free
index 2b64630..4c76c75 100755
--- a/build-aux/useless-if-before-free
+++ b/build-aux/useless-if-before-free
@@ -10,7 +10,7 @@ my $VERSION = '2012-01-06 07:23'; # UTC
# If you change this file with Emacs, please let the write hook
# do its job. Otherwise, update this string manually.
-# Copyright (C) 2008-2012 Free Software Foundation, Inc.
+# Copyright (C) 2008-2014 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
diff --git a/build-aux/vc-list-files b/build-aux/vc-list-files
index d477da8..b2bca54 100755
--- a/build-aux/vc-list-files
+++ b/build-aux/vc-list-files
@@ -4,7 +4,7 @@
# Print a version string.
scriptversion=2011-05-16.22; # UTC
-# Copyright (C) 2006-2012 Free Software Foundation, Inc.
+# Copyright (C) 2006-2014 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
diff --git a/cfg.mk b/cfg.mk
index 4599f9b..701c39d 100644
--- a/cfg.mk
+++ b/cfg.mk
@@ -1,4 +1,4 @@
-# Copyright (C) 2006-2013 Simon Josefsson
+# Copyright (C) 2006-2014 Simon Josefsson
#
# This file is part of the Generic Security Service (GSS).
#
@@ -30,6 +30,9 @@ endif
local-checks-to-skip = sc_copyright_check sc_immutable_NEWS \
sc_makefile_at_at_check sc_prohibit_strcmp sc_require_config_h \
sc_require_config_h_first
+
+exclude_file_name_regexp--sc_unmarked_diagnostics = ^src/gss.c
+
VC_LIST_ALWAYS_EXCLUDE_REGEX =
^maint.mk|GNUmakefile|gtk-doc.make|po/.*.po.in|doc/fdl-1.3.texi|doc/gendocs_template|m4/pkg.m4|build-aux/|((lib/|src/)?gl)/.*$$
update-copyright-env = UPDATE_COPYRIGHT_HOLDER="Simon Josefsson"
UPDATE_COPYRIGHT_USE_INTERVALS=2 UPDATE_COPYRIGHT_FORCE=1
@@ -77,16 +80,16 @@ ChangeLog:
tag = $(PACKAGE)-`echo $(VERSION) | sed 's/\./-/g'`
htmldir = ../www-$(PACKAGE)
-release: prepare upload web upload-web
+release: prepare upload2 web upload-web
prepare:
! git tag -l $(tag) | grep $(PACKAGE) > /dev/null
rm -f ChangeLog
$(MAKE) ChangeLog distcheck
git commit -m Generated. ChangeLog
- git tag -u b565716f! -m $(VERSION) $(tag)
+ git tag -s -m $(VERSION) $(tag)
-upload:
+upload2:
git push
git push --tags
build-aux/gnupload --to ftp.gnu.org:gss $(distdir).tar.gz
@@ -95,7 +98,7 @@ upload:
web:
cd doc && ../build-aux/gendocs.sh --html "--css-include=texinfo.css" \
-o ../$(htmldir)/manual/ $(PACKAGE) "$(PACKAGE_NAME)"
- cp -v doc/reference/$(PACKAGE).pdf doc/reference/html/*.html
doc/reference/html/*.png doc/reference/html/*.devhelp doc/reference/html/*.css
$(htmldir)/reference/
+ cp -v doc/reference/$(PACKAGE).pdf doc/reference/html/*.html
doc/reference/html/*.png doc/reference/html/*.devhelp2 doc/reference/html/*.css
$(htmldir)/reference/
cp -v doc/cyclo/cyclo-$(PACKAGE).html $(htmldir)/cyclo/
upload-web:
diff --git a/configure.ac b/configure.ac
index e6fad8b..7397eca 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,6 +1,6 @@
dnl Process this file with autoconf to produce a configure script.
-# Copyright (C) 2003-2013 Simon Josefsson
+# Copyright (C) 2003-2014 Simon Josefsson
#
# This file is part of the Generic Security Service (GSS).
#
@@ -24,7 +24,7 @@ AC_INIT([GNU Generic Security Service], [1.0.3],
address@hidden, [gss])
AC_CONFIG_AUX_DIR([build-aux])
AC_CONFIG_MACRO_DIR([m4])
AC_CONFIG_HEADERS(config.h)
-AM_INIT_AUTOMAKE([1.10 -Wall -Werror -Wno-override])
+AM_INIT_AUTOMAKE([1.10 -Wall -Wno-override])
AM_SILENT_RULES([yes])
# Library code modified: REVISION++
@@ -40,8 +40,8 @@ AC_PROG_CC
gl_EARLY
libgl_EARLY
srcgl_EARLY
-AC_LIBTOOL_WIN32_DLL
-AC_PROG_LIBTOOL
+AM_PROG_AR
+LT_INIT([win32-dll])
AM_MISSING_PROG(PERL, perl, $missing_dir)
AM_MISSING_PROG(HELP2MAN, help2man, $missing_dir)
@@ -51,7 +51,7 @@ AC_SUBST(DLL_VERSION)
# Internationalization.
AM_GNU_GETTEXT([external])
-AM_GNU_GETTEXT_VERSION([0.18.1])
+AM_GNU_GETTEXT_VERSION([0.19.2])
# For gnulib stuff.
gl_INIT
diff --git a/doc/Makefile.am b/doc/Makefile.am
index 84c0677..9d60b66 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -1,5 +1,5 @@
## Process this file with automake to produce Makefile.in
-# Copyright (C) 2003-2013 Simon Josefsson
+# Copyright (C) 2003-2014 Simon Josefsson
#
# This file is part of the Generic Security Service (GSS).
#
diff --git a/doc/Makefile.gdoci b/doc/Makefile.gdoci
index 366e1e8..5f9add6 100644
--- a/doc/Makefile.gdoci
+++ b/doc/Makefile.gdoci
@@ -1,5 +1,5 @@
# -*- makefile -*-
-# Copyright (C) 2002-2013 Simon Josefsson
+# Copyright (C) 2002-2014 Simon Josefsson
#
# This file is part of the Generic Security Service (GSS).
#
diff --git a/doc/cyclo/Makefile.am b/doc/cyclo/Makefile.am
index 5b8fad3..d8b8bf1 100644
--- a/doc/cyclo/Makefile.am
+++ b/doc/cyclo/Makefile.am
@@ -1,5 +1,5 @@
## Process this file with automake to produce Makefile.in
-# Copyright (C) 2008-2013 Simon Josefsson
+# Copyright (C) 2008-2014 Simon Josefsson
#
# This file is part of the Generic Security Service (GSS).
#
diff --git a/doc/fdl-1.3.texi b/doc/fdl-1.3.texi
index cb71f05..9c3bbe5 100644
--- a/doc/fdl-1.3.texi
+++ b/doc/fdl-1.3.texi
@@ -97,7 +97,7 @@ format, SGML or XML using a publicly available
DTD, and standard-conforming simple HTML,
PostScript or PDF designed for human modification. Examples
of transparent image formats include PNG, XCF and
-JPG. Opaque formats include proprietary formats that can be
address@hidden Opaque formats include proprietary formats that can be
read and edited only by proprietary word processors, SGML or
XML for which the DTD and/or processing tools are
not generally available, and the machine-generated HTML,
diff --git a/doc/gdoc b/doc/gdoc
index 9d0e989..ee905e4 100755
--- a/doc/gdoc
+++ b/doc/gdoc
@@ -1,6 +1,6 @@
#!/usr/bin/perl
-## Copyright (c) 2002-2013 Simon Josefsson
+## Copyright (c) 2002-2014 Simon Josefsson
## added -texinfo, -listfunc, -pkg-name
## man page revamp
## various improvements
diff --git a/doc/gendocs_template b/doc/gendocs_template
index eda4df2..2ecc50a 100644
--- a/doc/gendocs_template
+++ b/doc/gendocs_template
@@ -1,5 +1,6 @@
<!--#include virtual="/server/header.html" -->
-<title>%%TITLE%% - GNU Project - Free Software Foundation (FSF)</title>
+<!-- Parent-Version: 1.77 -->
+<title>%%TITLE%% - GNU Project - Free Software Foundation</title>
<!--#include virtual="/server/banner.html" -->
<h2>%%TITLE%%</h2>
@@ -45,8 +46,6 @@
(%%ASCII_GZ_SIZE%%K bytes gzipped)</a>.</li>
<li><a href="%%PACKAGE%%.dvi.gz">TeX dvi file
(%%DVI_GZ_SIZE%%K bytes gzipped)</a>.</li>
-<li><a href="%%PACKAGE%%.ps.gz">PostScript file
- (%%PS_GZ_SIZE%%K bytes gzipped)</a>.</li>
<li><a href="%%PACKAGE%%.pdf">PDF file
(%%PDF_SIZE%%K bytes)</a>.</li>
<li><a href="%%PACKAGE%%.texi.tar.gz">Texinfo source
@@ -60,6 +59,7 @@ this helps support FSF activities.</p>
<p>(This page generated by the <a href="%%SCRIPTURL%%">%%SCRIPTNAME%%
script</a>.)</p>
+
<p>There is also an API reference manual:
<ul>
@@ -68,7 +68,6 @@ script</a>.)</p>
<li><a href="../reference/%%PACKAGE%%.devhelp">DevHelp Reference API Manual
(GTK-DOC)</a>.
</ul>
-
<!-- If needed, change the copyright block at the bottom. In general,
all pages on the GNU web server should have the section about
verbatim copying. Please do NOT remove this without talking
@@ -78,19 +77,22 @@ script</a>.)</p>
</div><!-- for id="content", starts in the include above -->
<!--#include virtual="/server/footer.html" -->
<div id="footer">
+<div class="unprintable">
<p>Please send general FSF & GNU inquiries to
<a href="mailto:address@hidden";><address@hidden></a>.
There are also <a href="/contact/">other ways to contact</a>
-the FSF.<br />
-Please send broken links and other corrections or suggestions to
-<a href="mailto:%%EMAIL%%";><%%EMAIL%%></a>.</p>
+the FSF. Broken links and other corrections or suggestions can be sent
+to <a href="mailto:%%EMAIL%%";><%%EMAIL%%></a>.</p>
+</div>
+
+<p>Copyright © 2014 Free Software Foundation, Inc.</p>
-<p>Copyright © 2012 Free Software Foundation, Inc.</p>
+<p>This page is licensed under a <a rel="license"
+href="http://creativecommons.org/licenses/by-nd/3.0/us/";>Creative
+Commons Attribution-NoDerivs 3.0 United States License</a>.</p>
-<p>Verbatim copying and distribution of this entire article are
-permitted worldwide, without royalty, in any medium, provided this
-notice, and the copyright notice, are preserved.</p>
+<!--#include virtual="/server/bottom-notes.html" -->
</div>
</div>
diff --git a/doc/gss.texi b/doc/gss.texi
index d1c7fc5..ff44f6d 100644
--- a/doc/gss.texi
+++ b/doc/gss.texi
@@ -16,7 +16,7 @@
This manual is last updated @value{UPDATED} for version
@value{VERSION} of GNU GSS.
-Copyright @copyright{} 2003-2013 Simon Josefsson.
+Copyright @copyright{} 2003-2014 Simon Josefsson.
@quotation
Permission is granted to copy, distribute and/or modify this document
diff --git a/gl/Makefile.am b/gl/Makefile.am
index bfd4d4f..5afd25d 100644
--- a/gl/Makefile.am
+++ b/gl/Makefile.am
@@ -1,6 +1,6 @@
## DO NOT EDIT! GENERATED AUTOMATICALLY!
## Process this file with automake to produce Makefile.in.
-# Copyright (C) 2002-2012 Free Software Foundation, Inc.
+# Copyright (C) 2002-2014 Free Software Foundation, Inc.
#
# This file is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
@@ -23,7 +23,7 @@
# Generated by gnulib-tool.
# Reproduce by: gnulib-tool --import --dir=. --local-dir=gl/override
--lib=libgnu --source-base=gl --m4-base=gl/m4 --doc-base=doc
--tests-base=gl/tests --aux-dir=build-aux --no-conditional-dependencies
--libtool --macro-prefix=gl --no-vc-files autobuild fdl-1.3 gendocs gnupload
havelib lib-symbol-versions maintainer-makefile manywarnings pmccabe2html
update-copyright valgrind-tests warnings
-AUTOMAKE_OPTIONS = 1.5 gnits
+AUTOMAKE_OPTIONS = 1.9.6 gnits
SUBDIRS =
noinst_HEADERS =
diff --git a/gl/dummy.c b/gl/dummy.c
index 6e4b76e..3a71161 100644
--- a/gl/dummy.c
+++ b/gl/dummy.c
@@ -1,5 +1,5 @@
/* A dummy file, to prevent empty libraries from breaking builds.
- Copyright (C) 2004, 2007, 2009-2012 Free Software Foundation, Inc.
+ Copyright (C) 2004, 2007, 2009-2014 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
diff --git a/gl/m4/00gnulib.m4 b/gl/m4/00gnulib.m4
index d978cb8..8eca551 100644
--- a/gl/m4/00gnulib.m4
+++ b/gl/m4/00gnulib.m4
@@ -1,12 +1,28 @@
-# 00gnulib.m4 serial 2
-dnl Copyright (C) 2009-2012 Free Software Foundation, Inc.
+# 00gnulib.m4 serial 3
+dnl Copyright (C) 2009-2014 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.
dnl This file must be named something that sorts before all other
dnl gnulib-provided .m4 files. It is needed until such time as we can
-dnl assume Autoconf 2.64, with its improved AC_DEFUN_ONCE semantics.
+dnl assume Autoconf 2.64, with its improved AC_DEFUN_ONCE and
+dnl m4_divert semantics.
+
+# Until autoconf 2.63, handling of the diversion stack required m4_init
+# to be called first; but this does not happen with aclocal. Wrapping
+# the entire execution in another layer of the diversion stack fixes this.
+# Worse, prior to autoconf 2.62, m4_wrap depended on the underlying m4
+# for whether it was FIFO or LIFO; in order to properly balance with
+# m4_init, we need to undo our push just before anything wrapped within
+# the m4_init body. The way to ensure this is to wrap both sides of
+# m4_init with a one-shot macro that does the pop at the right time.
+m4_ifndef([_m4_divert_diversion],
+[m4_divert_push([KILL])
+m4_define([gl_divert_fixup], [m4_divert_pop()m4_define([$0])])
+m4_define([m4_init],
+ [gl_divert_fixup()]m4_defn([m4_init])[gl_divert_fixup()])])
+
# AC_DEFUN_ONCE([NAME], VALUE)
# ----------------------------
diff --git a/gl/m4/autobuild.m4 b/gl/m4/autobuild.m4
index 284dc60..00d8709 100644
--- a/gl/m4/autobuild.m4
+++ b/gl/m4/autobuild.m4
@@ -1,5 +1,5 @@
# autobuild.m4 serial 7
-dnl Copyright (C) 2004, 2006-2012 Free Software Foundation, Inc.
+dnl Copyright (C) 2004, 2006-2014 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/m4/gnulib-cache.m4 b/gl/m4/gnulib-cache.m4
index 8892286..5b4a528 100644
--- a/gl/m4/gnulib-cache.m4
+++ b/gl/m4/gnulib-cache.m4
@@ -1,4 +1,4 @@
-# Copyright (C) 2002-2012 Free Software Foundation, Inc.
+# Copyright (C) 2002-2014 Free Software Foundation, Inc.
#
# This file is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/gl/m4/gnulib-common.m4 b/gl/m4/gnulib-common.m4
index 15d2b2b..31e5f94 100644
--- a/gl/m4/gnulib-common.m4
+++ b/gl/m4/gnulib-common.m4
@@ -1,5 +1,5 @@
-# gnulib-common.m4 serial 33
-dnl Copyright (C) 2007-2012 Free Software Foundation, Inc.
+# gnulib-common.m4 serial 36
+dnl Copyright (C) 2007-2014 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.
@@ -49,6 +49,16 @@ AC_DEFUN([gl_COMMON_BODY], [
is a misnomer outside of parameter lists. */
#define _UNUSED_PARAMETER_ _GL_UNUSED
+/* gcc supports the "unused" attribute on possibly unused labels, and
+ g++ has since version 4.5. Note to support C++ as well as C,
+ _GL_UNUSED_LABEL should be used with a trailing ; */
+#if !defined __cplusplus || __GNUC__ > 4 \
+ || (__GNUC__ == 4 && __GNUC_MINOR__ >= 5)
+# define _GL_UNUSED_LABEL _GL_UNUSED
+#else
+# define _GL_UNUSED_LABEL
+#endif
+
/* The __pure__ attribute was added in gcc 2.96. */
#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 96)
# define _GL_ATTRIBUTE_PURE __attribute__ ((__pure__))
@@ -294,6 +304,8 @@ Amsterdam
# for interoperability with automake-1.9.6 from autoconf-2.62.
# Remove this macro when we can assume autoconf >= 2.62 or
# autoconf >= 2.60 && automake >= 1.10.
+# AC_AUTOCONF_VERSION was introduced in 2.62, so use that as the witness.
+m4_ifndef([AC_AUTOCONF_VERSION],[
m4_ifdef([AC_PROG_MKDIR_P], [
dnl For automake-1.9.6 && autoconf < 2.62: Ensure MKDIR_P is AC_SUBSTed.
m4_define([AC_PROG_MKDIR_P],
@@ -304,27 +316,31 @@ m4_ifdef([AC_PROG_MKDIR_P], [
[AC_REQUIRE([AM_PROG_MKDIR_P])dnl defined by automake
MKDIR_P='$(mkdir_p)'
AC_SUBST([MKDIR_P])])])
+])
# AC_C_RESTRICT
-# This definition overrides the AC_C_RESTRICT macro from autoconf 2.60..2.61,
-# so that mixed use of GNU C and GNU C++ and mixed use of Sun C and Sun C++
-# works.
-# This definition can be removed once autoconf >= 2.62 can be assumed.
-m4_if(m4_version_compare(m4_defn([m4_PACKAGE_VERSION]),[2.62]),[-1],[
+# This definition is copied from post-2.69 Autoconf and overrides the
+# AC_C_RESTRICT macro from autoconf 2.60..2.69. It can be removed
+# once autoconf >= 2.70 can be assumed. It's painful to check version
+# numbers, and in practice this macro is more up-to-date than Autoconf
+# is, so override Autoconf unconditionally.
AC_DEFUN([AC_C_RESTRICT],
[AC_CACHE_CHECK([for C/C++ restrict keyword], [ac_cv_c_restrict],
[ac_cv_c_restrict=no
# The order here caters to the fact that C++ does not require restrict.
for ac_kw in __restrict __restrict__ _Restrict restrict; do
- AC_COMPILE_IFELSE([AC_LANG_PROGRAM(
- [[typedef int * int_ptr;
- int foo (int_ptr $ac_kw ip) {
- return ip[0];
- }]],
- [[int s[1];
- int * $ac_kw t = s;
- t[0] = 0;
- return foo(t)]])],
+ AC_COMPILE_IFELSE(
+ [AC_LANG_PROGRAM(
+ [[typedef int *int_ptr;
+ int foo (int_ptr $ac_kw ip) { return ip[0]; }
+ int bar (int [$ac_kw]); /* Catch GCC bug 14050. */
+ int bar (int ip[$ac_kw]) { return ip[0]; }
+ ]],
+ [[int s[1];
+ int *$ac_kw t = s;
+ t[0] = 0;
+ return foo (t) + bar (t);
+ ]])],
[ac_cv_c_restrict=$ac_kw])
test "$ac_cv_c_restrict" != no && break
done
@@ -334,21 +350,21 @@ AC_DEFUN([AC_C_RESTRICT],
nothing if this is not supported. Do not define if restrict is
supported directly. */
#undef restrict
-/* Work around a bug in Sun C++: it does not support _Restrict, even
- though the corresponding Sun C compiler does, which causes
- "#define restrict _Restrict" in the previous line. Perhaps some future
- version of Sun C++ will work with _Restrict; if so, it'll probably
- define __RESTRICT, just as Sun C does. */
+/* Work around a bug in Sun C++: it does not support _Restrict or
+ __restrict__, even though the corresponding Sun C compiler ends up with
+ "#define restrict _Restrict" or "#define restrict __restrict__" in the
+ previous line. Perhaps some future version of Sun C++ will work with
+ restrict; if so, hopefully it defines __RESTRICT like Sun C does. */
#if defined __SUNPRO_CC && !defined __RESTRICT
# define _Restrict
+# define __restrict__
#endif])
case $ac_cv_c_restrict in
restrict) ;;
no) AC_DEFINE([restrict], []) ;;
*) AC_DEFINE_UNQUOTED([restrict], [$ac_cv_c_restrict]) ;;
esac
-])
-])
+])# AC_C_RESTRICT
# gl_BIGENDIAN
# is like AC_C_BIGENDIAN, except that it can be AC_REQUIREd.
@@ -371,3 +387,63 @@ AC_DEFUN([gl_CACHE_VAL_SILENT],
AC_CACHE_VAL([$1], [$2])
as_echo_n="$saved_as_echo_n"
])
+
+# AS_VAR_COPY was added in autoconf 2.63b
+m4_define_default([AS_VAR_COPY],
+[AS_LITERAL_IF([$1[]$2], [$1=$$2], [eval $1=\$$2])])
+
+# AC_PROG_SED was added in autoconf 2.59b
+m4_ifndef([AC_PROG_SED],
+[AC_DEFUN([AC_PROG_SED],
+[AC_CACHE_CHECK([for a sed that does not truncate output], ac_cv_path_SED,
+ [dnl ac_script should not contain more than 99 commands (for HP-UX sed),
+ dnl but more than about 7000 bytes, to catch a limit in Solaris 8
/usr/ucb/sed.
+
ac_script=s/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa/bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb/
+ for ac_i in 1 2 3 4 5 6 7; do
+ ac_script="$ac_script$as_nl$ac_script"
+ done
+ echo "$ac_script" 2>/dev/null | sed 99q >conftest.sed
+ AS_UNSET([ac_script])
+ if test -z "$SED"; then
+ ac_path_SED_found=false
+ _AS_PATH_WALK([], [
+ for ac_prog in sed gsed; do
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ ac_path_SED="$as_dir/$ac_prog$ac_exec_ext"
+ AS_EXECUTABLE_P(["$ac_path_SED"]) || continue
+ case `"$ac_path_SED" --version 2>&1` in
+ *GNU*) ac_cv_path_SED=$ac_path_SED ac_path_SED_found=:;;
+ *)
+ ac_count=0
+ _AS_ECHO_N([0123456789]) >conftest.in
+ while :
+ do
+ cat conftest.in conftest.in >conftest.tmp
+ mv conftest.tmp conftest.in
+ cp conftest.in conftest.nl
+ echo >> conftest.nl
+ "$ac_path_SED" -f conftest.sed <conftest.nl >conftest.out
2>/dev/null || break
+ diff conftest.out conftest.nl >/dev/null 2>&1 || break
+ ac_count=`expr $ac_count + 1`
+ if test $ac_count -gt ${ac_path_SED_max-0}; then
+ # Best so far, but keep looking for better
+ ac_cv_path_SED=$ac_path_SED
+ ac_path_SED_max=$ac_count
+ fi
+ test $ac_count -gt 10 && break
+ done
+ rm -f conftest.in conftest.tmp conftest.nl conftest.out;;
+ esac
+ $ac_path_SED_found && break 3
+ done
+ done])
+ if test -z "$ac_cv_path_SED"; then
+ AC_ERROR([no acceptable sed could be found in \$PATH])
+ fi
+ else
+ ac_cv_path_SED=$SED
+ fi
+ SED="$ac_cv_path_SED"
+ AC_SUBST([SED])dnl
+ rm -f conftest.sed
+])])])
diff --git a/gl/m4/gnulib-comp.m4 b/gl/m4/gnulib-comp.m4
index a89d7bd..2bf6df6 100644
--- a/gl/m4/gnulib-comp.m4
+++ b/gl/m4/gnulib-comp.m4
@@ -1,5 +1,5 @@
# DO NOT EDIT! GENERATED AUTOMATICALLY!
-# Copyright (C) 2002-2012 Free Software Foundation, Inc.
+# Copyright (C) 2002-2014 Free Software Foundation, Inc.
#
# This file is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
@@ -70,21 +70,22 @@ AC_DEFUN([gl_INIT],
m4_pushdef([gl_LIBSOURCES_DIR], [])
gl_COMMON
gl_source_base='gl'
-# Autoconf 2.61a.99 and earlier don't support linking a file only
-# in VPATH builds. But since GNUmakefile is for maintainer use
-# only, it does not matter if we skip the link with older autoconf.
-# Automake 1.10.1 and earlier try to remove GNUmakefile in non-VPATH
-# builds, so use a shell variable to bypass this.
-GNUmakefile=GNUmakefile
-m4_if(m4_version_compare([2.61a.100],
- m4_defn([m4_PACKAGE_VERSION])), [1], [],
- [AC_CONFIG_LINKS([$GNUmakefile:$GNUmakefile], [],
- [GNUmakefile=$GNUmakefile])])
-gl_LD_VERSION_SCRIPT
-AC_CONFIG_COMMANDS_PRE([m4_ifdef([AH_HEADER],
- [AC_SUBST([CONFIG_INCLUDE], m4_defn([AH_HEADER]))])])
-AC_PATH_PROG([PMCCABE], [pmccabe], [false])
-gl_VALGRIND_TESTS
+ # Autoconf 2.61a.99 and earlier don't support linking a file only
+ # in VPATH builds. But since GNUmakefile is for maintainer use
+ # only, it does not matter if we skip the link with older autoconf.
+ # Automake 1.10.1 and earlier try to remove GNUmakefile in non-VPATH
+ # builds, so use a shell variable to bypass this.
+ GNUmakefile=GNUmakefile
+ m4_if(m4_version_compare([2.61a.100],
+ m4_defn([m4_PACKAGE_VERSION])), [1], [],
+ [AC_CONFIG_LINKS([$GNUmakefile:$GNUmakefile], [],
+ [GNUmakefile=$GNUmakefile])])
+ gl_LD_VERSION_SCRIPT
+ AC_CONFIG_COMMANDS_PRE([m4_ifdef([AH_HEADER],
+ [AC_SUBST([CONFIG_INCLUDE], m4_defn([AH_HEADER]))])])
+ AC_REQUIRE([AC_PROG_SED])
+ AC_PATH_PROG([PMCCABE], [pmccabe], [false])
+ gl_VALGRIND_TESTS
# End of code from modules
m4_ifval(gl_LIBSOURCES_LIST, [
m4_syscmd([test ! -d ]m4_defn([gl_LIBSOURCES_DIR])[ ||
@@ -131,7 +132,7 @@ changequote([, ])dnl
AC_SUBST([gltests_WITNESS])
gl_module_indicator_condition=$gltests_WITNESS
m4_pushdef([gl_MODULE_INDICATOR_CONDITION], [$gl_module_indicator_condition])
-gl_VALGRIND_TESTS
+ gl_VALGRIND_TESTS
m4_popdef([gl_MODULE_INDICATOR_CONDITION])
m4_ifval(gltests_LIBSOURCES_LIST, [
m4_syscmd([test ! -d ]m4_defn([gltests_LIBSOURCES_DIR])[ ||
diff --git a/gl/m4/gnulib-tool.m4 b/gl/m4/gnulib-tool.m4
index a09ffc1..a588e15 100644
--- a/gl/m4/gnulib-tool.m4
+++ b/gl/m4/gnulib-tool.m4
@@ -1,5 +1,5 @@
# gnulib-tool.m4 serial 2
-dnl Copyright (C) 2004-2005, 2009-2012 Free Software Foundation, Inc.
+dnl Copyright (C) 2004-2005, 2009-2014 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/m4/ld-version-script.m4 b/gl/m4/ld-version-script.m4
index 5ed93ef..f8b4a5c 100644
--- a/gl/m4/ld-version-script.m4
+++ b/gl/m4/ld-version-script.m4
@@ -1,5 +1,5 @@
# ld-version-script.m4 serial 3
-dnl Copyright (C) 2008-2012 Free Software Foundation, Inc.
+dnl Copyright (C) 2008-2014 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/m4/lib-ld.m4 b/gl/m4/lib-ld.m4
index 4e1374d..ddc569f 100644
--- a/gl/m4/lib-ld.m4
+++ b/gl/m4/lib-ld.m4
@@ -1,33 +1,39 @@
-# lib-ld.m4 serial 5 (gettext-0.18.2)
-dnl Copyright (C) 1996-2003, 2009-2012 Free Software Foundation, Inc.
+# lib-ld.m4 serial 6
+dnl Copyright (C) 1996-2003, 2009-2014 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.
dnl Subroutines of libtool.m4,
-dnl with replacements s/AC_/AC_LIB/ and s/lt_cv/acl_cv/ to avoid collision
-dnl with libtool.m4.
+dnl with replacements s/_*LT_PATH/AC_LIB_PROG/ and s/lt_/acl_/ to avoid
+dnl collision with libtool.m4.
-dnl From libtool-1.4. Sets the variable with_gnu_ld to yes or no.
+dnl From libtool-2.4. Sets the variable with_gnu_ld to yes or no.
AC_DEFUN([AC_LIB_PROG_LD_GNU],
[AC_CACHE_CHECK([if the linker ($LD) is GNU ld], [acl_cv_prog_gnu_ld],
-[# I'd rather use --version here, but apparently some GNU ld's only accept -v.
+[# I'd rather use --version here, but apparently some GNU lds only accept -v.
case `$LD -v 2>&1 </dev/null` in
*GNU* | *'with BFD'*)
- acl_cv_prog_gnu_ld=yes ;;
+ acl_cv_prog_gnu_ld=yes
+ ;;
*)
- acl_cv_prog_gnu_ld=no ;;
+ acl_cv_prog_gnu_ld=no
+ ;;
esac])
with_gnu_ld=$acl_cv_prog_gnu_ld
])
-dnl From libtool-1.4. Sets the variable LD.
+dnl From libtool-2.4. Sets the variable LD.
AC_DEFUN([AC_LIB_PROG_LD],
-[AC_ARG_WITH([gnu-ld],
-[ --with-gnu-ld assume the C compiler uses GNU ld [default=no]],
-test "$withval" = no || with_gnu_ld=yes, with_gnu_ld=no)
-AC_REQUIRE([AC_PROG_CC])dnl
+[AC_REQUIRE([AC_PROG_CC])dnl
AC_REQUIRE([AC_CANONICAL_HOST])dnl
+
+AC_ARG_WITH([gnu-ld],
+ [AS_HELP_STRING([--with-gnu-ld],
+ [assume the C compiler uses GNU ld [default=no]])],
+ [test "$withval" = no || with_gnu_ld=yes],
+ [with_gnu_ld=no])dnl
+
# Prepare PATH_SEPARATOR.
# The user is always right.
if test "${PATH_SEPARATOR+set}" != set; then
@@ -40,10 +46,11 @@ if test "${PATH_SEPARATOR+set}" != set; then
|| PATH_SEPARATOR=';'
}
fi
+
ac_prog=ld
if test "$GCC" = yes; then
# Check if gcc -print-prog-name=ld gives a path.
- AC_MSG_CHECKING([for ld used by GCC])
+ AC_MSG_CHECKING([for ld used by $CC])
case $host in
*-*-mingw*)
# gcc leaves a trailing carriage return which upsets mingw
@@ -53,11 +60,11 @@ if test "$GCC" = yes; then
esac
case $ac_prog in
# Accept absolute paths.
- [[\\/]* | [A-Za-z]:[\\/]*)]
- [re_direlt='/[^/][^/]*/\.\./']
- # Canonicalize the path of ld
- ac_prog=`echo $ac_prog| sed 's%\\\\%/%g'`
- while echo $ac_prog | grep "$re_direlt" > /dev/null 2>&1; do
+ [[\\/]]* | ?:[[\\/]]*)
+ re_direlt='/[[^/]][[^/]]*/\.\./'
+ # Canonicalize the pathname of ld
+ ac_prog=`echo "$ac_prog"| sed 's%\\\\%/%g'`
+ while echo "$ac_prog" | grep "$re_direlt" > /dev/null 2>&1; do
ac_prog=`echo $ac_prog| sed "s%$re_direlt%/%"`
done
test -z "$LD" && LD="$ac_prog"
@@ -78,23 +85,26 @@ else
fi
AC_CACHE_VAL([acl_cv_path_LD],
[if test -z "$LD"; then
- IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}${PATH_SEPARATOR-:}"
+ acl_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
for ac_dir in $PATH; do
+ IFS="$acl_save_ifs"
test -z "$ac_dir" && ac_dir=.
if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then
acl_cv_path_LD="$ac_dir/$ac_prog"
# Check to see if the program is GNU ld. I'd rather use --version,
- # but apparently some GNU ld's only accept -v.
+ # but apparently some variants of GNU ld only accept -v.
# Break only if it was the GNU/non-GNU ld that we prefer.
- case `"$acl_cv_path_LD" -v 2>&1 < /dev/null` in
+ case `"$acl_cv_path_LD" -v 2>&1 </dev/null` in
*GNU* | *'with BFD'*)
- test "$with_gnu_ld" != no && break ;;
+ test "$with_gnu_ld" != no && break
+ ;;
*)
- test "$with_gnu_ld" != yes && break ;;
+ test "$with_gnu_ld" != yes && break
+ ;;
esac
fi
done
- IFS="$ac_save_ifs"
+ IFS="$acl_save_ifs"
else
acl_cv_path_LD="$LD" # Let the user override the test with a path.
fi])
diff --git a/gl/m4/lib-link.m4 b/gl/m4/lib-link.m4
index d11b4b4..3522d99 100644
--- a/gl/m4/lib-link.m4
+++ b/gl/m4/lib-link.m4
@@ -1,5 +1,5 @@
# lib-link.m4 serial 26 (gettext-0.18.2)
-dnl Copyright (C) 2001-2012 Free Software Foundation, Inc.
+dnl Copyright (C) 2001-2014 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/m4/lib-prefix.m4 b/gl/m4/lib-prefix.m4
index 007aa05..31f49e4 100644
--- a/gl/m4/lib-prefix.m4
+++ b/gl/m4/lib-prefix.m4
@@ -1,5 +1,5 @@
# lib-prefix.m4 serial 7 (gettext-0.18)
-dnl Copyright (C) 2001-2005, 2008-2012 Free Software Foundation, Inc.
+dnl Copyright (C) 2001-2005, 2008-2014 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/m4/manywarnings.m4 b/gl/m4/manywarnings.m4
index 864fc85..3e6dd21 100644
--- a/gl/m4/manywarnings.m4
+++ b/gl/m4/manywarnings.m4
@@ -1,5 +1,5 @@
-# manywarnings.m4 serial 4
-dnl Copyright (C) 2008-2012 Free Software Foundation, Inc.
+# manywarnings.m4 serial 7
+dnl Copyright (C) 2008-2014 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.
@@ -35,14 +35,12 @@ AC_DEFUN([gl_MANYWARN_COMPLEMENT],
# make sure your gcc understands it.
AC_DEFUN([gl_MANYWARN_ALL_GCC],
[
- dnl First, check if -Wno-missing-field-initializers is needed.
- dnl -Wmissing-field-initializers is implied by -W, but that issues
- dnl warnings with GCC version before 4.7, for the common idiom
- dnl of initializing types on the stack to zero, using { 0, }
+ dnl First, check for some issues that only occur when combining multiple
+ dnl gcc warning categories.
AC_REQUIRE([AC_PROG_CC])
if test -n "$GCC"; then
- dnl First, check -W -Werror -Wno-missing-field-initializers is supported
+ dnl Check if -W -Werror -Wno-missing-field-initializers is supported
dnl with the current $CC $CFLAGS $CPPFLAGS.
AC_MSG_CHECKING([whether -Wno-missing-field-initializers is supported])
AC_CACHE_VAL([gl_cv_cc_nomfi_supported], [
@@ -77,107 +75,171 @@ AC_DEFUN([gl_MANYWARN_ALL_GCC],
])
AC_MSG_RESULT([$gl_cv_cc_nomfi_needed])
fi
+
+ dnl Next, check if -Werror -Wuninitialized is useful with the
+ dnl user's choice of $CFLAGS; some versions of gcc warn that it
+ dnl has no effect if -O is not also used
+ AC_MSG_CHECKING([whether -Wuninitialized is supported])
+ AC_CACHE_VAL([gl_cv_cc_uninitialized_supported], [
+ gl_save_CFLAGS="$CFLAGS"
+ CFLAGS="$CFLAGS -Werror -Wuninitialized"
+ AC_COMPILE_IFELSE(
+ [AC_LANG_PROGRAM([[]], [[]])],
+ [gl_cv_cc_uninitialized_supported=yes],
+ [gl_cv_cc_uninitialized_supported=no])
+ CFLAGS="$gl_save_CFLAGS"])
+ AC_MSG_RESULT([$gl_cv_cc_uninitialized_supported])
+
fi
+ # List all gcc warning categories.
+ # To compare this list to your installed GCC's, run this Bash command:
+ #
+ # comm -3 \
+ # <(sed -n 's/^ *\(-[^ ]*\) .*/\1/p' manywarnings.m4 | sort) \
+ # <(gcc --help=warnings | sed -n 's/^ \(-[^ ]*\) .*/\1/p' | sort |
+ # grep -v -x -f <(
+ # awk '/^[^#]/ {print $1}' ../build-aux/gcc-warning.spec))
+
gl_manywarn_set=
for gl_manywarn_item in \
- -Wall \
-W \
- -Wformat-y2k \
- -Wformat-nonliteral \
- -Wformat-security \
- -Winit-self \
- -Wmissing-include-dirs \
- -Wswitch-default \
- -Wswitch-enum \
- -Wunused \
- -Wunknown-pragmas \
- -Wstrict-aliasing \
- -Wstrict-overflow \
- -Wsystem-headers \
- -Wfloat-equal \
- -Wtraditional \
- -Wtraditional-conversion \
- -Wdeclaration-after-statement \
- -Wundef \
- -Wshadow \
- -Wunsafe-loop-optimizations \
- -Wpointer-arith \
+ -Wabi \
+ -Waddress \
+ -Waggressive-loop-optimizations \
+ -Wall \
+ -Warray-bounds \
+ -Wattributes \
-Wbad-function-cast \
- -Wc++-compat \
- -Wcast-qual \
- -Wcast-align \
- -Wwrite-strings \
- -Wconversion \
- -Wsign-conversion \
- -Wlogical-op \
- -Waggregate-return \
- -Wstrict-prototypes \
- -Wold-style-definition \
- -Wmissing-prototypes \
- -Wmissing-declarations \
- -Wmissing-noreturn \
- -Wmissing-format-attribute \
- -Wpacked \
- -Wpadded \
- -Wredundant-decls \
- -Wnested-externs \
- -Wunreachable-code \
- -Winline \
- -Winvalid-pch \
- -Wlong-long \
- -Wvla \
- -Wvolatile-register-var \
- -Wdisabled-optimization \
- -Wstack-protector \
- -Woverlength-strings \
-Wbuiltin-macro-redefined \
- -Wmudflap \
- -Wpacked-bitfield-compat \
- -Wsync-nand \
- ; do
- gl_manywarn_set="$gl_manywarn_set $gl_manywarn_item"
- done
- # The following are not documented in the manual but are included in
- # output from gcc --help=warnings.
- for gl_manywarn_item in \
- -Wattributes \
+ -Wcast-align \
+ -Wchar-subscripts \
+ -Wclobbered \
+ -Wcomment \
+ -Wcomments \
-Wcoverage-mismatch \
- -Wunused-macros \
- ; do
- gl_manywarn_set="$gl_manywarn_set $gl_manywarn_item"
- done
- # More warnings from gcc 4.6.2 --help=warnings.
- for gl_manywarn_item in \
- -Wabi \
-Wcpp \
+ -Wdate-time \
-Wdeprecated \
-Wdeprecated-declarations \
+ -Wdisabled-optimization \
-Wdiv-by-zero \
-Wdouble-promotion \
+ -Wempty-body \
-Wendif-labels \
+ -Wenum-compare \
-Wextra \
-Wformat-contains-nul \
-Wformat-extra-args \
+ -Wformat-nonliteral \
+ -Wformat-security \
+ -Wformat-y2k \
-Wformat-zero-length \
- -Wformat=2 \
+ -Wfree-nonheap-object \
+ -Wignored-qualifiers \
+ -Wimplicit \
+ -Wimplicit-function-declaration \
+ -Wimplicit-int \
+ -Winit-self \
+ -Winline \
+ -Wint-to-pointer-cast \
+ -Winvalid-memory-model \
+ -Winvalid-pch \
+ -Wjump-misses-init \
+ -Wlogical-op \
+ -Wmain \
+ -Wmaybe-uninitialized \
+ -Wmissing-braces \
+ -Wmissing-declarations \
+ -Wmissing-field-initializers \
+ -Wmissing-include-dirs \
+ -Wmissing-parameter-type \
+ -Wmissing-prototypes \
-Wmultichar \
- -Wnormalized=nfc \
+ -Wnarrowing \
+ -Wnested-externs \
+ -Wnonnull \
+ -Wold-style-declaration \
+ -Wold-style-definition \
+ -Wopenmp-simd \
-Woverflow \
+ -Woverlength-strings \
+ -Woverride-init \
+ -Wpacked \
+ -Wpacked-bitfield-compat \
+ -Wparentheses \
+ -Wpointer-arith \
+ -Wpointer-sign \
-Wpointer-to-int-cast \
-Wpragmas \
+ -Wreturn-local-addr \
+ -Wreturn-type \
+ -Wsequence-point \
+ -Wshadow \
+ -Wsizeof-pointer-memaccess \
+ -Wstack-protector \
+ -Wstrict-aliasing \
+ -Wstrict-overflow \
+ -Wstrict-prototypes \
-Wsuggest-attribute=const \
+ -Wsuggest-attribute=format \
-Wsuggest-attribute=noreturn \
-Wsuggest-attribute=pure \
+ -Wswitch \
+ -Wswitch-default \
+ -Wsync-nand \
+ -Wsystem-headers \
-Wtrampolines \
+ -Wtrigraphs \
+ -Wtype-limits \
+ -Wuninitialized \
+ -Wunknown-pragmas \
+ -Wunsafe-loop-optimizations \
+ -Wunused \
+ -Wunused-but-set-parameter \
+ -Wunused-but-set-variable \
+ -Wunused-function \
+ -Wunused-label \
+ -Wunused-local-typedefs \
+ -Wunused-macros \
+ -Wunused-parameter \
+ -Wunused-result \
+ -Wunused-value \
+ -Wunused-variable \
+ -Wvarargs \
+ -Wvariadic-macros \
+ -Wvector-operation-performance \
+ -Wvla \
+ -Wvolatile-register-var \
+ -Wwrite-strings \
+ \
; do
gl_manywarn_set="$gl_manywarn_set $gl_manywarn_item"
done
- # Disable the missing-field-initializers warning if needed
+ # gcc --help=warnings outputs an unusual form for this option; list
+ # it here so that the above 'comm' command doesn't report a false match.
+ gl_manywarn_set="$gl_manywarn_set -Wnormalized=nfc"
+
+ # These are needed for older GCC versions.
+ if test -n "$GCC"; then
+ case `($CC --version) 2>/dev/null` in
+ 'gcc (GCC) '[[0-3]].* | \
+ 'gcc (GCC) '4.[[0-7]].*)
+ gl_manywarn_set="$gl_manywarn_set -fdiagnostics-show-option"
+ gl_manywarn_set="$gl_manywarn_set -funit-at-a-time"
+ ;;
+ esac
+ fi
+
+ # Disable specific options as needed.
if test "$gl_cv_cc_nomfi_needed" = yes; then
gl_manywarn_set="$gl_manywarn_set -Wno-missing-field-initializers"
fi
+ if test "$gl_cv_cc_uninitialized_supported" = no; then
+ gl_manywarn_set="$gl_manywarn_set -Wno-uninitialized"
+ fi
+
$1=$gl_manywarn_set
])
diff --git a/gl/m4/valgrind-tests.m4 b/gl/m4/valgrind-tests.m4
index 753d6fa..f1fbd58 100644
--- a/gl/m4/valgrind-tests.m4
+++ b/gl/m4/valgrind-tests.m4
@@ -1,5 +1,5 @@
# valgrind-tests.m4 serial 3
-dnl Copyright (C) 2008-2012 Free Software Foundation, Inc.
+dnl Copyright (C) 2008-2014 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.
@@ -12,8 +12,8 @@ dnl From Simon Josefsson
AC_DEFUN([gl_VALGRIND_TESTS],
[
AC_ARG_ENABLE(valgrind-tests,
- AS_HELP_STRING([--enable-valgrind-tests],
- [run self tests under valgrind]),
+ AS_HELP_STRING([--disable-valgrind-tests],
+ [don't try to run self tests under valgrind]),
[opt_valgrind_tests=$enableval], [opt_valgrind_tests=yes])
# Run self-tests under valgrind?
diff --git a/gl/m4/warnings.m4 b/gl/m4/warnings.m4
index 28b8294..43156f4 100644
--- a/gl/m4/warnings.m4
+++ b/gl/m4/warnings.m4
@@ -1,5 +1,5 @@
-# warnings.m4 serial 7
-dnl Copyright (C) 2008-2012 Free Software Foundation, Inc.
+# warnings.m4 serial 11
+dnl Copyright (C) 2008-2014 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.
@@ -25,19 +25,36 @@ m4_ifdef([AS_VAR_APPEND],
AC_DEFUN([gl_COMPILER_OPTION_IF],
[AS_VAR_PUSHDEF([gl_Warn], [gl_cv_warn_[]_AC_LANG_ABBREV[]_$1])dnl
AS_VAR_PUSHDEF([gl_Flags], [_AC_LANG_PREFIX[]FLAGS])dnl
+AS_LITERAL_IF([$1],
+ [m4_pushdef([gl_Positive], m4_bpatsubst([$1], [^-Wno-], [-W]))],
+ [gl_positive="$1"
+case $gl_positive in
+ -Wno-*) gl_positive=-W`expr "X$gl_positive" : 'X-Wno-\(.*\)'` ;;
+esac
+m4_pushdef([gl_Positive], [$gl_positive])])dnl
AC_CACHE_CHECK([whether _AC_LANG compiler handles $1], m4_defn([gl_Warn]), [
gl_save_compiler_FLAGS="$gl_Flags"
- gl_AS_VAR_APPEND(m4_defn([gl_Flags]), [" $1"])
- AC_COMPILE_IFELSE([m4_default([$4], [AC_LANG_PROGRAM([])])],
- [AS_VAR_SET(gl_Warn, [yes])],
- [AS_VAR_SET(gl_Warn, [no])])
+ gl_AS_VAR_APPEND(m4_defn([gl_Flags]),
+ [" $gl_unknown_warnings_are_errors ]m4_defn([gl_Positive])["])
+ AC_LINK_IFELSE([m4_default([$4], [AC_LANG_PROGRAM([])])],
+ [AS_VAR_SET(gl_Warn, [yes])],
+ [AS_VAR_SET(gl_Warn, [no])])
gl_Flags="$gl_save_compiler_FLAGS"
])
AS_VAR_IF(gl_Warn, [yes], [$2], [$3])
+m4_popdef([gl_Positive])dnl
AS_VAR_POPDEF([gl_Flags])dnl
AS_VAR_POPDEF([gl_Warn])dnl
])
+# gl_UNKNOWN_WARNINGS_ARE_ERRORS
+# ------------------------------
+# Clang doesn't complain about unknown warning options unless one also
+# specifies -Wunknown-warning-option -Werror. Detect this.
+AC_DEFUN([gl_UNKNOWN_WARNINGS_ARE_ERRORS],
+[gl_COMPILER_OPTION_IF([-Werror -Wunknown-warning-option],
+ [gl_unknown_warnings_are_errors='-Wunknown-warning-option -Werror'],
+ [gl_unknown_warnings_are_errors=])])
# gl_WARN_ADD(OPTION, [VARIABLE = WARN_CFLAGS],
# [PROGRAM = AC_LANG_PROGRAM()])
@@ -47,7 +64,8 @@ AS_VAR_POPDEF([gl_Warn])dnl
#
# If VARIABLE is a variable name, AC_SUBST it.
AC_DEFUN([gl_WARN_ADD],
-[gl_COMPILER_OPTION_IF([$1],
+[AC_REQUIRE([gl_UNKNOWN_WARNINGS_ARE_ERRORS])
+gl_COMPILER_OPTION_IF([$1],
[gl_AS_VAR_APPEND(m4_if([$2], [], [[WARN_CFLAGS]], [[$2]]), [" $1"])],
[],
[$3])
diff --git a/gss.pc.in b/gss.pc.in
index f2f525f..cb18fc0 100644
--- a/gss.pc.in
+++ b/gss.pc.in
@@ -1,5 +1,5 @@
# Process this file with autoconf to produce a pkg-config metadata file.
-# Copyright (C) 2003-2013 Simon Josefsson
+# Copyright (C) 2003-2014 Simon Josefsson
#
# Copying and distribution of this file, with or without modification,
# are permitted in any medium without royalty provided the copyright
diff --git a/lib/Makefile.am b/lib/Makefile.am
index d1a90e5..9700074 100644
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -1,5 +1,5 @@
## Process this file with automake to produce Makefile.in
-# Copyright (C) 2003-2013 Simon Josefsson
+# Copyright (C) 2003-2014 Simon Josefsson
#
# This file is part of the Generic Security Service (GSS).
#
diff --git a/lib/asn1.c b/lib/asn1.c
index 3ee36b0..0b1ce57 100644
--- a/lib/asn1.c
+++ b/lib/asn1.c
@@ -1,5 +1,5 @@
/* asn1.c --- Wrapper around pseudo-ASN.1 token format.
- * Copyright (C) 2003-2013 Simon Josefsson
+ * Copyright (C) 2003-2014 Simon Josefsson
*
* This file is part of the Generic Security Service (GSS).
*
diff --git a/lib/context.c b/lib/context.c
index 7ecfd4b..e77c2e8 100644
--- a/lib/context.c
+++ b/lib/context.c
@@ -1,5 +1,5 @@
/* context.c --- Implementation of GSS-API Context functions.
- * Copyright (C) 2003-2013 Simon Josefsson
+ * Copyright (C) 2003-2014 Simon Josefsson
*
* This file is part of the Generic Security Service (GSS).
*
diff --git a/lib/cred.c b/lib/cred.c
index ca2ff4a..7a8c615 100644
--- a/lib/cred.c
+++ b/lib/cred.c
@@ -1,5 +1,5 @@
/* cred.c --- Implementation of GSS-API Credential Management functions.
- * Copyright (C) 2003-2013 Simon Josefsson
+ * Copyright (C) 2003-2014 Simon Josefsson
*
* This file is part of the Generic Security Service (GSS).
*
diff --git a/lib/error.c b/lib/error.c
index 4734d34..64f32ad 100644
--- a/lib/error.c
+++ b/lib/error.c
@@ -1,5 +1,5 @@
/* error.c --- Error handling functionality.
- * Copyright (C) 2003-2013 Simon Josefsson
+ * Copyright (C) 2003-2014 Simon Josefsson
*
* This file is part of the Generic Security Service (GSS).
*
diff --git a/lib/ext.c b/lib/ext.c
index 0e243be..8a94853 100644
--- a/lib/ext.c
+++ b/lib/ext.c
@@ -1,5 +1,5 @@
/* ext.c --- Implementation of GSS specific extensions.
- * Copyright (C) 2003-2013 Simon Josefsson
+ * Copyright (C) 2003-2014 Simon Josefsson
*
* This file is part of the Generic Security Service (GSS).
*
diff --git a/lib/gl/Makefile.am b/lib/gl/Makefile.am
index 7031d66..153e32b 100644
--- a/lib/gl/Makefile.am
+++ b/lib/gl/Makefile.am
@@ -1,6 +1,6 @@
## DO NOT EDIT! GENERATED AUTOMATICALLY!
## Process this file with automake to produce Makefile.in.
-# Copyright (C) 2002-2012 Free Software Foundation, Inc.
+# Copyright (C) 2002-2014 Free Software Foundation, Inc.
#
# This file is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
@@ -23,7 +23,7 @@
# Generated by gnulib-tool.
# Reproduce by: gnulib-tool --import --dir=. --local-dir=lib/gl/override
--lib=libgnu --source-base=lib/gl --m4-base=lib/gl/m4 --doc-base=doc
--tests-base=lib/gl/tests --aux-dir=build-aux --avoid=xalloc-die
--no-conditional-dependencies --libtool --macro-prefix=libgl --no-vc-files
gettext-h lib-msvc-compat strverscmp
-AUTOMAKE_OPTIONS = 1.5 gnits
+AUTOMAKE_OPTIONS = 1.9.6 gnits
SUBDIRS =
noinst_HEADERS =
@@ -52,6 +52,15 @@ libgnu_la_LDFLAGS = $(AM_LDFLAGS)
libgnu_la_LDFLAGS += -no-undefined
libgnu_la_LDFLAGS += $(LTLIBINTL)
+## begin gnulib module absolute-header
+
+# Use this preprocessor expression to decide whether #include_next works.
+# Do not rely on a 'configure'-time test for this, since the expression
+# might appear in an installed header, which is used by some other compiler.
+HAVE_INCLUDE_NEXT = (__GNUC__ || 60000000 <= __DECC_VER)
+
+## end gnulib module absolute-header
+
## begin gnulib module gettext-h
libgnu_la_SOURCES += gettext.h
diff --git a/lib/gl/dummy.c b/lib/gl/dummy.c
index 6e4b76e..3a71161 100644
--- a/lib/gl/dummy.c
+++ b/lib/gl/dummy.c
@@ -1,5 +1,5 @@
/* A dummy file, to prevent empty libraries from breaking builds.
- Copyright (C) 2004, 2007, 2009-2012 Free Software Foundation, Inc.
+ Copyright (C) 2004, 2007, 2009-2014 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
diff --git a/lib/gl/gettext.h b/lib/gl/gettext.h
index 3108e4a..babf1d0 100644
--- a/lib/gl/gettext.h
+++ b/lib/gl/gettext.h
@@ -1,5 +1,5 @@
/* Convenience header for conditional use of GNU <libintl.h>.
- Copyright (C) 1995-1998, 2000-2002, 2004-2006, 2009-2012 Free Software
+ Copyright (C) 1995-1998, 2000-2002, 2004-2006, 2009-2014 Free Software
Foundation, Inc.
This program is free software; you can redistribute it and/or modify
diff --git a/lib/gl/m4/00gnulib.m4 b/lib/gl/m4/00gnulib.m4
index d978cb8..8eca551 100644
--- a/lib/gl/m4/00gnulib.m4
+++ b/lib/gl/m4/00gnulib.m4
@@ -1,12 +1,28 @@
-# 00gnulib.m4 serial 2
-dnl Copyright (C) 2009-2012 Free Software Foundation, Inc.
+# 00gnulib.m4 serial 3
+dnl Copyright (C) 2009-2014 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.
dnl This file must be named something that sorts before all other
dnl gnulib-provided .m4 files. It is needed until such time as we can
-dnl assume Autoconf 2.64, with its improved AC_DEFUN_ONCE semantics.
+dnl assume Autoconf 2.64, with its improved AC_DEFUN_ONCE and
+dnl m4_divert semantics.
+
+# Until autoconf 2.63, handling of the diversion stack required m4_init
+# to be called first; but this does not happen with aclocal. Wrapping
+# the entire execution in another layer of the diversion stack fixes this.
+# Worse, prior to autoconf 2.62, m4_wrap depended on the underlying m4
+# for whether it was FIFO or LIFO; in order to properly balance with
+# m4_init, we need to undo our push just before anything wrapped within
+# the m4_init body. The way to ensure this is to wrap both sides of
+# m4_init with a one-shot macro that does the pop at the right time.
+m4_ifndef([_m4_divert_diversion],
+[m4_divert_push([KILL])
+m4_define([gl_divert_fixup], [m4_divert_pop()m4_define([$0])])
+m4_define([m4_init],
+ [gl_divert_fixup()]m4_defn([m4_init])[gl_divert_fixup()])])
+
# AC_DEFUN_ONCE([NAME], VALUE)
# ----------------------------
diff --git a/lib/gl/m4/absolute-header.m4 b/lib/gl/m4/absolute-header.m4
new file mode 100644
index 0000000..ce3e39e
--- /dev/null
+++ b/lib/gl/m4/absolute-header.m4
@@ -0,0 +1,102 @@
+# absolute-header.m4 serial 16
+dnl Copyright (C) 2006-2014 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.
+
+dnl From Derek Price.
+
+# gl_ABSOLUTE_HEADER(HEADER1 HEADER2 ...)
+# ---------------------------------------
+# Find the absolute name of a header file, testing first if the header exists.
+# If the header were sys/inttypes.h, this macro would define
+# ABSOLUTE_SYS_INTTYPES_H to the '""' quoted absolute name of sys/inttypes.h
+# in config.h
+# (e.g. '#define ABSOLUTE_SYS_INTTYPES_H "///usr/include/sys/inttypes.h"').
+# The three "///" are to pacify Sun C 5.8, which otherwise would say
+# "warning: #include of /usr/include/... may be non-portable".
+# Use '""', not '<>', so that the /// cannot be confused with a C99 comment.
+# Note: This macro assumes that the header file is not empty after
+# preprocessing, i.e. it does not only define preprocessor macros but also
+# provides some type/enum definitions or function/variable declarations.
+AC_DEFUN([gl_ABSOLUTE_HEADER],
+[AC_REQUIRE([AC_CANONICAL_HOST])
+AC_LANG_PREPROC_REQUIRE()dnl
+dnl FIXME: gl_absolute_header and ac_header_exists must be used unquoted
+dnl until we can assume autoconf 2.64 or newer.
+m4_foreach_w([gl_HEADER_NAME], [$1],
+ [AS_VAR_PUSHDEF([gl_absolute_header],
+ [gl_cv_absolute_]m4_defn([gl_HEADER_NAME]))dnl
+ AC_CACHE_CHECK([absolute name of <]m4_defn([gl_HEADER_NAME])[>],
+ m4_defn([gl_absolute_header]),
+ [AS_VAR_PUSHDEF([ac_header_exists],
+ [ac_cv_header_]m4_defn([gl_HEADER_NAME]))dnl
+ AC_CHECK_HEADERS_ONCE(m4_defn([gl_HEADER_NAME]))dnl
+ if test AS_VAR_GET(ac_header_exists) = yes; then
+ gl_ABSOLUTE_HEADER_ONE(m4_defn([gl_HEADER_NAME]))
+ fi
+ AS_VAR_POPDEF([ac_header_exists])dnl
+ ])dnl
+ AC_DEFINE_UNQUOTED(AS_TR_CPP([ABSOLUTE_]m4_defn([gl_HEADER_NAME])),
+ ["AS_VAR_GET(gl_absolute_header)"],
+ [Define this to an absolute name of
<]m4_defn([gl_HEADER_NAME])[>.])
+ AS_VAR_POPDEF([gl_absolute_header])dnl
+])dnl
+])# gl_ABSOLUTE_HEADER
+
+# gl_ABSOLUTE_HEADER_ONE(HEADER)
+# ------------------------------
+# Like gl_ABSOLUTE_HEADER, except that:
+# - it assumes that the header exists,
+# - it uses the current CPPFLAGS,
+# - it does not cache the result,
+# - it is silent.
+AC_DEFUN([gl_ABSOLUTE_HEADER_ONE],
+[
+ AC_REQUIRE([AC_CANONICAL_HOST])
+ AC_LANG_CONFTEST([AC_LANG_SOURCE([[#include <]]m4_dquote([$1])[[>]])])
+ dnl AIX "xlc -E" and "cc -E" omit #line directives for header files
+ dnl that contain only a #include of other header files and no
+ dnl non-comment tokens of their own. This leads to a failure to
+ dnl detect the absolute name of <dirent.h>, <signal.h>, <poll.h>
+ dnl and others. The workaround is to force preservation of comments
+ dnl through option -C. This ensures all necessary #line directives
+ dnl are present. GCC supports option -C as well.
+ case "$host_os" in
+ aix*) gl_absname_cpp="$ac_cpp -C" ;;
+ *) gl_absname_cpp="$ac_cpp" ;;
+ esac
+changequote(,)
+ case "$host_os" in
+ mingw*)
+ dnl For the sake of native Windows compilers (excluding gcc),
+ dnl treat backslash as a directory separator, like /.
+ dnl Actually, these compilers use a double-backslash as
+ dnl directory separator, inside the
+ dnl # line "filename"
+ dnl directives.
+ gl_dirsep_regex='[/\\]'
+ ;;
+ *)
+ gl_dirsep_regex='\/'
+ ;;
+ esac
+ dnl A sed expression that turns a string into a basic regular
+ dnl expression, for use within "/.../".
+ gl_make_literal_regex_sed='s,[]$^\\.*/[],\\&,g'
+ gl_header_literal_regex=`echo '$1' \
+ | sed -e "$gl_make_literal_regex_sed"`
+ gl_absolute_header_sed="/${gl_dirsep_regex}${gl_header_literal_regex}/"'{
+ s/.*"\(.*'"${gl_dirsep_regex}${gl_header_literal_regex}"'\)".*/\1/
+ s|^/[^/]|//&|
+ p
+ q
+ }'
+changequote([,])
+ dnl eval is necessary to expand gl_absname_cpp.
+ dnl Ultrix and Pyramid sh refuse to redirect output of eval,
+ dnl so use subshell.
+ AS_VAR_SET([gl_cv_absolute_]AS_TR_SH([[$1]]),
+[`(eval "$gl_absname_cpp conftest.$ac_ext") 2>&AS_MESSAGE_LOG_FD |
+ sed -n "$gl_absolute_header_sed"`])
+])
diff --git a/lib/gl/m4/extensions.m4 b/lib/gl/m4/extensions.m4
index 6d17d8a..37f55ca 100644
--- a/lib/gl/m4/extensions.m4
+++ b/lib/gl/m4/extensions.m4
@@ -1,14 +1,14 @@
-# serial 12 -*- Autoconf -*-
+# serial 13 -*- Autoconf -*-
# Enable extensions on systems that normally disable them.
-# Copyright (C) 2003, 2006-2012 Free Software Foundation, Inc.
+# Copyright (C) 2003, 2006-2014 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.
-# This definition of AC_USE_SYSTEM_EXTENSIONS is stolen from CVS
+# This definition of AC_USE_SYSTEM_EXTENSIONS is stolen from git
# Autoconf. Perhaps we can remove this once we can assume Autoconf
-# 2.62 or later everywhere, but since CVS Autoconf mutates rapidly
+# 2.70 or later everywhere, but since Autoconf mutates rapidly
# enough in this area it's likely we'll need to redefine
# AC_USE_SYSTEM_EXTENSIONS for quite some time.
@@ -30,6 +30,7 @@
# ------------------------
# Enable extensions on systems that normally disable them,
# typically due to standards-conformance issues.
+#
# Remember that #undef in AH_VERBATIM gets replaced with #define by
# AC_DEFINE. The goal here is to define all known feature-enabling
# macros, then, if reports of conflicts are made, disable macros that
@@ -38,8 +39,6 @@ AC_DEFUN_ONCE([AC_USE_SYSTEM_EXTENSIONS],
[AC_BEFORE([$0], [AC_COMPILE_IFELSE])dnl
AC_BEFORE([$0], [AC_RUN_IFELSE])dnl
- AC_REQUIRE([AC_CANONICAL_HOST])
-
AC_CHECK_HEADER([minix/config.h], [MINIX=yes], [MINIX=])
if test "$MINIX" = yes; then
AC_DEFINE([_POSIX_SOURCE], [1],
@@ -50,24 +49,18 @@ AC_BEFORE([$0], [AC_RUN_IFELSE])dnl
except with this defined.])
AC_DEFINE([_MINIX], [1],
[Define to 1 if on MINIX.])
+ AC_DEFINE([_NETBSD_SOURCE], [1],
+ [Define to 1 to make NetBSD features available. MINIX 3 needs this.])
fi
- dnl HP-UX 11.11 defines mbstate_t only if _XOPEN_SOURCE is defined to 500,
- dnl regardless of whether the flags -Ae or _D_HPUX_SOURCE=1 are already
- dnl provided.
- case "$host_os" in
- hpux*)
- AC_DEFINE([_XOPEN_SOURCE], [500],
- [Define to 500 only on HP-UX.])
- ;;
- esac
-
- AH_VERBATIM([__EXTENSIONS__],
+dnl Use a different key than __EXTENSIONS__, as that name broke existing
+dnl configure.ac when using autoheader 2.62.
+ AH_VERBATIM([USE_SYSTEM_EXTENSIONS],
[/* Enable extensions on AIX 3, Interix. */
#ifndef _ALL_SOURCE
# undef _ALL_SOURCE
#endif
-/* Enable general extensions on Mac OS X. */
+/* Enable general extensions on OS X. */
#ifndef _DARWIN_C_SOURCE
# undef _DARWIN_C_SOURCE
#endif
@@ -83,6 +76,12 @@ AC_BEFORE([$0], [AC_RUN_IFELSE])dnl
#ifndef _TANDEM_SOURCE
# undef _TANDEM_SOURCE
#endif
+/* Enable X/Open extensions if necessary. HP-UX 11.11 defines
+ mbstate_t only if _XOPEN_SOURCE is defined to 500, regardless of
+ whether compiling with -Ae or -D_HPUX_SOURCE=1. */
+#ifndef _XOPEN_SOURCE
+# undef _XOPEN_SOURCE
+#endif
/* Enable general extensions on Solaris. */
#ifndef __EXTENSIONS__
# undef __EXTENSIONS__
@@ -103,6 +102,22 @@ AC_BEFORE([$0], [AC_RUN_IFELSE])dnl
AC_DEFINE([_GNU_SOURCE])
AC_DEFINE([_POSIX_PTHREAD_SEMANTICS])
AC_DEFINE([_TANDEM_SOURCE])
+ AC_CACHE_CHECK([whether _XOPEN_SOURCE should be defined],
+ [ac_cv_should_define__xopen_source],
+ [ac_cv_should_define__xopen_source=no
+ AC_COMPILE_IFELSE(
+ [AC_LANG_PROGRAM([[
+ #include <wchar.h>
+ mbstate_t x;]])],
+ [],
+ [AC_COMPILE_IFELSE(
+ [AC_LANG_PROGRAM([[
+ #define _XOPEN_SOURCE 500
+ #include <wchar.h>
+ mbstate_t x;]])],
+ [ac_cv_should_define__xopen_source=yes])])])
+ test $ac_cv_should_define__xopen_source = yes &&
+ AC_DEFINE([_XOPEN_SOURCE], [500])
])# AC_USE_SYSTEM_EXTENSIONS
# gl_USE_SYSTEM_EXTENSIONS
diff --git a/lib/gl/m4/extern-inline.m4 b/lib/gl/m4/extern-inline.m4
new file mode 100644
index 0000000..7f1bb39
--- /dev/null
+++ b/lib/gl/m4/extern-inline.m4
@@ -0,0 +1,99 @@
+dnl 'extern inline' a la ISO C99.
+
+dnl Copyright 2012-2014 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.
+
+AC_DEFUN([gl_EXTERN_INLINE],
+[
+ AH_VERBATIM([extern_inline],
+[/* Please see the Gnulib manual for how to use these macros.
+
+ Suppress extern inline with HP-UX cc, as it appears to be broken; see
+ <http://lists.gnu.org/archive/html/bug-texinfo/2013-02/msg00030.html>.
+
+ Suppress extern inline with Sun C in standards-conformance mode, as it
+ mishandles inline functions that call each other. E.g., for 'inline void f
+ (void) { } inline void g (void) { f (); }', c99 incorrectly complains
+ 'reference to static identifier "f" in extern inline function'.
+ This bug was observed with Sun C 5.12 SunOS_i386 2011/11/16.
+
+ Suppress extern inline (with or without __attribute__ ((__gnu_inline__)))
+ on configurations that mistakenly use 'static inline' to implement
+ functions or macros in standard C headers like <ctype.h>. For example,
+ if isdigit is mistakenly implemented via a static inline function,
+ a program containing an extern inline function that calls isdigit
+ may not work since the C standard prohibits extern inline functions
+ from calling static functions. This bug is known to occur on:
+
+ OS X 10.8 and earlier; see:
+ http://lists.gnu.org/archive/html/bug-gnulib/2012-12/msg00023.html
+
+ DragonFly; see
+
http://muscles.dragonflybsd.org/bulk/bleeding-edge-potential/latest-per-pkg/ah-tty-0.3.12.log
+
+ FreeBSD; see:
+ http://lists.gnu.org/archive/html/bug-gnulib/2014-07/msg00104.html
+
+ OS X 10.9 has a macro __header_inline indicating the bug is fixed for C and
+ for clang but remains for g++; see <http://trac.macports.org/ticket/41033>.
+ Assume DragonFly and FreeBSD will be similar. */
+#if (((defined __APPLE__ && defined __MACH__) \
+ || defined __DragonFly__ || defined __FreeBSD__) \
+ && (defined __header_inline \
+ ? (defined __cplusplus && defined __GNUC_STDC_INLINE__ \
+ && ! defined __clang__) \
+ : ((! defined _DONT_USE_CTYPE_INLINE_ \
+ && (defined __GNUC__ || defined __cplusplus)) \
+ || (defined _FORTIFY_SOURCE && 0 < _FORTIFY_SOURCE \
+ && defined __GNUC__ && ! defined __cplusplus))))
+# define _GL_EXTERN_INLINE_STDHEADER_BUG
+#endif
+#if ((__GNUC__ \
+ ? defined __GNUC_STDC_INLINE__ && __GNUC_STDC_INLINE__ \
+ : (199901L <= __STDC_VERSION__ \
+ && !defined __HP_cc \
+ && !(defined __SUNPRO_C && __STDC__))) \
+ && !defined _GL_EXTERN_INLINE_STDHEADER_BUG)
+# define _GL_INLINE inline
+# define _GL_EXTERN_INLINE extern inline
+# define _GL_EXTERN_INLINE_IN_USE
+#elif (2 < __GNUC__ + (7 <= __GNUC_MINOR__) && !defined __STRICT_ANSI__ \
+ && !defined _GL_EXTERN_INLINE_STDHEADER_BUG)
+# if defined __GNUC_GNU_INLINE__ && __GNUC_GNU_INLINE__
+ /* __gnu_inline__ suppresses a GCC 4.2 diagnostic. */
+# define _GL_INLINE extern inline __attribute__ ((__gnu_inline__))
+# else
+# define _GL_INLINE extern inline
+# endif
+# define _GL_EXTERN_INLINE extern
+# define _GL_EXTERN_INLINE_IN_USE
+#else
+# define _GL_INLINE static _GL_UNUSED
+# define _GL_EXTERN_INLINE static _GL_UNUSED
+#endif
+
+#if 4 < __GNUC__ + (6 <= __GNUC_MINOR__)
+# if defined __GNUC_STDC_INLINE__ && __GNUC_STDC_INLINE__
+# define _GL_INLINE_HEADER_CONST_PRAGMA
+# else
+# define _GL_INLINE_HEADER_CONST_PRAGMA \
+ _Pragma ("GCC diagnostic ignored \"-Wsuggest-attribute=const\"")
+# endif
+ /* Suppress GCC's bogus "no previous prototype for 'FOO'"
+ and "no previous declaration for 'FOO'" diagnostics,
+ when FOO is an inline function in the header; see
+ <http://gcc.gnu.org/bugzilla/show_bug.cgi?id=54113>. */
+# define _GL_INLINE_HEADER_BEGIN \
+ _Pragma ("GCC diagnostic push") \
+ _Pragma ("GCC diagnostic ignored \"-Wmissing-prototypes\"") \
+ _Pragma ("GCC diagnostic ignored \"-Wmissing-declarations\"") \
+ _GL_INLINE_HEADER_CONST_PRAGMA
+# define _GL_INLINE_HEADER_END \
+ _Pragma ("GCC diagnostic pop")
+#else
+# define _GL_INLINE_HEADER_BEGIN
+# define _GL_INLINE_HEADER_END
+#endif])
+])
diff --git a/lib/gl/m4/gnulib-cache.m4 b/lib/gl/m4/gnulib-cache.m4
index 162db60..5340646 100644
--- a/lib/gl/m4/gnulib-cache.m4
+++ b/lib/gl/m4/gnulib-cache.m4
@@ -1,4 +1,4 @@
-# Copyright (C) 2002-2012 Free Software Foundation, Inc.
+# Copyright (C) 2002-2014 Free Software Foundation, Inc.
#
# This file is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/lib/gl/m4/gnulib-common.m4 b/lib/gl/m4/gnulib-common.m4
index 15d2b2b..31e5f94 100644
--- a/lib/gl/m4/gnulib-common.m4
+++ b/lib/gl/m4/gnulib-common.m4
@@ -1,5 +1,5 @@
-# gnulib-common.m4 serial 33
-dnl Copyright (C) 2007-2012 Free Software Foundation, Inc.
+# gnulib-common.m4 serial 36
+dnl Copyright (C) 2007-2014 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.
@@ -49,6 +49,16 @@ AC_DEFUN([gl_COMMON_BODY], [
is a misnomer outside of parameter lists. */
#define _UNUSED_PARAMETER_ _GL_UNUSED
+/* gcc supports the "unused" attribute on possibly unused labels, and
+ g++ has since version 4.5. Note to support C++ as well as C,
+ _GL_UNUSED_LABEL should be used with a trailing ; */
+#if !defined __cplusplus || __GNUC__ > 4 \
+ || (__GNUC__ == 4 && __GNUC_MINOR__ >= 5)
+# define _GL_UNUSED_LABEL _GL_UNUSED
+#else
+# define _GL_UNUSED_LABEL
+#endif
+
/* The __pure__ attribute was added in gcc 2.96. */
#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 96)
# define _GL_ATTRIBUTE_PURE __attribute__ ((__pure__))
@@ -294,6 +304,8 @@ Amsterdam
# for interoperability with automake-1.9.6 from autoconf-2.62.
# Remove this macro when we can assume autoconf >= 2.62 or
# autoconf >= 2.60 && automake >= 1.10.
+# AC_AUTOCONF_VERSION was introduced in 2.62, so use that as the witness.
+m4_ifndef([AC_AUTOCONF_VERSION],[
m4_ifdef([AC_PROG_MKDIR_P], [
dnl For automake-1.9.6 && autoconf < 2.62: Ensure MKDIR_P is AC_SUBSTed.
m4_define([AC_PROG_MKDIR_P],
@@ -304,27 +316,31 @@ m4_ifdef([AC_PROG_MKDIR_P], [
[AC_REQUIRE([AM_PROG_MKDIR_P])dnl defined by automake
MKDIR_P='$(mkdir_p)'
AC_SUBST([MKDIR_P])])])
+])
# AC_C_RESTRICT
-# This definition overrides the AC_C_RESTRICT macro from autoconf 2.60..2.61,
-# so that mixed use of GNU C and GNU C++ and mixed use of Sun C and Sun C++
-# works.
-# This definition can be removed once autoconf >= 2.62 can be assumed.
-m4_if(m4_version_compare(m4_defn([m4_PACKAGE_VERSION]),[2.62]),[-1],[
+# This definition is copied from post-2.69 Autoconf and overrides the
+# AC_C_RESTRICT macro from autoconf 2.60..2.69. It can be removed
+# once autoconf >= 2.70 can be assumed. It's painful to check version
+# numbers, and in practice this macro is more up-to-date than Autoconf
+# is, so override Autoconf unconditionally.
AC_DEFUN([AC_C_RESTRICT],
[AC_CACHE_CHECK([for C/C++ restrict keyword], [ac_cv_c_restrict],
[ac_cv_c_restrict=no
# The order here caters to the fact that C++ does not require restrict.
for ac_kw in __restrict __restrict__ _Restrict restrict; do
- AC_COMPILE_IFELSE([AC_LANG_PROGRAM(
- [[typedef int * int_ptr;
- int foo (int_ptr $ac_kw ip) {
- return ip[0];
- }]],
- [[int s[1];
- int * $ac_kw t = s;
- t[0] = 0;
- return foo(t)]])],
+ AC_COMPILE_IFELSE(
+ [AC_LANG_PROGRAM(
+ [[typedef int *int_ptr;
+ int foo (int_ptr $ac_kw ip) { return ip[0]; }
+ int bar (int [$ac_kw]); /* Catch GCC bug 14050. */
+ int bar (int ip[$ac_kw]) { return ip[0]; }
+ ]],
+ [[int s[1];
+ int *$ac_kw t = s;
+ t[0] = 0;
+ return foo (t) + bar (t);
+ ]])],
[ac_cv_c_restrict=$ac_kw])
test "$ac_cv_c_restrict" != no && break
done
@@ -334,21 +350,21 @@ AC_DEFUN([AC_C_RESTRICT],
nothing if this is not supported. Do not define if restrict is
supported directly. */
#undef restrict
-/* Work around a bug in Sun C++: it does not support _Restrict, even
- though the corresponding Sun C compiler does, which causes
- "#define restrict _Restrict" in the previous line. Perhaps some future
- version of Sun C++ will work with _Restrict; if so, it'll probably
- define __RESTRICT, just as Sun C does. */
+/* Work around a bug in Sun C++: it does not support _Restrict or
+ __restrict__, even though the corresponding Sun C compiler ends up with
+ "#define restrict _Restrict" or "#define restrict __restrict__" in the
+ previous line. Perhaps some future version of Sun C++ will work with
+ restrict; if so, hopefully it defines __RESTRICT like Sun C does. */
#if defined __SUNPRO_CC && !defined __RESTRICT
# define _Restrict
+# define __restrict__
#endif])
case $ac_cv_c_restrict in
restrict) ;;
no) AC_DEFINE([restrict], []) ;;
*) AC_DEFINE_UNQUOTED([restrict], [$ac_cv_c_restrict]) ;;
esac
-])
-])
+])# AC_C_RESTRICT
# gl_BIGENDIAN
# is like AC_C_BIGENDIAN, except that it can be AC_REQUIREd.
@@ -371,3 +387,63 @@ AC_DEFUN([gl_CACHE_VAL_SILENT],
AC_CACHE_VAL([$1], [$2])
as_echo_n="$saved_as_echo_n"
])
+
+# AS_VAR_COPY was added in autoconf 2.63b
+m4_define_default([AS_VAR_COPY],
+[AS_LITERAL_IF([$1[]$2], [$1=$$2], [eval $1=\$$2])])
+
+# AC_PROG_SED was added in autoconf 2.59b
+m4_ifndef([AC_PROG_SED],
+[AC_DEFUN([AC_PROG_SED],
+[AC_CACHE_CHECK([for a sed that does not truncate output], ac_cv_path_SED,
+ [dnl ac_script should not contain more than 99 commands (for HP-UX sed),
+ dnl but more than about 7000 bytes, to catch a limit in Solaris 8
/usr/ucb/sed.
+
ac_script=s/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa/bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb/
+ for ac_i in 1 2 3 4 5 6 7; do
+ ac_script="$ac_script$as_nl$ac_script"
+ done
+ echo "$ac_script" 2>/dev/null | sed 99q >conftest.sed
+ AS_UNSET([ac_script])
+ if test -z "$SED"; then
+ ac_path_SED_found=false
+ _AS_PATH_WALK([], [
+ for ac_prog in sed gsed; do
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ ac_path_SED="$as_dir/$ac_prog$ac_exec_ext"
+ AS_EXECUTABLE_P(["$ac_path_SED"]) || continue
+ case `"$ac_path_SED" --version 2>&1` in
+ *GNU*) ac_cv_path_SED=$ac_path_SED ac_path_SED_found=:;;
+ *)
+ ac_count=0
+ _AS_ECHO_N([0123456789]) >conftest.in
+ while :
+ do
+ cat conftest.in conftest.in >conftest.tmp
+ mv conftest.tmp conftest.in
+ cp conftest.in conftest.nl
+ echo >> conftest.nl
+ "$ac_path_SED" -f conftest.sed <conftest.nl >conftest.out
2>/dev/null || break
+ diff conftest.out conftest.nl >/dev/null 2>&1 || break
+ ac_count=`expr $ac_count + 1`
+ if test $ac_count -gt ${ac_path_SED_max-0}; then
+ # Best so far, but keep looking for better
+ ac_cv_path_SED=$ac_path_SED
+ ac_path_SED_max=$ac_count
+ fi
+ test $ac_count -gt 10 && break
+ done
+ rm -f conftest.in conftest.tmp conftest.nl conftest.out;;
+ esac
+ $ac_path_SED_found && break 3
+ done
+ done])
+ if test -z "$ac_cv_path_SED"; then
+ AC_ERROR([no acceptable sed could be found in \$PATH])
+ fi
+ else
+ ac_cv_path_SED=$SED
+ fi
+ SED="$ac_cv_path_SED"
+ AC_SUBST([SED])dnl
+ rm -f conftest.sed
+])])])
diff --git a/lib/gl/m4/gnulib-comp.m4 b/lib/gl/m4/gnulib-comp.m4
index 1d9d335..5fcf74a 100644
--- a/lib/gl/m4/gnulib-comp.m4
+++ b/lib/gl/m4/gnulib-comp.m4
@@ -1,5 +1,5 @@
# DO NOT EDIT! GENERATED AUTOMATICALLY!
-# Copyright (C) 2002-2012 Free Software Foundation, Inc.
+# Copyright (C) 2002-2014 Free Software Foundation, Inc.
#
# This file is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
@@ -38,8 +38,10 @@ AC_DEFUN([libgl_EARLY],
m4_pattern_allow([^gl_LIBOBJS$])dnl a variable
m4_pattern_allow([^gl_LTLIBOBJS$])dnl a variable
AC_REQUIRE([gl_PROG_AR_RANLIB])
+ # Code from module absolute-header:
# Code from module extensions:
AC_REQUIRE([gl_USE_SYSTEM_EXTENSIONS])
+ # Code from module extern-inline:
# Code from module gettext-h:
# Code from module include_next:
# Code from module lib-msvc-compat:
@@ -65,17 +67,18 @@ AC_DEFUN([libgl_INIT],
m4_pushdef([libgl_LIBSOURCES_DIR], [])
gl_COMMON
gl_source_base='lib/gl'
-AC_SUBST([LIBINTL])
-AC_SUBST([LTLIBINTL])
-gl_LD_OUTPUT_DEF
-gl_STDDEF_H
-gl_HEADER_STRING_H
-gl_FUNC_STRVERSCMP
-if test $HAVE_STRVERSCMP = 0; then
- AC_LIBOBJ([strverscmp])
- gl_PREREQ_STRVERSCMP
-fi
-gl_STRING_MODULE_INDICATOR([strverscmp])
+ AC_REQUIRE([gl_EXTERN_INLINE])
+ AC_SUBST([LIBINTL])
+ AC_SUBST([LTLIBINTL])
+ gl_LD_OUTPUT_DEF
+ gl_STDDEF_H
+ gl_HEADER_STRING_H
+ gl_FUNC_STRVERSCMP
+ if test $HAVE_STRVERSCMP = 0; then
+ AC_LIBOBJ([strverscmp])
+ gl_PREREQ_STRVERSCMP
+ fi
+ gl_STRING_MODULE_INDICATOR([strverscmp])
# End of code from modules
m4_ifval(libgl_LIBSOURCES_LIST, [
m4_syscmd([test ! -d ]m4_defn([libgl_LIBSOURCES_DIR])[ ||
@@ -221,7 +224,9 @@ AC_DEFUN([libgl_FILE_LIST], [
lib/string.in.h
lib/strverscmp.c
m4/00gnulib.m4
+ m4/absolute-header.m4
m4/extensions.m4
+ m4/extern-inline.m4
m4/gnulib-common.m4
m4/include_next.m4
m4/ld-output-def.m4
diff --git a/lib/gl/m4/gnulib-tool.m4 b/lib/gl/m4/gnulib-tool.m4
index a09ffc1..a588e15 100644
--- a/lib/gl/m4/gnulib-tool.m4
+++ b/lib/gl/m4/gnulib-tool.m4
@@ -1,5 +1,5 @@
# gnulib-tool.m4 serial 2
-dnl Copyright (C) 2004-2005, 2009-2012 Free Software Foundation, Inc.
+dnl Copyright (C) 2004-2005, 2009-2014 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/lib/gl/m4/include_next.m4 b/lib/gl/m4/include_next.m4
index a60a261..69ad3db 100644
--- a/lib/gl/m4/include_next.m4
+++ b/lib/gl/m4/include_next.m4
@@ -1,5 +1,5 @@
# include_next.m4 serial 23
-dnl Copyright (C) 2006-2012 Free Software Foundation, Inc.
+dnl Copyright (C) 2006-2014 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.
@@ -192,56 +192,9 @@ dnl until we can assume autoconf 2.64 or newer.
if test AS_VAR_GET(gl_header_exists) = yes; then
AS_VAR_POPDEF([gl_header_exists])
])
- AC_LANG_CONFTEST(
- [AC_LANG_SOURCE(
- [[#include <]]m4_dquote(m4_defn([gl_HEADER_NAME]))[[>]]
- )])
- dnl AIX "xlc -E" and "cc -E" omit #line directives for header
- dnl files that contain only a #include of other header files and
- dnl no non-comment tokens of their own. This leads to a failure
- dnl to detect the absolute name of <dirent.h>, <signal.h>,
- dnl <poll.h> and others. The workaround is to force preservation
- dnl of comments through option -C. This ensures all necessary
- dnl #line directives are present. GCC supports option -C as
well.
- case "$host_os" in
- aix*) gl_absname_cpp="$ac_cpp -C" ;;
- *) gl_absname_cpp="$ac_cpp" ;;
- esac
-changequote(,)
- case "$host_os" in
- mingw*)
- dnl For the sake of native Windows compilers (excluding
gcc),
- dnl treat backslash as a directory separator, like /.
- dnl Actually, these compilers use a double-backslash as
- dnl directory separator, inside the
- dnl # line "filename"
- dnl directives.
- gl_dirsep_regex='[/\\]'
- ;;
- *)
- gl_dirsep_regex='\/'
- ;;
- esac
- dnl A sed expression that turns a string into a basic regular
- dnl expression, for use within "/.../".
- gl_make_literal_regex_sed='s,[]$^\\.*/[],\\&,g'
-changequote([,])
- gl_header_literal_regex=`echo ']m4_defn([gl_HEADER_NAME])[' \
- | sed -e "$gl_make_literal_regex_sed"`
-
gl_absolute_header_sed="/${gl_dirsep_regex}${gl_header_literal_regex}/"'{
-
s/.*"\(.*'"${gl_dirsep_regex}${gl_header_literal_regex}"'\)".*/\1/
-changequote(,)dnl
- s|^/[^/]|//&|
-changequote([,])dnl
- p
- q
- }'
- dnl eval is necessary to expand gl_absname_cpp.
- dnl Ultrix and Pyramid sh refuse to redirect output of eval,
- dnl so use subshell.
- AS_VAR_SET(gl_next_header,
- ['"'`(eval "$gl_absname_cpp conftest.$ac_ext")
2>&AS_MESSAGE_LOG_FD |
- sed -n "$gl_absolute_header_sed"`'"'])
+ gl_ABSOLUTE_HEADER_ONE(gl_HEADER_NAME)
+ AS_VAR_COPY([gl_header], [gl_cv_absolute_]AS_TR_SH(gl_HEADER_NAME))
+ AS_VAR_SET(gl_next_header, ['"'$gl_header'"'])
m4_if([$2], [check],
[else
AS_VAR_SET(gl_next_header, ['<'gl_HEADER_NAME'>'])
diff --git a/lib/gl/m4/ld-output-def.m4 b/lib/gl/m4/ld-output-def.m4
index 3511684..19d7e9a 100644
--- a/lib/gl/m4/ld-output-def.m4
+++ b/lib/gl/m4/ld-output-def.m4
@@ -1,5 +1,5 @@
# ld-output-def.m4 serial 2
-dnl Copyright (C) 2008-2012 Free Software Foundation, Inc.
+dnl Copyright (C) 2008-2014 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/lib/gl/m4/stddef_h.m4 b/lib/gl/m4/stddef_h.m4
index cc11609..c555e29 100644
--- a/lib/gl/m4/stddef_h.m4
+++ b/lib/gl/m4/stddef_h.m4
@@ -1,6 +1,6 @@
dnl A placeholder for POSIX 2008 <stddef.h>, for platforms that have issues.
# stddef_h.m4 serial 4
-dnl Copyright (C) 2009-2012 Free Software Foundation, Inc.
+dnl Copyright (C) 2009-2014 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/lib/gl/m4/string_h.m4 b/lib/gl/m4/string_h.m4
index 5677e09..64e683f 100644
--- a/lib/gl/m4/string_h.m4
+++ b/lib/gl/m4/string_h.m4
@@ -1,6 +1,6 @@
# Configure a GNU-like replacement for <string.h>.
-# Copyright (C) 2007-2012 Free Software Foundation, Inc.
+# Copyright (C) 2007-2014 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/lib/gl/m4/strverscmp.m4 b/lib/gl/m4/strverscmp.m4
index d744647..aca1d54 100644
--- a/lib/gl/m4/strverscmp.m4
+++ b/lib/gl/m4/strverscmp.m4
@@ -1,5 +1,5 @@
# strverscmp.m4 serial 8
-dnl Copyright (C) 2002, 2005-2012 Free Software Foundation, Inc.
+dnl Copyright (C) 2002, 2005-2014 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/lib/gl/m4/warn-on-use.m4 b/lib/gl/m4/warn-on-use.m4
index a77802e..cc690f8 100644
--- a/lib/gl/m4/warn-on-use.m4
+++ b/lib/gl/m4/warn-on-use.m4
@@ -1,5 +1,5 @@
# warn-on-use.m4 serial 5
-dnl Copyright (C) 2010-2012 Free Software Foundation, Inc.
+dnl Copyright (C) 2010-2014 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/lib/gl/m4/wchar_t.m4 b/lib/gl/m4/wchar_t.m4
index 534735d..839a04c 100644
--- a/lib/gl/m4/wchar_t.m4
+++ b/lib/gl/m4/wchar_t.m4
@@ -1,5 +1,5 @@
# wchar_t.m4 serial 4 (gettext-0.18.2)
-dnl Copyright (C) 2002-2003, 2008-2012 Free Software Foundation, Inc.
+dnl Copyright (C) 2002-2003, 2008-2014 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/lib/gl/stddef.in.h b/lib/gl/stddef.in.h
index 17fcaea..f5c0e05 100644
--- a/lib/gl/stddef.in.h
+++ b/lib/gl/stddef.in.h
@@ -1,6 +1,6 @@
/* A substitute for POSIX 2008 <stddef.h>, for platforms that have issues.
- Copyright (C) 2009-2012 Free Software Foundation, Inc.
+ Copyright (C) 2009-2014 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
diff --git a/lib/gl/string.in.h b/lib/gl/string.in.h
index f8d7520..9062142 100644
--- a/lib/gl/string.in.h
+++ b/lib/gl/string.in.h
@@ -1,6 +1,6 @@
/* A GNU-like <string.h>.
- Copyright (C) 1995-1996, 2001-2012 Free Software Foundation, Inc.
+ Copyright (C) 1995-1996, 2001-2014 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
diff --git a/lib/gl/strverscmp.c b/lib/gl/strverscmp.c
index 490773d..5f2a3dc 100644
--- a/lib/gl/strverscmp.c
+++ b/lib/gl/strverscmp.c
@@ -1,5 +1,5 @@
/* Compare strings while treating digits characters numerically.
- Copyright (C) 1997, 2000, 2002, 2004, 2006, 2009-2012 Free Software
+ Copyright (C) 1997, 2000, 2002, 2004, 2006, 2009-2014 Free Software
Foundation, Inc.
This file is part of the GNU C Library.
Contributed by Jean-François Bignolles <address@hidden>, 1997.
diff --git a/lib/headers/gss.h.in b/lib/headers/gss.h.in
index 6e8fd88..a403508 100644
--- a/lib/headers/gss.h.in
+++ b/lib/headers/gss.h.in
@@ -1,5 +1,5 @@
/* gss.h --- Header file for GSSLib. -*- c -*-
- * Copyright (C) 2003-2013 Simon Josefsson
+ * Copyright (C) 2003-2014 Simon Josefsson
*
* This file is part of the Generic Security Service (GSS).
*
diff --git a/lib/headers/gss/ext.h b/lib/headers/gss/ext.h
index 27410d7..6b1b239 100644
--- a/lib/headers/gss/ext.h
+++ b/lib/headers/gss/ext.h
@@ -1,5 +1,5 @@
/* ext.h --- Header file for non-standard GSS-API functions.
- * Copyright (C) 2003-2013 Simon Josefsson
+ * Copyright (C) 2003-2014 Simon Josefsson
*
* This file is part of the Generic Security Service (GSS).
*
diff --git a/lib/headers/gss/krb5-ext.h b/lib/headers/gss/krb5-ext.h
index 37406b7..4243101 100644
--- a/lib/headers/gss/krb5-ext.h
+++ b/lib/headers/gss/krb5-ext.h
@@ -1,5 +1,5 @@
/* gss/krb5-ext.h --- Header file for Kerberos 5 GSS-API mechanism.
- * Copyright (C) 2003-2013 Simon Josefsson
+ * Copyright (C) 2003-2014 Simon Josefsson
*
* This file is part of the Generic Security Service (GSS).
*
diff --git a/lib/headers/gss/krb5.h b/lib/headers/gss/krb5.h
index adb2e4b..aa1d1e5 100644
--- a/lib/headers/gss/krb5.h
+++ b/lib/headers/gss/krb5.h
@@ -1,5 +1,5 @@
/* gss/krb5.h --- Header file for Kerberos 5 GSS-API mechanism.
- * Copyright (C) 2003-2013 Simon Josefsson
+ * Copyright (C) 2003-2014 Simon Josefsson
*
* This file is part of the Generic Security Service (GSS).
*
diff --git a/lib/internal.h b/lib/internal.h
index 4eea04f..efa40cf 100644
--- a/lib/internal.h
+++ b/lib/internal.h
@@ -1,5 +1,5 @@
/* internal.h --- Internal header file for GSS.
- * Copyright (C) 2003-2013 Simon Josefsson
+ * Copyright (C) 2003-2014 Simon Josefsson
*
* This file is part of the Generic Security Service (GSS).
*
diff --git a/lib/krb5/Makefile.am b/lib/krb5/Makefile.am
index 80688f2..b114f8c 100644
--- a/lib/krb5/Makefile.am
+++ b/lib/krb5/Makefile.am
@@ -1,5 +1,5 @@
## Process this file with automake to produce Makefile.in
-# Copyright (C) 2003-2013 Simon Josefsson
+# Copyright (C) 2003-2014 Simon Josefsson
#
# This file is part of the Generic Security Service (GSS).
#
diff --git a/lib/krb5/checksum.c b/lib/krb5/checksum.c
index 4b63ac7..484e35c 100644
--- a/lib/krb5/checksum.c
+++ b/lib/krb5/checksum.c
@@ -1,5 +1,5 @@
/* krb5/checksum.c --- (Un)pack checksum fields in Krb5 GSS contexts.
- * Copyright (C) 2003-2013 Simon Josefsson
+ * Copyright (C) 2003-2014 Simon Josefsson
*
* This file is part of the Generic Security Service (GSS).
*
diff --git a/lib/krb5/checksum.h b/lib/krb5/checksum.h
index 9f8fa76..415ef24 100644
--- a/lib/krb5/checksum.h
+++ b/lib/krb5/checksum.h
@@ -1,5 +1,5 @@
/* krb5/checksum.h --- (Un)pack checksum fields in Krb5 GSS contexts.
- * Copyright (C) 2003-2013 Simon Josefsson
+ * Copyright (C) 2003-2014 Simon Josefsson
*
* This file is part of the Generic Security Service (GSS).
*
diff --git a/lib/krb5/context.c b/lib/krb5/context.c
index 306efa8..02c1ddb 100644
--- a/lib/krb5/context.c
+++ b/lib/krb5/context.c
@@ -1,5 +1,5 @@
/* krb5/context.c --- Implementation of Kerberos 5 GSS Context functions.
- * Copyright (C) 2003-2013 Simon Josefsson
+ * Copyright (C) 2003-2014 Simon Josefsson
*
* This file is part of the Generic Security Service (GSS).
*
diff --git a/lib/krb5/cred.c b/lib/krb5/cred.c
index a006be2..d22aca0 100644
--- a/lib/krb5/cred.c
+++ b/lib/krb5/cred.c
@@ -1,5 +1,5 @@
/* krb5/cred.c --- Kerberos 5 GSS-API credential management functions.
- * Copyright (C) 2003-2013 Simon Josefsson
+ * Copyright (C) 2003-2014 Simon Josefsson
*
* This file is part of the Generic Security Service (GSS).
*
diff --git a/lib/krb5/error.c b/lib/krb5/error.c
index 81fa564..b0df8e3 100644
--- a/lib/krb5/error.c
+++ b/lib/krb5/error.c
@@ -1,5 +1,5 @@
/* krb5/error.c --- Kerberos 5 GSS-API error handling functionality.
- * Copyright (C) 2003-2013 Simon Josefsson
+ * Copyright (C) 2003-2014 Simon Josefsson
*
* This file is part of the Generic Security Service (GSS).
*
diff --git a/lib/krb5/k5internal.h b/lib/krb5/k5internal.h
index 025bd57..2c29a5a 100644
--- a/lib/krb5/k5internal.h
+++ b/lib/krb5/k5internal.h
@@ -1,5 +1,5 @@
/* k5internal.h --- Internal header file for Kerberos 5 GSS.
- * Copyright (C) 2003-2013 Simon Josefsson
+ * Copyright (C) 2003-2014 Simon Josefsson
*
* This file is part of the Generic Security Service (GSS).
*
diff --git a/lib/krb5/msg.c b/lib/krb5/msg.c
index 7f303f1..81362a5 100644
--- a/lib/krb5/msg.c
+++ b/lib/krb5/msg.c
@@ -1,5 +1,5 @@
/* krb5/msg.c --- Implementation of Kerberos 5 GSS-API Per-Message functions.
- * Copyright (C) 2003-2013 Simon Josefsson
+ * Copyright (C) 2003-2014 Simon Josefsson
*
* This file is part of the Generic Security Service (GSS).
*
diff --git a/lib/krb5/name.c b/lib/krb5/name.c
index 5d149f0..20039dd 100644
--- a/lib/krb5/name.c
+++ b/lib/krb5/name.c
@@ -1,5 +1,5 @@
/* krb5/name.c --- Implementation of Kerberos 5 GSS-API Name functions.
- * Copyright (C) 2003-2013 Simon Josefsson
+ * Copyright (C) 2003-2014 Simon Josefsson
*
* This file is part of the Generic Security Service (GSS).
*
diff --git a/lib/krb5/oid.c b/lib/krb5/oid.c
index dde46f4..3ee7bbe 100644
--- a/lib/krb5/oid.c
+++ b/lib/krb5/oid.c
@@ -1,5 +1,5 @@
/* krb5/oid.c --- Definition of static Kerberos 5 GSS-API OIDs.
- * Copyright (C) 2003-2013 Simon Josefsson
+ * Copyright (C) 2003-2014 Simon Josefsson
*
* This file is part of the Generic Security Service (GSS).
*
diff --git a/lib/krb5/protos.h b/lib/krb5/protos.h
index e97a00f..2730068 100644
--- a/lib/krb5/protos.h
+++ b/lib/krb5/protos.h
@@ -1,5 +1,5 @@
/* protos.h --- Export Kerberos 5 GSS functions to core GSS library.
- * Copyright (C) 2003-2013 Simon Josefsson
+ * Copyright (C) 2003-2014 Simon Josefsson
*
* This file is part of the Generic Security Service (GSS).
*
diff --git a/lib/krb5/utils.c b/lib/krb5/utils.c
index 7cce2c6..fcf2034 100644
--- a/lib/krb5/utils.c
+++ b/lib/krb5/utils.c
@@ -1,5 +1,5 @@
/* krb5/utils.c --- Kerberos 5 GSS-API helper functions.
- * Copyright (C) 2003-2013 Simon Josefsson
+ * Copyright (C) 2003-2014 Simon Josefsson
*
* This file is part of the Generic Security Service (GSS).
*
diff --git a/lib/libgss.map b/lib/libgss.map
index 292a4a9..110e42f 100644
--- a/lib/libgss.map
+++ b/lib/libgss.map
@@ -1,4 +1,4 @@
-# Copyright (C) 2009-2013 Simon Josefsson
+# Copyright (C) 2009-2014 Simon Josefsson
#
# This file is part of the Generic Security Service (GSS).
#
diff --git a/lib/meta.c b/lib/meta.c
index d8e1dc2..65ff666 100644
--- a/lib/meta.c
+++ b/lib/meta.c
@@ -1,5 +1,5 @@
/* meta.c --- Implementation of function selection depending on mechanism.
- * Copyright (C) 2003-2013 Simon Josefsson
+ * Copyright (C) 2003-2014 Simon Josefsson
*
* This file is part of the Generic Security Service (GSS).
*
diff --git a/lib/meta.h b/lib/meta.h
index c44cc17..54e2f12 100644
--- a/lib/meta.h
+++ b/lib/meta.h
@@ -1,5 +1,5 @@
/* meta.h --- Prototypes for internally visible symbols from meta.c.
- * Copyright (C) 2003-2013 Simon Josefsson
+ * Copyright (C) 2003-2014 Simon Josefsson
*
* This file is part of the Generic Security Service (GSS).
*
diff --git a/lib/misc.c b/lib/misc.c
index c81fa6e..87d35c4 100644
--- a/lib/misc.c
+++ b/lib/misc.c
@@ -1,5 +1,5 @@
/* misc.c --- Implementation of GSS-API Miscellaneous functions.
- * Copyright (C) 2003-2013 Simon Josefsson
+ * Copyright (C) 2003-2014 Simon Josefsson
*
* This file is part of the Generic Security Service (GSS).
*
diff --git a/lib/msg.c b/lib/msg.c
index fda3065..50f5af5 100644
--- a/lib/msg.c
+++ b/lib/msg.c
@@ -1,5 +1,5 @@
/* msg.c --- Implementation of GSS-API Per-Message functions.
- * Copyright (C) 2003-2013 Simon Josefsson
+ * Copyright (C) 2003-2014 Simon Josefsson
*
* This file is part of the Generic Security Service (GSS).
*
diff --git a/lib/name.c b/lib/name.c
index d8a5636..15c1831 100644
--- a/lib/name.c
+++ b/lib/name.c
@@ -1,5 +1,5 @@
/* name.c --- Implementation of GSS-API Name Manipulation functions.
- * Copyright (C) 2003-2013 Simon Josefsson
+ * Copyright (C) 2003-2014 Simon Josefsson
*
* This file is part of the Generic Security Service (GSS).
*
diff --git a/lib/obsolete.c b/lib/obsolete.c
index ae6bb29..ee71822 100644
--- a/lib/obsolete.c
+++ b/lib/obsolete.c
@@ -1,5 +1,5 @@
/* obsolete.c --- Obsolete GSS-API v1 compatibility mappings.
- * Copyright (C) 2003-2013 Simon Josefsson
+ * Copyright (C) 2003-2014 Simon Josefsson
*
* This file is part of the Generic Security Service (GSS).
*
diff --git a/lib/oid.c b/lib/oid.c
index 4a11270..8c4b583 100644
--- a/lib/oid.c
+++ b/lib/oid.c
@@ -1,5 +1,5 @@
/* oid.c --- Definition of static GSS-API OIDs.
- * Copyright (C) 2003-2013 Simon Josefsson
+ * Copyright (C) 2003-2014 Simon Josefsson
*
* This file is part of the Generic Security Service (GSS).
*
diff --git a/lib/saslname.c b/lib/saslname.c
index 695ea5c..9bdbf58 100644
--- a/lib/saslname.c
+++ b/lib/saslname.c
@@ -1,5 +1,5 @@
/* saslname.c --- Implementation of the SASL GS2 interfaces.
- * Copyright (C) 2010-2013 Simon Josefsson
+ * Copyright (C) 2010-2014 Simon Josefsson
*
* This file is part of the Generic Security Service (GSS).
*
diff --git a/lib/version.c b/lib/version.c
index 003bae2..42a0413 100644
--- a/lib/version.c
+++ b/lib/version.c
@@ -1,5 +1,5 @@
/* version.c --- Version handling.
- * Copyright (C) 2002-2013 Simon Josefsson
+ * Copyright (C) 2002-2014 Simon Josefsson
*
* This file is part of the Generic Security Service (GSS).
*
diff --git a/maint.mk b/maint.mk
index a2b0b8d..1f5bddd 100644
--- a/maint.mk
+++ b/maint.mk
@@ -2,7 +2,7 @@
# This Makefile fragment tries to be general-purpose enough to be
# used by many projects via the gnulib maintainer-makefile module.
-## Copyright (C) 2001-2012 Free Software Foundation, Inc.
+## Copyright (C) 2001-2014 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
@@ -21,12 +21,27 @@
# ME := $(word $(words $(MAKEFILE_LIST)),$(MAKEFILE_LIST))
ME := maint.mk
-# Diagnostic for continued use of deprecated variable.
-# Remove in 2013
-ifneq ($(build_aux),)
- $(error "$(ME): \
-set $$(_build-aux) relative to $$(srcdir) instead of $$(build_aux)")
-endif
+# Helper variables.
+_empty =
+_sp = $(_empty) $(_empty)
+
+# _equal,S1,S2
+# ------------
+# If S1 == S2, return S1, otherwise the empty string.
+_equal = $(and $(findstring $(1),$(2)),$(findstring $(2),$(1)))
+
+# member-check,VARIABLE,VALID-VALUES
+# ----------------------------------
+# Check that $(VARIABLE) is in the space-separated list of VALID-VALUES, and
+# return it. Die otherwise.
+member-check = \
+ $(strip \
+ $(if $($(1)), \
+ $(if $(findstring $(_sp),$($(1))), \
+ $(error invalid $(1): '$($(1))', expected $(2)), \
+ $(or $(findstring $(_sp)$($(1))$(_sp),$(_sp)$(2)$(_sp)), \
+ $(error invalid $(1): '$($(1))', expected $(2)))), \
+ $(error $(1) undefined)))
# Do not save the original name or timestamp in the .tar.gz file.
# Use --rsyncable if available.
@@ -52,9 +67,9 @@ _dot_escaped_srcdir = $(subst .,\.,$(srcdir))
# Post-process $(VC_LIST) output, prepending $(srcdir)/, but only
# when $(srcdir) is not ".".
ifeq ($(srcdir),.)
-_prepend_srcdir_prefix =
+ _prepend_srcdir_prefix =
else
-_prepend_srcdir_prefix = | sed 's|^|$(srcdir)/|'
+ _prepend_srcdir_prefix = | $(SED) 's|^|$(srcdir)/|'
endif
# In order to be able to consistently filter "."-relative names,
@@ -63,7 +78,7 @@ endif
_sc_excl = \
$(or $(exclude_file_name_regexp--$@),^$$)
VC_LIST_EXCEPT = \
- $(VC_LIST) | sed 's|^$(_dot_escaped_srcdir)/||' \
+ $(VC_LIST) | $(SED) 's|^$(_dot_escaped_srcdir)/||' \
| if test -f $(srcdir)/.x-$@; then grep -vEf $(srcdir)/.x-$@; \
else grep -Ev -e "$${VC_LIST_EXCEPT_DEFAULT-ChangeLog}"; fi \
| grep -Ev -e '($(VC_LIST_ALWAYS_EXCLUDE_REGEX)|$(_sc_excl))' \
@@ -78,32 +93,41 @@ VERSION_REGEXP = $(subst .,\.,$(VERSION))
PREV_VERSION_REGEXP = $(subst .,\.,$(PREV_VERSION))
ifeq ($(VC),$(GIT))
-this-vc-tag = v$(VERSION)
-this-vc-tag-regexp = v$(VERSION_REGEXP)
+ this-vc-tag = v$(VERSION)
+ this-vc-tag-regexp = v$(VERSION_REGEXP)
else
-tag-package = $(shell echo "$(PACKAGE)" | tr '[:lower:]' '[:upper:]')
-tag-this-version = $(subst .,_,$(VERSION))
-this-vc-tag = $(tag-package)-$(tag-this-version)
-this-vc-tag-regexp = $(this-vc-tag)
+ tag-package = $(shell echo "$(PACKAGE)" | tr '[:lower:]' '[:upper:]')
+ tag-this-version = $(subst .,_,$(VERSION))
+ this-vc-tag = $(tag-package)-$(tag-this-version)
+ this-vc-tag-regexp = $(this-vc-tag)
endif
my_distdir = $(PACKAGE)-$(VERSION)
# Old releases are stored here.
release_archive_dir ?= ../release
+# If RELEASE_TYPE is undefined, but RELEASE is, use its second word.
+# But overwrite VERSION.
+ifdef RELEASE
+ VERSION := $(word 1, $(RELEASE))
+ RELEASE_TYPE ?= $(word 2, $(RELEASE))
+endif
+
+# Validate and return $(RELEASE_TYPE), or die.
+RELEASE_TYPES = alpha beta stable
+release-type = $(call member-check,RELEASE_TYPE,$(RELEASE_TYPES))
+
# Override gnu_rel_host and url_dir_list in cfg.mk if these are not right.
# Use alpha.gnu.org for alpha and beta releases.
# Use ftp.gnu.org for stable releases.
gnu_ftp_host-alpha = alpha.gnu.org
gnu_ftp_host-beta = alpha.gnu.org
gnu_ftp_host-stable = ftp.gnu.org
-gnu_rel_host ?= $(gnu_ftp_host-$(RELEASE_TYPE))
+gnu_rel_host ?= $(gnu_ftp_host-$(release-type))
-ifeq ($(gnu_rel_host),ftp.gnu.org)
-url_dir_list ?= http://ftpmirror.gnu.org/$(PACKAGE)
-else
-url_dir_list ?= ftp://$(gnu_rel_host)/gnu/$(PACKAGE)
-endif
+url_dir_list ?= $(if $(call _equal,$(gnu_rel_host),ftp.gnu.org), \
+ http://ftpmirror.gnu.org/$(PACKAGE), \
+ ftp://$(gnu_rel_host)/gnu/$(PACKAGE))
# Override this in cfg.mk if you are using a different format in your
# NEWS file.
@@ -124,17 +148,18 @@ export LC_ALL = C
## Sanity checks. ##
## --------------- ##
-_cfg_mk := $(shell test -f $(srcdir)/cfg.mk && echo '$(srcdir)/cfg.mk')
+ifneq ($(_gl-Makefile),)
+_cfg_mk := $(wildcard $(srcdir)/cfg.mk)
# Collect the names of rules starting with 'sc_'.
-syntax-check-rules := $(sort $(shell sed -n 's/^\(sc_[a-zA-Z0-9_-]*\):.*/\1/p'
\
- $(srcdir)/$(ME) $(_cfg_mk)))
+syntax-check-rules := $(sort $(shell $(SED) -n \
+ 's/^\(sc_[a-zA-Z0-9_-]*\):.*/\1/p' $(srcdir)/$(ME) $(_cfg_mk)))
.PHONY: $(syntax-check-rules)
ifeq ($(shell $(VC_LIST) >/dev/null 2>&1; echo $$?),0)
-local-checks-available += $(syntax-check-rules)
+ local-checks-available += $(syntax-check-rules)
else
-local-checks-available += no-vc-detected
+ local-checks-available += no-vc-detected
no-vc-detected:
@echo "No version control files detected; skipping syntax check"
endif
@@ -165,6 +190,7 @@ local-check :=
\
$(filter-out $(local-checks-to-skip), $(local-checks-available)))
syntax-check: $(local-check)
+endif
# _sc_search_regexp
#
@@ -330,8 +356,8 @@ sc_prohibit_atoi_atof:
sp_ = strcmp *\(.+\)
sc_prohibit_strcmp:
@prohibit='! *strcmp *\(|\<$(sp_) *[!=]=|[!=]= *$(sp_)' \
- exclude=':# *define STRN?EQ\(' \
- halt='$(ME): replace strcmp calls above with STREQ/STRNEQ' \
+ exclude='# *define STRN?EQ\(' \
+ halt='replace strcmp calls above with STREQ/STRNEQ' \
$(_sc_search_regexp)
# Really. You don't want to use this function.
@@ -354,7 +380,7 @@ sc_prohibit_strncpy:
# perl -pi -e 's/(^|[^.])\b(exit ?)\(0\)/$1$2(EXIT_SUCCESS)/'
sc_prohibit_magic_number_exit:
@prohibit='(^|[^.])\<(usage|exit|error) ?\(-?[0-9]+[,)]' \
- exclude='error ?\((0,|[^,]*)' \
+ exclude='exit \(77\)|error ?\(((0|77),|[^,]*)' \
halt='use EXIT_* values rather than magic number' \
$(_sc_search_regexp)
@@ -414,10 +440,10 @@ sc_require_config_h:
# You must include <config.h> before including any other header file.
# This can possibly be via a package-specific header, if given by cfg.mk.
sc_require_config_h_first:
- @if $(VC_LIST_EXCEPT) | grep -l '\.c$$' > /dev/null; then \
+ @if $(VC_LIST_EXCEPT) | grep '\.c$$' > /dev/null; then \
fail=0; \
for i in $$($(VC_LIST_EXCEPT) | grep '\.c$$'); do \
- grep '^# *include\>' $$i | sed 1q \
+ grep '^# *include\>' $$i | $(SED) 1q \
| grep -E '^# *include $(config_h_header)' > /dev/null \
|| { echo $$i; fail=1; }; \
done; \
@@ -437,8 +463,8 @@ sc_prohibit_HAVE_MBRTOWC:
# re: a regular expression that matches IFF something provided by $h is used.
define _sc_header_without_use
dummy=; : so we do not need a semicolon before each use; \
- h_esc=`echo '[<"]'"$$h"'[">]'|sed 's/\./\\\\./g'`; \
- if $(VC_LIST_EXCEPT) | grep -l '\.c$$' > /dev/null; then \
+ h_esc=`echo '[<"]'"$$h"'[">]'|$(SED) 's/\./\\\\./g'`;
\
+ if $(VC_LIST_EXCEPT) | grep '\.c$$' > /dev/null; then
\
files=$$(grep -l '^# *include '"$$h_esc" \
$$($(VC_LIST_EXCEPT) | grep '\.c$$')) && \
grep -LE "$$re" $$files | grep . &&
\
@@ -560,7 +586,7 @@ sc_prohibit_root_dev_ino_without_use:
sc_prohibit_openat_without_use:
@h='openat.h' \
-
re='\<(openat_(permissive|needs_fchdir|(save|restore)_fail)|l?(stat|ch(own|mod))at|(euid)?accessat)\>'
\
+
re='\<(openat_(permissive|needs_fchdir|(save|restore)_fail)|l?(stat|ch(own|mod))at|(euid)?accessat|(FCHMOD|FCHOWN|STAT)AT_INLINE)\>'
\
$(_sc_header_without_use)
# Prohibit the inclusion of c-ctype.h without an actual use.
@@ -570,8 +596,6 @@ sc_prohibit_c_ctype_without_use:
@h='c-ctype.h' re='\<c_($(ctype_re)) *\(' \
$(_sc_header_without_use)
-_empty =
-_sp = $(_empty) $(_empty)
# The following list was generated by running:
# man signal.h|col -b|perl -ne '/bsd_signal.*;/.../sigwaitinfo.*;/ and print' \
# | perl -lne '/^\s+(?:int|void).*?(\w+).*/ and print $1' | fmt
@@ -687,7 +711,7 @@ sc_changelog:
# Ensure that each .c file containing a "main" function also
# calls set_program_name.
sc_program_name:
- @require='set_program_name *\(m?argv\[0\]\);' \
+ @require='set_program_name *\(.*\);' \
in_vc_files='\.c$$' \
containing='\<main *(' \
halt='the above files do not call set_program_name' \
@@ -724,6 +748,7 @@ sc_require_test_exit_idiom:
sc_trailing_blank:
@prohibit='[ ]$$' \
halt='found trailing blank(s)' \
+ exclude='^Binary file .* matches$$' \
$(_sc_search_regexp)
# Match lines like the following, but where there is only one space
@@ -744,7 +769,7 @@ _gl_translatable_diag_func_re ?= error
sc_unmarked_diagnostics:
@prohibit='\<$(_gl_translatable_diag_func_re) *\([^"]*"[^"]*[a-z]{3}' \
exclude='(_|ngettext ?)\(' \
- halt='$(ME): found unmarked diagnostic(s)' \
+ halt='found unmarked diagnostic(s)' \
$(_sc_search_regexp)
# Avoid useless parentheses like those in this example:
@@ -759,7 +784,7 @@ sc_useless_cpp_parens:
# #if HAVE_HEADER_H that you remove, be sure that your project explicitly
# requires the gnulib module that guarantees the usability of that header.
gl_assured_headers_ = \
- cd $(gnulib_dir)/lib && echo *.in.h|sed 's/\.in\.h//g'
+ cd $(gnulib_dir)/lib && echo *.in.h|$(SED) 's/\.in\.h//g'
# Convert the list of names to upper case, and replace each space with "|".
az_ = abcdefghijklmnopqrstuvwxyz
@@ -779,8 +804,8 @@ sc_prohibit_always_true_header_tests:
$(_sc_search_regexp)
sc_prohibit_defined_have_decl_tests:
- @prohibit='#[ ]*if(n?def|.*\<defined)\>[ (]+HAVE_DECL_' \
- halt='$(ME): HAVE_DECL macros are always defined' \
+ @prohibit='(#[ ]*ifn?def|\<defined)\>[ (]+HAVE_DECL_' \
+ halt='HAVE_DECL macros are always defined' \
$(_sc_search_regexp)
# ==================================================================
@@ -810,7 +835,7 @@ define def_sym_regex
&& perl -lne '$(gl_extract_significant_defines_)' $$f; \
done; \
) | sort -u \
- | sed 's/^/^ *# *(define|undef) */;s/$$/\\>/'
+ | $(SED) 's/^/^ *# *(define|undef) */;s/$$/\\>/'
endef
# Don't define macros that we already get from gnulib header files.
@@ -971,6 +996,14 @@ sc_prohibit_undesirable_word_seq:
| grep -vE '$(ignore_undesirable_word_sequence_RE_)' | grep . \
&& { echo '$(ME): undesirable word sequence' >&2; exit 1; } || :
+# Except for shell files and for loops, double semicolon is probably a mistake
+sc_prohibit_double_semicolon:
+ @prohibit='; *;[ {} \]*(/[/*]|$$)' \
+ in_vc_files='\.[chly]$$' \
+ exclude='\bfor *\(.*\)' \
+ halt="Double semicolon detected" \
+ $(_sc_search_regexp)
+
_ptm1 = use "test C1 && test C2", not "test C1 -''a C2"
_ptm2 = use "test C1 || test C2", not "test C1 -''o C2"
# Using test's -a and -o operators is not portable.
@@ -1020,16 +1053,16 @@ sc_redundant_const:
sc_const_long_option:
@prohibit='^ *static.*struct option ' \
exclude='const struct option|struct option const' \
- halt='$(ME): add "const" to the above declarations' \
+ halt='add "const" to the above declarations' \
$(_sc_search_regexp)
NEWS_hash = \
- $$(sed -n '/^\*.* $(PREV_VERSION_REGEXP) ([0-9-]*)/,$$p' \
+ $$($(SED) -n '/^\*.* $(PREV_VERSION_REGEXP) ([0-9-]*)/,$$p' \
$(srcdir)/NEWS \
| perl -0777 -pe \
's/^Copyright.+?Free\sSoftware\sFoundation,\sInc\.\n//ms' \
| md5sum -
\
- | sed 's/ .*//')
+ | $(SED) 's/ .*//')
# Ensure that we don't accidentally insert an entry into an old NEWS block.
sc_immutable_NEWS:
@@ -1067,7 +1100,7 @@ sc_makefile_at_at_check:
&& { echo '$(ME): use $$(...), not @...@' 1>&2; exit 1; } || :
news-check: NEWS
- $(AM_V_GEN)if sed -n $(news-check-lines-spec)p $< \
+ $(AM_V_GEN)if $(SED) -n $(news-check-lines-spec)p $< \
| grep -E $(news-check-regexp) >/dev/null; then \
:; \
else \
@@ -1091,9 +1124,11 @@ fix_po_file_diag = \
'you have changed the set of files with translatable diagnostics;\n\
apply the above patch\n'
-# Verify that all source files using _() are listed in po/POTFILES.in.
+# Verify that all source files using _() (more specifically, files that
+# match $(_gl_translatable_string_re)) are listed in po/POTFILES.in.
po_file ?= $(srcdir)/po/POTFILES.in
generated_files ?= $(srcdir)/lib/*.[ch]
+_gl_translatable_string_re ?= \b(N?_|gettext *)\([^)"]*("|$$)
sc_po_check:
@if test -f $(po_file); then \
grep -E -v '^(#|$$)' $(po_file) \
@@ -1113,8 +1148,8 @@ sc_po_check:
esac; \
files="$$files $$file"; \
done; \
- grep -E -l '\b(N?_|gettext *)\([^)"]*("|$$)' $$files \
- | sed 's|^$(_dot_escaped_srcdir)/||' | sort -u > address@hidden;
\
+ grep -E -l '$(_gl_translatable_string_re)' $$files \
+ | $(SED) 's|^$(_dot_escaped_srcdir)/||' | sort -u > address@hidden;
\
diff -u -L $(po_file) -L $(po_file) address@hidden address@hidden
\
|| { printf '$(ME): '$(fix_po_file_diag) 1>&2; exit 1; }; \
rm -f address@hidden address@hidden;
\
@@ -1123,7 +1158,7 @@ sc_po_check:
# Sometimes it is useful to change the PATH environment variable
# in Makefiles. When doing so, it's better not to use the Unix-centric
# path separator of ':', but rather the automake-provided '$(PATH_SEPARATOR)'.
-msg = '$(ME): Do not use ":" above; use $$(PATH_SEPARATOR) instead'
+msg = 'Do not use ":" above; use $$(PATH_SEPARATOR) instead'
sc_makefile_path_separator_check:
@prohibit='PATH[=].*:' \
in_vc_files='akefile|\.mk$$' \
@@ -1134,7 +1169,7 @@ sc_makefile_path_separator_check:
# i.e., when pkg-M.N.tar.xz already exists (either in "." or in ../release)
# and is read-only.
writable-files:
- if test -d $(release_archive_dir); then \
+ $(AM_V_GEN)if test -d $(release_archive_dir); then \
for file in $(DIST_ARCHIVES); do \
for p in ./ $(release_archive_dir)/; do \
test -e $$p$$file || continue; \
@@ -1160,7 +1195,7 @@ sc_copyright_check:
in_vc_files=$(sample-test) \
halt='out of date copyright in $(sample-test); update it' \
$(_sc_search_regexp)
- @require='Copyright @copyright\{\} .*'$$(date +%Y)' Free' \
+ @require='Copyright @copyright\{\} .*'$$(date +%Y) \
in_vc_files=$(texi) \
halt='out of date copyright in $(texi); update it' \
$(_sc_search_regexp)
@@ -1216,7 +1251,7 @@ sc_Wundef_boolean:
# not be constant, or might overflow a stack. In general, use PATH_MAX as
# a limit, not an array or alloca size.
sc_prohibit_path_max_allocation:
- @prohibit='(\balloca *\([^)]*|\[[^]]*)PATH_MAX' \
+ @prohibit='(\balloca *\([^)]*|\[[^]]*)\bPATH_MAX' \
halt='Avoid stack allocations of size PATH_MAX' \
$(_sc_search_regexp)
@@ -1251,37 +1286,44 @@ vc-diff-check:
rel-files = $(DIST_ARCHIVES)
gnulib_dir ?= $(srcdir)/gnulib
-gnulib-version = $$(cd $(gnulib_dir) && git describe)
+gnulib-version = $$(cd $(gnulib_dir) \
+ && { git describe || git rev-parse --short=10 HEAD; } )
bootstrap-tools ?= autoconf,automake,gnulib
+gpgv = $$(gpgv2 --version >/dev/null && echo gpgv2 || echo gpgv)
# If it's not already specified, derive the GPG key ID from
# the signed tag we've just applied to mark this release.
gpg_key_ID ?= \
$$(cd $(srcdir) \
&& git cat-file tag v$(VERSION) \
- | gpgv --status-fd 1 --keyring /dev/null - - 2>/dev/null \
+ | $(gpgv) --status-fd 1 --keyring /dev/null - - 2>/dev/null \
| awk '/^\[GNUPG:\] ERRSIG / {print $$3; exit}')
translation_project_ ?= address@hidden
# Make info-gnu the default only for a stable release.
-ifeq ($(RELEASE_TYPE),stable)
- announcement_Cc_ ?= $(translation_project_), $(PACKAGE_BUGREPORT)
- announcement_mail_headers_ ?=
\
- To: address@hidden \
- Cc: $(announcement_Cc_) \
- Mail-Followup-To: $(PACKAGE_BUGREPORT)
-else
- announcement_Cc_ ?= $(translation_project_)
- announcement_mail_headers_ ?=
\
- To: $(PACKAGE_BUGREPORT) \
- Cc: $(announcement_Cc_)
-endif
-
+announcement_Cc_stable = $(translation_project_), $(PACKAGE_BUGREPORT)
+announcement_mail_headers_stable = \
+ To: address@hidden \
+ Cc: $(announcement_Cc_) \
+ Mail-Followup-To: $(PACKAGE_BUGREPORT)
+
+announcement_Cc_alpha = $(translation_project_)
+announcement_mail_headers_alpha = \
+ To: $(PACKAGE_BUGREPORT) \
+ Cc: $(announcement_Cc_)
+
+announcement_mail_Cc_beta = $(announcement_mail_Cc_alpha)
+announcement_mail_headers_beta = $(announcement_mail_headers_alpha)
+
+announcement_mail_Cc_ ?= $(announcement_mail_Cc_$(release-type))
+announcement_mail_headers_ ?= $(announcement_mail_headers_$(release-type))
announcement: NEWS ChangeLog $(rel-files)
- $(AM_V_GEN)$(srcdir)/$(_build-aux)/announce-gen \
+# Not $(AM_V_GEN) since the output of this command serves as
+# announcement message: it would start with " GEN announcement".
+ $(AM_V_at)$(srcdir)/$(_build-aux)/announce-gen \
--mail-headers='$(announcement_mail_headers_)' \
- --release-type=$(RELEASE_TYPE) \
+ --release-type=$(release-type) \
--package=$(PACKAGE) \
--prev=$(PREV_VERSION) \
--curr=$(VERSION) \
@@ -1308,16 +1350,22 @@ ftp-gnu = ftp://ftp.gnu.org/gnu
www-gnu = http://www.gnu.org
upload_dest_dir_ ?= $(PACKAGE)
+upload_command = \
+ $(srcdir)/$(_build-aux)/gnupload $(GNUPLOADFLAGS) \
+ --to $(gnu_rel_host):$(upload_dest_dir_) \
+ $(rel-files)
emit_upload_commands:
@echo =====================================
@echo =====================================
- @echo "$(srcdir)/$(_build-aux)/gnupload $(GNUPLOADFLAGS) \\"
- @echo " --to $(gnu_rel_host):$(upload_dest_dir_) \\"
- @echo " $(rel-files)"
+ @echo '$(upload_command)'
@echo '# send the ~/announce-$(my_distdir) e-mail'
@echo =====================================
@echo =====================================
+.PHONY: upload
+upload:
+ $(AM_V_GEN)$(upload_command)
+
define emit-commit-log
printf '%s\n' 'maint: post-release administrivia' '' \
'* NEWS: Add header line for next release.'
\
@@ -1327,7 +1375,8 @@ endef
.PHONY: no-submodule-changes
no-submodule-changes:
- $(AM_V_GEN)if test -d $(srcdir)/.git; then \
+ $(AM_V_GEN)if test -d $(srcdir)/.git \
+ && git --version >/dev/null 2>&1; then \
diff=$$(cd $(srcdir) && git submodule -q foreach \
git diff-index --name-only HEAD) \
|| exit 1; \
@@ -1345,10 +1394,12 @@ submodule-checks ?= no-submodule-changes
public-submodule-commit
# cannot be built from a fresh clone.
.PHONY: public-submodule-commit
public-submodule-commit:
- $(AM_V_GEN)if test -d $(srcdir)/.git; then \
+ $(AM_V_GEN)if test -d $(srcdir)/.git \
+ && git --version >/dev/null 2>&1; then \
cd $(srcdir) && \
- git submodule --quiet foreach test '$$(git rev-parse $$sha1)' \
- = '$$(git merge-base origin $$sha1)' \
+ git submodule --quiet foreach \
+ 'test "$$(git rev-parse "$$sha1")" \
+ = "$$(git merge-base origin "$$sha1")"' \
|| { echo '$(ME): found non-public submodule commit' >&2; \
exit 1; }; \
else \
@@ -1363,7 +1414,7 @@ public-submodule-commit:
gl_public_submodule_commit ?= public-submodule-commit
check: $(gl_public_submodule_commit)
-.PHONY: alpha beta stable
+.PHONY: alpha beta stable release
ALL_RECURSIVE_TARGETS += alpha beta stable
alpha beta stable: $(local-check) writable-files $(submodule-checks)
$(AM_V_GEN)test $@ = stable \
@@ -1377,15 +1428,17 @@ alpha beta stable: $(local-check) writable-files
$(submodule-checks)
$(AM_V_at)$(MAKE) $(release-prep-hook) RELEASE_TYPE=$@
$(AM_V_at)$(MAKE) -s emit_upload_commands RELEASE_TYPE=$@
+release:
+ $(AM_V_GEN)$(MAKE) _version
+ $(AM_V_GEN)$(MAKE) $(release-type)
+
# Override this in cfg.mk if you follow different procedures.
release-prep-hook ?= release-prep
gl_noteworthy_news_ = * Noteworthy changes in release ?.? (????-??-??) [?]
.PHONY: release-prep
release-prep:
- $(AM_V_GEN)case $$RELEASE_TYPE in alpha|beta|stable) ;; \
- *) echo "invalid RELEASE_TYPE: $$RELEASE_TYPE" 1>&2; exit 1;; esac
- $(AM_V_at)$(MAKE) --no-print-directory -s announcement \
+ $(AM_V_GEN)$(MAKE) --no-print-directory -s announcement \
> ~/announce-$(my_distdir)
$(AM_V_at)if test -d $(release_archive_dir); then \
ln $(rel-files) $(release_archive_dir); \
@@ -1461,7 +1514,7 @@ refresh-gnulib-patches:
test -n "$$t" && gl=$$t; \
fi; \
for diff in $$(cd $$gl; git ls-files | grep '\.diff$$'); do \
- b=$$(printf %s "$$diff"|sed 's/\.diff$$//'); \
+ b=$$(printf %s "$$diff"|$(SED) 's/\.diff$$//'); \
VERSION_CONTROL=none \
patch "$(gnulib_dir)/$$b" "$$gl/$$diff" || exit 1; \
( cd $(gnulib_dir) || exit 1; \
@@ -1480,7 +1533,8 @@ refresh-po:
wget --no-verbose --directory-prefix $(PODIR) --no-directories
--recursive --level 1 --accept .po --accept .po.1 $(POURL) && \
echo 'address@hidden' > $(PODIR)/LINGUAS && \
echo 'address@hidden' >> $(PODIR)/LINGUAS && \
- ls $(PODIR)/*.po | sed 's/\.po//;s,$(PODIR)/,,' | sort >>
$(PODIR)/LINGUAS
+ ls $(PODIR)/*.po | $(SED) 's/\.po//;s,$(PODIR)/,,' | \
+ sort >> $(PODIR)/LINGUAS
# Running indent once is not idempotent, but running it twice is.
INDENT_SOURCES ?= $(C_SOURCES)
@@ -1575,6 +1629,7 @@ _gl_TS_obj_files ?= *.$(OBJEXT)
# Files in which to search for the one-line style extern declarations.
# $(_gl_TS_dir)-relative.
_gl_TS_headers ?= $(noinst_HEADERS)
+_gl_TS_other_headers ?= *.h
.PHONY: _gl_tight_scope
_gl_tight_scope: $(bin_PROGRAMS)
@@ -1589,17 +1644,18 @@ _gl_tight_scope: $(bin_PROGRAMS)
test -f $$f && d= || d=$(srcdir)/; echo $$d$$f; done`; \
( printf '^%s$$\n' '__.*' $(_gl_TS_unmarked_extern_functions); \
grep -h -A1 '^extern .*[^;]$$' $$src \
- | grep -vE '^(extern |--)' | sed 's/ .*//'; \
+ | grep -vE '^(extern |--)' | $(SED) 's/ .*//'; \
perl -lne \
'$(_gl_TS_function_match) and print "^$$1\$$"' $$hdr; \
) | sort -u > $$t; \
- nm -e $(_gl_TS_obj_files) | sed -n 's/.* T //p'|grep -Ev -f $$t \
+ nm -e $(_gl_TS_obj_files)|$(SED) -n 's/.* T //p'|grep -Ev -f $$t \
&& { echo the above functions should have static scope >&2; \
exit 1; } || : ; \
( printf '^%s$$\n' '__.*' $(_gl_TS_unmarked_extern_vars); \
- perl -lne '$(_gl_TS_var_match) and print "^$$1\$$"' $$hdr *.h \
+ perl -lne '$(_gl_TS_var_match) and print "^$$1\$$"' \
+ $$hdr $(_gl_TS_other_headers) \
) | sort -u > $$t; \
- nm -e $(_gl_TS_obj_files) | sed -n 's/.* [BCDGRS] //p' \
+ nm -e $(_gl_TS_obj_files) | $(SED) -n 's/.* [BCDGRS] //p' \
| sort -u | grep -Ev -f $$t
\
&& { echo the above variables should have static scope >&2; \
exit 1; } || :
diff --git a/po/LINGUAS b/po/LINGUAS
index 664e053..5285206 100644
--- a/po/LINGUAS
+++ b/po/LINGUAS
@@ -1,10 +1,12 @@
address@hidden
address@hidden
+de
eo
fi
fr
ga
hr
+hu
id
it
pl
diff --git a/po/hr.po.in b/po/de.po.in
similarity index 57%
copy from po/hr.po.in
copy to po/de.po.in
index fa31938..459befa 100644
--- a/po/hr.po.in
+++ b/po/de.po.in
@@ -1,232 +1,231 @@
-# Translation of gss to Croatian.
-# Copyright (C) 2012 Free Software Foundation, Inc.
+# German translation of gss.
+# Copyright © 2009 Free Software Foundation, Inc.
+# Copyright (C) 2010 Simon Josefsson
# This file is distributed under the same license as the gss package.
+# Mario Blättermann <address@hidden>, 2014.
#
-# Tomislav Krznar <address@hidden>, 2012.
msgid ""
msgstr ""
"Project-Id-Version: gss 1.0.1\n"
"Report-Msgid-Bugs-To: address@hidden"
"POT-Creation-Date: 2010-05-20 15:38+0200\n"
-"PO-Revision-Date: 2012-07-31 00:27+0200\n"
-"Last-Translator: Tomislav Krznar <address@hidden>\n"
-"Language-Team: Croatian <address@hidden>\n"
-"Language: hr\n"
+"PO-Revision-Date: 2014-03-08 22:11+0100\n"
+"Last-Translator: Mario Blättermann <address@hidden>\n"
+"Language-Team: German <address@hidden>\n"
+"Language: de\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 &&
n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
-"X-Generator: Lokalize 1.4\n"
+"Plural-Forms: nplurals=2; plural=(n!=1);\n"
+"X-Generator: Poedit 1.5.4\n"
#: lib/meta.c:37
msgid "Kerberos V5 GSS-API mechanism"
-msgstr "Kerberos V5 GSS-API mehanizam"
+msgstr "Kerberos V5 GSS-API-Mechanismus"
#: lib/error.c:37
msgid "A required input parameter could not be read"
-msgstr "Ne mogu Äitati potreban ulazni parametar"
+msgstr "Ein benötigter Eingabeparameter konnte nicht gelesen werden"
#: lib/error.c:39
msgid "A required output parameter could not be written"
-msgstr "Ne mogu pisati potreban izlazni parametar"
+msgstr "Ein benötigter Ausgabeparameter konnte nicht geschrieben werden"
#: lib/error.c:41
msgid "A parameter was malformed"
-msgstr "Parametar je izobliÄen"
+msgstr "Ein Parameter war beschädigt"
#: lib/error.c:46
msgid "An unsupported mechanism was requested"
-msgstr "Tražen je nepodržani mehanizam"
+msgstr "Ein nicht unterstützter Mechanismus wurde angefordert"
#: lib/error.c:48
msgid "An invalid name was supplied"
-msgstr "Navedeno je neispravno ime"
+msgstr "Ein ungültiger Name wurde angegeben"
#: lib/error.c:50
msgid "A supplied name was of an unsupported type"
-msgstr "Vrsta navedenog imena nije podržana"
+msgstr "Der Typ des angegebenen Namens wird nicht unterstützt"
#: lib/error.c:52
msgid "Incorrect channel bindings were supplied"
-msgstr "Navedene su netoÄne veze kanala"
+msgstr "Inkorrekte Kanalbindungen wurden angegeben"
#: lib/error.c:54
msgid "An invalid status code was supplied"
-msgstr "Naveden je neispravan kod stanja"
+msgstr "Ein ungültiger Statuscode wurde angegeben"
#: lib/error.c:56
msgid "A token had an invalid MIC"
-msgstr "Simbol ima neispravan MIC"
+msgstr "Ein Token hat ein ungültiges MIC"
#: lib/error.c:58
msgid "No credentials were supplied, or the credentials were unavailable or
inaccessible"
-msgstr "Nisu navedene vjerodajnice, nedostupne su ili im nije moguÄ pristup"
+msgstr "Es wurden keine Anmeldedaten angegeben, oder die Anmeldedaten waren
nicht verfügbar oder der Zugriff darauf nicht möglich"
#: lib/error.c:61
msgid "No context has been established"
-msgstr "Nije izgraÄen kontekst"
+msgstr "Es wurde kein Kontext aufgebaut"
#: lib/error.c:63
msgid "A token was invalid"
-msgstr "Simbol je neispravan"
+msgstr "Ein Token war ungültig"
#: lib/error.c:65
msgid "A credential was invalid"
-msgstr "Vjerodajnica je neispravna"
+msgstr "Eine Anmeldeinformation war ungültig"
#: lib/error.c:67
msgid "The referenced credentials have expired"
-msgstr "Navedene vjerodajnice su istekle"
+msgstr "Die referenzierten Anmeldedaten sind abgelaufen"
#: lib/error.c:69
msgid "The context has expired"
-msgstr "Kontekst je istekao"
+msgstr "Der Kontext ist abgelaufen"
#: lib/error.c:71
msgid "Unspecified error in underlying mechanism"
-msgstr "NeodreÄena greÅ¡ka u pozadinskom mehanizmu"
+msgstr "Nicht näher bezeichneter Fehler im zugrundeliegenden Mechanismus"
#: lib/error.c:73
msgid "The quality-of-protection requested could not be provided"
-msgstr "Ne može se pružiti tražena kvaliteta zaštite
(quality-of-protection)"
+msgstr "Die angeforderte Schutzqualität konnte nicht bereitgestellt werden"
#: lib/error.c:75
msgid "The operation is forbidden by local security policy"
-msgstr "Lokalna sigurnosna pravila zabranjuju operaciju"
+msgstr "Der Vorgang ist durch die lokalen Sicherheitsregeln nicht erlaubt."
#: lib/error.c:77
msgid "The operation or option is unavailable"
-msgstr "Operacija ili opcija nije dostupna"
+msgstr "Der Vorgang oder die Option ist nicht verfügbar"
#: lib/error.c:79
msgid "The requested credential element already exists"
-msgstr "Traženi element vjerodajnice veÄ postoji"
+msgstr "Das angeforderte Anmeldedatenelement existiert bereits"
#: lib/error.c:81
msgid "The provided name was not a mechanism name"
-msgstr "Navedeno ime nije ime mehanizma"
+msgstr "Der angegebene Name war nicht der Name eines Mechanismus"
#: lib/error.c:86
msgid "The gss_init_sec_context() or gss_accept_sec_context() function must be
called again to complete its function"
-msgstr "Potrebno je ponovo pozvati funkciju gss_init_sec_context() ili
gss_accept_sec_context() za završetak djelovanja"
+msgstr "Die Funktion gss_init_sec_context() oder gss_accept_sec_context() muss
erneut aufgerufen werden, um die Funktion abzuschlieÃen"
#: lib/error.c:89
msgid "The token was a duplicate of an earlier token"
-msgstr "Simbol je duplikat prethodnog simbola"
+msgstr "Ein Token war ein Duplikat eines früheren Tokens"
#: lib/error.c:91
msgid "The token's validity period has expired"
-msgstr "Rok trajanja simbola je istekao"
+msgstr "Die Gültigkeitsdauer des Tokens ist überschritten"
#: lib/error.c:93
msgid "A later token has already been processed"
-msgstr "Noviji simbol je veÄ obraÄen"
+msgstr "Ein neuerer Token wurde bereits verarbeitet"
#: lib/error.c:95
msgid "An expected per-message token was not received"
-msgstr "OÄekivani simbol poruke nije primljen"
+msgstr "Ein erwarteter meldungsgebundener Token wurde nicht empfangen"
#: lib/error.c:312
msgid "No error"
-msgstr "Nema greške"
+msgstr "Kein Fehler"
#: lib/krb5/error.c:36
msgid "No @ in SERVICE-NAME name string"
-msgstr "Nedostaje @ u nizu SERVICE-NAME"
+msgstr "Kein @ in Zeichenkette SERVICE-NAME"
#: lib/krb5/error.c:38
msgid "STRING-UID-NAME contains nondigits"
-msgstr "STRING-UID-NAME sadrži znakove koji nisu znamenke"
+msgstr "STRING-UID-NAME enthält nicht nur ziffern"
#: lib/krb5/error.c:40
msgid "UID does not resolve to username"
-msgstr "UID se ne može povezati s korisniÄkim imenom"
+msgstr "UID löst den Benutzernamen nicht auf"
#: lib/krb5/error.c:42
msgid "Validation error"
-msgstr "Greška provjere valjanosti"
+msgstr "Validierungsfehler"
#: lib/krb5/error.c:44
msgid "Couldn't allocate gss_buffer_t data"
-msgstr "Ne mogu alocirati gss_buffer_t podatke"
+msgstr "Daten für gss_buffer_t konnten nicht zugewiesen werden"
#: lib/krb5/error.c:46
msgid "Message context invalid"
-msgstr "Kontekst poruke neispravan"
+msgstr "Meldungstext ungültig"
#: lib/krb5/error.c:48
msgid "Buffer is the wrong size"
-msgstr "MeÄuspremnik ima neispravnu veliÄinu"
+msgstr "Puffer hat die falsche GröÃe"
#: lib/krb5/error.c:50
msgid "Credential usage type is unknown"
-msgstr "Vrsta korištenja vjerodajnice je nepoznata"
+msgstr "Nutzunsgtyp der Anmeldedaten ist unbekannt"
#: lib/krb5/error.c:52
msgid "Unknown quality of protection specified"
-msgstr "Navedena je nepoznata kvaliteta zaštite"
+msgstr "Unbekannte Schutzqualität angegeben"
#: lib/krb5/error.c:55
msgid "Principal in credential cache does not match desired name"
-msgstr "Upravitelj u spremniku vjerodajnica ne odgovara željenom imenu"
+msgstr "Principal im Anmeldedaten-Zwischenspeicher entspricht nicht dem
gewünschten Namen"
#: lib/krb5/error.c:57
msgid "No principal in keytab matches desired name"
-msgstr "Nijedan upravitelj u tablici kljuÄeva ne odgovara željenom imenu"
+msgstr "Kein Principal in der Schlüsseltabelle entspricht dem gewünschten
Namen"
#: lib/krb5/error.c:59
msgid "Credential cache has no TGT"
-msgstr "Spremnik vjerodajnica nema TGT"
+msgstr "Anmeldedaten-Zwischenspeicher hat kein TGT"
#: lib/krb5/error.c:61
msgid "Authenticator has no subkey"
-msgstr "Ovjeritelj nema podkljuÄ"
+msgstr "Authentifizierer hat keinen Unterschlüssel"
#: lib/krb5/error.c:63
msgid "Context is already fully established"
-msgstr "Kontekst je veÄ u potpunosti izgraÄen"
+msgstr "Kontext wurde bereits vollständig aufgebaut"
#: lib/krb5/error.c:65
msgid "Unknown signature type in token"
-msgstr "Nepoznata vrsta potpisa u simbolu"
+msgstr "Unbekannter Signaturtyp im Token"
#: lib/krb5/error.c:67
msgid "Invalid field length in token"
-msgstr "Neispravna duljina polja u simbolu"
+msgstr "Ungültige Feldlänge im Token"
#: lib/krb5/error.c:69
msgid "Attempt to use incomplete security context"
-msgstr "Pokušaj korištenja nepotpunog sigurnosnog konteksta"
+msgstr "Versuch, einen unvollständigen Sicherheitskontext zu verwenden"
#: lib/krb5/error.c:86
msgid "No krb5 error"
-msgstr "Nema krb5 greške"
+msgstr "Kein krb5-Fehler"
#: lib/krb5/error.c:127
msgid "Unknown krb5 error"
-msgstr "Nepoznata krb5 greška"
+msgstr "Unbekannter krb5-Fehler"
#: src/gss.c:65
#, c-format
msgid "Try `%s --help' for more information.\n"
-msgstr "PokuÅ¡ajte â%s --helpâ za viÅ¡e informacija.\n"
+msgstr "Rufen Sie »%s --help« auf, um mehr Informationen zu erhalten.\n"
#: src/gss.c:69
#, c-format
msgid "Usage: %s OPTIONS...\n"
-msgstr "Uporaba: %s OPCIJE...\n"
+msgstr "Aufruf: %s OPTIONEN â¦\n"
#: src/gss.c:72
msgid ""
"Command line interface to GSS, used to explain error codes.\n"
"\n"
-msgstr ""
-"SuÄelje naredbenog retka prema GSS-u, koriÅ¡teno za pojaÅ¡njavanje kodova
grešaka.\n"
-"\n"
+msgstr "Befehlszeilenschnittstelle zu GSS zur Erläuterung von Fehlercodes.\n"
#: src/gss.c:76
msgid "Mandatory arguments to long options are mandatory for short options
too.\n"
-msgstr "Obavezni argumenti dugaÄkih opcija takoÄer su obavezni i za kratke
opcije.\n"
+msgstr "Vorgeschriebene Argumente für lange Optionen sind ebenfalls für die
Kurzoptionen vorgeschrieben.\n"
#: src/gss.c:79
msgid ""
@@ -237,17 +236,16 @@ msgid ""
" in a human readable format.\n"
" -m, --major=LONG Describe a `major status' error code value.\n"
msgstr ""
-" -h, --help IspiÅ¡i pomoÄ i izaÄi.\n"
-" -V, --version IspiÅ¡i inaÄicu i izaÄi.\n"
+" -h, --help Hilfe ausgeben und beenden.\n"
+" -V, --version Version ausgeben und beenden.\n"
" -l, --list-mechanisms\n"
-" Ispiši informacije o podržanim mehanizmima\n"
-" u ljudima Äitljivom obliku.\n"
-" -m, --major=DUG Opiši vrijednost koda greške glavnog stanja\n"
-" (âmajor statusâ).\n"
+" Informationen zu den unterstützten Mechanismen\n"
+" in einem menschenlesbaren Format ausgeben.\n"
+" -m, --major=LONG Den Wert eines »Major status«-Fehlercodes
beschreiben.\n"
#: src/gss.c:87
msgid " -q, --quiet Silent operation (default=off).\n"
-msgstr " -q, --quiet Tih rad (poÄetna vrijednost âoffâ).\n"
+msgstr " -q, --quiet Stiller Modus (Vorgabe=aus).\n"
#: src/gss.c:106
#, c-format
@@ -255,7 +253,7 @@ msgid ""
"GSS-API major status code %ld (0x%lx).\n"
"\n"
msgstr ""
-"GSS-API kod glavnog stanja %ld (0x%lx).\n"
+"GSS-API Major-Statuscode %ld (0x%lx).\n"
"\n"
#: src/gss.c:109
@@ -268,7 +266,7 @@ msgid ""
msgstr ""
" MSB LSB\n"
" +-----------------+-----------------+---------------------------------+\n"
-" |Greška pozivanja | Greška rutine | Dodatne informacije
|\n"
+" | Aufruf-Fehler | Routine-Fehler | Zusätzliche Infos |\n"
" | "
#: src/gss.c:123
@@ -287,34 +285,34 @@ msgstr ""
#: src/gss.c:133
#, c-format
msgid "Masked routine error %ld (0x%lx) shifted into %ld (0x%lx):\n"
-msgstr "Maskirana greška rutine %ld (0x%lx) pomaknuta u %ld (0x%lx):\n"
+msgstr "Maskierter Routine-Fehler %ld (0x%lx) verschoben in %ld (0x%lx):\n"
#: src/gss.c:150 src/gss.c:184 src/gss.c:221
#, c-format
msgid "displaying status code failed (%d)"
-msgstr "prikaz koda stanja nije uspio (%d)"
+msgstr "Anzeige des Statuscodes fehlgeschlagen (%d)"
#: src/gss.c:170
#, c-format
msgid "Masked calling error %ld (0x%lx) shifted into %ld (0x%lx):\n"
-msgstr "Maskirana greška pozivanja %ld (0x%lx) pomaknuta u %ld (0x%lx):\n"
+msgstr "Maskierter Aufruf-Fehler %ld (0x%lx) verschoben in %ld (0x%lx):\n"
#: src/gss.c:203
#, c-format
msgid "Masked supplementary info %ld (0x%lx) shifted into %ld (0x%lx):\n"
-msgstr "Maskirane dodatne informacije %ld (0x%lx) pomaknute u %ld (0x%lx):\n"
+msgstr "Maskierte Zusatz-Info %ld (0x%lx) verschoben in %ld (0x%lx):\n"
#: src/gss.c:238
#, c-format
msgid "No error\n"
-msgstr "Nema greške\n"
+msgstr "Kein Fehler\n"
#: src/gss.c:256
#, c-format
msgid "indicating mechanisms failed (%d)"
-msgstr "prikazivanje mehanizama nije uspjelo (%d)"
+msgstr "Indizierung der Mechanismen fehlgeschlagen (%d)"
#: src/gss.c:271
#, c-format
msgid "inquiring information about mechanism failed (%d)"
-msgstr "traženje informacija o mehanizmu nije uspjelo (%d)"
+msgstr "Ermittlung der Informationen zum Mechanismus ist fehlgeschlagen (%d)"
diff --git a/po/hr.po.in b/po/hu.po.in
similarity index 57%
copy from po/hr.po.in
copy to po/hu.po.in
index fa31938..550fdc9 100644
--- a/po/hr.po.in
+++ b/po/hu.po.in
@@ -1,232 +1,232 @@
-# Translation of gss to Croatian.
-# Copyright (C) 2012 Free Software Foundation, Inc.
+# Hungarian translation for gss.
+# Copyright (C) 2014 Free Software Foundation, Inc.
# This file is distributed under the same license as the gss package.
#
-# Tomislav Krznar <address@hidden>, 2012.
+# Balázs Ãr <address@hidden>, 2014.
msgid ""
msgstr ""
"Project-Id-Version: gss 1.0.1\n"
"Report-Msgid-Bugs-To: address@hidden"
"POT-Creation-Date: 2010-05-20 15:38+0200\n"
-"PO-Revision-Date: 2012-07-31 00:27+0200\n"
-"Last-Translator: Tomislav Krznar <address@hidden>\n"
-"Language-Team: Croatian <address@hidden>\n"
-"Language: hr\n"
+"PO-Revision-Date: 2014-06-26 22:18+0200\n"
+"Last-Translator: Balázs Ãr <address@hidden>\n"
+"Language-Team: Hungarian <address@hidden>\n"
+"Language: hu\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 &&
n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
-"X-Generator: Lokalize 1.4\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-Generator: Lokalize 1.5\n"
#: lib/meta.c:37
msgid "Kerberos V5 GSS-API mechanism"
-msgstr "Kerberos V5 GSS-API mehanizam"
+msgstr "Kerberos V5 GSS-API mechanizmus"
#: lib/error.c:37
msgid "A required input parameter could not be read"
-msgstr "Ne mogu Äitati potreban ulazni parametar"
+msgstr "Egy szükséges bemeneti paramétert nem sikerült beolvasni"
#: lib/error.c:39
msgid "A required output parameter could not be written"
-msgstr "Ne mogu pisati potreban izlazni parametar"
+msgstr "Egy szükséges kimeneti paramétert nem sikerült kiÃrni"
#: lib/error.c:41
msgid "A parameter was malformed"
-msgstr "Parametar je izobliÄen"
+msgstr "Egy paraméter helytelenül formázott"
#: lib/error.c:46
msgid "An unsupported mechanism was requested"
-msgstr "Tražen je nepodržani mehanizam"
+msgstr "Egy nem támogatott mechanizmust kértek"
#: lib/error.c:48
msgid "An invalid name was supplied"
-msgstr "Navedeno je neispravno ime"
+msgstr "Egy érvénytelen nevet adtak meg"
#: lib/error.c:50
msgid "A supplied name was of an unsupported type"
-msgstr "Vrsta navedenog imena nije podržana"
+msgstr "Egy megadott név tÃpusa nem támogatott"
#: lib/error.c:52
msgid "Incorrect channel bindings were supplied"
-msgstr "Navedene su netoÄne veze kanala"
+msgstr "Ãrvénytelen csatornakötéseket adtak meg"
#: lib/error.c:54
msgid "An invalid status code was supplied"
-msgstr "Naveden je neispravan kod stanja"
+msgstr "Egy érvénytelen állapotkódot adtak meg"
#: lib/error.c:56
msgid "A token had an invalid MIC"
-msgstr "Simbol ima neispravan MIC"
+msgstr "Egy tokennek érvénytelen MIC-je volt"
#: lib/error.c:58
msgid "No credentials were supplied, or the credentials were unavailable or
inaccessible"
-msgstr "Nisu navedene vjerodajnice, nedostupne su ili im nije moguÄ pristup"
+msgstr "Nem adtak meg hitelesÃtési adatokat, vagy a hitelesÃtési adatok
elérhetetlenek vagy hozzáférhetetlenek voltak"
#: lib/error.c:61
msgid "No context has been established"
-msgstr "Nije izgraÄen kontekst"
+msgstr "Környezet nem lett létesÃtve"
#: lib/error.c:63
msgid "A token was invalid"
-msgstr "Simbol je neispravan"
+msgstr "Egy token érvénytelen volt"
#: lib/error.c:65
msgid "A credential was invalid"
-msgstr "Vjerodajnica je neispravna"
+msgstr "Egy hitelesÃtési adat érvénytelen volt"
#: lib/error.c:67
msgid "The referenced credentials have expired"
-msgstr "Navedene vjerodajnice su istekle"
+msgstr "A hivatkozott hitelesÃtési adatok lejártak"
#: lib/error.c:69
msgid "The context has expired"
-msgstr "Kontekst je istekao"
+msgstr "A környezet lejárt"
#: lib/error.c:71
msgid "Unspecified error in underlying mechanism"
-msgstr "NeodreÄena greÅ¡ka u pozadinskom mehanizmu"
+msgstr "Meghatározhatatlan hiba az alapul szolgáló mechanizmusban"
#: lib/error.c:73
msgid "The quality-of-protection requested could not be provided"
-msgstr "Ne može se pružiti tražena kvaliteta zaštite
(quality-of-protection)"
+msgstr "A kért minÅségi védelem nem lett biztosÃtva"
#: lib/error.c:75
msgid "The operation is forbidden by local security policy"
-msgstr "Lokalna sigurnosna pravila zabranjuju operaciju"
+msgstr "A műveletet a helyi biztonsági házirend letiltotta"
#: lib/error.c:77
msgid "The operation or option is unavailable"
-msgstr "Operacija ili opcija nije dostupna"
+msgstr "A művelet vagy a kapcsoló nem érhetŠel"
#: lib/error.c:79
msgid "The requested credential element already exists"
-msgstr "Traženi element vjerodajnice veÄ postoji"
+msgstr "A kért hitelesÃtési adatelem már létezik"
#: lib/error.c:81
msgid "The provided name was not a mechanism name"
-msgstr "Navedeno ime nije ime mehanizma"
+msgstr "A megadott név nem mechanizmus név volt"
#: lib/error.c:86
msgid "The gss_init_sec_context() or gss_accept_sec_context() function must be
called again to complete its function"
-msgstr "Potrebno je ponovo pozvati funkciju gss_init_sec_context() ili
gss_accept_sec_context() za završetak djelovanja"
+msgstr "A gss_init_sec_context() vagy a gss_accept_sec_context() függvényt
újra meg kell hÃvni a funkciójuk befejezéséhez"
#: lib/error.c:89
msgid "The token was a duplicate of an earlier token"
-msgstr "Simbol je duplikat prethodnog simbola"
+msgstr "A token egy korábbi token másolata volt"
#: lib/error.c:91
msgid "The token's validity period has expired"
-msgstr "Rok trajanja simbola je istekao"
+msgstr "A token érvényességi idÅszaka lejárt"
#: lib/error.c:93
msgid "A later token has already been processed"
-msgstr "Noviji simbol je veÄ obraÄen"
+msgstr "Egy késÅbbi token már fel lett dolgozva"
#: lib/error.c:95
msgid "An expected per-message token was not received"
-msgstr "OÄekivani simbol poruke nije primljen"
+msgstr "Egy várt üzenetenkénti token nem érkezett meg"
#: lib/error.c:312
msgid "No error"
-msgstr "Nema greške"
+msgstr "Nincs hiba"
#: lib/krb5/error.c:36
msgid "No @ in SERVICE-NAME name string"
-msgstr "Nedostaje @ u nizu SERVICE-NAME"
+msgstr "Nincs @ a SERVICE-NAME nevű szövegben"
#: lib/krb5/error.c:38
msgid "STRING-UID-NAME contains nondigits"
-msgstr "STRING-UID-NAME sadrži znakove koji nisu znamenke"
+msgstr "A STRING-UID-NAME nem csak számjegyeket tartalmaz"
#: lib/krb5/error.c:40
msgid "UID does not resolve to username"
-msgstr "UID se ne može povezati s korisniÄkim imenom"
+msgstr "Az UID nem lett feloldva felhasználónévvé"
#: lib/krb5/error.c:42
msgid "Validation error"
-msgstr "Greška provjere valjanosti"
+msgstr "EllenÅrzési hiba"
#: lib/krb5/error.c:44
msgid "Couldn't allocate gss_buffer_t data"
-msgstr "Ne mogu alocirati gss_buffer_t podatke"
+msgstr "Nem sikerült lefoglalni a gss_buffer_t adatokat"
#: lib/krb5/error.c:46
msgid "Message context invalid"
-msgstr "Kontekst poruke neispravan"
+msgstr "Az üzenetkörnyezet érvénytelen"
#: lib/krb5/error.c:48
msgid "Buffer is the wrong size"
-msgstr "MeÄuspremnik ima neispravnu veliÄinu"
+msgstr "A puffer rossz méretű"
#: lib/krb5/error.c:50
msgid "Credential usage type is unknown"
-msgstr "Vrsta korištenja vjerodajnice je nepoznata"
+msgstr "A hitelesÃtési adatok használati tÃpusa ismeretlen"
#: lib/krb5/error.c:52
msgid "Unknown quality of protection specified"
-msgstr "Navedena je nepoznata kvaliteta zaštite"
+msgstr "Ismeretlen minÅségi védelem lett megadva"
#: lib/krb5/error.c:55
msgid "Principal in credential cache does not match desired name"
-msgstr "Upravitelj u spremniku vjerodajnica ne odgovara željenom imenu"
+msgstr "A hitelesÃtési adatok gyorsÃtótárában lévÅ résztvevÅ nem
egyezik a kÃvánt névvel"
#: lib/krb5/error.c:57
msgid "No principal in keytab matches desired name"
-msgstr "Nijedan upravitelj u tablici kljuÄeva ne odgovara željenom imenu"
+msgstr "Nincs a kÃvánt névvel egyezÅ résztvevÅ a kulcslapon"
#: lib/krb5/error.c:59
msgid "Credential cache has no TGT"
-msgstr "Spremnik vjerodajnica nema TGT"
+msgstr "A hitelesÃtési adatok gyorsÃtótárnak nincs TGT-je"
#: lib/krb5/error.c:61
msgid "Authenticator has no subkey"
-msgstr "Ovjeritelj nema podkljuÄ"
+msgstr "A hitelesÃtÅnek nincs alkulcsa"
#: lib/krb5/error.c:63
msgid "Context is already fully established"
-msgstr "Kontekst je veÄ u potpunosti izgraÄen"
+msgstr "A környezet már teljes mértékben létesÃtve"
#: lib/krb5/error.c:65
msgid "Unknown signature type in token"
-msgstr "Nepoznata vrsta potpisa u simbolu"
+msgstr "Ismeretlen aláÃrástÃpus a tokenben"
#: lib/krb5/error.c:67
msgid "Invalid field length in token"
-msgstr "Neispravna duljina polja u simbolu"
+msgstr "Ãrvénytelen mezÅhossz a tokenben"
#: lib/krb5/error.c:69
msgid "Attempt to use incomplete security context"
-msgstr "Pokušaj korištenja nepotpunog sigurnosnog konteksta"
+msgstr "Befejezetlen biztonsági környezet használatának kÃsérlete"
#: lib/krb5/error.c:86
msgid "No krb5 error"
-msgstr "Nema krb5 greške"
+msgstr "Nincs krb5 hiba"
#: lib/krb5/error.c:127
msgid "Unknown krb5 error"
-msgstr "Nepoznata krb5 greška"
+msgstr "Ismeretlen krb5 hiba"
#: src/gss.c:65
#, c-format
msgid "Try `%s --help' for more information.\n"
-msgstr "PokuÅ¡ajte â%s --helpâ za viÅ¡e informacija.\n"
+msgstr "További információkért próbálja a(z) â%s --helpâ
parancsot.\n"
#: src/gss.c:69
#, c-format
msgid "Usage: %s OPTIONS...\n"
-msgstr "Uporaba: %s OPCIJE...\n"
+msgstr "Használat: %s KAPCSOLÃKâ¦\n"
#: src/gss.c:72
msgid ""
"Command line interface to GSS, used to explain error codes.\n"
"\n"
msgstr ""
-"SuÄelje naredbenog retka prema GSS-u, koriÅ¡teno za pojaÅ¡njavanje kodova
grešaka.\n"
+"Parancssoros felület a GSS-hez, amely hibakódok magyarázatához
használható.\n"
"\n"
#: src/gss.c:76
msgid "Mandatory arguments to long options are mandatory for short options
too.\n"
-msgstr "Obavezni argumenti dugaÄkih opcija takoÄer su obavezni i za kratke
opcije.\n"
+msgstr "A hosszú kapcsolók kötelezŠargumentumai a rövid kapcsolókhoz is
kötelezÅek.\n"
#: src/gss.c:79
msgid ""
@@ -237,17 +237,16 @@ msgid ""
" in a human readable format.\n"
" -m, --major=LONG Describe a `major status' error code value.\n"
msgstr ""
-" -h, --help IspiÅ¡i pomoÄ i izaÄi.\n"
-" -V, --version IspiÅ¡i inaÄicu i izaÄi.\n"
+" -h, --help Súgó kiÃrása és kilépés.\n"
+" -V, --version Verzió kiÃrása és kilépés.\n"
" -l, --list-mechanisms\n"
-" Ispiši informacije o podržanim mehanizmima\n"
-" u ljudima Äitljivom obliku.\n"
-" -m, --major=DUG Opiši vrijednost koda greške glavnog stanja\n"
-" (âmajor statusâ).\n"
+" Információk listázása a támogatott
mechanizmusokról\n"
+" ember által olvasható formátumban.\n"
+" -m, --major=LONG Egy âfŠállapotâ hibakód érték leÃrása.\n"
#: src/gss.c:87
msgid " -q, --quiet Silent operation (default=off).\n"
-msgstr " -q, --quiet Tih rad (poÄetna vrijednost âoffâ).\n"
+msgstr " -q, --quiet Csendes működés (alapértelmezett=off).\n"
#: src/gss.c:106
#, c-format
@@ -255,7 +254,7 @@ msgid ""
"GSS-API major status code %ld (0x%lx).\n"
"\n"
msgstr ""
-"GSS-API kod glavnog stanja %ld (0x%lx).\n"
+"GSS-API fŠállapotkód %ld (0x%lx).\n"
"\n"
#: src/gss.c:109
@@ -268,7 +267,7 @@ msgid ""
msgstr ""
" MSB LSB\n"
" +-----------------+-----------------+---------------------------------+\n"
-" |Greška pozivanja | Greška rutine | Dodatne informacije
|\n"
+" | HÃvási hiba | Rutin hiba | KiegészÃtÅ információk
|\n"
" | "
#: src/gss.c:123
@@ -287,34 +286,34 @@ msgstr ""
#: src/gss.c:133
#, c-format
msgid "Masked routine error %ld (0x%lx) shifted into %ld (0x%lx):\n"
-msgstr "Maskirana greška rutine %ld (0x%lx) pomaknuta u %ld (0x%lx):\n"
+msgstr "Maszkolt rutin hiba %ld (0x%lx) eltolva ebbe: %ld (0x%lx):\n"
#: src/gss.c:150 src/gss.c:184 src/gss.c:221
#, c-format
msgid "displaying status code failed (%d)"
-msgstr "prikaz koda stanja nije uspio (%d)"
+msgstr "az állapotkód megjelenÃtése nem sikerült (%d)"
#: src/gss.c:170
#, c-format
msgid "Masked calling error %ld (0x%lx) shifted into %ld (0x%lx):\n"
-msgstr "Maskirana greška pozivanja %ld (0x%lx) pomaknuta u %ld (0x%lx):\n"
+msgstr "Maszkolt hÃvási hiba %ld (0x%lx) eltolva ebbe: %ld (0x%lx):\n"
#: src/gss.c:203
#, c-format
msgid "Masked supplementary info %ld (0x%lx) shifted into %ld (0x%lx):\n"
-msgstr "Maskirane dodatne informacije %ld (0x%lx) pomaknute u %ld (0x%lx):\n"
+msgstr "Maszkolt kiegészÃtÅ információk %ld (0x%lx) eltolva ebbe: %ld
(0x%lx):\n"
#: src/gss.c:238
#, c-format
msgid "No error\n"
-msgstr "Nema greške\n"
+msgstr "Nincs hiba\n"
#: src/gss.c:256
#, c-format
msgid "indicating mechanisms failed (%d)"
-msgstr "prikazivanje mehanizama nije uspjelo (%d)"
+msgstr "a mechanizmusok jelzése nem sikerült (%d)"
#: src/gss.c:271
#, c-format
msgid "inquiring information about mechanism failed (%d)"
-msgstr "traženje informacija o mehanizmu nije uspjelo (%d)"
+msgstr "az érdeklÅdés a mechanizmus információiról nem sikerült (%d)"
diff --git a/src/Makefile.am b/src/Makefile.am
index ca303e4..78bfddd 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,5 +1,5 @@
## Process this file with automake to produce Makefile.in
-# Copyright (C) 2003-2013 Simon Josefsson
+# Copyright (C) 2003-2014 Simon Josefsson
#
# This file is part of the Generic Security Service (GSS).
#
diff --git a/src/gl/Makefile.am b/src/gl/Makefile.am
index e2f6cfb..a9d91d6 100644
--- a/src/gl/Makefile.am
+++ b/src/gl/Makefile.am
@@ -1,6 +1,6 @@
## DO NOT EDIT! GENERATED AUTOMATICALLY!
## Process this file with automake to produce Makefile.in.
-# Copyright (C) 2002-2012 Free Software Foundation, Inc.
+# Copyright (C) 2002-2014 Free Software Foundation, Inc.
#
# This file is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
@@ -23,7 +23,7 @@
# Generated by gnulib-tool.
# Reproduce by: gnulib-tool --import --dir=. --local-dir=src/gl/override
--lib=libgnu --source-base=src/gl --m4-base=src/gl/m4 --doc-base=doc
--tests-base=src/gl/tests --aux-dir=build-aux --no-conditional-dependencies
--libtool --macro-prefix=srcgl --no-vc-files base64 error getopt-gnu progname
version-etc
-AUTOMAKE_OPTIONS = 1.5 gnits
+AUTOMAKE_OPTIONS = 1.9.6 gnits
SUBDIRS =
noinst_HEADERS =
@@ -52,6 +52,15 @@ libgnu_la_LDFLAGS = $(AM_LDFLAGS)
libgnu_la_LDFLAGS += -no-undefined
libgnu_la_LDFLAGS += $(LTLIBINTL)
+## begin gnulib module absolute-header
+
+# Use this preprocessor expression to decide whether #include_next works.
+# Do not rely on a 'configure'-time test for this, since the expression
+# might appear in an installed header, which is used by some other compiler.
+HAVE_INCLUDE_NEXT = (__GNUC__ || 60000000 <= __DECC_VER)
+
+## end gnulib module absolute-header
+
## begin gnulib module base64
libgnu_la_SOURCES += base64.h base64.c
@@ -324,6 +333,134 @@ EXTRA_DIST += stddef.in.h
## end gnulib module stddef
+## begin gnulib module stdio
+
+BUILT_SOURCES += stdio.h
+
+# We need the following in order to create <stdio.h> when the system
+# doesn't have one that works with the given compiler.
+stdio.h: stdio.in.h $(top_builddir)/config.status $(CXXDEFS_H)
$(ARG_NONNULL_H) $(WARN_ON_USE_H)
+ $(AM_V_GEN)rm -f address@hidden $@ && \
+ { echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */' && \
+ sed -e 's|@''GUARD_PREFIX''@|GL_SRCGL|g' \
+ -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \
+ -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \
+ -e 's|@''PRAGMA_COLUMNS''@|@PRAGMA_COLUMNS@|g' \
+ -e 's|@''NEXT_STDIO_H''@|$(NEXT_STDIO_H)|g' \
+ -e 's/@''GNULIB_DPRINTF''@/$(GNULIB_DPRINTF)/g' \
+ -e 's/@''GNULIB_FCLOSE''@/$(GNULIB_FCLOSE)/g' \
+ -e 's/@''GNULIB_FDOPEN''@/$(GNULIB_FDOPEN)/g' \
+ -e 's/@''GNULIB_FFLUSH''@/$(GNULIB_FFLUSH)/g' \
+ -e 's/@''GNULIB_FGETC''@/$(GNULIB_FGETC)/g' \
+ -e 's/@''GNULIB_FGETS''@/$(GNULIB_FGETS)/g' \
+ -e 's/@''GNULIB_FOPEN''@/$(GNULIB_FOPEN)/g' \
+ -e 's/@''GNULIB_FPRINTF''@/$(GNULIB_FPRINTF)/g' \
+ -e 's/@''GNULIB_FPRINTF_POSIX''@/$(GNULIB_FPRINTF_POSIX)/g' \
+ -e 's/@''GNULIB_FPURGE''@/$(GNULIB_FPURGE)/g' \
+ -e 's/@''GNULIB_FPUTC''@/$(GNULIB_FPUTC)/g' \
+ -e 's/@''GNULIB_FPUTS''@/$(GNULIB_FPUTS)/g' \
+ -e 's/@''GNULIB_FREAD''@/$(GNULIB_FREAD)/g' \
+ -e 's/@''GNULIB_FREOPEN''@/$(GNULIB_FREOPEN)/g' \
+ -e 's/@''GNULIB_FSCANF''@/$(GNULIB_FSCANF)/g' \
+ -e 's/@''GNULIB_FSEEK''@/$(GNULIB_FSEEK)/g' \
+ -e 's/@''GNULIB_FSEEKO''@/$(GNULIB_FSEEKO)/g' \
+ -e 's/@''GNULIB_FTELL''@/$(GNULIB_FTELL)/g' \
+ -e 's/@''GNULIB_FTELLO''@/$(GNULIB_FTELLO)/g' \
+ -e 's/@''GNULIB_FWRITE''@/$(GNULIB_FWRITE)/g' \
+ -e 's/@''GNULIB_GETC''@/$(GNULIB_GETC)/g' \
+ -e 's/@''GNULIB_GETCHAR''@/$(GNULIB_GETCHAR)/g' \
+ -e 's/@''GNULIB_GETDELIM''@/$(GNULIB_GETDELIM)/g' \
+ -e 's/@''GNULIB_GETLINE''@/$(GNULIB_GETLINE)/g' \
+ -e 's/@''GNULIB_OBSTACK_PRINTF''@/$(GNULIB_OBSTACK_PRINTF)/g' \
+ -e
's/@''GNULIB_OBSTACK_PRINTF_POSIX''@/$(GNULIB_OBSTACK_PRINTF_POSIX)/g' \
+ -e 's/@''GNULIB_PCLOSE''@/$(GNULIB_PCLOSE)/g' \
+ -e 's/@''GNULIB_PERROR''@/$(GNULIB_PERROR)/g' \
+ -e 's/@''GNULIB_POPEN''@/$(GNULIB_POPEN)/g' \
+ -e 's/@''GNULIB_PRINTF''@/$(GNULIB_PRINTF)/g' \
+ -e 's/@''GNULIB_PRINTF_POSIX''@/$(GNULIB_PRINTF_POSIX)/g' \
+ -e 's/@''GNULIB_PUTC''@/$(GNULIB_PUTC)/g' \
+ -e 's/@''GNULIB_PUTCHAR''@/$(GNULIB_PUTCHAR)/g' \
+ -e 's/@''GNULIB_PUTS''@/$(GNULIB_PUTS)/g' \
+ -e 's/@''GNULIB_REMOVE''@/$(GNULIB_REMOVE)/g' \
+ -e 's/@''GNULIB_RENAME''@/$(GNULIB_RENAME)/g' \
+ -e 's/@''GNULIB_RENAMEAT''@/$(GNULIB_RENAMEAT)/g' \
+ -e 's/@''GNULIB_SCANF''@/$(GNULIB_SCANF)/g' \
+ -e 's/@''GNULIB_SNPRINTF''@/$(GNULIB_SNPRINTF)/g' \
+ -e 's/@''GNULIB_SPRINTF_POSIX''@/$(GNULIB_SPRINTF_POSIX)/g' \
+ -e
's/@''GNULIB_STDIO_H_NONBLOCKING''@/$(GNULIB_STDIO_H_NONBLOCKING)/g' \
+ -e 's/@''GNULIB_STDIO_H_SIGPIPE''@/$(GNULIB_STDIO_H_SIGPIPE)/g' \
+ -e 's/@''GNULIB_TMPFILE''@/$(GNULIB_TMPFILE)/g' \
+ -e 's/@''GNULIB_VASPRINTF''@/$(GNULIB_VASPRINTF)/g' \
+ -e 's/@''GNULIB_VDPRINTF''@/$(GNULIB_VDPRINTF)/g' \
+ -e 's/@''GNULIB_VFPRINTF''@/$(GNULIB_VFPRINTF)/g' \
+ -e 's/@''GNULIB_VFPRINTF_POSIX''@/$(GNULIB_VFPRINTF_POSIX)/g' \
+ -e 's/@''GNULIB_VFSCANF''@/$(GNULIB_VFSCANF)/g' \
+ -e 's/@''GNULIB_VSCANF''@/$(GNULIB_VSCANF)/g' \
+ -e 's/@''GNULIB_VPRINTF''@/$(GNULIB_VPRINTF)/g' \
+ -e 's/@''GNULIB_VPRINTF_POSIX''@/$(GNULIB_VPRINTF_POSIX)/g' \
+ -e 's/@''GNULIB_VSNPRINTF''@/$(GNULIB_VSNPRINTF)/g' \
+ -e 's/@''GNULIB_VSPRINTF_POSIX''@/$(GNULIB_VSPRINTF_POSIX)/g' \
+ < $(srcdir)/stdio.in.h | \
+ sed -e 's|@''HAVE_DECL_FPURGE''@|$(HAVE_DECL_FPURGE)|g' \
+ -e 's|@''HAVE_DECL_FSEEKO''@|$(HAVE_DECL_FSEEKO)|g' \
+ -e 's|@''HAVE_DECL_FTELLO''@|$(HAVE_DECL_FTELLO)|g' \
+ -e 's|@''HAVE_DECL_GETDELIM''@|$(HAVE_DECL_GETDELIM)|g' \
+ -e 's|@''HAVE_DECL_GETLINE''@|$(HAVE_DECL_GETLINE)|g' \
+ -e
's|@''HAVE_DECL_OBSTACK_PRINTF''@|$(HAVE_DECL_OBSTACK_PRINTF)|g' \
+ -e 's|@''HAVE_DECL_SNPRINTF''@|$(HAVE_DECL_SNPRINTF)|g' \
+ -e 's|@''HAVE_DECL_VSNPRINTF''@|$(HAVE_DECL_VSNPRINTF)|g' \
+ -e 's|@''HAVE_DPRINTF''@|$(HAVE_DPRINTF)|g' \
+ -e 's|@''HAVE_FSEEKO''@|$(HAVE_FSEEKO)|g' \
+ -e 's|@''HAVE_FTELLO''@|$(HAVE_FTELLO)|g' \
+ -e 's|@''HAVE_PCLOSE''@|$(HAVE_PCLOSE)|g' \
+ -e 's|@''HAVE_POPEN''@|$(HAVE_POPEN)|g' \
+ -e 's|@''HAVE_RENAMEAT''@|$(HAVE_RENAMEAT)|g' \
+ -e 's|@''HAVE_VASPRINTF''@|$(HAVE_VASPRINTF)|g' \
+ -e 's|@''HAVE_VDPRINTF''@|$(HAVE_VDPRINTF)|g' \
+ -e 's|@''REPLACE_DPRINTF''@|$(REPLACE_DPRINTF)|g' \
+ -e 's|@''REPLACE_FCLOSE''@|$(REPLACE_FCLOSE)|g' \
+ -e 's|@''REPLACE_FDOPEN''@|$(REPLACE_FDOPEN)|g' \
+ -e 's|@''REPLACE_FFLUSH''@|$(REPLACE_FFLUSH)|g' \
+ -e 's|@''REPLACE_FOPEN''@|$(REPLACE_FOPEN)|g' \
+ -e 's|@''REPLACE_FPRINTF''@|$(REPLACE_FPRINTF)|g' \
+ -e 's|@''REPLACE_FPURGE''@|$(REPLACE_FPURGE)|g' \
+ -e 's|@''REPLACE_FREOPEN''@|$(REPLACE_FREOPEN)|g' \
+ -e 's|@''REPLACE_FSEEK''@|$(REPLACE_FSEEK)|g' \
+ -e 's|@''REPLACE_FSEEKO''@|$(REPLACE_FSEEKO)|g' \
+ -e 's|@''REPLACE_FTELL''@|$(REPLACE_FTELL)|g' \
+ -e 's|@''REPLACE_FTELLO''@|$(REPLACE_FTELLO)|g' \
+ -e 's|@''REPLACE_GETDELIM''@|$(REPLACE_GETDELIM)|g' \
+ -e 's|@''REPLACE_GETLINE''@|$(REPLACE_GETLINE)|g' \
+ -e 's|@''REPLACE_OBSTACK_PRINTF''@|$(REPLACE_OBSTACK_PRINTF)|g' \
+ -e 's|@''REPLACE_PERROR''@|$(REPLACE_PERROR)|g' \
+ -e 's|@''REPLACE_POPEN''@|$(REPLACE_POPEN)|g' \
+ -e 's|@''REPLACE_PRINTF''@|$(REPLACE_PRINTF)|g' \
+ -e 's|@''REPLACE_REMOVE''@|$(REPLACE_REMOVE)|g' \
+ -e 's|@''REPLACE_RENAME''@|$(REPLACE_RENAME)|g' \
+ -e 's|@''REPLACE_RENAMEAT''@|$(REPLACE_RENAMEAT)|g' \
+ -e 's|@''REPLACE_SNPRINTF''@|$(REPLACE_SNPRINTF)|g' \
+ -e 's|@''REPLACE_SPRINTF''@|$(REPLACE_SPRINTF)|g' \
+ -e
's|@''REPLACE_STDIO_READ_FUNCS''@|$(REPLACE_STDIO_READ_FUNCS)|g' \
+ -e
's|@''REPLACE_STDIO_WRITE_FUNCS''@|$(REPLACE_STDIO_WRITE_FUNCS)|g' \
+ -e 's|@''REPLACE_TMPFILE''@|$(REPLACE_TMPFILE)|g' \
+ -e 's|@''REPLACE_VASPRINTF''@|$(REPLACE_VASPRINTF)|g' \
+ -e 's|@''REPLACE_VDPRINTF''@|$(REPLACE_VDPRINTF)|g' \
+ -e 's|@''REPLACE_VFPRINTF''@|$(REPLACE_VFPRINTF)|g' \
+ -e 's|@''REPLACE_VPRINTF''@|$(REPLACE_VPRINTF)|g' \
+ -e 's|@''REPLACE_VSNPRINTF''@|$(REPLACE_VSNPRINTF)|g' \
+ -e 's|@''REPLACE_VSPRINTF''@|$(REPLACE_VSPRINTF)|g' \
+ -e 's|@''ASM_SYMBOL_PREFIX''@|$(ASM_SYMBOL_PREFIX)|g' \
+ -e '/definitions of _GL_FUNCDECL_RPL/r $(CXXDEFS_H)' \
+ -e '/definition of _GL_ARG_NONNULL/r $(ARG_NONNULL_H)' \
+ -e '/definition of _GL_WARN_ON_USE/r $(WARN_ON_USE_H)'; \
+ } > address@hidden && \
+ mv address@hidden $@
+MOSTLYCLEANFILES += stdio.h stdio.h-t
+
+EXTRA_DIST += stdio.in.h
+
+## end gnulib module stdio
+
## begin gnulib module strerror
@@ -470,6 +607,7 @@ EXTRA_DIST += sys_types.in.h
## begin gnulib module unistd
BUILT_SOURCES += unistd.h
+libgnu_la_SOURCES += unistd.c
# We need the following in order to create an empty placeholder for
# <unistd.h> when the system doesn't have one.
@@ -584,6 +722,7 @@ unistd.h: unistd.in.h $(top_builddir)/config.status
$(CXXDEFS_H) $(ARG_NONNULL_H
-e 's|@''REPLACE_FTRUNCATE''@|$(REPLACE_FTRUNCATE)|g' \
-e 's|@''REPLACE_GETCWD''@|$(REPLACE_GETCWD)|g' \
-e 's|@''REPLACE_GETDOMAINNAME''@|$(REPLACE_GETDOMAINNAME)|g' \
+ -e 's|@''REPLACE_GETDTABLESIZE''@|$(REPLACE_GETDTABLESIZE)|g' \
-e 's|@''REPLACE_GETLOGIN_R''@|$(REPLACE_GETLOGIN_R)|g' \
-e 's|@''REPLACE_GETGROUPS''@|$(REPLACE_GETGROUPS)|g' \
-e 's|@''REPLACE_GETPAGESIZE''@|$(REPLACE_GETPAGESIZE)|g' \
diff --git a/src/gl/base64.c b/src/gl/base64.c
index 351c5fd..c7f7ac5 100644
--- a/src/gl/base64.c
+++ b/src/gl/base64.c
@@ -1,5 +1,5 @@
/* base64.c -- Encode binary data using printable characters.
- Copyright (C) 1999-2001, 2004-2006, 2009-2012 Free Software Foundation, Inc.
+ Copyright (C) 1999-2001, 2004-2006, 2009-2014 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
@@ -53,12 +53,33 @@
#include <string.h>
/* C89 compliant way to cast 'char' to 'unsigned char'. */
-static inline unsigned char
+static unsigned char
to_uchar (char ch)
{
return ch;
}
+static const char b64c[64] =
+ "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/";
+
+/* Base64 encode IN array of size INLEN into OUT array. OUT needs
+ to be of length >= BASE64_LENGTH(INLEN), and INLEN needs to be
+ a multiple of 3. */
+static void
+base64_encode_fast (const char *restrict in, size_t inlen, char *restrict out)
+{
+ while (inlen)
+ {
+ *out++ = b64c[to_uchar (in[0]) >> 2];
+ *out++ = b64c[((to_uchar (in[0]) << 4) + (to_uchar (in[1]) >> 4)) &
0x3f];
+ *out++ = b64c[((to_uchar (in[1]) << 2) + (to_uchar (in[2]) >> 6)) &
0x3f];
+ *out++ = b64c[to_uchar (in[2]) & 0x3f];
+
+ inlen -= 3;
+ in += 3;
+ }
+}
+
/* Base64 encode IN array of size INLEN into OUT array of size OUTLEN.
If OUTLEN is less than BASE64_LENGTH(INLEN), write as many bytes as
possible. If OUTLEN is larger than BASE64_LENGTH(INLEN), also zero
@@ -67,28 +88,38 @@ void
base64_encode (const char *restrict in, size_t inlen,
char *restrict out, size_t outlen)
{
- static const char b64str[64] =
- "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/";
+ /* Note this outlen constraint can be enforced at compile time.
+ I.E. that the output buffer is exactly large enough to hold
+ the encoded inlen bytes. The inlen constraints (of corresponding
+ to outlen, and being a multiple of 3) can change at runtime
+ at the end of input. However the common case when reading
+ large inputs is to have both constraints satisfied, so we depend
+ on both in base_encode_fast(). */
+ if (outlen % 4 == 0 && inlen == outlen / 4 * 3)
+ {
+ base64_encode_fast (in, inlen, out);
+ return;
+ }
while (inlen && outlen)
{
- *out++ = b64str[(to_uchar (in[0]) >> 2) & 0x3f];
+ *out++ = b64c[to_uchar (in[0]) >> 2];
if (!--outlen)
break;
- *out++ = b64str[((to_uchar (in[0]) << 4)
+ *out++ = b64c[((to_uchar (in[0]) << 4)
+ (--inlen ? to_uchar (in[1]) >> 4 : 0))
& 0x3f];
if (!--outlen)
break;
*out++ =
(inlen
- ? b64str[((to_uchar (in[1]) << 2)
+ ? b64c[((to_uchar (in[1]) << 2)
+ (--inlen ? to_uchar (in[2]) >> 6 : 0))
& 0x3f]
: '=');
if (!--outlen)
break;
- *out++ = inlen ? b64str[to_uchar (in[2]) & 0x3f] : '=';
+ *out++ = inlen ? b64c[to_uchar (in[2]) & 0x3f] : '=';
if (!--outlen)
break;
if (inlen)
@@ -314,7 +345,7 @@ base64_decode_ctx_init (struct base64_decode_context *ctx)
and return CTX->buf. In either case, advance *IN to point to the byte
after the last one processed, and set *N_NON_NEWLINE to the number of
verified non-newline bytes accessible through the returned pointer. */
-static inline char *
+static char *
get_4 (struct base64_decode_context *ctx,
char const *restrict *in, char const *restrict in_end,
size_t *n_non_newline)
@@ -368,7 +399,7 @@ get_4 (struct base64_decode_context *ctx,
as many bytes as possible are written to *OUT. On return, advance
*OUT to point to the byte after the last one written, and decrement
*OUTLEN to reflect the number of bytes remaining in *OUT. */
-static inline bool
+static bool
decode_4 (char const *restrict in, size_t inlen,
char *restrict *outp, size_t *outleft)
{
diff --git a/src/gl/base64.h b/src/gl/base64.h
index b7e155c..f550ccc 100644
--- a/src/gl/base64.h
+++ b/src/gl/base64.h
@@ -1,5 +1,5 @@
/* base64.h -- Encode binary data using printable characters.
- Copyright (C) 2004-2006, 2009-2012 Free Software Foundation, Inc.
+ Copyright (C) 2004-2006, 2009-2014 Free Software Foundation, Inc.
Written by Simon Josefsson.
This program is free software; you can redistribute it and/or modify
diff --git a/src/gl/errno.in.h b/src/gl/errno.in.h
index 5e5af92..832afc8 100644
--- a/src/gl/errno.in.h
+++ b/src/gl/errno.in.h
@@ -1,6 +1,6 @@
/* A POSIX-like <errno.h>.
- Copyright (C) 2008-2012 Free Software Foundation, Inc.
+ Copyright (C) 2008-2014 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
@@ -270,5 +270,10 @@
# define GNULIB_defined_ENOTRECOVERABLE 1
# endif
+# ifndef EILSEQ
+# define EILSEQ 2015
+# define GNULIB_defined_EILSEQ 1
+# endif
+
#endif /* address@hidden@_ERRNO_H */
#endif /* address@hidden@_ERRNO_H */
diff --git a/src/gl/error.c b/src/gl/error.c
index dc8c65f..18ff5db 100644
--- a/src/gl/error.c
+++ b/src/gl/error.c
@@ -1,5 +1,5 @@
/* Error handler for noninteractive utilities
- Copyright (C) 1990-1998, 2000-2007, 2009-2012 Free Software Foundation, Inc.
+ Copyright (C) 1990-1998, 2000-2007, 2009-2014 Free Software Foundation, Inc.
This file is part of the GNU C Library.
This program is free software: you can redistribute it and/or modify
@@ -39,6 +39,9 @@
# include <stdint.h>
# include <wchar.h>
# define mbsrtowcs __mbsrtowcs
+# define USE_UNLOCKED_IO 0
+# define _GL_ATTRIBUTE_FORMAT_PRINTF(a, b)
+# define _GL_ARG_NONNULL(a)
#endif
#if USE_UNLOCKED_IO
@@ -72,14 +75,14 @@ extern void __error (int status, int errnum, const char
*message, ...)
extern void __error_at_line (int status, int errnum, const char *file_name,
unsigned int line_number, const char *message,
...)
- __attribute__ ((__format__ (__printf__, 5, 6)));;
+ __attribute__ ((__format__ (__printf__, 5, 6)));
# define error __error
# define error_at_line __error_at_line
# include <libio/iolibio.h>
-# define fflush(s) INTUSE(_IO_fflush) (s)
+# define fflush(s) _IO_fflush (s)
# undef putc
-# define putc(c, fp) INTUSE(_IO_putc) (c, fp)
+# define putc(c, fp) _IO_putc (c, fp)
# include <bits/libc-lock.h>
@@ -121,7 +124,7 @@ extern char *program_name;
#if !_LIBC
/* Return non-zero if FD is open. */
-static inline int
+static int
is_open (int fd)
{
# if (defined _WIN32 || defined __WIN32__) && ! defined __CYGWIN__
@@ -139,7 +142,7 @@ is_open (int fd)
}
#endif
-static inline void
+static void
flush_stdout (void)
{
#if !_LIBC
@@ -171,7 +174,7 @@ print_errno_message (int errnum)
#if defined HAVE_STRERROR_R || _LIBC
char errbuf[1024];
-# if STRERROR_R_CHAR_P || _LIBC
+# if _LIBC || STRERROR_R_CHAR_P
s = __strerror_r (errnum, errbuf, sizeof errbuf);
# else
if (__strerror_r (errnum, errbuf, sizeof errbuf) == 0)
@@ -195,13 +198,12 @@ print_errno_message (int errnum)
#endif
}
-static void
+static void _GL_ATTRIBUTE_FORMAT_PRINTF (3, 0) _GL_ARG_NONNULL ((3))
error_tail (int status, int errnum, const char *message, va_list args)
{
#if _LIBC
if (_IO_fwide (stderr, 0) > 0)
{
-# define ALLOCA_LIMIT 2000
size_t len = strlen (message) + 1;
wchar_t *wmessage = NULL;
mbstate_t st;
@@ -237,7 +239,7 @@ error_tail (int status, int errnum, const char *message,
va_list args)
if (res != len)
break;
- if (__builtin_expect (len >= SIZE_MAX / 2, 0))
+ if (__builtin_expect (len >= SIZE_MAX / sizeof (wchar_t) / 2, 0))
{
/* This really should not happen if everything is fine. */
res = (size_t) -1;
@@ -342,7 +344,10 @@ error_at_line (int status, int errnum, const char
*file_name,
if (old_line_number == line_number
&& (file_name == old_file_name
- || strcmp (old_file_name, file_name) == 0))
+ || (old_file_name != NULL
+ && file_name != NULL
+ && strcmp (old_file_name, file_name) == 0)))
+
/* Simply return and print nothing. */
return;
diff --git a/src/gl/error.h b/src/gl/error.h
index 9c2cb8b..4aaafb3 100644
--- a/src/gl/error.h
+++ b/src/gl/error.h
@@ -1,5 +1,5 @@
/* Declaration for error-reporting function
- Copyright (C) 1995-1997, 2003, 2006, 2008-2012 Free Software Foundation,
+ Copyright (C) 1995-1997, 2003, 2006, 2008-2014 Free Software Foundation,
Inc.
This file is part of the GNU C Library.
diff --git a/src/gl/getopt.c b/src/gl/getopt.c
index 4342a34..7d950af 100644
--- a/src/gl/getopt.c
+++ b/src/gl/getopt.c
@@ -2,7 +2,7 @@
NOTE: getopt is part of the C library, so if you don't know what
"Keep this file name-space clean" means, talk to address@hidden
before changing it!
- Copyright (C) 1987-1996, 1998-2004, 2006, 2008-2012 Free Software
+ Copyright (C) 1987-1996, 1998-2004, 2006, 2008-2014 Free Software
Foundation, Inc.
This file is part of the GNU C Library.
diff --git a/src/gl/getopt.in.h b/src/gl/getopt.in.h
index 06b6dfc..7ab99fb 100644
--- a/src/gl/getopt.in.h
+++ b/src/gl/getopt.in.h
@@ -1,5 +1,5 @@
/* Declarations for getopt.
- Copyright (C) 1989-1994, 1996-1999, 2001, 2003-2007, 2009-2012 Free Software
+ Copyright (C) 1989-1994, 1996-1999, 2001, 2003-2007, 2009-2014 Free Software
Foundation, Inc.
This file is part of the GNU C Library.
@@ -49,7 +49,9 @@
linkers. */
#if defined __GETOPT_PREFIX && !defined __need_getopt
# if address@hidden@
+# define __need_system_stdlib_h
# include <stdlib.h>
+# undef __need_system_stdlib_h
# include <stdio.h>
# include <unistd.h>
# endif
diff --git a/src/gl/getopt1.c b/src/gl/getopt1.c
index fb2a8f5..a184865 100644
--- a/src/gl/getopt1.c
+++ b/src/gl/getopt1.c
@@ -1,5 +1,5 @@
/* getopt_long and getopt_long_only entry points for GNU getopt.
- Copyright (C) 1987-1994, 1996-1998, 2004, 2006, 2009-2012 Free Software
+ Copyright (C) 1987-1994, 1996-1998, 2004, 2006, 2009-2014 Free Software
Foundation, Inc.
This file is part of the GNU C Library.
diff --git a/src/gl/getopt_int.h b/src/gl/getopt_int.h
index 2da020c..24ed672 100644
--- a/src/gl/getopt_int.h
+++ b/src/gl/getopt_int.h
@@ -1,5 +1,5 @@
/* Internal declarations for getopt.
- Copyright (C) 1989-1994, 1996-1999, 2001, 2003-2004, 2009-2012 Free Software
+ Copyright (C) 1989-1994, 1996-1999, 2001, 2003-2004, 2009-2014 Free Software
Foundation, Inc.
This file is part of the GNU C Library.
diff --git a/src/gl/gettext.h b/src/gl/gettext.h
index 3108e4a..babf1d0 100644
--- a/src/gl/gettext.h
+++ b/src/gl/gettext.h
@@ -1,5 +1,5 @@
/* Convenience header for conditional use of GNU <libintl.h>.
- Copyright (C) 1995-1998, 2000-2002, 2004-2006, 2009-2012 Free Software
+ Copyright (C) 1995-1998, 2000-2002, 2004-2006, 2009-2014 Free Software
Foundation, Inc.
This program is free software; you can redistribute it and/or modify
diff --git a/src/gl/intprops.h b/src/gl/intprops.h
index 2485c78..d0bb7a6 100644
--- a/src/gl/intprops.h
+++ b/src/gl/intprops.h
@@ -1,6 +1,6 @@
/* intprops.h -- properties of integer types
- Copyright (C) 2001-2005, 2009-2012 Free Software Foundation, Inc.
+ Copyright (C) 2001-2005, 2009-2014 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
@@ -89,7 +89,8 @@
/* Return 1 if the __typeof__ keyword works. This could be done by
'configure', but for now it's easier to do it by hand. */
-#if 2 <= __GNUC__ || 0x5110 <= __SUNPRO_C
+#if (2 <= __GNUC__ || defined __IBM__TYPEOF__ \
+ || (0x5110 <= __SUNPRO_C && !__STDC__))
# define _GL_HAVE___TYPEOF__ 1
#else
# define _GL_HAVE___TYPEOF__ 0
diff --git a/src/gl/m4/00gnulib.m4 b/src/gl/m4/00gnulib.m4
index d978cb8..8eca551 100644
--- a/src/gl/m4/00gnulib.m4
+++ b/src/gl/m4/00gnulib.m4
@@ -1,12 +1,28 @@
-# 00gnulib.m4 serial 2
-dnl Copyright (C) 2009-2012 Free Software Foundation, Inc.
+# 00gnulib.m4 serial 3
+dnl Copyright (C) 2009-2014 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.
dnl This file must be named something that sorts before all other
dnl gnulib-provided .m4 files. It is needed until such time as we can
-dnl assume Autoconf 2.64, with its improved AC_DEFUN_ONCE semantics.
+dnl assume Autoconf 2.64, with its improved AC_DEFUN_ONCE and
+dnl m4_divert semantics.
+
+# Until autoconf 2.63, handling of the diversion stack required m4_init
+# to be called first; but this does not happen with aclocal. Wrapping
+# the entire execution in another layer of the diversion stack fixes this.
+# Worse, prior to autoconf 2.62, m4_wrap depended on the underlying m4
+# for whether it was FIFO or LIFO; in order to properly balance with
+# m4_init, we need to undo our push just before anything wrapped within
+# the m4_init body. The way to ensure this is to wrap both sides of
+# m4_init with a one-shot macro that does the pop at the right time.
+m4_ifndef([_m4_divert_diversion],
+[m4_divert_push([KILL])
+m4_define([gl_divert_fixup], [m4_divert_pop()m4_define([$0])])
+m4_define([m4_init],
+ [gl_divert_fixup()]m4_defn([m4_init])[gl_divert_fixup()])])
+
# AC_DEFUN_ONCE([NAME], VALUE)
# ----------------------------
diff --git a/src/gl/m4/absolute-header.m4 b/src/gl/m4/absolute-header.m4
new file mode 100644
index 0000000..ce3e39e
--- /dev/null
+++ b/src/gl/m4/absolute-header.m4
@@ -0,0 +1,102 @@
+# absolute-header.m4 serial 16
+dnl Copyright (C) 2006-2014 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.
+
+dnl From Derek Price.
+
+# gl_ABSOLUTE_HEADER(HEADER1 HEADER2 ...)
+# ---------------------------------------
+# Find the absolute name of a header file, testing first if the header exists.
+# If the header were sys/inttypes.h, this macro would define
+# ABSOLUTE_SYS_INTTYPES_H to the '""' quoted absolute name of sys/inttypes.h
+# in config.h
+# (e.g. '#define ABSOLUTE_SYS_INTTYPES_H "///usr/include/sys/inttypes.h"').
+# The three "///" are to pacify Sun C 5.8, which otherwise would say
+# "warning: #include of /usr/include/... may be non-portable".
+# Use '""', not '<>', so that the /// cannot be confused with a C99 comment.
+# Note: This macro assumes that the header file is not empty after
+# preprocessing, i.e. it does not only define preprocessor macros but also
+# provides some type/enum definitions or function/variable declarations.
+AC_DEFUN([gl_ABSOLUTE_HEADER],
+[AC_REQUIRE([AC_CANONICAL_HOST])
+AC_LANG_PREPROC_REQUIRE()dnl
+dnl FIXME: gl_absolute_header and ac_header_exists must be used unquoted
+dnl until we can assume autoconf 2.64 or newer.
+m4_foreach_w([gl_HEADER_NAME], [$1],
+ [AS_VAR_PUSHDEF([gl_absolute_header],
+ [gl_cv_absolute_]m4_defn([gl_HEADER_NAME]))dnl
+ AC_CACHE_CHECK([absolute name of <]m4_defn([gl_HEADER_NAME])[>],
+ m4_defn([gl_absolute_header]),
+ [AS_VAR_PUSHDEF([ac_header_exists],
+ [ac_cv_header_]m4_defn([gl_HEADER_NAME]))dnl
+ AC_CHECK_HEADERS_ONCE(m4_defn([gl_HEADER_NAME]))dnl
+ if test AS_VAR_GET(ac_header_exists) = yes; then
+ gl_ABSOLUTE_HEADER_ONE(m4_defn([gl_HEADER_NAME]))
+ fi
+ AS_VAR_POPDEF([ac_header_exists])dnl
+ ])dnl
+ AC_DEFINE_UNQUOTED(AS_TR_CPP([ABSOLUTE_]m4_defn([gl_HEADER_NAME])),
+ ["AS_VAR_GET(gl_absolute_header)"],
+ [Define this to an absolute name of
<]m4_defn([gl_HEADER_NAME])[>.])
+ AS_VAR_POPDEF([gl_absolute_header])dnl
+])dnl
+])# gl_ABSOLUTE_HEADER
+
+# gl_ABSOLUTE_HEADER_ONE(HEADER)
+# ------------------------------
+# Like gl_ABSOLUTE_HEADER, except that:
+# - it assumes that the header exists,
+# - it uses the current CPPFLAGS,
+# - it does not cache the result,
+# - it is silent.
+AC_DEFUN([gl_ABSOLUTE_HEADER_ONE],
+[
+ AC_REQUIRE([AC_CANONICAL_HOST])
+ AC_LANG_CONFTEST([AC_LANG_SOURCE([[#include <]]m4_dquote([$1])[[>]])])
+ dnl AIX "xlc -E" and "cc -E" omit #line directives for header files
+ dnl that contain only a #include of other header files and no
+ dnl non-comment tokens of their own. This leads to a failure to
+ dnl detect the absolute name of <dirent.h>, <signal.h>, <poll.h>
+ dnl and others. The workaround is to force preservation of comments
+ dnl through option -C. This ensures all necessary #line directives
+ dnl are present. GCC supports option -C as well.
+ case "$host_os" in
+ aix*) gl_absname_cpp="$ac_cpp -C" ;;
+ *) gl_absname_cpp="$ac_cpp" ;;
+ esac
+changequote(,)
+ case "$host_os" in
+ mingw*)
+ dnl For the sake of native Windows compilers (excluding gcc),
+ dnl treat backslash as a directory separator, like /.
+ dnl Actually, these compilers use a double-backslash as
+ dnl directory separator, inside the
+ dnl # line "filename"
+ dnl directives.
+ gl_dirsep_regex='[/\\]'
+ ;;
+ *)
+ gl_dirsep_regex='\/'
+ ;;
+ esac
+ dnl A sed expression that turns a string into a basic regular
+ dnl expression, for use within "/.../".
+ gl_make_literal_regex_sed='s,[]$^\\.*/[],\\&,g'
+ gl_header_literal_regex=`echo '$1' \
+ | sed -e "$gl_make_literal_regex_sed"`
+ gl_absolute_header_sed="/${gl_dirsep_regex}${gl_header_literal_regex}/"'{
+ s/.*"\(.*'"${gl_dirsep_regex}${gl_header_literal_regex}"'\)".*/\1/
+ s|^/[^/]|//&|
+ p
+ q
+ }'
+changequote([,])
+ dnl eval is necessary to expand gl_absname_cpp.
+ dnl Ultrix and Pyramid sh refuse to redirect output of eval,
+ dnl so use subshell.
+ AS_VAR_SET([gl_cv_absolute_]AS_TR_SH([[$1]]),
+[`(eval "$gl_absname_cpp conftest.$ac_ext") 2>&AS_MESSAGE_LOG_FD |
+ sed -n "$gl_absolute_header_sed"`])
+])
diff --git a/src/gl/m4/base64.m4 b/src/gl/m4/base64.m4
index fa0c192..9559e30 100644
--- a/src/gl/m4/base64.m4
+++ b/src/gl/m4/base64.m4
@@ -1,5 +1,5 @@
-# base64.m4 serial 3
-dnl Copyright (C) 2004, 2006, 2009-2012 Free Software Foundation, Inc.
+# base64.m4 serial 4
+dnl Copyright (C) 2004, 2006, 2009-2014 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.
@@ -11,6 +11,5 @@ AC_DEFUN([gl_FUNC_BASE64],
# Prerequisites of lib/base64.c.
AC_DEFUN([gl_PREREQ_BASE64], [
- AC_REQUIRE([AC_C_INLINE])
AC_REQUIRE([AC_C_RESTRICT])
])
diff --git a/src/gl/m4/errno_h.m4 b/src/gl/m4/errno_h.m4
index 1e76ba2..4ee9e6a 100644
--- a/src/gl/m4/errno_h.m4
+++ b/src/gl/m4/errno_h.m4
@@ -1,5 +1,5 @@
-# errno_h.m4 serial 11
-dnl Copyright (C) 2004, 2006, 2008-2012 Free Software Foundation, Inc.
+# errno_h.m4 serial 12
+dnl Copyright (C) 2004, 2006, 2008-2014 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.
@@ -58,6 +58,9 @@ booboo
#if !defined ENOTRECOVERABLE
booboo
#endif
+#if !defined EILSEQ
+booboo
+#endif
],
[gl_cv_header_errno_h_complete=no],
[gl_cv_header_errno_h_complete=yes])
diff --git a/src/gl/m4/error.m4 b/src/gl/m4/error.m4
index 5d9c70a..f08ae50 100644
--- a/src/gl/m4/error.m4
+++ b/src/gl/m4/error.m4
@@ -1,6 +1,6 @@
#serial 14
-# Copyright (C) 1996-1998, 2001-2004, 2009-2012 Free Software Foundation, Inc.
+# Copyright (C) 1996-1998, 2001-2004, 2009-2014 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -23,6 +23,5 @@ AC_DEFUN([gl_ERROR],
AC_DEFUN([gl_PREREQ_ERROR],
[
AC_REQUIRE([AC_FUNC_STRERROR_R])
- AC_REQUIRE([AC_C_INLINE])
:
])
diff --git a/src/gl/m4/extensions.m4 b/src/gl/m4/extensions.m4
index 6d17d8a..37f55ca 100644
--- a/src/gl/m4/extensions.m4
+++ b/src/gl/m4/extensions.m4
@@ -1,14 +1,14 @@
-# serial 12 -*- Autoconf -*-
+# serial 13 -*- Autoconf -*-
# Enable extensions on systems that normally disable them.
-# Copyright (C) 2003, 2006-2012 Free Software Foundation, Inc.
+# Copyright (C) 2003, 2006-2014 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.
-# This definition of AC_USE_SYSTEM_EXTENSIONS is stolen from CVS
+# This definition of AC_USE_SYSTEM_EXTENSIONS is stolen from git
# Autoconf. Perhaps we can remove this once we can assume Autoconf
-# 2.62 or later everywhere, but since CVS Autoconf mutates rapidly
+# 2.70 or later everywhere, but since Autoconf mutates rapidly
# enough in this area it's likely we'll need to redefine
# AC_USE_SYSTEM_EXTENSIONS for quite some time.
@@ -30,6 +30,7 @@
# ------------------------
# Enable extensions on systems that normally disable them,
# typically due to standards-conformance issues.
+#
# Remember that #undef in AH_VERBATIM gets replaced with #define by
# AC_DEFINE. The goal here is to define all known feature-enabling
# macros, then, if reports of conflicts are made, disable macros that
@@ -38,8 +39,6 @@ AC_DEFUN_ONCE([AC_USE_SYSTEM_EXTENSIONS],
[AC_BEFORE([$0], [AC_COMPILE_IFELSE])dnl
AC_BEFORE([$0], [AC_RUN_IFELSE])dnl
- AC_REQUIRE([AC_CANONICAL_HOST])
-
AC_CHECK_HEADER([minix/config.h], [MINIX=yes], [MINIX=])
if test "$MINIX" = yes; then
AC_DEFINE([_POSIX_SOURCE], [1],
@@ -50,24 +49,18 @@ AC_BEFORE([$0], [AC_RUN_IFELSE])dnl
except with this defined.])
AC_DEFINE([_MINIX], [1],
[Define to 1 if on MINIX.])
+ AC_DEFINE([_NETBSD_SOURCE], [1],
+ [Define to 1 to make NetBSD features available. MINIX 3 needs this.])
fi
- dnl HP-UX 11.11 defines mbstate_t only if _XOPEN_SOURCE is defined to 500,
- dnl regardless of whether the flags -Ae or _D_HPUX_SOURCE=1 are already
- dnl provided.
- case "$host_os" in
- hpux*)
- AC_DEFINE([_XOPEN_SOURCE], [500],
- [Define to 500 only on HP-UX.])
- ;;
- esac
-
- AH_VERBATIM([__EXTENSIONS__],
+dnl Use a different key than __EXTENSIONS__, as that name broke existing
+dnl configure.ac when using autoheader 2.62.
+ AH_VERBATIM([USE_SYSTEM_EXTENSIONS],
[/* Enable extensions on AIX 3, Interix. */
#ifndef _ALL_SOURCE
# undef _ALL_SOURCE
#endif
-/* Enable general extensions on Mac OS X. */
+/* Enable general extensions on OS X. */
#ifndef _DARWIN_C_SOURCE
# undef _DARWIN_C_SOURCE
#endif
@@ -83,6 +76,12 @@ AC_BEFORE([$0], [AC_RUN_IFELSE])dnl
#ifndef _TANDEM_SOURCE
# undef _TANDEM_SOURCE
#endif
+/* Enable X/Open extensions if necessary. HP-UX 11.11 defines
+ mbstate_t only if _XOPEN_SOURCE is defined to 500, regardless of
+ whether compiling with -Ae or -D_HPUX_SOURCE=1. */
+#ifndef _XOPEN_SOURCE
+# undef _XOPEN_SOURCE
+#endif
/* Enable general extensions on Solaris. */
#ifndef __EXTENSIONS__
# undef __EXTENSIONS__
@@ -103,6 +102,22 @@ AC_BEFORE([$0], [AC_RUN_IFELSE])dnl
AC_DEFINE([_GNU_SOURCE])
AC_DEFINE([_POSIX_PTHREAD_SEMANTICS])
AC_DEFINE([_TANDEM_SOURCE])
+ AC_CACHE_CHECK([whether _XOPEN_SOURCE should be defined],
+ [ac_cv_should_define__xopen_source],
+ [ac_cv_should_define__xopen_source=no
+ AC_COMPILE_IFELSE(
+ [AC_LANG_PROGRAM([[
+ #include <wchar.h>
+ mbstate_t x;]])],
+ [],
+ [AC_COMPILE_IFELSE(
+ [AC_LANG_PROGRAM([[
+ #define _XOPEN_SOURCE 500
+ #include <wchar.h>
+ mbstate_t x;]])],
+ [ac_cv_should_define__xopen_source=yes])])])
+ test $ac_cv_should_define__xopen_source = yes &&
+ AC_DEFINE([_XOPEN_SOURCE], [500])
])# AC_USE_SYSTEM_EXTENSIONS
# gl_USE_SYSTEM_EXTENSIONS
diff --git a/src/gl/m4/extern-inline.m4 b/src/gl/m4/extern-inline.m4
new file mode 100644
index 0000000..7f1bb39
--- /dev/null
+++ b/src/gl/m4/extern-inline.m4
@@ -0,0 +1,99 @@
+dnl 'extern inline' a la ISO C99.
+
+dnl Copyright 2012-2014 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.
+
+AC_DEFUN([gl_EXTERN_INLINE],
+[
+ AH_VERBATIM([extern_inline],
+[/* Please see the Gnulib manual for how to use these macros.
+
+ Suppress extern inline with HP-UX cc, as it appears to be broken; see
+ <http://lists.gnu.org/archive/html/bug-texinfo/2013-02/msg00030.html>.
+
+ Suppress extern inline with Sun C in standards-conformance mode, as it
+ mishandles inline functions that call each other. E.g., for 'inline void f
+ (void) { } inline void g (void) { f (); }', c99 incorrectly complains
+ 'reference to static identifier "f" in extern inline function'.
+ This bug was observed with Sun C 5.12 SunOS_i386 2011/11/16.
+
+ Suppress extern inline (with or without __attribute__ ((__gnu_inline__)))
+ on configurations that mistakenly use 'static inline' to implement
+ functions or macros in standard C headers like <ctype.h>. For example,
+ if isdigit is mistakenly implemented via a static inline function,
+ a program containing an extern inline function that calls isdigit
+ may not work since the C standard prohibits extern inline functions
+ from calling static functions. This bug is known to occur on:
+
+ OS X 10.8 and earlier; see:
+ http://lists.gnu.org/archive/html/bug-gnulib/2012-12/msg00023.html
+
+ DragonFly; see
+
http://muscles.dragonflybsd.org/bulk/bleeding-edge-potential/latest-per-pkg/ah-tty-0.3.12.log
+
+ FreeBSD; see:
+ http://lists.gnu.org/archive/html/bug-gnulib/2014-07/msg00104.html
+
+ OS X 10.9 has a macro __header_inline indicating the bug is fixed for C and
+ for clang but remains for g++; see <http://trac.macports.org/ticket/41033>.
+ Assume DragonFly and FreeBSD will be similar. */
+#if (((defined __APPLE__ && defined __MACH__) \
+ || defined __DragonFly__ || defined __FreeBSD__) \
+ && (defined __header_inline \
+ ? (defined __cplusplus && defined __GNUC_STDC_INLINE__ \
+ && ! defined __clang__) \
+ : ((! defined _DONT_USE_CTYPE_INLINE_ \
+ && (defined __GNUC__ || defined __cplusplus)) \
+ || (defined _FORTIFY_SOURCE && 0 < _FORTIFY_SOURCE \
+ && defined __GNUC__ && ! defined __cplusplus))))
+# define _GL_EXTERN_INLINE_STDHEADER_BUG
+#endif
+#if ((__GNUC__ \
+ ? defined __GNUC_STDC_INLINE__ && __GNUC_STDC_INLINE__ \
+ : (199901L <= __STDC_VERSION__ \
+ && !defined __HP_cc \
+ && !(defined __SUNPRO_C && __STDC__))) \
+ && !defined _GL_EXTERN_INLINE_STDHEADER_BUG)
+# define _GL_INLINE inline
+# define _GL_EXTERN_INLINE extern inline
+# define _GL_EXTERN_INLINE_IN_USE
+#elif (2 < __GNUC__ + (7 <= __GNUC_MINOR__) && !defined __STRICT_ANSI__ \
+ && !defined _GL_EXTERN_INLINE_STDHEADER_BUG)
+# if defined __GNUC_GNU_INLINE__ && __GNUC_GNU_INLINE__
+ /* __gnu_inline__ suppresses a GCC 4.2 diagnostic. */
+# define _GL_INLINE extern inline __attribute__ ((__gnu_inline__))
+# else
+# define _GL_INLINE extern inline
+# endif
+# define _GL_EXTERN_INLINE extern
+# define _GL_EXTERN_INLINE_IN_USE
+#else
+# define _GL_INLINE static _GL_UNUSED
+# define _GL_EXTERN_INLINE static _GL_UNUSED
+#endif
+
+#if 4 < __GNUC__ + (6 <= __GNUC_MINOR__)
+# if defined __GNUC_STDC_INLINE__ && __GNUC_STDC_INLINE__
+# define _GL_INLINE_HEADER_CONST_PRAGMA
+# else
+# define _GL_INLINE_HEADER_CONST_PRAGMA \
+ _Pragma ("GCC diagnostic ignored \"-Wsuggest-attribute=const\"")
+# endif
+ /* Suppress GCC's bogus "no previous prototype for 'FOO'"
+ and "no previous declaration for 'FOO'" diagnostics,
+ when FOO is an inline function in the header; see
+ <http://gcc.gnu.org/bugzilla/show_bug.cgi?id=54113>. */
+# define _GL_INLINE_HEADER_BEGIN \
+ _Pragma ("GCC diagnostic push") \
+ _Pragma ("GCC diagnostic ignored \"-Wmissing-prototypes\"") \
+ _Pragma ("GCC diagnostic ignored \"-Wmissing-declarations\"") \
+ _GL_INLINE_HEADER_CONST_PRAGMA
+# define _GL_INLINE_HEADER_END \
+ _Pragma ("GCC diagnostic pop")
+#else
+# define _GL_INLINE_HEADER_BEGIN
+# define _GL_INLINE_HEADER_END
+#endif])
+])
diff --git a/src/gl/m4/getopt.m4 b/src/gl/m4/getopt.m4
index f6902b5..f127028 100644
--- a/src/gl/m4/getopt.m4
+++ b/src/gl/m4/getopt.m4
@@ -1,5 +1,5 @@
# getopt.m4 serial 44
-dnl Copyright (C) 2002-2006, 2008-2012 Free Software Foundation, Inc.
+dnl Copyright (C) 2002-2006, 2008-2014 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/src/gl/m4/gnulib-cache.m4 b/src/gl/m4/gnulib-cache.m4
index c88c5ab..9667c5f 100644
--- a/src/gl/m4/gnulib-cache.m4
+++ b/src/gl/m4/gnulib-cache.m4
@@ -1,4 +1,4 @@
-# Copyright (C) 2002-2012 Free Software Foundation, Inc.
+# Copyright (C) 2002-2014 Free Software Foundation, Inc.
#
# This file is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/src/gl/m4/gnulib-common.m4 b/src/gl/m4/gnulib-common.m4
index 15d2b2b..31e5f94 100644
--- a/src/gl/m4/gnulib-common.m4
+++ b/src/gl/m4/gnulib-common.m4
@@ -1,5 +1,5 @@
-# gnulib-common.m4 serial 33
-dnl Copyright (C) 2007-2012 Free Software Foundation, Inc.
+# gnulib-common.m4 serial 36
+dnl Copyright (C) 2007-2014 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.
@@ -49,6 +49,16 @@ AC_DEFUN([gl_COMMON_BODY], [
is a misnomer outside of parameter lists. */
#define _UNUSED_PARAMETER_ _GL_UNUSED
+/* gcc supports the "unused" attribute on possibly unused labels, and
+ g++ has since version 4.5. Note to support C++ as well as C,
+ _GL_UNUSED_LABEL should be used with a trailing ; */
+#if !defined __cplusplus || __GNUC__ > 4 \
+ || (__GNUC__ == 4 && __GNUC_MINOR__ >= 5)
+# define _GL_UNUSED_LABEL _GL_UNUSED
+#else
+# define _GL_UNUSED_LABEL
+#endif
+
/* The __pure__ attribute was added in gcc 2.96. */
#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 96)
# define _GL_ATTRIBUTE_PURE __attribute__ ((__pure__))
@@ -294,6 +304,8 @@ Amsterdam
# for interoperability with automake-1.9.6 from autoconf-2.62.
# Remove this macro when we can assume autoconf >= 2.62 or
# autoconf >= 2.60 && automake >= 1.10.
+# AC_AUTOCONF_VERSION was introduced in 2.62, so use that as the witness.
+m4_ifndef([AC_AUTOCONF_VERSION],[
m4_ifdef([AC_PROG_MKDIR_P], [
dnl For automake-1.9.6 && autoconf < 2.62: Ensure MKDIR_P is AC_SUBSTed.
m4_define([AC_PROG_MKDIR_P],
@@ -304,27 +316,31 @@ m4_ifdef([AC_PROG_MKDIR_P], [
[AC_REQUIRE([AM_PROG_MKDIR_P])dnl defined by automake
MKDIR_P='$(mkdir_p)'
AC_SUBST([MKDIR_P])])])
+])
# AC_C_RESTRICT
-# This definition overrides the AC_C_RESTRICT macro from autoconf 2.60..2.61,
-# so that mixed use of GNU C and GNU C++ and mixed use of Sun C and Sun C++
-# works.
-# This definition can be removed once autoconf >= 2.62 can be assumed.
-m4_if(m4_version_compare(m4_defn([m4_PACKAGE_VERSION]),[2.62]),[-1],[
+# This definition is copied from post-2.69 Autoconf and overrides the
+# AC_C_RESTRICT macro from autoconf 2.60..2.69. It can be removed
+# once autoconf >= 2.70 can be assumed. It's painful to check version
+# numbers, and in practice this macro is more up-to-date than Autoconf
+# is, so override Autoconf unconditionally.
AC_DEFUN([AC_C_RESTRICT],
[AC_CACHE_CHECK([for C/C++ restrict keyword], [ac_cv_c_restrict],
[ac_cv_c_restrict=no
# The order here caters to the fact that C++ does not require restrict.
for ac_kw in __restrict __restrict__ _Restrict restrict; do
- AC_COMPILE_IFELSE([AC_LANG_PROGRAM(
- [[typedef int * int_ptr;
- int foo (int_ptr $ac_kw ip) {
- return ip[0];
- }]],
- [[int s[1];
- int * $ac_kw t = s;
- t[0] = 0;
- return foo(t)]])],
+ AC_COMPILE_IFELSE(
+ [AC_LANG_PROGRAM(
+ [[typedef int *int_ptr;
+ int foo (int_ptr $ac_kw ip) { return ip[0]; }
+ int bar (int [$ac_kw]); /* Catch GCC bug 14050. */
+ int bar (int ip[$ac_kw]) { return ip[0]; }
+ ]],
+ [[int s[1];
+ int *$ac_kw t = s;
+ t[0] = 0;
+ return foo (t) + bar (t);
+ ]])],
[ac_cv_c_restrict=$ac_kw])
test "$ac_cv_c_restrict" != no && break
done
@@ -334,21 +350,21 @@ AC_DEFUN([AC_C_RESTRICT],
nothing if this is not supported. Do not define if restrict is
supported directly. */
#undef restrict
-/* Work around a bug in Sun C++: it does not support _Restrict, even
- though the corresponding Sun C compiler does, which causes
- "#define restrict _Restrict" in the previous line. Perhaps some future
- version of Sun C++ will work with _Restrict; if so, it'll probably
- define __RESTRICT, just as Sun C does. */
+/* Work around a bug in Sun C++: it does not support _Restrict or
+ __restrict__, even though the corresponding Sun C compiler ends up with
+ "#define restrict _Restrict" or "#define restrict __restrict__" in the
+ previous line. Perhaps some future version of Sun C++ will work with
+ restrict; if so, hopefully it defines __RESTRICT like Sun C does. */
#if defined __SUNPRO_CC && !defined __RESTRICT
# define _Restrict
+# define __restrict__
#endif])
case $ac_cv_c_restrict in
restrict) ;;
no) AC_DEFINE([restrict], []) ;;
*) AC_DEFINE_UNQUOTED([restrict], [$ac_cv_c_restrict]) ;;
esac
-])
-])
+])# AC_C_RESTRICT
# gl_BIGENDIAN
# is like AC_C_BIGENDIAN, except that it can be AC_REQUIREd.
@@ -371,3 +387,63 @@ AC_DEFUN([gl_CACHE_VAL_SILENT],
AC_CACHE_VAL([$1], [$2])
as_echo_n="$saved_as_echo_n"
])
+
+# AS_VAR_COPY was added in autoconf 2.63b
+m4_define_default([AS_VAR_COPY],
+[AS_LITERAL_IF([$1[]$2], [$1=$$2], [eval $1=\$$2])])
+
+# AC_PROG_SED was added in autoconf 2.59b
+m4_ifndef([AC_PROG_SED],
+[AC_DEFUN([AC_PROG_SED],
+[AC_CACHE_CHECK([for a sed that does not truncate output], ac_cv_path_SED,
+ [dnl ac_script should not contain more than 99 commands (for HP-UX sed),
+ dnl but more than about 7000 bytes, to catch a limit in Solaris 8
/usr/ucb/sed.
+
ac_script=s/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa/bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb/
+ for ac_i in 1 2 3 4 5 6 7; do
+ ac_script="$ac_script$as_nl$ac_script"
+ done
+ echo "$ac_script" 2>/dev/null | sed 99q >conftest.sed
+ AS_UNSET([ac_script])
+ if test -z "$SED"; then
+ ac_path_SED_found=false
+ _AS_PATH_WALK([], [
+ for ac_prog in sed gsed; do
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ ac_path_SED="$as_dir/$ac_prog$ac_exec_ext"
+ AS_EXECUTABLE_P(["$ac_path_SED"]) || continue
+ case `"$ac_path_SED" --version 2>&1` in
+ *GNU*) ac_cv_path_SED=$ac_path_SED ac_path_SED_found=:;;
+ *)
+ ac_count=0
+ _AS_ECHO_N([0123456789]) >conftest.in
+ while :
+ do
+ cat conftest.in conftest.in >conftest.tmp
+ mv conftest.tmp conftest.in
+ cp conftest.in conftest.nl
+ echo >> conftest.nl
+ "$ac_path_SED" -f conftest.sed <conftest.nl >conftest.out
2>/dev/null || break
+ diff conftest.out conftest.nl >/dev/null 2>&1 || break
+ ac_count=`expr $ac_count + 1`
+ if test $ac_count -gt ${ac_path_SED_max-0}; then
+ # Best so far, but keep looking for better
+ ac_cv_path_SED=$ac_path_SED
+ ac_path_SED_max=$ac_count
+ fi
+ test $ac_count -gt 10 && break
+ done
+ rm -f conftest.in conftest.tmp conftest.nl conftest.out;;
+ esac
+ $ac_path_SED_found && break 3
+ done
+ done])
+ if test -z "$ac_cv_path_SED"; then
+ AC_ERROR([no acceptable sed could be found in \$PATH])
+ fi
+ else
+ ac_cv_path_SED=$SED
+ fi
+ SED="$ac_cv_path_SED"
+ AC_SUBST([SED])dnl
+ rm -f conftest.sed
+])])])
diff --git a/src/gl/m4/gnulib-comp.m4 b/src/gl/m4/gnulib-comp.m4
index 35bcd51..fcadc01 100644
--- a/src/gl/m4/gnulib-comp.m4
+++ b/src/gl/m4/gnulib-comp.m4
@@ -1,5 +1,5 @@
# DO NOT EDIT! GENERATED AUTOMATICALLY!
-# Copyright (C) 2002-2012 Free Software Foundation, Inc.
+# Copyright (C) 2002-2014 Free Software Foundation, Inc.
#
# This file is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
@@ -38,11 +38,13 @@ AC_DEFUN([srcgl_EARLY],
m4_pattern_allow([^gl_LIBOBJS$])dnl a variable
m4_pattern_allow([^gl_LTLIBOBJS$])dnl a variable
AC_REQUIRE([gl_PROG_AR_RANLIB])
+ # Code from module absolute-header:
# Code from module base64:
# Code from module errno:
# Code from module error:
# Code from module extensions:
AC_REQUIRE([gl_USE_SYSTEM_EXTENSIONS])
+ # Code from module extern-inline:
# Code from module getopt-gnu:
# Code from module getopt-posix:
# Code from module gettext-h:
@@ -65,6 +67,7 @@ AC_DEFUN([srcgl_EARLY],
gl_PROG_CC_C99
# Code from module stdbool:
# Code from module stddef:
+ # Code from module stdio:
# Code from module strerror:
# Code from module strerror-override:
# Code from module string:
@@ -88,74 +91,76 @@ AC_DEFUN([srcgl_INIT],
m4_pushdef([srcgl_LIBSOURCES_DIR], [])
gl_COMMON
gl_source_base='src/gl'
-gl_FUNC_BASE64
-gl_HEADER_ERRNO_H
-gl_ERROR
-if test $ac_cv_lib_error_at_line = no; then
- AC_LIBOBJ([error])
- gl_PREREQ_ERROR
-fi
-m4_ifdef([AM_XGETTEXT_OPTION],
- [AM_][XGETTEXT_OPTION([--flag=error:3:c-format])
- AM_][XGETTEXT_OPTION([--flag=error_at_line:5:c-format])])
-gl_FUNC_GETOPT_GNU
-if test $REPLACE_GETOPT = 1; then
- AC_LIBOBJ([getopt])
- AC_LIBOBJ([getopt1])
- gl_PREREQ_GETOPT
- dnl Arrange for unistd.h to include getopt.h.
- GNULIB_GL_SRCGL_UNISTD_H_GETOPT=1
-fi
-AC_SUBST([GNULIB_GL_SRCGL_UNISTD_H_GETOPT])
-gl_MODULE_INDICATOR_FOR_TESTS([getopt-gnu])
-gl_FUNC_GETOPT_POSIX
-if test $REPLACE_GETOPT = 1; then
- AC_LIBOBJ([getopt])
- AC_LIBOBJ([getopt1])
- gl_PREREQ_GETOPT
- dnl Arrange for unistd.h to include getopt.h.
- GNULIB_GL_SRCGL_UNISTD_H_GETOPT=1
-fi
-AC_SUBST([GNULIB_GL_SRCGL_UNISTD_H_GETOPT])
-AC_SUBST([LIBINTL])
-AC_SUBST([LTLIBINTL])
-gl_FUNC_MEMCHR
-if test $HAVE_MEMCHR = 0 || test $REPLACE_MEMCHR = 1; then
- AC_LIBOBJ([memchr])
- gl_PREREQ_MEMCHR
-fi
-gl_STRING_MODULE_INDICATOR([memchr])
-gl_MSVC_INVAL
-if test $HAVE_MSVC_INVALID_PARAMETER_HANDLER = 1; then
- AC_LIBOBJ([msvc-inval])
-fi
-gl_MSVC_NOTHROW
-if test $HAVE_MSVC_INVALID_PARAMETER_HANDLER = 1; then
- AC_LIBOBJ([msvc-nothrow])
-fi
-AC_CHECK_DECLS([program_invocation_name], [], [], [#include <errno.h>])
-AC_CHECK_DECLS([program_invocation_short_name], [], [], [#include <errno.h>])
-gt_TYPE_SSIZE_T
-gl_STDARG_H
-AM_STDBOOL_H
-gl_STDDEF_H
-gl_FUNC_STRERROR
-if test $REPLACE_STRERROR = 1; then
- AC_LIBOBJ([strerror])
-fi
-gl_MODULE_INDICATOR([strerror])
-gl_STRING_MODULE_INDICATOR([strerror])
-AC_REQUIRE([gl_HEADER_ERRNO_H])
-AC_REQUIRE([gl_FUNC_STRERROR_0])
-if test -n "$ERRNO_H" || test $REPLACE_STRERROR_0 = 1; then
- AC_LIBOBJ([strerror-override])
- gl_PREREQ_SYS_H_WINSOCK2
-fi
-gl_HEADER_STRING_H
-gl_SYS_TYPES_H
-AC_PROG_MKDIR_P
-gl_UNISTD_H
-gl_VERSION_ETC
+ gl_FUNC_BASE64
+ gl_HEADER_ERRNO_H
+ gl_ERROR
+ if test $ac_cv_lib_error_at_line = no; then
+ AC_LIBOBJ([error])
+ gl_PREREQ_ERROR
+ fi
+ m4_ifdef([AM_XGETTEXT_OPTION],
+ [AM_][XGETTEXT_OPTION([--flag=error:3:c-format])
+ AM_][XGETTEXT_OPTION([--flag=error_at_line:5:c-format])])
+ AC_REQUIRE([gl_EXTERN_INLINE])
+ gl_FUNC_GETOPT_GNU
+ if test $REPLACE_GETOPT = 1; then
+ AC_LIBOBJ([getopt])
+ AC_LIBOBJ([getopt1])
+ gl_PREREQ_GETOPT
+ dnl Arrange for unistd.h to include getopt.h.
+ GNULIB_GL_SRCGL_UNISTD_H_GETOPT=1
+ fi
+ AC_SUBST([GNULIB_GL_SRCGL_UNISTD_H_GETOPT])
+ gl_MODULE_INDICATOR_FOR_TESTS([getopt-gnu])
+ gl_FUNC_GETOPT_POSIX
+ if test $REPLACE_GETOPT = 1; then
+ AC_LIBOBJ([getopt])
+ AC_LIBOBJ([getopt1])
+ gl_PREREQ_GETOPT
+ dnl Arrange for unistd.h to include getopt.h.
+ GNULIB_GL_SRCGL_UNISTD_H_GETOPT=1
+ fi
+ AC_SUBST([GNULIB_GL_SRCGL_UNISTD_H_GETOPT])
+ AC_SUBST([LIBINTL])
+ AC_SUBST([LTLIBINTL])
+ gl_FUNC_MEMCHR
+ if test $HAVE_MEMCHR = 0 || test $REPLACE_MEMCHR = 1; then
+ AC_LIBOBJ([memchr])
+ gl_PREREQ_MEMCHR
+ fi
+ gl_STRING_MODULE_INDICATOR([memchr])
+ gl_MSVC_INVAL
+ if test $HAVE_MSVC_INVALID_PARAMETER_HANDLER = 1; then
+ AC_LIBOBJ([msvc-inval])
+ fi
+ gl_MSVC_NOTHROW
+ if test $HAVE_MSVC_INVALID_PARAMETER_HANDLER = 1; then
+ AC_LIBOBJ([msvc-nothrow])
+ fi
+ AC_CHECK_DECLS([program_invocation_name], [], [], [#include <errno.h>])
+ AC_CHECK_DECLS([program_invocation_short_name], [], [], [#include <errno.h>])
+ gt_TYPE_SSIZE_T
+ gl_STDARG_H
+ AM_STDBOOL_H
+ gl_STDDEF_H
+ gl_STDIO_H
+ gl_FUNC_STRERROR
+ if test $REPLACE_STRERROR = 1; then
+ AC_LIBOBJ([strerror])
+ fi
+ gl_MODULE_INDICATOR([strerror])
+ gl_STRING_MODULE_INDICATOR([strerror])
+ AC_REQUIRE([gl_HEADER_ERRNO_H])
+ AC_REQUIRE([gl_FUNC_STRERROR_0])
+ if test -n "$ERRNO_H" || test $REPLACE_STRERROR_0 = 1; then
+ AC_LIBOBJ([strerror-override])
+ gl_PREREQ_SYS_H_WINSOCK2
+ fi
+ gl_HEADER_STRING_H
+ gl_SYS_TYPES_H
+ AC_PROG_MKDIR_P
+ gl_UNISTD_H
+ gl_VERSION_ETC
# End of code from modules
m4_ifval(srcgl_LIBSOURCES_LIST, [
m4_syscmd([test ! -d ]m4_defn([srcgl_LIBSOURCES_DIR])[ ||
@@ -317,20 +322,24 @@ AC_DEFUN([srcgl_FILE_LIST], [
lib/stdarg.in.h
lib/stdbool.in.h
lib/stddef.in.h
+ lib/stdio.in.h
lib/strerror-override.c
lib/strerror-override.h
lib/strerror.c
lib/string.in.h
lib/sys_types.in.h
+ lib/unistd.c
lib/unistd.in.h
lib/verify.h
lib/version-etc.c
lib/version-etc.h
m4/00gnulib.m4
+ m4/absolute-header.m4
m4/base64.m4
m4/errno_h.m4
m4/error.m4
m4/extensions.m4
+ m4/extern-inline.m4
m4/getopt.m4
m4/gnulib-common.m4
m4/include_next.m4
@@ -344,6 +353,7 @@ AC_DEFUN([srcgl_FILE_LIST], [
m4/stdarg.m4
m4/stdbool.m4
m4/stddef_h.m4
+ m4/stdio_h.m4
m4/strerror.m4
m4/string_h.m4
m4/sys_socket_h.m4
diff --git a/src/gl/m4/gnulib-tool.m4 b/src/gl/m4/gnulib-tool.m4
index a09ffc1..a588e15 100644
--- a/src/gl/m4/gnulib-tool.m4
+++ b/src/gl/m4/gnulib-tool.m4
@@ -1,5 +1,5 @@
# gnulib-tool.m4 serial 2
-dnl Copyright (C) 2004-2005, 2009-2012 Free Software Foundation, Inc.
+dnl Copyright (C) 2004-2005, 2009-2014 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/src/gl/m4/include_next.m4 b/src/gl/m4/include_next.m4
index a60a261..69ad3db 100644
--- a/src/gl/m4/include_next.m4
+++ b/src/gl/m4/include_next.m4
@@ -1,5 +1,5 @@
# include_next.m4 serial 23
-dnl Copyright (C) 2006-2012 Free Software Foundation, Inc.
+dnl Copyright (C) 2006-2014 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.
@@ -192,56 +192,9 @@ dnl until we can assume autoconf 2.64 or newer.
if test AS_VAR_GET(gl_header_exists) = yes; then
AS_VAR_POPDEF([gl_header_exists])
])
- AC_LANG_CONFTEST(
- [AC_LANG_SOURCE(
- [[#include <]]m4_dquote(m4_defn([gl_HEADER_NAME]))[[>]]
- )])
- dnl AIX "xlc -E" and "cc -E" omit #line directives for header
- dnl files that contain only a #include of other header files and
- dnl no non-comment tokens of their own. This leads to a failure
- dnl to detect the absolute name of <dirent.h>, <signal.h>,
- dnl <poll.h> and others. The workaround is to force preservation
- dnl of comments through option -C. This ensures all necessary
- dnl #line directives are present. GCC supports option -C as
well.
- case "$host_os" in
- aix*) gl_absname_cpp="$ac_cpp -C" ;;
- *) gl_absname_cpp="$ac_cpp" ;;
- esac
-changequote(,)
- case "$host_os" in
- mingw*)
- dnl For the sake of native Windows compilers (excluding
gcc),
- dnl treat backslash as a directory separator, like /.
- dnl Actually, these compilers use a double-backslash as
- dnl directory separator, inside the
- dnl # line "filename"
- dnl directives.
- gl_dirsep_regex='[/\\]'
- ;;
- *)
- gl_dirsep_regex='\/'
- ;;
- esac
- dnl A sed expression that turns a string into a basic regular
- dnl expression, for use within "/.../".
- gl_make_literal_regex_sed='s,[]$^\\.*/[],\\&,g'
-changequote([,])
- gl_header_literal_regex=`echo ']m4_defn([gl_HEADER_NAME])[' \
- | sed -e "$gl_make_literal_regex_sed"`
-
gl_absolute_header_sed="/${gl_dirsep_regex}${gl_header_literal_regex}/"'{
-
s/.*"\(.*'"${gl_dirsep_regex}${gl_header_literal_regex}"'\)".*/\1/
-changequote(,)dnl
- s|^/[^/]|//&|
-changequote([,])dnl
- p
- q
- }'
- dnl eval is necessary to expand gl_absname_cpp.
- dnl Ultrix and Pyramid sh refuse to redirect output of eval,
- dnl so use subshell.
- AS_VAR_SET(gl_next_header,
- ['"'`(eval "$gl_absname_cpp conftest.$ac_ext")
2>&AS_MESSAGE_LOG_FD |
- sed -n "$gl_absolute_header_sed"`'"'])
+ gl_ABSOLUTE_HEADER_ONE(gl_HEADER_NAME)
+ AS_VAR_COPY([gl_header], [gl_cv_absolute_]AS_TR_SH(gl_HEADER_NAME))
+ AS_VAR_SET(gl_next_header, ['"'$gl_header'"'])
m4_if([$2], [check],
[else
AS_VAR_SET(gl_next_header, ['<'gl_HEADER_NAME'>'])
diff --git a/src/gl/m4/memchr.m4 b/src/gl/m4/memchr.m4
index 0040294..b9f126c 100644
--- a/src/gl/m4/memchr.m4
+++ b/src/gl/m4/memchr.m4
@@ -1,5 +1,5 @@
# memchr.m4 serial 12
-dnl Copyright (C) 2002-2004, 2009-2012 Free Software Foundation, Inc.
+dnl Copyright (C) 2002-2004, 2009-2014 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/src/gl/m4/mmap-anon.m4 b/src/gl/m4/mmap-anon.m4
index 748b17d..94ae2e2 100644
--- a/src/gl/m4/mmap-anon.m4
+++ b/src/gl/m4/mmap-anon.m4
@@ -1,5 +1,5 @@
# mmap-anon.m4 serial 10
-dnl Copyright (C) 2005, 2007, 2009-2012 Free Software Foundation, Inc.
+dnl Copyright (C) 2005, 2007, 2009-2014 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/src/gl/m4/msvc-inval.m4 b/src/gl/m4/msvc-inval.m4
index 8db4617..7f26087 100644
--- a/src/gl/m4/msvc-inval.m4
+++ b/src/gl/m4/msvc-inval.m4
@@ -1,5 +1,5 @@
# msvc-inval.m4 serial 1
-dnl Copyright (C) 2011-2012 Free Software Foundation, Inc.
+dnl Copyright (C) 2011-2014 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/src/gl/m4/msvc-nothrow.m4 b/src/gl/m4/msvc-nothrow.m4
index 0125050..9e32c17 100644
--- a/src/gl/m4/msvc-nothrow.m4
+++ b/src/gl/m4/msvc-nothrow.m4
@@ -1,5 +1,5 @@
# msvc-nothrow.m4 serial 1
-dnl Copyright (C) 2011-2012 Free Software Foundation, Inc.
+dnl Copyright (C) 2011-2014 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/src/gl/m4/nocrash.m4 b/src/gl/m4/nocrash.m4
index c2638df..5a5d77d 100644
--- a/src/gl/m4/nocrash.m4
+++ b/src/gl/m4/nocrash.m4
@@ -1,5 +1,5 @@
# nocrash.m4 serial 4
-dnl Copyright (C) 2005, 2009-2012 Free Software Foundation, Inc.
+dnl Copyright (C) 2005, 2009-2014 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/src/gl/m4/off_t.m4 b/src/gl/m4/off_t.m4
index dfca2df..f5885b3 100644
--- a/src/gl/m4/off_t.m4
+++ b/src/gl/m4/off_t.m4
@@ -1,5 +1,5 @@
# off_t.m4 serial 1
-dnl Copyright (C) 2012 Free Software Foundation, Inc.
+dnl Copyright (C) 2012-2014 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/src/gl/m4/ssize_t.m4 b/src/gl/m4/ssize_t.m4
index 209d64c..fbe1d06 100644
--- a/src/gl/m4/ssize_t.m4
+++ b/src/gl/m4/ssize_t.m4
@@ -1,5 +1,5 @@
# ssize_t.m4 serial 5 (gettext-0.18.2)
-dnl Copyright (C) 2001-2003, 2006, 2010-2012 Free Software Foundation, Inc.
+dnl Copyright (C) 2001-2003, 2006, 2010-2014 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/src/gl/m4/stdarg.m4 b/src/gl/m4/stdarg.m4
index 5c313cb..732aa31 100644
--- a/src/gl/m4/stdarg.m4
+++ b/src/gl/m4/stdarg.m4
@@ -1,5 +1,5 @@
# stdarg.m4 serial 6
-dnl Copyright (C) 2006, 2008-2012 Free Software Foundation, Inc.
+dnl Copyright (C) 2006, 2008-2014 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/src/gl/m4/stdbool.m4 b/src/gl/m4/stdbool.m4
index eabfa64..006ed52 100644
--- a/src/gl/m4/stdbool.m4
+++ b/src/gl/m4/stdbool.m4
@@ -1,6 +1,6 @@
# Check for stdbool.h that conforms to C99.
-dnl Copyright (C) 2002-2006, 2009-2012 Free Software Foundation, Inc.
+dnl Copyright (C) 2002-2006, 2009-2014 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/src/gl/m4/stddef_h.m4 b/src/gl/m4/stddef_h.m4
index cc11609..c555e29 100644
--- a/src/gl/m4/stddef_h.m4
+++ b/src/gl/m4/stddef_h.m4
@@ -1,6 +1,6 @@
dnl A placeholder for POSIX 2008 <stddef.h>, for platforms that have issues.
# stddef_h.m4 serial 4
-dnl Copyright (C) 2009-2012 Free Software Foundation, Inc.
+dnl Copyright (C) 2009-2014 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/src/gl/m4/stdio_h.m4 b/src/gl/m4/stdio_h.m4
new file mode 100644
index 0000000..d15913a
--- /dev/null
+++ b/src/gl/m4/stdio_h.m4
@@ -0,0 +1,194 @@
+# stdio_h.m4 serial 43
+dnl Copyright (C) 2007-2014 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.
+
+AC_DEFUN([gl_STDIO_H],
+[
+ AC_REQUIRE([gl_STDIO_H_DEFAULTS])
+ gl_NEXT_HEADERS([stdio.h])
+
+ dnl No need to create extra modules for these functions. Everyone who uses
+ dnl <stdio.h> likely needs them.
+ GNULIB_FSCANF=1
+ gl_MODULE_INDICATOR([fscanf])
+ GNULIB_SCANF=1
+ gl_MODULE_INDICATOR([scanf])
+ GNULIB_FGETC=1
+ GNULIB_GETC=1
+ GNULIB_GETCHAR=1
+ GNULIB_FGETS=1
+ GNULIB_FREAD=1
+ dnl This ifdef is necessary to avoid an error "missing file lib/stdio-read.c"
+ dnl "expected source file, required through AC_LIBSOURCES, not found". It is
+ dnl also an optimization, to avoid performing a configure check whose result
+ dnl is not used. But it does not make the test of GNULIB_STDIO_H_NONBLOCKING
+ dnl or GNULIB_NONBLOCKING redundant.
+ m4_ifdef([gl_NONBLOCKING_IO], [
+ gl_NONBLOCKING_IO
+ if test $gl_cv_have_nonblocking != yes; then
+ REPLACE_STDIO_READ_FUNCS=1
+ AC_LIBOBJ([stdio-read])
+ fi
+ ])
+
+ dnl No need to create extra modules for these functions. Everyone who uses
+ dnl <stdio.h> likely needs them.
+ GNULIB_FPRINTF=1
+ GNULIB_PRINTF=1
+ GNULIB_VFPRINTF=1
+ GNULIB_VPRINTF=1
+ GNULIB_FPUTC=1
+ GNULIB_PUTC=1
+ GNULIB_PUTCHAR=1
+ GNULIB_FPUTS=1
+ GNULIB_PUTS=1
+ GNULIB_FWRITE=1
+ dnl This ifdef is necessary to avoid an error "missing file
lib/stdio-write.c"
+ dnl "expected source file, required through AC_LIBSOURCES, not found". It is
+ dnl also an optimization, to avoid performing a configure check whose result
+ dnl is not used. But it does not make the test of GNULIB_STDIO_H_SIGPIPE or
+ dnl GNULIB_SIGPIPE redundant.
+ m4_ifdef([gl_SIGNAL_SIGPIPE], [
+ gl_SIGNAL_SIGPIPE
+ if test $gl_cv_header_signal_h_SIGPIPE != yes; then
+ REPLACE_STDIO_WRITE_FUNCS=1
+ AC_LIBOBJ([stdio-write])
+ fi
+ ])
+ dnl This ifdef is necessary to avoid an error "missing file
lib/stdio-write.c"
+ dnl "expected source file, required through AC_LIBSOURCES, not found". It is
+ dnl also an optimization, to avoid performing a configure check whose result
+ dnl is not used. But it does not make the test of GNULIB_STDIO_H_NONBLOCKING
+ dnl or GNULIB_NONBLOCKING redundant.
+ m4_ifdef([gl_NONBLOCKING_IO], [
+ gl_NONBLOCKING_IO
+ if test $gl_cv_have_nonblocking != yes; then
+ REPLACE_STDIO_WRITE_FUNCS=1
+ AC_LIBOBJ([stdio-write])
+ fi
+ ])
+
+ dnl Check for declarations of anything we want to poison if the
+ dnl corresponding gnulib module is not in use, and which is not
+ dnl guaranteed by both C89 and C11.
+ gl_WARN_ON_USE_PREPARE([[#include <stdio.h>
+ ]], [dprintf fpurge fseeko ftello getdelim getline gets pclose popen
+ renameat snprintf tmpfile vdprintf vsnprintf])
+])
+
+AC_DEFUN([gl_STDIO_MODULE_INDICATOR],
+[
+ dnl Use AC_REQUIRE here, so that the default settings are expanded once only.
+ AC_REQUIRE([gl_STDIO_H_DEFAULTS])
+ gl_MODULE_INDICATOR_SET_VARIABLE([$1])
+ dnl Define it also as a C macro, for the benefit of the unit tests.
+ gl_MODULE_INDICATOR_FOR_TESTS([$1])
+])
+
+AC_DEFUN([gl_STDIO_H_DEFAULTS],
+[
+ GNULIB_DPRINTF=0; AC_SUBST([GNULIB_DPRINTF])
+ GNULIB_FCLOSE=0; AC_SUBST([GNULIB_FCLOSE])
+ GNULIB_FDOPEN=0; AC_SUBST([GNULIB_FDOPEN])
+ GNULIB_FFLUSH=0; AC_SUBST([GNULIB_FFLUSH])
+ GNULIB_FGETC=0; AC_SUBST([GNULIB_FGETC])
+ GNULIB_FGETS=0; AC_SUBST([GNULIB_FGETS])
+ GNULIB_FOPEN=0; AC_SUBST([GNULIB_FOPEN])
+ GNULIB_FPRINTF=0; AC_SUBST([GNULIB_FPRINTF])
+ GNULIB_FPRINTF_POSIX=0; AC_SUBST([GNULIB_FPRINTF_POSIX])
+ GNULIB_FPURGE=0; AC_SUBST([GNULIB_FPURGE])
+ GNULIB_FPUTC=0; AC_SUBST([GNULIB_FPUTC])
+ GNULIB_FPUTS=0; AC_SUBST([GNULIB_FPUTS])
+ GNULIB_FREAD=0; AC_SUBST([GNULIB_FREAD])
+ GNULIB_FREOPEN=0; AC_SUBST([GNULIB_FREOPEN])
+ GNULIB_FSCANF=0; AC_SUBST([GNULIB_FSCANF])
+ GNULIB_FSEEK=0; AC_SUBST([GNULIB_FSEEK])
+ GNULIB_FSEEKO=0; AC_SUBST([GNULIB_FSEEKO])
+ GNULIB_FTELL=0; AC_SUBST([GNULIB_FTELL])
+ GNULIB_FTELLO=0; AC_SUBST([GNULIB_FTELLO])
+ GNULIB_FWRITE=0; AC_SUBST([GNULIB_FWRITE])
+ GNULIB_GETC=0; AC_SUBST([GNULIB_GETC])
+ GNULIB_GETCHAR=0; AC_SUBST([GNULIB_GETCHAR])
+ GNULIB_GETDELIM=0; AC_SUBST([GNULIB_GETDELIM])
+ GNULIB_GETLINE=0; AC_SUBST([GNULIB_GETLINE])
+ GNULIB_OBSTACK_PRINTF=0; AC_SUBST([GNULIB_OBSTACK_PRINTF])
+ GNULIB_OBSTACK_PRINTF_POSIX=0; AC_SUBST([GNULIB_OBSTACK_PRINTF_POSIX])
+ GNULIB_PCLOSE=0; AC_SUBST([GNULIB_PCLOSE])
+ GNULIB_PERROR=0; AC_SUBST([GNULIB_PERROR])
+ GNULIB_POPEN=0; AC_SUBST([GNULIB_POPEN])
+ GNULIB_PRINTF=0; AC_SUBST([GNULIB_PRINTF])
+ GNULIB_PRINTF_POSIX=0; AC_SUBST([GNULIB_PRINTF_POSIX])
+ GNULIB_PUTC=0; AC_SUBST([GNULIB_PUTC])
+ GNULIB_PUTCHAR=0; AC_SUBST([GNULIB_PUTCHAR])
+ GNULIB_PUTS=0; AC_SUBST([GNULIB_PUTS])
+ GNULIB_REMOVE=0; AC_SUBST([GNULIB_REMOVE])
+ GNULIB_RENAME=0; AC_SUBST([GNULIB_RENAME])
+ GNULIB_RENAMEAT=0; AC_SUBST([GNULIB_RENAMEAT])
+ GNULIB_SCANF=0; AC_SUBST([GNULIB_SCANF])
+ GNULIB_SNPRINTF=0; AC_SUBST([GNULIB_SNPRINTF])
+ GNULIB_SPRINTF_POSIX=0; AC_SUBST([GNULIB_SPRINTF_POSIX])
+ GNULIB_STDIO_H_NONBLOCKING=0; AC_SUBST([GNULIB_STDIO_H_NONBLOCKING])
+ GNULIB_STDIO_H_SIGPIPE=0; AC_SUBST([GNULIB_STDIO_H_SIGPIPE])
+ GNULIB_TMPFILE=0; AC_SUBST([GNULIB_TMPFILE])
+ GNULIB_VASPRINTF=0; AC_SUBST([GNULIB_VASPRINTF])
+ GNULIB_VFSCANF=0; AC_SUBST([GNULIB_VFSCANF])
+ GNULIB_VSCANF=0; AC_SUBST([GNULIB_VSCANF])
+ GNULIB_VDPRINTF=0; AC_SUBST([GNULIB_VDPRINTF])
+ GNULIB_VFPRINTF=0; AC_SUBST([GNULIB_VFPRINTF])
+ GNULIB_VFPRINTF_POSIX=0; AC_SUBST([GNULIB_VFPRINTF_POSIX])
+ GNULIB_VPRINTF=0; AC_SUBST([GNULIB_VPRINTF])
+ GNULIB_VPRINTF_POSIX=0; AC_SUBST([GNULIB_VPRINTF_POSIX])
+ GNULIB_VSNPRINTF=0; AC_SUBST([GNULIB_VSNPRINTF])
+ GNULIB_VSPRINTF_POSIX=0; AC_SUBST([GNULIB_VSPRINTF_POSIX])
+ dnl Assume proper GNU behavior unless another module says otherwise.
+ HAVE_DECL_FPURGE=1; AC_SUBST([HAVE_DECL_FPURGE])
+ HAVE_DECL_FSEEKO=1; AC_SUBST([HAVE_DECL_FSEEKO])
+ HAVE_DECL_FTELLO=1; AC_SUBST([HAVE_DECL_FTELLO])
+ HAVE_DECL_GETDELIM=1; AC_SUBST([HAVE_DECL_GETDELIM])
+ HAVE_DECL_GETLINE=1; AC_SUBST([HAVE_DECL_GETLINE])
+ HAVE_DECL_OBSTACK_PRINTF=1; AC_SUBST([HAVE_DECL_OBSTACK_PRINTF])
+ HAVE_DECL_SNPRINTF=1; AC_SUBST([HAVE_DECL_SNPRINTF])
+ HAVE_DECL_VSNPRINTF=1; AC_SUBST([HAVE_DECL_VSNPRINTF])
+ HAVE_DPRINTF=1; AC_SUBST([HAVE_DPRINTF])
+ HAVE_FSEEKO=1; AC_SUBST([HAVE_FSEEKO])
+ HAVE_FTELLO=1; AC_SUBST([HAVE_FTELLO])
+ HAVE_PCLOSE=1; AC_SUBST([HAVE_PCLOSE])
+ HAVE_POPEN=1; AC_SUBST([HAVE_POPEN])
+ HAVE_RENAMEAT=1; AC_SUBST([HAVE_RENAMEAT])
+ HAVE_VASPRINTF=1; AC_SUBST([HAVE_VASPRINTF])
+ HAVE_VDPRINTF=1; AC_SUBST([HAVE_VDPRINTF])
+ REPLACE_DPRINTF=0; AC_SUBST([REPLACE_DPRINTF])
+ REPLACE_FCLOSE=0; AC_SUBST([REPLACE_FCLOSE])
+ REPLACE_FDOPEN=0; AC_SUBST([REPLACE_FDOPEN])
+ REPLACE_FFLUSH=0; AC_SUBST([REPLACE_FFLUSH])
+ REPLACE_FOPEN=0; AC_SUBST([REPLACE_FOPEN])
+ REPLACE_FPRINTF=0; AC_SUBST([REPLACE_FPRINTF])
+ REPLACE_FPURGE=0; AC_SUBST([REPLACE_FPURGE])
+ REPLACE_FREOPEN=0; AC_SUBST([REPLACE_FREOPEN])
+ REPLACE_FSEEK=0; AC_SUBST([REPLACE_FSEEK])
+ REPLACE_FSEEKO=0; AC_SUBST([REPLACE_FSEEKO])
+ REPLACE_FTELL=0; AC_SUBST([REPLACE_FTELL])
+ REPLACE_FTELLO=0; AC_SUBST([REPLACE_FTELLO])
+ REPLACE_GETDELIM=0; AC_SUBST([REPLACE_GETDELIM])
+ REPLACE_GETLINE=0; AC_SUBST([REPLACE_GETLINE])
+ REPLACE_OBSTACK_PRINTF=0; AC_SUBST([REPLACE_OBSTACK_PRINTF])
+ REPLACE_PERROR=0; AC_SUBST([REPLACE_PERROR])
+ REPLACE_POPEN=0; AC_SUBST([REPLACE_POPEN])
+ REPLACE_PRINTF=0; AC_SUBST([REPLACE_PRINTF])
+ REPLACE_REMOVE=0; AC_SUBST([REPLACE_REMOVE])
+ REPLACE_RENAME=0; AC_SUBST([REPLACE_RENAME])
+ REPLACE_RENAMEAT=0; AC_SUBST([REPLACE_RENAMEAT])
+ REPLACE_SNPRINTF=0; AC_SUBST([REPLACE_SNPRINTF])
+ REPLACE_SPRINTF=0; AC_SUBST([REPLACE_SPRINTF])
+ REPLACE_STDIO_READ_FUNCS=0; AC_SUBST([REPLACE_STDIO_READ_FUNCS])
+ REPLACE_STDIO_WRITE_FUNCS=0; AC_SUBST([REPLACE_STDIO_WRITE_FUNCS])
+ REPLACE_TMPFILE=0; AC_SUBST([REPLACE_TMPFILE])
+ REPLACE_VASPRINTF=0; AC_SUBST([REPLACE_VASPRINTF])
+ REPLACE_VDPRINTF=0; AC_SUBST([REPLACE_VDPRINTF])
+ REPLACE_VFPRINTF=0; AC_SUBST([REPLACE_VFPRINTF])
+ REPLACE_VPRINTF=0; AC_SUBST([REPLACE_VPRINTF])
+ REPLACE_VSNPRINTF=0; AC_SUBST([REPLACE_VSNPRINTF])
+ REPLACE_VSPRINTF=0; AC_SUBST([REPLACE_VSPRINTF])
+])
diff --git a/src/gl/m4/strerror.m4 b/src/gl/m4/strerror.m4
index 1c96e52..0763fe3 100644
--- a/src/gl/m4/strerror.m4
+++ b/src/gl/m4/strerror.m4
@@ -1,5 +1,5 @@
# strerror.m4 serial 17
-dnl Copyright (C) 2002, 2007-2012 Free Software Foundation, Inc.
+dnl Copyright (C) 2002, 2007-2014 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/src/gl/m4/string_h.m4 b/src/gl/m4/string_h.m4
index 5677e09..64e683f 100644
--- a/src/gl/m4/string_h.m4
+++ b/src/gl/m4/string_h.m4
@@ -1,6 +1,6 @@
# Configure a GNU-like replacement for <string.h>.
-# Copyright (C) 2007-2012 Free Software Foundation, Inc.
+# Copyright (C) 2007-2014 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/src/gl/m4/sys_socket_h.m4 b/src/gl/m4/sys_socket_h.m4
index 8d4e7e1..114d828 100644
--- a/src/gl/m4/sys_socket_h.m4
+++ b/src/gl/m4/sys_socket_h.m4
@@ -1,5 +1,5 @@
-# sys_socket_h.m4 serial 22
-dnl Copyright (C) 2005-2012 Free Software Foundation, Inc.
+# sys_socket_h.m4 serial 23
+dnl Copyright (C) 2005-2014 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.
@@ -10,7 +10,6 @@ AC_DEFUN([gl_HEADER_SYS_SOCKET],
[
AC_REQUIRE([gl_SYS_SOCKET_H_DEFAULTS])
AC_REQUIRE([AC_CANONICAL_HOST])
- AC_REQUIRE([AC_C_INLINE])
dnl On OSF/1, the functions recv(), send(), recvfrom(), sendto() have
dnl old-style declarations (with return type 'int' instead of 'ssize_t')
diff --git a/src/gl/m4/sys_types_h.m4 b/src/gl/m4/sys_types_h.m4
index f11eef2..9748905 100644
--- a/src/gl/m4/sys_types_h.m4
+++ b/src/gl/m4/sys_types_h.m4
@@ -1,10 +1,10 @@
-# sys_types_h.m4 serial 4
-dnl Copyright (C) 2011-2012 Free Software Foundation, Inc.
+# sys_types_h.m4 serial 5
+dnl Copyright (C) 2011-2014 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.
-AC_DEFUN([gl_SYS_TYPES_H],
+AC_DEFUN_ONCE([gl_SYS_TYPES_H],
[
AC_REQUIRE([gl_SYS_TYPES_H_DEFAULTS])
gl_NEXT_HEADERS([sys/types.h])
diff --git a/src/gl/m4/unistd_h.m4 b/src/gl/m4/unistd_h.m4
index 7e7651b..1fa197e 100644
--- a/src/gl/m4/unistd_h.m4
+++ b/src/gl/m4/unistd_h.m4
@@ -1,5 +1,5 @@
-# unistd_h.m4 serial 65
-dnl Copyright (C) 2006-2012 Free Software Foundation, Inc.
+# unistd_h.m4 serial 67
+dnl Copyright (C) 2006-2014 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.
@@ -11,7 +11,6 @@ AC_DEFUN([gl_UNISTD_H],
dnl Use AC_REQUIRE here, so that the default behavior below is expanded
dnl once only, before all statements that occur in other macros.
AC_REQUIRE([gl_UNISTD_H_DEFAULTS])
- AC_REQUIRE([AC_C_INLINE])
gl_CHECK_NEXT_HEADERS([unistd.h])
if test $ac_cv_header_unistd_h = yes; then
@@ -161,6 +160,7 @@ AC_DEFUN([gl_UNISTD_H_DEFAULTS],
REPLACE_FTRUNCATE=0; AC_SUBST([REPLACE_FTRUNCATE])
REPLACE_GETCWD=0; AC_SUBST([REPLACE_GETCWD])
REPLACE_GETDOMAINNAME=0; AC_SUBST([REPLACE_GETDOMAINNAME])
+ REPLACE_GETDTABLESIZE=0; AC_SUBST([REPLACE_GETDTABLESIZE])
REPLACE_GETLOGIN_R=0; AC_SUBST([REPLACE_GETLOGIN_R])
REPLACE_GETGROUPS=0; AC_SUBST([REPLACE_GETGROUPS])
REPLACE_GETPAGESIZE=0; AC_SUBST([REPLACE_GETPAGESIZE])
diff --git a/src/gl/m4/version-etc.m4 b/src/gl/m4/version-etc.m4
index 4c6c678..667f9f8 100644
--- a/src/gl/m4/version-etc.m4
+++ b/src/gl/m4/version-etc.m4
@@ -1,5 +1,5 @@
# version-etc.m4 serial 1
-# Copyright (C) 2009-2012 Free Software Foundation, Inc.
+# Copyright (C) 2009-2014 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/src/gl/m4/warn-on-use.m4 b/src/gl/m4/warn-on-use.m4
index a77802e..cc690f8 100644
--- a/src/gl/m4/warn-on-use.m4
+++ b/src/gl/m4/warn-on-use.m4
@@ -1,5 +1,5 @@
# warn-on-use.m4 serial 5
-dnl Copyright (C) 2010-2012 Free Software Foundation, Inc.
+dnl Copyright (C) 2010-2014 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/src/gl/m4/wchar_t.m4 b/src/gl/m4/wchar_t.m4
index 534735d..839a04c 100644
--- a/src/gl/m4/wchar_t.m4
+++ b/src/gl/m4/wchar_t.m4
@@ -1,5 +1,5 @@
# wchar_t.m4 serial 4 (gettext-0.18.2)
-dnl Copyright (C) 2002-2003, 2008-2012 Free Software Foundation, Inc.
+dnl Copyright (C) 2002-2003, 2008-2014 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/src/gl/memchr.c b/src/gl/memchr.c
index b8fb0ef..6709f6e 100644
--- a/src/gl/memchr.c
+++ b/src/gl/memchr.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1991, 1993, 1996-1997, 1999-2000, 2003-2004, 2006, 2008-2012
+/* Copyright (C) 1991, 1993, 1996-1997, 1999-2000, 2003-2004, 2006, 2008-2014
Free Software Foundation, Inc.
Based on strlen implementation by Torbjorn Granlund (address@hidden),
diff --git a/src/gl/msvc-inval.c b/src/gl/msvc-inval.c
index ba76a7e..f83827f 100644
--- a/src/gl/msvc-inval.c
+++ b/src/gl/msvc-inval.c
@@ -1,5 +1,5 @@
/* Invalid parameter handler for MSVC runtime libraries.
- Copyright (C) 2011-2012 Free Software Foundation, Inc.
+ Copyright (C) 2011-2014 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
@@ -28,7 +28,7 @@
# if MSVC_INVALID_PARAMETER_HANDLING == DEFAULT_HANDLING
-static void cdecl
+static void __cdecl
gl_msvc_invalid_parameter_handler (const wchar_t *expression,
const wchar_t *function,
const wchar_t *file,
@@ -45,7 +45,7 @@ gl_msvc_invalid_parameter_handler (const wchar_t *expression,
# if defined _MSC_VER
-static void cdecl
+static void __cdecl
gl_msvc_invalid_parameter_handler (const wchar_t *expression,
const wchar_t *function,
const wchar_t *file,
@@ -94,7 +94,7 @@ gl_msvc_inval_current (void)
}
}
-static void cdecl
+static void __cdecl
gl_msvc_invalid_parameter_handler (const wchar_t *expression,
const wchar_t *function,
const wchar_t *file,
diff --git a/src/gl/msvc-inval.h b/src/gl/msvc-inval.h
index eb6930b..a0ef540 100644
--- a/src/gl/msvc-inval.h
+++ b/src/gl/msvc-inval.h
@@ -1,5 +1,5 @@
/* Invalid parameter handler for MSVC runtime libraries.
- Copyright (C) 2011-2012 Free Software Foundation, Inc.
+ Copyright (C) 2011-2014 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
diff --git a/src/gl/msvc-nothrow.c b/src/gl/msvc-nothrow.c
index e5cf181..b1e5f0c 100644
--- a/src/gl/msvc-nothrow.c
+++ b/src/gl/msvc-nothrow.c
@@ -1,6 +1,6 @@
/* Wrappers that don't throw invalid parameter notifications
with MSVC runtime libraries.
- Copyright (C) 2011-2012 Free Software Foundation, Inc.
+ Copyright (C) 2011-2014 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
diff --git a/src/gl/msvc-nothrow.h b/src/gl/msvc-nothrow.h
index 2b71945..0d4dea5 100644
--- a/src/gl/msvc-nothrow.h
+++ b/src/gl/msvc-nothrow.h
@@ -1,6 +1,6 @@
/* Wrappers that don't throw invalid parameter notifications
with MSVC runtime libraries.
- Copyright (C) 2011-2012 Free Software Foundation, Inc.
+ Copyright (C) 2011-2014 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
diff --git a/src/gl/progname.c b/src/gl/progname.c
index bdd4dd7..2919be9 100644
--- a/src/gl/progname.c
+++ b/src/gl/progname.c
@@ -1,5 +1,5 @@
/* Program name management.
- Copyright (C) 2001-2003, 2005-2012 Free Software Foundation, Inc.
+ Copyright (C) 2001-2003, 2005-2014 Free Software Foundation, Inc.
Written by Bruno Haible <address@hidden>, 2001.
This program is free software: you can redistribute it and/or modify
diff --git a/src/gl/progname.h b/src/gl/progname.h
index bb5e989..c779214 100644
--- a/src/gl/progname.h
+++ b/src/gl/progname.h
@@ -1,5 +1,5 @@
/* Program name management.
- Copyright (C) 2001-2004, 2006, 2009-2012 Free Software Foundation, Inc.
+ Copyright (C) 2001-2004, 2006, 2009-2014 Free Software Foundation, Inc.
Written by Bruno Haible <address@hidden>, 2001.
This program is free software: you can redistribute it and/or modify
diff --git a/src/gl/stdarg.in.h b/src/gl/stdarg.in.h
index 53104a6..5b37dd3 100644
--- a/src/gl/stdarg.in.h
+++ b/src/gl/stdarg.in.h
@@ -1,5 +1,5 @@
/* Substitute for and wrapper around <stdarg.h>.
- Copyright (C) 2008-2012 Free Software Foundation, Inc.
+ Copyright (C) 2008-2014 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
diff --git a/src/gl/stdbool.in.h b/src/gl/stdbool.in.h
index ed1f9aa..651e8df 100644
--- a/src/gl/stdbool.in.h
+++ b/src/gl/stdbool.in.h
@@ -1,4 +1,4 @@
-/* Copyright (C) 2001-2003, 2006-2012 Free Software Foundation, Inc.
+/* Copyright (C) 2001-2003, 2006-2014 Free Software Foundation, Inc.
Written by Bruno Haible <address@hidden>, 2001.
This program is free software; you can redistribute it and/or modify
@@ -66,24 +66,19 @@
# undef true
#endif
-/* For the sake of symbolic names in gdb, we define true and false as
- enum constants, not only as macros.
- It is tempting to write
- typedef enum { false = 0, true = 1 } _Bool;
- so that gdb prints values of type 'bool' symbolically. But if we do
- this, values of type '_Bool' may promote to 'int' or 'unsigned int'
- (see ISO C 99 6.7.2.2.(4)); however, '_Bool' must promote to 'int'
- (see ISO C 99 6.3.1.1.(2)). So we add a negative value to the
- enum; this ensures that '_Bool' promotes to 'int'. */
-#if defined __cplusplus || (defined __BEOS__ && !defined __HAIKU__)
+#ifdef __cplusplus
+# define _Bool bool
+# define bool bool
+#else
+# if defined __BEOS__ && !defined __HAIKU__
/* A compiler known to have 'bool'. */
/* If the compiler already has both 'bool' and '_Bool', we can assume they
are the same types. */
-# if address@hidden@
+# if address@hidden@
typedef bool _Bool;
-# endif
-#else
-# if !defined __GNUC__
+# endif
+# else
+# if !defined __GNUC__
/* If @HAVE__BOOL@:
Some HP-UX cc and AIX IBM C compiler versions have compiler bugs when
the built-in _Bool type is used. See
@@ -103,19 +98,35 @@ typedef bool _Bool;
"Invalid enumerator. (badenum)" with HP-UX cc on Tru64.
The only benefit of the enum, debuggability, is not important
with these compilers. So use 'signed char' and no enum. */
-# define _Bool signed char
-# else
+# define _Bool signed char
+# else
/* With this compiler, trust the _Bool type if the compiler has it. */
-# if address@hidden@
+# if address@hidden@
+ /* For the sake of symbolic names in gdb, define true and false as
+ enum constants, not only as macros.
+ It is tempting to write
+ typedef enum { false = 0, true = 1 } _Bool;
+ so that gdb prints values of type 'bool' symbolically. But then
+ values of type '_Bool' might promote to 'int' or 'unsigned int'
+ (see ISO C 99 6.7.2.2.(4)); however, '_Bool' must promote to 'int'
+ (see ISO C 99 6.3.1.1.(2)). So add a negative value to the
+ enum; this ensures that '_Bool' promotes to 'int'. */
typedef enum { _Bool_must_promote_to_int = -1, false = 0, true = 1 } _Bool;
+# endif
# endif
# endif
+# define bool _Bool
#endif
-#define bool _Bool
/* The other macros must be usable in preprocessor directives. */
-#define false 0
-#define true 1
+#ifdef __cplusplus
+# define false false
+# define true true
+#else
+# define false 0
+# define true 1
+#endif
+
#define __bool_true_false_are_defined 1
#endif /* _GL_STDBOOL_H */
diff --git a/src/gl/stddef.in.h b/src/gl/stddef.in.h
index 17fcaea..f5c0e05 100644
--- a/src/gl/stddef.in.h
+++ b/src/gl/stddef.in.h
@@ -1,6 +1,6 @@
/* A substitute for POSIX 2008 <stddef.h>, for platforms that have issues.
- Copyright (C) 2009-2012 Free Software Foundation, Inc.
+ Copyright (C) 2009-2014 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
diff --git a/src/gl/stdio.in.h b/src/gl/stdio.in.h
new file mode 100644
index 0000000..1e1fe84
--- /dev/null
+++ b/src/gl/stdio.in.h
@@ -0,0 +1,1353 @@
+/* A GNU-like <stdio.h>.
+
+ Copyright (C) 2004, 2007-2014 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
+ the Free Software Foundation; either version 3, or (at your option)
+ any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with this program; if not, see <http://www.gnu.org/licenses/>. */
+
+#if __GNUC__ >= 3
address@hidden@
+#endif
address@hidden@
+
+#if defined __need_FILE || defined __need___FILE || defined
_GL_ALREADY_INCLUDING_STDIO_H
+/* Special invocation convention:
+ - Inside glibc header files.
+ - On OSF/1 5.1 we have a sequence of nested includes
+ <stdio.h> -> <getopt.h> -> <ctype.h> -> <sys/localedef.h> ->
+ <sys/lc_core.h> -> <nl_types.h> -> <mesg.h> -> <stdio.h>.
+ In this situation, the functions are not yet declared, therefore we cannot
+ provide the C++ aliases. */
+
address@hidden@ @NEXT_STDIO_H@
+
+#else
+/* Normal invocation convention. */
+
+#ifndef address@hidden@_STDIO_H
+
+#define _GL_ALREADY_INCLUDING_STDIO_H
+
+/* The include_next requires a split double-inclusion guard. */
address@hidden@ @NEXT_STDIO_H@
+
+#undef _GL_ALREADY_INCLUDING_STDIO_H
+
+#ifndef address@hidden@_STDIO_H
+#define address@hidden@_STDIO_H
+
+/* Get va_list. Needed on many systems, including glibc 2.8. */
+#include <stdarg.h>
+
+#include <stddef.h>
+
+/* Get off_t and ssize_t. Needed on many systems, including glibc 2.8
+ and eglibc 2.11.2.
+ May also define off_t to a 64-bit type on native Windows. */
+#include <sys/types.h>
+
+/* The __attribute__ feature is available in gcc versions 2.5 and later.
+ The __-protected variants of the attributes 'format' and 'printf' are
+ accepted by gcc versions 2.6.4 (effectively 2.7) and later.
+ We enable _GL_ATTRIBUTE_FORMAT only if these are supported too, because
+ gnulib and libintl do '#define printf __printf__' when they override
+ the 'printf' function. */
+#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 7)
+# define _GL_ATTRIBUTE_FORMAT(spec) __attribute__ ((__format__ spec))
+#else
+# define _GL_ATTRIBUTE_FORMAT(spec) /* empty */
+#endif
+
+/* _GL_ATTRIBUTE_FORMAT_PRINTF
+ indicates to GCC that the function takes a format string and arguments,
+ where the format string directives are the ones standardized by ISO C99
+ and POSIX. */
+#if __GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 4)
+# define _GL_ATTRIBUTE_FORMAT_PRINTF(formatstring_parameter, first_argument) \
+ _GL_ATTRIBUTE_FORMAT ((__gnu_printf__, formatstring_parameter,
first_argument))
+#else
+# define _GL_ATTRIBUTE_FORMAT_PRINTF(formatstring_parameter, first_argument) \
+ _GL_ATTRIBUTE_FORMAT ((__printf__, formatstring_parameter, first_argument))
+#endif
+
+/* _GL_ATTRIBUTE_FORMAT_PRINTF_SYSTEM is like _GL_ATTRIBUTE_FORMAT_PRINTF,
+ except that it indicates to GCC that the supported format string directives
+ are the ones of the system printf(), rather than the ones standardized by
+ ISO C99 and POSIX. */
+#define _GL_ATTRIBUTE_FORMAT_PRINTF_SYSTEM(formatstring_parameter,
first_argument) \
+ _GL_ATTRIBUTE_FORMAT ((__printf__, formatstring_parameter, first_argument))
+
+/* _GL_ATTRIBUTE_FORMAT_SCANF
+ indicates to GCC that the function takes a format string and arguments,
+ where the format string directives are the ones standardized by ISO C99
+ and POSIX. */
+#if __GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 4)
+# define _GL_ATTRIBUTE_FORMAT_SCANF(formatstring_parameter, first_argument) \
+ _GL_ATTRIBUTE_FORMAT ((__gnu_scanf__, formatstring_parameter,
first_argument))
+#else
+# define _GL_ATTRIBUTE_FORMAT_SCANF(formatstring_parameter, first_argument) \
+ _GL_ATTRIBUTE_FORMAT ((__scanf__, formatstring_parameter, first_argument))
+#endif
+
+/* _GL_ATTRIBUTE_FORMAT_SCANF_SYSTEM is like _GL_ATTRIBUTE_FORMAT_SCANF,
+ except that it indicates to GCC that the supported format string directives
+ are the ones of the system scanf(), rather than the ones standardized by
+ ISO C99 and POSIX. */
+#define _GL_ATTRIBUTE_FORMAT_SCANF_SYSTEM(formatstring_parameter,
first_argument) \
+ _GL_ATTRIBUTE_FORMAT ((__scanf__, formatstring_parameter, first_argument))
+
+/* Solaris 10 declares renameat in <unistd.h>, not in <stdio.h>. */
+/* But in any case avoid namespace pollution on glibc systems. */
+#if (@GNULIB_RENAMEAT@ || defined GNULIB_POSIXCHECK) && defined __sun \
+ && ! defined __GLIBC__
+# include <unistd.h>
+#endif
+
+
+/* The definitions of _GL_FUNCDECL_RPL etc. are copied here. */
+
+/* The definition of _GL_ARG_NONNULL is copied here. */
+
+/* The definition of _GL_WARN_ON_USE is copied here. */
+
+/* Macros for stringification. */
+#define _GL_STDIO_STRINGIZE(token) #token
+#define _GL_STDIO_MACROEXPAND_AND_STRINGIZE(token) _GL_STDIO_STRINGIZE(token)
+
+/* When also using extern inline, suppress the use of static inline in
+ standard headers of problematic Apple configurations, as Libc at
+ least through Libc-825.26 (2013-04-09) mishandles it; see, e.g.,
+ <http://lists.gnu.org/archive/html/bug-gnulib/2012-12/msg00023.html>.
+ Perhaps Apple will fix this some day. */
+#if (defined _GL_EXTERN_INLINE_IN_USE && defined __APPLE__ \
+ && defined __GNUC__ && defined __STDC__)
+# undef putc_unlocked
+#endif
+
+#if @GNULIB_DPRINTF@
+# if @REPLACE_DPRINTF@
+# if !(defined __cplusplus && defined GNULIB_NAMESPACE)
+# define dprintf rpl_dprintf
+# endif
+_GL_FUNCDECL_RPL (dprintf, int, (int fd, const char *format, ...)
+ _GL_ATTRIBUTE_FORMAT_PRINTF (2, 3)
+ _GL_ARG_NONNULL ((2)));
+_GL_CXXALIAS_RPL (dprintf, int, (int fd, const char *format, ...));
+# else
+# if address@hidden@
+_GL_FUNCDECL_SYS (dprintf, int, (int fd, const char *format, ...)
+ _GL_ATTRIBUTE_FORMAT_PRINTF (2, 3)
+ _GL_ARG_NONNULL ((2)));
+# endif
+_GL_CXXALIAS_SYS (dprintf, int, (int fd, const char *format, ...));
+# endif
+_GL_CXXALIASWARN (dprintf);
+#elif defined GNULIB_POSIXCHECK
+# undef dprintf
+# if HAVE_RAW_DECL_DPRINTF
+_GL_WARN_ON_USE (dprintf, "dprintf is unportable - "
+ "use gnulib module dprintf for portability");
+# endif
+#endif
+
+#if @GNULIB_FCLOSE@
+/* Close STREAM and its underlying file descriptor. */
+# if @REPLACE_FCLOSE@
+# if !(defined __cplusplus && defined GNULIB_NAMESPACE)
+# define fclose rpl_fclose
+# endif
+_GL_FUNCDECL_RPL (fclose, int, (FILE *stream) _GL_ARG_NONNULL ((1)));
+_GL_CXXALIAS_RPL (fclose, int, (FILE *stream));
+# else
+_GL_CXXALIAS_SYS (fclose, int, (FILE *stream));
+# endif
+_GL_CXXALIASWARN (fclose);
+#elif defined GNULIB_POSIXCHECK
+# undef fclose
+/* Assume fclose is always declared. */
+_GL_WARN_ON_USE (fclose, "fclose is not always POSIX compliant - "
+ "use gnulib module fclose for portable POSIX compliance");
+#endif
+
+#if @GNULIB_FDOPEN@
+# if @REPLACE_FDOPEN@
+# if !(defined __cplusplus && defined GNULIB_NAMESPACE)
+# undef fdopen
+# define fdopen rpl_fdopen
+# endif
+_GL_FUNCDECL_RPL (fdopen, FILE *, (int fd, const char *mode)
+ _GL_ARG_NONNULL ((2)));
+_GL_CXXALIAS_RPL (fdopen, FILE *, (int fd, const char *mode));
+# else
+_GL_CXXALIAS_SYS (fdopen, FILE *, (int fd, const char *mode));
+# endif
+_GL_CXXALIASWARN (fdopen);
+#elif defined GNULIB_POSIXCHECK
+# undef fdopen
+/* Assume fdopen is always declared. */
+_GL_WARN_ON_USE (fdopen, "fdopen on native Windows platforms is not POSIX
compliant - "
+ "use gnulib module fdopen for portability");
+#endif
+
+#if @GNULIB_FFLUSH@
+/* Flush all pending data on STREAM according to POSIX rules. Both
+ output and seekable input streams are supported.
+ Note! LOSS OF DATA can occur if fflush is applied on an input stream
+ that is _not_seekable_ or on an update stream that is _not_seekable_
+ and in which the most recent operation was input. Seekability can
+ be tested with lseek(fileno(fp),0,SEEK_CUR). */
+# if @REPLACE_FFLUSH@
+# if !(defined __cplusplus && defined GNULIB_NAMESPACE)
+# define fflush rpl_fflush
+# endif
+_GL_FUNCDECL_RPL (fflush, int, (FILE *gl_stream));
+_GL_CXXALIAS_RPL (fflush, int, (FILE *gl_stream));
+# else
+_GL_CXXALIAS_SYS (fflush, int, (FILE *gl_stream));
+# endif
+_GL_CXXALIASWARN (fflush);
+#elif defined GNULIB_POSIXCHECK
+# undef fflush
+/* Assume fflush is always declared. */
+_GL_WARN_ON_USE (fflush, "fflush is not always POSIX compliant - "
+ "use gnulib module fflush for portable POSIX compliance");
+#endif
+
+#if @GNULIB_FGETC@
+# if @REPLACE_STDIO_READ_FUNCS@ && @GNULIB_STDIO_H_NONBLOCKING@
+# if !(defined __cplusplus && defined GNULIB_NAMESPACE)
+# undef fgetc
+# define fgetc rpl_fgetc
+# endif
+_GL_FUNCDECL_RPL (fgetc, int, (FILE *stream) _GL_ARG_NONNULL ((1)));
+_GL_CXXALIAS_RPL (fgetc, int, (FILE *stream));
+# else
+_GL_CXXALIAS_SYS (fgetc, int, (FILE *stream));
+# endif
+_GL_CXXALIASWARN (fgetc);
+#endif
+
+#if @GNULIB_FGETS@
+# if @REPLACE_STDIO_READ_FUNCS@ && @GNULIB_STDIO_H_NONBLOCKING@
+# if !(defined __cplusplus && defined GNULIB_NAMESPACE)
+# undef fgets
+# define fgets rpl_fgets
+# endif
+_GL_FUNCDECL_RPL (fgets, char *, (char *s, int n, FILE *stream)
+ _GL_ARG_NONNULL ((1, 3)));
+_GL_CXXALIAS_RPL (fgets, char *, (char *s, int n, FILE *stream));
+# else
+_GL_CXXALIAS_SYS (fgets, char *, (char *s, int n, FILE *stream));
+# endif
+_GL_CXXALIASWARN (fgets);
+#endif
+
+#if @GNULIB_FOPEN@
+# if @REPLACE_FOPEN@
+# if !(defined __cplusplus && defined GNULIB_NAMESPACE)
+# undef fopen
+# define fopen rpl_fopen
+# endif
+_GL_FUNCDECL_RPL (fopen, FILE *, (const char *filename, const char *mode)
+ _GL_ARG_NONNULL ((1, 2)));
+_GL_CXXALIAS_RPL (fopen, FILE *, (const char *filename, const char *mode));
+# else
+_GL_CXXALIAS_SYS (fopen, FILE *, (const char *filename, const char *mode));
+# endif
+_GL_CXXALIASWARN (fopen);
+#elif defined GNULIB_POSIXCHECK
+# undef fopen
+/* Assume fopen is always declared. */
+_GL_WARN_ON_USE (fopen, "fopen on native Windows platforms is not POSIX
compliant - "
+ "use gnulib module fopen for portability");
+#endif
+
+#if @GNULIB_FPRINTF_POSIX@ || @GNULIB_FPRINTF@
+# if (@GNULIB_FPRINTF_POSIX@ && @REPLACE_FPRINTF@) \
+ || (@GNULIB_FPRINTF@ && @REPLACE_STDIO_WRITE_FUNCS@ &&
(@GNULIB_STDIO_H_NONBLOCKING@ || @GNULIB_STDIO_H_SIGPIPE@))
+# if !(defined __cplusplus && defined GNULIB_NAMESPACE)
+# define fprintf rpl_fprintf
+# endif
+# define GNULIB_overrides_fprintf 1
+# if @GNULIB_FPRINTF_POSIX@ || @GNULIB_VFPRINTF_POSIX@
+_GL_FUNCDECL_RPL (fprintf, int, (FILE *fp, const char *format, ...)
+ _GL_ATTRIBUTE_FORMAT_PRINTF (2, 3)
+ _GL_ARG_NONNULL ((1, 2)));
+# else
+_GL_FUNCDECL_RPL (fprintf, int, (FILE *fp, const char *format, ...)
+ _GL_ATTRIBUTE_FORMAT_PRINTF_SYSTEM (2, 3)
+ _GL_ARG_NONNULL ((1, 2)));
+# endif
+_GL_CXXALIAS_RPL (fprintf, int, (FILE *fp, const char *format, ...));
+# else
+_GL_CXXALIAS_SYS (fprintf, int, (FILE *fp, const char *format, ...));
+# endif
+_GL_CXXALIASWARN (fprintf);
+#endif
+#if address@hidden@ && defined GNULIB_POSIXCHECK
+# if !GNULIB_overrides_fprintf
+# undef fprintf
+# endif
+/* Assume fprintf is always declared. */
+_GL_WARN_ON_USE (fprintf, "fprintf is not always POSIX compliant - "
+ "use gnulib module fprintf-posix for portable "
+ "POSIX compliance");
+#endif
+
+#if @GNULIB_FPURGE@
+/* Discard all pending buffered I/O data on STREAM.
+ STREAM must not be wide-character oriented.
+ When discarding pending output, the file position is set back to where it
+ was before the write calls. When discarding pending input, the file
+ position is advanced to match the end of the previously read input.
+ Return 0 if successful. Upon error, return -1 and set errno. */
+# if @REPLACE_FPURGE@
+# if !(defined __cplusplus && defined GNULIB_NAMESPACE)
+# define fpurge rpl_fpurge
+# endif
+_GL_FUNCDECL_RPL (fpurge, int, (FILE *gl_stream) _GL_ARG_NONNULL ((1)));
+_GL_CXXALIAS_RPL (fpurge, int, (FILE *gl_stream));
+# else
+# if address@hidden@
+_GL_FUNCDECL_SYS (fpurge, int, (FILE *gl_stream) _GL_ARG_NONNULL ((1)));
+# endif
+_GL_CXXALIAS_SYS (fpurge, int, (FILE *gl_stream));
+# endif
+_GL_CXXALIASWARN (fpurge);
+#elif defined GNULIB_POSIXCHECK
+# undef fpurge
+# if HAVE_RAW_DECL_FPURGE
+_GL_WARN_ON_USE (fpurge, "fpurge is not always present - "
+ "use gnulib module fpurge for portability");
+# endif
+#endif
+
+#if @GNULIB_FPUTC@
+# if @REPLACE_STDIO_WRITE_FUNCS@ && (@GNULIB_STDIO_H_NONBLOCKING@ ||
@GNULIB_STDIO_H_SIGPIPE@)
+# if !(defined __cplusplus && defined GNULIB_NAMESPACE)
+# undef fputc
+# define fputc rpl_fputc
+# endif
+_GL_FUNCDECL_RPL (fputc, int, (int c, FILE *stream) _GL_ARG_NONNULL ((2)));
+_GL_CXXALIAS_RPL (fputc, int, (int c, FILE *stream));
+# else
+_GL_CXXALIAS_SYS (fputc, int, (int c, FILE *stream));
+# endif
+_GL_CXXALIASWARN (fputc);
+#endif
+
+#if @GNULIB_FPUTS@
+# if @REPLACE_STDIO_WRITE_FUNCS@ && (@GNULIB_STDIO_H_NONBLOCKING@ ||
@GNULIB_STDIO_H_SIGPIPE@)
+# if !(defined __cplusplus && defined GNULIB_NAMESPACE)
+# undef fputs
+# define fputs rpl_fputs
+# endif
+_GL_FUNCDECL_RPL (fputs, int, (const char *string, FILE *stream)
+ _GL_ARG_NONNULL ((1, 2)));
+_GL_CXXALIAS_RPL (fputs, int, (const char *string, FILE *stream));
+# else
+_GL_CXXALIAS_SYS (fputs, int, (const char *string, FILE *stream));
+# endif
+_GL_CXXALIASWARN (fputs);
+#endif
+
+#if @GNULIB_FREAD@
+# if @REPLACE_STDIO_READ_FUNCS@ && @GNULIB_STDIO_H_NONBLOCKING@
+# if !(defined __cplusplus && defined GNULIB_NAMESPACE)
+# undef fread
+# define fread rpl_fread
+# endif
+_GL_FUNCDECL_RPL (fread, size_t, (void *ptr, size_t s, size_t n, FILE *stream)
+ _GL_ARG_NONNULL ((4)));
+_GL_CXXALIAS_RPL (fread, size_t, (void *ptr, size_t s, size_t n, FILE
*stream));
+# else
+_GL_CXXALIAS_SYS (fread, size_t, (void *ptr, size_t s, size_t n, FILE
*stream));
+# endif
+_GL_CXXALIASWARN (fread);
+#endif
+
+#if @GNULIB_FREOPEN@
+# if @REPLACE_FREOPEN@
+# if !(defined __cplusplus && defined GNULIB_NAMESPACE)
+# undef freopen
+# define freopen rpl_freopen
+# endif
+_GL_FUNCDECL_RPL (freopen, FILE *,
+ (const char *filename, const char *mode, FILE *stream)
+ _GL_ARG_NONNULL ((2, 3)));
+_GL_CXXALIAS_RPL (freopen, FILE *,
+ (const char *filename, const char *mode, FILE *stream));
+# else
+_GL_CXXALIAS_SYS (freopen, FILE *,
+ (const char *filename, const char *mode, FILE *stream));
+# endif
+_GL_CXXALIASWARN (freopen);
+#elif defined GNULIB_POSIXCHECK
+# undef freopen
+/* Assume freopen is always declared. */
+_GL_WARN_ON_USE (freopen,
+ "freopen on native Windows platforms is not POSIX compliant -
"
+ "use gnulib module freopen for portability");
+#endif
+
+#if @GNULIB_FSCANF@
+# if @REPLACE_STDIO_READ_FUNCS@ && @GNULIB_STDIO_H_NONBLOCKING@
+# if !(defined __cplusplus && defined GNULIB_NAMESPACE)
+# undef fscanf
+# define fscanf rpl_fscanf
+# endif
+_GL_FUNCDECL_RPL (fscanf, int, (FILE *stream, const char *format, ...)
+ _GL_ATTRIBUTE_FORMAT_SCANF_SYSTEM (2, 3)
+ _GL_ARG_NONNULL ((1, 2)));
+_GL_CXXALIAS_RPL (fscanf, int, (FILE *stream, const char *format, ...));
+# else
+_GL_CXXALIAS_SYS (fscanf, int, (FILE *stream, const char *format, ...));
+# endif
+_GL_CXXALIASWARN (fscanf);
+#endif
+
+
+/* Set up the following warnings, based on which modules are in use.
+ GNU Coding Standards discourage the use of fseek, since it imposes
+ an arbitrary limitation on some 32-bit hosts. Remember that the
+ fseek module depends on the fseeko module, so we only have three
+ cases to consider:
+
+ 1. The developer is not using either module. Issue a warning under
+ GNULIB_POSIXCHECK for both functions, to remind them that both
+ functions have bugs on some systems. _GL_NO_LARGE_FILES has no
+ impact on this warning.
+
+ 2. The developer is using both modules. They may be unaware of the
+ arbitrary limitations of fseek, so issue a warning under
+ GNULIB_POSIXCHECK. On the other hand, they may be using both
+ modules intentionally, so the developer can define
+ _GL_NO_LARGE_FILES in the compilation units where the use of fseek
+ is safe, to silence the warning.
+
+ 3. The developer is using the fseeko module, but not fseek. Gnulib
+ guarantees that fseek will still work around platform bugs in that
+ case, but we presume that the developer is aware of the pitfalls of
+ fseek and was trying to avoid it, so issue a warning even when
+ GNULIB_POSIXCHECK is undefined. Again, _GL_NO_LARGE_FILES can be
+ defined to silence the warning in particular compilation units.
+ In C++ compilations with GNULIB_NAMESPACE, in order to avoid that
+ fseek gets defined as a macro, it is recommended that the developer
+ uses the fseek module, even if he is not calling the fseek function.
+
+ Most gnulib clients that perform stream operations should fall into
+ category 3. */
+
+#if @GNULIB_FSEEK@
+# if defined GNULIB_POSIXCHECK && !defined _GL_NO_LARGE_FILES
+# define _GL_FSEEK_WARN /* Category 2, above. */
+# undef fseek
+# endif
+# if @REPLACE_FSEEK@
+# if !(defined __cplusplus && defined GNULIB_NAMESPACE)
+# undef fseek
+# define fseek rpl_fseek
+# endif
+_GL_FUNCDECL_RPL (fseek, int, (FILE *fp, long offset, int whence)
+ _GL_ARG_NONNULL ((1)));
+_GL_CXXALIAS_RPL (fseek, int, (FILE *fp, long offset, int whence));
+# else
+_GL_CXXALIAS_SYS (fseek, int, (FILE *fp, long offset, int whence));
+# endif
+_GL_CXXALIASWARN (fseek);
+#endif
+
+#if @GNULIB_FSEEKO@
+# if address@hidden@ && !defined _GL_NO_LARGE_FILES
+# define _GL_FSEEK_WARN /* Category 3, above. */
+# undef fseek
+# endif
+# if @REPLACE_FSEEKO@
+/* Provide an fseeko function that is aware of a preceding fflush(), and which
+ detects pipes. */
+# if !(defined __cplusplus && defined GNULIB_NAMESPACE)
+# undef fseeko
+# define fseeko rpl_fseeko
+# endif
+_GL_FUNCDECL_RPL (fseeko, int, (FILE *fp, off_t offset, int whence)
+ _GL_ARG_NONNULL ((1)));
+_GL_CXXALIAS_RPL (fseeko, int, (FILE *fp, off_t offset, int whence));
+# else
+# if ! @HAVE_DECL_FSEEKO@
+_GL_FUNCDECL_SYS (fseeko, int, (FILE *fp, off_t offset, int whence)
+ _GL_ARG_NONNULL ((1)));
+# endif
+_GL_CXXALIAS_SYS (fseeko, int, (FILE *fp, off_t offset, int whence));
+# endif
+_GL_CXXALIASWARN (fseeko);
+#elif defined GNULIB_POSIXCHECK
+# define _GL_FSEEK_WARN /* Category 1, above. */
+# undef fseek
+# undef fseeko
+# if HAVE_RAW_DECL_FSEEKO
+_GL_WARN_ON_USE (fseeko, "fseeko is unportable - "
+ "use gnulib module fseeko for portability");
+# endif
+#endif
+
+#ifdef _GL_FSEEK_WARN
+# undef _GL_FSEEK_WARN
+/* Here, either fseek is undefined (but C89 guarantees that it is
+ declared), or it is defined as rpl_fseek (declared above). */
+_GL_WARN_ON_USE (fseek, "fseek cannot handle files larger than 4 GB "
+ "on 32-bit platforms - "
+ "use fseeko function for handling of large files");
+#endif
+
+
+/* ftell, ftello. See the comments on fseek/fseeko. */
+
+#if @GNULIB_FTELL@
+# if defined GNULIB_POSIXCHECK && !defined _GL_NO_LARGE_FILES
+# define _GL_FTELL_WARN /* Category 2, above. */
+# undef ftell
+# endif
+# if @REPLACE_FTELL@
+# if !(defined __cplusplus && defined GNULIB_NAMESPACE)
+# undef ftell
+# define ftell rpl_ftell
+# endif
+_GL_FUNCDECL_RPL (ftell, long, (FILE *fp) _GL_ARG_NONNULL ((1)));
+_GL_CXXALIAS_RPL (ftell, long, (FILE *fp));
+# else
+_GL_CXXALIAS_SYS (ftell, long, (FILE *fp));
+# endif
+_GL_CXXALIASWARN (ftell);
+#endif
+
+#if @GNULIB_FTELLO@
+# if address@hidden@ && !defined _GL_NO_LARGE_FILES
+# define _GL_FTELL_WARN /* Category 3, above. */
+# undef ftell
+# endif
+# if @REPLACE_FTELLO@
+# if !(defined __cplusplus && defined GNULIB_NAMESPACE)
+# undef ftello
+# define ftello rpl_ftello
+# endif
+_GL_FUNCDECL_RPL (ftello, off_t, (FILE *fp) _GL_ARG_NONNULL ((1)));
+_GL_CXXALIAS_RPL (ftello, off_t, (FILE *fp));
+# else
+# if ! @HAVE_DECL_FTELLO@
+_GL_FUNCDECL_SYS (ftello, off_t, (FILE *fp) _GL_ARG_NONNULL ((1)));
+# endif
+_GL_CXXALIAS_SYS (ftello, off_t, (FILE *fp));
+# endif
+_GL_CXXALIASWARN (ftello);
+#elif defined GNULIB_POSIXCHECK
+# define _GL_FTELL_WARN /* Category 1, above. */
+# undef ftell
+# undef ftello
+# if HAVE_RAW_DECL_FTELLO
+_GL_WARN_ON_USE (ftello, "ftello is unportable - "
+ "use gnulib module ftello for portability");
+# endif
+#endif
+
+#ifdef _GL_FTELL_WARN
+# undef _GL_FTELL_WARN
+/* Here, either ftell is undefined (but C89 guarantees that it is
+ declared), or it is defined as rpl_ftell (declared above). */
+_GL_WARN_ON_USE (ftell, "ftell cannot handle files larger than 4 GB "
+ "on 32-bit platforms - "
+ "use ftello function for handling of large files");
+#endif
+
+
+#if @GNULIB_FWRITE@
+# if @REPLACE_STDIO_WRITE_FUNCS@ && (@GNULIB_STDIO_H_NONBLOCKING@ ||
@GNULIB_STDIO_H_SIGPIPE@)
+# if !(defined __cplusplus && defined GNULIB_NAMESPACE)
+# undef fwrite
+# define fwrite rpl_fwrite
+# endif
+_GL_FUNCDECL_RPL (fwrite, size_t,
+ (const void *ptr, size_t s, size_t n, FILE *stream)
+ _GL_ARG_NONNULL ((1, 4)));
+_GL_CXXALIAS_RPL (fwrite, size_t,
+ (const void *ptr, size_t s, size_t n, FILE *stream));
+# else
+_GL_CXXALIAS_SYS (fwrite, size_t,
+ (const void *ptr, size_t s, size_t n, FILE *stream));
+
+/* Work around bug 11959 when fortifying glibc 2.4 through 2.15
+ <http://sources.redhat.com/bugzilla/show_bug.cgi?id=11959>,
+ which sometimes causes an unwanted diagnostic for fwrite calls.
+ This affects only function declaration attributes under certain
+ versions of gcc and clang, and is not needed for C++. */
+# if (0 < __USE_FORTIFY_LEVEL \
+ && __GLIBC__ == 2 && 4 <= __GLIBC_MINOR__ && __GLIBC_MINOR__ <= 15 \
+ && 3 < __GNUC__ + (4 <= __GNUC_MINOR__) \
+ && !defined __cplusplus)
+# undef fwrite
+# undef fwrite_unlocked
+extern size_t __REDIRECT (rpl_fwrite,
+ (const void *__restrict, size_t, size_t,
+ FILE *__restrict),
+ fwrite);
+extern size_t __REDIRECT (rpl_fwrite_unlocked,
+ (const void *__restrict, size_t, size_t,
+ FILE *__restrict),
+ fwrite_unlocked);
+# define fwrite rpl_fwrite
+# define fwrite_unlocked rpl_fwrite_unlocked
+# endif
+# endif
+_GL_CXXALIASWARN (fwrite);
+#endif
+
+#if @GNULIB_GETC@
+# if @REPLACE_STDIO_READ_FUNCS@ && @GNULIB_STDIO_H_NONBLOCKING@
+# if !(defined __cplusplus && defined GNULIB_NAMESPACE)
+# undef getc
+# define getc rpl_fgetc
+# endif
+_GL_FUNCDECL_RPL (fgetc, int, (FILE *stream) _GL_ARG_NONNULL ((1)));
+_GL_CXXALIAS_RPL_1 (getc, rpl_fgetc, int, (FILE *stream));
+# else
+_GL_CXXALIAS_SYS (getc, int, (FILE *stream));
+# endif
+_GL_CXXALIASWARN (getc);
+#endif
+
+#if @GNULIB_GETCHAR@
+# if @REPLACE_STDIO_READ_FUNCS@ && @GNULIB_STDIO_H_NONBLOCKING@
+# if !(defined __cplusplus && defined GNULIB_NAMESPACE)
+# undef getchar
+# define getchar rpl_getchar
+# endif
+_GL_FUNCDECL_RPL (getchar, int, (void));
+_GL_CXXALIAS_RPL (getchar, int, (void));
+# else
+_GL_CXXALIAS_SYS (getchar, int, (void));
+# endif
+_GL_CXXALIASWARN (getchar);
+#endif
+
+#if @GNULIB_GETDELIM@
+/* Read input, up to (and including) the next occurrence of DELIMITER, from
+ STREAM, store it in *LINEPTR (and NUL-terminate it).
+ *LINEPTR is a pointer returned from malloc (or NULL), pointing to *LINESIZE
+ bytes of space. It is realloc'd as necessary.
+ Return the number of bytes read and stored at *LINEPTR (not including the
+ NUL terminator), or -1 on error or EOF. */
+# if @REPLACE_GETDELIM@
+# if !(defined __cplusplus && defined GNULIB_NAMESPACE)
+# undef getdelim
+# define getdelim rpl_getdelim
+# endif
+_GL_FUNCDECL_RPL (getdelim, ssize_t,
+ (char **lineptr, size_t *linesize, int delimiter,
+ FILE *stream)
+ _GL_ARG_NONNULL ((1, 2, 4)));
+_GL_CXXALIAS_RPL (getdelim, ssize_t,
+ (char **lineptr, size_t *linesize, int delimiter,
+ FILE *stream));
+# else
+# if address@hidden@
+_GL_FUNCDECL_SYS (getdelim, ssize_t,
+ (char **lineptr, size_t *linesize, int delimiter,
+ FILE *stream)
+ _GL_ARG_NONNULL ((1, 2, 4)));
+# endif
+_GL_CXXALIAS_SYS (getdelim, ssize_t,
+ (char **lineptr, size_t *linesize, int delimiter,
+ FILE *stream));
+# endif
+_GL_CXXALIASWARN (getdelim);
+#elif defined GNULIB_POSIXCHECK
+# undef getdelim
+# if HAVE_RAW_DECL_GETDELIM
+_GL_WARN_ON_USE (getdelim, "getdelim is unportable - "
+ "use gnulib module getdelim for portability");
+# endif
+#endif
+
+#if @GNULIB_GETLINE@
+/* Read a line, up to (and including) the next newline, from STREAM, store it
+ in *LINEPTR (and NUL-terminate it).
+ *LINEPTR is a pointer returned from malloc (or NULL), pointing to *LINESIZE
+ bytes of space. It is realloc'd as necessary.
+ Return the number of bytes read and stored at *LINEPTR (not including the
+ NUL terminator), or -1 on error or EOF. */
+# if @REPLACE_GETLINE@
+# if !(defined __cplusplus && defined GNULIB_NAMESPACE)
+# undef getline
+# define getline rpl_getline
+# endif
+_GL_FUNCDECL_RPL (getline, ssize_t,
+ (char **lineptr, size_t *linesize, FILE *stream)
+ _GL_ARG_NONNULL ((1, 2, 3)));
+_GL_CXXALIAS_RPL (getline, ssize_t,
+ (char **lineptr, size_t *linesize, FILE *stream));
+# else
+# if address@hidden@
+_GL_FUNCDECL_SYS (getline, ssize_t,
+ (char **lineptr, size_t *linesize, FILE *stream)
+ _GL_ARG_NONNULL ((1, 2, 3)));
+# endif
+_GL_CXXALIAS_SYS (getline, ssize_t,
+ (char **lineptr, size_t *linesize, FILE *stream));
+# endif
+# if @HAVE_DECL_GETLINE@
+_GL_CXXALIASWARN (getline);
+# endif
+#elif defined GNULIB_POSIXCHECK
+# undef getline
+# if HAVE_RAW_DECL_GETLINE
+_GL_WARN_ON_USE (getline, "getline is unportable - "
+ "use gnulib module getline for portability");
+# endif
+#endif
+
+/* It is very rare that the developer ever has full control of stdin,
+ so any use of gets warrants an unconditional warning; besides, C11
+ removed it. */
+#undef gets
+#if HAVE_RAW_DECL_GETS
+_GL_WARN_ON_USE (gets, "gets is a security hole - use fgets instead");
+#endif
+
+
+#if @GNULIB_OBSTACK_PRINTF@ || @GNULIB_OBSTACK_PRINTF_POSIX@
+struct obstack;
+/* Grow an obstack with formatted output. Return the number of
+ bytes added to OBS. No trailing nul byte is added, and the
+ object should be closed with obstack_finish before use. Upon
+ memory allocation error, call obstack_alloc_failed_handler. Upon
+ other error, return -1. */
+# if @REPLACE_OBSTACK_PRINTF@
+# if !(defined __cplusplus && defined GNULIB_NAMESPACE)
+# define obstack_printf rpl_obstack_printf
+# endif
+_GL_FUNCDECL_RPL (obstack_printf, int,
+ (struct obstack *obs, const char *format, ...)
+ _GL_ATTRIBUTE_FORMAT_PRINTF (2, 3)
+ _GL_ARG_NONNULL ((1, 2)));
+_GL_CXXALIAS_RPL (obstack_printf, int,
+ (struct obstack *obs, const char *format, ...));
+# else
+# if address@hidden@
+_GL_FUNCDECL_SYS (obstack_printf, int,
+ (struct obstack *obs, const char *format, ...)
+ _GL_ATTRIBUTE_FORMAT_PRINTF (2, 3)
+ _GL_ARG_NONNULL ((1, 2)));
+# endif
+_GL_CXXALIAS_SYS (obstack_printf, int,
+ (struct obstack *obs, const char *format, ...));
+# endif
+_GL_CXXALIASWARN (obstack_printf);
+# if @REPLACE_OBSTACK_PRINTF@
+# if !(defined __cplusplus && defined GNULIB_NAMESPACE)
+# define obstack_vprintf rpl_obstack_vprintf
+# endif
+_GL_FUNCDECL_RPL (obstack_vprintf, int,
+ (struct obstack *obs, const char *format, va_list args)
+ _GL_ATTRIBUTE_FORMAT_PRINTF (2, 0)
+ _GL_ARG_NONNULL ((1, 2)));
+_GL_CXXALIAS_RPL (obstack_vprintf, int,
+ (struct obstack *obs, const char *format, va_list args));
+# else
+# if address@hidden@
+_GL_FUNCDECL_SYS (obstack_vprintf, int,
+ (struct obstack *obs, const char *format, va_list args)
+ _GL_ATTRIBUTE_FORMAT_PRINTF (2, 0)
+ _GL_ARG_NONNULL ((1, 2)));
+# endif
+_GL_CXXALIAS_SYS (obstack_vprintf, int,
+ (struct obstack *obs, const char *format, va_list args));
+# endif
+_GL_CXXALIASWARN (obstack_vprintf);
+#endif
+
+#if @GNULIB_PCLOSE@
+# if address@hidden@
+_GL_FUNCDECL_SYS (pclose, int, (FILE *stream) _GL_ARG_NONNULL ((1)));
+# endif
+_GL_CXXALIAS_SYS (pclose, int, (FILE *stream));
+_GL_CXXALIASWARN (pclose);
+#elif defined GNULIB_POSIXCHECK
+# undef pclose
+# if HAVE_RAW_DECL_PCLOSE
+_GL_WARN_ON_USE (pclose, "pclose is unportable - "
+ "use gnulib module pclose for more portability");
+# endif
+#endif
+
+#if @GNULIB_PERROR@
+/* Print a message to standard error, describing the value of ERRNO,
+ (if STRING is not NULL and not empty) prefixed with STRING and ": ",
+ and terminated with a newline. */
+# if @REPLACE_PERROR@
+# if !(defined __cplusplus && defined GNULIB_NAMESPACE)
+# define perror rpl_perror
+# endif
+_GL_FUNCDECL_RPL (perror, void, (const char *string));
+_GL_CXXALIAS_RPL (perror, void, (const char *string));
+# else
+_GL_CXXALIAS_SYS (perror, void, (const char *string));
+# endif
+_GL_CXXALIASWARN (perror);
+#elif defined GNULIB_POSIXCHECK
+# undef perror
+/* Assume perror is always declared. */
+_GL_WARN_ON_USE (perror, "perror is not always POSIX compliant - "
+ "use gnulib module perror for portability");
+#endif
+
+#if @GNULIB_POPEN@
+# if @REPLACE_POPEN@
+# if !(defined __cplusplus && defined GNULIB_NAMESPACE)
+# undef popen
+# define popen rpl_popen
+# endif
+_GL_FUNCDECL_RPL (popen, FILE *, (const char *cmd, const char *mode)
+ _GL_ARG_NONNULL ((1, 2)));
+_GL_CXXALIAS_RPL (popen, FILE *, (const char *cmd, const char *mode));
+# else
+# if address@hidden@
+_GL_FUNCDECL_SYS (popen, FILE *, (const char *cmd, const char *mode)
+ _GL_ARG_NONNULL ((1, 2)));
+# endif
+_GL_CXXALIAS_SYS (popen, FILE *, (const char *cmd, const char *mode));
+# endif
+_GL_CXXALIASWARN (popen);
+#elif defined GNULIB_POSIXCHECK
+# undef popen
+# if HAVE_RAW_DECL_POPEN
+_GL_WARN_ON_USE (popen, "popen is buggy on some platforms - "
+ "use gnulib module popen or pipe for more portability");
+# endif
+#endif
+
+#if @GNULIB_PRINTF_POSIX@ || @GNULIB_PRINTF@
+# if (@GNULIB_PRINTF_POSIX@ && @REPLACE_PRINTF@) \
+ || (@GNULIB_PRINTF@ && @REPLACE_STDIO_WRITE_FUNCS@ &&
(@GNULIB_STDIO_H_NONBLOCKING@ || @GNULIB_STDIO_H_SIGPIPE@))
+# if defined __GNUC__
+# if !(defined __cplusplus && defined GNULIB_NAMESPACE)
+/* Don't break __attribute__((format(printf,M,N))). */
+# define printf __printf__
+# endif
+# if @GNULIB_PRINTF_POSIX@ || @GNULIB_VFPRINTF_POSIX@
+_GL_FUNCDECL_RPL_1 (__printf__, int,
+ (const char *format, ...)
+ __asm__ (@ASM_SYMBOL_PREFIX@
+ _GL_STDIO_MACROEXPAND_AND_STRINGIZE(rpl_printf))
+ _GL_ATTRIBUTE_FORMAT_PRINTF (1, 2)
+ _GL_ARG_NONNULL ((1)));
+# else
+_GL_FUNCDECL_RPL_1 (__printf__, int,
+ (const char *format, ...)
+ __asm__ (@ASM_SYMBOL_PREFIX@
+ _GL_STDIO_MACROEXPAND_AND_STRINGIZE(rpl_printf))
+ _GL_ATTRIBUTE_FORMAT_PRINTF_SYSTEM (1, 2)
+ _GL_ARG_NONNULL ((1)));
+# endif
+_GL_CXXALIAS_RPL_1 (printf, __printf__, int, (const char *format, ...));
+# else
+# if !(defined __cplusplus && defined GNULIB_NAMESPACE)
+# define printf rpl_printf
+# endif
+_GL_FUNCDECL_RPL (printf, int,
+ (const char *format, ...)
+ _GL_ATTRIBUTE_FORMAT_PRINTF (1, 2)
+ _GL_ARG_NONNULL ((1)));
+_GL_CXXALIAS_RPL (printf, int, (const char *format, ...));
+# endif
+# define GNULIB_overrides_printf 1
+# else
+_GL_CXXALIAS_SYS (printf, int, (const char *format, ...));
+# endif
+_GL_CXXALIASWARN (printf);
+#endif
+#if address@hidden@ && defined GNULIB_POSIXCHECK
+# if !GNULIB_overrides_printf
+# undef printf
+# endif
+/* Assume printf is always declared. */
+_GL_WARN_ON_USE (printf, "printf is not always POSIX compliant - "
+ "use gnulib module printf-posix for portable "
+ "POSIX compliance");
+#endif
+
+#if @GNULIB_PUTC@
+# if @REPLACE_STDIO_WRITE_FUNCS@ && (@GNULIB_STDIO_H_NONBLOCKING@ ||
@GNULIB_STDIO_H_SIGPIPE@)
+# if !(defined __cplusplus && defined GNULIB_NAMESPACE)
+# undef putc
+# define putc rpl_fputc
+# endif
+_GL_FUNCDECL_RPL (fputc, int, (int c, FILE *stream) _GL_ARG_NONNULL ((2)));
+_GL_CXXALIAS_RPL_1 (putc, rpl_fputc, int, (int c, FILE *stream));
+# else
+_GL_CXXALIAS_SYS (putc, int, (int c, FILE *stream));
+# endif
+_GL_CXXALIASWARN (putc);
+#endif
+
+#if @GNULIB_PUTCHAR@
+# if @REPLACE_STDIO_WRITE_FUNCS@ && (@GNULIB_STDIO_H_NONBLOCKING@ ||
@GNULIB_STDIO_H_SIGPIPE@)
+# if !(defined __cplusplus && defined GNULIB_NAMESPACE)
+# undef putchar
+# define putchar rpl_putchar
+# endif
+_GL_FUNCDECL_RPL (putchar, int, (int c));
+_GL_CXXALIAS_RPL (putchar, int, (int c));
+# else
+_GL_CXXALIAS_SYS (putchar, int, (int c));
+# endif
+_GL_CXXALIASWARN (putchar);
+#endif
+
+#if @GNULIB_PUTS@
+# if @REPLACE_STDIO_WRITE_FUNCS@ && (@GNULIB_STDIO_H_NONBLOCKING@ ||
@GNULIB_STDIO_H_SIGPIPE@)
+# if !(defined __cplusplus && defined GNULIB_NAMESPACE)
+# undef puts
+# define puts rpl_puts
+# endif
+_GL_FUNCDECL_RPL (puts, int, (const char *string) _GL_ARG_NONNULL ((1)));
+_GL_CXXALIAS_RPL (puts, int, (const char *string));
+# else
+_GL_CXXALIAS_SYS (puts, int, (const char *string));
+# endif
+_GL_CXXALIASWARN (puts);
+#endif
+
+#if @GNULIB_REMOVE@
+# if @REPLACE_REMOVE@
+# if !(defined __cplusplus && defined GNULIB_NAMESPACE)
+# undef remove
+# define remove rpl_remove
+# endif
+_GL_FUNCDECL_RPL (remove, int, (const char *name) _GL_ARG_NONNULL ((1)));
+_GL_CXXALIAS_RPL (remove, int, (const char *name));
+# else
+_GL_CXXALIAS_SYS (remove, int, (const char *name));
+# endif
+_GL_CXXALIASWARN (remove);
+#elif defined GNULIB_POSIXCHECK
+# undef remove
+/* Assume remove is always declared. */
+_GL_WARN_ON_USE (remove, "remove cannot handle directories on some platforms -
"
+ "use gnulib module remove for more portability");
+#endif
+
+#if @GNULIB_RENAME@
+# if @REPLACE_RENAME@
+# if !(defined __cplusplus && defined GNULIB_NAMESPACE)
+# undef rename
+# define rename rpl_rename
+# endif
+_GL_FUNCDECL_RPL (rename, int,
+ (const char *old_filename, const char *new_filename)
+ _GL_ARG_NONNULL ((1, 2)));
+_GL_CXXALIAS_RPL (rename, int,
+ (const char *old_filename, const char *new_filename));
+# else
+_GL_CXXALIAS_SYS (rename, int,
+ (const char *old_filename, const char *new_filename));
+# endif
+_GL_CXXALIASWARN (rename);
+#elif defined GNULIB_POSIXCHECK
+# undef rename
+/* Assume rename is always declared. */
+_GL_WARN_ON_USE (rename, "rename is buggy on some platforms - "
+ "use gnulib module rename for more portability");
+#endif
+
+#if @GNULIB_RENAMEAT@
+# if @REPLACE_RENAMEAT@
+# if !(defined __cplusplus && defined GNULIB_NAMESPACE)
+# undef renameat
+# define renameat rpl_renameat
+# endif
+_GL_FUNCDECL_RPL (renameat, int,
+ (int fd1, char const *file1, int fd2, char const *file2)
+ _GL_ARG_NONNULL ((2, 4)));
+_GL_CXXALIAS_RPL (renameat, int,
+ (int fd1, char const *file1, int fd2, char const *file2));
+# else
+# if address@hidden@
+_GL_FUNCDECL_SYS (renameat, int,
+ (int fd1, char const *file1, int fd2, char const *file2)
+ _GL_ARG_NONNULL ((2, 4)));
+# endif
+_GL_CXXALIAS_SYS (renameat, int,
+ (int fd1, char const *file1, int fd2, char const *file2));
+# endif
+_GL_CXXALIASWARN (renameat);
+#elif defined GNULIB_POSIXCHECK
+# undef renameat
+# if HAVE_RAW_DECL_RENAMEAT
+_GL_WARN_ON_USE (renameat, "renameat is not portable - "
+ "use gnulib module renameat for portability");
+# endif
+#endif
+
+#if @GNULIB_SCANF@
+# if @REPLACE_STDIO_READ_FUNCS@ && @GNULIB_STDIO_H_NONBLOCKING@
+# if defined __GNUC__
+# if !(defined __cplusplus && defined GNULIB_NAMESPACE)
+# undef scanf
+/* Don't break __attribute__((format(scanf,M,N))). */
+# define scanf __scanf__
+# endif
+_GL_FUNCDECL_RPL_1 (__scanf__, int,
+ (const char *format, ...)
+ __asm__ (@ASM_SYMBOL_PREFIX@
+ _GL_STDIO_MACROEXPAND_AND_STRINGIZE(rpl_scanf))
+ _GL_ATTRIBUTE_FORMAT_SCANF_SYSTEM (1, 2)
+ _GL_ARG_NONNULL ((1)));
+_GL_CXXALIAS_RPL_1 (scanf, __scanf__, int, (const char *format, ...));
+# else
+# if !(defined __cplusplus && defined GNULIB_NAMESPACE)
+# undef scanf
+# define scanf rpl_scanf
+# endif
+_GL_FUNCDECL_RPL (scanf, int, (const char *format, ...)
+ _GL_ATTRIBUTE_FORMAT_SCANF_SYSTEM (1, 2)
+ _GL_ARG_NONNULL ((1)));
+_GL_CXXALIAS_RPL (scanf, int, (const char *format, ...));
+# endif
+# else
+_GL_CXXALIAS_SYS (scanf, int, (const char *format, ...));
+# endif
+_GL_CXXALIASWARN (scanf);
+#endif
+
+#if @GNULIB_SNPRINTF@
+# if @REPLACE_SNPRINTF@
+# if !(defined __cplusplus && defined GNULIB_NAMESPACE)
+# define snprintf rpl_snprintf
+# endif
+_GL_FUNCDECL_RPL (snprintf, int,
+ (char *str, size_t size, const char *format, ...)
+ _GL_ATTRIBUTE_FORMAT_PRINTF (3, 4)
+ _GL_ARG_NONNULL ((3)));
+_GL_CXXALIAS_RPL (snprintf, int,
+ (char *str, size_t size, const char *format, ...));
+# else
+# if address@hidden@
+_GL_FUNCDECL_SYS (snprintf, int,
+ (char *str, size_t size, const char *format, ...)
+ _GL_ATTRIBUTE_FORMAT_PRINTF (3, 4)
+ _GL_ARG_NONNULL ((3)));
+# endif
+_GL_CXXALIAS_SYS (snprintf, int,
+ (char *str, size_t size, const char *format, ...));
+# endif
+_GL_CXXALIASWARN (snprintf);
+#elif defined GNULIB_POSIXCHECK
+# undef snprintf
+# if HAVE_RAW_DECL_SNPRINTF
+_GL_WARN_ON_USE (snprintf, "snprintf is unportable - "
+ "use gnulib module snprintf for portability");
+# endif
+#endif
+
+/* Some people would argue that all sprintf uses should be warned about
+ (for example, OpenBSD issues a link warning for it),
+ since it can cause security holes due to buffer overruns.
+ However, we believe that sprintf can be used safely, and is more
+ efficient than snprintf in those safe cases; and as proof of our
+ belief, we use sprintf in several gnulib modules. So this header
+ intentionally avoids adding a warning to sprintf except when
+ GNULIB_POSIXCHECK is defined. */
+
+#if @GNULIB_SPRINTF_POSIX@
+# if @REPLACE_SPRINTF@
+# if !(defined __cplusplus && defined GNULIB_NAMESPACE)
+# define sprintf rpl_sprintf
+# endif
+_GL_FUNCDECL_RPL (sprintf, int, (char *str, const char *format, ...)
+ _GL_ATTRIBUTE_FORMAT_PRINTF (2, 3)
+ _GL_ARG_NONNULL ((1, 2)));
+_GL_CXXALIAS_RPL (sprintf, int, (char *str, const char *format, ...));
+# else
+_GL_CXXALIAS_SYS (sprintf, int, (char *str, const char *format, ...));
+# endif
+_GL_CXXALIASWARN (sprintf);
+#elif defined GNULIB_POSIXCHECK
+# undef sprintf
+/* Assume sprintf is always declared. */
+_GL_WARN_ON_USE (sprintf, "sprintf is not always POSIX compliant - "
+ "use gnulib module sprintf-posix for portable "
+ "POSIX compliance");
+#endif
+
+#if @GNULIB_TMPFILE@
+# if @REPLACE_TMPFILE@
+# if !(defined __cplusplus && defined GNULIB_NAMESPACE)
+# define tmpfile rpl_tmpfile
+# endif
+_GL_FUNCDECL_RPL (tmpfile, FILE *, (void));
+_GL_CXXALIAS_RPL (tmpfile, FILE *, (void));
+# else
+_GL_CXXALIAS_SYS (tmpfile, FILE *, (void));
+# endif
+_GL_CXXALIASWARN (tmpfile);
+#elif defined GNULIB_POSIXCHECK
+# undef tmpfile
+# if HAVE_RAW_DECL_TMPFILE
+_GL_WARN_ON_USE (tmpfile, "tmpfile is not usable on mingw - "
+ "use gnulib module tmpfile for portability");
+# endif
+#endif
+
+#if @GNULIB_VASPRINTF@
+/* Write formatted output to a string dynamically allocated with malloc().
+ If the memory allocation succeeds, store the address of the string in
+ *RESULT and return the number of resulting bytes, excluding the trailing
+ NUL. Upon memory allocation error, or some other error, return -1. */
+# if @REPLACE_VASPRINTF@
+# if !(defined __cplusplus && defined GNULIB_NAMESPACE)
+# define asprintf rpl_asprintf
+# endif
+_GL_FUNCDECL_RPL (asprintf, int,
+ (char **result, const char *format, ...)
+ _GL_ATTRIBUTE_FORMAT_PRINTF (2, 3)
+ _GL_ARG_NONNULL ((1, 2)));
+_GL_CXXALIAS_RPL (asprintf, int,
+ (char **result, const char *format, ...));
+# else
+# if address@hidden@
+_GL_FUNCDECL_SYS (asprintf, int,
+ (char **result, const char *format, ...)
+ _GL_ATTRIBUTE_FORMAT_PRINTF (2, 3)
+ _GL_ARG_NONNULL ((1, 2)));
+# endif
+_GL_CXXALIAS_SYS (asprintf, int,
+ (char **result, const char *format, ...));
+# endif
+_GL_CXXALIASWARN (asprintf);
+# if @REPLACE_VASPRINTF@
+# if !(defined __cplusplus && defined GNULIB_NAMESPACE)
+# define vasprintf rpl_vasprintf
+# endif
+_GL_FUNCDECL_RPL (vasprintf, int,
+ (char **result, const char *format, va_list args)
+ _GL_ATTRIBUTE_FORMAT_PRINTF (2, 0)
+ _GL_ARG_NONNULL ((1, 2)));
+_GL_CXXALIAS_RPL (vasprintf, int,
+ (char **result, const char *format, va_list args));
+# else
+# if address@hidden@
+_GL_FUNCDECL_SYS (vasprintf, int,
+ (char **result, const char *format, va_list args)
+ _GL_ATTRIBUTE_FORMAT_PRINTF (2, 0)
+ _GL_ARG_NONNULL ((1, 2)));
+# endif
+_GL_CXXALIAS_SYS (vasprintf, int,
+ (char **result, const char *format, va_list args));
+# endif
+_GL_CXXALIASWARN (vasprintf);
+#endif
+
+#if @GNULIB_VDPRINTF@
+# if @REPLACE_VDPRINTF@
+# if !(defined __cplusplus && defined GNULIB_NAMESPACE)
+# define vdprintf rpl_vdprintf
+# endif
+_GL_FUNCDECL_RPL (vdprintf, int, (int fd, const char *format, va_list args)
+ _GL_ATTRIBUTE_FORMAT_PRINTF (2, 0)
+ _GL_ARG_NONNULL ((2)));
+_GL_CXXALIAS_RPL (vdprintf, int, (int fd, const char *format, va_list args));
+# else
+# if address@hidden@
+_GL_FUNCDECL_SYS (vdprintf, int, (int fd, const char *format, va_list args)
+ _GL_ATTRIBUTE_FORMAT_PRINTF (2, 0)
+ _GL_ARG_NONNULL ((2)));
+# endif
+/* Need to cast, because on Solaris, the third parameter will likely be
+ __va_list args. */
+_GL_CXXALIAS_SYS_CAST (vdprintf, int,
+ (int fd, const char *format, va_list args));
+# endif
+_GL_CXXALIASWARN (vdprintf);
+#elif defined GNULIB_POSIXCHECK
+# undef vdprintf
+# if HAVE_RAW_DECL_VDPRINTF
+_GL_WARN_ON_USE (vdprintf, "vdprintf is unportable - "
+ "use gnulib module vdprintf for portability");
+# endif
+#endif
+
+#if @GNULIB_VFPRINTF_POSIX@ || @GNULIB_VFPRINTF@
+# if (@GNULIB_VFPRINTF_POSIX@ && @REPLACE_VFPRINTF@) \
+ || (@GNULIB_VFPRINTF@ && @REPLACE_STDIO_WRITE_FUNCS@ &&
(@GNULIB_STDIO_H_NONBLOCKING@ || @GNULIB_STDIO_H_SIGPIPE@))
+# if !(defined __cplusplus && defined GNULIB_NAMESPACE)
+# define vfprintf rpl_vfprintf
+# endif
+# define GNULIB_overrides_vfprintf 1
+# if @GNULIB_VFPRINTF_POSIX@
+_GL_FUNCDECL_RPL (vfprintf, int, (FILE *fp, const char *format, va_list args)
+ _GL_ATTRIBUTE_FORMAT_PRINTF (2, 0)
+ _GL_ARG_NONNULL ((1, 2)));
+# else
+_GL_FUNCDECL_RPL (vfprintf, int, (FILE *fp, const char *format, va_list args)
+ _GL_ATTRIBUTE_FORMAT_PRINTF_SYSTEM (2, 0)
+ _GL_ARG_NONNULL ((1, 2)));
+# endif
+_GL_CXXALIAS_RPL (vfprintf, int, (FILE *fp, const char *format, va_list args));
+# else
+/* Need to cast, because on Solaris, the third parameter is
+ __va_list args
+ and GCC's fixincludes did not change this to __gnuc_va_list. */
+_GL_CXXALIAS_SYS_CAST (vfprintf, int,
+ (FILE *fp, const char *format, va_list args));
+# endif
+_GL_CXXALIASWARN (vfprintf);
+#endif
+#if address@hidden@ && defined GNULIB_POSIXCHECK
+# if !GNULIB_overrides_vfprintf
+# undef vfprintf
+# endif
+/* Assume vfprintf is always declared. */
+_GL_WARN_ON_USE (vfprintf, "vfprintf is not always POSIX compliant - "
+ "use gnulib module vfprintf-posix for portable "
+ "POSIX compliance");
+#endif
+
+#if @GNULIB_VFSCANF@
+# if @REPLACE_STDIO_READ_FUNCS@ && @GNULIB_STDIO_H_NONBLOCKING@
+# if !(defined __cplusplus && defined GNULIB_NAMESPACE)
+# undef vfscanf
+# define vfscanf rpl_vfscanf
+# endif
+_GL_FUNCDECL_RPL (vfscanf, int,
+ (FILE *stream, const char *format, va_list args)
+ _GL_ATTRIBUTE_FORMAT_SCANF_SYSTEM (2, 0)
+ _GL_ARG_NONNULL ((1, 2)));
+_GL_CXXALIAS_RPL (vfscanf, int,
+ (FILE *stream, const char *format, va_list args));
+# else
+_GL_CXXALIAS_SYS (vfscanf, int,
+ (FILE *stream, const char *format, va_list args));
+# endif
+_GL_CXXALIASWARN (vfscanf);
+#endif
+
+#if @GNULIB_VPRINTF_POSIX@ || @GNULIB_VPRINTF@
+# if (@GNULIB_VPRINTF_POSIX@ && @REPLACE_VPRINTF@) \
+ || (@GNULIB_VPRINTF@ && @REPLACE_STDIO_WRITE_FUNCS@ &&
(@GNULIB_STDIO_H_NONBLOCKING@ || @GNULIB_STDIO_H_SIGPIPE@))
+# if !(defined __cplusplus && defined GNULIB_NAMESPACE)
+# define vprintf rpl_vprintf
+# endif
+# define GNULIB_overrides_vprintf 1
+# if @GNULIB_VPRINTF_POSIX@ || @GNULIB_VFPRINTF_POSIX@
+_GL_FUNCDECL_RPL (vprintf, int, (const char *format, va_list args)
+ _GL_ATTRIBUTE_FORMAT_PRINTF (1, 0)
+ _GL_ARG_NONNULL ((1)));
+# else
+_GL_FUNCDECL_RPL (vprintf, int, (const char *format, va_list args)
+ _GL_ATTRIBUTE_FORMAT_PRINTF_SYSTEM (1, 0)
+ _GL_ARG_NONNULL ((1)));
+# endif
+_GL_CXXALIAS_RPL (vprintf, int, (const char *format, va_list args));
+# else
+/* Need to cast, because on Solaris, the second parameter is
+ __va_list args
+ and GCC's fixincludes did not change this to __gnuc_va_list. */
+_GL_CXXALIAS_SYS_CAST (vprintf, int, (const char *format, va_list args));
+# endif
+_GL_CXXALIASWARN (vprintf);
+#endif
+#if address@hidden@ && defined GNULIB_POSIXCHECK
+# if !GNULIB_overrides_vprintf
+# undef vprintf
+# endif
+/* Assume vprintf is always declared. */
+_GL_WARN_ON_USE (vprintf, "vprintf is not always POSIX compliant - "
+ "use gnulib module vprintf-posix for portable "
+ "POSIX compliance");
+#endif
+
+#if @GNULIB_VSCANF@
+# if @REPLACE_STDIO_READ_FUNCS@ && @GNULIB_STDIO_H_NONBLOCKING@
+# if !(defined __cplusplus && defined GNULIB_NAMESPACE)
+# undef vscanf
+# define vscanf rpl_vscanf
+# endif
+_GL_FUNCDECL_RPL (vscanf, int, (const char *format, va_list args)
+ _GL_ATTRIBUTE_FORMAT_SCANF_SYSTEM (1, 0)
+ _GL_ARG_NONNULL ((1)));
+_GL_CXXALIAS_RPL (vscanf, int, (const char *format, va_list args));
+# else
+_GL_CXXALIAS_SYS (vscanf, int, (const char *format, va_list args));
+# endif
+_GL_CXXALIASWARN (vscanf);
+#endif
+
+#if @GNULIB_VSNPRINTF@
+# if @REPLACE_VSNPRINTF@
+# if !(defined __cplusplus && defined GNULIB_NAMESPACE)
+# define vsnprintf rpl_vsnprintf
+# endif
+_GL_FUNCDECL_RPL (vsnprintf, int,
+ (char *str, size_t size, const char *format, va_list args)
+ _GL_ATTRIBUTE_FORMAT_PRINTF (3, 0)
+ _GL_ARG_NONNULL ((3)));
+_GL_CXXALIAS_RPL (vsnprintf, int,
+ (char *str, size_t size, const char *format, va_list args));
+# else
+# if address@hidden@
+_GL_FUNCDECL_SYS (vsnprintf, int,
+ (char *str, size_t size, const char *format, va_list args)
+ _GL_ATTRIBUTE_FORMAT_PRINTF (3, 0)
+ _GL_ARG_NONNULL ((3)));
+# endif
+_GL_CXXALIAS_SYS (vsnprintf, int,
+ (char *str, size_t size, const char *format, va_list args));
+# endif
+_GL_CXXALIASWARN (vsnprintf);
+#elif defined GNULIB_POSIXCHECK
+# undef vsnprintf
+# if HAVE_RAW_DECL_VSNPRINTF
+_GL_WARN_ON_USE (vsnprintf, "vsnprintf is unportable - "
+ "use gnulib module vsnprintf for portability");
+# endif
+#endif
+
+#if @GNULIB_VSPRINTF_POSIX@
+# if @REPLACE_VSPRINTF@
+# if !(defined __cplusplus && defined GNULIB_NAMESPACE)
+# define vsprintf rpl_vsprintf
+# endif
+_GL_FUNCDECL_RPL (vsprintf, int,
+ (char *str, const char *format, va_list args)
+ _GL_ATTRIBUTE_FORMAT_PRINTF (2, 0)
+ _GL_ARG_NONNULL ((1, 2)));
+_GL_CXXALIAS_RPL (vsprintf, int,
+ (char *str, const char *format, va_list args));
+# else
+/* Need to cast, because on Solaris, the third parameter is
+ __va_list args
+ and GCC's fixincludes did not change this to __gnuc_va_list. */
+_GL_CXXALIAS_SYS_CAST (vsprintf, int,
+ (char *str, const char *format, va_list args));
+# endif
+_GL_CXXALIASWARN (vsprintf);
+#elif defined GNULIB_POSIXCHECK
+# undef vsprintf
+/* Assume vsprintf is always declared. */
+_GL_WARN_ON_USE (vsprintf, "vsprintf is not always POSIX compliant - "
+ "use gnulib module vsprintf-posix for portable "
+ "POSIX compliance");
+#endif
+
+#endif /* address@hidden@_STDIO_H */
+#endif /* address@hidden@_STDIO_H */
+#endif
diff --git a/src/gl/strerror-override.c b/src/gl/strerror-override.c
index 9f55cfa..255d933 100644
--- a/src/gl/strerror-override.c
+++ b/src/gl/strerror-override.c
@@ -1,6 +1,6 @@
/* strerror-override.c --- POSIX compatible system error routine
- Copyright (C) 2010-2012 Free Software Foundation, Inc.
+ Copyright (C) 2010-2014 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
@@ -291,6 +291,11 @@ strerror_override (int errnum)
return "State not recoverable";
#endif
+#if GNULIB_defined_EILSEQ
+ case EILSEQ:
+ return "Invalid or incomplete multibyte or wide character";
+#endif
+
default:
return NULL;
}
diff --git a/src/gl/strerror-override.h b/src/gl/strerror-override.h
index fe1fb2c..e98c1c1 100644
--- a/src/gl/strerror-override.h
+++ b/src/gl/strerror-override.h
@@ -1,6 +1,6 @@
/* strerror-override.h --- POSIX compatible system error routine
- Copyright (C) 2010-2012 Free Software Foundation, Inc.
+ Copyright (C) 2010-2014 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
@@ -46,8 +46,9 @@
|| GNULIB_defined_EDQUOT \
|| GNULIB_defined_ECANCELED \
|| GNULIB_defined_EOWNERDEAD \
- || GNULIB_defined_ENOTRECOVERABLE
-extern const char *strerror_override (int errnum);
+ || GNULIB_defined_ENOTRECOVERABLE \
+ || GNULIB_defined_EILSEQ
+extern const char *strerror_override (int errnum) _GL_ATTRIBUTE_CONST;
# else
# define strerror_override(ignored) NULL
# endif
diff --git a/src/gl/strerror.c b/src/gl/strerror.c
index 587bd21..e54f0cc 100644
--- a/src/gl/strerror.c
+++ b/src/gl/strerror.c
@@ -1,6 +1,6 @@
/* strerror.c --- POSIX compatible system error routine
- Copyright (C) 2007-2012 Free Software Foundation, Inc.
+ Copyright (C) 2007-2014 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
diff --git a/src/gl/string.in.h b/src/gl/string.in.h
index f8d7520..9062142 100644
--- a/src/gl/string.in.h
+++ b/src/gl/string.in.h
@@ -1,6 +1,6 @@
/* A GNU-like <string.h>.
- Copyright (C) 1995-1996, 2001-2012 Free Software Foundation, Inc.
+ Copyright (C) 1995-1996, 2001-2014 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
diff --git a/src/gl/sys_types.in.h b/src/gl/sys_types.in.h
index 8139d98..deb5d67 100644
--- a/src/gl/sys_types.in.h
+++ b/src/gl/sys_types.in.h
@@ -1,6 +1,6 @@
/* Provide a more complete sys/types.h.
- Copyright (C) 2011-2012 Free Software Foundation, Inc.
+ Copyright (C) 2011-2014 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
@@ -23,7 +23,9 @@
#ifndef address@hidden@_SYS_TYPES_H
/* The include_next requires a split double-inclusion guard. */
+# define _GL_INCLUDING_SYS_TYPES_H
address@hidden@ @NEXT_SYS_TYPES_H@
+# undef _GL_INCLUDING_SYS_TYPES_H
#ifndef address@hidden@_SYS_TYPES_H
#define address@hidden@_SYS_TYPES_H
diff --git a/src/gl/unistd.c b/src/gl/unistd.c
new file mode 100644
index 0000000..6c6a8e2
--- /dev/null
+++ b/src/gl/unistd.c
@@ -0,0 +1,3 @@
+#include <config.h>
+#define _GL_UNISTD_INLINE _GL_EXTERN_INLINE
+#include "unistd.h"
diff --git a/src/gl/unistd.in.h b/src/gl/unistd.in.h
index e904e51..622b228 100644
--- a/src/gl/unistd.in.h
+++ b/src/gl/unistd.in.h
@@ -1,5 +1,5 @@
/* Substitute for and wrapper around <unistd.h>.
- Copyright (C) 2003-2012 Free Software Foundation, Inc.
+ Copyright (C) 2003-2014 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
@@ -14,32 +14,30 @@
You should have received a copy of the GNU General Public License
along with this program; if not, see <http://www.gnu.org/licenses/>. */
+#ifndef address@hidden@_UNISTD_H
+
#if __GNUC__ >= 3
@PRAGMA_SYSTEM_HEADER@
#endif
@PRAGMA_COLUMNS@
+#ifdef _GL_INCLUDING_UNISTD_H
/* Special invocation convention:
- - On mingw, several headers, including <winsock2.h>, include <unistd.h>,
- but we need to ensure that both the system <unistd.h> and <winsock2.h>
- are completely included before we replace gethostname. */
-#if @GNULIB_GETHOSTNAME@ && @UNISTD_H_HAVE_WINSOCK2_H@ \
- && !defined _GL_WINSOCK2_H_WITNESS && defined _WINSOCK2_H
-/* <unistd.h> is being indirectly included for the first time from
- <winsock2.h>; avoid declaring any overrides. */
-# if @HAVE_UNISTD_H@
-# @INCLUDE_NEXT@ @NEXT_UNISTD_H@
-# else
-# error unexpected; report this to address@hidden
-# endif
-# define _GL_WINSOCK2_H_WITNESS
+ - On Mac OS X 10.3.9 we have a sequence of nested includes
+ <unistd.h> -> <signal.h> -> <pthread.h> -> <unistd.h>
+ In this situation, the functions are not yet declared, therefore we cannot
+ provide the C++ aliases. */
-/* Normal invocation. */
-#elif !defined address@hidden@_UNISTD_H
address@hidden@ @NEXT_UNISTD_H@
+
+#else
+/* Normal invocation convention. */
/* The include_next requires a split double-inclusion guard. */
#if @HAVE_UNISTD_H@
+# define _GL_INCLUDING_UNISTD_H
# @INCLUDE_NEXT@ @NEXT_UNISTD_H@
+# undef _GL_INCLUDING_UNISTD_H
#endif
/* Get all possible declarations of gethostname(). */
@@ -77,9 +75,13 @@
/* mingw, MSVC, BeOS, Haiku declare environ in <stdlib.h>, not in
<unistd.h>. */
/* Solaris declares getcwd not only in <unistd.h> but also in <stdlib.h>. */
+/* OSF Tru64 Unix cannot see gnulib rpl_strtod when system <stdlib.h> is
+ included here. */
/* But avoid namespace pollution on glibc systems. */
-#ifndef __GLIBC__
+#if !defined __GLIBC__ && !defined __osf__
+# define __need_system_stdlib_h
# include <stdlib.h>
+# undef __need_system_stdlib_h
#endif
/* Native Windows platforms declare chdir, getcwd, rmdir in
@@ -124,9 +126,18 @@
/* Get getopt(), optarg, optind, opterr, optopt.
But avoid namespace pollution on glibc systems. */
#if @GNULIB_UNISTD_H_GETOPT@ && !defined __GLIBC__ && !defined
_GL_SYSTEM_GETOPT
+# define __need_getopt
# include <getopt.h>
#endif
+#ifndef _GL_INLINE_HEADER_BEGIN
+ #error "Please include config.h first."
+#endif
+_GL_INLINE_HEADER_BEGIN
+#ifndef _GL_UNISTD_INLINE
+# define _GL_UNISTD_INLINE _GL_INLINE
+#endif
+
/* The definitions of _GL_FUNCDECL_RPL etc. are copied here. */
/* The definition of _GL_ARG_NONNULL is copied here. */
@@ -404,7 +415,7 @@ extern char **environ;
# endif
#elif defined GNULIB_POSIXCHECK
# if HAVE_RAW_DECL_ENVIRON
-static inline char ***
+_GL_UNISTD_INLINE char ***
rpl_environ (void)
{
return &environ;
@@ -657,10 +668,19 @@ _GL_WARN_ON_USE (getdomainname, "getdomainname is
unportable - "
#if @GNULIB_GETDTABLESIZE@
/* Return the maximum number of file descriptors in the current process.
In POSIX, this is same as sysconf (_SC_OPEN_MAX). */
-# if address@hidden@
+# if @REPLACE_GETDTABLESIZE@
+# if !(defined __cplusplus && defined GNULIB_NAMESPACE)
+# undef getdtablesize
+# define getdtablesize rpl_getdtablesize
+# endif
+_GL_FUNCDECL_RPL (getdtablesize, int, (void));
+_GL_CXXALIAS_RPL (getdtablesize, int, (void));
+# else
+# if address@hidden@
_GL_FUNCDECL_SYS (getdtablesize, int, (void));
-# endif
+# endif
_GL_CXXALIAS_SYS (getdtablesize, int, (void));
+# endif
_GL_CXXALIASWARN (getdtablesize);
#elif defined GNULIB_POSIXCHECK
# undef getdtablesize
@@ -862,7 +882,7 @@ _GL_CXXALIAS_RPL (getpagesize, int, (void));
# define getpagesize() _gl_getpagesize ()
# else
# if !GNULIB_defined_getpagesize_function
-static inline int
+_GL_UNISTD_INLINE int
getpagesize ()
{
return _gl_getpagesize ();
@@ -1530,6 +1550,8 @@ _GL_CXXALIAS_SYS_CAST (write, ssize_t, (int fd, const
void *buf, size_t count));
_GL_CXXALIASWARN (write);
#endif
+_GL_INLINE_HEADER_END
#endif /* address@hidden@_UNISTD_H */
+#endif /* _GL_INCLUDING_UNISTD_H */
#endif /* address@hidden@_UNISTD_H */
diff --git a/src/gl/verify.h b/src/gl/verify.h
index 0c320b1..a25e514 100644
--- a/src/gl/verify.h
+++ b/src/gl/verify.h
@@ -1,6 +1,6 @@
/* Compile-time assert-like macros.
- Copyright (C) 2005-2006, 2009-2012 Free Software Foundation, Inc.
+ Copyright (C) 2005-2006, 2009-2014 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
@@ -18,7 +18,7 @@
/* Written by Paul Eggert, Bruno Haible, and Jim Meyering. */
#ifndef _GL_VERIFY_H
-# define _GL_VERIFY_H
+#define _GL_VERIFY_H
/* Define _GL_HAVE__STATIC_ASSERT to 1 if _Static_assert works as per C11.
@@ -31,14 +31,24 @@
Use this only with GCC. If we were willing to slow 'configure'
down we could also use it with other compilers, but since this
affects only the quality of diagnostics, why bother? */
-# if (4 < __GNUC__ || (__GNUC__ == 4 && 6 <= __GNUC_MINOR__)) && !defined
__cplusplus
-# define _GL_HAVE__STATIC_ASSERT 1
-# endif
+#if (4 < __GNUC__ + (6 <= __GNUC_MINOR__) \
+ && (201112L <= __STDC_VERSION__ || !defined __STRICT_ANSI__) \
+ && !defined __cplusplus)
+# define _GL_HAVE__STATIC_ASSERT 1
+#endif
/* The condition (99 < __GNUC__) is temporary, until we know about the
first G++ release that supports static_assert. */
-# if (99 < __GNUC__) && defined __cplusplus
-# define _GL_HAVE_STATIC_ASSERT 1
-# endif
+#if (99 < __GNUC__) && defined __cplusplus
+# define _GL_HAVE_STATIC_ASSERT 1
+#endif
+
+/* FreeBSD 9.1 <sys/cdefs.h>, included by <stddef.h> and lots of other
+ system headers, defines a conflicting _Static_assert that is no
+ better than ours; override it. */
+#ifndef _GL_HAVE_STATIC_ASSERT
+# include <stddef.h>
+# undef _Static_assert
+#endif
/* Each of these macros verifies that its argument R is nonzero. To
be portable, R should be an integer constant expression. Unlike
@@ -141,50 +151,50 @@
Use a template type to work around the problem. */
/* Concatenate two preprocessor tokens. */
-# define _GL_CONCAT(x, y) _GL_CONCAT0 (x, y)
-# define _GL_CONCAT0(x, y) x##y
+#define _GL_CONCAT(x, y) _GL_CONCAT0 (x, y)
+#define _GL_CONCAT0(x, y) x##y
/* _GL_COUNTER is an integer, preferably one that changes each time we
use it. Use __COUNTER__ if it works, falling back on __LINE__
otherwise. __LINE__ isn't perfect, but it's better than a
constant. */
-# if defined __COUNTER__ && __COUNTER__ != __COUNTER__
-# define _GL_COUNTER __COUNTER__
-# else
-# define _GL_COUNTER __LINE__
-# endif
+#if defined __COUNTER__ && __COUNTER__ != __COUNTER__
+# define _GL_COUNTER __COUNTER__
+#else
+# define _GL_COUNTER __LINE__
+#endif
/* Generate a symbol with the given prefix, making it unique if
possible. */
-# define _GL_GENSYM(prefix) _GL_CONCAT (prefix, _GL_COUNTER)
+#define _GL_GENSYM(prefix) _GL_CONCAT (prefix, _GL_COUNTER)
/* Verify requirement R at compile-time, as an integer constant expression
that returns 1. If R is false, fail at compile-time, preferably
with a diagnostic that includes the string-literal DIAGNOSTIC. */
-# define _GL_VERIFY_TRUE(R, DIAGNOSTIC) \
- (!!sizeof (_GL_VERIFY_TYPE (R, DIAGNOSTIC)))
+#define _GL_VERIFY_TRUE(R, DIAGNOSTIC) \
+ (!!sizeof (_GL_VERIFY_TYPE (R, DIAGNOSTIC)))
-# ifdef __cplusplus
-# if !GNULIB_defined_struct__gl_verify_type
+#ifdef __cplusplus
+# if !GNULIB_defined_struct__gl_verify_type
template <int w>
struct _gl_verify_type {
unsigned int _gl_verify_error_if_negative: w;
};
-# define GNULIB_defined_struct__gl_verify_type 1
-# endif
-# define _GL_VERIFY_TYPE(R, DIAGNOSTIC) \
- _gl_verify_type<(R) ? 1 : -1>
-# elif defined _GL_HAVE__STATIC_ASSERT
-# define _GL_VERIFY_TYPE(R, DIAGNOSTIC) \
- struct { \
- _Static_assert (R, DIAGNOSTIC); \
- int _gl_dummy; \
- }
-# else
-# define _GL_VERIFY_TYPE(R, DIAGNOSTIC) \
- struct { unsigned int _gl_verify_error_if_negative: (R) ? 1 : -1; }
+# define GNULIB_defined_struct__gl_verify_type 1
# endif
+# define _GL_VERIFY_TYPE(R, DIAGNOSTIC) \
+ _gl_verify_type<(R) ? 1 : -1>
+#elif defined _GL_HAVE__STATIC_ASSERT
+# define _GL_VERIFY_TYPE(R, DIAGNOSTIC) \
+ struct { \
+ _Static_assert (R, DIAGNOSTIC); \
+ int _gl_dummy; \
+ }
+#else
+# define _GL_VERIFY_TYPE(R, DIAGNOSTIC) \
+ struct { unsigned int _gl_verify_error_if_negative: (R) ? 1 : -1; }
+#endif
/* Verify requirement R at compile-time, as a declaration without a
trailing ';'. If R is false, fail at compile-time, preferably
@@ -193,23 +203,23 @@ template <int w>
Unfortunately, unlike C11, this implementation must appear as an
ordinary declaration, and cannot appear inside struct { ... }. */
-# ifdef _GL_HAVE__STATIC_ASSERT
-# define _GL_VERIFY _Static_assert
-# else
-# define _GL_VERIFY(R, DIAGNOSTIC) \
- extern int (*_GL_GENSYM (_gl_verify_function) (void)) \
- [_GL_VERIFY_TRUE (R, DIAGNOSTIC)]
-# endif
+#ifdef _GL_HAVE__STATIC_ASSERT
+# define _GL_VERIFY _Static_assert
+#else
+# define _GL_VERIFY(R, DIAGNOSTIC) \
+ extern int (*_GL_GENSYM (_gl_verify_function) (void)) \
+ [_GL_VERIFY_TRUE (R, DIAGNOSTIC)]
+#endif
/* _GL_STATIC_ASSERT_H is defined if this code is copied into assert.h. */
-# ifdef _GL_STATIC_ASSERT_H
-# if !defined _GL_HAVE__STATIC_ASSERT && !defined _Static_assert
-# define _Static_assert(R, DIAGNOSTIC) _GL_VERIFY (R, DIAGNOSTIC)
-# endif
-# if !defined _GL_HAVE_STATIC_ASSERT && !defined static_assert
-# define static_assert _Static_assert /* C11 requires this #define. */
-# endif
+#ifdef _GL_STATIC_ASSERT_H
+# if !defined _GL_HAVE__STATIC_ASSERT && !defined _Static_assert
+# define _Static_assert(R, DIAGNOSTIC) _GL_VERIFY (R, DIAGNOSTIC)
# endif
+# if !defined _GL_HAVE_STATIC_ASSERT && !defined static_assert
+# define static_assert _Static_assert /* C11 requires this #define. */
+# endif
+#endif
/* @assert.h omit start@ */
@@ -227,18 +237,42 @@ template <int w>
verify_true is obsolescent; please use verify_expr instead. */
-# define verify_true(R) _GL_VERIFY_TRUE (R, "verify_true (" #R ")")
+#define verify_true(R) _GL_VERIFY_TRUE (R, "verify_true (" #R ")")
/* Verify requirement R at compile-time. Return the value of the
expression E. */
-# define verify_expr(R, E) \
- (_GL_VERIFY_TRUE (R, "verify_expr (" #R ", " #E ")") ? (E) : (E))
+#define verify_expr(R, E) \
+ (_GL_VERIFY_TRUE (R, "verify_expr (" #R ", " #E ")") ? (E) : (E))
/* Verify requirement R at compile-time, as a declaration without a
trailing ';'. */
-# define verify(R) _GL_VERIFY (R, "verify (" #R ")")
+#define verify(R) _GL_VERIFY (R, "verify (" #R ")")
+
+#ifndef __has_builtin
+# define __has_builtin(x) 0
+#endif
+
+/* Assume that R always holds. This lets the compiler optimize
+ accordingly. R should not have side-effects; it may or may not be
+ evaluated. Behavior is undefined if R is false. */
+
+#if (__has_builtin (__builtin_unreachable) \
+ || 4 < __GNUC__ + (5 <= __GNUC_MINOR__))
+# define assume(R) ((R) ? (void) 0 : __builtin_unreachable ())
+#elif 1200 <= _MSC_VER
+# define assume(R) __assume (R)
+#elif (defined lint \
+ && (__has_builtin (__builtin_trap) \
+ || 3 < __GNUC__ + (3 < __GNUC_MINOR__ + (4 <=
__GNUC_PATCHLEVEL__))))
+ /* Doing it this way helps various packages when configured with
+ --enable-gcc-warnings, which compiles with -Dlint. It's nicer
+ when 'assume' silences warnings even with older GCCs. */
+# define assume(R) ((R) ? (void) 0 : __builtin_trap ())
+#else
+# define assume(R) ((void) (0 && (R)))
+#endif
/* @assert.h omit end@ */
diff --git a/src/gl/version-etc.c b/src/gl/version-etc.c
index ae1e44d..04f5b62 100644
--- a/src/gl/version-etc.c
+++ b/src/gl/version-etc.c
@@ -1,5 +1,5 @@
/* Print --version and bug-reporting information in a consistent format.
- Copyright (C) 1999-2012 Free Software Foundation, Inc.
+ Copyright (C) 1999-2014 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
@@ -38,7 +38,7 @@
# define PACKAGE PACKAGE_TARNAME
#endif
-enum { COPYRIGHT_YEAR = 2012 };
+enum { COPYRIGHT_YEAR = 2014 };
/* The three functions below display the --version information the
standard way.
diff --git a/src/gl/version-etc.h b/src/gl/version-etc.h
index 5548c02..8e1b2cc 100644
--- a/src/gl/version-etc.h
+++ b/src/gl/version-etc.h
@@ -1,5 +1,5 @@
/* Print --version and bug-reporting information in a consistent format.
- Copyright (C) 1999, 2003, 2005, 2009-2012 Free Software Foundation, Inc.
+ Copyright (C) 1999, 2003, 2005, 2009-2014 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
diff --git a/src/gss.c b/src/gss.c
index a111265..332cf37 100644
--- a/src/gss.c
+++ b/src/gss.c
@@ -1,5 +1,5 @@
/* gss.c --- Command line tool for GSS.
- * Copyright (C) 2004-2013 Simon Josefsson
+ * Copyright (C) 2004-2014 Simon Josefsson
*
* This file is part of the Generic Security Service (GSS).
*
@@ -406,7 +406,7 @@ init_sec_context (unsigned quiet, const char *mech, const
char *server)
if (s == -1 && !feof (stdin))
error (EXIT_FAILURE, errno, _("getline"));
if (s == -1)
- error (EXIT_FAILURE, 0, _("EOF"));
+ error (EXIT_FAILURE, 0, _("end of file"));
ok = base64_decode_alloc (line, strlen (line), &out, &outlen);
if (!ok)
@@ -536,7 +536,7 @@ accept_sec_context (unsigned quiet, const char *mech, const
char *server)
if (s == -1 && !feof (stdin))
error (EXIT_FAILURE, errno, _("getline"));
if (s == -1)
- error (EXIT_FAILURE, 0, _("EOF"));
+ error (EXIT_FAILURE, 0, _("end of file"));
ok = base64_decode_alloc (line, strlen (line), &out, &outlen);
if (!ok)
diff --git a/src/gss.ggo b/src/gss.ggo
index b3506f4..e1eb8d0 100644
--- a/src/gss.ggo
+++ b/src/gss.ggo
@@ -1,5 +1,5 @@
# gss.ggo --- Run gengetopt on this file to produce gss_cmd.*. -*- sh -*-
-# Copyright (C) 2003-2013 Simon Josefsson
+# Copyright (C) 2003-2014 Simon Josefsson
#
# This file is part of the Generic Security Service (GSS).
#
diff --git a/tests/Makefile.am b/tests/Makefile.am
index 2d7c78a..18c0ee8 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -1,5 +1,5 @@
## Process this file with automake to produce Makefile.in
-# Copyright (C) 2003-2013 Simon Josefsson
+# Copyright (C) 2003-2014 Simon Josefsson
#
# This file is part of the Generic Security Service (GSS).
#
diff --git a/tests/basic.c b/tests/basic.c
index 704560b..b1e5948 100644
--- a/tests/basic.c
+++ b/tests/basic.c
@@ -1,5 +1,5 @@
/* basic.c --- Basic GSS self tests.
- * Copyright (C) 2003-2013 Simon Josefsson
+ * Copyright (C) 2003-2014 Simon Josefsson
*
* This file is part of the Generic Security Service (GSS).
*
diff --git a/tests/krb5context.c b/tests/krb5context.c
index 04d04cf..e49fd8f 100644
--- a/tests/krb5context.c
+++ b/tests/krb5context.c
@@ -1,5 +1,5 @@
/* krb5context.c --- Kerberos 5 security context self tests.
- * Copyright (C) 2003-2013 Simon Josefsson
+ * Copyright (C) 2003-2014 Simon Josefsson
*
* This file is part of the Generic Security Service (GSS).
*
diff --git a/tests/saslname.c b/tests/saslname.c
index ca951a9..ae82441 100644
--- a/tests/saslname.c
+++ b/tests/saslname.c
@@ -1,5 +1,5 @@
/* saslname.c --- Test of new SASL GS2 related GSS-API functions
- * Copyright (C) 2003-2013 Simon Josefsson
+ * Copyright (C) 2003-2014 Simon Josefsson
*
* This file is part of the Generic Security Service (GSS).
*
diff --git a/tests/threadsafety b/tests/threadsafety
index 5ffe183..a85df9a 100755
--- a/tests/threadsafety
+++ b/tests/threadsafety
@@ -1,6 +1,6 @@
#!/bin/sh
-# Copyright (C) 2004-2013 Simon Josefsson
+# Copyright (C) 2004-2014 Simon Josefsson
#
# This file is free software; you can redistribute it and/or modify it
# under the terms of the GNU General Public License as published by
hooks/post-receive
--
GNU gss
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [SCM] GNU gss branch, master, updated. gss-1-0-2-42-gf057c1b,
Simon Josefsson <=