[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[7919] gnulib update
|
From: |
gavinsmith0123 |
|
Subject: |
[7919] gnulib update |
|
Date: |
Mon, 10 Jul 2017 14:35:37 -0400 (EDT) |
Revision: 7919
http://svn.sv.gnu.org/viewvc/?view=rev&root=texinfo&revision=7919
Author: gavin
Date: 2017-07-10 14:35:37 -0400 (Mon, 10 Jul 2017)
Log Message:
-----------
gnulib update
Modified Paths:
--------------
trunk/gnulib/lib/Makefile.am
trunk/gnulib/lib/error.c
trunk/gnulib/lib/float.in.h
trunk/gnulib/lib/getopt-pfx-core.h
trunk/gnulib/lib/getopt-pfx-ext.h
trunk/gnulib/lib/gettext.h
trunk/gnulib/lib/intprops.h
trunk/gnulib/lib/localcharset.c
trunk/gnulib/lib/mbrtowc.c
trunk/gnulib/lib/sys_types.in.h
trunk/gnulib/lib/vasnprintf.c
trunk/gnulib/lib/xalloc-oversized.h
trunk/gnulib/m4/argz.m4
trunk/gnulib/m4/float_h.m4
trunk/gnulib/m4/iconv.m4
trunk/gnulib/m4/printf.m4
trunk/gnulib/m4/strcasestr.m4
trunk/gnulib/m4/strstr.m4
trunk/gnulib/m4/sys_types_h.m4
trunk/tp/Texinfo/Convert/XSParagraph/lib/Makefile.am
trunk/tp/Texinfo/Convert/XSParagraph/lib/float.in.h
trunk/tp/Texinfo/Convert/XSParagraph/lib/sys_types.in.h
trunk/tp/Texinfo/Convert/XSParagraph/lib/vasnprintf.c
trunk/tp/Texinfo/Convert/XSParagraph/m4/float_h.m4
trunk/tp/Texinfo/Convert/XSParagraph/m4/getdelim.m4
trunk/tp/Texinfo/Convert/XSParagraph/m4/getline.m4
trunk/tp/Texinfo/Convert/XSParagraph/m4/printf.m4
trunk/tp/Texinfo/Convert/XSParagraph/m4/sys_types_h.m4
Modified: trunk/gnulib/lib/Makefile.am
===================================================================
--- trunk/gnulib/lib/Makefile.am 2017-07-10 17:59:21 UTC (rev 7918)
+++ trunk/gnulib/lib/Makefile.am 2017-07-10 18:35:37 UTC (rev 7919)
@@ -1387,6 +1387,7 @@
-e 's|@''PRAGMA_COLUMNS''@|@PRAGMA_COLUMNS@|g' \
-e 's|@''NEXT_SYS_TYPES_H''@|$(NEXT_SYS_TYPES_H)|g' \
-e 's|@''WINDOWS_64_BIT_OFF_T''@|$(WINDOWS_64_BIT_OFF_T)|g' \
+ -e 's|@''WINDOWS_STAT_INODES''@|$(WINDOWS_STAT_INODES)|g' \
< $(srcdir)/sys_types.in.h; \
} > address@hidden && \
mv address@hidden $@
Modified: trunk/gnulib/lib/error.c
===================================================================
--- trunk/gnulib/lib/error.c 2017-07-10 17:59:21 UTC (rev 7918)
+++ trunk/gnulib/lib/error.c 2017-07-10 18:35:37 UTC (rev 7919)
@@ -272,7 +272,6 @@
else
#endif
vfprintf (stderr, message, args);
- va_end (args);
++error_message_count;
if (errnum)
@@ -322,6 +321,7 @@
va_start (args, message);
error_tail (status, errnum, message, args);
+ va_end (args);
#ifdef _LIBC
_IO_funlockfile (stderr);
@@ -392,6 +392,7 @@
va_start (args, message);
error_tail (status, errnum, message, args);
+ va_end (args);
#ifdef _LIBC
_IO_funlockfile (stderr);
Modified: trunk/gnulib/lib/float.in.h
===================================================================
--- trunk/gnulib/lib/float.in.h 2017-07-10 17:59:21 UTC (rev 7918)
+++ trunk/gnulib/lib/float.in.h 2017-07-10 18:35:37 UTC (rev 7919)
@@ -63,7 +63,7 @@
/* On FreeBSD/x86 6.4, the 'long double' type really has only 53 bits of
precision in the compiler but 64 bits of precision at runtime. See
<http://lists.gnu.org/archive/html/bug-gnulib/2008-07/msg00063.html>. */
-#if defined __i386__ && defined __FreeBSD__
+#if defined __i386__ && (defined __FreeBSD__ || defined __DragonFly__)
/* Number of mantissa units, in base FLT_RADIX. */
# undef LDBL_MANT_DIG
# define LDBL_MANT_DIG 64
Modified: trunk/gnulib/lib/getopt-pfx-core.h
===================================================================
--- trunk/gnulib/lib/getopt-pfx-core.h 2017-07-10 17:59:21 UTC (rev 7918)
+++ trunk/gnulib/lib/getopt-pfx-core.h 2017-07-10 18:35:37 UTC (rev 7919)
@@ -47,6 +47,11 @@
# define opterr __GETOPT_ID (opterr)
# define optind __GETOPT_ID (optind)
# define optopt __GETOPT_ID (optopt)
+
+/* The system's getopt.h may have already included getopt-core.h to
+ declare the unprefixed identifiers. Undef _GETOPT_CORE_H so that
+ getopt-core.h declares them with prefixes. */
+# undef _GETOPT_CORE_H
#endif
#include <getopt-core.h>
Modified: trunk/gnulib/lib/getopt-pfx-ext.h
===================================================================
--- trunk/gnulib/lib/getopt-pfx-ext.h 2017-07-10 17:59:21 UTC (rev 7918)
+++ trunk/gnulib/lib/getopt-pfx-ext.h 2017-07-10 18:35:37 UTC (rev 7919)
@@ -45,6 +45,11 @@
# define getopt_long_only __GETOPT_ID (getopt_long_only)
# define option __GETOPT_ID (option)
# define _getopt_internal __GETOPT_ID (getopt_internal)
+
+/* The system's getopt.h may have already included getopt-ext.h to
+ declare the unprefixed identifiers. Undef _GETOPT_EXT_H so that
+ getopt-ext.h declares them with prefixes. */
+# undef _GETOPT_EXT_H
#endif
/* Standalone applications get correct prototypes for getopt_long and
Modified: trunk/gnulib/lib/gettext.h
===================================================================
--- trunk/gnulib/lib/gettext.h 2017-07-10 17:59:21 UTC (rev 7918)
+++ trunk/gnulib/lib/gettext.h 2017-07-10 18:35:37 UTC (rev 7919)
@@ -185,7 +185,8 @@
#include <string.h>
#if (((__GNUC__ >= 3 || __GNUG__ >= 2) && !defined __STRICT_ANSI__) \
- /* || __STDC_VERSION__ >= 199901L */ )
+ /* || __STDC_VERSION__ == 199901L
+ || (__STDC_VERSION__ >= 201112L && !defined __STDC_NO_VLA__) */ )
# define _LIBGETTEXT_HAVE_VARIABLE_SIZE_ARRAYS 1
#else
# define _LIBGETTEXT_HAVE_VARIABLE_SIZE_ARRAYS 0
Modified: trunk/gnulib/lib/intprops.h
===================================================================
--- trunk/gnulib/lib/intprops.h 2017-07-10 17:59:21 UTC (rev 7918)
+++ trunk/gnulib/lib/intprops.h 2017-07-10 18:35:37 UTC (rev 7919)
@@ -219,7 +219,11 @@
: (max) >> (b) < (a))
/* True if __builtin_add_overflow (A, B, P) works when P is non-null. */
-#define _GL_HAS_BUILTIN_OVERFLOW (5 <= __GNUC__)
+#if 5 <= __GNUC__ && !defined __ICC
+# define _GL_HAS_BUILTIN_OVERFLOW 1
+#else
+# define _GL_HAS_BUILTIN_OVERFLOW 0
+#endif
/* True if __builtin_add_overflow_p (A, B, C) works. */
#define _GL_HAS_BUILTIN_OVERFLOW_P (7 <= __GNUC__)
Modified: trunk/gnulib/lib/localcharset.c
===================================================================
--- trunk/gnulib/lib/localcharset.c 2017-07-10 17:59:21 UTC (rev 7918)
+++ trunk/gnulib/lib/localcharset.c 2017-07-10 18:35:37 UTC (rev 7919)
@@ -75,6 +75,7 @@
# include "relocatable.h"
#else
# define relocate(pathname) (pathname)
+# define relocate2(pathname,allocatedp) (*(allocatedp) = NULL, (pathname))
#endif
/* Get LIBDIR. */
@@ -129,6 +130,7 @@
if (cp == NULL)
{
#if !(defined DARWIN7 || defined VMS || defined WINDOWS_NATIVE || defined
__CYGWIN__ || defined OS2)
+ char *malloc_dir = NULL;
const char *dir;
const char *base = "charset.alias";
char *file_name;
@@ -137,7 +139,7 @@
necessary for running the testsuite before "make install". */
dir = getenv ("CHARSETALIASDIR");
if (dir == NULL || dir[0] == '\0')
- dir = relocate (LIBDIR);
+ dir = relocate2 (LIBDIR, &malloc_dir);
/* Concatenate dir and base into freshly allocated file_name. */
{
@@ -154,6 +156,8 @@
}
}
+ free (malloc_dir);
+
if (file_name == NULL)
/* Out of memory. Treat the file as empty. */
cp = "";
Modified: trunk/gnulib/lib/mbrtowc.c
===================================================================
--- trunk/gnulib/lib/mbrtowc.c 2017-07-10 17:59:21 UTC (rev 7918)
+++ trunk/gnulib/lib/mbrtowc.c 2017-07-10 18:35:37 UTC (rev 7919)
@@ -35,6 +35,13 @@
# include "streq.h"
# include "verify.h"
+#ifndef FALLTHROUGH
+# if __GNUC__ < 7
+# define FALLTHROUGH ((void) 0)
+# else
+# define FALLTHROUGH __attribute__ ((__fallthrough__))
+# endif
+#endif
verify (sizeof (mbstate_t) >= 4);
@@ -74,10 +81,10 @@
break;
case 3:
buf[2] = pstate[3];
- /*FALLTHROUGH*/
+ FALLTHROUGH;
case 2:
buf[1] = pstate[2];
- /*FALLTHROUGH*/
+ FALLTHROUGH;
case 1:
buf[0] = pstate[1];
p = buf;
Modified: trunk/gnulib/lib/sys_types.in.h
===================================================================
--- trunk/gnulib/lib/sys_types.in.h 2017-07-10 17:59:21 UTC (rev 7918)
+++ trunk/gnulib/lib/sys_types.in.h 2017-07-10 18:35:37 UTC (rev 7919)
@@ -42,6 +42,48 @@
# define _GL_WINDOWS_64_BIT_OFF_T 1
#endif
+/* Override dev_t and ino_t if distinguishable inodes support is requested
+ on native Windows. */
+#if @WINDOWS_STAT_INODES@
+
+# if @WINDOWS_STAT_INODES@ == 2
+/* Experimental, not useful in Windows 10. */
+
+/* Define dev_t to a 64-bit type. */
+# if !defined GNULIB_defined_dev_t
+typedef unsigned long long int rpl_dev_t;
+# undef dev_t
+# define dev_t rpl_dev_t
+# define GNULIB_defined_dev_t 1
+# endif
+
+/* Define ino_t to a 128-bit type. */
+# if !defined GNULIB_defined_ino_t
+/* MSVC does not have a 128-bit integer type.
+ GCC has a 128-bit integer type __int128, but only on 64-bit targets. */
+typedef struct { unsigned long long int _gl_ino[2]; } rpl_ino_t;
+# undef ino_t
+# define ino_t rpl_ino_t
+# define GNULIB_defined_ino_t 1
+# endif
+
+# else /* @WINDOWS_STAT_INODES@ == 1 */
+
+/* Define ino_t to a 64-bit type. */
+# if !defined GNULIB_defined_ino_t
+typedef unsigned long long int rpl_ino_t;
+# undef ino_t
+# define ino_t rpl_ino_t
+# define GNULIB_defined_ino_t 1
+# endif
+
+# endif
+
+/* Indicator, for gnulib internal purposes. */
+# define _GL_WINDOWS_STAT_INODES @WINDOWS_STAT_INODES@
+
+#endif
+
/* MSVC 9 defines size_t in <stddef.h>, not in <sys/types.h>. */
/* But avoid namespace pollution on glibc systems. */
#if ((defined _WIN32 || defined __WIN32__) && ! defined __CYGWIN__) \
Modified: trunk/gnulib/lib/vasnprintf.c
===================================================================
--- trunk/gnulib/lib/vasnprintf.c 2017-07-10 17:59:21 UTC (rev 7918)
+++ trunk/gnulib/lib/vasnprintf.c 2017-07-10 18:35:37 UTC (rev 7919)
@@ -118,6 +118,14 @@
# include "fpucw.h"
#endif
+#ifndef FALLTHROUGH
+# if __GNUC__ < 7
+# define FALLTHROUGH ((void) 0)
+# else
+# define FALLTHROUGH __attribute__ ((__fallthrough__))
+# endif
+#endif
+
/* Default parameters. */
#ifndef VASNPRINTF
# if WIDE_CHAR_VERSION
@@ -4837,7 +4845,7 @@
*fbp++ = 'l';
# endif
#endif
- /*FALLTHROUGH*/
+ FALLTHROUGH;
case TYPE_LONGINT:
case TYPE_ULONGINT:
#if HAVE_WINT_T
@@ -4861,7 +4869,10 @@
#endif
*fbp = dp->conversion;
#if USE_SNPRINTF
-# if !(((__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 3)) &&
!defined __UCLIBC__) || ((defined _WIN32 || defined __WIN32__) && ! defined
__CYGWIN__))
+# if ! (((__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 3)) \
+ && !defined __UCLIBC__) \
+ || (defined __APPLE__ && defined __MACH__) \
+ || ((defined _WIN32 || defined __WIN32__) && ! defined __CYGWIN__))
fbp[1] = '%';
fbp[2] = 'n';
fbp[3] = '\0';
@@ -4875,6 +4886,13 @@
in format strings in writable memory may crash the program
(if compiled with _FORTIFY_SOURCE=2), so we should avoid it
in this situation. */
+ /* On Mac OS X 10.3 or newer, we know that snprintf's return
+ value conforms to ISO C 99: the tests gl_SNPRINTF_RETVAL_C99
+ and gl_SNPRINTF_TRUNCATION_C99 pass.
+ Therefore we can avoid using %n in this situation.
+ On Mac OS X 10.13 or newer, the use of %n in format strings
+ in writable memory by default crashes the program, so we
+ should avoid it in this situation. */
/* On native Windows systems (such as mingw), we can avoid
using
%n because:
- Although the gl_SNPRINTF_TRUNCATION_C99 test fails,
Modified: trunk/gnulib/lib/xalloc-oversized.h
===================================================================
--- trunk/gnulib/lib/xalloc-oversized.h 2017-07-10 17:59:21 UTC (rev 7918)
+++ trunk/gnulib/lib/xalloc-oversized.h 2017-07-10 18:35:37 UTC (rev 7919)
@@ -44,7 +44,7 @@
#if 7 <= __GNUC__
# define xalloc_oversized(n, s) \
__builtin_mul_overflow_p (n, s, (__xalloc_count_type) 1)
-#elif 5 <= __GNUC__ && !__STRICT_ANSI__
+#elif 5 <= __GNUC__ && !defined __ICC && !__STRICT_ANSI__
# define xalloc_oversized(n, s) \
(__builtin_constant_p (n) && __builtin_constant_p (s) \
? __xalloc_oversized (n, s) \
Modified: trunk/gnulib/m4/argz.m4
===================================================================
--- trunk/gnulib/m4/argz.m4 2017-07-10 17:59:21 UTC (rev 7918)
+++ trunk/gnulib/m4/argz.m4 2017-07-10 18:35:37 UTC (rev 7919)
@@ -7,12 +7,13 @@
# unlimited permission to copy and/or distribute it, with or without
# modifications, as long as this notice is preserved.
-# serial 11 argz.m4
+# serial 12 argz.m4
AC_DEFUN([gl_FUNC_ARGZ],
[gl_PREREQ_ARGZ
AC_REQUIRE([AC_C_RESTRICT])
+AC_REQUIRE([AC_CANONICAL_HOST]) dnl for cross-compiles
AC_CHECK_HEADERS([argz.h], [], [], [AC_INCLUDES_DEFAULT])
Modified: trunk/gnulib/m4/float_h.m4
===================================================================
--- trunk/gnulib/m4/float_h.m4 2017-07-10 17:59:21 UTC (rev 7918)
+++ trunk/gnulib/m4/float_h.m4 2017-07-10 18:35:37 UTC (rev 7919)
@@ -1,4 +1,4 @@
-# float_h.m4 serial 9
+# float_h.m4 serial 10
dnl Copyright (C) 2007, 2009-2017 Free Software Foundation, Inc.
dnl This file is free software; the Free Software Foundation
dnl gives unlimited permission to copy and/or distribute it,
@@ -14,7 +14,7 @@
aix* | beos* | openbsd* | mirbsd* | irix*)
FLOAT_H=float.h
;;
- freebsd*)
+ freebsd* | dragonfly*)
case "$host_cpu" in
changequote(,)dnl
i[34567]86 )
@@ -42,7 +42,7 @@
;;
esac
case "$host_os" in
- aix* | freebsd* | linux*)
+ aix* | freebsd* | dragonfly* | linux*)
if test -n "$FLOAT_H"; then
REPLACE_FLOAT_LDBL=1
fi
Modified: trunk/gnulib/m4/iconv.m4
===================================================================
--- trunk/gnulib/m4/iconv.m4 2017-07-10 17:59:21 UTC (rev 7918)
+++ trunk/gnulib/m4/iconv.m4 2017-07-10 18:35:37 UTC (rev 7919)
@@ -1,5 +1,5 @@
-# iconv.m4 serial 20
-dnl Copyright (C) 2000-2002, 2007-2014, 2016 Free Software Foundation, Inc.
+# iconv.m4 serial 21
+dnl Copyright (C) 2000-2002, 2007-2014, 2016-2017 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.
@@ -167,15 +167,27 @@
#endif
/* Test against HP-UX 11.11 bug: No converter from EUC-JP to UTF-8 is
provided. */
- if (/* Try standardized names. */
- iconv_open ("UTF-8", "EUC-JP") == (iconv_t)(-1)
- /* Try IRIX, OSF/1 names. */
- && iconv_open ("UTF-8", "eucJP") == (iconv_t)(-1)
- /* Try AIX names. */
- && iconv_open ("UTF-8", "IBM-eucJP") == (iconv_t)(-1)
- /* Try HP-UX names. */
- && iconv_open ("utf8", "eucJP") == (iconv_t)(-1))
- result |= 16;
+ {
+ /* Try standardized names. */
+ iconv_t cd1 = iconv_open ("UTF-8", "EUC-JP");
+ /* Try IRIX, OSF/1 names. */
+ iconv_t cd2 = iconv_open ("UTF-8", "eucJP");
+ /* Try AIX names. */
+ iconv_t cd3 = iconv_open ("UTF-8", "IBM-eucJP");
+ /* Try HP-UX names. */
+ iconv_t cd4 = iconv_open ("utf8", "eucJP");
+ if (cd1 == (iconv_t)(-1) && cd2 == (iconv_t)(-1)
+ && cd3 == (iconv_t)(-1) && cd4 == (iconv_t)(-1))
+ result |= 16;
+ if (cd1 != (iconv_t)(-1))
+ iconv_close (cd1);
+ if (cd2 != (iconv_t)(-1))
+ iconv_close (cd2);
+ if (cd3 != (iconv_t)(-1))
+ iconv_close (cd3);
+ if (cd4 != (iconv_t)(-1))
+ iconv_close (cd4);
+ }
return result;
]])],
[am_cv_func_iconv_works=yes], ,
Modified: trunk/gnulib/m4/printf.m4
===================================================================
--- trunk/gnulib/m4/printf.m4 2017-07-10 17:59:21 UTC (rev 7918)
+++ trunk/gnulib/m4/printf.m4 2017-07-10 18:35:37 UTC (rev 7919)
@@ -1,4 +1,4 @@
-# printf.m4 serial 53
+# printf.m4 serial 54
dnl Copyright (C) 2003, 2007-2017 Free Software Foundation, Inc.
dnl This file is free software; the Free Software Foundation
dnl gives unlimited permission to copy and/or distribute it,
@@ -588,8 +588,8 @@
darwin[1-6].*) gl_cv_func_printf_directive_f="guessing no";;
darwin*) gl_cv_func_printf_directive_f="guessing yes";;
# Guess yes on Solaris >= 2.10.
- solaris2.[1-9][0-9]*) gl_cv_func_printf_sizes_c99="guessing yes";;
- solaris*) gl_cv_func_printf_sizes_c99="guessing no";;
+ solaris2.[1-9][0-9]*) gl_cv_func_printf_directive_f="guessing yes";;
+ solaris*) gl_cv_func_printf_directive_f="guessing no";;
# If we don't know, assume the worst.
*) gl_cv_func_printf_directive_f="guessing no";;
esac
Modified: trunk/gnulib/m4/strcasestr.m4
===================================================================
--- trunk/gnulib/m4/strcasestr.m4 2017-07-10 17:59:21 UTC (rev 7918)
+++ trunk/gnulib/m4/strcasestr.m4 2017-07-10 18:35:37 UTC (rev 7919)
@@ -1,4 +1,4 @@
-# strcasestr.m4 serial 21
+# strcasestr.m4 serial 22
dnl Copyright (C) 2005, 2007-2017 Free Software Foundation, Inc.
dnl This file is free software; the Free Software Foundation
dnl gives unlimited permission to copy and/or distribute it,
@@ -102,6 +102,9 @@
if (!strcasestr (haystack, needle))
result |= 1;
}
+ /* Free allocated memory, in case some sanitizer is watching. */
+ free (haystack);
+ free (needle);
return result;
]])],
[gl_cv_func_strcasestr_linear=yes], [gl_cv_func_strcasestr_linear=no],
Modified: trunk/gnulib/m4/strstr.m4
===================================================================
--- trunk/gnulib/m4/strstr.m4 2017-07-10 17:59:21 UTC (rev 7918)
+++ trunk/gnulib/m4/strstr.m4 2017-07-10 18:35:37 UTC (rev 7919)
@@ -1,4 +1,4 @@
-# strstr.m4 serial 17
+# strstr.m4 serial 18
dnl Copyright (C) 2008-2017 Free Software Foundation, Inc.
dnl This file is free software; the Free Software Foundation
dnl gives unlimited permission to copy and/or distribute it,
@@ -99,6 +99,9 @@
if (!strstr (haystack, needle))
result |= 1;
}
+ /* Free allocated memory, in case some sanitizer is watching. */
+ free (haystack);
+ free (needle);
return result;
]])],
[gl_cv_func_strstr_linear=yes], [gl_cv_func_strstr_linear=no],
Modified: trunk/gnulib/m4/sys_types_h.m4
===================================================================
--- trunk/gnulib/m4/sys_types_h.m4 2017-07-10 17:59:21 UTC (rev 7918)
+++ trunk/gnulib/m4/sys_types_h.m4 2017-07-10 18:35:37 UTC (rev 7919)
@@ -1,4 +1,4 @@
-# sys_types_h.m4 serial 6
+# sys_types_h.m4 serial 8
dnl Copyright (C) 2011-2017 Free Software Foundation, Inc.
dnl This file is free software; the Free Software Foundation
dnl gives unlimited permission to copy and/or distribute it,
@@ -6,6 +6,9 @@
AC_DEFUN_ONCE([gl_SYS_TYPES_H],
[
+ dnl Use sane struct stat types in OpenVMS 8.2 and later.
+ AC_DEFINE([_USE_STD_STAT], 1, [For standard stat data types on VMS.])
+
AC_REQUIRE([gl_SYS_TYPES_H_DEFAULTS])
gl_NEXT_HEADERS([sys/types.h])
@@ -17,6 +20,14 @@
dnl Whether to override the 'off_t' type.
AC_REQUIRE([gl_TYPE_OFF_T])
+
+ dnl Whether to override the 'dev_t' and 'ino_t' types.
+ m4_ifdef([gl_WINDOWS_STAT_INODES], [
+ AC_REQUIRE([gl_WINDOWS_STAT_INODES])
+ ], [
+ WINDOWS_STAT_INODES=0
+ ])
+ AC_SUBST([WINDOWS_STAT_INODES])
])
AC_DEFUN([gl_SYS_TYPES_H_DEFAULTS],
Modified: trunk/tp/Texinfo/Convert/XSParagraph/lib/Makefile.am
===================================================================
--- trunk/tp/Texinfo/Convert/XSParagraph/lib/Makefile.am 2017-07-10
17:59:21 UTC (rev 7918)
+++ trunk/tp/Texinfo/Convert/XSParagraph/lib/Makefile.am 2017-07-10
18:35:37 UTC (rev 7919)
@@ -572,6 +572,7 @@
-e 's|@''PRAGMA_COLUMNS''@|@PRAGMA_COLUMNS@|g' \
-e 's|@''NEXT_SYS_TYPES_H''@|$(NEXT_SYS_TYPES_H)|g' \
-e 's|@''WINDOWS_64_BIT_OFF_T''@|$(WINDOWS_64_BIT_OFF_T)|g' \
+ -e 's|@''WINDOWS_STAT_INODES''@|$(WINDOWS_STAT_INODES)|g' \
< $(srcdir)/sys_types.in.h; \
} > address@hidden && \
mv address@hidden $@
Modified: trunk/tp/Texinfo/Convert/XSParagraph/lib/float.in.h
===================================================================
--- trunk/tp/Texinfo/Convert/XSParagraph/lib/float.in.h 2017-07-10 17:59:21 UTC
(rev 7918)
+++ trunk/tp/Texinfo/Convert/XSParagraph/lib/float.in.h 2017-07-10 18:35:37 UTC
(rev 7919)
@@ -63,7 +63,7 @@
/* On FreeBSD/x86 6.4, the 'long double' type really has only 53 bits of
precision in the compiler but 64 bits of precision at runtime. See
<http://lists.gnu.org/archive/html/bug-gnulib/2008-07/msg00063.html>. */
-#if defined __i386__ && defined __FreeBSD__
+#if defined __i386__ && (defined __FreeBSD__ || defined __DragonFly__)
/* Number of mantissa units, in base FLT_RADIX. */
# undef LDBL_MANT_DIG
# define LDBL_MANT_DIG 64
Modified: trunk/tp/Texinfo/Convert/XSParagraph/lib/sys_types.in.h
===================================================================
--- trunk/tp/Texinfo/Convert/XSParagraph/lib/sys_types.in.h 2017-07-10
17:59:21 UTC (rev 7918)
+++ trunk/tp/Texinfo/Convert/XSParagraph/lib/sys_types.in.h 2017-07-10
18:35:37 UTC (rev 7919)
@@ -42,6 +42,48 @@
# define _GL_WINDOWS_64_BIT_OFF_T 1
#endif
+/* Override dev_t and ino_t if distinguishable inodes support is requested
+ on native Windows. */
+#if @WINDOWS_STAT_INODES@
+
+# if @WINDOWS_STAT_INODES@ == 2
+/* Experimental, not useful in Windows 10. */
+
+/* Define dev_t to a 64-bit type. */
+# if !defined GNULIB_defined_dev_t
+typedef unsigned long long int rpl_dev_t;
+# undef dev_t
+# define dev_t rpl_dev_t
+# define GNULIB_defined_dev_t 1
+# endif
+
+/* Define ino_t to a 128-bit type. */
+# if !defined GNULIB_defined_ino_t
+/* MSVC does not have a 128-bit integer type.
+ GCC has a 128-bit integer type __int128, but only on 64-bit targets. */
+typedef struct { unsigned long long int _gl_ino[2]; } rpl_ino_t;
+# undef ino_t
+# define ino_t rpl_ino_t
+# define GNULIB_defined_ino_t 1
+# endif
+
+# else /* @WINDOWS_STAT_INODES@ == 1 */
+
+/* Define ino_t to a 64-bit type. */
+# if !defined GNULIB_defined_ino_t
+typedef unsigned long long int rpl_ino_t;
+# undef ino_t
+# define ino_t rpl_ino_t
+# define GNULIB_defined_ino_t 1
+# endif
+
+# endif
+
+/* Indicator, for gnulib internal purposes. */
+# define _GL_WINDOWS_STAT_INODES @WINDOWS_STAT_INODES@
+
+#endif
+
/* MSVC 9 defines size_t in <stddef.h>, not in <sys/types.h>. */
/* But avoid namespace pollution on glibc systems. */
#if ((defined _WIN32 || defined __WIN32__) && ! defined __CYGWIN__) \
Modified: trunk/tp/Texinfo/Convert/XSParagraph/lib/vasnprintf.c
===================================================================
--- trunk/tp/Texinfo/Convert/XSParagraph/lib/vasnprintf.c 2017-07-10
17:59:21 UTC (rev 7918)
+++ trunk/tp/Texinfo/Convert/XSParagraph/lib/vasnprintf.c 2017-07-10
18:35:37 UTC (rev 7919)
@@ -118,6 +118,14 @@
# include "fpucw.h"
#endif
+#ifndef FALLTHROUGH
+# if __GNUC__ < 7
+# define FALLTHROUGH ((void) 0)
+# else
+# define FALLTHROUGH __attribute__ ((__fallthrough__))
+# endif
+#endif
+
/* Default parameters. */
#ifndef VASNPRINTF
# if WIDE_CHAR_VERSION
@@ -4837,7 +4845,7 @@
*fbp++ = 'l';
# endif
#endif
- /*FALLTHROUGH*/
+ FALLTHROUGH;
case TYPE_LONGINT:
case TYPE_ULONGINT:
#if HAVE_WINT_T
@@ -4861,7 +4869,10 @@
#endif
*fbp = dp->conversion;
#if USE_SNPRINTF
-# if !(((__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 3)) &&
!defined __UCLIBC__) || ((defined _WIN32 || defined __WIN32__) && ! defined
__CYGWIN__))
+# if ! (((__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 3)) \
+ && !defined __UCLIBC__) \
+ || (defined __APPLE__ && defined __MACH__) \
+ || ((defined _WIN32 || defined __WIN32__) && ! defined __CYGWIN__))
fbp[1] = '%';
fbp[2] = 'n';
fbp[3] = '\0';
@@ -4875,6 +4886,13 @@
in format strings in writable memory may crash the program
(if compiled with _FORTIFY_SOURCE=2), so we should avoid it
in this situation. */
+ /* On Mac OS X 10.3 or newer, we know that snprintf's return
+ value conforms to ISO C 99: the tests gl_SNPRINTF_RETVAL_C99
+ and gl_SNPRINTF_TRUNCATION_C99 pass.
+ Therefore we can avoid using %n in this situation.
+ On Mac OS X 10.13 or newer, the use of %n in format strings
+ in writable memory by default crashes the program, so we
+ should avoid it in this situation. */
/* On native Windows systems (such as mingw), we can avoid
using
%n because:
- Although the gl_SNPRINTF_TRUNCATION_C99 test fails,
Modified: trunk/tp/Texinfo/Convert/XSParagraph/m4/float_h.m4
===================================================================
--- trunk/tp/Texinfo/Convert/XSParagraph/m4/float_h.m4 2017-07-10 17:59:21 UTC
(rev 7918)
+++ trunk/tp/Texinfo/Convert/XSParagraph/m4/float_h.m4 2017-07-10 18:35:37 UTC
(rev 7919)
@@ -1,4 +1,4 @@
-# float_h.m4 serial 9
+# float_h.m4 serial 10
dnl Copyright (C) 2007, 2009-2017 Free Software Foundation, Inc.
dnl This file is free software; the Free Software Foundation
dnl gives unlimited permission to copy and/or distribute it,
@@ -14,7 +14,7 @@
aix* | beos* | openbsd* | mirbsd* | irix*)
FLOAT_H=float.h
;;
- freebsd*)
+ freebsd* | dragonfly*)
case "$host_cpu" in
changequote(,)dnl
i[34567]86 )
@@ -42,7 +42,7 @@
;;
esac
case "$host_os" in
- aix* | freebsd* | linux*)
+ aix* | freebsd* | dragonfly* | linux*)
if test -n "$FLOAT_H"; then
REPLACE_FLOAT_LDBL=1
fi
Modified: trunk/tp/Texinfo/Convert/XSParagraph/m4/getdelim.m4
===================================================================
--- trunk/tp/Texinfo/Convert/XSParagraph/m4/getdelim.m4 2017-07-10 17:59:21 UTC
(rev 7918)
+++ trunk/tp/Texinfo/Convert/XSParagraph/m4/getdelim.m4 2017-07-10 18:35:37 UTC
(rev 7919)
@@ -1,4 +1,4 @@
-# getdelim.m4 serial 11
+# getdelim.m4 serial 12
dnl Copyright (C) 2005-2007, 2009-2017 Free Software Foundation, Inc.
dnl
@@ -39,7 +39,7 @@
size_t siz = 0;
int len = getdelim (&line, &siz, '\n', in);
if (!(len == 4 && line && strcmp (line, "foo\n") == 0))
- return 2;
+ { free (line); fclose (in); return 2; }
}
{
/* Test result for a NULL buffer and a non-zero size.
@@ -47,7 +47,7 @@
char *line = NULL;
size_t siz = (size_t)(~0) / 4;
if (getdelim (&line, &siz, '\n', in) == -1)
- return 3;
+ { fclose (in); return 3; }
free (line);
}
fclose (in);
Modified: trunk/tp/Texinfo/Convert/XSParagraph/m4/getline.m4
===================================================================
--- trunk/tp/Texinfo/Convert/XSParagraph/m4/getline.m4 2017-07-10 17:59:21 UTC
(rev 7918)
+++ trunk/tp/Texinfo/Convert/XSParagraph/m4/getline.m4 2017-07-10 18:35:37 UTC
(rev 7919)
@@ -1,4 +1,4 @@
-# getline.m4 serial 27
+# getline.m4 serial 28
dnl Copyright (C) 1998-2003, 2005-2007, 2009-2017 Free Software Foundation,
dnl Inc.
@@ -46,7 +46,7 @@
size_t siz = 0;
int len = getline (&line, &siz, in);
if (!(len == 4 && line && strcmp (line, "foo\n") == 0))
- return 2;
+ { free (line); fclose (in); return 2; }
free (line);
}
{
@@ -55,7 +55,7 @@
char *line = NULL;
size_t siz = (size_t)(~0) / 4;
if (getline (&line, &siz, in) == -1)
- return 3;
+ { fclose (in); return 3; }
free (line);
}
fclose (in);
Modified: trunk/tp/Texinfo/Convert/XSParagraph/m4/printf.m4
===================================================================
--- trunk/tp/Texinfo/Convert/XSParagraph/m4/printf.m4 2017-07-10 17:59:21 UTC
(rev 7918)
+++ trunk/tp/Texinfo/Convert/XSParagraph/m4/printf.m4 2017-07-10 18:35:37 UTC
(rev 7919)
@@ -1,4 +1,4 @@
-# printf.m4 serial 53
+# printf.m4 serial 54
dnl Copyright (C) 2003, 2007-2017 Free Software Foundation, Inc.
dnl This file is free software; the Free Software Foundation
dnl gives unlimited permission to copy and/or distribute it,
@@ -588,8 +588,8 @@
darwin[1-6].*) gl_cv_func_printf_directive_f="guessing no";;
darwin*) gl_cv_func_printf_directive_f="guessing yes";;
# Guess yes on Solaris >= 2.10.
- solaris2.[1-9][0-9]*) gl_cv_func_printf_sizes_c99="guessing yes";;
- solaris*) gl_cv_func_printf_sizes_c99="guessing no";;
+ solaris2.[1-9][0-9]*) gl_cv_func_printf_directive_f="guessing yes";;
+ solaris*) gl_cv_func_printf_directive_f="guessing no";;
# If we don't know, assume the worst.
*) gl_cv_func_printf_directive_f="guessing no";;
esac
Modified: trunk/tp/Texinfo/Convert/XSParagraph/m4/sys_types_h.m4
===================================================================
--- trunk/tp/Texinfo/Convert/XSParagraph/m4/sys_types_h.m4 2017-07-10
17:59:21 UTC (rev 7918)
+++ trunk/tp/Texinfo/Convert/XSParagraph/m4/sys_types_h.m4 2017-07-10
18:35:37 UTC (rev 7919)
@@ -1,4 +1,4 @@
-# sys_types_h.m4 serial 6
+# sys_types_h.m4 serial 8
dnl Copyright (C) 2011-2017 Free Software Foundation, Inc.
dnl This file is free software; the Free Software Foundation
dnl gives unlimited permission to copy and/or distribute it,
@@ -6,6 +6,9 @@
AC_DEFUN_ONCE([gl_SYS_TYPES_H],
[
+ dnl Use sane struct stat types in OpenVMS 8.2 and later.
+ AC_DEFINE([_USE_STD_STAT], 1, [For standard stat data types on VMS.])
+
AC_REQUIRE([gl_SYS_TYPES_H_DEFAULTS])
gl_NEXT_HEADERS([sys/types.h])
@@ -17,6 +20,14 @@
dnl Whether to override the 'off_t' type.
AC_REQUIRE([gl_TYPE_OFF_T])
+
+ dnl Whether to override the 'dev_t' and 'ino_t' types.
+ m4_ifdef([gl_WINDOWS_STAT_INODES], [
+ AC_REQUIRE([gl_WINDOWS_STAT_INODES])
+ ], [
+ WINDOWS_STAT_INODES=0
+ ])
+ AC_SUBST([WINDOWS_STAT_INODES])
])
AC_DEFUN([gl_SYS_TYPES_H_DEFAULTS],
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [7919] gnulib update,
gavinsmith0123 <=