diff -Nru mmv-2.5/INSTALL mmv-2.5.1/INSTALL --- mmv-2.5/INSTALL 2023-07-20 19:40:23.000000000 +0000 +++ mmv-2.5.1/INSTALL 2023-08-08 11:02:40.000000000 +0000 @@ -1,8 +1,8 @@ Installation Instructions ************************* - Copyright © 1994–1996, 1999–2002, 2004–2017, 2020–2023 Free Software -Foundation, Inc. + Copyright (C) 1994-1996, 1999-2002, 2004-2017, 2020-2021 Free +Software Foundation, Inc. Copying and distribution of this file, with or without modification, are permitted in any medium without royalty provided the copyright @@ -12,94 +12,94 @@ Basic Installation ================== - Briefly, the shell command ‘./configure && make && make install’ + Briefly, the shell command './configure && make && make install' should configure, build, and install this package. The following -more-detailed instructions are generic; see the ‘README’ file for +more-detailed instructions are generic; see the 'README' file for instructions specific to this package. Some packages provide this -‘INSTALL’ file but do not implement all of the features documented +'INSTALL' file but do not implement all of the features documented below. The lack of an optional feature in a given package is not necessarily a bug. More recommendations for GNU packages can be found in *note Makefile Conventions: (standards)Makefile Conventions. - The ‘configure’ shell script attempts to guess correct values for + The 'configure' shell script attempts to guess correct values for various system-dependent variables used during compilation. It uses -those values to create a ‘Makefile’ in each directory of the package. -It may also create one or more ‘.h’ files containing system-dependent -definitions. Finally, it creates a shell script ‘config.status’ that +those values to create a 'Makefile' in each directory of the package. +It may also create one or more '.h' files containing system-dependent +definitions. Finally, it creates a shell script 'config.status' that you can run in the future to recreate the current configuration, and a -file ‘config.log’ containing compiler output (useful mainly for -debugging ‘configure’). +file 'config.log' containing compiler output (useful mainly for +debugging 'configure'). - It can also use an optional file (typically called ‘config.cache’ and -enabled with ‘--cache-file=config.cache’ or simply ‘-C’) that saves the + It can also use an optional file (typically called 'config.cache' and +enabled with '--cache-file=config.cache' or simply '-C') that saves the results of its tests to speed up reconfiguring. Caching is disabled by default to prevent problems with accidental use of stale cache files. If you need to do unusual things to compile the package, please try -to figure out how ‘configure’ could check whether to do them, and mail -diffs or instructions to the address given in the ‘README’ so they can +to figure out how 'configure' could check whether to do them, and mail +diffs or instructions to the address given in the 'README' so they can be considered for the next release. If you are using the cache, and at -some point ‘config.cache’ contains results you don’t want to keep, you +some point 'config.cache' contains results you don't want to keep, you may remove or edit it. - The file ‘configure.ac’ (or ‘configure.in’) is used to create -‘configure’ by a program called ‘autoconf’. You need ‘configure.ac’ if -you want to change it or regenerate ‘configure’ using a newer version of -‘autoconf’. + The file 'configure.ac' (or 'configure.in') is used to create +'configure' by a program called 'autoconf'. You need 'configure.ac' if +you want to change it or regenerate 'configure' using a newer version of +'autoconf'. The simplest way to compile this package is: - 1. ‘cd’ to the directory containing the package’s source code and type - ‘./configure’ to configure the package for your system. + 1. 'cd' to the directory containing the package's source code and type + './configure' to configure the package for your system. - Running ‘configure’ might take a while. While running, it prints + Running 'configure' might take a while. While running, it prints some messages telling which features it is checking for. - 2. Type ‘make’ to compile the package. + 2. Type 'make' to compile the package. - 3. Optionally, type ‘make check’ to run any self-tests that come with + 3. Optionally, type 'make check' to run any self-tests that come with the package, generally using the just-built uninstalled binaries. - 4. Type ‘make install’ to install the programs and any data files and + 4. Type 'make install' to install the programs and any data files and documentation. When installing into a prefix owned by root, it is recommended that the package be configured and built as a regular - user, and only the ‘make install’ phase executed with root + user, and only the 'make install' phase executed with root privileges. - 5. Optionally, type ‘make installcheck’ to repeat any self-tests, but + 5. Optionally, type 'make installcheck' to repeat any self-tests, but this time using the binaries in their final installed location. This target does not install anything. Running this target as a - regular user, particularly if the prior ‘make install’ required + regular user, particularly if the prior 'make install' required root privileges, verifies that the installation completed correctly. 6. You can remove the program binaries and object files from the - source code directory by typing ‘make clean’. To also remove the - files that ‘configure’ created (so you can compile the package for - a different kind of computer), type ‘make distclean’. There is - also a ‘make maintainer-clean’ target, but that is intended mainly - for the package’s developers. If you use it, you may have to get + source code directory by typing 'make clean'. To also remove the + files that 'configure' created (so you can compile the package for + a different kind of computer), type 'make distclean'. There is + also a 'make maintainer-clean' target, but that is intended mainly + for the package's developers. If you use it, you may have to get all sorts of other programs in order to regenerate files that came with the distribution. - 7. Often, you can also type ‘make uninstall’ to remove the installed + 7. Often, you can also type 'make uninstall' to remove the installed files again. In practice, not all packages have tested that uninstallation works correctly, even though it is required by the GNU Coding Standards. - 8. Some packages, particularly those that use Automake, provide ‘make - distcheck’, which can by used by developers to test that all other - targets like ‘make install’ and ‘make uninstall’ work correctly. + 8. Some packages, particularly those that use Automake, provide 'make + distcheck', which can by used by developers to test that all other + targets like 'make install' and 'make uninstall' work correctly. This target is generally not run by end users. Compilers and Options ===================== Some systems require unusual options for compilation or linking that -the ‘configure’ script does not know about. Run ‘./configure --help’ +the 'configure' script does not know about. Run './configure --help' for details on some of the pertinent environment variables. - You can give ‘configure’ initial values for configuration parameters + You can give 'configure' initial values for configuration parameters by setting variables in the command line or in the environment. Here is an example: @@ -112,21 +112,21 @@ You can compile the package for more than one kind of computer at the same time, by placing the object files for each architecture in their -own directory. To do this, you can use GNU ‘make’. ‘cd’ to the +own directory. To do this, you can use GNU 'make'. 'cd' to the directory where you want the object files and executables to go and run -the ‘configure’ script. ‘configure’ automatically checks for the source -code in the directory that ‘configure’ is in and in ‘..’. This is known -as a “VPATH” build. +the 'configure' script. 'configure' automatically checks for the source +code in the directory that 'configure' is in and in '..'. This is known +as a "VPATH" build. - With a non-GNU ‘make’, it is safer to compile the package for one + With a non-GNU 'make', it is safer to compile the package for one architecture at a time in the source code directory. After you have -installed the package for one architecture, use ‘make distclean’ before +installed the package for one architecture, use 'make distclean' before reconfiguring for another architecture. On MacOS X 10.5 and later systems, you can create libraries and -executables that work on multiple system types—known as “fat” or -“universal” binaries—by specifying multiple ‘-arch’ options to the -compiler but only a single ‘-arch’ option to the preprocessor. Like +executables that work on multiple system types--known as "fat" or +"universal" binaries--by specifying multiple '-arch' options to the +compiler but only a single '-arch' option to the preprocessor. Like this: ./configure CC="gcc -arch i386 -arch x86_64 -arch ppc -arch ppc64" \ @@ -135,43 +135,43 @@ This is not guaranteed to produce working output in all cases, you may have to build one architecture at a time and combine the results -using the ‘lipo’ tool if you have problems. +using the 'lipo' tool if you have problems. Installation Names ================== - By default, ‘make install’ installs the package’s commands under -‘/usr/local/bin’, include files under ‘/usr/local/include’, etc. You -can specify an installation prefix other than ‘/usr/local’ by giving -‘configure’ the option ‘--prefix=PREFIX’, where PREFIX must be an + By default, 'make install' installs the package's commands under +'/usr/local/bin', include files under '/usr/local/include', etc. You +can specify an installation prefix other than '/usr/local' by giving +'configure' the option '--prefix=PREFIX', where PREFIX must be an absolute file name. You can specify separate installation prefixes for architecture-specific files and architecture-independent files. If you -pass the option ‘--exec-prefix=PREFIX’ to ‘configure’, the package uses +pass the option '--exec-prefix=PREFIX' to 'configure', the package uses PREFIX as the prefix for installing programs and libraries. Documentation and other data files still use the regular prefix. In addition, if you use an unusual directory layout you can give -options like ‘--bindir=DIR’ to specify different values for particular -kinds of files. Run ‘configure --help’ for a list of the directories +options like '--bindir=DIR' to specify different values for particular +kinds of files. Run 'configure --help' for a list of the directories you can set and what kinds of files go in them. In general, the default -for these options is expressed in terms of ‘${prefix}’, so that -specifying just ‘--prefix’ will affect all of the other directory +for these options is expressed in terms of '${prefix}', so that +specifying just '--prefix' will affect all of the other directory specifications that were not explicitly provided. The most portable way to affect installation locations is to pass the -correct locations to ‘configure’; however, many packages provide one or +correct locations to 'configure'; however, many packages provide one or both of the following shortcuts of passing variable assignments to the -‘make install’ command line to change installation locations without +'make install' command line to change installation locations without having to reconfigure or recompile. The first method involves providing an override variable for each -affected directory. For example, ‘make install -prefix=/alternate/directory’ will choose an alternate location for all +affected directory. For example, 'make install +prefix=/alternate/directory' will choose an alternate location for all directory configuration variables that were expressed in terms of -‘${prefix}’. Any directories that were specified during ‘configure’, -but not in terms of ‘${prefix}’, must each be overridden at install time +'${prefix}'. Any directories that were specified during 'configure', +but not in terms of '${prefix}', must each be overridden at install time for the entire installation to be relocated. The approach of makefile variable overrides for each directory variable is required by the GNU Coding Standards, and ideally causes no recompilation. However, some @@ -179,40 +179,40 @@ that end up requiring recompilation when using this method, particularly noticeable in packages that use GNU Libtool. - The second method involves providing the ‘DESTDIR’ variable. For -example, ‘make install DESTDIR=/alternate/directory’ will prepend -‘/alternate/directory’ before all installation names. The approach of -‘DESTDIR’ overrides is not required by the GNU Coding Standards, and + The second method involves providing the 'DESTDIR' variable. For +example, 'make install DESTDIR=/alternate/directory' will prepend +'/alternate/directory' before all installation names. The approach of +'DESTDIR' overrides is not required by the GNU Coding Standards, and does not work on platforms that have drive letters. On the other hand, it does better at avoiding recompilation issues, and works well even -when some directory options were not specified in terms of ‘${prefix}’ -at ‘configure’ time. +when some directory options were not specified in terms of '${prefix}' +at 'configure' time. Optional Features ================= If the package supports it, you can cause programs to be installed -with an extra prefix or suffix on their names by giving ‘configure’ the -option ‘--program-prefix=PREFIX’ or ‘--program-suffix=SUFFIX’. +with an extra prefix or suffix on their names by giving 'configure' the +option '--program-prefix=PREFIX' or '--program-suffix=SUFFIX'. - Some packages pay attention to ‘--enable-FEATURE’ options to -‘configure’, where FEATURE indicates an optional part of the package. -They may also pay attention to ‘--with-PACKAGE’ options, where PACKAGE -is something like ‘gnu-as’ or ‘x’ (for the X Window System). The -‘README’ should mention any ‘--enable-’ and ‘--with-’ options that the + Some packages pay attention to '--enable-FEATURE' options to +'configure', where FEATURE indicates an optional part of the package. +They may also pay attention to '--with-PACKAGE' options, where PACKAGE +is something like 'gnu-as' or 'x' (for the X Window System). The +'README' should mention any '--enable-' and '--with-' options that the package recognizes. - For packages that use the X Window System, ‘configure’ can usually -find the X include and library files automatically, but if it doesn’t, -you can use the ‘configure’ options ‘--x-includes=DIR’ and -‘--x-libraries=DIR’ to specify their locations. + For packages that use the X Window System, 'configure' can usually +find the X include and library files automatically, but if it doesn't, +you can use the 'configure' options '--x-includes=DIR' and +'--x-libraries=DIR' to specify their locations. Some packages offer the ability to configure how verbose the -execution of ‘make’ will be. For these packages, running ‘./configure ---enable-silent-rules’ sets the default to minimal output, which can be -overridden with ‘make V=1’; while running ‘./configure ---disable-silent-rules’ sets the default to verbose, which can be -overridden with ‘make V=0’. +execution of 'make' will be. For these packages, running './configure +--enable-silent-rules' sets the default to minimal output, which can be +overridden with 'make V=1'; while running './configure +--disable-silent-rules' sets the default to verbose, which can be +overridden with 'make V=0'. Particular systems ================== @@ -223,43 +223,43 @@ ./configure CC="cc -Ae -D_XOPEN_SOURCE=500" -and if that doesn’t work, install pre-built binaries of GCC for HP-UX. +and if that doesn't work, install pre-built binaries of GCC for HP-UX. - HP-UX ‘make’ updates targets which have the same timestamps as their + HP-UX 'make' updates targets which have the same timestamps as their prerequisites, which makes it generally unusable when shipped generated -files such as ‘configure’ are involved. Use GNU ‘make’ instead. +files such as 'configure' are involved. Use GNU 'make' instead. On OSF/1 a.k.a. Tru64, some versions of the default C compiler cannot -parse its ‘’ header file. The option ‘-nodtk’ can be used as a +parse its '' header file. The option '-nodtk' can be used as a workaround. If GNU CC is not installed, it is therefore recommended to try ./configure CC="cc" -and if that doesn’t work, try +and if that doesn't work, try ./configure CC="cc -nodtk" - On Solaris, don’t put ‘/usr/ucb’ early in your ‘PATH’. This + On Solaris, don't put '/usr/ucb' early in your 'PATH'. This directory contains several dysfunctional programs; working variants of -these programs are available in ‘/usr/bin’. So, if you need ‘/usr/ucb’ -in your ‘PATH’, put it _after_ ‘/usr/bin’. +these programs are available in '/usr/bin'. So, if you need '/usr/ucb' +in your 'PATH', put it _after_ '/usr/bin'. - On Haiku, software installed for all users goes in ‘/boot/common’, -not ‘/usr/local’. It is recommended to use the following options: + On Haiku, software installed for all users goes in '/boot/common', +not '/usr/local'. It is recommended to use the following options: ./configure --prefix=/boot/common Specifying the System Type ========================== - There may be some features ‘configure’ cannot figure out + There may be some features 'configure' cannot figure out automatically, but needs to determine by the type of machine the package will run on. Usually, assuming the package is built to be run on the -_same_ architectures, ‘configure’ can figure that out, but if it prints +_same_ architectures, 'configure' can figure that out, but if it prints a message saying it cannot guess the machine type, give it the -‘--build=TYPE’ option. TYPE can either be a short name for the system -type, such as ‘sun4’, or a canonical name which has the form: +'--build=TYPE' option. TYPE can either be a short name for the system +type, such as 'sun4', or a canonical name which has the form: CPU-COMPANY-SYSTEM @@ -268,101 +268,101 @@ OS KERNEL-OS - See the file ‘config.sub’ for the possible values of each field. If -‘config.sub’ isn’t included in this package, then this package doesn’t + See the file 'config.sub' for the possible values of each field. If +'config.sub' isn't included in this package, then this package doesn't need to know the machine type. If you are _building_ compiler tools for cross-compiling, you should -use the option ‘--target=TYPE’ to select the type of system they will +use the option '--target=TYPE' to select the type of system they will produce code for. If you want to _use_ a cross compiler, that generates code for a platform different from the build platform, you should specify the -“host” platform (i.e., that on which the generated programs will -eventually be run) with ‘--host=TYPE’. +"host" platform (i.e., that on which the generated programs will +eventually be run) with '--host=TYPE'. Sharing Defaults ================ - If you want to set default values for ‘configure’ scripts to share, -you can create a site shell script called ‘config.site’ that gives -default values for variables like ‘CC’, ‘cache_file’, and ‘prefix’. -‘configure’ looks for ‘PREFIX/share/config.site’ if it exists, then -‘PREFIX/etc/config.site’ if it exists. Or, you can set the -‘CONFIG_SITE’ environment variable to the location of the site script. -A warning: not all ‘configure’ scripts look for a site script. + If you want to set default values for 'configure' scripts to share, +you can create a site shell script called 'config.site' that gives +default values for variables like 'CC', 'cache_file', and 'prefix'. +'configure' looks for 'PREFIX/share/config.site' if it exists, then +'PREFIX/etc/config.site' if it exists. Or, you can set the +'CONFIG_SITE' environment variable to the location of the site script. +A warning: not all 'configure' scripts look for a site script. Defining Variables ================== Variables not defined in a site shell script can be set in the -environment passed to ‘configure’. However, some packages may run +environment passed to 'configure'. However, some packages may run configure again during the build, and the customized values of these variables may be lost. In order to avoid this problem, you should set -them in the ‘configure’ command line, using ‘VAR=value’. For example: +them in the 'configure' command line, using 'VAR=value'. For example: ./configure CC=/usr/local2/bin/gcc -causes the specified ‘gcc’ to be used as the C compiler (unless it is +causes the specified 'gcc' to be used as the C compiler (unless it is overridden in the site shell script). -Unfortunately, this technique does not work for ‘CONFIG_SHELL’ due to an +Unfortunately, this technique does not work for 'CONFIG_SHELL' due to an Autoconf limitation. Until the limitation is lifted, you can use this workaround: CONFIG_SHELL=/bin/bash ./configure CONFIG_SHELL=/bin/bash -‘configure’ Invocation +'configure' Invocation ====================== - ‘configure’ recognizes the following options to control how it + 'configure' recognizes the following options to control how it operates. -‘--help’ -‘-h’ - Print a summary of all of the options to ‘configure’, and exit. - -‘--help=short’ -‘--help=recursive’ - Print a summary of the options unique to this package’s - ‘configure’, and exit. The ‘short’ variant lists options used only - in the top level, while the ‘recursive’ variant lists options also +'--help' +'-h' + Print a summary of all of the options to 'configure', and exit. + +'--help=short' +'--help=recursive' + Print a summary of the options unique to this package's + 'configure', and exit. The 'short' variant lists options used only + in the top level, while the 'recursive' variant lists options also present in any nested packages. -‘--version’ -‘-V’ - Print the version of Autoconf used to generate the ‘configure’ +'--version' +'-V' + Print the version of Autoconf used to generate the 'configure' script, and exit. -‘--cache-file=FILE’ +'--cache-file=FILE' Enable the cache: use and save the results of the tests in FILE, - traditionally ‘config.cache’. FILE defaults to ‘/dev/null’ to + traditionally 'config.cache'. FILE defaults to '/dev/null' to disable caching. -‘--config-cache’ -‘-C’ - Alias for ‘--cache-file=config.cache’. - -‘--quiet’ -‘--silent’ -‘-q’ +'--config-cache' +'-C' + Alias for '--cache-file=config.cache'. + +'--quiet' +'--silent' +'-q' Do not print messages saying which checks are being made. To - suppress all normal output, redirect it to ‘/dev/null’ (any error + suppress all normal output, redirect it to '/dev/null' (any error messages will still be shown). -‘--srcdir=DIR’ - Look for the package’s source code in directory DIR. Usually - ‘configure’ can determine that directory automatically. +'--srcdir=DIR' + Look for the package's source code in directory DIR. Usually + 'configure' can determine that directory automatically. -‘--prefix=DIR’ +'--prefix=DIR' Use DIR as the installation prefix. *note Installation Names:: for more details, including other options available for fine-tuning the installation locations. -‘--no-create’ -‘-n’ +'--no-create' +'-n' Run the configure checks, but stop before creating any output files. -‘configure’ also accepts some other, not widely useful, options. Run -‘configure --help’ for more details. +'configure' also accepts some other, not widely useful, options. Run +'configure --help' for more details. diff -Nru mmv-2.5/Makefile.in mmv-2.5.1/Makefile.in --- mmv-2.5/Makefile.in 2023-07-20 19:40:54.000000000 +0000 +++ mmv-2.5.1/Makefile.in 2023-08-08 11:08:17.000000000 +0000 @@ -113,15 +113,12 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/00gnulib.m4 \ $(top_srcdir)/m4/__inline.m4 \ $(top_srcdir)/m4/absolute-header.m4 $(top_srcdir)/m4/alloca.m4 \ - $(top_srcdir)/m4/assert_h.m4 \ - $(top_srcdir)/m4/builtin-expect.m4 $(top_srcdir)/m4/c-bool.m4 \ - $(top_srcdir)/m4/calloc.m4 $(top_srcdir)/m4/canonicalize.m4 \ - $(top_srcdir)/m4/close.m4 $(top_srcdir)/m4/codeset.m4 \ + $(top_srcdir)/m4/canonicalize.m4 $(top_srcdir)/m4/close.m4 \ $(top_srcdir)/m4/double-slash-root.m4 $(top_srcdir)/m4/dup2.m4 \ $(top_srcdir)/m4/eealloc.m4 $(top_srcdir)/m4/errno_h.m4 \ - $(top_srcdir)/m4/error.m4 $(top_srcdir)/m4/error_h.m4 \ - $(top_srcdir)/m4/exponentd.m4 $(top_srcdir)/m4/exponentf.m4 \ - $(top_srcdir)/m4/exponentl.m4 $(top_srcdir)/m4/extensions.m4 \ + $(top_srcdir)/m4/error.m4 $(top_srcdir)/m4/exponentd.m4 \ + $(top_srcdir)/m4/exponentf.m4 $(top_srcdir)/m4/exponentl.m4 \ + $(top_srcdir)/m4/extensions.m4 \ $(top_srcdir)/m4/extern-inline.m4 $(top_srcdir)/m4/fcntl-o.m4 \ $(top_srcdir)/m4/fcntl.m4 $(top_srcdir)/m4/fcntl_h.m4 \ $(top_srcdir)/m4/float_h.m4 $(top_srcdir)/m4/fpieee.m4 \ @@ -137,32 +134,32 @@ $(top_srcdir)/m4/isnand.m4 $(top_srcdir)/m4/isnanf.m4 \ $(top_srcdir)/m4/isnanl.m4 $(top_srcdir)/m4/largefile.m4 \ $(top_srcdir)/m4/ldexpl.m4 $(top_srcdir)/m4/limits-h.m4 \ - $(top_srcdir)/m4/link.m4 $(top_srcdir)/m4/locale-fr.m4 \ - $(top_srcdir)/m4/lseek.m4 $(top_srcdir)/m4/lstat.m4 \ - $(top_srcdir)/m4/malloc.m4 $(top_srcdir)/m4/malloca.m4 \ - $(top_srcdir)/m4/manywarnings.m4 $(top_srcdir)/m4/math_h.m4 \ - $(top_srcdir)/m4/memchr.m4 $(top_srcdir)/m4/mempcpy.m4 \ - $(top_srcdir)/m4/minmax.m4 $(top_srcdir)/m4/mmap-anon.m4 \ - $(top_srcdir)/m4/mode_t.m4 $(top_srcdir)/m4/msvc-inval.m4 \ + $(top_srcdir)/m4/link.m4 $(top_srcdir)/m4/lseek.m4 \ + $(top_srcdir)/m4/lstat.m4 $(top_srcdir)/m4/malloc.m4 \ + $(top_srcdir)/m4/malloca.m4 $(top_srcdir)/m4/manywarnings.m4 \ + $(top_srcdir)/m4/math_h.m4 $(top_srcdir)/m4/memchr.m4 \ + $(top_srcdir)/m4/mempcpy.m4 $(top_srcdir)/m4/minmax.m4 \ + $(top_srcdir)/m4/mmap-anon.m4 $(top_srcdir)/m4/mode_t.m4 \ + $(top_srcdir)/m4/msvc-inval.m4 \ $(top_srcdir)/m4/msvc-nothrow.m4 $(top_srcdir)/m4/multiarch.m4 \ - $(top_srcdir)/m4/musl.m4 $(top_srcdir)/m4/nocrash.m4 \ - $(top_srcdir)/m4/off_t.m4 $(top_srcdir)/m4/open-cloexec.m4 \ + $(top_srcdir)/m4/nocrash.m4 $(top_srcdir)/m4/off_t.m4 \ + $(top_srcdir)/m4/open-cloexec.m4 \ $(top_srcdir)/m4/open-slash.m4 $(top_srcdir)/m4/open.m4 \ $(top_srcdir)/m4/pathmax.m4 $(top_srcdir)/m4/printf-frexp.m4 \ $(top_srcdir)/m4/printf-frexpl.m4 $(top_srcdir)/m4/printf.m4 \ $(top_srcdir)/m4/raise.m4 $(top_srcdir)/m4/rawmemchr.m4 \ $(top_srcdir)/m4/read.m4 $(top_srcdir)/m4/readlink.m4 \ - $(top_srcdir)/m4/realloc.m4 $(top_srcdir)/m4/reallocarray.m4 \ - $(top_srcdir)/m4/rename.m4 $(top_srcdir)/m4/rmdir.m4 \ - $(top_srcdir)/m4/signal_h.m4 $(top_srcdir)/m4/signbit.m4 \ - $(top_srcdir)/m4/size_max.m4 $(top_srcdir)/m4/sprintf-posix.m4 \ - $(top_srcdir)/m4/ssize_t.m4 $(top_srcdir)/m4/stat-time.m4 \ - $(top_srcdir)/m4/stat.m4 $(top_srcdir)/m4/stdalign.m4 \ - $(top_srcdir)/m4/stddef_h.m4 $(top_srcdir)/m4/stdint.m4 \ - $(top_srcdir)/m4/stdint_h.m4 $(top_srcdir)/m4/stdio_h.m4 \ - $(top_srcdir)/m4/stdlib_h.m4 $(top_srcdir)/m4/strdup.m4 \ - $(top_srcdir)/m4/strerror.m4 $(top_srcdir)/m4/string_h.m4 \ - $(top_srcdir)/m4/symlink.m4 $(top_srcdir)/m4/sys_socket_h.m4 \ + $(top_srcdir)/m4/realloc.m4 $(top_srcdir)/m4/rename.m4 \ + $(top_srcdir)/m4/rmdir.m4 $(top_srcdir)/m4/signal_h.m4 \ + $(top_srcdir)/m4/signbit.m4 $(top_srcdir)/m4/size_max.m4 \ + $(top_srcdir)/m4/sprintf-posix.m4 $(top_srcdir)/m4/ssize_t.m4 \ + $(top_srcdir)/m4/stat-time.m4 $(top_srcdir)/m4/stat.m4 \ + $(top_srcdir)/m4/stdbool.m4 $(top_srcdir)/m4/stddef_h.m4 \ + $(top_srcdir)/m4/stdint.m4 $(top_srcdir)/m4/stdint_h.m4 \ + $(top_srcdir)/m4/stdio_h.m4 $(top_srcdir)/m4/stdlib_h.m4 \ + $(top_srcdir)/m4/strdup.m4 $(top_srcdir)/m4/strerror.m4 \ + $(top_srcdir)/m4/string_h.m4 $(top_srcdir)/m4/symlink.m4 \ + $(top_srcdir)/m4/sys_socket_h.m4 \ $(top_srcdir)/m4/sys_stat_h.m4 $(top_srcdir)/m4/sys_types_h.m4 \ $(top_srcdir)/m4/time_h.m4 $(top_srcdir)/m4/unistd_h.m4 \ $(top_srcdir)/m4/unlink.m4 $(top_srcdir)/m4/vasnprintf.m4 \ @@ -356,7 +353,6 @@ APPLE_UNIVERSAL_BUILD = @APPLE_UNIVERSAL_BUILD@ AR = @AR@ ARFLAGS = @ARFLAGS@ -ASSERT_H = @ASSERT_H@ AUTOCONF = @AUTOCONF@ AUTOHEADER = @AUTOHEADER@ AUTOMAKE = @AUTOMAKE@ @@ -389,447 +385,431 @@ EOVERFLOW_HIDDEN = @EOVERFLOW_HIDDEN@ EOVERFLOW_VALUE = @EOVERFLOW_VALUE@ ERRNO_H = @ERRNO_H@ -ERROR_H = @ERROR_H@ ETAGS = @ETAGS@ EXEEXT = @EXEEXT@ FLOAT_H = @FLOAT_H@ GETOPT_CDEFS_H = @GETOPT_CDEFS_H@ GETOPT_H = @GETOPT_H@ -GL_CFLAG_ALLOW_WARNINGS = @GL_CFLAG_ALLOW_WARNINGS@ -GL_CFLAG_GNULIB_WARNINGS = @GL_CFLAG_GNULIB_WARNINGS@ -GL_GNULIB_ACCESS = @GL_GNULIB_ACCESS@ -GL_GNULIB_ACOSF = @GL_GNULIB_ACOSF@ -GL_GNULIB_ACOSL = @GL_GNULIB_ACOSL@ -GL_GNULIB_ALIGNED_ALLOC = @GL_GNULIB_ALIGNED_ALLOC@ -GL_GNULIB_ASINF = @GL_GNULIB_ASINF@ -GL_GNULIB_ASINL = @GL_GNULIB_ASINL@ -GL_GNULIB_ATAN2F = @GL_GNULIB_ATAN2F@ -GL_GNULIB_ATANF = @GL_GNULIB_ATANF@ -GL_GNULIB_ATANL = @GL_GNULIB_ATANL@ -GL_GNULIB_ATOLL = @GL_GNULIB_ATOLL@ -GL_GNULIB_BTOWC = @GL_GNULIB_BTOWC@ -GL_GNULIB_CALLOC_GNU = @GL_GNULIB_CALLOC_GNU@ -GL_GNULIB_CALLOC_POSIX = @GL_GNULIB_CALLOC_POSIX@ -GL_GNULIB_CANONICALIZE_FILE_NAME = @GL_GNULIB_CANONICALIZE_FILE_NAME@ -GL_GNULIB_CBRT = @GL_GNULIB_CBRT@ -GL_GNULIB_CBRTF = @GL_GNULIB_CBRTF@ -GL_GNULIB_CBRTL = @GL_GNULIB_CBRTL@ -GL_GNULIB_CEIL = @GL_GNULIB_CEIL@ -GL_GNULIB_CEILF = @GL_GNULIB_CEILF@ -GL_GNULIB_CEILL = @GL_GNULIB_CEILL@ -GL_GNULIB_CHDIR = @GL_GNULIB_CHDIR@ -GL_GNULIB_CHMOD = @GL_GNULIB_CHMOD@ -GL_GNULIB_CHOWN = @GL_GNULIB_CHOWN@ -GL_GNULIB_CLOSE = @GL_GNULIB_CLOSE@ -GL_GNULIB_COPYSIGN = @GL_GNULIB_COPYSIGN@ -GL_GNULIB_COPYSIGNF = @GL_GNULIB_COPYSIGNF@ -GL_GNULIB_COPYSIGNL = @GL_GNULIB_COPYSIGNL@ -GL_GNULIB_COPY_FILE_RANGE = @GL_GNULIB_COPY_FILE_RANGE@ -GL_GNULIB_COSF = @GL_GNULIB_COSF@ -GL_GNULIB_COSHF = @GL_GNULIB_COSHF@ -GL_GNULIB_COSL = @GL_GNULIB_COSL@ -GL_GNULIB_CREAT = @GL_GNULIB_CREAT@ -GL_GNULIB_CTIME = @GL_GNULIB_CTIME@ -GL_GNULIB_DPRINTF = @GL_GNULIB_DPRINTF@ -GL_GNULIB_DUP = @GL_GNULIB_DUP@ -GL_GNULIB_DUP2 = @GL_GNULIB_DUP2@ -GL_GNULIB_DUP3 = @GL_GNULIB_DUP3@ -GL_GNULIB_ENVIRON = @GL_GNULIB_ENVIRON@ -GL_GNULIB_EUIDACCESS = @GL_GNULIB_EUIDACCESS@ -GL_GNULIB_EXECL = @GL_GNULIB_EXECL@ -GL_GNULIB_EXECLE = @GL_GNULIB_EXECLE@ -GL_GNULIB_EXECLP = @GL_GNULIB_EXECLP@ -GL_GNULIB_EXECV = @GL_GNULIB_EXECV@ -GL_GNULIB_EXECVE = @GL_GNULIB_EXECVE@ -GL_GNULIB_EXECVP = @GL_GNULIB_EXECVP@ -GL_GNULIB_EXECVPE = @GL_GNULIB_EXECVPE@ -GL_GNULIB_EXP2 = @GL_GNULIB_EXP2@ -GL_GNULIB_EXP2F = @GL_GNULIB_EXP2F@ -GL_GNULIB_EXP2L = @GL_GNULIB_EXP2L@ -GL_GNULIB_EXPF = @GL_GNULIB_EXPF@ -GL_GNULIB_EXPL = @GL_GNULIB_EXPL@ -GL_GNULIB_EXPLICIT_BZERO = @GL_GNULIB_EXPLICIT_BZERO@ -GL_GNULIB_EXPM1 = @GL_GNULIB_EXPM1@ -GL_GNULIB_EXPM1F = @GL_GNULIB_EXPM1F@ -GL_GNULIB_EXPM1L = @GL_GNULIB_EXPM1L@ -GL_GNULIB_FABSF = @GL_GNULIB_FABSF@ -GL_GNULIB_FABSL = @GL_GNULIB_FABSL@ -GL_GNULIB_FACCESSAT = @GL_GNULIB_FACCESSAT@ -GL_GNULIB_FCHDIR = @GL_GNULIB_FCHDIR@ -GL_GNULIB_FCHMODAT = @GL_GNULIB_FCHMODAT@ -GL_GNULIB_FCHOWNAT = @GL_GNULIB_FCHOWNAT@ -GL_GNULIB_FCLOSE = @GL_GNULIB_FCLOSE@ -GL_GNULIB_FCNTL = @GL_GNULIB_FCNTL@ -GL_GNULIB_FDATASYNC = @GL_GNULIB_FDATASYNC@ -GL_GNULIB_FDOPEN = @GL_GNULIB_FDOPEN@ -GL_GNULIB_FFLUSH = @GL_GNULIB_FFLUSH@ -GL_GNULIB_FFSL = @GL_GNULIB_FFSL@ -GL_GNULIB_FFSLL = @GL_GNULIB_FFSLL@ -GL_GNULIB_FGETC = @GL_GNULIB_FGETC@ -GL_GNULIB_FGETS = @GL_GNULIB_FGETS@ -GL_GNULIB_FLOOR = @GL_GNULIB_FLOOR@ -GL_GNULIB_FLOORF = @GL_GNULIB_FLOORF@ -GL_GNULIB_FLOORL = @GL_GNULIB_FLOORL@ -GL_GNULIB_FMA = @GL_GNULIB_FMA@ -GL_GNULIB_FMAF = @GL_GNULIB_FMAF@ -GL_GNULIB_FMAL = @GL_GNULIB_FMAL@ -GL_GNULIB_FMOD = @GL_GNULIB_FMOD@ -GL_GNULIB_FMODF = @GL_GNULIB_FMODF@ -GL_GNULIB_FMODL = @GL_GNULIB_FMODL@ -GL_GNULIB_FOPEN = @GL_GNULIB_FOPEN@ -GL_GNULIB_FOPEN_GNU = @GL_GNULIB_FOPEN_GNU@ -GL_GNULIB_FPRINTF = @GL_GNULIB_FPRINTF@ -GL_GNULIB_FPRINTF_POSIX = @GL_GNULIB_FPRINTF_POSIX@ -GL_GNULIB_FPURGE = @GL_GNULIB_FPURGE@ -GL_GNULIB_FPUTC = @GL_GNULIB_FPUTC@ -GL_GNULIB_FPUTS = @GL_GNULIB_FPUTS@ -GL_GNULIB_FREAD = @GL_GNULIB_FREAD@ -GL_GNULIB_FREE_POSIX = @GL_GNULIB_FREE_POSIX@ -GL_GNULIB_FREOPEN = @GL_GNULIB_FREOPEN@ -GL_GNULIB_FREXP = @GL_GNULIB_FREXP@ -GL_GNULIB_FREXPF = @GL_GNULIB_FREXPF@ -GL_GNULIB_FREXPL = @GL_GNULIB_FREXPL@ -GL_GNULIB_FSCANF = @GL_GNULIB_FSCANF@ -GL_GNULIB_FSEEK = @GL_GNULIB_FSEEK@ -GL_GNULIB_FSEEKO = @GL_GNULIB_FSEEKO@ -GL_GNULIB_FSTAT = @GL_GNULIB_FSTAT@ -GL_GNULIB_FSTATAT = @GL_GNULIB_FSTATAT@ -GL_GNULIB_FSYNC = @GL_GNULIB_FSYNC@ -GL_GNULIB_FTELL = @GL_GNULIB_FTELL@ -GL_GNULIB_FTELLO = @GL_GNULIB_FTELLO@ -GL_GNULIB_FTRUNCATE = @GL_GNULIB_FTRUNCATE@ -GL_GNULIB_FUTIMENS = @GL_GNULIB_FUTIMENS@ -GL_GNULIB_FWRITE = @GL_GNULIB_FWRITE@ -GL_GNULIB_GETC = @GL_GNULIB_GETC@ -GL_GNULIB_GETCHAR = @GL_GNULIB_GETCHAR@ -GL_GNULIB_GETCWD = @GL_GNULIB_GETCWD@ -GL_GNULIB_GETDELIM = @GL_GNULIB_GETDELIM@ -GL_GNULIB_GETDOMAINNAME = @GL_GNULIB_GETDOMAINNAME@ -GL_GNULIB_GETDTABLESIZE = @GL_GNULIB_GETDTABLESIZE@ -GL_GNULIB_GETENTROPY = @GL_GNULIB_GETENTROPY@ -GL_GNULIB_GETGROUPS = @GL_GNULIB_GETGROUPS@ -GL_GNULIB_GETHOSTNAME = @GL_GNULIB_GETHOSTNAME@ -GL_GNULIB_GETLINE = @GL_GNULIB_GETLINE@ -GL_GNULIB_GETLOADAVG = @GL_GNULIB_GETLOADAVG@ -GL_GNULIB_GETLOGIN = @GL_GNULIB_GETLOGIN@ -GL_GNULIB_GETLOGIN_R = @GL_GNULIB_GETLOGIN_R@ -GL_GNULIB_GETOPT_POSIX = @GL_GNULIB_GETOPT_POSIX@ -GL_GNULIB_GETPAGESIZE = @GL_GNULIB_GETPAGESIZE@ -GL_GNULIB_GETPASS = @GL_GNULIB_GETPASS@ -GL_GNULIB_GETPASS_GNU = @GL_GNULIB_GETPASS_GNU@ -GL_GNULIB_GETPROGNAME = @GL_GNULIB_GETPROGNAME@ -GL_GNULIB_GETSUBOPT = @GL_GNULIB_GETSUBOPT@ -GL_GNULIB_GETUMASK = @GL_GNULIB_GETUMASK@ -GL_GNULIB_GETUSERSHELL = @GL_GNULIB_GETUSERSHELL@ -GL_GNULIB_GRANTPT = @GL_GNULIB_GRANTPT@ -GL_GNULIB_GROUP_MEMBER = @GL_GNULIB_GROUP_MEMBER@ -GL_GNULIB_HYPOT = @GL_GNULIB_HYPOT@ -GL_GNULIB_HYPOTF = @GL_GNULIB_HYPOTF@ -GL_GNULIB_HYPOTL = @GL_GNULIB_HYPOTL@ -GL_GNULIB_ILOGB = @GL_GNULIB_ILOGB@ -GL_GNULIB_ILOGBF = @GL_GNULIB_ILOGBF@ -GL_GNULIB_ILOGBL = @GL_GNULIB_ILOGBL@ -GL_GNULIB_IMAXABS = @GL_GNULIB_IMAXABS@ -GL_GNULIB_IMAXDIV = @GL_GNULIB_IMAXDIV@ -GL_GNULIB_ISATTY = @GL_GNULIB_ISATTY@ -GL_GNULIB_ISFINITE = @GL_GNULIB_ISFINITE@ -GL_GNULIB_ISINF = @GL_GNULIB_ISINF@ -GL_GNULIB_ISNAN = @GL_GNULIB_ISNAN@ -GL_GNULIB_ISNAND = @GL_GNULIB_ISNAND@ -GL_GNULIB_ISNANF = @GL_GNULIB_ISNANF@ -GL_GNULIB_ISNANL = @GL_GNULIB_ISNANL@ -GL_GNULIB_LCHMOD = @GL_GNULIB_LCHMOD@ -GL_GNULIB_LCHOWN = @GL_GNULIB_LCHOWN@ -GL_GNULIB_LDEXPF = @GL_GNULIB_LDEXPF@ -GL_GNULIB_LDEXPL = @GL_GNULIB_LDEXPL@ -GL_GNULIB_LINK = @GL_GNULIB_LINK@ -GL_GNULIB_LINKAT = @GL_GNULIB_LINKAT@ -GL_GNULIB_LOCALTIME = @GL_GNULIB_LOCALTIME@ -GL_GNULIB_LOG = @GL_GNULIB_LOG@ -GL_GNULIB_LOG10 = @GL_GNULIB_LOG10@ -GL_GNULIB_LOG10F = @GL_GNULIB_LOG10F@ -GL_GNULIB_LOG10L = @GL_GNULIB_LOG10L@ -GL_GNULIB_LOG1P = @GL_GNULIB_LOG1P@ -GL_GNULIB_LOG1PF = @GL_GNULIB_LOG1PF@ -GL_GNULIB_LOG1PL = @GL_GNULIB_LOG1PL@ -GL_GNULIB_LOG2 = @GL_GNULIB_LOG2@ -GL_GNULIB_LOG2F = @GL_GNULIB_LOG2F@ -GL_GNULIB_LOG2L = @GL_GNULIB_LOG2L@ -GL_GNULIB_LOGB = @GL_GNULIB_LOGB@ -GL_GNULIB_LOGBF = @GL_GNULIB_LOGBF@ -GL_GNULIB_LOGBL = @GL_GNULIB_LOGBL@ -GL_GNULIB_LOGF = @GL_GNULIB_LOGF@ -GL_GNULIB_LOGL = @GL_GNULIB_LOGL@ -GL_GNULIB_LSEEK = @GL_GNULIB_LSEEK@ -GL_GNULIB_LSTAT = @GL_GNULIB_LSTAT@ -GL_GNULIB_MALLOC_GNU = @GL_GNULIB_MALLOC_GNU@ -GL_GNULIB_MALLOC_POSIX = @GL_GNULIB_MALLOC_POSIX@ -GL_GNULIB_MBRLEN = @GL_GNULIB_MBRLEN@ -GL_GNULIB_MBRTOWC = @GL_GNULIB_MBRTOWC@ -GL_GNULIB_MBSCASECMP = @GL_GNULIB_MBSCASECMP@ -GL_GNULIB_MBSCASESTR = @GL_GNULIB_MBSCASESTR@ -GL_GNULIB_MBSCHR = @GL_GNULIB_MBSCHR@ -GL_GNULIB_MBSCSPN = @GL_GNULIB_MBSCSPN@ -GL_GNULIB_MBSINIT = @GL_GNULIB_MBSINIT@ -GL_GNULIB_MBSLEN = @GL_GNULIB_MBSLEN@ -GL_GNULIB_MBSNCASECMP = @GL_GNULIB_MBSNCASECMP@ -GL_GNULIB_MBSNLEN = @GL_GNULIB_MBSNLEN@ -GL_GNULIB_MBSNRTOWCS = @GL_GNULIB_MBSNRTOWCS@ -GL_GNULIB_MBSPBRK = @GL_GNULIB_MBSPBRK@ -GL_GNULIB_MBSPCASECMP = @GL_GNULIB_MBSPCASECMP@ -GL_GNULIB_MBSRCHR = @GL_GNULIB_MBSRCHR@ -GL_GNULIB_MBSRTOWCS = @GL_GNULIB_MBSRTOWCS@ -GL_GNULIB_MBSSEP = @GL_GNULIB_MBSSEP@ -GL_GNULIB_MBSSPN = @GL_GNULIB_MBSSPN@ -GL_GNULIB_MBSSTR = @GL_GNULIB_MBSSTR@ -GL_GNULIB_MBSTOK_R = @GL_GNULIB_MBSTOK_R@ -GL_GNULIB_MBSTOWCS = @GL_GNULIB_MBSTOWCS@ -GL_GNULIB_MBTOWC = @GL_GNULIB_MBTOWC@ -GL_GNULIB_MDA_ACCESS = @GL_GNULIB_MDA_ACCESS@ -GL_GNULIB_MDA_CHDIR = @GL_GNULIB_MDA_CHDIR@ -GL_GNULIB_MDA_CHMOD = @GL_GNULIB_MDA_CHMOD@ -GL_GNULIB_MDA_CLOSE = @GL_GNULIB_MDA_CLOSE@ -GL_GNULIB_MDA_CREAT = @GL_GNULIB_MDA_CREAT@ -GL_GNULIB_MDA_DUP = @GL_GNULIB_MDA_DUP@ -GL_GNULIB_MDA_DUP2 = @GL_GNULIB_MDA_DUP2@ -GL_GNULIB_MDA_ECVT = @GL_GNULIB_MDA_ECVT@ -GL_GNULIB_MDA_EXECL = @GL_GNULIB_MDA_EXECL@ -GL_GNULIB_MDA_EXECLE = @GL_GNULIB_MDA_EXECLE@ -GL_GNULIB_MDA_EXECLP = @GL_GNULIB_MDA_EXECLP@ -GL_GNULIB_MDA_EXECV = @GL_GNULIB_MDA_EXECV@ -GL_GNULIB_MDA_EXECVE = @GL_GNULIB_MDA_EXECVE@ -GL_GNULIB_MDA_EXECVP = @GL_GNULIB_MDA_EXECVP@ -GL_GNULIB_MDA_EXECVPE = @GL_GNULIB_MDA_EXECVPE@ -GL_GNULIB_MDA_FCLOSEALL = @GL_GNULIB_MDA_FCLOSEALL@ -GL_GNULIB_MDA_FCVT = @GL_GNULIB_MDA_FCVT@ -GL_GNULIB_MDA_FDOPEN = @GL_GNULIB_MDA_FDOPEN@ -GL_GNULIB_MDA_FILENO = @GL_GNULIB_MDA_FILENO@ -GL_GNULIB_MDA_GCVT = @GL_GNULIB_MDA_GCVT@ -GL_GNULIB_MDA_GETCWD = @GL_GNULIB_MDA_GETCWD@ -GL_GNULIB_MDA_GETPID = @GL_GNULIB_MDA_GETPID@ -GL_GNULIB_MDA_GETW = @GL_GNULIB_MDA_GETW@ -GL_GNULIB_MDA_ISATTY = @GL_GNULIB_MDA_ISATTY@ -GL_GNULIB_MDA_J0 = @GL_GNULIB_MDA_J0@ -GL_GNULIB_MDA_J1 = @GL_GNULIB_MDA_J1@ -GL_GNULIB_MDA_JN = @GL_GNULIB_MDA_JN@ -GL_GNULIB_MDA_LSEEK = @GL_GNULIB_MDA_LSEEK@ -GL_GNULIB_MDA_MEMCCPY = @GL_GNULIB_MDA_MEMCCPY@ -GL_GNULIB_MDA_MKDIR = @GL_GNULIB_MDA_MKDIR@ -GL_GNULIB_MDA_MKTEMP = @GL_GNULIB_MDA_MKTEMP@ -GL_GNULIB_MDA_OPEN = @GL_GNULIB_MDA_OPEN@ -GL_GNULIB_MDA_PUTENV = @GL_GNULIB_MDA_PUTENV@ -GL_GNULIB_MDA_PUTW = @GL_GNULIB_MDA_PUTW@ -GL_GNULIB_MDA_READ = @GL_GNULIB_MDA_READ@ -GL_GNULIB_MDA_RMDIR = @GL_GNULIB_MDA_RMDIR@ -GL_GNULIB_MDA_STRDUP = @GL_GNULIB_MDA_STRDUP@ -GL_GNULIB_MDA_SWAB = @GL_GNULIB_MDA_SWAB@ -GL_GNULIB_MDA_TEMPNAM = @GL_GNULIB_MDA_TEMPNAM@ -GL_GNULIB_MDA_TZSET = @GL_GNULIB_MDA_TZSET@ -GL_GNULIB_MDA_UMASK = @GL_GNULIB_MDA_UMASK@ -GL_GNULIB_MDA_UNLINK = @GL_GNULIB_MDA_UNLINK@ -GL_GNULIB_MDA_WCSDUP = @GL_GNULIB_MDA_WCSDUP@ -GL_GNULIB_MDA_WRITE = @GL_GNULIB_MDA_WRITE@ -GL_GNULIB_MDA_Y0 = @GL_GNULIB_MDA_Y0@ -GL_GNULIB_MDA_Y1 = @GL_GNULIB_MDA_Y1@ -GL_GNULIB_MDA_YN = @GL_GNULIB_MDA_YN@ -GL_GNULIB_MEMCHR = @GL_GNULIB_MEMCHR@ -GL_GNULIB_MEMMEM = @GL_GNULIB_MEMMEM@ -GL_GNULIB_MEMPCPY = @GL_GNULIB_MEMPCPY@ -GL_GNULIB_MEMRCHR = @GL_GNULIB_MEMRCHR@ -GL_GNULIB_MEMSET_EXPLICIT = @GL_GNULIB_MEMSET_EXPLICIT@ -GL_GNULIB_MKDIR = @GL_GNULIB_MKDIR@ -GL_GNULIB_MKDIRAT = @GL_GNULIB_MKDIRAT@ -GL_GNULIB_MKDTEMP = @GL_GNULIB_MKDTEMP@ -GL_GNULIB_MKFIFO = @GL_GNULIB_MKFIFO@ -GL_GNULIB_MKFIFOAT = @GL_GNULIB_MKFIFOAT@ -GL_GNULIB_MKNOD = @GL_GNULIB_MKNOD@ -GL_GNULIB_MKNODAT = @GL_GNULIB_MKNODAT@ -GL_GNULIB_MKOSTEMP = @GL_GNULIB_MKOSTEMP@ -GL_GNULIB_MKOSTEMPS = @GL_GNULIB_MKOSTEMPS@ -GL_GNULIB_MKSTEMP = @GL_GNULIB_MKSTEMP@ -GL_GNULIB_MKSTEMPS = @GL_GNULIB_MKSTEMPS@ -GL_GNULIB_MKTIME = @GL_GNULIB_MKTIME@ -GL_GNULIB_MODF = @GL_GNULIB_MODF@ -GL_GNULIB_MODFF = @GL_GNULIB_MODFF@ -GL_GNULIB_MODFL = @GL_GNULIB_MODFL@ -GL_GNULIB_NANOSLEEP = @GL_GNULIB_NANOSLEEP@ -GL_GNULIB_NONBLOCKING = @GL_GNULIB_NONBLOCKING@ -GL_GNULIB_OBSTACK_PRINTF = @GL_GNULIB_OBSTACK_PRINTF@ -GL_GNULIB_OBSTACK_PRINTF_POSIX = @GL_GNULIB_OBSTACK_PRINTF_POSIX@ -GL_GNULIB_OPEN = @GL_GNULIB_OPEN@ -GL_GNULIB_OPENAT = @GL_GNULIB_OPENAT@ -GL_GNULIB_OVERRIDES_STRUCT_STAT = @GL_GNULIB_OVERRIDES_STRUCT_STAT@ -GL_GNULIB_PCLOSE = @GL_GNULIB_PCLOSE@ -GL_GNULIB_PERROR = @GL_GNULIB_PERROR@ -GL_GNULIB_PIPE = @GL_GNULIB_PIPE@ -GL_GNULIB_PIPE2 = @GL_GNULIB_PIPE2@ -GL_GNULIB_POPEN = @GL_GNULIB_POPEN@ -GL_GNULIB_POSIX_MEMALIGN = @GL_GNULIB_POSIX_MEMALIGN@ -GL_GNULIB_POSIX_OPENPT = @GL_GNULIB_POSIX_OPENPT@ -GL_GNULIB_POWF = @GL_GNULIB_POWF@ -GL_GNULIB_PREAD = @GL_GNULIB_PREAD@ -GL_GNULIB_PRINTF = @GL_GNULIB_PRINTF@ -GL_GNULIB_PRINTF_POSIX = @GL_GNULIB_PRINTF_POSIX@ -GL_GNULIB_PTHREAD_SIGMASK = @GL_GNULIB_PTHREAD_SIGMASK@ -GL_GNULIB_PTSNAME = @GL_GNULIB_PTSNAME@ -GL_GNULIB_PTSNAME_R = @GL_GNULIB_PTSNAME_R@ -GL_GNULIB_PUTC = @GL_GNULIB_PUTC@ -GL_GNULIB_PUTCHAR = @GL_GNULIB_PUTCHAR@ -GL_GNULIB_PUTENV = @GL_GNULIB_PUTENV@ -GL_GNULIB_PUTS = @GL_GNULIB_PUTS@ -GL_GNULIB_PWRITE = @GL_GNULIB_PWRITE@ -GL_GNULIB_QSORT_R = @GL_GNULIB_QSORT_R@ -GL_GNULIB_RAISE = @GL_GNULIB_RAISE@ -GL_GNULIB_RANDOM = @GL_GNULIB_RANDOM@ -GL_GNULIB_RANDOM_R = @GL_GNULIB_RANDOM_R@ -GL_GNULIB_RAWMEMCHR = @GL_GNULIB_RAWMEMCHR@ -GL_GNULIB_READ = @GL_GNULIB_READ@ -GL_GNULIB_READLINK = @GL_GNULIB_READLINK@ -GL_GNULIB_READLINKAT = @GL_GNULIB_READLINKAT@ -GL_GNULIB_REALLOCARRAY = @GL_GNULIB_REALLOCARRAY@ -GL_GNULIB_REALLOC_GNU = @GL_GNULIB_REALLOC_GNU@ -GL_GNULIB_REALLOC_POSIX = @GL_GNULIB_REALLOC_POSIX@ -GL_GNULIB_REALPATH = @GL_GNULIB_REALPATH@ -GL_GNULIB_REMAINDER = @GL_GNULIB_REMAINDER@ -GL_GNULIB_REMAINDERF = @GL_GNULIB_REMAINDERF@ -GL_GNULIB_REMAINDERL = @GL_GNULIB_REMAINDERL@ -GL_GNULIB_REMOVE = @GL_GNULIB_REMOVE@ -GL_GNULIB_RENAME = @GL_GNULIB_RENAME@ -GL_GNULIB_RENAMEAT = @GL_GNULIB_RENAMEAT@ -GL_GNULIB_RINT = @GL_GNULIB_RINT@ -GL_GNULIB_RINTF = @GL_GNULIB_RINTF@ -GL_GNULIB_RINTL = @GL_GNULIB_RINTL@ -GL_GNULIB_RMDIR = @GL_GNULIB_RMDIR@ -GL_GNULIB_ROUND = @GL_GNULIB_ROUND@ -GL_GNULIB_ROUNDF = @GL_GNULIB_ROUNDF@ -GL_GNULIB_ROUNDL = @GL_GNULIB_ROUNDL@ -GL_GNULIB_RPMATCH = @GL_GNULIB_RPMATCH@ -GL_GNULIB_SCANF = @GL_GNULIB_SCANF@ -GL_GNULIB_SECURE_GETENV = @GL_GNULIB_SECURE_GETENV@ -GL_GNULIB_SETENV = @GL_GNULIB_SETENV@ -GL_GNULIB_SETHOSTNAME = @GL_GNULIB_SETHOSTNAME@ -GL_GNULIB_SIGABBREV_NP = @GL_GNULIB_SIGABBREV_NP@ -GL_GNULIB_SIGACTION = @GL_GNULIB_SIGACTION@ -GL_GNULIB_SIGDESCR_NP = @GL_GNULIB_SIGDESCR_NP@ -GL_GNULIB_SIGNAL_H_SIGPIPE = @GL_GNULIB_SIGNAL_H_SIGPIPE@ -GL_GNULIB_SIGNBIT = @GL_GNULIB_SIGNBIT@ -GL_GNULIB_SIGPROCMASK = @GL_GNULIB_SIGPROCMASK@ -GL_GNULIB_SINF = @GL_GNULIB_SINF@ -GL_GNULIB_SINHF = @GL_GNULIB_SINHF@ -GL_GNULIB_SINL = @GL_GNULIB_SINL@ -GL_GNULIB_SLEEP = @GL_GNULIB_SLEEP@ -GL_GNULIB_SNPRINTF = @GL_GNULIB_SNPRINTF@ -GL_GNULIB_SPRINTF_POSIX = @GL_GNULIB_SPRINTF_POSIX@ -GL_GNULIB_SQRTF = @GL_GNULIB_SQRTF@ -GL_GNULIB_SQRTL = @GL_GNULIB_SQRTL@ -GL_GNULIB_STAT = @GL_GNULIB_STAT@ -GL_GNULIB_STDIO_H_NONBLOCKING = @GL_GNULIB_STDIO_H_NONBLOCKING@ -GL_GNULIB_STDIO_H_SIGPIPE = @GL_GNULIB_STDIO_H_SIGPIPE@ -GL_GNULIB_STPCPY = @GL_GNULIB_STPCPY@ -GL_GNULIB_STPNCPY = @GL_GNULIB_STPNCPY@ -GL_GNULIB_STRCASESTR = @GL_GNULIB_STRCASESTR@ -GL_GNULIB_STRCHRNUL = @GL_GNULIB_STRCHRNUL@ -GL_GNULIB_STRDUP = @GL_GNULIB_STRDUP@ -GL_GNULIB_STRERROR = @GL_GNULIB_STRERROR@ -GL_GNULIB_STRERRORNAME_NP = @GL_GNULIB_STRERRORNAME_NP@ -GL_GNULIB_STRERROR_R = @GL_GNULIB_STRERROR_R@ -GL_GNULIB_STRFTIME = @GL_GNULIB_STRFTIME@ -GL_GNULIB_STRNCAT = @GL_GNULIB_STRNCAT@ -GL_GNULIB_STRNDUP = @GL_GNULIB_STRNDUP@ -GL_GNULIB_STRNLEN = @GL_GNULIB_STRNLEN@ -GL_GNULIB_STRPBRK = @GL_GNULIB_STRPBRK@ -GL_GNULIB_STRPTIME = @GL_GNULIB_STRPTIME@ -GL_GNULIB_STRSEP = @GL_GNULIB_STRSEP@ -GL_GNULIB_STRSIGNAL = @GL_GNULIB_STRSIGNAL@ -GL_GNULIB_STRSTR = @GL_GNULIB_STRSTR@ -GL_GNULIB_STRTOD = @GL_GNULIB_STRTOD@ -GL_GNULIB_STRTOIMAX = @GL_GNULIB_STRTOIMAX@ -GL_GNULIB_STRTOK_R = @GL_GNULIB_STRTOK_R@ -GL_GNULIB_STRTOL = @GL_GNULIB_STRTOL@ -GL_GNULIB_STRTOLD = @GL_GNULIB_STRTOLD@ -GL_GNULIB_STRTOLL = @GL_GNULIB_STRTOLL@ -GL_GNULIB_STRTOUL = @GL_GNULIB_STRTOUL@ -GL_GNULIB_STRTOULL = @GL_GNULIB_STRTOULL@ -GL_GNULIB_STRTOUMAX = @GL_GNULIB_STRTOUMAX@ -GL_GNULIB_STRVERSCMP = @GL_GNULIB_STRVERSCMP@ -GL_GNULIB_SYMLINK = @GL_GNULIB_SYMLINK@ -GL_GNULIB_SYMLINKAT = @GL_GNULIB_SYMLINKAT@ -GL_GNULIB_SYSTEM_POSIX = @GL_GNULIB_SYSTEM_POSIX@ -GL_GNULIB_TANF = @GL_GNULIB_TANF@ -GL_GNULIB_TANHF = @GL_GNULIB_TANHF@ -GL_GNULIB_TANL = @GL_GNULIB_TANL@ -GL_GNULIB_TIME = @GL_GNULIB_TIME@ -GL_GNULIB_TIMEGM = @GL_GNULIB_TIMEGM@ -GL_GNULIB_TIMESPEC_GET = @GL_GNULIB_TIMESPEC_GET@ -GL_GNULIB_TIMESPEC_GETRES = @GL_GNULIB_TIMESPEC_GETRES@ -GL_GNULIB_TIME_R = @GL_GNULIB_TIME_R@ -GL_GNULIB_TIME_RZ = @GL_GNULIB_TIME_RZ@ -GL_GNULIB_TMPFILE = @GL_GNULIB_TMPFILE@ -GL_GNULIB_TRUNC = @GL_GNULIB_TRUNC@ -GL_GNULIB_TRUNCATE = @GL_GNULIB_TRUNCATE@ -GL_GNULIB_TRUNCF = @GL_GNULIB_TRUNCF@ -GL_GNULIB_TRUNCL = @GL_GNULIB_TRUNCL@ -GL_GNULIB_TTYNAME_R = @GL_GNULIB_TTYNAME_R@ -GL_GNULIB_TZSET = @GL_GNULIB_TZSET@ -GL_GNULIB_UNISTD_H_GETOPT = @GL_GNULIB_UNISTD_H_GETOPT@ -GL_GNULIB_UNISTD_H_NONBLOCKING = @GL_GNULIB_UNISTD_H_NONBLOCKING@ -GL_GNULIB_UNISTD_H_SIGPIPE = @GL_GNULIB_UNISTD_H_SIGPIPE@ -GL_GNULIB_UNLINK = @GL_GNULIB_UNLINK@ -GL_GNULIB_UNLINKAT = @GL_GNULIB_UNLINKAT@ -GL_GNULIB_UNLOCKPT = @GL_GNULIB_UNLOCKPT@ -GL_GNULIB_UNSETENV = @GL_GNULIB_UNSETENV@ -GL_GNULIB_USLEEP = @GL_GNULIB_USLEEP@ -GL_GNULIB_UTIMENSAT = @GL_GNULIB_UTIMENSAT@ -GL_GNULIB_VASPRINTF = @GL_GNULIB_VASPRINTF@ -GL_GNULIB_VDPRINTF = @GL_GNULIB_VDPRINTF@ -GL_GNULIB_VFPRINTF = @GL_GNULIB_VFPRINTF@ -GL_GNULIB_VFPRINTF_POSIX = @GL_GNULIB_VFPRINTF_POSIX@ -GL_GNULIB_VFSCANF = @GL_GNULIB_VFSCANF@ -GL_GNULIB_VPRINTF = @GL_GNULIB_VPRINTF@ -GL_GNULIB_VPRINTF_POSIX = @GL_GNULIB_VPRINTF_POSIX@ -GL_GNULIB_VSCANF = @GL_GNULIB_VSCANF@ -GL_GNULIB_VSNPRINTF = @GL_GNULIB_VSNPRINTF@ -GL_GNULIB_VSPRINTF_POSIX = @GL_GNULIB_VSPRINTF_POSIX@ -GL_GNULIB_WCPCPY = @GL_GNULIB_WCPCPY@ -GL_GNULIB_WCPNCPY = @GL_GNULIB_WCPNCPY@ -GL_GNULIB_WCRTOMB = @GL_GNULIB_WCRTOMB@ -GL_GNULIB_WCSCASECMP = @GL_GNULIB_WCSCASECMP@ -GL_GNULIB_WCSCAT = @GL_GNULIB_WCSCAT@ -GL_GNULIB_WCSCHR = @GL_GNULIB_WCSCHR@ -GL_GNULIB_WCSCMP = @GL_GNULIB_WCSCMP@ -GL_GNULIB_WCSCOLL = @GL_GNULIB_WCSCOLL@ -GL_GNULIB_WCSCPY = @GL_GNULIB_WCSCPY@ -GL_GNULIB_WCSCSPN = @GL_GNULIB_WCSCSPN@ -GL_GNULIB_WCSDUP = @GL_GNULIB_WCSDUP@ -GL_GNULIB_WCSFTIME = @GL_GNULIB_WCSFTIME@ -GL_GNULIB_WCSLEN = @GL_GNULIB_WCSLEN@ -GL_GNULIB_WCSNCASECMP = @GL_GNULIB_WCSNCASECMP@ -GL_GNULIB_WCSNCAT = @GL_GNULIB_WCSNCAT@ -GL_GNULIB_WCSNCMP = @GL_GNULIB_WCSNCMP@ -GL_GNULIB_WCSNCPY = @GL_GNULIB_WCSNCPY@ -GL_GNULIB_WCSNLEN = @GL_GNULIB_WCSNLEN@ -GL_GNULIB_WCSNRTOMBS = @GL_GNULIB_WCSNRTOMBS@ -GL_GNULIB_WCSPBRK = @GL_GNULIB_WCSPBRK@ -GL_GNULIB_WCSRCHR = @GL_GNULIB_WCSRCHR@ -GL_GNULIB_WCSRTOMBS = @GL_GNULIB_WCSRTOMBS@ -GL_GNULIB_WCSSPN = @GL_GNULIB_WCSSPN@ -GL_GNULIB_WCSSTR = @GL_GNULIB_WCSSTR@ -GL_GNULIB_WCSTOK = @GL_GNULIB_WCSTOK@ -GL_GNULIB_WCSWIDTH = @GL_GNULIB_WCSWIDTH@ -GL_GNULIB_WCSXFRM = @GL_GNULIB_WCSXFRM@ -GL_GNULIB_WCTOB = @GL_GNULIB_WCTOB@ -GL_GNULIB_WCTOMB = @GL_GNULIB_WCTOMB@ -GL_GNULIB_WCWIDTH = @GL_GNULIB_WCWIDTH@ -GL_GNULIB_WMEMCHR = @GL_GNULIB_WMEMCHR@ -GL_GNULIB_WMEMCMP = @GL_GNULIB_WMEMCMP@ -GL_GNULIB_WMEMCPY = @GL_GNULIB_WMEMCPY@ -GL_GNULIB_WMEMMOVE = @GL_GNULIB_WMEMMOVE@ -GL_GNULIB_WMEMPCPY = @GL_GNULIB_WMEMPCPY@ -GL_GNULIB_WMEMSET = @GL_GNULIB_WMEMSET@ -GL_GNULIB_WRITE = @GL_GNULIB_WRITE@ -GL_GNULIB__EXIT = @GL_GNULIB__EXIT@ -GNULIBHEADERS_OVERRIDE_WINT_T = @GNULIBHEADERS_OVERRIDE_WINT_T@ +GNULIB_ACCESS = @GNULIB_ACCESS@ +GNULIB_ACOSF = @GNULIB_ACOSF@ +GNULIB_ACOSL = @GNULIB_ACOSL@ +GNULIB_ALIGNED_ALLOC = @GNULIB_ALIGNED_ALLOC@ +GNULIB_ASINF = @GNULIB_ASINF@ +GNULIB_ASINL = @GNULIB_ASINL@ +GNULIB_ATAN2F = @GNULIB_ATAN2F@ +GNULIB_ATANF = @GNULIB_ATANF@ +GNULIB_ATANL = @GNULIB_ATANL@ +GNULIB_ATOLL = @GNULIB_ATOLL@ +GNULIB_BTOWC = @GNULIB_BTOWC@ +GNULIB_CALLOC_POSIX = @GNULIB_CALLOC_POSIX@ +GNULIB_CANONICALIZE_FILE_NAME = @GNULIB_CANONICALIZE_FILE_NAME@ +GNULIB_CBRT = @GNULIB_CBRT@ +GNULIB_CBRTF = @GNULIB_CBRTF@ +GNULIB_CBRTL = @GNULIB_CBRTL@ +GNULIB_CEIL = @GNULIB_CEIL@ +GNULIB_CEILF = @GNULIB_CEILF@ +GNULIB_CEILL = @GNULIB_CEILL@ +GNULIB_CHDIR = @GNULIB_CHDIR@ +GNULIB_CHOWN = @GNULIB_CHOWN@ +GNULIB_CLOSE = @GNULIB_CLOSE@ +GNULIB_COPYSIGN = @GNULIB_COPYSIGN@ +GNULIB_COPYSIGNF = @GNULIB_COPYSIGNF@ +GNULIB_COPYSIGNL = @GNULIB_COPYSIGNL@ +GNULIB_COPY_FILE_RANGE = @GNULIB_COPY_FILE_RANGE@ +GNULIB_COSF = @GNULIB_COSF@ +GNULIB_COSHF = @GNULIB_COSHF@ +GNULIB_COSL = @GNULIB_COSL@ +GNULIB_CREAT = @GNULIB_CREAT@ +GNULIB_CTIME = @GNULIB_CTIME@ +GNULIB_DPRINTF = @GNULIB_DPRINTF@ +GNULIB_DUP = @GNULIB_DUP@ +GNULIB_DUP2 = @GNULIB_DUP2@ +GNULIB_DUP3 = @GNULIB_DUP3@ +GNULIB_ENVIRON = @GNULIB_ENVIRON@ +GNULIB_EUIDACCESS = @GNULIB_EUIDACCESS@ +GNULIB_EXECL = @GNULIB_EXECL@ +GNULIB_EXECLE = @GNULIB_EXECLE@ +GNULIB_EXECLP = @GNULIB_EXECLP@ +GNULIB_EXECV = @GNULIB_EXECV@ +GNULIB_EXECVE = @GNULIB_EXECVE@ +GNULIB_EXECVP = @GNULIB_EXECVP@ +GNULIB_EXECVPE = @GNULIB_EXECVPE@ +GNULIB_EXP2 = @GNULIB_EXP2@ +GNULIB_EXP2F = @GNULIB_EXP2F@ +GNULIB_EXP2L = @GNULIB_EXP2L@ +GNULIB_EXPF = @GNULIB_EXPF@ +GNULIB_EXPL = @GNULIB_EXPL@ +GNULIB_EXPLICIT_BZERO = @GNULIB_EXPLICIT_BZERO@ +GNULIB_EXPM1 = @GNULIB_EXPM1@ +GNULIB_EXPM1F = @GNULIB_EXPM1F@ +GNULIB_EXPM1L = @GNULIB_EXPM1L@ +GNULIB_FABSF = @GNULIB_FABSF@ +GNULIB_FABSL = @GNULIB_FABSL@ +GNULIB_FACCESSAT = @GNULIB_FACCESSAT@ +GNULIB_FCHDIR = @GNULIB_FCHDIR@ +GNULIB_FCHMODAT = @GNULIB_FCHMODAT@ +GNULIB_FCHOWNAT = @GNULIB_FCHOWNAT@ +GNULIB_FCLOSE = @GNULIB_FCLOSE@ +GNULIB_FCNTL = @GNULIB_FCNTL@ +GNULIB_FDATASYNC = @GNULIB_FDATASYNC@ +GNULIB_FDOPEN = @GNULIB_FDOPEN@ +GNULIB_FFLUSH = @GNULIB_FFLUSH@ +GNULIB_FFSL = @GNULIB_FFSL@ +GNULIB_FFSLL = @GNULIB_FFSLL@ +GNULIB_FGETC = @GNULIB_FGETC@ +GNULIB_FGETS = @GNULIB_FGETS@ +GNULIB_FLOOR = @GNULIB_FLOOR@ +GNULIB_FLOORF = @GNULIB_FLOORF@ +GNULIB_FLOORL = @GNULIB_FLOORL@ +GNULIB_FMA = @GNULIB_FMA@ +GNULIB_FMAF = @GNULIB_FMAF@ +GNULIB_FMAL = @GNULIB_FMAL@ +GNULIB_FMOD = @GNULIB_FMOD@ +GNULIB_FMODF = @GNULIB_FMODF@ +GNULIB_FMODL = @GNULIB_FMODL@ +GNULIB_FOPEN = @GNULIB_FOPEN@ +GNULIB_FPRINTF = @GNULIB_FPRINTF@ +GNULIB_FPRINTF_POSIX = @GNULIB_FPRINTF_POSIX@ +GNULIB_FPURGE = @GNULIB_FPURGE@ +GNULIB_FPUTC = @GNULIB_FPUTC@ +GNULIB_FPUTS = @GNULIB_FPUTS@ +GNULIB_FREAD = @GNULIB_FREAD@ +GNULIB_FREE_POSIX = @GNULIB_FREE_POSIX@ +GNULIB_FREOPEN = @GNULIB_FREOPEN@ +GNULIB_FREXP = @GNULIB_FREXP@ +GNULIB_FREXPF = @GNULIB_FREXPF@ +GNULIB_FREXPL = @GNULIB_FREXPL@ +GNULIB_FSCANF = @GNULIB_FSCANF@ +GNULIB_FSEEK = @GNULIB_FSEEK@ +GNULIB_FSEEKO = @GNULIB_FSEEKO@ +GNULIB_FSTAT = @GNULIB_FSTAT@ +GNULIB_FSTATAT = @GNULIB_FSTATAT@ +GNULIB_FSYNC = @GNULIB_FSYNC@ +GNULIB_FTELL = @GNULIB_FTELL@ +GNULIB_FTELLO = @GNULIB_FTELLO@ +GNULIB_FTRUNCATE = @GNULIB_FTRUNCATE@ +GNULIB_FUTIMENS = @GNULIB_FUTIMENS@ +GNULIB_FWRITE = @GNULIB_FWRITE@ +GNULIB_GETC = @GNULIB_GETC@ +GNULIB_GETCHAR = @GNULIB_GETCHAR@ +GNULIB_GETCWD = @GNULIB_GETCWD@ +GNULIB_GETDELIM = @GNULIB_GETDELIM@ +GNULIB_GETDOMAINNAME = @GNULIB_GETDOMAINNAME@ +GNULIB_GETDTABLESIZE = @GNULIB_GETDTABLESIZE@ +GNULIB_GETENTROPY = @GNULIB_GETENTROPY@ +GNULIB_GETGROUPS = @GNULIB_GETGROUPS@ +GNULIB_GETHOSTNAME = @GNULIB_GETHOSTNAME@ +GNULIB_GETLINE = @GNULIB_GETLINE@ +GNULIB_GETLOADAVG = @GNULIB_GETLOADAVG@ +GNULIB_GETLOGIN = @GNULIB_GETLOGIN@ +GNULIB_GETLOGIN_R = @GNULIB_GETLOGIN_R@ +GNULIB_GETOPT_POSIX = @GNULIB_GETOPT_POSIX@ +GNULIB_GETPAGESIZE = @GNULIB_GETPAGESIZE@ +GNULIB_GETPASS = @GNULIB_GETPASS@ +GNULIB_GETSUBOPT = @GNULIB_GETSUBOPT@ GNULIB_GETTIMEOFDAY = @GNULIB_GETTIMEOFDAY@ +GNULIB_GETUMASK = @GNULIB_GETUMASK@ +GNULIB_GETUSERSHELL = @GNULIB_GETUSERSHELL@ +GNULIB_GL_UNISTD_H_GETOPT = @GNULIB_GL_UNISTD_H_GETOPT@ +GNULIB_GRANTPT = @GNULIB_GRANTPT@ +GNULIB_GROUP_MEMBER = @GNULIB_GROUP_MEMBER@ +GNULIB_HYPOT = @GNULIB_HYPOT@ +GNULIB_HYPOTF = @GNULIB_HYPOTF@ +GNULIB_HYPOTL = @GNULIB_HYPOTL@ +GNULIB_ILOGB = @GNULIB_ILOGB@ +GNULIB_ILOGBF = @GNULIB_ILOGBF@ +GNULIB_ILOGBL = @GNULIB_ILOGBL@ +GNULIB_IMAXABS = @GNULIB_IMAXABS@ +GNULIB_IMAXDIV = @GNULIB_IMAXDIV@ +GNULIB_ISATTY = @GNULIB_ISATTY@ +GNULIB_ISFINITE = @GNULIB_ISFINITE@ +GNULIB_ISINF = @GNULIB_ISINF@ +GNULIB_ISNAN = @GNULIB_ISNAN@ +GNULIB_ISNAND = @GNULIB_ISNAND@ +GNULIB_ISNANF = @GNULIB_ISNANF@ +GNULIB_ISNANL = @GNULIB_ISNANL@ +GNULIB_LCHMOD = @GNULIB_LCHMOD@ +GNULIB_LCHOWN = @GNULIB_LCHOWN@ +GNULIB_LDEXPF = @GNULIB_LDEXPF@ +GNULIB_LDEXPL = @GNULIB_LDEXPL@ +GNULIB_LINK = @GNULIB_LINK@ +GNULIB_LINKAT = @GNULIB_LINKAT@ +GNULIB_LOCALTIME = @GNULIB_LOCALTIME@ +GNULIB_LOG = @GNULIB_LOG@ +GNULIB_LOG10 = @GNULIB_LOG10@ +GNULIB_LOG10F = @GNULIB_LOG10F@ +GNULIB_LOG10L = @GNULIB_LOG10L@ +GNULIB_LOG1P = @GNULIB_LOG1P@ +GNULIB_LOG1PF = @GNULIB_LOG1PF@ +GNULIB_LOG1PL = @GNULIB_LOG1PL@ +GNULIB_LOG2 = @GNULIB_LOG2@ +GNULIB_LOG2F = @GNULIB_LOG2F@ +GNULIB_LOG2L = @GNULIB_LOG2L@ +GNULIB_LOGB = @GNULIB_LOGB@ +GNULIB_LOGBF = @GNULIB_LOGBF@ +GNULIB_LOGBL = @GNULIB_LOGBL@ +GNULIB_LOGF = @GNULIB_LOGF@ +GNULIB_LOGL = @GNULIB_LOGL@ +GNULIB_LSEEK = @GNULIB_LSEEK@ +GNULIB_LSTAT = @GNULIB_LSTAT@ +GNULIB_MALLOC_POSIX = @GNULIB_MALLOC_POSIX@ +GNULIB_MBRLEN = @GNULIB_MBRLEN@ +GNULIB_MBRTOWC = @GNULIB_MBRTOWC@ +GNULIB_MBSCASECMP = @GNULIB_MBSCASECMP@ +GNULIB_MBSCASESTR = @GNULIB_MBSCASESTR@ +GNULIB_MBSCHR = @GNULIB_MBSCHR@ +GNULIB_MBSCSPN = @GNULIB_MBSCSPN@ +GNULIB_MBSINIT = @GNULIB_MBSINIT@ +GNULIB_MBSLEN = @GNULIB_MBSLEN@ +GNULIB_MBSNCASECMP = @GNULIB_MBSNCASECMP@ +GNULIB_MBSNLEN = @GNULIB_MBSNLEN@ +GNULIB_MBSNRTOWCS = @GNULIB_MBSNRTOWCS@ +GNULIB_MBSPBRK = @GNULIB_MBSPBRK@ +GNULIB_MBSPCASECMP = @GNULIB_MBSPCASECMP@ +GNULIB_MBSRCHR = @GNULIB_MBSRCHR@ +GNULIB_MBSRTOWCS = @GNULIB_MBSRTOWCS@ +GNULIB_MBSSEP = @GNULIB_MBSSEP@ +GNULIB_MBSSPN = @GNULIB_MBSSPN@ +GNULIB_MBSSTR = @GNULIB_MBSSTR@ +GNULIB_MBSTOK_R = @GNULIB_MBSTOK_R@ +GNULIB_MBTOWC = @GNULIB_MBTOWC@ +GNULIB_MDA_ACCESS = @GNULIB_MDA_ACCESS@ +GNULIB_MDA_CHDIR = @GNULIB_MDA_CHDIR@ +GNULIB_MDA_CHMOD = @GNULIB_MDA_CHMOD@ +GNULIB_MDA_CLOSE = @GNULIB_MDA_CLOSE@ +GNULIB_MDA_CREAT = @GNULIB_MDA_CREAT@ +GNULIB_MDA_DUP = @GNULIB_MDA_DUP@ +GNULIB_MDA_DUP2 = @GNULIB_MDA_DUP2@ +GNULIB_MDA_ECVT = @GNULIB_MDA_ECVT@ +GNULIB_MDA_EXECL = @GNULIB_MDA_EXECL@ +GNULIB_MDA_EXECLE = @GNULIB_MDA_EXECLE@ +GNULIB_MDA_EXECLP = @GNULIB_MDA_EXECLP@ +GNULIB_MDA_EXECV = @GNULIB_MDA_EXECV@ +GNULIB_MDA_EXECVE = @GNULIB_MDA_EXECVE@ +GNULIB_MDA_EXECVP = @GNULIB_MDA_EXECVP@ +GNULIB_MDA_EXECVPE = @GNULIB_MDA_EXECVPE@ +GNULIB_MDA_FCLOSEALL = @GNULIB_MDA_FCLOSEALL@ +GNULIB_MDA_FCVT = @GNULIB_MDA_FCVT@ +GNULIB_MDA_FDOPEN = @GNULIB_MDA_FDOPEN@ +GNULIB_MDA_FILENO = @GNULIB_MDA_FILENO@ +GNULIB_MDA_GCVT = @GNULIB_MDA_GCVT@ +GNULIB_MDA_GETCWD = @GNULIB_MDA_GETCWD@ +GNULIB_MDA_GETPID = @GNULIB_MDA_GETPID@ +GNULIB_MDA_GETW = @GNULIB_MDA_GETW@ +GNULIB_MDA_ISATTY = @GNULIB_MDA_ISATTY@ +GNULIB_MDA_J0 = @GNULIB_MDA_J0@ +GNULIB_MDA_J1 = @GNULIB_MDA_J1@ +GNULIB_MDA_JN = @GNULIB_MDA_JN@ +GNULIB_MDA_LSEEK = @GNULIB_MDA_LSEEK@ +GNULIB_MDA_MEMCCPY = @GNULIB_MDA_MEMCCPY@ +GNULIB_MDA_MKDIR = @GNULIB_MDA_MKDIR@ +GNULIB_MDA_MKTEMP = @GNULIB_MDA_MKTEMP@ +GNULIB_MDA_OPEN = @GNULIB_MDA_OPEN@ +GNULIB_MDA_PUTENV = @GNULIB_MDA_PUTENV@ +GNULIB_MDA_PUTW = @GNULIB_MDA_PUTW@ +GNULIB_MDA_READ = @GNULIB_MDA_READ@ +GNULIB_MDA_RMDIR = @GNULIB_MDA_RMDIR@ +GNULIB_MDA_STRDUP = @GNULIB_MDA_STRDUP@ +GNULIB_MDA_SWAB = @GNULIB_MDA_SWAB@ +GNULIB_MDA_TEMPNAM = @GNULIB_MDA_TEMPNAM@ +GNULIB_MDA_TZSET = @GNULIB_MDA_TZSET@ +GNULIB_MDA_UMASK = @GNULIB_MDA_UMASK@ +GNULIB_MDA_UNLINK = @GNULIB_MDA_UNLINK@ +GNULIB_MDA_WCSDUP = @GNULIB_MDA_WCSDUP@ +GNULIB_MDA_WRITE = @GNULIB_MDA_WRITE@ +GNULIB_MDA_Y0 = @GNULIB_MDA_Y0@ +GNULIB_MDA_Y1 = @GNULIB_MDA_Y1@ +GNULIB_MDA_YN = @GNULIB_MDA_YN@ +GNULIB_MEMCHR = @GNULIB_MEMCHR@ +GNULIB_MEMMEM = @GNULIB_MEMMEM@ +GNULIB_MEMPCPY = @GNULIB_MEMPCPY@ +GNULIB_MEMRCHR = @GNULIB_MEMRCHR@ +GNULIB_MKDIR = @GNULIB_MKDIR@ +GNULIB_MKDIRAT = @GNULIB_MKDIRAT@ +GNULIB_MKDTEMP = @GNULIB_MKDTEMP@ +GNULIB_MKFIFO = @GNULIB_MKFIFO@ +GNULIB_MKFIFOAT = @GNULIB_MKFIFOAT@ +GNULIB_MKNOD = @GNULIB_MKNOD@ +GNULIB_MKNODAT = @GNULIB_MKNODAT@ +GNULIB_MKOSTEMP = @GNULIB_MKOSTEMP@ +GNULIB_MKOSTEMPS = @GNULIB_MKOSTEMPS@ +GNULIB_MKSTEMP = @GNULIB_MKSTEMP@ +GNULIB_MKSTEMPS = @GNULIB_MKSTEMPS@ +GNULIB_MKTIME = @GNULIB_MKTIME@ +GNULIB_MODF = @GNULIB_MODF@ +GNULIB_MODFF = @GNULIB_MODFF@ +GNULIB_MODFL = @GNULIB_MODFL@ +GNULIB_NANOSLEEP = @GNULIB_NANOSLEEP@ +GNULIB_NONBLOCKING = @GNULIB_NONBLOCKING@ +GNULIB_OBSTACK_PRINTF = @GNULIB_OBSTACK_PRINTF@ +GNULIB_OBSTACK_PRINTF_POSIX = @GNULIB_OBSTACK_PRINTF_POSIX@ +GNULIB_OPEN = @GNULIB_OPEN@ +GNULIB_OPENAT = @GNULIB_OPENAT@ +GNULIB_OVERRIDES_STRUCT_STAT = @GNULIB_OVERRIDES_STRUCT_STAT@ +GNULIB_OVERRIDES_WINT_T = @GNULIB_OVERRIDES_WINT_T@ +GNULIB_PCLOSE = @GNULIB_PCLOSE@ +GNULIB_PERROR = @GNULIB_PERROR@ +GNULIB_PIPE = @GNULIB_PIPE@ +GNULIB_PIPE2 = @GNULIB_PIPE2@ +GNULIB_POPEN = @GNULIB_POPEN@ +GNULIB_POSIX_MEMALIGN = @GNULIB_POSIX_MEMALIGN@ +GNULIB_POSIX_OPENPT = @GNULIB_POSIX_OPENPT@ +GNULIB_POWF = @GNULIB_POWF@ +GNULIB_PREAD = @GNULIB_PREAD@ +GNULIB_PRINTF = @GNULIB_PRINTF@ +GNULIB_PRINTF_POSIX = @GNULIB_PRINTF_POSIX@ +GNULIB_PTHREAD_SIGMASK = @GNULIB_PTHREAD_SIGMASK@ +GNULIB_PTSNAME = @GNULIB_PTSNAME@ +GNULIB_PTSNAME_R = @GNULIB_PTSNAME_R@ +GNULIB_PUTC = @GNULIB_PUTC@ +GNULIB_PUTCHAR = @GNULIB_PUTCHAR@ +GNULIB_PUTENV = @GNULIB_PUTENV@ +GNULIB_PUTS = @GNULIB_PUTS@ +GNULIB_PWRITE = @GNULIB_PWRITE@ +GNULIB_QSORT_R = @GNULIB_QSORT_R@ +GNULIB_RAISE = @GNULIB_RAISE@ +GNULIB_RANDOM = @GNULIB_RANDOM@ +GNULIB_RANDOM_R = @GNULIB_RANDOM_R@ +GNULIB_RAWMEMCHR = @GNULIB_RAWMEMCHR@ +GNULIB_READ = @GNULIB_READ@ +GNULIB_READLINK = @GNULIB_READLINK@ +GNULIB_READLINKAT = @GNULIB_READLINKAT@ +GNULIB_REALLOCARRAY = @GNULIB_REALLOCARRAY@ +GNULIB_REALLOC_POSIX = @GNULIB_REALLOC_POSIX@ +GNULIB_REALPATH = @GNULIB_REALPATH@ +GNULIB_REMAINDER = @GNULIB_REMAINDER@ +GNULIB_REMAINDERF = @GNULIB_REMAINDERF@ +GNULIB_REMAINDERL = @GNULIB_REMAINDERL@ +GNULIB_REMOVE = @GNULIB_REMOVE@ +GNULIB_RENAME = @GNULIB_RENAME@ +GNULIB_RENAMEAT = @GNULIB_RENAMEAT@ +GNULIB_RINT = @GNULIB_RINT@ +GNULIB_RINTF = @GNULIB_RINTF@ +GNULIB_RINTL = @GNULIB_RINTL@ +GNULIB_RMDIR = @GNULIB_RMDIR@ +GNULIB_ROUND = @GNULIB_ROUND@ +GNULIB_ROUNDF = @GNULIB_ROUNDF@ +GNULIB_ROUNDL = @GNULIB_ROUNDL@ +GNULIB_RPMATCH = @GNULIB_RPMATCH@ +GNULIB_SCANF = @GNULIB_SCANF@ +GNULIB_SECURE_GETENV = @GNULIB_SECURE_GETENV@ +GNULIB_SETENV = @GNULIB_SETENV@ +GNULIB_SETHOSTNAME = @GNULIB_SETHOSTNAME@ +GNULIB_SIGABBREV_NP = @GNULIB_SIGABBREV_NP@ +GNULIB_SIGACTION = @GNULIB_SIGACTION@ +GNULIB_SIGDESCR_NP = @GNULIB_SIGDESCR_NP@ +GNULIB_SIGNAL_H_SIGPIPE = @GNULIB_SIGNAL_H_SIGPIPE@ +GNULIB_SIGNBIT = @GNULIB_SIGNBIT@ +GNULIB_SIGPROCMASK = @GNULIB_SIGPROCMASK@ +GNULIB_SINF = @GNULIB_SINF@ +GNULIB_SINHF = @GNULIB_SINHF@ +GNULIB_SINL = @GNULIB_SINL@ +GNULIB_SLEEP = @GNULIB_SLEEP@ +GNULIB_SNPRINTF = @GNULIB_SNPRINTF@ +GNULIB_SPRINTF_POSIX = @GNULIB_SPRINTF_POSIX@ +GNULIB_SQRTF = @GNULIB_SQRTF@ +GNULIB_SQRTL = @GNULIB_SQRTL@ +GNULIB_STAT = @GNULIB_STAT@ +GNULIB_STDIO_H_NONBLOCKING = @GNULIB_STDIO_H_NONBLOCKING@ +GNULIB_STDIO_H_SIGPIPE = @GNULIB_STDIO_H_SIGPIPE@ +GNULIB_STPCPY = @GNULIB_STPCPY@ +GNULIB_STPNCPY = @GNULIB_STPNCPY@ +GNULIB_STRCASESTR = @GNULIB_STRCASESTR@ +GNULIB_STRCHRNUL = @GNULIB_STRCHRNUL@ +GNULIB_STRDUP = @GNULIB_STRDUP@ +GNULIB_STRERROR = @GNULIB_STRERROR@ +GNULIB_STRERRORNAME_NP = @GNULIB_STRERRORNAME_NP@ +GNULIB_STRERROR_R = @GNULIB_STRERROR_R@ +GNULIB_STRFTIME = @GNULIB_STRFTIME@ +GNULIB_STRNCAT = @GNULIB_STRNCAT@ +GNULIB_STRNDUP = @GNULIB_STRNDUP@ +GNULIB_STRNLEN = @GNULIB_STRNLEN@ +GNULIB_STRPBRK = @GNULIB_STRPBRK@ +GNULIB_STRPTIME = @GNULIB_STRPTIME@ +GNULIB_STRSEP = @GNULIB_STRSEP@ +GNULIB_STRSIGNAL = @GNULIB_STRSIGNAL@ +GNULIB_STRSTR = @GNULIB_STRSTR@ +GNULIB_STRTOD = @GNULIB_STRTOD@ +GNULIB_STRTOIMAX = @GNULIB_STRTOIMAX@ +GNULIB_STRTOK_R = @GNULIB_STRTOK_R@ +GNULIB_STRTOLD = @GNULIB_STRTOLD@ +GNULIB_STRTOLL = @GNULIB_STRTOLL@ +GNULIB_STRTOULL = @GNULIB_STRTOULL@ +GNULIB_STRTOUMAX = @GNULIB_STRTOUMAX@ +GNULIB_STRVERSCMP = @GNULIB_STRVERSCMP@ +GNULIB_SYMLINK = @GNULIB_SYMLINK@ +GNULIB_SYMLINKAT = @GNULIB_SYMLINKAT@ +GNULIB_SYSTEM_POSIX = @GNULIB_SYSTEM_POSIX@ +GNULIB_TANF = @GNULIB_TANF@ +GNULIB_TANHF = @GNULIB_TANHF@ +GNULIB_TANL = @GNULIB_TANL@ +GNULIB_TIMEGM = @GNULIB_TIMEGM@ +GNULIB_TIMESPEC_GET = @GNULIB_TIMESPEC_GET@ +GNULIB_TIME_R = @GNULIB_TIME_R@ +GNULIB_TIME_RZ = @GNULIB_TIME_RZ@ +GNULIB_TMPFILE = @GNULIB_TMPFILE@ +GNULIB_TRUNC = @GNULIB_TRUNC@ +GNULIB_TRUNCATE = @GNULIB_TRUNCATE@ +GNULIB_TRUNCF = @GNULIB_TRUNCF@ +GNULIB_TRUNCL = @GNULIB_TRUNCL@ +GNULIB_TTYNAME_R = @GNULIB_TTYNAME_R@ +GNULIB_TZSET = @GNULIB_TZSET@ +GNULIB_UNISTD_H_NONBLOCKING = @GNULIB_UNISTD_H_NONBLOCKING@ +GNULIB_UNISTD_H_SIGPIPE = @GNULIB_UNISTD_H_SIGPIPE@ +GNULIB_UNLINK = @GNULIB_UNLINK@ +GNULIB_UNLINKAT = @GNULIB_UNLINKAT@ +GNULIB_UNLOCKPT = @GNULIB_UNLOCKPT@ +GNULIB_UNSETENV = @GNULIB_UNSETENV@ +GNULIB_USLEEP = @GNULIB_USLEEP@ +GNULIB_UTIMENSAT = @GNULIB_UTIMENSAT@ +GNULIB_VASPRINTF = @GNULIB_VASPRINTF@ +GNULIB_VDPRINTF = @GNULIB_VDPRINTF@ +GNULIB_VFPRINTF = @GNULIB_VFPRINTF@ +GNULIB_VFPRINTF_POSIX = @GNULIB_VFPRINTF_POSIX@ +GNULIB_VFSCANF = @GNULIB_VFSCANF@ +GNULIB_VPRINTF = @GNULIB_VPRINTF@ +GNULIB_VPRINTF_POSIX = @GNULIB_VPRINTF_POSIX@ +GNULIB_VSCANF = @GNULIB_VSCANF@ +GNULIB_VSNPRINTF = @GNULIB_VSNPRINTF@ +GNULIB_VSPRINTF_POSIX = @GNULIB_VSPRINTF_POSIX@ +GNULIB_WCPCPY = @GNULIB_WCPCPY@ +GNULIB_WCPNCPY = @GNULIB_WCPNCPY@ +GNULIB_WCRTOMB = @GNULIB_WCRTOMB@ +GNULIB_WCSCASECMP = @GNULIB_WCSCASECMP@ +GNULIB_WCSCAT = @GNULIB_WCSCAT@ +GNULIB_WCSCHR = @GNULIB_WCSCHR@ +GNULIB_WCSCMP = @GNULIB_WCSCMP@ +GNULIB_WCSCOLL = @GNULIB_WCSCOLL@ +GNULIB_WCSCPY = @GNULIB_WCSCPY@ +GNULIB_WCSCSPN = @GNULIB_WCSCSPN@ +GNULIB_WCSDUP = @GNULIB_WCSDUP@ +GNULIB_WCSFTIME = @GNULIB_WCSFTIME@ +GNULIB_WCSLEN = @GNULIB_WCSLEN@ +GNULIB_WCSNCASECMP = @GNULIB_WCSNCASECMP@ +GNULIB_WCSNCAT = @GNULIB_WCSNCAT@ +GNULIB_WCSNCMP = @GNULIB_WCSNCMP@ +GNULIB_WCSNCPY = @GNULIB_WCSNCPY@ +GNULIB_WCSNLEN = @GNULIB_WCSNLEN@ +GNULIB_WCSNRTOMBS = @GNULIB_WCSNRTOMBS@ +GNULIB_WCSPBRK = @GNULIB_WCSPBRK@ +GNULIB_WCSRCHR = @GNULIB_WCSRCHR@ +GNULIB_WCSRTOMBS = @GNULIB_WCSRTOMBS@ +GNULIB_WCSSPN = @GNULIB_WCSSPN@ +GNULIB_WCSSTR = @GNULIB_WCSSTR@ +GNULIB_WCSTOK = @GNULIB_WCSTOK@ +GNULIB_WCSWIDTH = @GNULIB_WCSWIDTH@ +GNULIB_WCSXFRM = @GNULIB_WCSXFRM@ +GNULIB_WCTOB = @GNULIB_WCTOB@ +GNULIB_WCTOMB = @GNULIB_WCTOMB@ +GNULIB_WCWIDTH = @GNULIB_WCWIDTH@ +GNULIB_WMEMCHR = @GNULIB_WMEMCHR@ +GNULIB_WMEMCMP = @GNULIB_WMEMCMP@ +GNULIB_WMEMCPY = @GNULIB_WMEMCPY@ +GNULIB_WMEMMOVE = @GNULIB_WMEMMOVE@ +GNULIB_WMEMPCPY = @GNULIB_WMEMPCPY@ +GNULIB_WMEMSET = @GNULIB_WMEMSET@ +GNULIB_WRITE = @GNULIB_WRITE@ +GNULIB__EXIT = @GNULIB__EXIT@ GREP = @GREP@ HAVE_ACOSF = @HAVE_ACOSF@ HAVE_ACOSL = @HAVE_ACOSL@ @@ -891,7 +871,6 @@ HAVE_DECL_GETLOGIN_R = @HAVE_DECL_GETLOGIN_R@ HAVE_DECL_GETPAGESIZE = @HAVE_DECL_GETPAGESIZE@ HAVE_DECL_GETUSERSHELL = @HAVE_DECL_GETUSERSHELL@ -HAVE_DECL_GETW = @HAVE_DECL_GETW@ HAVE_DECL_IMAXABS = @HAVE_DECL_IMAXABS@ HAVE_DECL_IMAXDIV = @HAVE_DECL_IMAXDIV@ HAVE_DECL_INITSTATE = @HAVE_DECL_INITSTATE@ @@ -906,8 +885,6 @@ HAVE_DECL_MEMMEM = @HAVE_DECL_MEMMEM@ HAVE_DECL_MEMRCHR = @HAVE_DECL_MEMRCHR@ HAVE_DECL_OBSTACK_PRINTF = @HAVE_DECL_OBSTACK_PRINTF@ -HAVE_DECL_PROGRAM_INVOCATION_NAME = @HAVE_DECL_PROGRAM_INVOCATION_NAME@ -HAVE_DECL_PUTW = @HAVE_DECL_PUTW@ HAVE_DECL_REMAINDER = @HAVE_DECL_REMAINDER@ HAVE_DECL_REMAINDERL = @HAVE_DECL_REMAINDERL@ HAVE_DECL_RINTF = @HAVE_DECL_RINTF@ @@ -941,9 +918,6 @@ HAVE_DECL_WCWIDTH = @HAVE_DECL_WCWIDTH@ HAVE_DPRINTF = @HAVE_DPRINTF@ HAVE_DUP3 = @HAVE_DUP3@ -HAVE_ERROR = @HAVE_ERROR@ -HAVE_ERROR_AT_LINE = @HAVE_ERROR_AT_LINE@ -HAVE_ERROR_H = @HAVE_ERROR_H@ HAVE_EUIDACCESS = @HAVE_EUIDACCESS@ HAVE_EXECVPE = @HAVE_EXECVPE@ HAVE_EXPF = @HAVE_EXPF@ @@ -982,7 +956,6 @@ HAVE_GETOPT_H = @HAVE_GETOPT_H@ HAVE_GETPAGESIZE = @HAVE_GETPAGESIZE@ HAVE_GETPASS = @HAVE_GETPASS@ -HAVE_GETPROGNAME = @HAVE_GETPROGNAME@ HAVE_GETSUBOPT = @HAVE_GETSUBOPT@ HAVE_GETUMASK = @HAVE_GETUMASK@ HAVE_GRANTPT = @HAVE_GRANTPT@ @@ -992,8 +965,6 @@ HAVE_ILOGB = @HAVE_ILOGB@ HAVE_ILOGBF = @HAVE_ILOGBF@ HAVE_ILOGBL = @HAVE_ILOGBL@ -HAVE_IMAXABS = @HAVE_IMAXABS@ -HAVE_IMAXDIV = @HAVE_IMAXDIV@ HAVE_IMAXDIV_T = @HAVE_IMAXDIV_T@ HAVE_INITSTATE = @HAVE_INITSTATE@ HAVE_INTTYPES_H = @HAVE_INTTYPES_H@ @@ -1024,7 +995,6 @@ HAVE_MBSRTOWCS = @HAVE_MBSRTOWCS@ HAVE_MBTOWC = @HAVE_MBTOWC@ HAVE_MEMPCPY = @HAVE_MEMPCPY@ -HAVE_MEMSET_EXPLICIT = @HAVE_MEMSET_EXPLICIT@ HAVE_MKDIRAT = @HAVE_MKDIRAT@ HAVE_MKDTEMP = @HAVE_MKDTEMP@ HAVE_MKFIFO = @HAVE_MKFIFO@ @@ -1100,10 +1070,8 @@ HAVE_STRPTIME = @HAVE_STRPTIME@ HAVE_STRSEP = @HAVE_STRSEP@ HAVE_STRTOD = @HAVE_STRTOD@ -HAVE_STRTOL = @HAVE_STRTOL@ HAVE_STRTOLD = @HAVE_STRTOLD@ HAVE_STRTOLL = @HAVE_STRTOLL@ -HAVE_STRTOUL = @HAVE_STRTOUL@ HAVE_STRTOULL = @HAVE_STRTOULL@ HAVE_STRUCT_RANDOM_DATA = @HAVE_STRUCT_RANDOM_DATA@ HAVE_STRUCT_SIGACTION_SA_SIGACTION = @HAVE_STRUCT_SIGACTION_SA_SIGACTION@ @@ -1121,7 +1089,6 @@ HAVE_TANL = @HAVE_TANL@ HAVE_TIMEGM = @HAVE_TIMEGM@ HAVE_TIMESPEC_GET = @HAVE_TIMESPEC_GET@ -HAVE_TIMESPEC_GETRES = @HAVE_TIMESPEC_GETRES@ HAVE_TIMEZONE_T = @HAVE_TIMEZONE_T@ HAVE_TYPE_VOLATILE_SIG_ATOMIC_T = @HAVE_TYPE_VOLATILE_SIG_ATOMIC_T@ HAVE_UNISTD_H = @HAVE_UNISTD_H@ @@ -1168,6 +1135,7 @@ HAVE_WMEMMOVE = @HAVE_WMEMMOVE@ HAVE_WMEMPCPY = @HAVE_WMEMPCPY@ HAVE_WMEMSET = @HAVE_WMEMSET@ +HAVE__BOOL = @HAVE__BOOL@ HAVE__EXIT = @HAVE__EXIT@ HELP2MAN = @HELP2MAN@ INCLUDE_NEXT = @INCLUDE_NEXT@ @@ -1188,15 +1156,11 @@ LIBS = @LIBS@ LIMITS_H = @LIMITS_H@ LN_S = @LN_S@ -LOCALE_FR_UTF8 = @LOCALE_FR_UTF8@ LTLIBINTL = @LTLIBINTL@ LTLIBOBJS = @LTLIBOBJS@ MAKEINFO = @MAKEINFO@ MKDIR_P = @MKDIR_P@ -NEXT_ASSERT_H = @NEXT_ASSERT_H@ -NEXT_AS_FIRST_DIRECTIVE_ASSERT_H = @NEXT_AS_FIRST_DIRECTIVE_ASSERT_H@ NEXT_AS_FIRST_DIRECTIVE_ERRNO_H = @NEXT_AS_FIRST_DIRECTIVE_ERRNO_H@ -NEXT_AS_FIRST_DIRECTIVE_ERROR_H = @NEXT_AS_FIRST_DIRECTIVE_ERROR_H@ NEXT_AS_FIRST_DIRECTIVE_FCNTL_H = @NEXT_AS_FIRST_DIRECTIVE_FCNTL_H@ NEXT_AS_FIRST_DIRECTIVE_FLOAT_H = @NEXT_AS_FIRST_DIRECTIVE_FLOAT_H@ NEXT_AS_FIRST_DIRECTIVE_GETOPT_H = @NEXT_AS_FIRST_DIRECTIVE_GETOPT_H@ @@ -1215,7 +1179,6 @@ NEXT_AS_FIRST_DIRECTIVE_UNISTD_H = @NEXT_AS_FIRST_DIRECTIVE_UNISTD_H@ NEXT_AS_FIRST_DIRECTIVE_WCHAR_H = @NEXT_AS_FIRST_DIRECTIVE_WCHAR_H@ NEXT_ERRNO_H = @NEXT_ERRNO_H@ -NEXT_ERROR_H = @NEXT_ERROR_H@ NEXT_FCNTL_H = @NEXT_FCNTL_H@ NEXT_FLOAT_H = @NEXT_FLOAT_H@ NEXT_GETOPT_H = @NEXT_GETOPT_H@ @@ -1258,18 +1221,15 @@ REPLACE_ATAN2F = @REPLACE_ATAN2F@ REPLACE_ATANF = @REPLACE_ATANF@ REPLACE_BTOWC = @REPLACE_BTOWC@ -REPLACE_CALLOC_FOR_CALLOC_GNU = @REPLACE_CALLOC_FOR_CALLOC_GNU@ -REPLACE_CALLOC_FOR_CALLOC_POSIX = @REPLACE_CALLOC_FOR_CALLOC_POSIX@ +REPLACE_CALLOC = @REPLACE_CALLOC@ REPLACE_CANONICALIZE_FILE_NAME = @REPLACE_CANONICALIZE_FILE_NAME@ REPLACE_CBRTF = @REPLACE_CBRTF@ REPLACE_CBRTL = @REPLACE_CBRTL@ REPLACE_CEIL = @REPLACE_CEIL@ REPLACE_CEILF = @REPLACE_CEILF@ REPLACE_CEILL = @REPLACE_CEILL@ -REPLACE_CHMOD = @REPLACE_CHMOD@ REPLACE_CHOWN = @REPLACE_CHOWN@ REPLACE_CLOSE = @REPLACE_CLOSE@ -REPLACE_COPY_FILE_RANGE = @REPLACE_COPY_FILE_RANGE@ REPLACE_COSF = @REPLACE_COSF@ REPLACE_COSHF = @REPLACE_COSHF@ REPLACE_CREAT = @REPLACE_CREAT@ @@ -1277,9 +1237,6 @@ REPLACE_DPRINTF = @REPLACE_DPRINTF@ REPLACE_DUP = @REPLACE_DUP@ REPLACE_DUP2 = @REPLACE_DUP2@ -REPLACE_DUP3 = @REPLACE_DUP3@ -REPLACE_ERROR = @REPLACE_ERROR@ -REPLACE_ERROR_AT_LINE = @REPLACE_ERROR_AT_LINE@ REPLACE_EXECL = @REPLACE_EXECL@ REPLACE_EXECLE = @REPLACE_EXECLE@ REPLACE_EXECLP = @REPLACE_EXECLP@ @@ -1300,7 +1257,6 @@ REPLACE_FCHOWNAT = @REPLACE_FCHOWNAT@ REPLACE_FCLOSE = @REPLACE_FCLOSE@ REPLACE_FCNTL = @REPLACE_FCNTL@ -REPLACE_FDATASYNC = @REPLACE_FDATASYNC@ REPLACE_FDOPEN = @REPLACE_FDOPEN@ REPLACE_FFLUSH = @REPLACE_FFLUSH@ REPLACE_FFSLL = @REPLACE_FFSLL@ @@ -1314,7 +1270,6 @@ REPLACE_FMODF = @REPLACE_FMODF@ REPLACE_FMODL = @REPLACE_FMODL@ REPLACE_FOPEN = @REPLACE_FOPEN@ -REPLACE_FOPEN_FOR_FOPEN_GNU = @REPLACE_FOPEN_FOR_FOPEN_GNU@ REPLACE_FPRINTF = @REPLACE_FPRINTF@ REPLACE_FPURGE = @REPLACE_FPURGE@ REPLACE_FREE = @REPLACE_FREE@ @@ -1334,16 +1289,11 @@ REPLACE_GETDELIM = @REPLACE_GETDELIM@ REPLACE_GETDOMAINNAME = @REPLACE_GETDOMAINNAME@ REPLACE_GETDTABLESIZE = @REPLACE_GETDTABLESIZE@ -REPLACE_GETENTROPY = @REPLACE_GETENTROPY@ REPLACE_GETGROUPS = @REPLACE_GETGROUPS@ REPLACE_GETLINE = @REPLACE_GETLINE@ -REPLACE_GETLOADAVG = @REPLACE_GETLOADAVG@ REPLACE_GETLOGIN_R = @REPLACE_GETLOGIN_R@ REPLACE_GETPAGESIZE = @REPLACE_GETPAGESIZE@ REPLACE_GETPASS = @REPLACE_GETPASS@ -REPLACE_GETPASS_FOR_GETPASS_GNU = @REPLACE_GETPASS_FOR_GETPASS_GNU@ -REPLACE_GETPROGNAME = @REPLACE_GETPROGNAME@ -REPLACE_GETSUBOPT = @REPLACE_GETSUBOPT@ REPLACE_GMTIME = @REPLACE_GMTIME@ REPLACE_HUGE_VAL = @REPLACE_HUGE_VAL@ REPLACE_HYPOT = @REPLACE_HYPOT@ @@ -1352,8 +1302,6 @@ REPLACE_ILOGB = @REPLACE_ILOGB@ REPLACE_ILOGBF = @REPLACE_ILOGBF@ REPLACE_ILOGBL = @REPLACE_ILOGBL@ -REPLACE_IMAXABS = @REPLACE_IMAXABS@ -REPLACE_IMAXDIV = @REPLACE_IMAXDIV@ REPLACE_INITSTATE = @REPLACE_INITSTATE@ REPLACE_ISATTY = @REPLACE_ISATTY@ REPLACE_ISFINITE = @REPLACE_ISFINITE@ @@ -1383,27 +1331,21 @@ REPLACE_LOGL = @REPLACE_LOGL@ REPLACE_LSEEK = @REPLACE_LSEEK@ REPLACE_LSTAT = @REPLACE_LSTAT@ -REPLACE_MALLOC_FOR_MALLOC_GNU = @REPLACE_MALLOC_FOR_MALLOC_GNU@ -REPLACE_MALLOC_FOR_MALLOC_POSIX = @REPLACE_MALLOC_FOR_MALLOC_POSIX@ +REPLACE_MALLOC = @REPLACE_MALLOC@ REPLACE_MBRLEN = @REPLACE_MBRLEN@ REPLACE_MBRTOWC = @REPLACE_MBRTOWC@ REPLACE_MBSINIT = @REPLACE_MBSINIT@ REPLACE_MBSNRTOWCS = @REPLACE_MBSNRTOWCS@ REPLACE_MBSRTOWCS = @REPLACE_MBSRTOWCS@ REPLACE_MBSTATE_T = @REPLACE_MBSTATE_T@ -REPLACE_MBSTOWCS = @REPLACE_MBSTOWCS@ REPLACE_MBTOWC = @REPLACE_MBTOWC@ -REPLACE_MB_CUR_MAX = @REPLACE_MB_CUR_MAX@ REPLACE_MEMCHR = @REPLACE_MEMCHR@ REPLACE_MEMMEM = @REPLACE_MEMMEM@ -REPLACE_MEMPCPY = @REPLACE_MEMPCPY@ REPLACE_MKDIR = @REPLACE_MKDIR@ REPLACE_MKFIFO = @REPLACE_MKFIFO@ REPLACE_MKFIFOAT = @REPLACE_MKFIFOAT@ REPLACE_MKNOD = @REPLACE_MKNOD@ REPLACE_MKNODAT = @REPLACE_MKNODAT@ -REPLACE_MKOSTEMP = @REPLACE_MKOSTEMP@ -REPLACE_MKOSTEMPS = @REPLACE_MKOSTEMPS@ REPLACE_MKSTEMP = @REPLACE_MKSTEMP@ REPLACE_MKTIME = @REPLACE_MKTIME@ REPLACE_MODF = @REPLACE_MODF@ @@ -1416,10 +1358,8 @@ REPLACE_OPEN = @REPLACE_OPEN@ REPLACE_OPENAT = @REPLACE_OPENAT@ REPLACE_PERROR = @REPLACE_PERROR@ -REPLACE_PIPE2 = @REPLACE_PIPE2@ REPLACE_POPEN = @REPLACE_POPEN@ REPLACE_POSIX_MEMALIGN = @REPLACE_POSIX_MEMALIGN@ -REPLACE_POSIX_OPENPT = @REPLACE_POSIX_OPENPT@ REPLACE_PREAD = @REPLACE_PREAD@ REPLACE_PRINTF = @REPLACE_PRINTF@ REPLACE_PTHREAD_SIGMASK = @REPLACE_PTHREAD_SIGMASK@ @@ -1434,9 +1374,7 @@ REPLACE_READ = @REPLACE_READ@ REPLACE_READLINK = @REPLACE_READLINK@ REPLACE_READLINKAT = @REPLACE_READLINKAT@ -REPLACE_REALLOCARRAY = @REPLACE_REALLOCARRAY@ -REPLACE_REALLOC_FOR_REALLOC_GNU = @REPLACE_REALLOC_FOR_REALLOC_GNU@ -REPLACE_REALLOC_FOR_REALLOC_POSIX = @REPLACE_REALLOC_FOR_REALLOC_POSIX@ +REPLACE_REALLOC = @REPLACE_REALLOC@ REPLACE_REALPATH = @REPLACE_REALPATH@ REPLACE_REMAINDER = @REPLACE_REMAINDER@ REPLACE_REMAINDERF = @REPLACE_REMAINDERF@ @@ -1450,7 +1388,6 @@ REPLACE_ROUNDF = @REPLACE_ROUNDF@ REPLACE_ROUNDL = @REPLACE_ROUNDL@ REPLACE_SETENV = @REPLACE_SETENV@ -REPLACE_SETHOSTNAME = @REPLACE_SETHOSTNAME@ REPLACE_SETSTATE = @REPLACE_SETSTATE@ REPLACE_SIGNBIT = @REPLACE_SIGNBIT@ REPLACE_SIGNBIT_USING_BUILTINS = @REPLACE_SIGNBIT_USING_BUILTINS@ @@ -1464,7 +1401,6 @@ REPLACE_STAT = @REPLACE_STAT@ REPLACE_STDIO_READ_FUNCS = @REPLACE_STDIO_READ_FUNCS@ REPLACE_STDIO_WRITE_FUNCS = @REPLACE_STDIO_WRITE_FUNCS@ -REPLACE_STPCPY = @REPLACE_STPCPY@ REPLACE_STPNCPY = @REPLACE_STPNCPY@ REPLACE_STRCASESTR = @REPLACE_STRCASESTR@ REPLACE_STRCHRNUL = @REPLACE_STRCHRNUL@ @@ -1481,19 +1417,13 @@ REPLACE_STRTOD = @REPLACE_STRTOD@ REPLACE_STRTOIMAX = @REPLACE_STRTOIMAX@ REPLACE_STRTOK_R = @REPLACE_STRTOK_R@ -REPLACE_STRTOL = @REPLACE_STRTOL@ REPLACE_STRTOLD = @REPLACE_STRTOLD@ -REPLACE_STRTOLL = @REPLACE_STRTOLL@ -REPLACE_STRTOUL = @REPLACE_STRTOUL@ -REPLACE_STRTOULL = @REPLACE_STRTOULL@ REPLACE_STRTOUMAX = @REPLACE_STRTOUMAX@ REPLACE_SYMLINK = @REPLACE_SYMLINK@ REPLACE_SYMLINKAT = @REPLACE_SYMLINKAT@ REPLACE_TANF = @REPLACE_TANF@ REPLACE_TANHF = @REPLACE_TANHF@ -REPLACE_TIME = @REPLACE_TIME@ REPLACE_TIMEGM = @REPLACE_TIMEGM@ -REPLACE_TIMESPEC_GET = @REPLACE_TIMESPEC_GET@ REPLACE_TMPFILE = @REPLACE_TMPFILE@ REPLACE_TRUNC = @REPLACE_TRUNC@ REPLACE_TRUNCATE = @REPLACE_TRUNCATE@ @@ -1513,26 +1443,20 @@ REPLACE_VSNPRINTF = @REPLACE_VSNPRINTF@ REPLACE_VSPRINTF = @REPLACE_VSPRINTF@ REPLACE_WCRTOMB = @REPLACE_WCRTOMB@ -REPLACE_WCSCMP = @REPLACE_WCSCMP@ REPLACE_WCSFTIME = @REPLACE_WCSFTIME@ -REPLACE_WCSNCMP = @REPLACE_WCSNCMP@ REPLACE_WCSNRTOMBS = @REPLACE_WCSNRTOMBS@ REPLACE_WCSRTOMBS = @REPLACE_WCSRTOMBS@ -REPLACE_WCSSTR = @REPLACE_WCSSTR@ REPLACE_WCSTOK = @REPLACE_WCSTOK@ REPLACE_WCSWIDTH = @REPLACE_WCSWIDTH@ REPLACE_WCTOB = @REPLACE_WCTOB@ REPLACE_WCTOMB = @REPLACE_WCTOMB@ REPLACE_WCWIDTH = @REPLACE_WCWIDTH@ -REPLACE_WMEMCMP = @REPLACE_WMEMCMP@ -REPLACE_WMEMPCPY = @REPLACE_WMEMPCPY@ REPLACE_WRITE = @REPLACE_WRITE@ -REPLACE__EXIT = @REPLACE__EXIT@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ SIG_ATOMIC_T_SUFFIX = @SIG_ATOMIC_T_SUFFIX@ SIZE_T_SUFFIX = @SIZE_T_SUFFIX@ -STDCKDINT_H = @STDCKDINT_H@ +STDBOOL_H = @STDBOOL_H@ STDDEF_H = @STDDEF_H@ STDINT_H = @STDINT_H@ STRIP = @STRIP@ @@ -1577,10 +1501,8 @@ docdir = @docdir@ dvidir = @dvidir@ exec_prefix = @exec_prefix@ -gl_LIBOBJDEPS = @gl_LIBOBJDEPS@ gl_LIBOBJS = @gl_LIBOBJS@ gl_LTLIBOBJS = @gl_LTLIBOBJS@ -gltests_LIBOBJDEPS = @gltests_LIBOBJDEPS@ gltests_LIBOBJS = @gltests_LIBOBJS@ gltests_LTLIBOBJS = @gltests_LTLIBOBJS@ gltests_WITNESS = @gltests_WITNESS@ diff -Nru mmv-2.5/aclocal.m4 mmv-2.5.1/aclocal.m4 --- mmv-2.5/aclocal.m4 2023-07-20 19:40:51.000000000 +0000 +++ mmv-2.5.1/aclocal.m4 2023-08-08 11:08:16.000000000 +0000 @@ -895,43 +895,6 @@ am_aux_dir=`cd "$ac_aux_dir" && pwd` ]) -# AM_COND_IF -*- Autoconf -*- - -# Copyright (C) 2008-2021 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. - -# _AM_COND_IF -# _AM_COND_ELSE -# _AM_COND_ENDIF -# -------------- -# These macros are only used for tracing. -m4_define([_AM_COND_IF]) -m4_define([_AM_COND_ELSE]) -m4_define([_AM_COND_ENDIF]) - -# AM_COND_IF(COND, [IF-TRUE], [IF-FALSE]) -# --------------------------------------- -# If the shell condition COND is true, execute IF-TRUE, otherwise execute -# IF-FALSE. Allow automake to learn about conditional instantiating macros -# (the AC_CONFIG_FOOS). -AC_DEFUN([AM_COND_IF], -[m4_ifndef([_AM_COND_VALUE_$1], - [m4_fatal([$0: no such condition "$1"])])dnl -_AM_COND_IF([$1])dnl -if test -z "$$1_TRUE"; then : - m4_n([$2])[]dnl -m4_ifval([$3], -[_AM_COND_ELSE([$1])dnl -else - $3 -])dnl -_AM_COND_ENDIF([$1])dnl -fi[]dnl -]) - # AM_CONDITIONAL -*- Autoconf -*- # Copyright (C) 1997-2021 Free Software Foundation, Inc. @@ -1976,19 +1939,13 @@ m4_include([m4/__inline.m4]) m4_include([m4/absolute-header.m4]) m4_include([m4/alloca.m4]) -m4_include([m4/assert_h.m4]) -m4_include([m4/builtin-expect.m4]) -m4_include([m4/c-bool.m4]) -m4_include([m4/calloc.m4]) m4_include([m4/canonicalize.m4]) m4_include([m4/close.m4]) -m4_include([m4/codeset.m4]) m4_include([m4/double-slash-root.m4]) m4_include([m4/dup2.m4]) m4_include([m4/eealloc.m4]) m4_include([m4/errno_h.m4]) m4_include([m4/error.m4]) -m4_include([m4/error_h.m4]) m4_include([m4/exponentd.m4]) m4_include([m4/exponentf.m4]) m4_include([m4/exponentl.m4]) @@ -2021,7 +1978,6 @@ m4_include([m4/ldexpl.m4]) m4_include([m4/limits-h.m4]) m4_include([m4/link.m4]) -m4_include([m4/locale-fr.m4]) m4_include([m4/lseek.m4]) m4_include([m4/lstat.m4]) m4_include([m4/malloc.m4]) @@ -2036,7 +1992,6 @@ m4_include([m4/msvc-inval.m4]) m4_include([m4/msvc-nothrow.m4]) m4_include([m4/multiarch.m4]) -m4_include([m4/musl.m4]) m4_include([m4/nocrash.m4]) m4_include([m4/off_t.m4]) m4_include([m4/open-cloexec.m4]) @@ -2051,7 +2006,6 @@ m4_include([m4/read.m4]) m4_include([m4/readlink.m4]) m4_include([m4/realloc.m4]) -m4_include([m4/reallocarray.m4]) m4_include([m4/rename.m4]) m4_include([m4/rmdir.m4]) m4_include([m4/signal_h.m4]) @@ -2061,7 +2015,7 @@ m4_include([m4/ssize_t.m4]) m4_include([m4/stat-time.m4]) m4_include([m4/stat.m4]) -m4_include([m4/stdalign.m4]) +m4_include([m4/stdbool.m4]) m4_include([m4/stddef_h.m4]) m4_include([m4/stdint.m4]) m4_include([m4/stdint_h.m4]) diff -Nru mmv-2.5/build-aux/bootstrap.in mmv-2.5.1/build-aux/bootstrap.in --- mmv-2.5/build-aux/bootstrap.in 2023-07-20 19:40:24.000000000 +0000 +++ mmv-2.5.1/build-aux/bootstrap.in 2023-08-08 11:02:47.000000000 +0000 @@ -10,7 +10,7 @@ # Copyright (C) 2010-2019 Bootstrap Authors # # This file is dual licensed under the terms of the MIT license -# , and GPL version 2 or later +# , and GPL version 3 or later # . You must apply one of # these licenses when using or redistributing this software or any of # the files within it. See the URLs above, or the file `LICENSE` diff -Nru mmv-2.5/build-aux/compile mmv-2.5.1/build-aux/compile --- mmv-2.5/build-aux/compile 2023-07-20 19:40:22.000000000 +0000 +++ mmv-2.5.1/build-aux/compile 2023-08-08 11:02:40.000000000 +0000 @@ -3,7 +3,7 @@ scriptversion=2018-03-07.03; # UTC -# Copyright (C) 1999-2023 Free Software Foundation, Inc. +# Copyright (C) 1999-2020 Free Software Foundation, Inc. # Written by Tom Tromey . # # This program is free software; you can redistribute it and/or modify @@ -256,7 +256,6 @@ exit $? ;; cl | *[/\\]cl | cl.exe | *[/\\]cl.exe | \ - clang-cl | *[/\\]clang-cl | clang-cl.exe | *[/\\]clang-cl.exe | \ icl | *[/\\]icl | icl.exe | *[/\\]icl.exe ) func_cl_wrapper "$@" # Doesn't return... ;; diff -Nru mmv-2.5/build-aux/config.guess mmv-2.5.1/build-aux/config.guess --- mmv-2.5/build-aux/config.guess 2023-07-20 19:40:23.000000000 +0000 +++ mmv-2.5.1/build-aux/config.guess 2023-08-08 11:02:40.000000000 +0000 @@ -1,14 +1,12 @@ #! /bin/sh # Attempt to guess a canonical system name. -# Copyright 1992-2023 Free Software Foundation, Inc. +# Copyright 1992-2021 Free Software Foundation, Inc. -# shellcheck disable=SC2006,SC2268 # see below for rationale - -timestamp='2023-01-01' +timestamp='2021-01-25' # 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 -# the Free Software Foundation, either version 3 of the License, or +# the Free Software Foundation; either version 3 of the License, or # (at your option) any later version. # # This program is distributed in the hope that it will be useful, but @@ -34,15 +32,7 @@ # Please send patches to . -# The "shellcheck disable" line above the timestamp inhibits complaints -# about features and limitations of the classic Bourne shell that were -# superseded or lifted in POSIX. However, this script identifies a wide -# variety of pre-POSIX systems that do not have POSIX shells at all, and -# even some reasonably current systems (Solaris 10 as case-in-point) still -# have a pre-POSIX /bin/sh. - - -me=`echo "$0" | sed -e 's,.*/,,'` +me=$(echo "$0" | sed -e 's,.*/,,') usage="\ Usage: $0 [OPTION] @@ -60,7 +50,7 @@ GNU config.guess ($timestamp) Originally written by Per Bothner. -Copyright 1992-2023 Free Software Foundation, Inc. +Copyright 1992-2021 Free Software Foundation, Inc. This is free software; see the source for copying conditions. There is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." @@ -94,9 +84,6 @@ exit 1 fi -# Just in case it came from the environment. -GUESS= - # CC_FOR_BUILD -- compiler used by this script. Note that the use of a # compiler to aid in system detection is discouraged as it requires # temporary files to be created and, as you can see below, it is a @@ -115,8 +102,8 @@ # prevent multiple calls if $tmp is already set test "$tmp" && return 0 : "${TMPDIR=/tmp}" - # shellcheck disable=SC2039,SC3028 - { tmp=`(umask 077 && mktemp -d "$TMPDIR/cgXXXXXX") 2>/dev/null` && test -n "$tmp" && test -d "$tmp" ; } || + # shellcheck disable=SC2039 + { tmp=$( (umask 077 && mktemp -d "$TMPDIR/cgXXXXXX") 2>/dev/null) && test -n "$tmp" && test -d "$tmp" ; } || { test -n "$RANDOM" && tmp=$TMPDIR/cg$$-$RANDOM && (umask 077 && mkdir "$tmp" 2>/dev/null) ; } || { tmp=$TMPDIR/cg-$$ && (umask 077 && mkdir "$tmp" 2>/dev/null) && echo "Warning: creating insecure temp directory" >&2 ; } || { echo "$me: cannot create a temporary directory in $TMPDIR" >&2 ; exit 1 ; } @@ -125,7 +112,7 @@ ,,) echo "int x;" > "$dummy.c" for driver in cc gcc c89 c99 ; do if ($driver -c -o "$dummy.o" "$dummy.c") >/dev/null 2>&1 ; then - CC_FOR_BUILD=$driver + CC_FOR_BUILD="$driver" break fi done @@ -144,12 +131,12 @@ PATH=$PATH:/.attbin ; export PATH fi -UNAME_MACHINE=`(uname -m) 2>/dev/null` || UNAME_MACHINE=unknown -UNAME_RELEASE=`(uname -r) 2>/dev/null` || UNAME_RELEASE=unknown -UNAME_SYSTEM=`(uname -s) 2>/dev/null` || UNAME_SYSTEM=unknown -UNAME_VERSION=`(uname -v) 2>/dev/null` || UNAME_VERSION=unknown +UNAME_MACHINE=$( (uname -m) 2>/dev/null) || UNAME_MACHINE=unknown +UNAME_RELEASE=$( (uname -r) 2>/dev/null) || UNAME_RELEASE=unknown +UNAME_SYSTEM=$( (uname -s) 2>/dev/null) || UNAME_SYSTEM=unknown +UNAME_VERSION=$( (uname -v) 2>/dev/null) || UNAME_VERSION=unknown -case $UNAME_SYSTEM in +case "$UNAME_SYSTEM" in Linux|GNU|GNU/*) LIBC=unknown @@ -170,8 +157,7 @@ #endif #endif EOF - cc_set_libc=`$CC_FOR_BUILD -E "$dummy.c" 2>/dev/null | grep '^LIBC' | sed 's, ,,g'` - eval "$cc_set_libc" + eval "$($CC_FOR_BUILD -E "$dummy.c" 2>/dev/null | grep '^LIBC' | sed 's, ,,g')" # Second heuristic to detect musl libc. if [ "$LIBC" = unknown ] && @@ -190,7 +176,7 @@ # Note: order is significant - the case branches are not exclusive. -case $UNAME_MACHINE:$UNAME_SYSTEM:$UNAME_RELEASE:$UNAME_VERSION in +case "$UNAME_MACHINE:$UNAME_SYSTEM:$UNAME_RELEASE:$UNAME_VERSION" in *:NetBSD:*:*) # NetBSD (nbsd) targets should (where applicable) match one or # more of the tuples: *-*-netbsdelf*, *-*-netbsdaout*, @@ -202,11 +188,11 @@ # # Note: NetBSD doesn't particularly care about the vendor # portion of the name. We always set it to "unknown". - UNAME_MACHINE_ARCH=`(uname -p 2>/dev/null || \ + UNAME_MACHINE_ARCH=$( (uname -p 2>/dev/null || \ /sbin/sysctl -n hw.machine_arch 2>/dev/null || \ /usr/sbin/sysctl -n hw.machine_arch 2>/dev/null || \ - echo unknown)` - case $UNAME_MACHINE_ARCH in + echo unknown)) + case "$UNAME_MACHINE_ARCH" in aarch64eb) machine=aarch64_be-unknown ;; armeb) machine=armeb-unknown ;; arm*) machine=arm-unknown ;; @@ -214,15 +200,15 @@ sh3eb) machine=sh-unknown ;; sh5el) machine=sh5le-unknown ;; earmv*) - arch=`echo "$UNAME_MACHINE_ARCH" | sed -e 's,^e\(armv[0-9]\).*$,\1,'` - endian=`echo "$UNAME_MACHINE_ARCH" | sed -ne 's,^.*\(eb\)$,\1,p'` - machine=${arch}${endian}-unknown + arch=$(echo "$UNAME_MACHINE_ARCH" | sed -e 's,^e\(armv[0-9]\).*$,\1,') + endian=$(echo "$UNAME_MACHINE_ARCH" | sed -ne 's,^.*\(eb\)$,\1,p') + machine="${arch}${endian}"-unknown ;; - *) machine=$UNAME_MACHINE_ARCH-unknown ;; + *) machine="$UNAME_MACHINE_ARCH"-unknown ;; esac # The Operating System including object format, if it has switched # to ELF recently (or will in the future) and ABI. - case $UNAME_MACHINE_ARCH in + case "$UNAME_MACHINE_ARCH" in earm*) os=netbsdelf ;; @@ -243,10 +229,10 @@ ;; esac # Determine ABI tags. - case $UNAME_MACHINE_ARCH in + case "$UNAME_MACHINE_ARCH" in earm*) expr='s/^earmv[0-9]/-eabi/;s/eb$//' - abi=`echo "$UNAME_MACHINE_ARCH" | sed -e "$expr"` + abi=$(echo "$UNAME_MACHINE_ARCH" | sed -e "$expr") ;; esac # The OS release @@ -254,82 +240,76 @@ # thus, need a distinct triplet. However, they do not need # kernel version information, so it can be replaced with a # suitable tag, in the style of linux-gnu. - case $UNAME_VERSION in + case "$UNAME_VERSION" in Debian*) release='-gnu' ;; *) - release=`echo "$UNAME_RELEASE" | sed -e 's/[-_].*//' | cut -d. -f1,2` + release=$(echo "$UNAME_RELEASE" | sed -e 's/[-_].*//' | cut -d. -f1,2) ;; esac # Since CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM: # contains redundant information, the shorter form: # CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM is used. - GUESS=$machine-${os}${release}${abi-} - ;; + echo "$machine-${os}${release}${abi-}" + exit ;; *:Bitrig:*:*) - UNAME_MACHINE_ARCH=`arch | sed 's/Bitrig.//'` - GUESS=$UNAME_MACHINE_ARCH-unknown-bitrig$UNAME_RELEASE - ;; + UNAME_MACHINE_ARCH=$(arch | sed 's/Bitrig.//') + echo "$UNAME_MACHINE_ARCH"-unknown-bitrig"$UNAME_RELEASE" + exit ;; *:OpenBSD:*:*) - UNAME_MACHINE_ARCH=`arch | sed 's/OpenBSD.//'` - GUESS=$UNAME_MACHINE_ARCH-unknown-openbsd$UNAME_RELEASE - ;; - *:SecBSD:*:*) - UNAME_MACHINE_ARCH=`arch | sed 's/SecBSD.//'` - GUESS=$UNAME_MACHINE_ARCH-unknown-secbsd$UNAME_RELEASE - ;; + UNAME_MACHINE_ARCH=$(arch | sed 's/OpenBSD.//') + echo "$UNAME_MACHINE_ARCH"-unknown-openbsd"$UNAME_RELEASE" + exit ;; *:LibertyBSD:*:*) - UNAME_MACHINE_ARCH=`arch | sed 's/^.*BSD\.//'` - GUESS=$UNAME_MACHINE_ARCH-unknown-libertybsd$UNAME_RELEASE - ;; + UNAME_MACHINE_ARCH=$(arch | sed 's/^.*BSD\.//') + echo "$UNAME_MACHINE_ARCH"-unknown-libertybsd"$UNAME_RELEASE" + exit ;; *:MidnightBSD:*:*) - GUESS=$UNAME_MACHINE-unknown-midnightbsd$UNAME_RELEASE - ;; + echo "$UNAME_MACHINE"-unknown-midnightbsd"$UNAME_RELEASE" + exit ;; *:ekkoBSD:*:*) - GUESS=$UNAME_MACHINE-unknown-ekkobsd$UNAME_RELEASE - ;; + echo "$UNAME_MACHINE"-unknown-ekkobsd"$UNAME_RELEASE" + exit ;; *:SolidBSD:*:*) - GUESS=$UNAME_MACHINE-unknown-solidbsd$UNAME_RELEASE - ;; + echo "$UNAME_MACHINE"-unknown-solidbsd"$UNAME_RELEASE" + exit ;; *:OS108:*:*) - GUESS=$UNAME_MACHINE-unknown-os108_$UNAME_RELEASE - ;; + echo "$UNAME_MACHINE"-unknown-os108_"$UNAME_RELEASE" + exit ;; macppc:MirBSD:*:*) - GUESS=powerpc-unknown-mirbsd$UNAME_RELEASE - ;; + echo powerpc-unknown-mirbsd"$UNAME_RELEASE" + exit ;; *:MirBSD:*:*) - GUESS=$UNAME_MACHINE-unknown-mirbsd$UNAME_RELEASE - ;; + echo "$UNAME_MACHINE"-unknown-mirbsd"$UNAME_RELEASE" + exit ;; *:Sortix:*:*) - GUESS=$UNAME_MACHINE-unknown-sortix - ;; + echo "$UNAME_MACHINE"-unknown-sortix + exit ;; *:Twizzler:*:*) - GUESS=$UNAME_MACHINE-unknown-twizzler - ;; + echo "$UNAME_MACHINE"-unknown-twizzler + exit ;; *:Redox:*:*) - GUESS=$UNAME_MACHINE-unknown-redox - ;; + echo "$UNAME_MACHINE"-unknown-redox + exit ;; mips:OSF1:*.*) - GUESS=mips-dec-osf1 - ;; + echo mips-dec-osf1 + exit ;; alpha:OSF1:*:*) - # Reset EXIT trap before exiting to avoid spurious non-zero exit code. - trap '' 0 case $UNAME_RELEASE in *4.0) - UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $3}'` + UNAME_RELEASE=$(/usr/sbin/sizer -v | awk '{print $3}') ;; *5.*) - UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $4}'` + UNAME_RELEASE=$(/usr/sbin/sizer -v | awk '{print $4}') ;; esac # According to Compaq, /usr/sbin/psrinfo has been available on # OSF/1 and Tru64 systems produced since 1995. I hope that # covers most systems running today. This code pipes the CPU # types through head -n 1, so we only detect the type of CPU 0. - ALPHA_CPU_TYPE=`/usr/sbin/psrinfo -v | sed -n -e 's/^ The alpha \(.*\) processor.*$/\1/p' | head -n 1` - case $ALPHA_CPU_TYPE in + ALPHA_CPU_TYPE=$(/usr/sbin/psrinfo -v | sed -n -e 's/^ The alpha \(.*\) processor.*$/\1/p' | head -n 1) + case "$ALPHA_CPU_TYPE" in "EV4 (21064)") UNAME_MACHINE=alpha ;; "EV4.5 (21064)") @@ -366,69 +346,68 @@ # A Tn.n version is a released field test version. # A Xn.n version is an unreleased experimental baselevel. # 1.2 uses "1.2" for uname -r. - OSF_REL=`echo "$UNAME_RELEASE" | sed -e 's/^[PVTX]//' | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz` - GUESS=$UNAME_MACHINE-dec-osf$OSF_REL - ;; + echo "$UNAME_MACHINE"-dec-osf"$(echo "$UNAME_RELEASE" | sed -e 's/^[PVTX]//' | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz)" + # Reset EXIT trap before exiting to avoid spurious non-zero exit code. + exitcode=$? + trap '' 0 + exit $exitcode ;; Amiga*:UNIX_System_V:4.0:*) - GUESS=m68k-unknown-sysv4 - ;; + echo m68k-unknown-sysv4 + exit ;; *:[Aa]miga[Oo][Ss]:*:*) - GUESS=$UNAME_MACHINE-unknown-amigaos - ;; + echo "$UNAME_MACHINE"-unknown-amigaos + exit ;; *:[Mm]orph[Oo][Ss]:*:*) - GUESS=$UNAME_MACHINE-unknown-morphos - ;; + echo "$UNAME_MACHINE"-unknown-morphos + exit ;; *:OS/390:*:*) - GUESS=i370-ibm-openedition - ;; + echo i370-ibm-openedition + exit ;; *:z/VM:*:*) - GUESS=s390-ibm-zvmoe - ;; + echo s390-ibm-zvmoe + exit ;; *:OS400:*:*) - GUESS=powerpc-ibm-os400 - ;; + echo powerpc-ibm-os400 + exit ;; arm:RISC*:1.[012]*:*|arm:riscix:1.[012]*:*) - GUESS=arm-acorn-riscix$UNAME_RELEASE - ;; + echo arm-acorn-riscix"$UNAME_RELEASE" + exit ;; arm*:riscos:*:*|arm*:RISCOS:*:*) - GUESS=arm-unknown-riscos - ;; + echo arm-unknown-riscos + exit ;; SR2?01:HI-UX/MPP:*:* | SR8000:HI-UX/MPP:*:*) - GUESS=hppa1.1-hitachi-hiuxmpp - ;; + echo hppa1.1-hitachi-hiuxmpp + exit ;; Pyramid*:OSx*:*:* | MIS*:OSx*:*:* | MIS*:SMP_DC-OSx*:*:*) # akee@wpdis03.wpafb.af.mil (Earle F. Ake) contributed MIS and NILE. - case `(/bin/universe) 2>/dev/null` in - att) GUESS=pyramid-pyramid-sysv3 ;; - *) GUESS=pyramid-pyramid-bsd ;; - esac - ;; + if test "$( (/bin/universe) 2>/dev/null)" = att ; then + echo pyramid-pyramid-sysv3 + else + echo pyramid-pyramid-bsd + fi + exit ;; NILE*:*:*:dcosx) - GUESS=pyramid-pyramid-svr4 - ;; + echo pyramid-pyramid-svr4 + exit ;; DRS?6000:unix:4.0:6*) - GUESS=sparc-icl-nx6 - ;; + echo sparc-icl-nx6 + exit ;; DRS?6000:UNIX_SV:4.2*:7* | DRS?6000:isis:4.2*:7*) - case `/usr/bin/uname -p` in - sparc) GUESS=sparc-icl-nx7 ;; - esac - ;; + case $(/usr/bin/uname -p) in + sparc) echo sparc-icl-nx7; exit ;; + esac ;; s390x:SunOS:*:*) - SUN_REL=`echo "$UNAME_RELEASE" | sed -e 's/[^.]*//'` - GUESS=$UNAME_MACHINE-ibm-solaris2$SUN_REL - ;; + echo "$UNAME_MACHINE"-ibm-solaris2"$(echo "$UNAME_RELEASE" | sed -e 's/[^.]*//')" + exit ;; sun4H:SunOS:5.*:*) - SUN_REL=`echo "$UNAME_RELEASE" | sed -e 's/[^.]*//'` - GUESS=sparc-hal-solaris2$SUN_REL - ;; + echo sparc-hal-solaris2"$(echo "$UNAME_RELEASE"|sed -e 's/[^.]*//')" + exit ;; sun4*:SunOS:5.*:* | tadpole*:SunOS:5.*:*) - SUN_REL=`echo "$UNAME_RELEASE" | sed -e 's/[^.]*//'` - GUESS=sparc-sun-solaris2$SUN_REL - ;; + echo sparc-sun-solaris2"$(echo "$UNAME_RELEASE" | sed -e 's/[^.]*//')" + exit ;; i86pc:AuroraUX:5.*:* | i86xen:AuroraUX:5.*:*) - GUESS=i386-pc-auroraux$UNAME_RELEASE - ;; + echo i386-pc-auroraux"$UNAME_RELEASE" + exit ;; i86pc:SunOS:5.*:* | i86xen:SunOS:5.*:*) set_cc_for_build SUN_ARCH=i386 @@ -437,50 +416,47 @@ # This test works for both compilers. if test "$CC_FOR_BUILD" != no_compiler_found; then if (echo '#ifdef __amd64'; echo IS_64BIT_ARCH; echo '#endif') | \ - (CCOPTS="" $CC_FOR_BUILD -m64 -E - 2>/dev/null) | \ + (CCOPTS="" $CC_FOR_BUILD -E - 2>/dev/null) | \ grep IS_64BIT_ARCH >/dev/null then SUN_ARCH=x86_64 fi fi - SUN_REL=`echo "$UNAME_RELEASE" | sed -e 's/[^.]*//'` - GUESS=$SUN_ARCH-pc-solaris2$SUN_REL - ;; + echo "$SUN_ARCH"-pc-solaris2"$(echo "$UNAME_RELEASE"|sed -e 's/[^.]*//')" + exit ;; sun4*:SunOS:6*:*) # According to config.sub, this is the proper way to canonicalize # SunOS6. Hard to guess exactly what SunOS6 will be like, but # it's likely to be more like Solaris than SunOS4. - SUN_REL=`echo "$UNAME_RELEASE" | sed -e 's/[^.]*//'` - GUESS=sparc-sun-solaris3$SUN_REL - ;; + echo sparc-sun-solaris3"$(echo "$UNAME_RELEASE"|sed -e 's/[^.]*//')" + exit ;; sun4*:SunOS:*:*) - case `/usr/bin/arch -k` in + case "$(/usr/bin/arch -k)" in Series*|S4*) - UNAME_RELEASE=`uname -v` + UNAME_RELEASE=$(uname -v) ;; esac # Japanese Language versions have a version number like `4.1.3-JL'. - SUN_REL=`echo "$UNAME_RELEASE" | sed -e 's/-/_/'` - GUESS=sparc-sun-sunos$SUN_REL - ;; + echo sparc-sun-sunos"$(echo "$UNAME_RELEASE"|sed -e 's/-/_/')" + exit ;; sun3*:SunOS:*:*) - GUESS=m68k-sun-sunos$UNAME_RELEASE - ;; + echo m68k-sun-sunos"$UNAME_RELEASE" + exit ;; sun*:*:4.2BSD:*) - UNAME_RELEASE=`(sed 1q /etc/motd | awk '{print substr($5,1,3)}') 2>/dev/null` + UNAME_RELEASE=$( (sed 1q /etc/motd | awk '{print substr($5,1,3)}') 2>/dev/null) test "x$UNAME_RELEASE" = x && UNAME_RELEASE=3 - case `/bin/arch` in + case "$(/bin/arch)" in sun3) - GUESS=m68k-sun-sunos$UNAME_RELEASE + echo m68k-sun-sunos"$UNAME_RELEASE" ;; sun4) - GUESS=sparc-sun-sunos$UNAME_RELEASE + echo sparc-sun-sunos"$UNAME_RELEASE" ;; esac - ;; + exit ;; aushp:SunOS:*:*) - GUESS=sparc-auspex-sunos$UNAME_RELEASE - ;; + echo sparc-auspex-sunos"$UNAME_RELEASE" + exit ;; # The situation for MiNT is a little confusing. The machine name # can be virtually everything (everything which is not # "atarist" or "atariste" at least should have a processor @@ -490,41 +466,41 @@ # MiNT. But MiNT is downward compatible to TOS, so this should # be no problem. atarist[e]:*MiNT:*:* | atarist[e]:*mint:*:* | atarist[e]:*TOS:*:*) - GUESS=m68k-atari-mint$UNAME_RELEASE - ;; + echo m68k-atari-mint"$UNAME_RELEASE" + exit ;; atari*:*MiNT:*:* | atari*:*mint:*:* | atarist[e]:*TOS:*:*) - GUESS=m68k-atari-mint$UNAME_RELEASE - ;; + echo m68k-atari-mint"$UNAME_RELEASE" + exit ;; *falcon*:*MiNT:*:* | *falcon*:*mint:*:* | *falcon*:*TOS:*:*) - GUESS=m68k-atari-mint$UNAME_RELEASE - ;; + echo m68k-atari-mint"$UNAME_RELEASE" + exit ;; milan*:*MiNT:*:* | milan*:*mint:*:* | *milan*:*TOS:*:*) - GUESS=m68k-milan-mint$UNAME_RELEASE - ;; + echo m68k-milan-mint"$UNAME_RELEASE" + exit ;; hades*:*MiNT:*:* | hades*:*mint:*:* | *hades*:*TOS:*:*) - GUESS=m68k-hades-mint$UNAME_RELEASE - ;; + echo m68k-hades-mint"$UNAME_RELEASE" + exit ;; *:*MiNT:*:* | *:*mint:*:* | *:*TOS:*:*) - GUESS=m68k-unknown-mint$UNAME_RELEASE - ;; + echo m68k-unknown-mint"$UNAME_RELEASE" + exit ;; m68k:machten:*:*) - GUESS=m68k-apple-machten$UNAME_RELEASE - ;; + echo m68k-apple-machten"$UNAME_RELEASE" + exit ;; powerpc:machten:*:*) - GUESS=powerpc-apple-machten$UNAME_RELEASE - ;; + echo powerpc-apple-machten"$UNAME_RELEASE" + exit ;; RISC*:Mach:*:*) - GUESS=mips-dec-mach_bsd4.3 - ;; + echo mips-dec-mach_bsd4.3 + exit ;; RISC*:ULTRIX:*:*) - GUESS=mips-dec-ultrix$UNAME_RELEASE - ;; + echo mips-dec-ultrix"$UNAME_RELEASE" + exit ;; VAX*:ULTRIX*:*:*) - GUESS=vax-dec-ultrix$UNAME_RELEASE - ;; + echo vax-dec-ultrix"$UNAME_RELEASE" + exit ;; 2020:CLIX:*:* | 2430:CLIX:*:*) - GUESS=clipper-intergraph-clix$UNAME_RELEASE - ;; + echo clipper-intergraph-clix"$UNAME_RELEASE" + exit ;; mips:*:*:UMIPS | mips:*:*:RISCos) set_cc_for_build sed 's/^ //' << EOF > "$dummy.c" @@ -549,79 +525,78 @@ } EOF $CC_FOR_BUILD -o "$dummy" "$dummy.c" && - dummyarg=`echo "$UNAME_RELEASE" | sed -n 's/\([0-9]*\).*/\1/p'` && - SYSTEM_NAME=`"$dummy" "$dummyarg"` && + dummyarg=$(echo "$UNAME_RELEASE" | sed -n 's/\([0-9]*\).*/\1/p') && + SYSTEM_NAME=$("$dummy" "$dummyarg") && { echo "$SYSTEM_NAME"; exit; } - GUESS=mips-mips-riscos$UNAME_RELEASE - ;; + echo mips-mips-riscos"$UNAME_RELEASE" + exit ;; Motorola:PowerMAX_OS:*:*) - GUESS=powerpc-motorola-powermax - ;; + echo powerpc-motorola-powermax + exit ;; Motorola:*:4.3:PL8-*) - GUESS=powerpc-harris-powermax - ;; + echo powerpc-harris-powermax + exit ;; Night_Hawk:*:*:PowerMAX_OS | Synergy:PowerMAX_OS:*:*) - GUESS=powerpc-harris-powermax - ;; + echo powerpc-harris-powermax + exit ;; Night_Hawk:Power_UNIX:*:*) - GUESS=powerpc-harris-powerunix - ;; + echo powerpc-harris-powerunix + exit ;; m88k:CX/UX:7*:*) - GUESS=m88k-harris-cxux7 - ;; + echo m88k-harris-cxux7 + exit ;; m88k:*:4*:R4*) - GUESS=m88k-motorola-sysv4 - ;; + echo m88k-motorola-sysv4 + exit ;; m88k:*:3*:R3*) - GUESS=m88k-motorola-sysv3 - ;; + echo m88k-motorola-sysv3 + exit ;; AViiON:dgux:*:*) # DG/UX returns AViiON for all architectures - UNAME_PROCESSOR=`/usr/bin/uname -p` + UNAME_PROCESSOR=$(/usr/bin/uname -p) if test "$UNAME_PROCESSOR" = mc88100 || test "$UNAME_PROCESSOR" = mc88110 then if test "$TARGET_BINARY_INTERFACE"x = m88kdguxelfx || \ test "$TARGET_BINARY_INTERFACE"x = x then - GUESS=m88k-dg-dgux$UNAME_RELEASE + echo m88k-dg-dgux"$UNAME_RELEASE" else - GUESS=m88k-dg-dguxbcs$UNAME_RELEASE + echo m88k-dg-dguxbcs"$UNAME_RELEASE" fi else - GUESS=i586-dg-dgux$UNAME_RELEASE + echo i586-dg-dgux"$UNAME_RELEASE" fi - ;; + exit ;; M88*:DolphinOS:*:*) # DolphinOS (SVR3) - GUESS=m88k-dolphin-sysv3 - ;; + echo m88k-dolphin-sysv3 + exit ;; M88*:*:R3*:*) # Delta 88k system running SVR3 - GUESS=m88k-motorola-sysv3 - ;; + echo m88k-motorola-sysv3 + exit ;; XD88*:*:*:*) # Tektronix XD88 system running UTekV (SVR3) - GUESS=m88k-tektronix-sysv3 - ;; + echo m88k-tektronix-sysv3 + exit ;; Tek43[0-9][0-9]:UTek:*:*) # Tektronix 4300 system running UTek (BSD) - GUESS=m68k-tektronix-bsd - ;; + echo m68k-tektronix-bsd + exit ;; *:IRIX*:*:*) - IRIX_REL=`echo "$UNAME_RELEASE" | sed -e 's/-/_/g'` - GUESS=mips-sgi-irix$IRIX_REL - ;; + echo mips-sgi-irix"$(echo "$UNAME_RELEASE"|sed -e 's/-/_/g')" + exit ;; ????????:AIX?:[12].1:2) # AIX 2.2.1 or AIX 2.1.1 is RT/PC AIX. - GUESS=romp-ibm-aix # uname -m gives an 8 hex-code CPU id - ;; # Note that: echo "'`uname -s`'" gives 'AIX ' + echo romp-ibm-aix # uname -m gives an 8 hex-code CPU id + exit ;; # Note that: echo "'$(uname -s)'" gives 'AIX ' i*86:AIX:*:*) - GUESS=i386-ibm-aix - ;; + echo i386-ibm-aix + exit ;; ia64:AIX:*:*) if test -x /usr/bin/oslevel ; then - IBM_REV=`/usr/bin/oslevel` + IBM_REV=$(/usr/bin/oslevel) else - IBM_REV=$UNAME_VERSION.$UNAME_RELEASE + IBM_REV="$UNAME_VERSION.$UNAME_RELEASE" fi - GUESS=$UNAME_MACHINE-ibm-aix$IBM_REV - ;; + echo "$UNAME_MACHINE"-ibm-aix"$IBM_REV" + exit ;; *:AIX:2:3) if grep bos325 /usr/include/stdio.h >/dev/null 2>&1; then set_cc_for_build @@ -636,68 +611,68 @@ exit(0); } EOF - if $CC_FOR_BUILD -o "$dummy" "$dummy.c" && SYSTEM_NAME=`"$dummy"` + if $CC_FOR_BUILD -o "$dummy" "$dummy.c" && SYSTEM_NAME=$("$dummy") then - GUESS=$SYSTEM_NAME + echo "$SYSTEM_NAME" else - GUESS=rs6000-ibm-aix3.2.5 + echo rs6000-ibm-aix3.2.5 fi elif grep bos324 /usr/include/stdio.h >/dev/null 2>&1; then - GUESS=rs6000-ibm-aix3.2.4 + echo rs6000-ibm-aix3.2.4 else - GUESS=rs6000-ibm-aix3.2 + echo rs6000-ibm-aix3.2 fi - ;; + exit ;; *:AIX:*:[4567]) - IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | sed 1q | awk '{ print $1 }'` + IBM_CPU_ID=$(/usr/sbin/lsdev -C -c processor -S available | sed 1q | awk '{ print $1 }') if /usr/sbin/lsattr -El "$IBM_CPU_ID" | grep ' POWER' >/dev/null 2>&1; then IBM_ARCH=rs6000 else IBM_ARCH=powerpc fi if test -x /usr/bin/lslpp ; then - IBM_REV=`/usr/bin/lslpp -Lqc bos.rte.libc | \ - awk -F: '{ print $3 }' | sed s/[0-9]*$/0/` + IBM_REV=$(/usr/bin/lslpp -Lqc bos.rte.libc | + awk -F: '{ print $3 }' | sed s/[0-9]*$/0/) else - IBM_REV=$UNAME_VERSION.$UNAME_RELEASE + IBM_REV="$UNAME_VERSION.$UNAME_RELEASE" fi - GUESS=$IBM_ARCH-ibm-aix$IBM_REV - ;; + echo "$IBM_ARCH"-ibm-aix"$IBM_REV" + exit ;; *:AIX:*:*) - GUESS=rs6000-ibm-aix - ;; + echo rs6000-ibm-aix + exit ;; ibmrt:4.4BSD:*|romp-ibm:4.4BSD:*) - GUESS=romp-ibm-bsd4.4 - ;; + echo romp-ibm-bsd4.4 + exit ;; ibmrt:*BSD:*|romp-ibm:BSD:*) # covers RT/PC BSD and - GUESS=romp-ibm-bsd$UNAME_RELEASE # 4.3 with uname added to - ;; # report: romp-ibm BSD 4.3 + echo romp-ibm-bsd"$UNAME_RELEASE" # 4.3 with uname added to + exit ;; # report: romp-ibm BSD 4.3 *:BOSX:*:*) - GUESS=rs6000-bull-bosx - ;; + echo rs6000-bull-bosx + exit ;; DPX/2?00:B.O.S.:*:*) - GUESS=m68k-bull-sysv3 - ;; + echo m68k-bull-sysv3 + exit ;; 9000/[34]??:4.3bsd:1.*:*) - GUESS=m68k-hp-bsd - ;; + echo m68k-hp-bsd + exit ;; hp300:4.4BSD:*:* | 9000/[34]??:4.3bsd:2.*:*) - GUESS=m68k-hp-bsd4.4 - ;; + echo m68k-hp-bsd4.4 + exit ;; 9000/[34678]??:HP-UX:*:*) - HPUX_REV=`echo "$UNAME_RELEASE" | sed -e 's/[^.]*.[0B]*//'` - case $UNAME_MACHINE in + HPUX_REV=$(echo "$UNAME_RELEASE"|sed -e 's/[^.]*.[0B]*//') + case "$UNAME_MACHINE" in 9000/31?) HP_ARCH=m68000 ;; 9000/[34]??) HP_ARCH=m68k ;; 9000/[678][0-9][0-9]) if test -x /usr/bin/getconf; then - sc_cpu_version=`/usr/bin/getconf SC_CPU_VERSION 2>/dev/null` - sc_kernel_bits=`/usr/bin/getconf SC_KERNEL_BITS 2>/dev/null` - case $sc_cpu_version in + sc_cpu_version=$(/usr/bin/getconf SC_CPU_VERSION 2>/dev/null) + sc_kernel_bits=$(/usr/bin/getconf SC_KERNEL_BITS 2>/dev/null) + case "$sc_cpu_version" in 523) HP_ARCH=hppa1.0 ;; # CPU_PA_RISC1_0 528) HP_ARCH=hppa1.1 ;; # CPU_PA_RISC1_1 532) # CPU_PA_RISC2_0 - case $sc_kernel_bits in + case "$sc_kernel_bits" in 32) HP_ARCH=hppa2.0n ;; 64) HP_ARCH=hppa2.0w ;; '') HP_ARCH=hppa2.0 ;; # HP-UX 10.20 @@ -739,7 +714,7 @@ exit (0); } EOF - (CCOPTS="" $CC_FOR_BUILD -o "$dummy" "$dummy.c" 2>/dev/null) && HP_ARCH=`"$dummy"` + (CCOPTS="" $CC_FOR_BUILD -o "$dummy" "$dummy.c" 2>/dev/null) && HP_ARCH=$("$dummy") test -z "$HP_ARCH" && HP_ARCH=hppa fi ;; esac @@ -764,12 +739,12 @@ HP_ARCH=hppa64 fi fi - GUESS=$HP_ARCH-hp-hpux$HPUX_REV - ;; + echo "$HP_ARCH"-hp-hpux"$HPUX_REV" + exit ;; ia64:HP-UX:*:*) - HPUX_REV=`echo "$UNAME_RELEASE" | sed -e 's/[^.]*.[0B]*//'` - GUESS=ia64-hp-hpux$HPUX_REV - ;; + HPUX_REV=$(echo "$UNAME_RELEASE"|sed -e 's/[^.]*.[0B]*//') + echo ia64-hp-hpux"$HPUX_REV" + exit ;; 3050*:HI-UX:*:*) set_cc_for_build sed 's/^ //' << EOF > "$dummy.c" @@ -797,38 +772,38 @@ exit (0); } EOF - $CC_FOR_BUILD -o "$dummy" "$dummy.c" && SYSTEM_NAME=`"$dummy"` && + $CC_FOR_BUILD -o "$dummy" "$dummy.c" && SYSTEM_NAME=$("$dummy") && { echo "$SYSTEM_NAME"; exit; } - GUESS=unknown-hitachi-hiuxwe2 - ;; + echo unknown-hitachi-hiuxwe2 + exit ;; 9000/7??:4.3bsd:*:* | 9000/8?[79]:4.3bsd:*:*) - GUESS=hppa1.1-hp-bsd - ;; + echo hppa1.1-hp-bsd + exit ;; 9000/8??:4.3bsd:*:*) - GUESS=hppa1.0-hp-bsd - ;; + echo hppa1.0-hp-bsd + exit ;; *9??*:MPE/iX:*:* | *3000*:MPE/iX:*:*) - GUESS=hppa1.0-hp-mpeix - ;; + echo hppa1.0-hp-mpeix + exit ;; hp7??:OSF1:*:* | hp8?[79]:OSF1:*:*) - GUESS=hppa1.1-hp-osf - ;; + echo hppa1.1-hp-osf + exit ;; hp8??:OSF1:*:*) - GUESS=hppa1.0-hp-osf - ;; + echo hppa1.0-hp-osf + exit ;; i*86:OSF1:*:*) if test -x /usr/sbin/sysversion ; then - GUESS=$UNAME_MACHINE-unknown-osf1mk + echo "$UNAME_MACHINE"-unknown-osf1mk else - GUESS=$UNAME_MACHINE-unknown-osf1 + echo "$UNAME_MACHINE"-unknown-osf1 fi - ;; + exit ;; parisc*:Lites*:*:*) - GUESS=hppa1.1-hp-lites - ;; + echo hppa1.1-hp-lites + exit ;; C1*:ConvexOS:*:* | convex:ConvexOS:C1*:*) - GUESS=c1-convex-bsd - ;; + echo c1-convex-bsd + exit ;; C2*:ConvexOS:*:* | convex:ConvexOS:C2*:*) if getsysinfo -f scalar_acc then echo c32-convex-bsd @@ -836,18 +811,17 @@ fi exit ;; C34*:ConvexOS:*:* | convex:ConvexOS:C34*:*) - GUESS=c34-convex-bsd - ;; + echo c34-convex-bsd + exit ;; C38*:ConvexOS:*:* | convex:ConvexOS:C38*:*) - GUESS=c38-convex-bsd - ;; + echo c38-convex-bsd + exit ;; C4*:ConvexOS:*:* | convex:ConvexOS:C4*:*) - GUESS=c4-convex-bsd - ;; + echo c4-convex-bsd + exit ;; CRAY*Y-MP:*:*:*) - CRAY_REL=`echo "$UNAME_RELEASE" | sed -e 's/\.[^.]*$/.X/'` - GUESS=ymp-cray-unicos$CRAY_REL - ;; + echo ymp-cray-unicos"$UNAME_RELEASE" | sed -e 's/\.[^.]*$/.X/' + exit ;; CRAY*[A-Z]90:*:*:*) echo "$UNAME_MACHINE"-cray-unicos"$UNAME_RELEASE" \ | sed -e 's/CRAY.*\([A-Z]90\)/\1/' \ @@ -855,135 +829,114 @@ -e 's/\.[^.]*$/.X/' exit ;; CRAY*TS:*:*:*) - CRAY_REL=`echo "$UNAME_RELEASE" | sed -e 's/\.[^.]*$/.X/'` - GUESS=t90-cray-unicos$CRAY_REL - ;; + echo t90-cray-unicos"$UNAME_RELEASE" | sed -e 's/\.[^.]*$/.X/' + exit ;; CRAY*T3E:*:*:*) - CRAY_REL=`echo "$UNAME_RELEASE" | sed -e 's/\.[^.]*$/.X/'` - GUESS=alphaev5-cray-unicosmk$CRAY_REL - ;; + echo alphaev5-cray-unicosmk"$UNAME_RELEASE" | sed -e 's/\.[^.]*$/.X/' + exit ;; CRAY*SV1:*:*:*) - CRAY_REL=`echo "$UNAME_RELEASE" | sed -e 's/\.[^.]*$/.X/'` - GUESS=sv1-cray-unicos$CRAY_REL - ;; + echo sv1-cray-unicos"$UNAME_RELEASE" | sed -e 's/\.[^.]*$/.X/' + exit ;; *:UNICOS/mp:*:*) - CRAY_REL=`echo "$UNAME_RELEASE" | sed -e 's/\.[^.]*$/.X/'` - GUESS=craynv-cray-unicosmp$CRAY_REL - ;; + echo craynv-cray-unicosmp"$UNAME_RELEASE" | sed -e 's/\.[^.]*$/.X/' + exit ;; F30[01]:UNIX_System_V:*:* | F700:UNIX_System_V:*:*) - FUJITSU_PROC=`uname -m | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz` - FUJITSU_SYS=`uname -p | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz | sed -e 's/\///'` - FUJITSU_REL=`echo "$UNAME_RELEASE" | sed -e 's/ /_/'` - GUESS=${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL} - ;; + FUJITSU_PROC=$(uname -m | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz) + FUJITSU_SYS=$(uname -p | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz | sed -e 's/\///') + FUJITSU_REL=$(echo "$UNAME_RELEASE" | sed -e 's/ /_/') + echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}" + exit ;; 5000:UNIX_System_V:4.*:*) - FUJITSU_SYS=`uname -p | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz | sed -e 's/\///'` - FUJITSU_REL=`echo "$UNAME_RELEASE" | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz | sed -e 's/ /_/'` - GUESS=sparc-fujitsu-${FUJITSU_SYS}${FUJITSU_REL} - ;; + FUJITSU_SYS=$(uname -p | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz | sed -e 's/\///') + FUJITSU_REL=$(echo "$UNAME_RELEASE" | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz | sed -e 's/ /_/') + echo "sparc-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}" + exit ;; i*86:BSD/386:*:* | i*86:BSD/OS:*:* | *:Ascend\ Embedded/OS:*:*) - GUESS=$UNAME_MACHINE-pc-bsdi$UNAME_RELEASE - ;; + echo "$UNAME_MACHINE"-pc-bsdi"$UNAME_RELEASE" + exit ;; sparc*:BSD/OS:*:*) - GUESS=sparc-unknown-bsdi$UNAME_RELEASE - ;; + echo sparc-unknown-bsdi"$UNAME_RELEASE" + exit ;; *:BSD/OS:*:*) - GUESS=$UNAME_MACHINE-unknown-bsdi$UNAME_RELEASE - ;; + echo "$UNAME_MACHINE"-unknown-bsdi"$UNAME_RELEASE" + exit ;; arm:FreeBSD:*:*) - UNAME_PROCESSOR=`uname -p` + UNAME_PROCESSOR=$(uname -p) set_cc_for_build if echo __ARM_PCS_VFP | $CC_FOR_BUILD -E - 2>/dev/null \ | grep -q __ARM_PCS_VFP then - FREEBSD_REL=`echo "$UNAME_RELEASE" | sed -e 's/[-(].*//'` - GUESS=$UNAME_PROCESSOR-unknown-freebsd$FREEBSD_REL-gnueabi + echo "${UNAME_PROCESSOR}"-unknown-freebsd"$(echo ${UNAME_RELEASE}|sed -e 's/[-(].*//')"-gnueabi else - FREEBSD_REL=`echo "$UNAME_RELEASE" | sed -e 's/[-(].*//'` - GUESS=$UNAME_PROCESSOR-unknown-freebsd$FREEBSD_REL-gnueabihf + echo "${UNAME_PROCESSOR}"-unknown-freebsd"$(echo ${UNAME_RELEASE}|sed -e 's/[-(].*//')"-gnueabihf fi - ;; + exit ;; *:FreeBSD:*:*) - UNAME_PROCESSOR=`/usr/bin/uname -p` - case $UNAME_PROCESSOR in + UNAME_PROCESSOR=$(/usr/bin/uname -p) + case "$UNAME_PROCESSOR" in amd64) UNAME_PROCESSOR=x86_64 ;; i386) UNAME_PROCESSOR=i586 ;; esac - FREEBSD_REL=`echo "$UNAME_RELEASE" | sed -e 's/[-(].*//'` - GUESS=$UNAME_PROCESSOR-unknown-freebsd$FREEBSD_REL - ;; + echo "$UNAME_PROCESSOR"-unknown-freebsd"$(echo "$UNAME_RELEASE"|sed -e 's/[-(].*//')" + exit ;; i*:CYGWIN*:*) - GUESS=$UNAME_MACHINE-pc-cygwin - ;; + echo "$UNAME_MACHINE"-pc-cygwin + exit ;; *:MINGW64*:*) - GUESS=$UNAME_MACHINE-pc-mingw64 - ;; + echo "$UNAME_MACHINE"-pc-mingw64 + exit ;; *:MINGW*:*) - GUESS=$UNAME_MACHINE-pc-mingw32 - ;; + echo "$UNAME_MACHINE"-pc-mingw32 + exit ;; *:MSYS*:*) - GUESS=$UNAME_MACHINE-pc-msys - ;; + echo "$UNAME_MACHINE"-pc-msys + exit ;; i*:PW*:*) - GUESS=$UNAME_MACHINE-pc-pw32 - ;; - *:SerenityOS:*:*) - GUESS=$UNAME_MACHINE-pc-serenity - ;; + echo "$UNAME_MACHINE"-pc-pw32 + exit ;; *:Interix*:*) - case $UNAME_MACHINE in + case "$UNAME_MACHINE" in x86) - GUESS=i586-pc-interix$UNAME_RELEASE - ;; + echo i586-pc-interix"$UNAME_RELEASE" + exit ;; authenticamd | genuineintel | EM64T) - GUESS=x86_64-unknown-interix$UNAME_RELEASE - ;; + echo x86_64-unknown-interix"$UNAME_RELEASE" + exit ;; IA64) - GUESS=ia64-unknown-interix$UNAME_RELEASE - ;; + echo ia64-unknown-interix"$UNAME_RELEASE" + exit ;; esac ;; i*:UWIN*:*) - GUESS=$UNAME_MACHINE-pc-uwin - ;; + echo "$UNAME_MACHINE"-pc-uwin + exit ;; amd64:CYGWIN*:*:* | x86_64:CYGWIN*:*:*) - GUESS=x86_64-pc-cygwin - ;; + echo x86_64-pc-cygwin + exit ;; prep*:SunOS:5.*:*) - SUN_REL=`echo "$UNAME_RELEASE" | sed -e 's/[^.]*//'` - GUESS=powerpcle-unknown-solaris2$SUN_REL - ;; + echo powerpcle-unknown-solaris2"$(echo "$UNAME_RELEASE"|sed -e 's/[^.]*//')" + exit ;; *:GNU:*:*) # the GNU system - GNU_ARCH=`echo "$UNAME_MACHINE" | sed -e 's,[-/].*$,,'` - GNU_REL=`echo "$UNAME_RELEASE" | sed -e 's,/.*$,,'` - GUESS=$GNU_ARCH-unknown-$LIBC$GNU_REL - ;; + echo "$(echo "$UNAME_MACHINE"|sed -e 's,[-/].*$,,')-unknown-$LIBC$(echo "$UNAME_RELEASE"|sed -e 's,/.*$,,')" + exit ;; *:GNU/*:*:*) # other systems with GNU libc and userland - GNU_SYS=`echo "$UNAME_SYSTEM" | sed 's,^[^/]*/,,' | tr "[:upper:]" "[:lower:]"` - GNU_REL=`echo "$UNAME_RELEASE" | sed -e 's/[-(].*//'` - GUESS=$UNAME_MACHINE-unknown-$GNU_SYS$GNU_REL-$LIBC - ;; - x86_64:[Mm]anagarm:*:*|i?86:[Mm]anagarm:*:*) - GUESS="$UNAME_MACHINE-pc-managarm-mlibc" - ;; - *:[Mm]anagarm:*:*) - GUESS="$UNAME_MACHINE-unknown-managarm-mlibc" - ;; + echo "$UNAME_MACHINE-unknown-$(echo "$UNAME_SYSTEM" | sed 's,^[^/]*/,,' | tr "[:upper:]" "[:lower:]")$(echo "$UNAME_RELEASE"|sed -e 's/[-(].*//')-$LIBC" + exit ;; *:Minix:*:*) - GUESS=$UNAME_MACHINE-unknown-minix - ;; + echo "$UNAME_MACHINE"-unknown-minix + exit ;; aarch64:Linux:*:*) - GUESS=$UNAME_MACHINE-unknown-linux-$LIBC - ;; + echo "$UNAME_MACHINE"-unknown-linux-"$LIBC" + exit ;; aarch64_be:Linux:*:*) UNAME_MACHINE=aarch64_be - GUESS=$UNAME_MACHINE-unknown-linux-$LIBC - ;; + echo "$UNAME_MACHINE"-unknown-linux-"$LIBC" + exit ;; alpha:Linux:*:*) - case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' /proc/cpuinfo 2>/dev/null` in + case $(sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' /proc/cpuinfo 2>/dev/null) in EV5) UNAME_MACHINE=alphaev5 ;; EV56) UNAME_MACHINE=alphaev56 ;; PCA56) UNAME_MACHINE=alphapca56 ;; @@ -994,63 +947,63 @@ esac objdump --private-headers /bin/sh | grep -q ld.so.1 if test "$?" = 0 ; then LIBC=gnulibc1 ; fi - GUESS=$UNAME_MACHINE-unknown-linux-$LIBC - ;; - arc:Linux:*:* | arceb:Linux:*:* | arc32:Linux:*:* | arc64:Linux:*:*) - GUESS=$UNAME_MACHINE-unknown-linux-$LIBC - ;; + echo "$UNAME_MACHINE"-unknown-linux-"$LIBC" + exit ;; + arc:Linux:*:* | arceb:Linux:*:*) + echo "$UNAME_MACHINE"-unknown-linux-"$LIBC" + exit ;; arm*:Linux:*:*) set_cc_for_build if echo __ARM_EABI__ | $CC_FOR_BUILD -E - 2>/dev/null \ | grep -q __ARM_EABI__ then - GUESS=$UNAME_MACHINE-unknown-linux-$LIBC + echo "$UNAME_MACHINE"-unknown-linux-"$LIBC" else if echo __ARM_PCS_VFP | $CC_FOR_BUILD -E - 2>/dev/null \ | grep -q __ARM_PCS_VFP then - GUESS=$UNAME_MACHINE-unknown-linux-${LIBC}eabi + echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"eabi else - GUESS=$UNAME_MACHINE-unknown-linux-${LIBC}eabihf + echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"eabihf fi fi - ;; + exit ;; avr32*:Linux:*:*) - GUESS=$UNAME_MACHINE-unknown-linux-$LIBC - ;; + echo "$UNAME_MACHINE"-unknown-linux-"$LIBC" + exit ;; cris:Linux:*:*) - GUESS=$UNAME_MACHINE-axis-linux-$LIBC - ;; + echo "$UNAME_MACHINE"-axis-linux-"$LIBC" + exit ;; crisv32:Linux:*:*) - GUESS=$UNAME_MACHINE-axis-linux-$LIBC - ;; + echo "$UNAME_MACHINE"-axis-linux-"$LIBC" + exit ;; e2k:Linux:*:*) - GUESS=$UNAME_MACHINE-unknown-linux-$LIBC - ;; + echo "$UNAME_MACHINE"-unknown-linux-"$LIBC" + exit ;; frv:Linux:*:*) - GUESS=$UNAME_MACHINE-unknown-linux-$LIBC - ;; + echo "$UNAME_MACHINE"-unknown-linux-"$LIBC" + exit ;; hexagon:Linux:*:*) - GUESS=$UNAME_MACHINE-unknown-linux-$LIBC - ;; + echo "$UNAME_MACHINE"-unknown-linux-"$LIBC" + exit ;; i*86:Linux:*:*) - GUESS=$UNAME_MACHINE-pc-linux-$LIBC - ;; + echo "$UNAME_MACHINE"-pc-linux-"$LIBC" + exit ;; ia64:Linux:*:*) - GUESS=$UNAME_MACHINE-unknown-linux-$LIBC - ;; + echo "$UNAME_MACHINE"-unknown-linux-"$LIBC" + exit ;; k1om:Linux:*:*) - GUESS=$UNAME_MACHINE-unknown-linux-$LIBC - ;; - loongarch32:Linux:*:* | loongarch64:Linux:*:*) - GUESS=$UNAME_MACHINE-unknown-linux-$LIBC - ;; + echo "$UNAME_MACHINE"-unknown-linux-"$LIBC" + exit ;; + loongarch32:Linux:*:* | loongarch64:Linux:*:* | loongarchx32:Linux:*:*) + echo "$UNAME_MACHINE"-unknown-linux-"$LIBC" + exit ;; m32r*:Linux:*:*) - GUESS=$UNAME_MACHINE-unknown-linux-$LIBC - ;; + echo "$UNAME_MACHINE"-unknown-linux-"$LIBC" + exit ;; m68*:Linux:*:*) - GUESS=$UNAME_MACHINE-unknown-linux-$LIBC - ;; + echo "$UNAME_MACHINE"-unknown-linux-"$LIBC" + exit ;; mips:Linux:*:* | mips64:Linux:*:*) set_cc_for_build IS_GLIBC=0 @@ -1095,150 +1048,138 @@ #endif #endif EOF - cc_set_vars=`$CC_FOR_BUILD -E "$dummy.c" 2>/dev/null | grep '^CPU\|^MIPS_ENDIAN\|^LIBCABI'` - eval "$cc_set_vars" + eval "$($CC_FOR_BUILD -E "$dummy.c" 2>/dev/null | grep '^CPU\|^MIPS_ENDIAN\|^LIBCABI')" test "x$CPU" != x && { echo "$CPU${MIPS_ENDIAN}-unknown-linux-$LIBCABI"; exit; } ;; mips64el:Linux:*:*) - GUESS=$UNAME_MACHINE-unknown-linux-$LIBC - ;; + echo "$UNAME_MACHINE"-unknown-linux-"$LIBC" + exit ;; openrisc*:Linux:*:*) - GUESS=or1k-unknown-linux-$LIBC - ;; + echo or1k-unknown-linux-"$LIBC" + exit ;; or32:Linux:*:* | or1k*:Linux:*:*) - GUESS=$UNAME_MACHINE-unknown-linux-$LIBC - ;; + echo "$UNAME_MACHINE"-unknown-linux-"$LIBC" + exit ;; padre:Linux:*:*) - GUESS=sparc-unknown-linux-$LIBC - ;; + echo sparc-unknown-linux-"$LIBC" + exit ;; parisc64:Linux:*:* | hppa64:Linux:*:*) - GUESS=hppa64-unknown-linux-$LIBC - ;; + echo hppa64-unknown-linux-"$LIBC" + exit ;; parisc:Linux:*:* | hppa:Linux:*:*) # Look for CPU level - case `grep '^cpu[^a-z]*:' /proc/cpuinfo 2>/dev/null | cut -d' ' -f2` in - PA7*) GUESS=hppa1.1-unknown-linux-$LIBC ;; - PA8*) GUESS=hppa2.0-unknown-linux-$LIBC ;; - *) GUESS=hppa-unknown-linux-$LIBC ;; + case $(grep '^cpu[^a-z]*:' /proc/cpuinfo 2>/dev/null | cut -d' ' -f2) in + PA7*) echo hppa1.1-unknown-linux-"$LIBC" ;; + PA8*) echo hppa2.0-unknown-linux-"$LIBC" ;; + *) echo hppa-unknown-linux-"$LIBC" ;; esac - ;; + exit ;; ppc64:Linux:*:*) - GUESS=powerpc64-unknown-linux-$LIBC - ;; + echo powerpc64-unknown-linux-"$LIBC" + exit ;; ppc:Linux:*:*) - GUESS=powerpc-unknown-linux-$LIBC - ;; + echo powerpc-unknown-linux-"$LIBC" + exit ;; ppc64le:Linux:*:*) - GUESS=powerpc64le-unknown-linux-$LIBC - ;; + echo powerpc64le-unknown-linux-"$LIBC" + exit ;; ppcle:Linux:*:*) - GUESS=powerpcle-unknown-linux-$LIBC - ;; + echo powerpcle-unknown-linux-"$LIBC" + exit ;; riscv32:Linux:*:* | riscv32be:Linux:*:* | riscv64:Linux:*:* | riscv64be:Linux:*:*) - GUESS=$UNAME_MACHINE-unknown-linux-$LIBC - ;; + echo "$UNAME_MACHINE"-unknown-linux-"$LIBC" + exit ;; s390:Linux:*:* | s390x:Linux:*:*) - GUESS=$UNAME_MACHINE-ibm-linux-$LIBC - ;; + echo "$UNAME_MACHINE"-ibm-linux-"$LIBC" + exit ;; sh64*:Linux:*:*) - GUESS=$UNAME_MACHINE-unknown-linux-$LIBC - ;; + echo "$UNAME_MACHINE"-unknown-linux-"$LIBC" + exit ;; sh*:Linux:*:*) - GUESS=$UNAME_MACHINE-unknown-linux-$LIBC - ;; + echo "$UNAME_MACHINE"-unknown-linux-"$LIBC" + exit ;; sparc:Linux:*:* | sparc64:Linux:*:*) - GUESS=$UNAME_MACHINE-unknown-linux-$LIBC - ;; + echo "$UNAME_MACHINE"-unknown-linux-"$LIBC" + exit ;; tile*:Linux:*:*) - GUESS=$UNAME_MACHINE-unknown-linux-$LIBC - ;; + echo "$UNAME_MACHINE"-unknown-linux-"$LIBC" + exit ;; vax:Linux:*:*) - GUESS=$UNAME_MACHINE-dec-linux-$LIBC - ;; + echo "$UNAME_MACHINE"-dec-linux-"$LIBC" + exit ;; x86_64:Linux:*:*) set_cc_for_build - CPU=$UNAME_MACHINE LIBCABI=$LIBC if test "$CC_FOR_BUILD" != no_compiler_found; then - ABI=64 - sed 's/^ //' << EOF > "$dummy.c" - #ifdef __i386__ - ABI=x86 - #else - #ifdef __ILP32__ - ABI=x32 - #endif - #endif -EOF - cc_set_abi=`$CC_FOR_BUILD -E "$dummy.c" 2>/dev/null | grep '^ABI' | sed 's, ,,g'` - eval "$cc_set_abi" - case $ABI in - x86) CPU=i686 ;; - x32) LIBCABI=${LIBC}x32 ;; - esac + if (echo '#ifdef __ILP32__'; echo IS_X32; echo '#endif') | \ + (CCOPTS="" $CC_FOR_BUILD -E - 2>/dev/null) | \ + grep IS_X32 >/dev/null + then + LIBCABI="$LIBC"x32 + fi fi - GUESS=$CPU-pc-linux-$LIBCABI - ;; + echo "$UNAME_MACHINE"-pc-linux-"$LIBCABI" + exit ;; xtensa*:Linux:*:*) - GUESS=$UNAME_MACHINE-unknown-linux-$LIBC - ;; + echo "$UNAME_MACHINE"-unknown-linux-"$LIBC" + exit ;; i*86:DYNIX/ptx:4*:*) # ptx 4.0 does uname -s correctly, with DYNIX/ptx in there. # earlier versions are messed up and put the nodename in both # sysname and nodename. - GUESS=i386-sequent-sysv4 - ;; + echo i386-sequent-sysv4 + exit ;; i*86:UNIX_SV:4.2MP:2.*) # Unixware is an offshoot of SVR4, but it has its own version # number series starting with 2... # I am not positive that other SVR4 systems won't match this, # I just have to hope. -- rms. # Use sysv4.2uw... so that sysv4* matches it. - GUESS=$UNAME_MACHINE-pc-sysv4.2uw$UNAME_VERSION - ;; + echo "$UNAME_MACHINE"-pc-sysv4.2uw"$UNAME_VERSION" + exit ;; i*86:OS/2:*:*) # If we were able to find `uname', then EMX Unix compatibility # is probably installed. - GUESS=$UNAME_MACHINE-pc-os2-emx - ;; + echo "$UNAME_MACHINE"-pc-os2-emx + exit ;; i*86:XTS-300:*:STOP) - GUESS=$UNAME_MACHINE-unknown-stop - ;; + echo "$UNAME_MACHINE"-unknown-stop + exit ;; i*86:atheos:*:*) - GUESS=$UNAME_MACHINE-unknown-atheos - ;; + echo "$UNAME_MACHINE"-unknown-atheos + exit ;; i*86:syllable:*:*) - GUESS=$UNAME_MACHINE-pc-syllable - ;; + echo "$UNAME_MACHINE"-pc-syllable + exit ;; i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.[02]*:*) - GUESS=i386-unknown-lynxos$UNAME_RELEASE - ;; + echo i386-unknown-lynxos"$UNAME_RELEASE" + exit ;; i*86:*DOS:*:*) - GUESS=$UNAME_MACHINE-pc-msdosdjgpp - ;; + echo "$UNAME_MACHINE"-pc-msdosdjgpp + exit ;; i*86:*:4.*:*) - UNAME_REL=`echo "$UNAME_RELEASE" | sed 's/\/MP$//'` + UNAME_REL=$(echo "$UNAME_RELEASE" | sed 's/\/MP$//') if grep Novell /usr/include/link.h >/dev/null 2>/dev/null; then - GUESS=$UNAME_MACHINE-univel-sysv$UNAME_REL + echo "$UNAME_MACHINE"-univel-sysv"$UNAME_REL" else - GUESS=$UNAME_MACHINE-pc-sysv$UNAME_REL + echo "$UNAME_MACHINE"-pc-sysv"$UNAME_REL" fi - ;; + exit ;; i*86:*:5:[678]*) # UnixWare 7.x, OpenUNIX and OpenServer 6. - case `/bin/uname -X | grep "^Machine"` in + case $(/bin/uname -X | grep "^Machine") in *486*) UNAME_MACHINE=i486 ;; *Pentium) UNAME_MACHINE=i586 ;; *Pent*|*Celeron) UNAME_MACHINE=i686 ;; esac - GUESS=$UNAME_MACHINE-unknown-sysv${UNAME_RELEASE}${UNAME_SYSTEM}${UNAME_VERSION} - ;; + echo "$UNAME_MACHINE-unknown-sysv${UNAME_RELEASE}${UNAME_SYSTEM}${UNAME_VERSION}" + exit ;; i*86:*:3.2:*) if test -f /usr/options/cb.name; then - UNAME_REL=`sed -n 's/.*Version //p' /dev/null >/dev/null ; then - UNAME_REL=`(/bin/uname -X|grep Release|sed -e 's/.*= //')` + UNAME_REL=$( (/bin/uname -X|grep Release|sed -e 's/.*= //')) (/bin/uname -X|grep i80486 >/dev/null) && UNAME_MACHINE=i486 (/bin/uname -X|grep '^Machine.*Pentium' >/dev/null) \ && UNAME_MACHINE=i586 @@ -1246,11 +1187,11 @@ && UNAME_MACHINE=i686 (/bin/uname -X|grep '^Machine.*Pentium Pro' >/dev/null) \ && UNAME_MACHINE=i686 - GUESS=$UNAME_MACHINE-pc-sco$UNAME_REL + echo "$UNAME_MACHINE"-pc-sco"$UNAME_REL" else - GUESS=$UNAME_MACHINE-pc-sysv32 + echo "$UNAME_MACHINE"-pc-sysv32 fi - ;; + exit ;; pc:*:*:*) # Left here for compatibility: # uname -m prints for DJGPP always 'pc', but it prints nothing about @@ -1258,37 +1199,37 @@ # Note: whatever this is, it MUST be the same as what config.sub # prints for the "djgpp" host, or else GDB configure will decide that # this is a cross-build. - GUESS=i586-pc-msdosdjgpp - ;; + echo i586-pc-msdosdjgpp + exit ;; Intel:Mach:3*:*) - GUESS=i386-pc-mach3 - ;; + echo i386-pc-mach3 + exit ;; paragon:*:*:*) - GUESS=i860-intel-osf1 - ;; + echo i860-intel-osf1 + exit ;; i860:*:4.*:*) # i860-SVR4 if grep Stardent /usr/include/sys/uadmin.h >/dev/null 2>&1 ; then - GUESS=i860-stardent-sysv$UNAME_RELEASE # Stardent Vistra i860-SVR4 + echo i860-stardent-sysv"$UNAME_RELEASE" # Stardent Vistra i860-SVR4 else # Add other i860-SVR4 vendors below as they are discovered. - GUESS=i860-unknown-sysv$UNAME_RELEASE # Unknown i860-SVR4 + echo i860-unknown-sysv"$UNAME_RELEASE" # Unknown i860-SVR4 fi - ;; + exit ;; mini*:CTIX:SYS*5:*) # "miniframe" - GUESS=m68010-convergent-sysv - ;; + echo m68010-convergent-sysv + exit ;; mc68k:UNIX:SYSTEM5:3.51m) - GUESS=m68k-convergent-sysv - ;; + echo m68k-convergent-sysv + exit ;; M680?0:D-NIX:5.3:*) - GUESS=m68k-diab-dnix - ;; + echo m68k-diab-dnix + exit ;; M68*:*:R3V[5678]*:*) test -r /sysV68 && { echo 'm68k-motorola-sysv'; exit; } ;; 3[345]??:*:4.0:3.0 | 3[34]??A:*:4.0:3.0 | 3[34]??,*:*:4.0:3.0 | 3[34]??/*:*:4.0:3.0 | 4400:*:4.0:3.0 | 4850:*:4.0:3.0 | SKA40:*:4.0:3.0 | SDS2:*:4.0:3.0 | SHG2:*:4.0:3.0 | S7501*:*:4.0:3.0) OS_REL='' test -r /etc/.relid \ - && OS_REL=.`sed -n 's/[^ ]* [^ ]* \([0-9][0-9]\).*/\1/p' < /etc/.relid` + && OS_REL=.$(sed -n 's/[^ ]* [^ ]* \([0-9][0-9]\).*/\1/p' < /etc/.relid) /bin/uname -p 2>/dev/null | grep 86 >/dev/null \ && { echo i486-ncr-sysv4.3"$OS_REL"; exit; } /bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \ @@ -1299,7 +1240,7 @@ NCR*:*:4.2:* | MPRAS*:*:4.2:*) OS_REL='.3' test -r /etc/.relid \ - && OS_REL=.`sed -n 's/[^ ]* [^ ]* \([0-9][0-9]\).*/\1/p' < /etc/.relid` + && OS_REL=.$(sed -n 's/[^ ]* [^ ]* \([0-9][0-9]\).*/\1/p' < /etc/.relid) /bin/uname -p 2>/dev/null | grep 86 >/dev/null \ && { echo i486-ncr-sysv4.3"$OS_REL"; exit; } /bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \ @@ -1307,121 +1248,118 @@ /bin/uname -p 2>/dev/null | /bin/grep pteron >/dev/null \ && { echo i586-ncr-sysv4.3"$OS_REL"; exit; } ;; m68*:LynxOS:2.*:* | m68*:LynxOS:3.0*:*) - GUESS=m68k-unknown-lynxos$UNAME_RELEASE - ;; + echo m68k-unknown-lynxos"$UNAME_RELEASE" + exit ;; mc68030:UNIX_System_V:4.*:*) - GUESS=m68k-atari-sysv4 - ;; + echo m68k-atari-sysv4 + exit ;; TSUNAMI:LynxOS:2.*:*) - GUESS=sparc-unknown-lynxos$UNAME_RELEASE - ;; + echo sparc-unknown-lynxos"$UNAME_RELEASE" + exit ;; rs6000:LynxOS:2.*:*) - GUESS=rs6000-unknown-lynxos$UNAME_RELEASE - ;; + echo rs6000-unknown-lynxos"$UNAME_RELEASE" + exit ;; PowerPC:LynxOS:2.*:* | PowerPC:LynxOS:3.[01]*:* | PowerPC:LynxOS:4.[02]*:*) - GUESS=powerpc-unknown-lynxos$UNAME_RELEASE - ;; + echo powerpc-unknown-lynxos"$UNAME_RELEASE" + exit ;; SM[BE]S:UNIX_SV:*:*) - GUESS=mips-dde-sysv$UNAME_RELEASE - ;; + echo mips-dde-sysv"$UNAME_RELEASE" + exit ;; RM*:ReliantUNIX-*:*:*) - GUESS=mips-sni-sysv4 - ;; + echo mips-sni-sysv4 + exit ;; RM*:SINIX-*:*:*) - GUESS=mips-sni-sysv4 - ;; + echo mips-sni-sysv4 + exit ;; *:SINIX-*:*:*) if uname -p 2>/dev/null >/dev/null ; then - UNAME_MACHINE=`(uname -p) 2>/dev/null` - GUESS=$UNAME_MACHINE-sni-sysv4 + UNAME_MACHINE=$( (uname -p) 2>/dev/null) + echo "$UNAME_MACHINE"-sni-sysv4 else - GUESS=ns32k-sni-sysv + echo ns32k-sni-sysv fi - ;; + exit ;; PENTIUM:*:4.0*:*) # Unisys `ClearPath HMP IX 4000' SVR4/MP effort # says - GUESS=i586-unisys-sysv4 - ;; + echo i586-unisys-sysv4 + exit ;; *:UNIX_System_V:4*:FTX*) # From Gerald Hewes . # How about differentiating between stratus architectures? -djm - GUESS=hppa1.1-stratus-sysv4 - ;; + echo hppa1.1-stratus-sysv4 + exit ;; *:*:*:FTX*) # From seanf@swdc.stratus.com. - GUESS=i860-stratus-sysv4 - ;; + echo i860-stratus-sysv4 + exit ;; i*86:VOS:*:*) # From Paul.Green@stratus.com. - GUESS=$UNAME_MACHINE-stratus-vos - ;; + echo "$UNAME_MACHINE"-stratus-vos + exit ;; *:VOS:*:*) # From Paul.Green@stratus.com. - GUESS=hppa1.1-stratus-vos - ;; + echo hppa1.1-stratus-vos + exit ;; mc68*:A/UX:*:*) - GUESS=m68k-apple-aux$UNAME_RELEASE - ;; + echo m68k-apple-aux"$UNAME_RELEASE" + exit ;; news*:NEWS-OS:6*:*) - GUESS=mips-sony-newsos6 - ;; + echo mips-sony-newsos6 + exit ;; R[34]000:*System_V*:*:* | R4000:UNIX_SYSV:*:* | R*000:UNIX_SV:*:*) if test -d /usr/nec; then - GUESS=mips-nec-sysv$UNAME_RELEASE + echo mips-nec-sysv"$UNAME_RELEASE" else - GUESS=mips-unknown-sysv$UNAME_RELEASE + echo mips-unknown-sysv"$UNAME_RELEASE" fi - ;; + exit ;; BeBox:BeOS:*:*) # BeOS running on hardware made by Be, PPC only. - GUESS=powerpc-be-beos - ;; + echo powerpc-be-beos + exit ;; BeMac:BeOS:*:*) # BeOS running on Mac or Mac clone, PPC only. - GUESS=powerpc-apple-beos - ;; + echo powerpc-apple-beos + exit ;; BePC:BeOS:*:*) # BeOS running on Intel PC compatible. - GUESS=i586-pc-beos - ;; + echo i586-pc-beos + exit ;; BePC:Haiku:*:*) # Haiku running on Intel PC compatible. - GUESS=i586-pc-haiku - ;; - ppc:Haiku:*:*) # Haiku running on Apple PowerPC - GUESS=powerpc-apple-haiku - ;; - *:Haiku:*:*) # Haiku modern gcc (not bound by BeOS compat) - GUESS=$UNAME_MACHINE-unknown-haiku - ;; + echo i586-pc-haiku + exit ;; + x86_64:Haiku:*:*) + echo x86_64-unknown-haiku + exit ;; SX-4:SUPER-UX:*:*) - GUESS=sx4-nec-superux$UNAME_RELEASE - ;; + echo sx4-nec-superux"$UNAME_RELEASE" + exit ;; SX-5:SUPER-UX:*:*) - GUESS=sx5-nec-superux$UNAME_RELEASE - ;; + echo sx5-nec-superux"$UNAME_RELEASE" + exit ;; SX-6:SUPER-UX:*:*) - GUESS=sx6-nec-superux$UNAME_RELEASE - ;; + echo sx6-nec-superux"$UNAME_RELEASE" + exit ;; SX-7:SUPER-UX:*:*) - GUESS=sx7-nec-superux$UNAME_RELEASE - ;; + echo sx7-nec-superux"$UNAME_RELEASE" + exit ;; SX-8:SUPER-UX:*:*) - GUESS=sx8-nec-superux$UNAME_RELEASE - ;; + echo sx8-nec-superux"$UNAME_RELEASE" + exit ;; SX-8R:SUPER-UX:*:*) - GUESS=sx8r-nec-superux$UNAME_RELEASE - ;; + echo sx8r-nec-superux"$UNAME_RELEASE" + exit ;; SX-ACE:SUPER-UX:*:*) - GUESS=sxace-nec-superux$UNAME_RELEASE - ;; + echo sxace-nec-superux"$UNAME_RELEASE" + exit ;; Power*:Rhapsody:*:*) - GUESS=powerpc-apple-rhapsody$UNAME_RELEASE - ;; + echo powerpc-apple-rhapsody"$UNAME_RELEASE" + exit ;; *:Rhapsody:*:*) - GUESS=$UNAME_MACHINE-apple-rhapsody$UNAME_RELEASE - ;; + echo "$UNAME_MACHINE"-apple-rhapsody"$UNAME_RELEASE" + exit ;; arm64:Darwin:*:*) - GUESS=aarch64-apple-darwin$UNAME_RELEASE - ;; + echo aarch64-apple-darwin"$UNAME_RELEASE" + exit ;; *:Darwin:*:*) - UNAME_PROCESSOR=`uname -p` + UNAME_PROCESSOR=$(uname -p) case $UNAME_PROCESSOR in unknown) UNAME_PROCESSOR=powerpc ;; esac @@ -1455,119 +1393,109 @@ # uname -m returns i386 or x86_64 UNAME_PROCESSOR=$UNAME_MACHINE fi - GUESS=$UNAME_PROCESSOR-apple-darwin$UNAME_RELEASE - ;; + echo "$UNAME_PROCESSOR"-apple-darwin"$UNAME_RELEASE" + exit ;; *:procnto*:*:* | *:QNX:[0123456789]*:*) - UNAME_PROCESSOR=`uname -p` + UNAME_PROCESSOR=$(uname -p) if test "$UNAME_PROCESSOR" = x86; then UNAME_PROCESSOR=i386 UNAME_MACHINE=pc fi - GUESS=$UNAME_PROCESSOR-$UNAME_MACHINE-nto-qnx$UNAME_RELEASE - ;; + echo "$UNAME_PROCESSOR"-"$UNAME_MACHINE"-nto-qnx"$UNAME_RELEASE" + exit ;; *:QNX:*:4*) - GUESS=i386-pc-qnx - ;; + echo i386-pc-qnx + exit ;; NEO-*:NONSTOP_KERNEL:*:*) - GUESS=neo-tandem-nsk$UNAME_RELEASE - ;; + echo neo-tandem-nsk"$UNAME_RELEASE" + exit ;; NSE-*:NONSTOP_KERNEL:*:*) - GUESS=nse-tandem-nsk$UNAME_RELEASE - ;; + echo nse-tandem-nsk"$UNAME_RELEASE" + exit ;; NSR-*:NONSTOP_KERNEL:*:*) - GUESS=nsr-tandem-nsk$UNAME_RELEASE - ;; + echo nsr-tandem-nsk"$UNAME_RELEASE" + exit ;; NSV-*:NONSTOP_KERNEL:*:*) - GUESS=nsv-tandem-nsk$UNAME_RELEASE - ;; + echo nsv-tandem-nsk"$UNAME_RELEASE" + exit ;; NSX-*:NONSTOP_KERNEL:*:*) - GUESS=nsx-tandem-nsk$UNAME_RELEASE - ;; + echo nsx-tandem-nsk"$UNAME_RELEASE" + exit ;; *:NonStop-UX:*:*) - GUESS=mips-compaq-nonstopux - ;; + echo mips-compaq-nonstopux + exit ;; BS2000:POSIX*:*:*) - GUESS=bs2000-siemens-sysv - ;; + echo bs2000-siemens-sysv + exit ;; DS/*:UNIX_System_V:*:*) - GUESS=$UNAME_MACHINE-$UNAME_SYSTEM-$UNAME_RELEASE - ;; + echo "$UNAME_MACHINE"-"$UNAME_SYSTEM"-"$UNAME_RELEASE" + exit ;; *:Plan9:*:*) # "uname -m" is not consistent, so use $cputype instead. 386 # is converted to i386 for consistency with other x86 # operating systems. - if test "${cputype-}" = 386; then + # shellcheck disable=SC2154 + if test "$cputype" = 386; then UNAME_MACHINE=i386 - elif test "x${cputype-}" != x; then - UNAME_MACHINE=$cputype + else + UNAME_MACHINE="$cputype" fi - GUESS=$UNAME_MACHINE-unknown-plan9 - ;; + echo "$UNAME_MACHINE"-unknown-plan9 + exit ;; *:TOPS-10:*:*) - GUESS=pdp10-unknown-tops10 - ;; + echo pdp10-unknown-tops10 + exit ;; *:TENEX:*:*) - GUESS=pdp10-unknown-tenex - ;; + echo pdp10-unknown-tenex + exit ;; KS10:TOPS-20:*:* | KL10:TOPS-20:*:* | TYPE4:TOPS-20:*:*) - GUESS=pdp10-dec-tops20 - ;; + echo pdp10-dec-tops20 + exit ;; XKL-1:TOPS-20:*:* | TYPE5:TOPS-20:*:*) - GUESS=pdp10-xkl-tops20 - ;; + echo pdp10-xkl-tops20 + exit ;; *:TOPS-20:*:*) - GUESS=pdp10-unknown-tops20 - ;; + echo pdp10-unknown-tops20 + exit ;; *:ITS:*:*) - GUESS=pdp10-unknown-its - ;; + echo pdp10-unknown-its + exit ;; SEI:*:*:SEIUX) - GUESS=mips-sei-seiux$UNAME_RELEASE - ;; + echo mips-sei-seiux"$UNAME_RELEASE" + exit ;; *:DragonFly:*:*) - DRAGONFLY_REL=`echo "$UNAME_RELEASE" | sed -e 's/[-(].*//'` - GUESS=$UNAME_MACHINE-unknown-dragonfly$DRAGONFLY_REL - ;; + echo "$UNAME_MACHINE"-unknown-dragonfly"$(echo "$UNAME_RELEASE"|sed -e 's/[-(].*//')" + exit ;; *:*VMS:*:*) - UNAME_MACHINE=`(uname -p) 2>/dev/null` - case $UNAME_MACHINE in - A*) GUESS=alpha-dec-vms ;; - I*) GUESS=ia64-dec-vms ;; - V*) GUESS=vax-dec-vms ;; + UNAME_MACHINE=$( (uname -p) 2>/dev/null) + case "$UNAME_MACHINE" in + A*) echo alpha-dec-vms ; exit ;; + I*) echo ia64-dec-vms ; exit ;; + V*) echo vax-dec-vms ; exit ;; esac ;; *:XENIX:*:SysV) - GUESS=i386-pc-xenix - ;; + echo i386-pc-xenix + exit ;; i*86:skyos:*:*) - SKYOS_REL=`echo "$UNAME_RELEASE" | sed -e 's/ .*$//'` - GUESS=$UNAME_MACHINE-pc-skyos$SKYOS_REL - ;; + echo "$UNAME_MACHINE"-pc-skyos"$(echo "$UNAME_RELEASE" | sed -e 's/ .*$//')" + exit ;; i*86:rdos:*:*) - GUESS=$UNAME_MACHINE-pc-rdos - ;; - i*86:Fiwix:*:*) - GUESS=$UNAME_MACHINE-pc-fiwix - ;; + echo "$UNAME_MACHINE"-pc-rdos + exit ;; *:AROS:*:*) - GUESS=$UNAME_MACHINE-unknown-aros - ;; + echo "$UNAME_MACHINE"-unknown-aros + exit ;; x86_64:VMkernel:*:*) - GUESS=$UNAME_MACHINE-unknown-esx - ;; + echo "$UNAME_MACHINE"-unknown-esx + exit ;; amd64:Isilon\ OneFS:*:*) - GUESS=x86_64-unknown-onefs - ;; + echo x86_64-unknown-onefs + exit ;; *:Unleashed:*:*) - GUESS=$UNAME_MACHINE-unknown-unleashed$UNAME_RELEASE - ;; + echo "$UNAME_MACHINE"-unknown-unleashed"$UNAME_RELEASE" + exit ;; esac -# Do we have a guess based on uname results? -if test "x$GUESS" != x; then - echo "$GUESS" - exit -fi - # No uname command or uname output not recognized. set_cc_for_build cat > "$dummy.c" </dev/null`; + version=$( (hostinfo | sed -n 's/.*NeXT Mach \([0-9]*\).*/\1/p') 2>/dev/null); if (version < 4) printf ("%s-next-nextstep%d\n", __ARCHITECTURE__, version); else @@ -1699,7 +1627,7 @@ } EOF -$CC_FOR_BUILD -o "$dummy" "$dummy.c" 2>/dev/null && SYSTEM_NAME=`"$dummy"` && +$CC_FOR_BUILD -o "$dummy" "$dummy.c" 2>/dev/null && SYSTEM_NAME=$($dummy) && { echo "$SYSTEM_NAME"; exit; } # Apollos put the system type in the environment. @@ -1707,7 +1635,7 @@ echo "$0: unable to guess system type" >&2 -case $UNAME_MACHINE:$UNAME_SYSTEM in +case "$UNAME_MACHINE:$UNAME_SYSTEM" in mips:Linux | mips64:Linux) # If we got here on MIPS GNU/Linux, output extra information. cat >&2 <&2 </dev/null || echo unknown` -uname -r = `(uname -r) 2>/dev/null || echo unknown` -uname -s = `(uname -s) 2>/dev/null || echo unknown` -uname -v = `(uname -v) 2>/dev/null || echo unknown` - -/usr/bin/uname -p = `(/usr/bin/uname -p) 2>/dev/null` -/bin/uname -X = `(/bin/uname -X) 2>/dev/null` - -hostinfo = `(hostinfo) 2>/dev/null` -/bin/universe = `(/bin/universe) 2>/dev/null` -/usr/bin/arch -k = `(/usr/bin/arch -k) 2>/dev/null` -/bin/arch = `(/bin/arch) 2>/dev/null` -/usr/bin/oslevel = `(/usr/bin/oslevel) 2>/dev/null` -/usr/convex/getsysinfo = `(/usr/convex/getsysinfo) 2>/dev/null` +uname -m = $( (uname -m) 2>/dev/null || echo unknown) +uname -r = $( (uname -r) 2>/dev/null || echo unknown) +uname -s = $( (uname -s) 2>/dev/null || echo unknown) +uname -v = $( (uname -v) 2>/dev/null || echo unknown) + +/usr/bin/uname -p = $( (/usr/bin/uname -p) 2>/dev/null) +/bin/uname -X = $( (/bin/uname -X) 2>/dev/null) + +hostinfo = $( (hostinfo) 2>/dev/null) +/bin/universe = $( (/bin/universe) 2>/dev/null) +/usr/bin/arch -k = $( (/usr/bin/arch -k) 2>/dev/null) +/bin/arch = $( (/bin/arch) 2>/dev/null) +/usr/bin/oslevel = $( (/usr/bin/oslevel) 2>/dev/null) +/usr/convex/getsysinfo = $( (/usr/convex/getsysinfo) 2>/dev/null) UNAME_MACHINE = "$UNAME_MACHINE" UNAME_RELEASE = "$UNAME_RELEASE" diff -Nru mmv-2.5/build-aux/config.sub mmv-2.5.1/build-aux/config.sub --- mmv-2.5/build-aux/config.sub 2023-07-20 19:40:23.000000000 +0000 +++ mmv-2.5.1/build-aux/config.sub 2023-08-08 11:02:40.000000000 +0000 @@ -1,14 +1,12 @@ #! /bin/sh # Configuration validation subroutine script. -# Copyright 1992-2023 Free Software Foundation, Inc. +# Copyright 1992-2021 Free Software Foundation, Inc. -# shellcheck disable=SC2006,SC2268 # see below for rationale - -timestamp='2023-01-21' +timestamp='2021-01-08' # 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 -# the Free Software Foundation, either version 3 of the License, or +# the Free Software Foundation; either version 3 of the License, or # (at your option) any later version. # # This program is distributed in the hope that it will be useful, but @@ -52,14 +50,7 @@ # CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM # It is wrong to echo any other type of specification. -# The "shellcheck disable" line above the timestamp inhibits complaints -# about features and limitations of the classic Bourne shell that were -# superseded or lifted in POSIX. However, this script identifies a wide -# variety of pre-POSIX systems that do not have POSIX shells at all, and -# even some reasonably current systems (Solaris 10 as case-in-point) still -# have a pre-POSIX /bin/sh. - -me=`echo "$0" | sed -e 's,.*/,,'` +me=$(echo "$0" | sed -e 's,.*/,,') usage="\ Usage: $0 [OPTION] CPU-MFR-OPSYS or ALIAS @@ -76,7 +67,7 @@ version="\ GNU config.sub ($timestamp) -Copyright 1992-2023 Free Software Foundation, Inc. +Copyright 1992-2021 Free Software Foundation, Inc. This is free software; see the source for copying conditions. There is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." @@ -121,11 +112,9 @@ # Split fields of configuration type # shellcheck disable=SC2162 -saved_IFS=$IFS IFS="-" read field1 field2 field3 field4 <&2 exit 1 @@ -1778,27 +1742,16 @@ # As a final step for OS-related things, validate the OS-kernel combination # (given a valid OS), if there is a kernel. case $kernel-$os in - linux-gnu* | linux-dietlibc* | linux-android* | linux-newlib* \ - | linux-musl* | linux-relibc* | linux-uclibc* | linux-mlibc* ) + linux-gnu* | linux-dietlibc* | linux-android* | linux-newlib* | linux-musl* | linux-uclibc* ) ;; uclinux-uclibc* ) ;; - managarm-mlibc* | managarm-kernel* ) - ;; - -dietlibc* | -newlib* | -musl* | -relibc* | -uclibc* | -mlibc* ) + -dietlibc* | -newlib* | -musl* | -uclibc* ) # These are just libc implementations, not actual OSes, and thus # require a kernel. echo "Invalid configuration \`$1': libc \`$os' needs explicit kernel." 1>&2 exit 1 ;; - -kernel* ) - echo "Invalid configuration \`$1': \`$os' needs explicit kernel." 1>&2 - exit 1 - ;; - *-kernel* ) - echo "Invalid configuration \`$1': \`$kernel' does not support \`$os'." 1>&2 - exit 1 - ;; kfreebsd*-gnu* | kopensolaris*-gnu*) ;; vxworks-simlinux | vxworks-simwindows | vxworks-spe) diff -Nru mmv-2.5/build-aux/depcomp mmv-2.5.1/build-aux/depcomp --- mmv-2.5/build-aux/depcomp 2023-07-20 19:40:23.000000000 +0000 +++ mmv-2.5.1/build-aux/depcomp 2023-08-08 11:02:40.000000000 +0000 @@ -1,9 +1,9 @@ #! /bin/sh # depcomp - compile a program generating dependencies as side-effects -scriptversion=2022-09-18.14; # UTC +scriptversion=2018-03-07.03; # UTC -# Copyright (C) 1999-2023 Free Software Foundation, Inc. +# Copyright (C) 1999-2020 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 @@ -113,6 +113,7 @@ # These definitions help. upper=ABCDEFGHIJKLMNOPQRSTUVWXYZ lower=abcdefghijklmnopqrstuvwxyz +digits=0123456789 alpha=${upper}${lower} if test -z "$depmode" || test -z "$source" || test -z "$object"; then @@ -197,7 +198,7 @@ ;; gcc) -## Note that this doesn't just cater to obsolete pre-3.x GCC compilers. +## Note that this doesn't just cater to obsosete pre-3.x GCC compilers. ## but also to in-use compilers like IMB xlc/xlC and the HP C compiler. ## (see the conditional assignment to $gccflag above). ## There are various ways to get dependency output from gcc. Here's diff -Nru mmv-2.5/build-aux/extract-trace mmv-2.5.1/build-aux/extract-trace --- mmv-2.5/build-aux/extract-trace 2023-07-20 19:40:24.000000000 +0000 +++ mmv-2.5.1/build-aux/extract-trace 2023-08-08 11:02:47.000000000 +0000 @@ -9,7 +9,7 @@ # Copyright (C) 2010-2019 Bootstrap Authors # # This file is dual licensed under the terms of the MIT license -# , and GPL version 2 or later +# , and GPL version 3 or later # . You must apply one of # these licenses when using or redistributing this software or any of # the files within it. See the URLs above, or the file `LICENSE` diff -Nru mmv-2.5/build-aux/funclib.sh mmv-2.5.1/build-aux/funclib.sh --- mmv-2.5/build-aux/funclib.sh 2023-07-20 19:40:24.000000000 +0000 +++ mmv-2.5.1/build-aux/funclib.sh 2023-08-08 11:02:47.000000000 +0000 @@ -10,7 +10,7 @@ # Copyright (C) 2004-2019 Bootstrap Authors # # This file is dual licensed under the terms of the MIT license -# , and GPL version 2 or later +# , and GPL version 3 or later # . You must apply one of # these licenses when using or redistributing this software or any of # the files within it. See the URLs above, or the file `LICENSE` diff -Nru mmv-2.5/build-aux/inline-source mmv-2.5.1/build-aux/inline-source --- mmv-2.5/build-aux/inline-source 2023-07-20 19:40:24.000000000 +0000 +++ mmv-2.5.1/build-aux/inline-source 2023-08-08 11:02:47.000000000 +0000 @@ -9,7 +9,7 @@ # Copyright (C) 2012-2019 Bootstrap Authors # # This file is dual licensed under the terms of the MIT license -# , and GPL version 2 or later +# , and GPL version 3 or later # . You must apply one of # these licenses when using or redistributing this software or any of # the files within it. See the URLs above, or the file `LICENSE` diff -Nru mmv-2.5/build-aux/mdate-sh mmv-2.5.1/build-aux/mdate-sh --- mmv-2.5/build-aux/mdate-sh 2023-07-20 19:40:22.000000000 +0000 +++ mmv-2.5.1/build-aux/mdate-sh 2023-08-08 11:02:40.000000000 +0000 @@ -3,7 +3,7 @@ scriptversion=2018-03-07.03; # UTC -# Copyright (C) 1995-2023 Free Software Foundation, Inc. +# Copyright (C) 1995-2020 Free Software Foundation, Inc. # written by Ulrich Drepper , June 1995 # # This program is free software; you can redistribute it and/or modify diff -Nru mmv-2.5/build-aux/options-parser mmv-2.5.1/build-aux/options-parser --- mmv-2.5/build-aux/options-parser 2023-07-20 19:40:24.000000000 +0000 +++ mmv-2.5.1/build-aux/options-parser 2023-08-08 11:02:47.000000000 +0000 @@ -9,7 +9,7 @@ # Copyright (C) 2010-2019 Bootstrap Authors # # This file is dual licensed under the terms of the MIT license -# , and GPL version 2 or later +# , and GPL version 3 or later # . You must apply one of # these licenses when using or redistributing this software or any of # the files within it. See the URLs above, or the file `LICENSE` diff -Nru mmv-2.5/build-aux/texinfo.tex mmv-2.5.1/build-aux/texinfo.tex --- mmv-2.5/build-aux/texinfo.tex 2023-07-20 19:40:23.000000000 +0000 +++ mmv-2.5.1/build-aux/texinfo.tex 2023-08-08 11:02:40.000000000 +0000 @@ -3,9 +3,9 @@ % Load plain if necessary, i.e., if running under initex. \expandafter\ifx\csname fmtname\endcsname\relax\input plain\fi % -\def\texinfoversion{2023-03-27.21} +\def\texinfoversion{2021-02-20.11} % -% Copyright 1985, 1986, 1988, 1990-2023 Free Software Foundation, Inc. +% Copyright 1985, 1986, 1988, 1990-2021 Free Software Foundation, Inc. % % This texinfo.tex file is free software: you can redistribute it and/or % modify it under the terms of the GNU General Public License as @@ -58,6 +58,12 @@ \message{Loading texinfo [version \texinfoversion]:} +% If in a .fmt file, print the version number +% and turn on active characters that we couldn't do earlier because +% they might have appeared in the input file name. +\everyjob{\message{[Texinfo version \texinfoversion]}% + \catcode`+=\active \catcode`\_=\active} + % LaTeX's \typeout. This ensures that the messages it is used for % are identical in format to the corresponding ones from latex/pdflatex. \def\typeout{\immediate\write17}% @@ -235,6 +241,9 @@ % \def\finalout{\overfullrule=0pt } +\newdimen\outerhsize \newdimen\outervsize % set by the paper size routines +\newdimen\topandbottommargin \topandbottommargin=.75in + % Output a mark which sets \thischapter, \thissection and \thiscolor. % We dump everything together because we only have one kind of mark. % This works because we only use \botmark / \topmark, not \firstmark. @@ -308,8 +317,16 @@ \newbox\footlinebox % When outputting the double column layout for indices, an output routine -% is run several times, hiding the original value of \topmark. Hence, save -% \topmark at the beginning. +% is run several times, which hides the original value of \topmark. This +% can lead to a page heading being output and duplicating the chapter heading +% of the index. Hence, save the contents of \topmark at the beginning of +% the output routine. The saved contents are valid until we actually +% \shipout a page. +% +% (We used to run a short output routine to actually set \topmark and +% \firstmark to the right values, but if this was called with an empty page +% containing whatsits for writing index entries, the whatsits would be thrown +% away and the index auxiliary file would remain empty.) % \newtoks\savedtopmark \newif\iftopmarksaved @@ -334,9 +351,15 @@ % \checkchapterpage % - % Make the heading and footing. \makeheadline and \makefootline - % use the contents of \headline and \footline. + % Retrieve the information for the headings from the marks in the page, + % and call Plain TeX's \makeheadline and \makefootline, which use the + % values in \headline and \footline. + % + % Common context changes for both heading and footing. + % Do this outside of the \shipout so @code etc. will be expanded in + % the headline as they should be, not taken literally (outputting ''code). \def\commonheadfootline{\let\hsize=\txipagewidth \texinfochars} + % \ifodd\pageno \getoddheadingmarks \else \getevenheadingmarks \fi \global\setbox\headlinebox = \vbox{\commonheadfootline \makeheadline}% \ifodd\pageno \getoddfootingmarks \else \getevenfootingmarks \fi @@ -524,7 +547,7 @@ % ... but they get defined via ``\envdef\foo{...}'': \long\def\envdef#1#2{\def#1{\startenvironment#1#2}} -\long\def\envparseargdef#1#2{\parseargdef#1{\startenvironment#1#2}} +\def\envparseargdef#1#2{\parseargdef#1{\startenvironment#1#2}} % Check whether we're in the right environment: \def\checkenv#1{% @@ -551,7 +574,7 @@ % @end foo calls \checkenv and executes the definition of \Efoo. -\parseargdef\end{% +\parseargdef\end{ \if 1\csname iscond.#1\endcsname \else % The general wording of \badenverr may not be ideal. @@ -585,9 +608,6 @@ % @/ allows a line break. \let\/=\allowbreak -% @- allows explicit insertion of hyphenation points -\def\-{\discretionary{\normaldash}{}{}}% - % @. is an end-of-sentence period. \def\.{.\spacefactor=\endofsentencespacefactor\space} @@ -597,6 +617,21 @@ % @? is an end-of-sentence query. \def\?{?\spacefactor=\endofsentencespacefactor\space} +% @frenchspacing on|off says whether to put extra space after punctuation. +% +\def\onword{on} +\def\offword{off} +% +\parseargdef\frenchspacing{% + \def\temp{#1}% + \ifx\temp\onword \plainfrenchspacing + \else\ifx\temp\offword \plainnonfrenchspacing + \else + \errhelp = \EMsimple + \errmessage{Unknown @frenchspacing option `\temp', must be on|off}% + \fi\fi +} + % @w prevents a word break. Without the \leavevmode, @w at the % beginning of a paragraph, when TeX is still in vertical mode, would % produce a whole line of output instead of starting the paragraph. @@ -690,22 +725,32 @@ \dimen2 = \ht\strutbox \advance\dimen2 by \dp\strutbox \ifdim\dimen0 > \dimen2 - % This is similar to the 'needspace' module in LaTeX. - % The first penalty allows a break if the end of the page is - % not too far away. Following penalties and skips are discarded. - % Otherwise, require at least \dimen0 of vertical space. - % - % (We used to use a \vtop to reserve space, but this had spacing issues - % when followed by a section heading, as it was not a "discardable item". - % This also has the benefit of providing glue before the page break if - % there isn't enough space.) - \vskip0pt plus \dimen0 - \penalty-100 - \vskip0pt plus -\dimen0 - \vskip \dimen0 + % + % Do a \strut just to make the height of this box be normal, so the + % normal leading is inserted relative to the preceding line. + % And a page break here is fine. + \vtop to #1\mil{\strut\vfil}% + % + % TeX does not even consider page breaks if a penalty added to the + % main vertical list is 10000 or more. But in order to see if the + % empty box we just added fits on the page, we must make it consider + % page breaks. On the other hand, we don't want to actually break the + % page after the empty box. So we use a penalty of 9999. + % + % There is an extremely small chance that TeX will actually break the + % page at this \penalty, if there are no other feasible breakpoints in + % sight. (If the user is using lots of big @group commands, which + % almost-but-not-quite fill up a page, TeX will have a hard time doing + % good page breaking, for example.) However, I could not construct an + % example where a page broke at this \penalty; if it happens in a real + % document, then we can reconsider our strategy. \penalty9999 - \vskip -\dimen0 - \penalty0\relax % this hides the above glue from \safewhatsit and \dobreak + % + % Back up by the size of the box, whether we did a page break or not. + \kern -#1\mil + % + % Do not allow a page break right after this kern. + \nobreak \fi } @@ -957,14 +1002,6 @@ \global\everypar = {}% } -% leave vertical mode without cancelling any first paragraph indent -\gdef\imageindent{% - \toks0=\everypar - \everypar={}% - \ptexnoindent - \global\everypar=\toks0 -} - % @refill is a no-op. \let\refill=\relax @@ -1102,33 +1139,27 @@ % Output page labels information. % See PDF reference v.1.7 p.594, section 8.3.1. -% Page label ranges must be increasing. \ifpdf \def\pagelabels{% \def\title{0 << /P (T-) /S /D >>}% + \edef\roman{\the\romancount << /S /r >>}% + \edef\arabic{\the\arabiccount << /S /D >>}% % - % support @contents at very end of document - \ifnum\contentsendcount=\pagecount - \ifnum\arabiccount<\romancount - \pdfcatalog{/PageLabels << /Nums - [\title - \the\arabiccount << /S /D >> - \the\romancount << /S /r >> - ] >> }\relax - \fi - % no contents in document - \else\ifnum\contentsendcount=0 - \pdfcatalog{/PageLabels << /Nums - [\title - \the\arabiccount << /S /D >> - ] >> }\relax - \else - \pdfcatalog{/PageLabels << /Nums - [\title - \the\romancount << /S /r >> - \the\contentsendcount << /S /D >> - ] >> }\relax - \fi\fi + % Page label ranges must be increasing. Remove any duplicates. + % (There is a slight chance of this being wrong if e.g. there is + % a @contents but no @titlepage, etc.) + % + \ifnum\romancount=0 \def\roman{}\fi + \ifnum\arabiccount=0 \def\title{}% + \else + \ifnum\romancount=\arabiccount \def\roman{}\fi + \fi + % + \ifnum\romancount<\arabiccount + \pdfcatalog{/PageLabels << /Nums [\title \roman \arabic ] >> }\relax + \else + \pdfcatalog{/PageLabels << /Nums [\title \arabic \roman ] >> }\relax + \fi } \else \let\pagelabels\relax @@ -1137,8 +1168,6 @@ \newcount\pagecount \pagecount=0 \newcount\romancount \romancount=0 \newcount\arabiccount \arabiccount=0 -\newcount\contentsendcount \contentsendcount=0 - \ifpdf \let\ptxadvancepageno\advancepageno \def\advancepageno{% @@ -1202,17 +1231,13 @@ % % Set color, and create a mark which defines \thiscolor accordingly, % so that \makeheadline knows which color to restore. - \def\curcolor{0 0 0}% \def\setcolor#1{% - \ifx#1\curcolor\else - \xdef\currentcolordefs{\gdef\noexpand\thiscolor{#1}}% - \domark - \pdfsetcolor{#1}% - \xdef\curcolor{#1}% - \fi + \xdef\currentcolordefs{\gdef\noexpand\thiscolor{#1}}% + \domark + \pdfsetcolor{#1}% } % - \let\maincolor\rgbBlack + \def\maincolor{\rgbBlack} \pdfsetcolor{\maincolor} \edef\thiscolor{\maincolor} \def\currentcolordefs{} @@ -1368,7 +1393,7 @@ % % by default, use black for everything. \def\urlcolor{\rgbBlack} - \let\linkcolor\rgbBlack + \def\linkcolor{\rgbBlack} \def\endlink{\setcolor{\maincolor}\pdfendlink} % % Adding outlines to PDF; macros for calculating structure of outlines @@ -1546,10 +1571,9 @@ \next} \def\makelink{\addtokens{\toksB}% {\noexpand\pdflink{\the\toksC}}\toksC={}\global\countA=0} - \def\pdflink#1{\pdflinkpage{#1}{#1}}% - \def\pdflinkpage#1#2{% + \def\pdflink#1{% \startlink attr{/Border [0 0 0]} goto name{\pdfmkpgn{#1}} - \setcolor{\linkcolor}#2\endlink} + \setcolor{\linkcolor}#1\endlink} \def\done{\edef\st{\global\noexpand\toksA={\the\toksB}}\st} \else % non-pdf mode @@ -1796,11 +1820,10 @@ \next} \def\makelink{\addtokens{\toksB}% {\noexpand\pdflink{\the\toksC}}\toksC={}\global\countA=0} - \def\pdflink#1{\pdflinkpage{#1}{#1}}% - \def\pdflinkpage#1#2{% + \def\pdflink#1{% \special{pdf:bann << /Border [0 0 0] /Type /Annot /Subtype /Link /A << /S /GoTo /D (#1) >> >>}% - \setcolor{\linkcolor}#2\endlink} + \setcolor{\linkcolor}#1\endlink} \def\done{\edef\st{\global\noexpand\toksA={\the\toksB}}\st} % % @@ -1839,23 +1862,19 @@ \closein 1 \endgroup % - % Putting an \hbox around the image can prevent an over-long line - % after the image. - \hbox\bgroup - \def\xetexpdfext{pdf}% + \def\xetexpdfext{pdf}% + \ifx\xeteximgext\xetexpdfext + \XeTeXpdffile "#1".\xeteximgext "" + \else + \def\xetexpdfext{PDF}% \ifx\xeteximgext\xetexpdfext \XeTeXpdffile "#1".\xeteximgext "" \else - \def\xetexpdfext{PDF}% - \ifx\xeteximgext\xetexpdfext - \XeTeXpdffile "#1".\xeteximgext "" - \else - \XeTeXpicfile "#1".\xeteximgext "" - \fi + \XeTeXpicfile "#1".\xeteximgext "" \fi - \ifdim \wd0 >0pt width \xeteximagewidth \fi - \ifdim \wd2 >0pt height \xeteximageheight \fi \relax - \egroup + \fi + \ifdim \wd0 >0pt width \xeteximagewidth \fi + \ifdim \wd2 >0pt height \xeteximageheight \fi \relax } \fi @@ -2145,11 +2164,6 @@ \pdffontattr#1{/ToUnicode \the\pdflastobj\space 0 R}% }% \fi\fi -% -% This is what gets called when #5 of \setfont is empty. -\let\cmap\gobble -% -% (end of cmaps) % Set the font macro #1 to the font named \fontprefix#2. @@ -2165,10 +2179,11 @@ \def\setfont#1#2#3#4#5{% \font#1=\fontprefix#2#3 scaled #4 \csname cmap#5\endcsname#1% - \ifx#2\ttshape\hyphenchar#1=-1 \fi - \ifx#2\ttbshape\hyphenchar#1=-1 \fi - \ifx#2\ttslshape\hyphenchar#1=-1 \fi } +% This is what gets called when #5 of \setfont is empty. +\let\cmap\gobble +% +% (end of cmaps) % Use cm as the default font prefix. % To specify the font prefix, you must define \fontprefix @@ -2531,7 +2546,7 @@ \def\it{\fam=\itfam \setfontstyle{it}} \def\sl{\fam=\slfam \setfontstyle{sl}} \def\bf{\fam=\bffam \setfontstyle{bf}}\def\bfstylename{bf} -\def\tt{\fam=\ttfam \setfontstyle{tt}} +\def\tt{\fam=\ttfam \setfontstyle{tt}}\def\ttstylename{tt} % Texinfo sort of supports the sans serif font style, which plain TeX does not. % So we set up a \sf. @@ -2559,30 +2574,34 @@ \scriptfont\sffam=\sevensf } +% - -% \defineassignfonts{SIZE} - -% Define sequence \assignfontsSIZE, which switches between font sizes -% by redefining the meanings of \STYLEfont. (Just \STYLE additionally sets -% the current \fam for math mode.) -% -\def\defineassignfonts#1{% - \expandafter\edef\csname assignfonts#1\endcsname{% - \let\noexpand\rmfont\csname #1rm\endcsname - \let\noexpand\itfont\csname #1it\endcsname - \let\noexpand\slfont\csname #1sl\endcsname - \let\noexpand\bffont\csname #1bf\endcsname - \let\noexpand\ttfont\csname #1tt\endcsname - \let\noexpand\smallcaps\csname #1sc\endcsname - \let\noexpand\sffont \csname #1sf\endcsname - \let\noexpand\ifont \csname #1i\endcsname - \let\noexpand\syfont \csname #1sy\endcsname - \let\noexpand\ttslfont\csname #1ttsl\endcsname - } -} +% The font-changing commands (all called \...fonts) redefine the meanings +% of \STYLEfont, instead of just \STYLE. We do this because \STYLE needs +% to also set the current \fam for math mode. Our \STYLE (e.g., \rm) +% commands hardwire \STYLEfont to set the current font. +% +% The fonts used for \ifont are for "math italics" (\itfont is for italics +% in regular text). \syfont is also used in math mode only. +% +% Each font-changing command also sets the names \lsize (one size lower) +% and \lllsize (three sizes lower). These relative commands are used +% in, e.g., the LaTeX logo and acronyms. +% +% This all needs generalizing, badly. +% \def\assignfonts#1{% - \csname assignfonts#1\endcsname + \expandafter\let\expandafter\rmfont\csname #1rm\endcsname + \expandafter\let\expandafter\itfont\csname #1it\endcsname + \expandafter\let\expandafter\slfont\csname #1sl\endcsname + \expandafter\let\expandafter\bffont\csname #1bf\endcsname + \expandafter\let\expandafter\ttfont\csname #1tt\endcsname + \expandafter\let\expandafter\smallcaps\csname #1sc\endcsname + \expandafter\let\expandafter\sffont \csname #1sf\endcsname + \expandafter\let\expandafter\ifont \csname #1i\endcsname + \expandafter\let\expandafter\syfont \csname #1sy\endcsname + \expandafter\let\expandafter\ttslfont\csname #1ttsl\endcsname } \newif\ifrmisbold @@ -2606,21 +2625,12 @@ \csname\curfontstyle\endcsname }% -% Define the font-changing commands (all called \...fonts). -% Each font-changing command also sets the names \lsize (one size lower) -% and \lllsize (three sizes lower). These relative commands are used -% in, e.g., the LaTeX logo and acronyms. -% -% Note: The fonts used for \ifont are for "math italics" (\itfont is for -% italics in regular text). \syfont is also used in math mode only. -% \def\definefontsetatsize#1#2#3#4#5{% - \defineassignfonts{#1}% \expandafter\def\csname #1fonts\endcsname{% \def\curfontsize{#1}% \def\lsize{#2}\def\lllsize{#3}% \csname rmisbold#5\endcsname - \csname assignfonts#1\endcsname + \assignfonts{#1}% \resetmathfonts \setleading{#4}% }} @@ -2665,22 +2675,9 @@ % Check if we are currently using a typewriter font. Since all the % Computer Modern typewriter fonts have zero interword stretch (and % shrink), and it is reasonable to expect all typewriter fonts to have -% this property, we can check that font parameter. #1 is what to -% print if we are indeed using \tt; #2 is what to print otherwise. -\def\ifusingtt#1#2{\ifdim \fontdimen3\font=0pt #1\else #2\fi} - -% Same as above, but check for italic font. Actually this also catches -% non-italic slanted fonts since it is impossible to distinguish them from -% italic fonts. But since this is only used by $ and it uses \sl anyway -% this is not a problem. -\def\ifusingit#1#2{\ifdim \fontdimen1\font>0pt #1\else #2\fi} - - -% Check if internal flag is clear, i.e. has not been @set. -\def\ifflagclear#1#2#3{% - \expandafter\ifx\csname SET#1\endcsname\relax - #2\else#3\fi -} +% this property, we can check that font parameter. +% +\def\ifmonospace{\ifdim\fontdimen3\font=0pt } { \catcode`\'=\active @@ -2689,33 +2686,41 @@ \gdef\setcodequotes{\let`\codequoteleft \let'\codequoteright} \gdef\setregularquotes{\let`\lq \let'\rq} } -\setregularquotes -% output for ' in @code -% in tt font hex 0D (undirected) or 27 (curly right quote) +% Allow an option to not use regular directed right quote/apostrophe +% (char 0x27), but instead the undirected quote from cmtt (char 0x0d). +% The undirected quote is ugly, so don't make it the default, but it +% works for pasting with more pdf viewers (at least evince), the +% lilypond developers report. xpdf does work with the regular 0x27. % \def\codequoteright{% - \ifusingtt - {\ifflagclear{txicodequoteundirected}% - {\ifflagclear{codequoteundirected}% - {'}% - {\char"0D }}% - {\char"0D }}% - {'}% + \ifmonospace + \expandafter\ifx\csname SETtxicodequoteundirected\endcsname\relax + \expandafter\ifx\csname SETcodequoteundirected\endcsname\relax + '% + \else \char'15 \fi + \else \char'15 \fi + \else + '% + \fi } - -% output for ` in @code -% in tt font hex 12 (grave accent) or 60 (curly left quote) -% \relax disables Spanish ligatures ?` and !` of \tt font. +% +% and a similar option for the left quote char vs. a grave accent. +% Modern fonts display ASCII 0x60 as a grave accent, so some people like +% the code environments to do likewise. % \def\codequoteleft{% - \ifusingtt - {\ifflagclear{txicodequotebacktick}% - {\ifflagclear{codequotebacktick}% - {\relax`}% - {\char"12 }}% - {\char"12 }}% - {\relax`}% + \ifmonospace + \expandafter\ifx\csname SETtxicodequotebacktick\endcsname\relax + \expandafter\ifx\csname SETcodequotebacktick\endcsname\relax + % [Knuth] pp. 380,381,391 + % \relax disables Spanish ligatures ?` and !` of \tt font. + \relax`% + \else \char'22 \fi + \else \char'22 \fi + \else + \relax`% + \fi } % Commands to set the quote options. @@ -2733,7 +2738,7 @@ \errmessage{Unknown @codequoteundirected value `\temp', must be on|off}% \fi\fi } - +% \parseargdef\codequotebacktick{% \def\temp{#1}% \ifx\temp\onword @@ -2748,11 +2753,6 @@ \fi\fi } -% Turn them on by default -\let\SETtxicodequoteundirected = t -\let\SETtxicodequotebacktick = t - - % [Knuth] pp. 380,381,391, disable Spanish ligatures ?` and !` of \tt font. \def\noligaturesquoteleft{\relax\lq} @@ -2767,16 +2767,15 @@ \def\dosmartslant#1#2{% \ifusingtt {{\ttsl #2}\let\next=\relax}% - {\def\next{{#1#2}\smartitaliccorrection}}% + {\def\next{{#1#2}\futurelet\next\smartitaliccorrection}}% \next } \def\smartslanted{\dosmartslant\sl} \def\smartitalic{\dosmartslant\it} -% Output an italic correction unless the following character is such as -% not to need one. -\def\smartitaliccorrection{\futurelet\next\smartitaliccorrectionx} -\def\smartitaliccorrectionx{% +% Output an italic correction unless \next (presumed to be the following +% character) is such as not to need one. +\def\smartitaliccorrection{% \ifx\next,% \else\ifx\next-% \else\ifx\next.% @@ -2787,41 +2786,27 @@ \aftersmartic } -% @cite unconditionally uses \sl with \smartitaliccorrection. -\def\cite#1{{\sl #1}\smartitaliccorrection} +% Unconditional use \ttsl, and no ic. @var is set to this for defuns. +\def\ttslanted#1{{\ttsl #1}} + +% @cite is like \smartslanted except unconditionally use \sl. We never want +% ttsl for book titles, do we? +\def\cite#1{{\sl #1}\futurelet\next\smartitaliccorrection} -% @var unconditionally uses \sl. This gives consistency for -% parameter names whether they are in @def, @table @code or a -% regular paragraph. -% To get ttsl font for @var when used in code context, @set txicodevaristt. -% The \null is to reset \spacefactor. \def\aftersmartic{} \def\var#1{% \let\saveaftersmartic = \aftersmartic \def\aftersmartic{\null\let\aftersmartic=\saveaftersmartic}% - % - \ifflagclear{txicodevaristt}% - {\def\varnext{{{\sl #1}}\smartitaliccorrection}}% - {\def\varnext{\smartslanted{#1}}}% - \varnext + \smartslanted{#1}% } -% To be removed after next release -\def\SETtxicodevaristt{}% @set txicodevaristt - \let\i=\smartitalic \let\slanted=\smartslanted \let\dfn=\smartslanted \let\emph=\smartitalic -% @r for roman font, used for code comment -\def\r#1{{% - \usenormaldash % get --, --- ligatures even if in @code - \defcharsdefault % in case on def line - \rm #1}} -{\catcode`-=\active \gdef\usenormaldash{\let-\normaldash}} - -% @sc, undocumented @ii. +% Explicit font changes: @r, @sc, undocumented @ii. +\def\r#1{{\rm #1}} % roman font \def\sc#1{{\smallcaps#1}} % smallcaps font \def\ii#1{{\it #1}} % italic font @@ -2832,8 +2817,12 @@ % @sansserif, explicit sans. \def\sansserif#1{{\sf #1}} -\newif\iffrenchspacing -\frenchspacingfalse +% We can't just use \exhyphenpenalty, because that only has effect at +% the end of a paragraph. Restore normal hyphenation at the end of the +% group within which \nohyphenation is presumably called. +% +\def\nohyphenation{\hyphenchar\font = -1 \aftergroup\restorehyphenation} +\def\restorehyphenation{\hyphenchar\font = `- } % Set sfcode to normal for the chars that usually have another value. % Can't use plain's \frenchspacing because it uses the `\x notation, and @@ -2841,45 +2830,21 @@ % \catcode`@=11 \def\plainfrenchspacing{% - \iffrenchspacing\else - \frenchspacingtrue - \sfcode`\.=\@m \sfcode`\?=\@m \sfcode`\!=\@m - \sfcode`\:=\@m \sfcode`\;=\@m \sfcode`\,=\@m - \def\endofsentencespacefactor{1000}% for @. and friends - \fi + \sfcode`\.=\@m \sfcode`\?=\@m \sfcode`\!=\@m + \sfcode`\:=\@m \sfcode`\;=\@m \sfcode`\,=\@m + \def\endofsentencespacefactor{1000}% for @. and friends } \def\plainnonfrenchspacing{% - \iffrenchspacing - \frenchspacingfalse - \sfcode`\.3000\sfcode`\?3000\sfcode`\!3000 - \sfcode`\:2000\sfcode`\;1500\sfcode`\,1250 - \def\endofsentencespacefactor{3000}% for @. and friends - \fi + \sfcode`\.3000\sfcode`\?3000\sfcode`\!3000 + \sfcode`\:2000\sfcode`\;1500\sfcode`\,1250 + \def\endofsentencespacefactor{3000}% for @. and friends } \catcode`@=\other \def\endofsentencespacefactor{3000}% default -% @frenchspacing on|off says whether to put extra space after punctuation. -% -\def\onword{on} -\def\offword{off} -% -\let\frenchspacingsetting\plainnonfrenchspacing % used in output routine -\parseargdef\frenchspacing{% - \def\temp{#1}% - \ifx\temp\onword \let\frenchspacingsetting\plainfrenchspacing - \else\ifx\temp\offword \let\frenchspacingsetting\plainnonfrenchspacing - \else - \errhelp = \EMsimple - \errmessage{Unknown @frenchspacing option `\temp', must be on|off}% - \fi\fi - \frenchspacingsetting -} - - % @t, explicit typewriter. \def\t#1{% - {\tt \defcharsdefault \plainfrenchspacing #1}% + {\tt \plainfrenchspacing #1}% \null } @@ -2900,29 +2865,27 @@ % Switch to typewriter. \tt % - % `\ ' produces the large typewriter interword space. + % But `\ ' produces the large typewriter interword space. \def\ {{\spaceskip = 0pt{} }}% % + % Turn off hyphenation. + \nohyphenation + % \plainfrenchspacing #1% }% \null % reset spacefactor to 1000 } -% This is for LuaTeX: It is not sufficient to disable hyphenation at -% explicit dashes by setting `\hyphenchar` to -1. -\def\dashnobreak{% - \normaldash - \penalty 10000 } - -% We must turn on hyphenation at `-' and `_' in @code. +% We *must* turn on hyphenation at `-' and `_' in @code. +% (But see \codedashfinish below.) % Otherwise, it is too hard to avoid overfull hboxes % in the Emacs manual, the Library manual, etc. -% We explicitly allow hyphenation at these characters -% using \discretionary. % -% Hyphenation at - and hyphenation within words was turned off -% by default for the tt fonts using the \hyphenchar parameter of TeX. +% Unfortunately, TeX uses one parameter (\hyphenchar) to control +% both hyphenation at - and hyphenation within words. +% We must therefore turn them both off (\tclose does that) +% and arrange explicitly to hyphenate at a dash. -- rms. { \catcode`\-=\active \catcode`\_=\active \catcode`\'=\active \catcode`\`=\active @@ -2935,9 +2898,13 @@ \let-\codedash \let_\codeunder \else - \let-\dashnobreak + \let-\normaldash \let_\realunder \fi + % Given -foo (with a single dash), we do not want to allow a break + % after the hyphen. + \global\let\codedashprev=\codedash + % \codex } % @@ -2947,30 +2914,21 @@ % % Now, output a discretionary to allow a line break, unless % (a) the next character is a -, or - % (b) the preceding character is a -, or - % (c) we are at the start of the string. - % In both cases (b) and (c), \codedashnobreak should be set to \codedash. - % + % (b) the preceding character is a -. % E.g., given --posix, we do not want to allow a break after either -. % Given --foo-bar, we do want to allow a break between the - and the b. \ifx\next\codedash \else - \ifx\codedashnobreak\codedash + \ifx\codedashprev\codedash \else \discretionary{}{}{}\fi \fi % we need the space after the = for the case when \next itself is a % space token; it would get swallowed otherwise. As in @code{- a}. - \global\let\codedashnobreak= \next + \global\let\codedashprev= \next } } \def\normaldash{-} % -\def\codex #1{\tclose{% - % Given -foo (with a single dash), we do not want to allow a break - % after the -. \codedashnobreak is set to the first character in - % @code. - \futurelet\codedashnobreak\relax - #1% -}\endgroup} +\def\codex #1{\tclose{#1}\endgroup} \def\codeunder{% % this is all so @math{@code{var_name}+1} can work. In math mode, _ @@ -3201,8 +3159,16 @@ % Default is `distinct'. \kbdinputstyle distinct -\def\kbd#1{% - \tclose{\kbdfont\setcodequotes#1}% +% @kbd is like @code, except that if the argument is just one @key command, +% then @kbd has no effect. +\def\kbd#1{{\def\look{#1}\expandafter\kbdsub\look??\par}} + +\def\xkey{\key} +\def\kbdsub#1#2#3\par{% + \def\one{#1}\def\three{#3}\def\threex{??}% + \ifx\one\xkey\ifx\threex\three \key{#2}% + \else{\tclose{\kbdfont\setcodequotes\look}}\fi + \else{\tclose{\kbdfont\setcodequotes\look}}\fi } % definition of @key that produces a lozenge. Doesn't adjust to text size. @@ -3215,9 +3181,14 @@ % \kern-0.4pt\hrule}% % \kern-.06em\raise0.4pt\hbox{\angleright}}}} -% definition of @key with no lozenge. -% -\def\key#1{{\setregularquotes \tt #1}\null} +% definition of @key with no lozenge. If the current font is already +% monospace, don't change it; that way, we respect @kbdinputstyle. But +% if it isn't monospace, then use \tt. +% +\def\key#1{{\setregularquotes + \nohyphenation + \ifmonospace\else\tt\fi + #1}\null} % @clicksequence{File @click{} Open ...} \def\clicksequence#1{\begingroup #1\endgroup} @@ -3420,8 +3391,8 @@ \let\atchar=\@ % @{ @} @lbracechar{} @rbracechar{} all generate brace characters. -\def\lbracechar{{\ifusingtt{\char123}{\ensuremath\lbrace}}} -\def\rbracechar{{\ifusingtt{\char125}{\ensuremath\rbrace}}} +\def\lbracechar{{\ifmonospace\char123\else\ensuremath\lbrace\fi}} +\def\rbracechar{{\ifmonospace\char125\else\ensuremath\rbrace\fi}} \let\{=\lbracechar \let\}=\rbracechar @@ -3475,13 +3446,8 @@ % Revert to plain's \scriptsize, which is 7pt. \count255=\the\fam $\fam\count255 \scriptstyle A$% \else - \ifx\curfontsize\smallword - % For footnotes and indices - \count255=\the\fam $\fam\count255 \scriptstyle A$% - \else - % For 11pt, we can use our lllsize. - \switchtolllsize A% - \fi + % For 11pt, we can use our lllsize. + \switchtolllsize A% \fi }% \vss @@ -3489,7 +3455,6 @@ \kern-.15em \TeX } -\def\smallword{small} % Some math mode symbols. Define \ensuremath to switch into math mode % unless we are already there. Expansion tricks may not be needed here, @@ -3568,7 +3533,7 @@ % @pounds{} is a sterling sign, which Knuth put in the CM italic font. % -\def\pounds{{\ifusingtt{\ecfont\char"BF}{\it\$}}} +\def\pounds{\ifmonospace{\ecfont\char"BF}\else{\it\$}\fi} % @euro{} comes from a separate font, depending on the current style. % We use the free feym* fonts from the eurosym package by Henrik @@ -3637,9 +3602,6 @@ \def\quotedblbase{{\ecfont \char"12}} \def\quotesinglbase{{\ecfont \char"0D}} % -\def\L{{\ecfont \char"8A}} % L with stroke -\def\l{{\ecfont \char"AA}} % l with stroke -% % This positioning is not perfect (see the ogonek LaTeX package), but % we have the precomposed glyphs for the most common cases. We put the % tests to use those glyphs in the single \ogonek macro so we have fewer @@ -3682,17 +3644,18 @@ % hopefully nobody will notice/care. \edef\ecsize{\csname\curfontsize ecsize\endcsname}% \edef\nominalsize{\csname\curfontsize nominalsize\endcsname}% - \ifusingtt - % typewriter: - {\font\thisecfont = #1ctt\ecsize \space at \nominalsize}% - % else - {\ifx\curfontstyle\bfstylename - % bold: - \font\thisecfont = #1cb\ifusingit{i}{x}\ecsize \space at \nominalsize - \else - % regular: - \font\thisecfont = #1c\ifusingit{ti}{rm}\ecsize \space at \nominalsize - \fi}% + \ifmonospace + % typewriter: + \font\thisecfont = #1ctt\ecsize \space at \nominalsize + \else + \ifx\curfontstyle\bfstylename + % bold: + \font\thisecfont = #1cb\ifusingit{i}{x}\ecsize \space at \nominalsize + \else + % regular: + \font\thisecfont = #1c\ifusingit{ti}{rm}\ecsize \space at \nominalsize + \fi + \fi \thisecfont } @@ -3708,10 +3671,7 @@ % @textdegree - the normal degrees sign. % -\def\textdegree{% - \ifmmode ^\circ - \else {\tcfont \char 176}% - \fi} +\def\textdegree{$^\circ$} % Laurent Siebenmann reports \Orb undefined with: % Textures 1.7.7 (preloaded format=plain 93.10.14) (68K) 16 APR 2004 02:38 @@ -3728,11 +3688,11 @@ % only change font for tt for correct kerning and to avoid using % \ecfont unless necessary. \def\quotedblleft{% - \ifusingtt{{\ecfont\char"10}}{{\char"5C}}% + \ifmonospace{\ecfont\char"10}\else{\char"5C}\fi } \def\quotedblright{% - \ifusingtt{{\ecfont\char"11}}{{\char`\"}}% + \ifmonospace{\ecfont\char"11}\else{\char`\"}\fi } @@ -3757,14 +3717,13 @@ want the contents after the title page.}}% \parseargdef\shorttitlepage{% - {\headingsoff \begingroup \hbox{}\vskip 1.5in \chaprm \centerline{#1}% - \endgroup\page\hbox{}\page}\pageone} + \begingroup \hbox{}\vskip 1.5in \chaprm \centerline{#1}% + \endgroup\page\hbox{}\page} \envdef\titlepage{% % Open one extra group, as we want to close it in the middle of \Etitlepage. \begingroup \parindent=0pt \textfonts - \headingsoff % Leave some space at the very top of the page. \vglue\titlepagetopglue % No rule at page bottom unless we print one at the top with @title. @@ -3792,9 +3751,11 @@ % If we use the new definition of \page, we always get a blank page % after the title page, which we certainly don't want. \oldpage - \pageone \endgroup % + % Need this before the \...aftertitlepage checks so that if they are + % in effect the toc pages will come out with page numbers. + \HEADINGSon } \def\finishtitlepage{% @@ -3861,16 +3822,15 @@ \newtoks\oddfootline % footline on odd pages % Now make \makeheadline and \makefootline in Plain TeX use those variables -\headline={{\textfonts\rm\frenchspacingsetting +\headline={{\textfonts\rm \ifchapterpage \ifodd\pageno\the\oddchapheadline\else\the\evenchapheadline\fi \else \ifodd\pageno\the\oddheadline\else\the\evenheadline\fi \fi}} -\footline={{\textfonts\rm\frenchspacingsetting - \ifodd\pageno \the\oddfootline \else \the\evenfootline \fi}% - \HEADINGShook} +\footline={{\textfonts\rm \ifodd\pageno \the\oddfootline + \else \the\evenfootline \fi}\HEADINGShook} \let\HEADINGShook=\relax % Commands to set those variables. @@ -3963,37 +3923,46 @@ } \def\HEADINGSoff{{\globaldefs=1 \headingsoff}} % global setting +\HEADINGSoff % it's the default -% Set the page number to 1. +% When we turn headings on, set the page number to 1. \def\pageone{ \global\pageno=1 \global\arabiccount = \pagecount } -\let\contentsalignmacro = \chappager - -% \def\HEADINGSon{\HEADINGSdouble} % defined by \CHAPPAGon - % For double-sided printing, put current file name in lower left corner, % chapter name on inside top of right hand pages, document % title on inside top of left hand pages, and page numbers on outside top % edge of all pages. -\def\HEADINGSafter{\let\HEADINGShook=\HEADINGSdouble} -\let\HEADINGSdoubleafter=\HEADINGSafter \def\HEADINGSdouble{% +\pageone +\HEADINGSdoublex +} +\let\contentsalignmacro = \chappager + +% For single-sided printing, chapter title goes across top left of page, +% page number on top right. +\def\HEADINGSsingle{% +\pageone +\HEADINGSsinglex +} +\def\HEADINGSon{\HEADINGSdouble} + +\def\HEADINGSafter{\let\HEADINGShook=\HEADINGSdoublex} +\let\HEADINGSdoubleafter=\HEADINGSafter +\def\HEADINGSdoublex{% \global\evenfootline={\hfil} \global\oddfootline={\hfil} \global\evenheadline={\line{\folio\hfil\thistitle}} \global\oddheadline={\line{\thischapter\hfil\folio}} -\global\evenchapheadline={\line{\folio\hfil\thistitle}} +\global\evenchapheadline={\line{\folio\hfil}} \global\oddchapheadline={\line{\hfil\folio}} \global\let\contentsalignmacro = \chapoddpage } -% For single-sided printing, chapter title goes across top left of page, -% page number on top right. -\def\HEADINGSsingleafter{\let\HEADINGShook=\HEADINGSsingle} -\def\HEADINGSsingle{% +\def\HEADINGSsingleafter{\let\HEADINGShook=\HEADINGSsinglex} +\def\HEADINGSsinglex{% \global\evenfootline={\hfil} \global\oddfootline={\hfil} \global\evenheadline={\line{\thischapter\hfil\folio}} @@ -4005,6 +3974,7 @@ % for @setchapternewpage off \def\HEADINGSsinglechapoff{% +\pageone \global\evenfootline={\hfil} \global\oddfootline={\hfil} \global\evenheadline={\line{\thischapter\hfil\folio}} @@ -4319,8 +4289,82 @@ \doitemize{#1.}\flushcr } +% @alphaenumerate and @capsenumerate are abbreviations for giving an arg +% to @enumerate. +% +\def\alphaenumerate{\enumerate{a}} +\def\capsenumerate{\enumerate{A}} +\def\Ealphaenumerate{\Eenumerate} +\def\Ecapsenumerate{\Eenumerate} + % @multitable macros +% Amy Hendrickson, 8/18/94, 3/6/96 +% +% @multitable ... @end multitable will make as many columns as desired. +% Contents of each column will wrap at width given in preamble. Width +% can be specified either with sample text given in a template line, +% or in percent of \hsize, the current width of text on page. + +% Table can continue over pages but will only break between lines. + +% To make preamble: +% +% Either define widths of columns in terms of percent of \hsize: +% @multitable @columnfractions .25 .3 .45 +% @item ... +% +% Numbers following @columnfractions are the percent of the total +% current hsize to be used for each column. You may use as many +% columns as desired. + + +% Or use a template: +% @multitable {Column 1 template} {Column 2 template} {Column 3 template} +% @item ... +% using the widest term desired in each column. + +% Each new table line starts with @item, each subsequent new column +% starts with @tab. Empty columns may be produced by supplying @tab's +% with nothing between them for as many times as empty columns are needed, +% ie, @tab@tab@tab will produce two empty columns. + +% @item, @tab do not need to be on their own lines, but it will not hurt +% if they are. + +% Sample multitable: + +% @multitable {Column 1 template} {Column 2 template} {Column 3 template} +% @item first col stuff @tab second col stuff @tab third col +% @item +% first col stuff +% @tab +% second col stuff +% @tab +% third col +% @item first col stuff @tab second col stuff +% @tab Many paragraphs of text may be used in any column. +% +% They will wrap at the width determined by the template. +% @item@tab@tab This will be in third column. +% @end multitable + +% Default dimensions may be reset by user. +% @multitableparskip is vertical space between paragraphs in table. +% @multitableparindent is paragraph indent in table. +% @multitablecolmargin is horizontal space to be left between columns. +% @multitablelinespace is space to leave between table items, baseline +% to baseline. +% 0pt means it depends on current normal line spacing. +% +\newskip\multitableparskip +\newskip\multitableparindent +\newdimen\multitablecolspace +\newskip\multitablelinespace +\multitableparskip=0pt +\multitableparindent=6pt +\multitablecolspace=12pt +\multitablelinespace=0pt % Macros used to set up halign preamble: % @@ -4368,13 +4412,16 @@ \go } +% multitable-only commands. +% % @headitem starts a heading row, which we typeset in bold. Assignments % have to be global since we are inside the implicit group of an % alignment entry. \everycr below resets \everytab so we don't have to % undo it ourselves. \def\headitemfont{\b}% for people to use in the template row; not changeable \def\headitem{% - \crcr % must appear first + \checkenv\multitable + \crcr \gdef\headitemcrhook{\nobreak}% attempt to avoid page break after headings \global\everytab={\bf}% can't use \headitemfont since the parsing differs \the\everytab % for the first item @@ -4383,8 +4430,14 @@ % default for tables with no headings. \let\headitemcrhook=\relax % +% A \tab used to include \hskip1sp. But then the space in a template +% line is not enough. That is bad. So let's go back to just `&' until +% we again encounter the problem the 1sp was intended to solve. +% --karl, nathan@acm.org, 20apr99. \def\tab{\checkenv\multitable &\the\everytab}% +% @multitable ... @end multitable definitions: +% \newtoks\everytab % insert after every tab. % \envdef\multitable{% @@ -4399,8 +4452,9 @@ % \tolerance=9500 \hbadness=9500 - \parskip=0pt - \parindent=6pt + \setmultitablespacing + \parskip=\multitableparskip + \parindent=\multitableparindent \overfullrule=0pt \global\colcount=0 % @@ -4430,24 +4484,47 @@ % continue for many paragraphs if desired. \halign\bgroup &% \global\advance\colcount by 1 - \strut + \multistrut \vtop{% - \advance\hsize by -1\leftskip - % Find the correct column width + % Use the current \colcount to find the correct column width: \hsize=\expandafter\csname col\the\colcount\endcsname % - \advance\rightskip by -1\rightskip % Zero leaving only any stretch + % In order to keep entries from bumping into each other + % we will add a \leftskip of \multitablecolspace to all columns after + % the first one. + % + % If a template has been used, we will add \multitablecolspace + % to the width of each template entry. + % + % If the user has set preamble in terms of percent of \hsize we will + % use that dimension as the width of the column, and the \leftskip + % will keep entries from bumping into each other. Table will start at + % left margin and final column will justify at right margin. + % + % Make sure we don't inherit \rightskip from the outer environment. + \rightskip=0pt \ifnum\colcount=1 - \advance\hsize by\leftskip % Add indent of surrounding text + % The first column will be indented with the surrounding text. + \advance\hsize by\leftskip \else - % In order to keep entries from bumping into each other. - \leftskip=12pt - \ifsetpercent \else - % If a template has been used - \advance\hsize by \leftskip - \fi + \ifsetpercent \else + % If user has not set preamble in terms of percent of \hsize + % we will advance \hsize by \multitablecolspace. + \advance\hsize by \multitablecolspace + \fi + % In either case we will make \leftskip=\multitablecolspace: + \leftskip=\multitablecolspace \fi - \noindent\ignorespaces##\unskip\strut + % Ignoring space at the beginning and end avoids an occasional spurious + % blank line, when TeX decides to break the line at the space before the + % box from the multistrut, so the strut ends up on a line by itself. + % For example: + % @multitable @columnfractions .11 .89 + % @item @code{#} + % @tab Legal holiday which is valid in major parts of the whole country. + % Is automatically provided with highlighting sequences respectively + % marking characters. + \noindent\ignorespaces##\unskip\multistrut }\cr } \def\Emultitable{% @@ -4456,10 +4533,35 @@ \global\setpercentfalse } +\def\setmultitablespacing{% + \def\multistrut{\strut}% just use the standard line spacing + % + % Compute \multitablelinespace (if not defined by user) for use in + % \multitableparskip calculation. We used define \multistrut based on + % this, but (ironically) that caused the spacing to be off. + % See bug-texinfo report from Werner Lemberg, 31 Oct 2004 12:52:20 +0100. +\ifdim\multitablelinespace=0pt +\setbox0=\vbox{X}\global\multitablelinespace=\the\baselineskip +\global\advance\multitablelinespace by-\ht0 +\fi +% Test to see if parskip is larger than space between lines of +% table. If not, do nothing. +% If so, set to same dimension as multitablelinespace. +\ifdim\multitableparskip>\multitablelinespace +\global\multitableparskip=\multitablelinespace +\global\advance\multitableparskip-7pt % to keep parskip somewhat smaller + % than skip between lines in the table. +\fi% +\ifdim\multitableparskip=0pt +\global\multitableparskip=\multitablelinespace +\global\advance\multitableparskip-7pt % to keep parskip somewhat smaller + % than skip between lines in the table. +\fi} + \message{conditionals,} -% @iftex, @ifnotdocbook, @ifnothtml, @ifnotinfo, @ifnotlatex, @ifnotplaintext, +% @iftex, @ifnotdocbook, @ifnothtml, @ifnotinfo, @ifnotplaintext, % @ifnotxml always succeed. They currently do nothing; we don't % attempt to check whether the conditionals are properly nested. But we % have to remember that they are conditionals, so that @end doesn't @@ -4473,7 +4575,6 @@ \makecond{ifnotdocbook} \makecond{ifnothtml} \makecond{ifnotinfo} -\makecond{ifnotlatex} \makecond{ifnotplaintext} \makecond{ifnotxml} @@ -4486,12 +4587,10 @@ \def\ifdocbook{\doignore{ifdocbook}} \def\ifhtml{\doignore{ifhtml}} \def\ifinfo{\doignore{ifinfo}} -\def\iflatex{\doignore{iflatex}} \def\ifnottex{\doignore{ifnottex}} \def\ifplaintext{\doignore{ifplaintext}} \def\ifxml{\doignore{ifxml}} \def\ignore{\doignore{ignore}} -\def\latex{\doignore{latex}} \def\menu{\doignore{menu}} \def\xml{\doignore{xml}} @@ -4730,11 +4829,13 @@ % except not \outer, so it can be used within macros and \if's. \edef\newwrite{\makecsname{ptexnewwrite}} -% \newindex {IX} defines an index named IX. +% \newindex {foo} defines an index named IX. % It automatically defines \IXindex such that % \IXindex ...rest of line... puts an entry in the index IX. % It also defines \IXindfile to be the number of the output channel for % the file that accumulates this index. The file's extension is IX. +% The name of an index should be no more than 2 characters long +% for the sake of vms. % \def\newindex#1{% \expandafter\chardef\csname#1indfile\endcsname=0 @@ -4797,6 +4898,21 @@ \def\docodeindexxxx #1{\docind{\indexname}{#1}} +% Used for the aux, toc and index files to prevent expansion of Texinfo +% commands. +% +\def\atdummies{% + \definedummyletter\@% + \definedummyletter\ % + \definedummyletter\{% + \definedummyletter\}% + \definedummyletter\&% + % + % Do the redefinitions. + \definedummies + \otherbackslash +} + % \definedummyword defines \#1 as \string\#1\space, thus effectively % preventing its expansion. This is used only for control words, % not control letters, because the \space would be incorrect for @@ -4812,91 +4928,110 @@ % \def\definedummyword #1{\def#1{\string#1\space}}% \def\definedummyletter#1{\def#1{\string#1}}% +\let\definedummyaccent\definedummyletter -% Used for the aux, toc and index files to prevent expansion of Texinfo -% commands. Most of the commands are controlled through the -% \ifdummies conditional. +% Called from \atdummies to prevent the expansion of commands. % -\def\atdummies{% - \dummiestrue +\def\definedummies{% % - \definedummyletter\@% - \definedummyletter\ % - \definedummyletter\{% - \definedummyletter\}% - \definedummyletter\&% + \let\commondummyword\definedummyword + \let\commondummyletter\definedummyletter + \let\commondummyaccent\definedummyaccent + \commondummiesnofonts % \definedummyletter\_% \definedummyletter\-% % + % Non-English letters. + \definedummyword\AA + \definedummyword\AE + \definedummyword\DH + \definedummyword\L + \definedummyword\O + \definedummyword\OE + \definedummyword\TH + \definedummyword\aa + \definedummyword\ae + \definedummyword\dh + \definedummyword\exclamdown + \definedummyword\l + \definedummyword\o + \definedummyword\oe + \definedummyword\ordf + \definedummyword\ordm + \definedummyword\questiondown + \definedummyword\ss + \definedummyword\th + % + % Although these internal commands shouldn't show up, sometimes they do. + \definedummyword\bf + \definedummyword\gtr + \definedummyword\hat + \definedummyword\less + \definedummyword\sf + \definedummyword\sl + \definedummyword\tclose + \definedummyword\tt + % + \definedummyword\LaTeX + \definedummyword\TeX + % + % Assorted special characters. + \definedummyword\ampchar + \definedummyword\atchar + \definedummyword\arrow + \definedummyword\backslashchar + \definedummyword\bullet + \definedummyword\comma + \definedummyword\copyright + \definedummyword\registeredsymbol + \definedummyword\dots + \definedummyword\enddots + \definedummyword\entrybreak + \definedummyword\equiv + \definedummyword\error + \definedummyword\euro + \definedummyword\expansion + \definedummyword\geq + \definedummyword\guillemetleft + \definedummyword\guillemetright + \definedummyword\guilsinglleft + \definedummyword\guilsinglright + \definedummyword\lbracechar + \definedummyword\leq + \definedummyword\mathopsup + \definedummyword\minus + \definedummyword\ogonek + \definedummyword\pounds + \definedummyword\point + \definedummyword\print + \definedummyword\quotedblbase + \definedummyword\quotedblleft + \definedummyword\quotedblright + \definedummyword\quoteleft + \definedummyword\quoteright + \definedummyword\quotesinglbase + \definedummyword\rbracechar + \definedummyword\result + \definedummyword\sub + \definedummyword\sup + \definedummyword\textdegree + % \definedummyword\subentry % % We want to disable all macros so that they are not expanded by \write. - \let\commondummyword\definedummyword \macrolist \let\value\dummyvalue % - \turnoffactive + \normalturnoffactive } -\newif\ifdummies -\newif\ifindexnofonts - -\def\commondummyletter#1{% - \expandafter\let\csname\string#1:impl\endcsname#1% - \edef#1{% - \noexpand\ifindexnofonts - % empty expansion - \noexpand\else - \noexpand\ifdummies\string#1% - \noexpand\else - \noexpand\jumptwofi % dispose of the \fi - \expandafter\noexpand\csname\string#1:impl\endcsname - \noexpand\fi - \noexpand\fi}% -} - -\def\commondummyaccent#1{% - \expandafter\let\csname\string#1:impl\endcsname#1% - \edef#1{% - \noexpand\ifindexnofonts - \noexpand\expandafter % dispose of \else ... \fi - \noexpand\asis - \noexpand\else - \noexpand\ifdummies\string#1% - \noexpand\else - \noexpand\jumptwofi % dispose of the \fi - \expandafter\noexpand\csname\string#1:impl\endcsname - \noexpand\fi - \noexpand\fi}% -} - -% Like \commondummyaccent but add a \space at the end of the dummy expansion -% #2 is the expansion used for \indexnofonts. #2 is always followed by -% \asis to remove a pair of following braces. -\def\commondummyword#1#2{% - \expandafter\let\csname\string#1:impl\endcsname#1% - \expandafter\def\csname\string#1:ixnf\endcsname{#2\asis}% - \edef#1{% - \noexpand\ifindexnofonts - \noexpand\expandafter % dispose of \else ... \fi - \expandafter\noexpand\csname\string#1:ixnf\endcsname - \noexpand\else - \noexpand\ifdummies\string#1\space - \noexpand\else - \noexpand\jumptwofi % dispose of the \fi \fi - \expandafter\noexpand\csname\string#1:impl\endcsname - \noexpand\fi - \noexpand\fi}% -} -\def\jumptwofi#1\fi\fi{\fi\fi#1} - -% For \atdummies and \indexnofonts. \atdummies sets -% \dummiestrue and \indexnofonts sets \indexnofontstrue. -\def\definedummies{ - % @-sign is always an escape character when reading auxiliary files - \escapechar = `\@ - % +% \commondummiesnofonts: common to \definedummies and \indexnofonts. +% Define \commondummyletter, \commondummyaccent and \commondummyword before +% using. Used for accents, font commands, and various control letters. +% +\def\commondummiesnofonts{% + % Control letters and accents. \commondummyletter\!% \commondummyaccent\"% \commondummyaccent\'% @@ -4910,123 +5045,58 @@ \commondummyaccent\^% \commondummyaccent\`% \commondummyaccent\~% - % - % Control letters and accents. - \commondummyword\u {}% - \commondummyword\v {}% - \commondummyword\H {}% - \commondummyword\dotaccent {}% - \commondummyword\ogonek {}% - \commondummyword\ringaccent {}% - \commondummyword\tieaccent {}% - \commondummyword\ubaraccent {}% - \commondummyword\udotaccent {}% - \commondummyword\dotless {}% + \commondummyword\u + \commondummyword\v + \commondummyword\H + \commondummyword\dotaccent + \commondummyword\ogonek + \commondummyword\ringaccent + \commondummyword\tieaccent + \commondummyword\ubaraccent + \commondummyword\udotaccent + \commondummyword\dotless % % Texinfo font commands. - \commondummyword\b {}% - \commondummyword\i {}% - \commondummyword\r {}% - \commondummyword\sansserif {}% - \commondummyword\sc {}% - \commondummyword\slanted {}% - \commondummyword\t {}% + \commondummyword\b + \commondummyword\i + \commondummyword\r + \commondummyword\sansserif + \commondummyword\sc + \commondummyword\slanted + \commondummyword\t % % Commands that take arguments. - \commondummyword\abbr {}% - \commondummyword\acronym {}% - \commondummyword\anchor {}% - \commondummyword\cite {}% - \commondummyword\code {}% - \commondummyword\command {}% - \commondummyword\dfn {}% - \commondummyword\dmn {}% - \commondummyword\email {}% - \commondummyword\emph {}% - \commondummyword\env {}% - \commondummyword\file {}% - \commondummyword\image {}% - \commondummyword\indicateurl{}% - \commondummyword\inforef {}% - \commondummyword\kbd {}% - \commondummyword\key {}% - \commondummyword\math {}% - \commondummyword\option {}% - \commondummyword\pxref {}% - \commondummyword\ref {}% - \commondummyword\samp {}% - \commondummyword\strong {}% - \commondummyword\tie {}% - \commondummyword\U {}% - \commondummyword\uref {}% - \commondummyword\url {}% - \commondummyword\var {}% - \commondummyword\verb {}% - \commondummyword\w {}% - \commondummyword\xref {}% - % - \commondummyword\AA {AA}% - \commondummyword\AE {AE}% - \commondummyword\DH {DZZ}% - \commondummyword\L {L}% - \commondummyword\O {O}% - \commondummyword\OE {OE}% - \commondummyword\TH {TH}% - \commondummyword\aa {aa}% - \commondummyword\ae {ae}% - \commondummyword\dh {dzz}% - \commondummyword\exclamdown {!}% - \commondummyword\l {l}% - \commondummyword\o {o}% - \commondummyword\oe {oe}% - \commondummyword\ordf {a}% - \commondummyword\ordm {o}% - \commondummyword\questiondown {?}% - \commondummyword\ss {ss}% - \commondummyword\th {th}% - % - \commondummyword\LaTeX {LaTeX}% - \commondummyword\TeX {TeX}% - % - % Assorted special characters. - \commondummyword\ampchar {\normalamp}% - \commondummyword\atchar {\@}% - \commondummyword\arrow {->}% - \commondummyword\backslashchar {\realbackslash}% - \commondummyword\bullet {bullet}% - \commondummyword\comma {,}% - \commondummyword\copyright {copyright}% - \commondummyword\dots {...}% - \commondummyword\enddots {...}% - \commondummyword\entrybreak {}% - \commondummyword\equiv {===}% - \commondummyword\error {error}% - \commondummyword\euro {euro}% - \commondummyword\expansion {==>}% - \commondummyword\geq {>=}% - \commondummyword\guillemetleft {<<}% - \commondummyword\guillemetright {>>}% - \commondummyword\guilsinglleft {<}% - \commondummyword\guilsinglright {>}% - \commondummyword\lbracechar {\{}% - \commondummyword\leq {<=}% - \commondummyword\mathopsup {sup}% - \commondummyword\minus {-}% - \commondummyword\pounds {pounds}% - \commondummyword\point {.}% - \commondummyword\print {-|}% - \commondummyword\quotedblbase {"}% - \commondummyword\quotedblleft {"}% - \commondummyword\quotedblright {"}% - \commondummyword\quoteleft {`}% - \commondummyword\quoteright {'}% - \commondummyword\quotesinglbase {,}% - \commondummyword\rbracechar {\}}% - \commondummyword\registeredsymbol {R}% - \commondummyword\result {=>}% - \commondummyword\sub {}% - \commondummyword\sup {}% - \commondummyword\textdegree {o}% + \commondummyword\abbr + \commondummyword\acronym + \commondummyword\anchor + \commondummyword\cite + \commondummyword\code + \commondummyword\command + \commondummyword\dfn + \commondummyword\dmn + \commondummyword\email + \commondummyword\emph + \commondummyword\env + \commondummyword\file + \commondummyword\image + \commondummyword\indicateurl + \commondummyword\inforef + \commondummyword\kbd + \commondummyword\key + \commondummyword\math + \commondummyword\option + \commondummyword\pxref + \commondummyword\ref + \commondummyword\samp + \commondummyword\strong + \commondummyword\tie + \commondummyword\U + \commondummyword\uref + \commondummyword\url + \commondummyword\var + \commondummyword\verb + \commondummyword\w + \commondummyword\xref } \let\indexlbrace\relax @@ -5044,24 +5114,25 @@ \catcode`\-=13 \catcode`\`=13 \gdef\indexnonalnumdisappear{% - \ifflagclear{txiindexlquoteignore}{}{% + \expandafter\ifx\csname SETtxiindexlquoteignore\endcsname\relax\else % @set txiindexlquoteignore makes us ignore left quotes in the sort term. % (Introduced for FSFS 2nd ed.) \let`=\empty - }% + \fi % - \ifflagclear{txiindexbackslashignore}{}{% + \expandafter\ifx\csname SETtxiindexbackslashignore\endcsname\relax\else \backslashdisappear - }% - \ifflagclear{txiindexhyphenignore}{}{% + \fi + % + \expandafter\ifx\csname SETtxiindexhyphenignore\endcsname\relax\else \def-{}% - }% - \ifflagclear{txiindexlessthanignore}{}{% + \fi + \expandafter\ifx\csname SETtxiindexlessthanignore\endcsname\relax\else \def<{}% - }% - \ifflagclear{txiindexatsignignore}{}{% + \fi + \expandafter\ifx\csname SETtxiindexatsignignore\endcsname\relax\else \def\@{}% - }% + \fi } \gdef\indexnonalnumreappear{% @@ -5077,7 +5148,18 @@ % would be for a given command (usually its argument). % \def\indexnofonts{% - \indexnofontstrue + % Accent commands should become @asis. + \def\commondummyaccent##1{\let##1\asis}% + % We can just ignore other control letters. + \def\commondummyletter##1{\let##1\empty}% + % All control words become @asis by default; overrides below. + \let\commondummyword\commondummyaccent + \commondummiesnofonts + % + % Don't no-op \tt, since it isn't a user-level command + % and is used in the definitions of the active chars like <, >, |, etc. + % Likewise with the other plain tex font commands. + %\let\tt=\asis % \def\ { }% \def\@{@}% @@ -5090,18 +5172,84 @@ \let\rbracechar\}% % % + \let\do\indexnofontsdef + % + % Non-English letters. + \do\AA{AA}% + \do\AE{AE}% + \do\DH{DZZ}% + \do\L{L}% + \do\OE{OE}% + \do\O{O}% + \do\TH{TH}% + \do\aa{aa}% + \do\ae{ae}% + \do\dh{dzz}% + \do\exclamdown{!}% + \do\l{l}% + \do\oe{oe}% + \do\ordf{a}% + \do\ordm{o}% + \do\o{o}% + \do\questiondown{?}% + \do\ss{ss}% + \do\th{th}% + % + \do\LaTeX{LaTeX}% + \do\TeX{TeX}% + % + % Assorted special characters. + \do\atchar{@}% + \do\arrow{->}% + \do\bullet{bullet}% + \do\comma{,}% + \do\copyright{copyright}% + \do\dots{...}% + \do\enddots{...}% + \do\equiv{==}% + \do\error{error}% + \do\euro{euro}% + \do\expansion{==>}% + \do\geq{>=}% + \do\guillemetleft{<<}% + \do\guillemetright{>>}% + \do\guilsinglleft{<}% + \do\guilsinglright{>}% + \do\leq{<=}% + \do\lbracechar{\{}% + \do\minus{-}% + \do\point{.}% + \do\pounds{pounds}% + \do\print{-|}% + \do\quotedblbase{"}% + \do\quotedblleft{"}% + \do\quotedblright{"}% + \do\quoteleft{`}% + \do\quoteright{'}% + \do\quotesinglbase{,}% + \do\rbracechar{\}}% + \do\registeredsymbol{R}% + \do\result{=>}% + \do\textdegree{o}% + % % We need to get rid of all macros, leaving only the arguments (if present). % Of course this is not nearly correct, but it is the best we can do for now. + % makeinfo does not expand macros in the argument to @deffn, which ends up + % writing an index entry, and texindex isn't prepared for an index sort entry + % that starts with \. % % Since macro invocations are followed by braces, we can just redefine them % to take a single TeX argument. The case of a macro invocation that % goes to end-of-line is not handled. % - \def\commondummyword##1{\let##1\asis}% \macrolist \let\value\indexnofontsvalue } +% Give the control sequence a definition that removes the {} that follows +% its use, e.g. @AA{} -> AA +\def\indexnofontsdef#1#2{\def#1##1{#2}}% + @@ -5232,10 +5380,7 @@ \xdef\trimmed{\segment}% \xdef\trimmed{\expandafter\eatspaces\expandafter{\trimmed}}% \xdef\indexsortkey{\trimmed}% - \ifx\indexsortkey\empty - \message{Empty index sort key near line \the\inputlineno}% - \xdef\indexsortkey{ }% - \fi + \ifx\indexsortkey\empty\xdef\indexsortkey{ }\fi }\fi % % Append to \fullindexsortkey. @@ -5280,7 +5425,9 @@ % \atdummies % - \ifflagclear{txiindexescapeisbackslash}{}{\escapeisbackslash}% + \expandafter\ifx\csname SETtxiindexescapeisbackslash\endcsname\relax\else + \escapeisbackslash + \fi % % For texindex which always views { and } as separators. \def\{{\lbracechar{}}% @@ -5464,9 +5611,9 @@ % old index files using \ as the escape character. Reading this would % at best lead to typesetting garbage, at worst a TeX syntax error. \def\printindexzz#1#2\finish{% - \ifflagclear{txiindexescapeisbackslash}{% + \expandafter\ifx\csname SETtxiindexescapeisbackslash\endcsname\relax \uccode`\~=`\\ \uppercase{\if\noexpand~}\noexpand#1 - \ifflagclear{txiskipindexfileswithbackslash}{% + \expandafter\ifx\csname SETtxiskipindexfileswithbackslash\endcsname\relax \errmessage{% ERROR: A sorted index file in an obsolete format was skipped. To fix this problem, please upgrade your version of 'texi2dvi' @@ -5482,15 +5629,15 @@ If you continue to have problems, deleting the index files and starting again might help (with 'rm \jobname.?? \jobname.??s')% }% - }{% + \else (Skipped sorted index file in obsolete format) - }% + \fi \else \begindoublecolumns \input \jobname.\indexname s \enddoublecolumns \fi - }{% + \else \begindoublecolumns \catcode`\\=0\relax % @@ -5500,7 +5647,7 @@ \catcode`\@=0\relax \input \jobname.\indexname s \enddoublecolumns - }% + \fi } % These macros are used by the sorted index file itself. @@ -5575,11 +5722,6 @@ \newdimen\entryrightmargin \entryrightmargin=0pt -% for PDF output, whether to make the text of the entry a link to the page -% number. set for @contents and @shortcontents where there is only one -% page number. -\newif\iflinkentrytext - % \entry typesets a paragraph consisting of the text (#1), dot leaders, and % then page number (#2) flushed to the right margin. It is used for index % and table of contents entries. The paragraph is indented by \leftskip. @@ -5606,7 +5748,7 @@ } \def\entrybreak{\unskip\space\ignorespaces}% \def\doentry{% - % Save the text of the entry in \boxA + % Save the text of the entry \global\setbox\boxA=\hbox\bgroup \bgroup % Instead of the swallowed brace. \noindent @@ -5616,21 +5758,12 @@ % with catcodes occurring. } {\catcode`\@=11 -% #1 is the page number \gdef\finishentry#1{% - \egroup % end \boxA + \egroup % end box A \dimen@ = \wd\boxA % Length of text of entry - % add any leaders and page number to \boxA. \global\setbox\boxA=\hbox\bgroup - \ifpdforxetex - \iflinkentrytext - \pdflinkpage{#1}{\unhbox\boxA}% - \else - \unhbox\boxA - \fi - \else - \unhbox\boxA - \fi + \unhbox\boxA + % #1 is the page number. % % Get the width of the page numbers, and only use % leaders if they are present. @@ -5649,8 +5782,6 @@ \fi \fi \egroup % end \boxA - % - % now output \ifdim\wd\boxB = 0pt \noindent\unhbox\boxA\par \nobreak @@ -5952,7 +6083,7 @@ % Chapters, sections, etc. % Let's start with @part. -\parseargdef\part{\partzzz{#1}} +\outer\parseargdef\part{\partzzz{#1}} \def\partzzz#1{% \chapoddpage \null @@ -6350,7 +6481,7 @@ \fi } -\parseargdef\setchapternewpage{\csname CHAPPAG#1\endcsname\HEADINGSon} +\parseargdef\setchapternewpage{\csname CHAPPAG#1\endcsname} \def\CHAPPAGoff{% \global\let\contentsalignmacro = \chappager @@ -6367,7 +6498,7 @@ \global\let\pchapsepmacro=\chapoddpage \global\def\HEADINGSon{\HEADINGSdouble}} -\setchapternewpage on +\CHAPPAGon % \chapmacro - Chapter opening. % @@ -6380,16 +6511,6 @@ \def\Yappendixkeyword{Yappendix} \def\Yomitfromtockeyword{Yomitfromtoc} % -% -% Definitions for @thischapter. These can be overridden in translation -% files. -\def\thischapterAppendix{% - \putwordAppendix{} \thischapternum: \thischaptername} - -\def\thischapterChapter{% - \putwordChapter{} \thischapternum: \thischaptername} -% -% \def\chapmacro#1#2#3{% \expandafter\ifx\thisenv\titlepage\else \checkenv{}% chapters, etc., should not start inside an environment. @@ -6412,14 +6533,22 @@ \xdef\currentchapterdefs{% \gdef\noexpand\thischaptername{\the\toks0}% \gdef\noexpand\thischapternum{\appendixletter}% - \let\noexpand\thischapter\noexpand\thischapterAppendix + % \noexpand\putwordAppendix avoids expanding indigestible + % commands in some of the translations. + \gdef\noexpand\thischapter{\noexpand\putwordAppendix{} + \noexpand\thischapternum: + \noexpand\thischaptername}% }% \else \toks0={#1}% \xdef\currentchapterdefs{% \gdef\noexpand\thischaptername{\the\toks0}% \gdef\noexpand\thischapternum{\the\chapno}% - \let\noexpand\thischapter\noexpand\thischapterChapter + % \noexpand\putwordChapter avoids expanding indigestible + % commands in some of the translations. + \gdef\noexpand\thischapter{\noexpand\putwordChapter{} + \noexpand\thischapternum: + \noexpand\thischaptername}% }% \fi\fi\fi % @@ -6505,12 +6634,6 @@ \def\subsubsecheadingskip{\subsecheadingskip} \def\subsubsecheadingbreak{\subsecheadingbreak} -% Definition for @thissection. This can be overridden in translation -% files. -\def\thissectionDef{% - \putwordSection{} \thissectionnum: \thissectionname} -% - % Print any size, any type, section title. % @@ -6552,7 +6675,11 @@ \xdef\currentsectiondefs{% \gdef\noexpand\thissectionname{\the\toks0}% \gdef\noexpand\thissectionnum{#4}% - \let\noexpand\thissection\noexpand\thissectionDef + % \noexpand\putwordSection avoids expanding indigestible + % commands in some of the translations. + \gdef\noexpand\thissection{\noexpand\putwordSection{} + \noexpand\thissectionnum: + \noexpand\thissectionname}% }% \fi \else @@ -6561,7 +6688,11 @@ \xdef\currentsectiondefs{% \gdef\noexpand\thissectionname{\the\toks0}% \gdef\noexpand\thissectionnum{#4}% - \let\noexpand\thissection\noexpand\thissectionDef + % \noexpand\putwordSection avoids expanding indigestible + % commands in some of the translations. + \gdef\noexpand\thissection{\noexpand\putwordSection{} + \noexpand\thissectionnum: + \noexpand\thissectionname}% }% \fi \fi\fi\fi @@ -6747,14 +6878,8 @@ \def\thistitle{}% no title in double-sided headings % Record where the Roman numerals started. \ifnum\romancount=0 \global\romancount=\pagecount \fi - \linkentrytexttrue } -% \raggedbottom in plain.tex hardcodes \topskip so override it -\catcode`\@=11 -\def\raggedbottom{\advance\topskip by 0pt plus60pt \r@ggedbottomtrue} -\catcode`\@=\other - % redefined for the two-volume lispref. We always output on % \jobname.toc even if this is redefined. % @@ -6817,8 +6942,12 @@ % Get ready to use Arabic numerals again \def\contentsendroman{% \lastnegativepageno = \pageno - \global\pageno=1 - \contentsendcount = \pagecount + \global\pageno = \savepageno + % + % If \romancount > \arabiccount, the contents are at the end of the + % document. Otherwise, advance where the Arabic numerals start for + % the page numbers. + \ifnum\romancount>\arabiccount\else\global\arabiccount=\pagecount\fi } % Typeset the label for a chapter or appendix for the short contents. @@ -6871,7 +7000,7 @@ % Chapters, in the short toc. % See comments in \dochapentry re vbox and related settings. \def\shortchapentry#1#2#3#4{% - \tocentry{\shortchaplabel{#2}\labelspace #1}{#4}% + \tocentry{\shortchaplabel{#2}\labelspace #1}{\doshortpageno\bgroup#4\egroup}% } % Appendices, in the main contents. @@ -6886,7 +7015,7 @@ % Unnumbered chapters. \def\unnchapentry#1#2#3#4{\dochapentry{#1}{#4}} -\def\shortunnchapentry#1#2#3#4{\tocentry{#1}{#4}} +\def\shortunnchapentry#1#2#3#4{\tocentry{#1}{\doshortpageno\bgroup#4\egroup}} % Sections. \def\numsecentry#1#2#3#4{\dosecentry{#2\labelspace#1}{#4}} @@ -6918,24 +7047,24 @@ % Move the page numbers slightly to the right \advance\entryrightmargin by -0.05em \chapentryfonts - \tocentry{#1}{#2}% + \tocentry{#1}{\dopageno\bgroup#2\egroup}% \endgroup \nobreak\vskip .25\baselineskip plus.1\baselineskip } \def\dosecentry#1#2{\begingroup \secentryfonts \leftskip=\tocindent - \tocentry{#1}{#2}% + \tocentry{#1}{\dopageno\bgroup#2\egroup}% \endgroup} \def\dosubsecentry#1#2{\begingroup \subsecentryfonts \leftskip=2\tocindent - \tocentry{#1}{#2}% + \tocentry{#1}{\dopageno\bgroup#2\egroup}% \endgroup} \def\dosubsubsecentry#1#2{\begingroup \subsubsecentryfonts \leftskip=3\tocindent - \tocentry{#1}{#2}% + \tocentry{#1}{\dopageno\bgroup#2\egroup}% \endgroup} % We use the same \entry macro as for the index entries. @@ -6944,6 +7073,9 @@ % Space between chapter (or whatever) number and the title. \def\labelspace{\hskip1em \relax} +\def\dopageno#1{{\rm #1}} +\def\doshortpageno#1{{\rm #1}} + \def\chapentryfonts{\secfonts \rm} \def\secentryfonts{\textfonts} \def\subsecentryfonts{\textfonts} @@ -7088,25 +7220,19 @@ \newdimen\cartouter\newdimen\cartinner \newskip\normbskip\newskip\normpskip\newskip\normlskip -\envparseargdef\cartouche{% + +\envdef\cartouche{% \cartouchefontdefs \ifhmode\par\fi % can't be in the midst of a paragraph. \startsavinginserts \lskip=\leftskip \rskip=\rightskip \leftskip=0pt\rightskip=0pt % we want these *outside*. - % - % Set paragraph width for text inside cartouche. There are - % left and right margins of 3pt each plus two vrules 0.4pt each. \cartinner=\hsize \advance\cartinner by-\lskip \advance\cartinner by-\rskip - \advance\cartinner by -6.8pt - % - % For drawing top and bottom of cartouche. Each corner char - % adds 6pt and we take off the width of a rule to line up with the - % right boundary perfectly. \cartouter=\hsize - \advance\cartouter by 11.6pt - % + \advance\cartouter by 18.4pt % allow for 3pt kerns on either + % side, and for 6pt waste from + % each corner char, and rule thickness \normbskip=\baselineskip \normpskip=\parskip \normlskip=\lineskip % % If this cartouche directly follows a sectioning command, we need the @@ -7114,23 +7240,20 @@ % collide with the section heading. \ifnum\lastpenalty>10000 \vskip\parskip \penalty\lastpenalty \fi % - \setbox\groupbox=\vtop\bgroup + \setbox\groupbox=\vbox\bgroup \baselineskip=0pt\parskip=0pt\lineskip=0pt \carttop \hbox\bgroup - \hskip\lskip - \vrule\kern3pt - \vbox\bgroup - \hsize=\cartinner - \baselineskip=\normbskip - \lineskip=\normlskip - \parskip=\normpskip - \def\arg{#1}% - \ifx\arg\empty\else - \centerV{\hfil \bf #1 \hfil}% - \fi - \kern3pt - \vskip -\parskip + \hskip\lskip + \vrule\kern3pt + \vbox\bgroup + \kern3pt + \hsize=\cartinner + \baselineskip=\normbskip + \lineskip=\normlskip + \parskip=\normpskip + \vskip -\parskip + \comment % For explanation, see the end of def\group. } \def\Ecartouche{% \ifhmode\par\fi @@ -7284,6 +7407,22 @@ } \let\Eraggedright\par +\envdef\raggedleft{% + \parindent=0pt \leftskip0pt plus2em + \spaceskip.3333em \xspaceskip.5em \parfillskip=0pt + \hbadness=10000 % Last line will usually be underfull, so turn off + % badness reporting. +} +\let\Eraggedleft\par + +\envdef\raggedcenter{% + \parindent=0pt \rightskip0pt plus1em \leftskip0pt plus1em + \spaceskip.3333em \xspaceskip.5em \parfillskip=0pt + \hbadness=10000 % Last line will usually be underfull, so turn off + % badness reporting. +} +\let\Eraggedcenter\par + % @quotation does normal linebreaking (hence we can't use \nonfillstart) % and narrows the margins. We keep \parskip nonzero in general, since @@ -7381,9 +7520,8 @@ \endgroup % \def\setupverb{% - \tt + \tt % easiest (and conventionally used) font for verbatim \def\par{\leavevmode\endgraf}% - \parindent = 0pt \setcodequotes \tabeightspaces % Respect line breaks, @@ -7507,11 +7645,9 @@ % file; b) letting users define the frontmatter in as flexible order as % possible is desirable. % -\def\copying{\checkenv{}\begingroup\macrobodyctxt\docopying} -{\catcode`\ =\other -\gdef\docopying#1@end copying{\endgroup\def\copyingtext{#1}} -} - +\def\copying{\checkenv{}\begingroup\scanargctxt\docopying} +\def\docopying#1@end copying{\endgroup\def\copyingtext{#1}} +% \def\insertcopying{% \begingroup \parindent = 0pt % paragraph indentation looks wrong on title page @@ -7559,19 +7695,31 @@ \exdentamount=\defbodyindent } -% Called as \printdefunline \deffooheader{text} +\def\dodefunx#1{% + % First, check whether we are in the right environment: + \checkenv#1% + % + % As above, allow line break if we have multiple x headers in a row. + % It's not a great place, though. + \ifnum\lastpenalty=10002 \penalty3000 \else \defunpenalty=10002 \fi + % + % And now, it's time to reuse the body of the original defun: + \expandafter\gobbledefun#1% +} +\def\gobbledefun#1\startdefun{} + +% \printdefunline \deffnheader{text} % \def\printdefunline#1#2{% \begingroup - \plainfrenchspacing - % call \deffooheader: + % call \deffnheader: #1#2 \endheader % common ending: \interlinepenalty = 10000 \advance\rightskip by 0pt plus 1fil\relax \endgraf \nobreak\vskip -\parskip - \penalty\defunpenalty % signal to \startdefun and \deffoox + \penalty\defunpenalty % signal to \startdefun and \dodefunx % Some of the @defun-type tags do not enable magic parentheses, % rendering the following check redundant. But we don't optimize. \checkparencounts @@ -7580,51 +7728,29 @@ \def\Edefun{\endgraf\medbreak} -% @defblock, @defline do not automatically create index entries -\envdef\defblock{% - \startdefun -} -\let\Edefblock\Edefun - -\def\defline{% - \doingtypefnfalse - \parseargusing\activeparens{\printdefunline\deflineheader}% -} -\def\deflineheader#1 #2 #3\endheader{% - \printdefname{#1}{}{#2}\magicamp\defunargs{#3\unskip}% -} -\def\deftypeline{% - \doingtypefntrue - \parseargusing\activeparens{\printdefunline\deflineheader}% -} - -% \makedefun{deffoo} (\deffooheader parameters) { (\deffooheader expansion) } +% \makedefun{deffn} creates \deffn, \deffnx and \Edeffn; +% the only thing remaining is to define \deffnheader. % -% Define \deffoo, \deffoox \Edeffoo and \deffooheader. \def\makedefun#1{% \expandafter\let\csname E#1\endcsname = \Edefun \edef\temp{\noexpand\domakedefun \makecsname{#1}\makecsname{#1x}\makecsname{#1header}}% \temp } + +% \domakedefun \deffn \deffnx \deffnheader { (defn. of \deffnheader) } +% +% Define \deffn and \deffnx, without parameters. +% \deffnheader has to be defined explicitly. +% \def\domakedefun#1#2#3{% \envdef#1{% \startdefun \doingtypefnfalse % distinguish typed functions from all else \parseargusing\activeparens{\printdefunline#3}% }% - \def#2{% - % First, check whether we are in the right environment: - \checkenv#1% - % - % As in \startdefun, allow line break if we have multiple x headers - % in a row. It's not a great place, though. - \ifnum\lastpenalty=10002 \penalty3000 \else \defunpenalty=10002 \fi - % - \doingtypefnfalse % distinguish typed functions from all else - \parseargusing\activeparens{\printdefunline#3}% - }% - \def#3% definition of \deffooheader follows + \def#2{\dodefunx#1}% + \def#3% } \newif\ifdoingtypefn % doing typed function? @@ -7649,51 +7775,74 @@ \fi\fi } +% \dosubind {index}{topic}{subtopic} +% +% If SUBTOPIC is present, precede it with a space, and call \doind. +% (At some time during the 20th century, this made a two-level entry in an +% index such as the operation index. Nobody seemed to notice the change in +% behaviour though.) +\def\dosubind#1#2#3{% + \def\thirdarg{#3}% + \ifx\thirdarg\empty + \doind{#1}{#2}% + \else + \doind{#1}{#2\space#3}% + \fi +} + % Untyped functions: % @deffn category name args -\makedefun{deffn}#1 #2 #3\endheader{% - \doind{fn}{\code{#2}}% - \printdefname{#1}{}{#2}\magicamp\defunargs{#3\unskip}% -} +\makedefun{deffn}{\deffngeneral{}} + +% @deffn category class name args +\makedefun{defop}#1 {\defopon{#1\ \putwordon}} + +% \defopon {category on}class name args +\def\defopon#1#2 {\deffngeneral{\putwordon\ \code{#2}}{#1\ \code{#2}} } -% @defop category class name args -\makedefun{defop}#1 {\defopheaderx{#1\ \putwordon}} -\def\defopheaderx#1#2 #3 #4\endheader{% - \doind{fn}{\code{#3}\space\putwordon\ \code{#2}}% - \printdefname{#1\ \code{#2}}{}{#3}\magicamp\defunargs{#4\unskip}% +% \deffngeneral {subind}category name args +% +\def\deffngeneral#1#2 #3 #4\endheader{% + \dosubind{fn}{\code{#3}}{#1}% + \defname{#2}{}{#3}\magicamp\defunargs{#4\unskip}% } % Typed functions: % @deftypefn category type name args -\makedefun{deftypefn}#1 #2 #3 #4\endheader{% - \doind{fn}{\code{#3}}% - \doingtypefntrue - \printdefname{#1}{#2}{#3}\defunargs{#4\unskip}% -} +\makedefun{deftypefn}{\deftypefngeneral{}} % @deftypeop category class type name args -\makedefun{deftypeop}#1 {\deftypeopheaderx{#1\ \putwordon}} -\def\deftypeopheaderx#1#2 #3 #4 #5\endheader{% - \doind{fn}{\code{#4}\space\putwordon\ \code{#1\ \code{#2}}}% +\makedefun{deftypeop}#1 {\deftypeopon{#1\ \putwordon}} + +% \deftypeopon {category on}class type name args +\def\deftypeopon#1#2 {\deftypefngeneral{\putwordon\ \code{#2}}{#1\ \code{#2}} } + +% \deftypefngeneral {subind}category type name args +% +\def\deftypefngeneral#1#2 #3 #4 #5\endheader{% + \dosubind{fn}{\code{#4}}{#1}% \doingtypefntrue - \printdefname{#1\ \code{#2}}{#3}{#4}\defunargs{#5\unskip}% + \defname{#2}{#3}{#4}\defunargs{#5\unskip}% } % Typed variables: % @deftypevr category type var args -\makedefun{deftypevr}#1 #2 #3 #4\endheader{% - \doind{vr}{\code{#3}}% - \printdefname{#1}{#2}{#3}\defunargs{#4\unskip}% -} +\makedefun{deftypevr}{\deftypecvgeneral{}} % @deftypecv category class type var args -\makedefun{deftypecv}#1 {\deftypecvheaderx{#1\ \putwordof}} -\def\deftypecvheaderx#1#2 #3 #4 #5\endheader{% - \doind{vr}{\code{#4}\space\putwordof\ \code{#2}}% - \printdefname{#1\ \code{#2}}{#3}{#4}\defunargs{#5\unskip}% +\makedefun{deftypecv}#1 {\deftypecvof{#1\ \putwordof}} + +% \deftypecvof {category of}class type var args +\def\deftypecvof#1#2 {\deftypecvgeneral{\putwordof\ \code{#2}}{#1\ \code{#2}} } + +% \deftypecvgeneral {subind}category type var args +% +\def\deftypecvgeneral#1#2 #3 #4 #5\endheader{% + \dosubind{vr}{\code{#4}}{#1}% + \defname{#2}{#3}{#4}\defunargs{#5\unskip}% } % Untyped variables: @@ -7702,15 +7851,17 @@ \makedefun{defvr}#1 {\deftypevrheader{#1} {} } % @defcv category class var args -\makedefun{defcv}#1 {\defcvheaderx{#1\ \putwordof}} -\def\defcvheaderx#1#2 {\deftypecvheaderx{#1}#2 {} } +\makedefun{defcv}#1 {\defcvof{#1\ \putwordof}} + +% \defcvof {category of}class var args +\def\defcvof#1#2 {\deftypecvof{#1}#2 {} } % Types: % @deftp category name args \makedefun{deftp}#1 #2 #3\endheader{% \doind{tp}{\code{#2}}% - \printdefname{#1}{}{#2}\defunargs{#3\unskip}% + \defname{#1}{}{#2}\defunargs{#3\unskip}% } % Remaining @defun-like shortcuts: @@ -7721,19 +7872,19 @@ \makedefun{defvar}{\defvrheader{\putwordDefvar} } \makedefun{defopt}{\defvrheader{\putwordDefopt} } \makedefun{deftypevar}{\deftypevrheader{\putwordDefvar} } -\makedefun{defmethod}{\defopheaderx\putwordMethodon} -\makedefun{deftypemethod}{\deftypeopheaderx\putwordMethodon} -\makedefun{defivar}{\defcvheaderx\putwordInstanceVariableof} -\makedefun{deftypeivar}{\deftypecvheaderx\putwordInstanceVariableof} +\makedefun{defmethod}{\defopon\putwordMethodon} +\makedefun{deftypemethod}{\deftypeopon\putwordMethodon} +\makedefun{defivar}{\defcvof\putwordInstanceVariableof} +\makedefun{deftypeivar}{\deftypecvof\putwordInstanceVariableof} -% \printdefname, which formats the name of the @def (not the args). +% \defname, which formats the name of the @def (not the args). % #1 is the category, such as "Function". % #2 is the return type, if any. % #3 is the function name. % % We are followed by (but not passed) the arguments, if any. % -\def\printdefname#1#2#3{% +\def\defname#1#2#3{% \par % Get the values of \leftskip and \rightskip as they were outside the @def... \advance\leftskip by -\defbodyindent @@ -7743,7 +7894,9 @@ \rettypeownlinefalse \ifdoingtypefn % doing a typed function specifically? % then check user option for putting return type on its own line: - \ifflagclear{txideftypefnnl}{}{\rettypeownlinetrue}% + \expandafter\ifx\csname SETtxideftypefnnl\endcsname\relax \else + \rettypeownlinetrue + \fi \fi % % How we'll format the category name. Putting it in brackets helps @@ -7808,22 +7961,30 @@ \fi % no return type #3% output function name }% - \ifflagclear{txidefnamenospace}{% - {\rm\enskip}% hskip 0.5 em of \rmfont - }{}% + {\rm\enskip}% hskip 0.5 em of \rmfont % \boldbrax % arguments will be output next, if any. } -% Print arguments. Use slanted for @def*, typewriter for @deftype*. +% Print arguments in slanted roman (not ttsl), inconsistently with using +% tt for the name. This is because literal text is sometimes needed in +% the argument list (groff manual), and ttsl and tt are not very +% distinguishable. Prevent hyphenation at `-' chars. +% \def\defunargs#1{% - \bgroup - \df \ifdoingtypefn \tt \else \sl \fi - \ifflagclear{txicodevaristt}{}% - {\def\var##1{{\setregularquotes \ttsl ##1}}}% - #1% - \egroup + % use sl by default (not ttsl), + % tt for the names. + \df \sl \hyphenchar\font=0 + % + % On the other hand, if an argument has two dashes (for instance), we + % want a way to get ttsl. We used to recommend @var for that, so + % leave the code in, but it's strange for @var to lead to typewriter. + % Nowadays we recommend @code, since the difference between a ttsl hyphen + % and a tt hyphen is pretty tiny. @code also disables ?` !`. + \def\var##1{{\setregularquotes\ttslanted{##1}}}% + #1% + \sl\hyphenchar\font=45 } % We want ()&[] to print specially on the defun line. @@ -7842,12 +8003,9 @@ % so TeX would otherwise complain about undefined control sequence. { \activeparens - \gdef\defcharsdefault{% - \let(=\lparen \let)=\rparen - \let[=\lbrack \let]=\rbrack - \let& = \&% - } - \globaldefs=1 \defcharsdefault + \global\let(=\lparen \global\let)=\rparen + \global\let[=\lbrack \global\let]=\rbrack + \global\let& = \& \gdef\boldbrax{\let(=\opnr\let)=\clnr\let[=\lbrb\let]=\rbrb} \gdef\magicamp{\let&=\amprm} @@ -7858,7 +8016,7 @@ % If we encounter &foo, then turn on ()-hacking afterwards \newif\ifampseen -\def\amprm#1 {\ampseentrue{\rm\ }} +\def\amprm#1 {\ampseentrue{\bf\ }} \def\parenfont{% \ifampseen @@ -8031,17 +8189,24 @@ \catcode`\_=\other \catcode`\|=\other \catcode`\~=\other + \passthroughcharstrue +} + +\def\scanargctxt{% used for copying and captions, not macros. + \scanctxt \catcode`\@=\other + \catcode`\\=\other \catcode`\^^M=\other - \catcode`\\=\active - \passthroughcharstrue } -\def\macrobodyctxt{% used for @macro definitions and @copying +\def\macrobodyctxt{% used for @macro definitions \scanctxt \catcode`\ =\other + \catcode`\@=\other \catcode`\{=\other \catcode`\}=\other + \catcode`\^^M=\other + \usembodybackslash } % Used when scanning braced macro arguments. Note, however, that catcode @@ -8050,10 +8215,14 @@ \def\macroargctxt{% \scanctxt \catcode`\ =\active + \catcode`\@=\other + \catcode`\^^M=\other + \catcode`\\=\active } \def\macrolineargctxt{% used for whole-line arguments without braces \scanctxt + \catcode`\@=\other \catcode`\{=\other \catcode`\}=\other } @@ -8097,7 +8266,7 @@ \global\expandafter\let\csname ismacro.\the\macname\endcsname=1% \addtomacrolist{\the\macname}% \fi - \begingroup \macrobodyctxt \usembodybackslash + \begingroup \macrobodyctxt \ifrecursive \expandafter\parsermacbody \else \expandafter\parsemacbody \fi} @@ -8182,12 +8351,12 @@ % % We are in \macrobodyctxt, and the \xdef causes backslashshes in the macro % body to be transformed. -% Set \macrobody to the body of the macro, and call \macrodef. +% Set \macrobody to the body of the macro, and call \defmacro. % {\catcode`\ =\other\long\gdef\parsemacbody#1@end macro{% -\xdef\macrobody{\eatcr{#1}}\endgroup\macrodef}}% +\xdef\macrobody{\eatcr{#1}}\endgroup\defmacro}}% {\catcode`\ =\other\long\gdef\parsermacbody#1@end rmacro{% -\xdef\macrobody{\eatcr{#1}}\endgroup\macrodef}}% +\xdef\macrobody{\eatcr{#1}}\endgroup\defmacro}}% % Make @ a letter, so that we can make private-to-Texinfo macro names. \edef\texiatcatcode{\the\catcode`\@} @@ -8406,36 +8575,35 @@ % \xdef is used so that macro definitions will survive the file % they're defined in: @include reads the file inside a group. % -\def\macrodef{% +\def\defmacro{% \let\hash=##% convert placeholders to macro parameter chars \ifnum\paramno=1 - \long\def\xeatspaces##1{##1}% - % We don't use \xeatspaces for single-argument macros, because we - % want to keep ends of lines. This definition removes \xeatspaces - % when \macrobody is expanded below. - \else - \def\xeatspaces{\string\xeatspaces}% - % This expands \xeatspaces as a sequence of character tokens, which - % stops \scantokens inserting an extra space after the control sequence. + \def\xeatspaces##1{##1}% + % This removes the pair of braces around the argument. We don't + % use \eatspaces, because this can cause ends of lines to be lost + % when the argument to \eatspaces is read, leading to line-based + % commands like "@itemize" not being read correctly. + \else + \let\xeatspaces\relax % suppress expansion \fi \ifcase\paramno % 0 \expandafter\xdef\csname\the\macname\endcsname{% - \begingroup + \bgroup \noexpand\spaceisspace \noexpand\endlineisspace \noexpand\expandafter % skip any whitespace after the macro name. \expandafter\noexpand\csname\the\macname @@@\endcsname}% \expandafter\xdef\csname\the\macname @@@\endcsname{% - \endgroup + \egroup \noexpand\scanmacro{\macrobody}}% \or % 1 \expandafter\xdef\csname\the\macname\endcsname{% - \begingroup + \bgroup \noexpand\braceorline \expandafter\noexpand\csname\the\macname @@@\endcsname}% \expandafter\xdef\csname\the\macname @@@\endcsname##1{% - \endgroup + \egroup \noexpand\scanmacro{\macrobody}% }% \else % at most 9 @@ -8446,7 +8614,7 @@ % @MACNAME@@@ removes braces surrounding the argument list. % @MACNAME@@@@ scans the macro body with arguments substituted. \expandafter\xdef\csname\the\macname\endcsname{% - \begingroup + \bgroup \noexpand\expandafter % This \expandafter skip any spaces after the \noexpand\macroargctxt % macro before we change the catcode of space. \noexpand\expandafter @@ -8460,7 +8628,7 @@ \expandafter\xdef \expandafter\expandafter \csname\the\macname @@@@\endcsname\paramlist{% - \endgroup\noexpand\scanmacro{\macrobody}}% + \egroup\noexpand\scanmacro{\macrobody}}% \else % 10 or more: \expandafter\xdef\csname\the\macname\endcsname{% \noexpand\getargvals@{\the\macname}{\argl}% @@ -8582,75 +8750,6 @@ \fi \macnamexxx} -% @linemacro - -\parseargdef\linemacro{% - \getargs{#1}% now \macname is the macname and \argl the arglist - \ifx\argl\empty - \paramno=0 - \let\hash\relax - \def\paramlist{\hash 1\endlinemacro}% - \else - \expandafter\linegetparamlist\argl;% - \fi - \begingroup \macrobodyctxt \usembodybackslash - \parselinemacrobody -} - -% Build up \paramlist which will be used as the parameter text for the macro. -% At the end it will be like "#1 #2 #3\endlinemacro". -\def\linegetparamlist#1;{% - \paramno=0\def\paramlist{}% - \let\hash\relax - \linegetparamlistxxx#1,;,% -} -\def\linegetparamlistxxx#1,{% - \if#1;\let\next=\linegetparamlistxxxx - \else \let\next=\linegetparamlistxxx - \advance\paramno by 1 - \expandafter\edef\csname macarg.\eatspaces{#1}\endcsname - {\hash\the\paramno}% - \edef\paramlist{\paramlist\hash\the\paramno\space}% - \fi\next} -\def\linegetparamlistxxxx{% - \expandafter\fixparamlist\paramlist\fixparamlist -} -% Replace final space token -\def\fixparamlist#1 \fixparamlist{% - \def\paramlist{#1\endlinemacro}% -} - -% Read the body of the macro, replacing backslash-surrounded variables -% -{\catcode`\ =\other\long\gdef\parselinemacrobody#1@end linemacro{% -\xdef\macrobody{#1}% -\endgroup -\linemacrodef -}} - -% Make the definition -\def\linemacrodef{% - \let\hash=##% - \expandafter\xdef\csname\the\macname\endcsname{% - \bgroup - \noexpand\parsearg - \expandafter\noexpand\csname\the\macname @@\endcsname - } - \expandafter\xdef\csname\the\macname @@\endcsname##1{% - \egroup - \expandafter\noexpand - \csname\the\macname @@@\endcsname##1\noexpand\endlinemacro - } - \expandafter\expandafter - \expandafter\xdef - \expandafter\expandafter\csname\the\macname @@@\endcsname\paramlist{% - \newlinechar=13 % split \macrobody into lines - \noexpand\scantokens{\macrobody}% - } -} - - - % @alias. % We need some trickery to remove the optional spaces around the equal % sign. Make them active and then expand them all to nothing. @@ -8702,11 +8801,9 @@ } \def\wordTop{Top} -% Until the next @node, @part or @bye command, divert output to a box that -% is not output. -\def\ignorenode{\setbox\dummybox\vbox\bgroup -\def\part{\egroup\part}% -\def\node{\egroup\node}% +% Until the next @node or @bye command, divert output to a box that is not +% output. +\def\ignorenode{\setbox\dummybox\vbox\bgroup\def\node{\egroup\node}% \ignorenodebye } @@ -8971,11 +9068,12 @@ % output the `[mynode]' via the macro below so it can be overridden. \xrefprintnodename\printedrefname % - \ifflagclear{txiomitxrefpg}{% - % We always want a comma - ,% + \expandafter\ifx\csname SETtxiomitxrefpg\endcsname\relax + % But we always want a comma and a space: + ,\space + % % output the `page 3'. - \turnoffactive \putpageref{#1}% + \turnoffactive \putwordpage\tie\refx{#1-pg}% % Add a , if xref followed by a space \if\space\noexpand\tokenafterxref ,% \else\ifx\ \tokenafterxref ,% @TAB @@ -8985,16 +9083,12 @@ \tokenafterxref ,% @NL \else\ifx\tie\tokenafterxref ,% @tie \fi\fi\fi\fi\fi\fi - }{}% + \fi \fi\fi \fi \endlink \endgroup} -% can be overridden in translation files -\def\putpageref#1{% - \space\putwordpage\tie\refx{#1-pg}} - % Output a cross-manual xref to #1. Used just above (twice). % % Only include the text "Section ``foo'' in" if the foo is neither @@ -9406,12 +9500,6 @@ \imagexxx #1,,,,,\finish \fi } - -% Approximate height of a line in the standard text font. -\newdimen\capheight -\setbox0=\vbox{\tenrm H} -\capheight=\ht0 - % % Arguments to @image: % #1 is (mandatory) image filename; we tack on .eps extension. @@ -9424,30 +9512,32 @@ \catcode`\^^M = 5 % in case we're inside an example \normalturnoffactive % allow _ et al. in names \makevalueexpandable + % If the image is by itself, center it. \ifvmode \imagevmodetrue - \medskip + \else \ifx\centersub\centerV + % for @center @image, we need a vbox so we can have our vertical space + \imagevmodetrue + \vbox\bgroup % vbox has better behavior than vtop herev + \fi\fi + % + \ifimagevmode + \nobreak\medskip % Usually we'll have text after the image which will insert % \parskip glue, so insert it here too to equalize the space % above and below. - \vskip\parskip - % - % Place image in a \vtop for a top page margin that is (close to) correct, - % as \topskip glue is relative to the first baseline. - \vtop\bgroup \kern -\capheight \vskip-\parskip + \nobreak\vskip\parskip + \nobreak \fi % - \ifx\centersub\centerV - % For @center @image, enter vertical mode and add vertical space - % Enter an extra \parskip because @center doesn't add space itself. - \vbox\bgroup\vskip\parskip\medskip\vskip\parskip - \else - % Enter horizontal mode so that indentation from an enclosing - % environment such as @quotation is respected. - % However, if we're at the top level, we don't want the - % normal paragraph indentation. - \imageindent - \fi + % Leave vertical mode so that indentation from an enclosing + % environment such as @quotation is respected. + % However, if we're at the top level, we don't want the + % normal paragraph indentation. + % On the other hand, if we are in the case of @center @image, we don't + % want to start a paragraph, which will create a hsize-width box and + % eradicate the centering. + \ifx\centersub\centerV\else \noindent \fi % % Output the image. \ifpdf @@ -9469,13 +9559,9 @@ \fi % \ifimagevmode - \egroup \medskip % space after a standalone image \fi - \ifx\centersub\centerV % @center @image - \medskip - \egroup % close \vbox - \fi + \ifx\centersub\centerV \egroup \fi \endgroup} @@ -9642,8 +9728,8 @@ % \def\caption{\docaption\thiscaption} \def\shortcaption{\docaption\thisshortcaption} -\def\docaption{\checkenv\float \bgroup\scanctxt\docaptionz} -\def\docaptionz#1#2{\egroup \def#1{#2}} +\def\docaption{\checkenv\float \bgroup\scanargctxt\defcaption} +\def\defcaption#1#2{\egroup \def#1{#2}} % The parameter is the control sequence identifying the counter we are % going to use. Create it if it doesn't exist and assign it to \floatno. @@ -9932,10 +10018,12 @@ % For native Unicode handling (XeTeX and LuaTeX) \nativeunicodechardefs \else - % For treating UTF-8 as byte sequences (TeX, eTeX and pdfTeX). - % Since we already invoke \utfeightchardefs at the top level, - % making non-ascii chars active is sufficient. + % For treating UTF-8 as byte sequences (TeX, eTeX and pdfTeX) \setnonasciicharscatcode\active + % since we already invoked \utfeightchardefs at the top level + % (below), do not re-invoke it, otherwise our check for duplicated + % definitions gets triggered. Making non-ascii chars active is + % sufficient. \fi % \else @@ -9960,6 +10048,7 @@ \fi } +% emacs-page % A message to be logged when using a character that isn't available % the default font encoding (OT1). % @@ -9968,6 +10057,12 @@ % Take account of \c (plain) vs. \, (Texinfo) difference. \def\cedilla#1{\ifx\c\ptexc\c{#1}\else\,{#1}\fi} +% First, make active non-ASCII characters in order for them to be +% correctly categorized when TeX reads the replacement text of +% macros containing the character definitions. +\setnonasciicharscatcode\active +% + \def\gdefchar#1#2{% \gdef#1{% \ifpassthroughchars @@ -9977,14 +10072,8 @@ \fi }} -\begingroup - -% Make non-ASCII characters active for defining the character definition -% macros. -\setnonasciicharscatcode\active - % Latin1 (ISO-8859-1) character definitions. -\gdef\latonechardefs{% +\def\latonechardefs{% \gdefchar^^a0{\tie} \gdefchar^^a1{\exclamdown} \gdefchar^^a2{{\tcfont \char162}} % cent @@ -10089,7 +10178,7 @@ } % Latin9 (ISO-8859-15) encoding character definitions. -\gdef\latninechardefs{% +\def\latninechardefs{% % Encoding is almost identical to Latin1. \latonechardefs % @@ -10104,7 +10193,7 @@ } % Latin2 (ISO-8859-2) character definitions. -\gdef\lattwochardefs{% +\def\lattwochardefs{% \gdefchar^^a0{\tie} \gdefchar^^a1{\ogonek{A}} \gdefchar^^a2{\u{}} @@ -10122,7 +10211,7 @@ \gdefchar^^ae{\v Z} \gdefchar^^af{\dotaccent Z} % - \gdefchar^^b0{\textdegree} + \gdefchar^^b0{\textdegree{}} \gdefchar^^b1{\ogonek{a}} \gdefchar^^b2{\ogonek{ }} \gdefchar^^b3{\l} @@ -10208,8 +10297,6 @@ \gdefchar^^ff{\dotaccent{}} } -\endgroup % active chars - % UTF-8 character definitions. % % This code to support UTF-8 is based on LaTeX's utf8.def, with some @@ -10361,9 +10448,9 @@ % Given the value in \countUTFz as a Unicode code point, set \UTFviiiTmp % to the corresponding UTF-8 sequence. \gdef\parseXMLCharref{% - \ifnum\countUTFz < "20\relax + \ifnum\countUTFz < "A0\relax \errhelp = \EMsimple - \errmessage{Cannot define Unicode char value < 0020}% + \errmessage{Cannot define Unicode char value < 00A0}% \else\ifnum\countUTFz < "800\relax \parseUTFviiiA,% \parseUTFviiiB C\UTFviiiTwoOctetsName.,% @@ -10433,103 +10520,6 @@ % least make most of the characters not bomb out. % \def\unicodechardefs{% - \DeclareUnicodeCharacter{0020}{ } % space - \DeclareUnicodeCharacter{0021}{\char"21 }% % space to terminate number - \DeclareUnicodeCharacter{0022}{\char"22 }% - \DeclareUnicodeCharacter{0023}{\char"23 }% - \DeclareUnicodeCharacter{0024}{\char"24 }% - \DeclareUnicodeCharacter{0025}{\char"25 }% - \DeclareUnicodeCharacter{0026}{\char"26 }% - \DeclareUnicodeCharacter{0027}{\char"27 }% - \DeclareUnicodeCharacter{0028}{\char"28 }% - \DeclareUnicodeCharacter{0029}{\char"29 }% - \DeclareUnicodeCharacter{002A}{\char"2A }% - \DeclareUnicodeCharacter{002B}{\char"2B }% - \DeclareUnicodeCharacter{002C}{\char"2C }% - \DeclareUnicodeCharacter{002D}{\char"2D }% - \DeclareUnicodeCharacter{002E}{\char"2E }% - \DeclareUnicodeCharacter{002F}{\char"2F }% - \DeclareUnicodeCharacter{0030}{0}% - \DeclareUnicodeCharacter{0031}{1}% - \DeclareUnicodeCharacter{0032}{2}% - \DeclareUnicodeCharacter{0033}{3}% - \DeclareUnicodeCharacter{0034}{4}% - \DeclareUnicodeCharacter{0035}{5}% - \DeclareUnicodeCharacter{0036}{6}% - \DeclareUnicodeCharacter{0037}{7}% - \DeclareUnicodeCharacter{0038}{8}% - \DeclareUnicodeCharacter{0039}{9}% - \DeclareUnicodeCharacter{003A}{\char"3A }% - \DeclareUnicodeCharacter{003B}{\char"3B }% - \DeclareUnicodeCharacter{003C}{\char"3C }% - \DeclareUnicodeCharacter{003D}{\char"3D }% - \DeclareUnicodeCharacter{003E}{\char"3E }% - \DeclareUnicodeCharacter{003F}{\char"3F }% - \DeclareUnicodeCharacter{0040}{\char"40 }% - \DeclareUnicodeCharacter{0041}{A}% - \DeclareUnicodeCharacter{0042}{B}% - \DeclareUnicodeCharacter{0043}{C}% - \DeclareUnicodeCharacter{0044}{D}% - \DeclareUnicodeCharacter{0045}{E}% - \DeclareUnicodeCharacter{0046}{F}% - \DeclareUnicodeCharacter{0047}{G}% - \DeclareUnicodeCharacter{0048}{H}% - \DeclareUnicodeCharacter{0049}{I}% - \DeclareUnicodeCharacter{004A}{J}% - \DeclareUnicodeCharacter{004B}{K}% - \DeclareUnicodeCharacter{004C}{L}% - \DeclareUnicodeCharacter{004D}{M}% - \DeclareUnicodeCharacter{004E}{N}% - \DeclareUnicodeCharacter{004F}{O}% - \DeclareUnicodeCharacter{0050}{P}% - \DeclareUnicodeCharacter{0051}{Q}% - \DeclareUnicodeCharacter{0052}{R}% - \DeclareUnicodeCharacter{0053}{S}% - \DeclareUnicodeCharacter{0054}{T}% - \DeclareUnicodeCharacter{0055}{U}% - \DeclareUnicodeCharacter{0056}{V}% - \DeclareUnicodeCharacter{0057}{W}% - \DeclareUnicodeCharacter{0058}{X}% - \DeclareUnicodeCharacter{0059}{Y}% - \DeclareUnicodeCharacter{005A}{Z}% - \DeclareUnicodeCharacter{005B}{\char"5B }% - \DeclareUnicodeCharacter{005C}{\char"5C }% - \DeclareUnicodeCharacter{005D}{\char"5D }% - \DeclareUnicodeCharacter{005E}{\char"5E }% - \DeclareUnicodeCharacter{005F}{\char"5F }% - \DeclareUnicodeCharacter{0060}{\char"60 }% - \DeclareUnicodeCharacter{0061}{a}% - \DeclareUnicodeCharacter{0062}{b}% - \DeclareUnicodeCharacter{0063}{c}% - \DeclareUnicodeCharacter{0064}{d}% - \DeclareUnicodeCharacter{0065}{e}% - \DeclareUnicodeCharacter{0066}{f}% - \DeclareUnicodeCharacter{0067}{g}% - \DeclareUnicodeCharacter{0068}{h}% - \DeclareUnicodeCharacter{0069}{i}% - \DeclareUnicodeCharacter{006A}{j}% - \DeclareUnicodeCharacter{006B}{k}% - \DeclareUnicodeCharacter{006C}{l}% - \DeclareUnicodeCharacter{006D}{m}% - \DeclareUnicodeCharacter{006E}{n}% - \DeclareUnicodeCharacter{006F}{o}% - \DeclareUnicodeCharacter{0070}{p}% - \DeclareUnicodeCharacter{0071}{q}% - \DeclareUnicodeCharacter{0072}{r}% - \DeclareUnicodeCharacter{0073}{s}% - \DeclareUnicodeCharacter{0074}{t}% - \DeclareUnicodeCharacter{0075}{u}% - \DeclareUnicodeCharacter{0076}{v}% - \DeclareUnicodeCharacter{0077}{w}% - \DeclareUnicodeCharacter{0078}{x}% - \DeclareUnicodeCharacter{0079}{y}% - \DeclareUnicodeCharacter{007A}{z}% - \DeclareUnicodeCharacter{007B}{\char"7B }% - \DeclareUnicodeCharacter{007C}{\char"7C }% - \DeclareUnicodeCharacter{007D}{\char"7D }% - \DeclareUnicodeCharacter{007E}{\char"7E }% - % \DeclareUnicodeCharacter{007F}{} % DEL - % \DeclareUnicodeCharacter{00A0}{\tie}% \DeclareUnicodeCharacter{00A1}{\exclamdown}% \DeclareUnicodeCharacter{00A2}{{\tcfont \char162}}% 0242=cent @@ -10547,7 +10537,7 @@ \DeclareUnicodeCharacter{00AE}{\registeredsymbol{}}% \DeclareUnicodeCharacter{00AF}{\={ }}% % - \DeclareUnicodeCharacter{00B0}{\textdegree}% + \DeclareUnicodeCharacter{00B0}{\ringaccent{ }}% \DeclareUnicodeCharacter{00B1}{\ensuremath\pm}% \DeclareUnicodeCharacter{00B2}{$^2$}% \DeclareUnicodeCharacter{00B3}{$^3$}% @@ -11029,9 +11019,6 @@ \DeclareUnicodeCharacter{1EF8}{\~Y}% \DeclareUnicodeCharacter{1EF9}{\~y}% % - % Exotic spaces - \DeclareUnicodeCharacter{2007}{\hphantom{0}}% - % % Punctuation \DeclareUnicodeCharacter{2013}{--}% \DeclareUnicodeCharacter{2014}{---}% @@ -11051,7 +11038,7 @@ % \DeclareUnicodeCharacter{20AC}{\euro{}}% % - \DeclareUnicodeCharacter{2192}{\arrow}% + \DeclareUnicodeCharacter{2192}{\expansion{}}% \DeclareUnicodeCharacter{21D2}{\result{}}% % % Mathematical symbols @@ -11214,26 +11201,24 @@ % provide a definition macro to replace/pass-through a Unicode character % \def\DeclareUnicodeCharacterNative#1#2{% - \ifnum"#1>"7F % only make non-ASCII chars active - \catcode"#1=\active - \def\dodeclareunicodecharacternative##1##2##3{% - \begingroup - \uccode`\~="##2\relax - \uppercase{\gdef~}{% - \ifpassthroughchars - ##1% - \else - ##3% - \fi - } - \endgroup - } + \catcode"#1=\active + \def\dodeclareunicodecharacternative##1##2##3{% \begingroup - \uccode`\.="#1\relax - \uppercase{\def\UTFNativeTmp{.}}% - \expandafter\dodeclareunicodecharacternative\UTFNativeTmp{#1}{#2}% + \uccode`\~="##2\relax + \uppercase{\gdef~}{% + \ifpassthroughchars + ##1% + \else + ##3% + \fi + } \endgroup - \fi + } + \begingroup + \uccode`\.="#1\relax + \uppercase{\def\UTFNativeTmp{.}}% + \expandafter\dodeclareunicodecharacternative\UTFNativeTmp{#1}{#2}% + \endgroup } % Native Unicode handling (XeTeX and LuaTeX) character replacing definition. @@ -11262,14 +11247,14 @@ \relax } -% Define all Unicode characters we know about +% Define all Unicode characters we know about. This makes UTF-8 the default +% input encoding and allows @U to work. \iftxinativeunicodecapable \nativeunicodechardefsatu \else \utfeightchardefs \fi - \message{formatting,} \newdimen\defaultparindent \defaultparindent = 15pt @@ -11316,9 +11301,13 @@ % \vsize = #1\relax \advance\vsize by \topskip + \outervsize = \vsize + \advance\outervsize by 2\topandbottommargin \txipageheight = \vsize % \hsize = #2\relax + \outerhsize = \hsize + \advance\outerhsize by 0.5in \txipagewidth = \hsize % \normaloffset = #4\relax @@ -11375,6 +11364,23 @@ \defbodyindent = .5cm }} +% Use @smallerbook to reset parameters for 6x9 trim size. +% (Just testing, parameters still in flux.) +\def\smallerbook{{\globaldefs = 1 + \parskip = 1.5pt plus 1pt + \textleading = 12pt + % + \internalpagesizes{7.4in}{4.8in}% + {-.2in}{-.4in}% + {0pt}{14pt}% + {9in}{6in}% + % + \lispnarrowing = 0.25in + \tolerance = 700 + \contentsrightmargin = 0pt + \defbodyindent = .4cm +}} + % Use @afourpaper to print on European A4 paper. \def\afourpaper{{\globaldefs = 1 \parskip = 3pt plus 2pt minus 1pt @@ -11408,7 +11414,7 @@ \textleading = 12.5pt % \internalpagesizes{160mm}{120mm}% - {\voffset}{-11.4mm}% + {\voffset}{\hoffset}% {\bindingoffset}{8pt}% {210mm}{148mm}% % @@ -11487,138 +11493,9 @@ \hfuzz = 1pt -\message{microtype,} - -% protrusion, from Thanh's protcode.tex. -\def\mtsetprotcode#1{% - \rpcode#1`\!=200 \rpcode#1`\,=700 \rpcode#1`\-=700 \rpcode#1`\.=700 - \rpcode#1`\;=500 \rpcode#1`\:=500 \rpcode#1`\?=200 - \rpcode#1`\'=700 - \rpcode#1 34=500 % '' - \rpcode#1 123=300 % -- - \rpcode#1 124=200 % --- - \rpcode#1`\)=50 \rpcode#1`\A=50 \rpcode#1`\F=50 \rpcode#1`\K=50 - \rpcode#1`\L=50 \rpcode#1`\T=50 \rpcode#1`\V=50 \rpcode#1`\W=50 - \rpcode#1`\X=50 \rpcode#1`\Y=50 \rpcode#1`\k=50 \rpcode#1`\r=50 - \rpcode#1`\t=50 \rpcode#1`\v=50 \rpcode#1`\w=50 \rpcode#1`\x=50 - \rpcode#1`\y=50 - % - \lpcode#1`\`=700 - \lpcode#1 92=500 % `` - \lpcode#1`\(=50 \lpcode#1`\A=50 \lpcode#1`\J=50 \lpcode#1`\T=50 - \lpcode#1`\V=50 \lpcode#1`\W=50 \lpcode#1`\X=50 \lpcode#1`\Y=50 - \lpcode#1`\v=50 \lpcode#1`\w=50 \lpcode#1`\x=50 \lpcode#1`\y=0 - % - \mtadjustprotcode#1\relax -} - -\newcount\countC -\def\mtadjustprotcode#1{% - \countC=0 - \loop - \ifcase\lpcode#1\countC\else - \mtadjustcp\lpcode#1\countC - \fi - \ifcase\rpcode#1\countC\else - \mtadjustcp\rpcode#1\countC - \fi - \advance\countC 1 - \ifnum\countC < 256 \repeat -} - -\newcount\countB -\def\mtadjustcp#1#2#3{% - \setbox\boxA=\hbox{% - \ifx#2\font\else#2\fi - \char#3}% - \countB=\wd\boxA - \multiply\countB #1#2#3\relax - \divide\countB \fontdimen6 #2\relax - #1#2#3=\countB\relax -} - -\ifx\XeTeXrevision\thisisundefined - \ifx\luatexversion\thisisundefined - \ifpdf % pdfTeX - \mtsetprotcode\textrm - \def\mtfontexpand#1{\pdffontexpand#1 20 20 1 autoexpand\relax} - \else % TeX - \def\mtfontexpand#1{} - \fi - \else % LuaTeX - \mtsetprotcode\textrm - \def\mtfontexpand#1{\expandglyphsinfont#1 20 20 1\relax} - \fi -\else % XeTeX - \mtsetprotcode\textrm - \def\mtfontexpand#1{} -\fi - - -\newif\ifmicrotype - -\def\microtypeON{% - \microtypetrue - % - \ifx\XeTeXrevision\thisisundefined - \ifx\luatexversion\thisisundefined - \ifpdf % pdfTeX - \pdfadjustspacing=2 - \pdfprotrudechars=2 - \fi - \else % LuaTeX - \adjustspacing=2 - \protrudechars=2 - \fi - \else % XeTeX - \XeTeXprotrudechars=2 - \fi - % - \mtfontexpand\textrm - \mtfontexpand\textsl - \mtfontexpand\textbf -} - -\def\microtypeOFF{% - \microtypefalse - % - \ifx\XeTeXrevision\thisisundefined - \ifx\luatexversion\thisisundefined - \ifpdf % pdfTeX - \pdfadjustspacing=0 - \pdfprotrudechars=0 - \fi - \else % LuaTeX - \adjustspacing=0 - \protrudechars=0 - \fi - \else % XeTeX - \XeTeXprotrudechars=0 - \fi -} - -\microtypeOFF - -\parseargdef\microtype{% - \def\txiarg{#1}% - \ifx\txiarg\onword - \microtypeON - \else\ifx\txiarg\offword - \microtypeOFF - \else - \errhelp = \EMsimple - \errmessage{Unknown @microtype option `\txiarg', must be on|off}% - \fi\fi -} - - \message{and turning on texinfo input format.} -% Make UTF-8 the default encoding. -\documentencodingzzz{UTF-8} - \def^^L{\par} % remove \outer, so ^L can appear in an @comment -\catcode`\^^K = 10 % treat vertical tab as whitespace % DEL is a comment character, in case @c does not suffice. \catcode`\^^? = 14 @@ -11634,6 +11511,23 @@ \catcode`\|=\other \def\normalverticalbar{|} \catcode`\~=\other \def\normaltilde{~} +% This macro is used to make a character print one way in \tt +% (where it can probably be output as-is), and another way in other fonts, +% where something hairier probably needs to be done. +% +% #1 is what to print if we are indeed using \tt; #2 is what to print +% otherwise. Since all the Computer Modern typewriter fonts have zero +% interword stretch (and shrink), and it is reasonable to expect all +% typewriter fonts to have this, we can check that font parameter. +% +\def\ifusingtt#1#2{\ifdim \fontdimen3\font=0pt #1\else #2\fi} + +% Same as above, but check for italic font. Actually this also catches +% non-italic slanted fonts since it is impossible to distinguish them from +% italic fonts. But since this is only used by $ and it uses \sl anyway +% this is not a problem. +\def\ifusingit#1#2{\ifdim \fontdimen1\font>0pt #1\else #2\fi} + % Set catcodes for Texinfo file % Active characters for printing the wanted glyph. @@ -11679,32 +11573,23 @@ % Used sometimes to turn off (effectively) the active characters even after % parsing them. \def\turnoffactive{% - \passthroughcharstrue - \let-=\normaldash - \let"=\normaldoublequote - \let$=\normaldollar %$ font-lock fix - \let+=\normalplus - \let<=\normalless - \let>=\normalgreater - \let^=\normalcaret - \let_=\normalunderscore - \let|=\normalverticalbar - \let~=\normaltilde + \normalturnoffactive \otherbackslash - \setregularquotes - \unsepspaces } -% If a .fmt file is being used, characters that might appear in a file -% name cannot be active until we have parsed the command line. -% So turn them off again, and have \loadconf turn them back on. -\catcode`+=\other \catcode`\_=\other - +\catcode`\@=0 % \backslashcurfont outputs one backslash character in current font, % as in \char`\\. \global\chardef\backslashcurfont=`\\ +% \realbackslash is an actual character `\' with catcode other. +{\catcode`\\=\other @gdef@realbackslash{\}} + +% In Texinfo, backslash is an active character; it prints the backslash +% in fixed width font. +\catcode`\\=\active % @ for escape char from now on. + % Print a typewriter backslash. For math mode, we can't simply use % \backslashcurfont: the story here is that in math mode, the \char % of \backslashcurfont ends up printing the roman \ from the math symbol @@ -11714,120 +11599,109 @@ % ignored family value; char position "5C). We can't use " for the % usual hex value because it has already been made active. -\def\ttbackslash{{\tt \ifmmode \mathchar29020 \else \backslashcurfont \fi}} -\let\backslashchar = \ttbackslash % \backslashchar{} is for user documents. +@def@ttbackslash{{@tt @ifmmode @mathchar29020 @else @backslashcurfont @fi}} +@let@backslashchar = @ttbackslash % @backslashchar{} is for user documents. -% These are made active for url-breaking, so need -% active definitions as the normal characters. -\def\normaldot{.} -\def\normalquest{?} -\def\normalslash{/} - -% \newlinesloadsconf - call \loadconf as soon as possible in the -% file, e.g. at the first newline. -% -{\catcode`\^=7 -\catcode`\^^M=13 -\gdef\newlineloadsconf{% - \catcode`\^^M=13 % - \newlineloadsconfzz% -} -\gdef\newlineloadsconfzz#1^^M{% - \def\c{\loadconf\c}% - % Definition for the first newline read in the file - \def ^^M{\loadconf}% +% \otherbackslash defines an active \ to be a literal `\' character with +% catcode other. +@gdef@otherbackslash{@let\=@realbackslash} + +% Same as @turnoffactive except outputs \ as {\tt\char`\\} instead of +% the literal character `\'. +% +{@catcode`- = @active + @gdef@normalturnoffactive{% + @passthroughcharstrue + @let-=@normaldash + @let"=@normaldoublequote + @let$=@normaldollar %$ font-lock fix + @let+=@normalplus + @let<=@normalless + @let>=@normalgreater + @let^=@normalcaret + @let_=@normalunderscore + @let|=@normalverticalbar + @let~=@normaltilde + @let\=@ttbackslash + @setregularquotes + @unsepspaces + } +} + +% If a .fmt file is being used, characters that might appear in a file +% name cannot be active until we have parsed the command line. +% So turn them off again, and have @fixbackslash turn them back on. +@catcode`+=@other @catcode`@_=@other + +% \enablebackslashhack - allow file to begin `\input texinfo' +% +% If a .fmt file is being used, we don't want the `\input texinfo' to show up. +% That is what \eatinput is for; after that, the `\' should revert to printing +% a backslash. +% If the file did not have a `\input texinfo', then it is turned off after +% the first line; otherwise the first `\' in the file would cause an error. +% This is used on the very last line of this file, texinfo.tex. +% We also use @c to call @fixbackslash, in case ends of lines are hidden. +{ +@catcode`@^=7 +@catcode`@^^M=13@gdef@enablebackslashhack{% + @global@let\ = @eatinput% + @catcode`@^^M=13% + @def@c{@fixbackslash@c}% + % Definition for the newline at the end of this file. + @def ^^M{@let^^M@secondlinenl}% + % Definition for a newline in the main Texinfo file. + @gdef @secondlinenl{@fixbackslash}% % In case the first line has a whole-line command on it - \let\originalparsearg\parsearg% - \def\parsearg{\loadconf\originalparsearg}% + @let@originalparsearg@parsearg + @def@parsearg{@fixbackslash@originalparsearg} }} +{@catcode`@^=7 @catcode`@^^M=13% +@gdef@eatinput input texinfo#1^^M{@fixbackslash}} % Emergency active definition of newline, in case an active newline token % appears by mistake. -{\catcode`\^=7 \catcode13=13% -\gdef\enableemergencynewline{% - \gdef^^M{% - \par% - %\par% +{@catcode`@^=7 @catcode13=13% +@gdef@enableemergencynewline{% + @gdef^^M{% + @par% + %@par% }}} -% \loadconf gets called at the beginning of every Texinfo file. -% If texinfo.cnf is present on the system, read it. Useful for site-wide -% @afourpaper, etc. Not opening texinfo.cnf directly in texinfo.tex -% makes it possible to make a format file for Texinfo. -% -\gdef\loadconf{% - \relax % Terminate the filename if running as "tex '&texinfo' FILE.texi". - % - % Turn off the definitions that trigger \loadconf - \everyjobreset - \catcode13=5 % regular end of line - \enableemergencynewline - \let\c=\comment - \let\parsearg\originalparsearg - % +@gdef@fixbackslash{% + @ifx\@eatinput @let\ = @ttbackslash @fi + @catcode13=5 % regular end of line + @enableemergencynewline + @let@c=@comment + @let@parsearg@originalparsearg % Also turn back on active characters that might appear in the input % file name, in case not using a pre-dumped format. - \catcode`+=\active - \catcode`\_=\active + @catcode`+=@active + @catcode`@_=@active % - \openin 1 texinfo.cnf - \ifeof 1 \else \input texinfo.cnf \fi - \closein 1 + % If texinfo.cnf is present on the system, read it. + % Useful for site-wide @afourpaper, etc. This macro, @fixbackslash, gets + % called at the beginning of every Texinfo file. Not opening texinfo.cnf + % directly in this file, texinfo.tex, makes it possible to make a format + % file for Texinfo. + % + @openin 1 texinfo.cnf + @ifeof 1 @else @input texinfo.cnf @fi + @closein 1 } -% Redefine some control sequences to be controlled by the \ifdummies -% and \ifindexnofonts switches. Do this at the end so that the control -% sequences are all defined. -\definedummies - - - - -\catcode`\@=0 - -% \realbackslash is an actual character `\' with catcode other. -{\catcode`\\=\other @gdef@realbackslash{\}} - -% In Texinfo, backslash is an active character; it prints the backslash -% in fixed width font. -\catcode`\\=\active % @ for escape char from now on. - -@let\ = @ttbackslash - -% If in a .fmt file, print the version number. -% \eatinput stops the `\input texinfo' from showing up. -% After that, `\' should revert to printing a backslash. -% Turn on active characters that we couldn't do earlier because -% they might have appeared in the input file name. -% -@everyjob{@message{[Texinfo version @texinfoversion]}% - @global@let\ = @eatinput - @catcode`+=@active @catcode`@_=@active} - -{@catcode`@^=7 @catcode`@^^M=13% -@gdef@eatinput input texinfo#1^^M{@loadconf}} - -@def@everyjobreset{@ifx\@eatinput @let\ = @ttbackslash @fi} - -% \otherbackslash defines an active \ to be a literal `\' character with -% catcode other. -@gdef@otherbackslash{@let\=@realbackslash} - -% Same as @turnoffactive except outputs \ as {\tt\char`\\} instead of -% the literal character `\'. -% -{@catcode`- = @active - @gdef@normalturnoffactive{% - @turnoffactive - @let\=@ttbackslash - } -} % Say @foo, not \foo, in error messages. @escapechar = `@@ +% These (along with & and #) are made active for url-breaking, so need +% active definitions as the normal characters. +@def@normaldot{.} +@def@normalquest{?} +@def@normalslash{/} + % These look ok in all fonts, so just make them not special. % @hashchar{} gets its own user-level command, because of #line. @catcode`@& = @other @def@normalamp{&} @@ -11842,11 +11716,16 @@ @c Do this last of all since we use ` in the previous @catcode assignments. @catcode`@'=@active @catcode`@`=@active +@setregularquotes @c Local variables: -@c eval: (add-hook 'before-save-hook 'time-stamp nil t) -@c time-stamp-pattern: "texinfoversion{%Y-%02m-%02d.%02H}" -@c page-delimiter: "^\\\\message" +@c eval: (add-hook 'before-save-hook 'time-stamp) +@c page-delimiter: "^\\\\message\\|emacs-page" +@c time-stamp-start: "def\\\\texinfoversion{" +@c time-stamp-format: "%:y-%02m-%02d.%02H" +@c time-stamp-end: "}" @c End: -@newlineloadsconf +@c vim:sw=2: + +@enablebackslashhack diff -Nru mmv-2.5/config.h.in mmv-2.5.1/config.h.in --- mmv-2.5/config.h.in 2023-07-20 19:40:53.000000000 +0000 +++ mmv-2.5.1/config.h.in 2023-08-08 11:08:18.000000000 +0000 @@ -1,9 +1,5 @@ /* config.h.in. Generated from configure.ac by autoheader. */ -/* Witness that has been included. */ -#define _GL_CONFIG_H_INCLUDED 1 - - /* Define if building universal (internal helper macro) */ #undef AC_APPLE_UNIVERSAL_BUILD @@ -78,6 +74,10 @@ #undef GNULIB_FSCANF /* Define to a C preprocessor expression that evaluates to 1 or 0, depending + whether the gnulib module malloc-posix shall be considered present. */ +#undef GNULIB_MALLOC_POSIX + +/* Define to a C preprocessor expression that evaluates to 1 or 0, depending whether the gnulib module msvc-nothrow shall be considered present. */ #undef GNULIB_MSVC_NOTHROW @@ -86,8 +86,8 @@ #undef GNULIB_PRINTF_ATTRIBUTE_FLAVOR_GNU /* Define to a C preprocessor expression that evaluates to 1 or 0, depending - whether the gnulib module reallocarray shall be considered present. */ -#undef GNULIB_REALLOCARRAY + whether the gnulib module realloc-posix shall be considered present. */ +#undef GNULIB_REALLOC_POSIX /* Define to a C preprocessor expression that evaluates to 1 or 0, depending whether the gnulib module scanf shall be considered present. */ @@ -97,12 +97,6 @@ whether the gnulib module strerror shall be considered present. */ #undef GNULIB_STRERROR -/* Define to 1 when the gnulib module calloc-gnu should be tested. */ -#undef GNULIB_TEST_CALLOC_GNU - -/* Define to 1 when the gnulib module calloc-posix should be tested. */ -#undef GNULIB_TEST_CALLOC_POSIX - /* Define to 1 when the gnulib module canonicalize_file_name should be tested. */ #undef GNULIB_TEST_CANONICALIZE_FILE_NAME @@ -122,27 +116,9 @@ /* Define to 1 when the gnulib module fcntl should be tested. */ #undef GNULIB_TEST_FCNTL -/* Define to 1 when the gnulib module fgetc should be tested. */ -#undef GNULIB_TEST_FGETC - -/* Define to 1 when the gnulib module fgets should be tested. */ -#undef GNULIB_TEST_FGETS - -/* Define to 1 when the gnulib module fprintf should be tested. */ -#undef GNULIB_TEST_FPRINTF - /* Define to 1 when the gnulib module fprintf-posix should be tested. */ #undef GNULIB_TEST_FPRINTF_POSIX -/* Define to 1 when the gnulib module fputc should be tested. */ -#undef GNULIB_TEST_FPUTC - -/* Define to 1 when the gnulib module fputs should be tested. */ -#undef GNULIB_TEST_FPUTS - -/* Define to 1 when the gnulib module fread should be tested. */ -#undef GNULIB_TEST_FREAD - /* Define to 1 when the gnulib module free-posix should be tested. */ #undef GNULIB_TEST_FREE_POSIX @@ -152,30 +128,15 @@ /* Define to 1 when the gnulib module frexpl should be tested. */ #undef GNULIB_TEST_FREXPL -/* Define to 1 when the gnulib module fscanf should be tested. */ -#undef GNULIB_TEST_FSCANF - /* Define to 1 when the gnulib module fstat should be tested. */ #undef GNULIB_TEST_FSTAT -/* Define to 1 when the gnulib module fwrite should be tested. */ -#undef GNULIB_TEST_FWRITE - -/* Define to 1 when the gnulib module getc should be tested. */ -#undef GNULIB_TEST_GETC - -/* Define to 1 when the gnulib module getchar should be tested. */ -#undef GNULIB_TEST_GETCHAR - /* Define to 1 when the gnulib module getdtablesize should be tested. */ #undef GNULIB_TEST_GETDTABLESIZE /* Define to 1 when the gnulib module getopt-posix should be tested. */ #undef GNULIB_TEST_GETOPT_POSIX -/* Define to 1 when the gnulib module getprogname should be tested. */ -#undef GNULIB_TEST_GETPROGNAME - /* Define to 1 when the gnulib module link should be tested. */ #undef GNULIB_TEST_LINK @@ -185,9 +146,6 @@ /* Define to 1 when the gnulib module lstat should be tested. */ #undef GNULIB_TEST_LSTAT -/* Define to 1 when the gnulib module malloc-gnu should be tested. */ -#undef GNULIB_TEST_MALLOC_GNU - /* Define to 1 when the gnulib module malloc-posix should be tested. */ #undef GNULIB_TEST_MALLOC_POSIX @@ -200,18 +158,6 @@ /* Define to 1 when the gnulib module open should be tested. */ #undef GNULIB_TEST_OPEN -/* Define to 1 when the gnulib module printf should be tested. */ -#undef GNULIB_TEST_PRINTF - -/* Define to 1 when the gnulib module putc should be tested. */ -#undef GNULIB_TEST_PUTC - -/* Define to 1 when the gnulib module putchar should be tested. */ -#undef GNULIB_TEST_PUTCHAR - -/* Define to 1 when the gnulib module puts should be tested. */ -#undef GNULIB_TEST_PUTS - /* Define to 1 when the gnulib module raise should be tested. */ #undef GNULIB_TEST_RAISE @@ -224,12 +170,6 @@ /* Define to 1 when the gnulib module readlink should be tested. */ #undef GNULIB_TEST_READLINK -/* Define to 1 when the gnulib module reallocarray should be tested. */ -#undef GNULIB_TEST_REALLOCARRAY - -/* Define to 1 when the gnulib module realloc-gnu should be tested. */ -#undef GNULIB_TEST_REALLOC_GNU - /* Define to 1 when the gnulib module realloc-posix should be tested. */ #undef GNULIB_TEST_REALLOC_POSIX @@ -242,9 +182,6 @@ /* Define to 1 when the gnulib module rmdir should be tested. */ #undef GNULIB_TEST_RMDIR -/* Define to 1 when the gnulib module scanf should be tested. */ -#undef GNULIB_TEST_SCANF - /* Define to 1 when the gnulib module signbit should be tested. */ #undef GNULIB_TEST_SIGNBIT @@ -266,12 +203,6 @@ /* Define to 1 when the gnulib module unlink should be tested. */ #undef GNULIB_TEST_UNLINK -/* Define to 1 when the gnulib module vfprintf should be tested. */ -#undef GNULIB_TEST_VFPRINTF - -/* Define to 1 when the gnulib module vprintf should be tested. */ -#undef GNULIB_TEST_VPRINTF - /* Define to 1 when the gnulib module write should be tested. */ #undef GNULIB_TEST_WRITE @@ -311,18 +242,6 @@ /* Define to 1 if you have the header file. */ #undef HAVE_CRTDEFS_H -/* Define to 1 if the alignas and alignof keywords work. */ -#undef HAVE_C_ALIGNASOF - -/* Define to 1 if bool, true and false work as per C2023. */ -#undef HAVE_C_BOOL - -/* Define to 1 if the static_assert keyword works. */ -#undef HAVE_C_STATIC_ASSERT - -/* Define to 1 if C supports variable-length arrays. */ -#undef HAVE_C_VARARRAYS - /* Define to 1 if you have the declaration of `alarm', and to 0 if you don't. */ #undef HAVE_DECL_ALARM @@ -363,10 +282,6 @@ don't. */ #undef HAVE_DECL_GETDTABLESIZE -/* Define to 1 if you have the declaration of `getw', and to 0 if you don't. - */ -#undef HAVE_DECL_GETW - /* Define to 1 if you have the declaration of `program_invocation_name', and to 0 if you don't. */ #undef HAVE_DECL_PROGRAM_INVOCATION_NAME @@ -375,10 +290,6 @@ and to 0 if you don't. */ #undef HAVE_DECL_PROGRAM_INVOCATION_SHORT_NAME -/* Define to 1 if you have the declaration of `putw', and to 0 if you don't. - */ -#undef HAVE_DECL_PUTW - /* Define to 1 if you have the declaration of `strdup', and to 0 if you don't. */ #undef HAVE_DECL_STRDUP @@ -399,12 +310,6 @@ */ #undef HAVE_DECL___ARGV -/* Define to 1 if you have the `error' function. */ -#undef HAVE_ERROR - -/* Define to 1 if you have the header file. */ -#undef HAVE_ERROR_H - /* Define to 1 if you have the `faccessat' function. */ #undef HAVE_FACCESSAT @@ -460,9 +365,6 @@ /* Define if the isnan(long double) function is available in libc. */ #undef HAVE_ISNANL_IN_LIBC -/* Define if you have and nl_langinfo(CODESET). */ -#undef HAVE_LANGINFO_CODESET - /* Define if the ldexpl function is available in libc. */ #undef HAVE_LDEXPL_IN_LIBC @@ -481,7 +383,7 @@ /* Define to 1 if you have the `lstat' function. */ #undef HAVE_LSTAT -/* Define if malloc, realloc, and calloc set errno on allocation failure. */ +/* Define if the 'malloc' function is POSIX compliant. */ #undef HAVE_MALLOC_POSIX /* Define to 1 if mmap()'s MAP_ANONYMOUS flag is available after including @@ -491,6 +393,9 @@ /* Define to 1 if you have the header file. */ #undef HAVE_MATH_H +/* Define to 1 if you have the `mbrtowc' function. */ +#undef HAVE_MBRTOWC + /* Define to 1 if you have the `mempcpy' function. */ #undef HAVE_MEMPCPY @@ -522,8 +427,8 @@ /* Define to 1 if you have the `readlink' function. */ #undef HAVE_READLINK -/* Define to 1 if you have the `reallocarray' function. */ -#undef HAVE_REALLOCARRAY +/* Define if the 'realloc' function is POSIX compliant. */ +#undef HAVE_REALLOC_POSIX /* Define to 1 if you have the `realpath' function. */ #undef HAVE_REALPATH @@ -561,12 +466,6 @@ terminated. */ #undef HAVE_SNPRINTF_TRUNCATION_C99 -/* Define to 1 if you have the header file. */ -#undef HAVE_STDBOOL_H - -/* Define to 1 if you have the header file. */ -#undef HAVE_STDCKDINT_H - /* Define to 1 if you have the header file. */ #undef HAVE_STDINT_H @@ -667,6 +566,9 @@ /* Define to 1 if you have the `wcslen' function. */ #undef HAVE_WCSLEN +/* Define to 1 if you have the `wcsnlen' function. */ +#undef HAVE_WCSNLEN + /* Define to 1 if you have the header file. */ #undef HAVE_WINSOCK2_H @@ -679,132 +581,15 @@ /* Define to 1 if O_NOFOLLOW works. */ #undef HAVE_WORKING_O_NOFOLLOW +/* Define to 1 if the system has the type `_Bool'. */ +#undef HAVE__BOOL + /* Define to 1 if you have the `_set_invalid_parameter_handler' function. */ #undef HAVE__SET_INVALID_PARAMETER_HANDLER -/* Define to 1 if the compiler supports __builtin_expect, - and to 2 if does. */ -#undef HAVE___BUILTIN_EXPECT -#ifndef HAVE___BUILTIN_EXPECT -# define __builtin_expect(e, c) (e) -#elif HAVE___BUILTIN_EXPECT == 2 -# include -#endif - - /* Define to 1 if you have the `__fseterr' function. */ #undef HAVE___FSETERR -/* Define to 1 if ctype.h defines __header_inline. */ -#undef HAVE___HEADER_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 - . - - 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 Oracle Developer Studio 12.6 - (Sun C 5.15 SunOS_sparc 2017/05/30). - - 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 . 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 (ISO C 99 section 6.7.4.(3). - This bug is known to occur on: - - OS X 10.8 and earlier; see: - https://lists.gnu.org/r/bug-gnulib/2012-12/msg00023.html - - DragonFly; see - http://muscles.dragonflybsd.org/bulk/clang-master-potential/20141111_102002/logs/ah-tty-0.3.12.log - - FreeBSD; see: - https://lists.gnu.org/r/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 . - Assume DragonFly and FreeBSD will be similar. - - GCC 4.3 and above with -std=c99 or -std=gnu99 implements ISO C99 - inline semantics, unless -fgnu89-inline is used. It defines a macro - __GNUC_STDC_INLINE__ to indicate this situation or a macro - __GNUC_GNU_INLINE__ to indicate the opposite situation. - GCC 4.2 with -std=c99 or -std=gnu99 implements the GNU C inline - semantics but warns, unless -fgnu89-inline is used: - warning: C99 inline functions are not supported; using GNU89 - warning: to disable this warning use -fgnu89-inline or the gnu_inline function attribute - It defines a macro __GNUC_GNU_INLINE__ to indicate this situation. - */ -#if (((defined __APPLE__ && defined __MACH__) \ - || defined __DragonFly__ || defined __FreeBSD__) \ - && (defined HAVE___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__ \ - && !defined __PCC__) \ - : (199901L <= __STDC_VERSION__ \ - && !defined __HP_cc \ - && !defined __PGI \ - && !(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 __PCC__ \ - && !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 _GL_UNUSED static -# define _GL_EXTERN_INLINE _GL_UNUSED static -#endif - -/* In GCC 4.6 (inclusive) to 5.1 (exclusive), - suppress bogus "no previous prototype for 'FOO'" - and "no previous declaration for 'FOO'" diagnostics, - when FOO is an inline function in the header; see - and - . */ -#if __GNUC__ == 4 && 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 -# 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 - /* Define to 1 if the compiler supports the keyword '__inline'. */ #undef HAVE___INLINE @@ -841,25 +626,14 @@ #endif -/* Define to 1 on musl libc. */ -#undef MUSL_LIBC - /* Define if the vasnprintf implementation needs special code for the 'a' and 'A' directives. */ #undef NEED_PRINTF_DIRECTIVE_A -/* Define if the vasnprintf implementation needs special code for the 'b' - directive. */ -#undef NEED_PRINTF_DIRECTIVE_B - /* Define if the vasnprintf implementation needs special code for the 'F' directive. */ #undef NEED_PRINTF_DIRECTIVE_F -/* Define if the vasnprintf implementation needs special code for the 'lc' - directive. */ -#undef NEED_PRINTF_DIRECTIVE_LC - /* Define if the vasnprintf implementation needs special code for the 'ls' directive. */ #undef NEED_PRINTF_DIRECTIVE_LS @@ -1070,15 +844,11 @@ #ifndef __STDC_WANT_IEC_60559_DFP_EXT__ # undef __STDC_WANT_IEC_60559_DFP_EXT__ #endif -/* Enable extensions specified by C23 Annex F. */ -#ifndef __STDC_WANT_IEC_60559_EXT__ -# undef __STDC_WANT_IEC_60559_EXT__ -#endif /* Enable extensions specified by ISO/IEC TS 18661-4:2015. */ #ifndef __STDC_WANT_IEC_60559_FUNCS_EXT__ # undef __STDC_WANT_IEC_60559_FUNCS_EXT__ #endif -/* Enable extensions specified by C23 Annex H and ISO/IEC TS 18661-3:2015. */ +/* Enable extensions specified by ISO/IEC TS 18661-3:2015. */ #ifndef __STDC_WANT_IEC_60559_TYPES_EXT__ # undef __STDC_WANT_IEC_60559_TYPES_EXT__ #endif @@ -1139,7 +909,7 @@ /* Define to enable the declarations of ISO C 11 types and functions. */ #undef _ISOC11_SOURCE -/* Define to 1 on platforms where this makes off_t a 64-bit type. */ +/* Define for large files, on AIX-style hosts. */ #undef _LARGE_FILES /* The _Noreturn keyword of C11. */ @@ -1155,11 +925,6 @@ AIX system header files and several gnulib header files use precisely this syntax with 'extern'. */ # define _Noreturn [[noreturn]] -# elif (defined __clang__ && __clang_major__ < 16 \ - && defined _GL_WORK_AROUND_LLVM_BUG_59792) - /* Compile with -D_GL_WORK_AROUND_LLVM_BUG_59792 to work around - that rare LLVM bug, though you may get many false-alarm warnings. */ -# define _Noreturn # elif ((!defined __cplusplus || defined __clang__) \ && (201112 <= (defined __STDC_VERSION__ ? __STDC_VERSION__ : 0) \ || (!defined __STRICT_ANSI__ \ @@ -1178,9 +943,6 @@ #endif -/* Number of bits in time_t, on hosts where this is settable. */ -#undef _TIME_BITS - /* For standard stat data types on VMS. */ #undef _USE_STD_STAT @@ -1188,19 +950,12 @@ used. */ #undef __GETOPT_PREFIX -/* Define to 1 on platforms where this makes time_t a 64-bit type. */ -#undef __MINGW_USE_VC2005_COMPAT - /* Define to 1 if the system predates C++11. */ #undef __STDC_CONSTANT_MACROS /* Define to 1 if the system predates C++11. */ #undef __STDC_LIMIT_MACROS -/* Define to 1 if C does not support variable-length arrays, and if the - compiler does not already define this. */ -#undef __STDC_NO_VLA__ - /* The _GL_ASYNC_SAFE marker should be attached to functions that are signal handlers (for signals other than SIGABRT, SIGPIPE) or can be invoked from such signal handlers. Such functions have some restrictions: @@ -1231,9 +986,7 @@ /* Attributes. */ #if (defined __has_attribute \ && (!defined __clang_minor__ \ - || (defined __apple_build_version__ \ - ? 6000000 <= __apple_build_version__ \ - : 5 <= __clang_major__))) + || 3 < __clang_major__ + (5 <= __clang_minor__))) # define _GL_HAS_ATTRIBUTE(attr) __has_attribute (__##attr##__) #else # define _GL_HAS_ATTRIBUTE(attr) _GL_ATTR_##attr @@ -1249,12 +1002,12 @@ # define _GL_ATTR_fallthrough _GL_GNUC_PREREQ (7, 0) # define _GL_ATTR_format _GL_GNUC_PREREQ (2, 7) # define _GL_ATTR_leaf _GL_GNUC_PREREQ (4, 6) -# define _GL_ATTR_malloc _GL_GNUC_PREREQ (3, 0) # ifdef _ICC # define _GL_ATTR_may_alias 0 # else # define _GL_ATTR_may_alias _GL_GNUC_PREREQ (3, 3) # endif +# define _GL_ATTR_malloc _GL_GNUC_PREREQ (3, 0) # define _GL_ATTR_noinline _GL_GNUC_PREREQ (3, 1) # define _GL_ATTR_nonnull _GL_GNUC_PREREQ (3, 3) # define _GL_ATTR_nonstring _GL_GNUC_PREREQ (8, 0) @@ -1267,455 +1020,285 @@ # define _GL_ATTR_warn_unused_result _GL_GNUC_PREREQ (3, 4) #endif -/* Disable GCC -Wpedantic if using __has_c_attribute and this is not C23+. */ -#if (defined __has_c_attribute && _GL_GNUC_PREREQ (4, 6) \ - && (defined __STDC_VERSION__ ? __STDC_VERSION__ : 0) <= 201710) -# pragma GCC diagnostic ignored "-Wpedantic" -#endif -/* Define if, in a function declaration, the attributes in bracket syntax - [[...]] must come before the attributes in __attribute__((...)) syntax. - If this is defined, it is best to avoid the bracket syntax, so that the - various _GL_ATTRIBUTE_* can be cumulated on the same declaration in any - order. */ -#ifdef __cplusplus -# if defined __clang__ -# define _GL_BRACKET_BEFORE_ATTRIBUTE 1 -# endif +#if _GL_HAS_ATTRIBUTE (alloc_size) +# define _GL_ATTRIBUTE_ALLOC_SIZE(args) __attribute__ ((__alloc_size__ args)) #else -# if defined __GNUC__ && !defined __clang__ -# define _GL_BRACKET_BEFORE_ATTRIBUTE 1 -# endif -#endif - -/* _GL_ATTRIBUTE_ALLOC_SIZE ((N)) declares that the Nth argument of the function - is the size of the returned memory block. - _GL_ATTRIBUTE_ALLOC_SIZE ((M, N)) declares that the Mth argument multiplied - by the Nth argument of the function is the size of the returned memory block. - */ -/* Applies to: function, pointer to function, function types. */ -#ifndef _GL_ATTRIBUTE_ALLOC_SIZE -# if _GL_HAS_ATTRIBUTE (alloc_size) -# define _GL_ATTRIBUTE_ALLOC_SIZE(args) __attribute__ ((__alloc_size__ args)) -# else -# define _GL_ATTRIBUTE_ALLOC_SIZE(args) -# endif +# define _GL_ATTRIBUTE_ALLOC_SIZE(args) #endif -/* _GL_ATTRIBUTE_ALWAYS_INLINE tells that the compiler should always inline the - function and report an error if it cannot do so. */ -/* Applies to: function. */ -#ifndef _GL_ATTRIBUTE_ALWAYS_INLINE -# if _GL_HAS_ATTRIBUTE (always_inline) -# define _GL_ATTRIBUTE_ALWAYS_INLINE __attribute__ ((__always_inline__)) -# else -# define _GL_ATTRIBUTE_ALWAYS_INLINE -# endif +#if _GL_HAS_ATTRIBUTE (always_inline) +# define _GL_ATTRIBUTE_ALWAYS_INLINE __attribute__ ((__always_inline__)) +#else +# define _GL_ATTRIBUTE_ALWAYS_INLINE #endif -/* _GL_ATTRIBUTE_ARTIFICIAL declares that the function is not important to show - in stack traces when debugging. The compiler should omit the function from - stack traces. */ -/* Applies to: function. */ -#ifndef _GL_ATTRIBUTE_ARTIFICIAL -# if _GL_HAS_ATTRIBUTE (artificial) -# define _GL_ATTRIBUTE_ARTIFICIAL __attribute__ ((__artificial__)) -# else -# define _GL_ATTRIBUTE_ARTIFICIAL -# endif +#if _GL_HAS_ATTRIBUTE (artificial) +# define _GL_ATTRIBUTE_ARTIFICIAL __attribute__ ((__artificial__)) +#else +# define _GL_ATTRIBUTE_ARTIFICIAL #endif -/* _GL_ATTRIBUTE_COLD declares that the function is rarely executed. */ -/* Applies to: functions. */ /* Avoid __attribute__ ((cold)) on MinGW; see thread starting at . Also, Oracle Studio 12.6 requires 'cold' not '__cold__'. */ -#ifndef _GL_ATTRIBUTE_COLD -# if _GL_HAS_ATTRIBUTE (cold) && !defined __MINGW32__ -# ifndef __SUNPRO_C -# define _GL_ATTRIBUTE_COLD __attribute__ ((__cold__)) -# else -# define _GL_ATTRIBUTE_COLD __attribute__ ((cold)) -# endif -# else -# define _GL_ATTRIBUTE_COLD -# endif -#endif - -/* _GL_ATTRIBUTE_CONST declares that it is OK for a compiler to omit duplicate - calls to the function with the same arguments. - This attribute is safe for a function that neither depends on nor affects - observable state, and always returns exactly once - e.g., does not loop - forever, and does not call longjmp. - (This attribute is stricter than _GL_ATTRIBUTE_PURE.) */ -/* Applies to: functions. */ -#ifndef _GL_ATTRIBUTE_CONST -# if _GL_HAS_ATTRIBUTE (const) -# define _GL_ATTRIBUTE_CONST __attribute__ ((__const__)) +#if _GL_HAS_ATTRIBUTE (cold) && !defined __MINGW32__ +# ifndef __SUNPRO_C +# define _GL_ATTRIBUTE_COLD __attribute__ ((__cold__)) # else -# define _GL_ATTRIBUTE_CONST -# endif -#endif - -/* _GL_ATTRIBUTE_DEALLOC (F, I) declares that the function returns pointers - that can be freed by passing them as the Ith argument to the - function F. - _GL_ATTRIBUTE_DEALLOC_FREE declares that the function returns pointers that - can be freed via 'free'; it can be used only after declaring 'free'. */ -/* Applies to: functions. Cannot be used on inline functions. */ -#ifndef _GL_ATTRIBUTE_DEALLOC -# if _GL_GNUC_PREREQ (11, 0) -# define _GL_ATTRIBUTE_DEALLOC(f, i) __attribute__ ((__malloc__ (f, i))) -# else -# define _GL_ATTRIBUTE_DEALLOC(f, i) -# endif -#endif -/* If gnulib's or has already defined this macro, continue - to use this earlier definition, since may not have been included - yet. */ -#ifndef _GL_ATTRIBUTE_DEALLOC_FREE -# if defined __cplusplus && defined __GNUC__ && !defined __clang__ -/* Work around GCC bug */ -# define _GL_ATTRIBUTE_DEALLOC_FREE \ - _GL_ATTRIBUTE_DEALLOC ((void (*) (void *)) free, 1) -# else -# define _GL_ATTRIBUTE_DEALLOC_FREE \ - _GL_ATTRIBUTE_DEALLOC (free, 1) +# define _GL_ATTRIBUTE_COLD __attribute__ ((cold)) # endif +#else +# define _GL_ATTRIBUTE_COLD #endif -/* _GL_ATTRIBUTE_DEPRECATED: Declares that an entity is deprecated. - The compiler may warn if the entity is used. */ -/* Applies to: - - function, variable, - - struct, union, struct/union member, - - enumeration, enumeration item, - - typedef, - in C++ also: namespace, class, template specialization. */ -#ifndef _GL_ATTRIBUTE_DEPRECATED -# ifndef _GL_BRACKET_BEFORE_ATTRIBUTE -# ifdef __has_c_attribute -# if __has_c_attribute (__deprecated__) -# define _GL_ATTRIBUTE_DEPRECATED [[__deprecated__]] -# endif -# endif -# endif -# if !defined _GL_ATTRIBUTE_DEPRECATED && _GL_HAS_ATTRIBUTE (deprecated) -# define _GL_ATTRIBUTE_DEPRECATED __attribute__ ((__deprecated__)) -# endif -# ifndef _GL_ATTRIBUTE_DEPRECATED -# define _GL_ATTRIBUTE_DEPRECATED -# endif +#if _GL_HAS_ATTRIBUTE (const) +# define _GL_ATTRIBUTE_CONST __attribute__ ((__const__)) +#else +# define _GL_ATTRIBUTE_CONST #endif -/* _GL_ATTRIBUTE_ERROR(msg) requests an error if a function is called and - the function call is not optimized away. - _GL_ATTRIBUTE_WARNING(msg) requests a warning if a function is called and - the function call is not optimized away. */ -/* Applies to: functions. */ -#if !(defined _GL_ATTRIBUTE_ERROR && defined _GL_ATTRIBUTE_WARNING) -# if _GL_HAS_ATTRIBUTE (error) -# define _GL_ATTRIBUTE_ERROR(msg) __attribute__ ((__error__ (msg))) -# define _GL_ATTRIBUTE_WARNING(msg) __attribute__ ((__warning__ (msg))) -# elif _GL_HAS_ATTRIBUTE (diagnose_if) -# define _GL_ATTRIBUTE_ERROR(msg) __attribute__ ((__diagnose_if__ (1, msg, "error"))) -# define _GL_ATTRIBUTE_WARNING(msg) __attribute__ ((__diagnose_if__ (1, msg, "warning"))) -# else -# define _GL_ATTRIBUTE_ERROR(msg) -# define _GL_ATTRIBUTE_WARNING(msg) -# endif +#if 201710L < __STDC_VERSION__ +# define _GL_ATTRIBUTE_DEPRECATED [[__deprecated__]] +#elif _GL_HAS_ATTRIBUTE (deprecated) +# define _GL_ATTRIBUTE_DEPRECATED __attribute__ ((__deprecated__)) +#else +# define _GL_ATTRIBUTE_DEPRECATED #endif -/* _GL_ATTRIBUTE_EXTERNALLY_VISIBLE declares that the entity should remain - visible to debuggers etc., even with '-fwhole-program'. */ -/* Applies to: functions, variables. */ -#ifndef _GL_ATTRIBUTE_EXTERNALLY_VISIBLE -# if _GL_HAS_ATTRIBUTE (externally_visible) -# define _GL_ATTRIBUTE_EXTERNALLY_VISIBLE __attribute__ ((externally_visible)) -# else -# define _GL_ATTRIBUTE_EXTERNALLY_VISIBLE -# endif +#if _GL_HAS_ATTRIBUTE (error) +# define _GL_ATTRIBUTE_ERROR(msg) __attribute__ ((__error__ (msg))) +# define _GL_ATTRIBUTE_WARNING(msg) __attribute__ ((__warning__ (msg))) +#elif _GL_HAS_ATTRIBUTE (diagnose_if) +# define _GL_ATTRIBUTE_ERROR(msg) __attribute__ ((__diagnose_if__ (1, msg, "error"))) +# define _GL_ATTRIBUTE_WARNING(msg) __attribute__ ((__diagnose_if__ (1, msg, "warning"))) +#else +# define _GL_ATTRIBUTE_ERROR(msg) +# define _GL_ATTRIBUTE_WARNING(msg) #endif -/* _GL_ATTRIBUTE_FALLTHROUGH declares that it is not a programming mistake if - the control flow falls through to the immediately following 'case' or - 'default' label. The compiler should not warn in this case. */ -/* Applies to: Empty statement (;), inside a 'switch' statement. */ -/* Always expands to something. */ -#ifndef _GL_ATTRIBUTE_FALLTHROUGH -# ifdef __has_c_attribute -# if __has_c_attribute (__fallthrough__) -# define _GL_ATTRIBUTE_FALLTHROUGH [[__fallthrough__]] -# endif -# endif -# if !defined _GL_ATTRIBUTE_FALLTHROUGH && _GL_HAS_ATTRIBUTE (fallthrough) -# define _GL_ATTRIBUTE_FALLTHROUGH __attribute__ ((__fallthrough__)) -# endif -# ifndef _GL_ATTRIBUTE_FALLTHROUGH -# define _GL_ATTRIBUTE_FALLTHROUGH ((void) 0) -# endif +#if _GL_HAS_ATTRIBUTE (externally_visible) +# define _GL_ATTRIBUTE_EXTERNALLY_VISIBLE __attribute__ ((externally_visible)) +#else +# define _GL_ATTRIBUTE_EXTERNALLY_VISIBLE #endif -/* _GL_ATTRIBUTE_FORMAT ((ARCHETYPE, STRING-INDEX, FIRST-TO-CHECK)) - declares that the STRING-INDEXth function argument is a format string of - style ARCHETYPE, which is one of: - printf, gnu_printf - scanf, gnu_scanf, - strftime, gnu_strftime, - strfmon, - or the same thing prefixed and suffixed with '__'. - If FIRST-TO-CHECK is not 0, arguments starting at FIRST-TO_CHECK - are suitable for the format string. */ -/* Applies to: functions. */ -#ifndef _GL_ATTRIBUTE_FORMAT -# if _GL_HAS_ATTRIBUTE (format) -# define _GL_ATTRIBUTE_FORMAT(spec) __attribute__ ((__format__ spec)) -# else -# define _GL_ATTRIBUTE_FORMAT(spec) -# endif +/* FALLTHROUGH is special, because it always expands to something. */ +#if 201710L < __STDC_VERSION__ +# define _GL_ATTRIBUTE_FALLTHROUGH [[__fallthrough__]] +#elif _GL_HAS_ATTRIBUTE (fallthrough) +# define _GL_ATTRIBUTE_FALLTHROUGH __attribute__ ((__fallthrough__)) +#else +# define _GL_ATTRIBUTE_FALLTHROUGH ((void) 0) #endif -/* _GL_ATTRIBUTE_LEAF declares that if the function is called from some other - compilation unit, it executes code from that unit only by return or by - exception handling. This declaration lets the compiler optimize that unit - more aggressively. */ -/* Applies to: functions. */ -#ifndef _GL_ATTRIBUTE_LEAF -# if _GL_HAS_ATTRIBUTE (leaf) -# define _GL_ATTRIBUTE_LEAF __attribute__ ((__leaf__)) -# else -# define _GL_ATTRIBUTE_LEAF -# endif +#if _GL_HAS_ATTRIBUTE (format) +# define _GL_ATTRIBUTE_FORMAT(spec) __attribute__ ((__format__ spec)) +#else +# define _GL_ATTRIBUTE_FORMAT(spec) #endif -/* _GL_ATTRIBUTE_MALLOC declares that the function returns a pointer to freshly - allocated memory. */ -/* Applies to: functions. */ -#ifndef _GL_ATTRIBUTE_MALLOC -# if _GL_HAS_ATTRIBUTE (malloc) -# define _GL_ATTRIBUTE_MALLOC __attribute__ ((__malloc__)) -# else -# define _GL_ATTRIBUTE_MALLOC -# endif +#if _GL_HAS_ATTRIBUTE (leaf) +# define _GL_ATTRIBUTE_LEAF __attribute__ ((__leaf__)) +#else +# define _GL_ATTRIBUTE_LEAF #endif -/* _GL_ATTRIBUTE_MAY_ALIAS declares that pointers to the type may point to the - same storage as pointers to other types. Thus this declaration disables - strict aliasing optimization. */ -/* Applies to: types. */ /* Oracle Studio 12.6 mishandles may_alias despite __has_attribute OK. */ -#ifndef _GL_ATTRIBUTE_MAY_ALIAS -# if _GL_HAS_ATTRIBUTE (may_alias) && !defined __SUNPRO_C -# define _GL_ATTRIBUTE_MAY_ALIAS __attribute__ ((__may_alias__)) -# else -# define _GL_ATTRIBUTE_MAY_ALIAS -# endif +#if _GL_HAS_ATTRIBUTE (may_alias) && !defined __SUNPRO_C +# define _GL_ATTRIBUTE_MAY_ALIAS __attribute__ ((__may_alias__)) +#else +# define _GL_ATTRIBUTE_MAY_ALIAS #endif -/* _GL_ATTRIBUTE_MAYBE_UNUSED declares that it is not a programming mistake if - the entity is not used. The compiler should not warn if the entity is not - used. */ -/* Applies to: - - function, variable, - - struct, union, struct/union member, - - enumeration, enumeration item, - - typedef, - in C++ also: class. */ -/* In C++ and C23, this is spelled [[__maybe_unused__]]. - GCC's syntax is __attribute__ ((__unused__)). - clang supports both syntaxes. Except that with clang ≥ 6, < 10, in C++ mode, - __has_c_attribute (__maybe_unused__) yields true but the use of - [[__maybe_unused__]] nevertheless produces a warning. */ -#ifndef _GL_ATTRIBUTE_MAYBE_UNUSED -# ifndef _GL_BRACKET_BEFORE_ATTRIBUTE -# if defined __clang__ && defined __cplusplus -# if !defined __apple_build_version__ && __clang_major__ >= 10 -# define _GL_ATTRIBUTE_MAYBE_UNUSED [[__maybe_unused__]] -# endif -# elif defined __has_c_attribute -# if __has_c_attribute (__maybe_unused__) -# define _GL_ATTRIBUTE_MAYBE_UNUSED [[__maybe_unused__]] -# endif -# endif -# endif -# ifndef _GL_ATTRIBUTE_MAYBE_UNUSED -# define _GL_ATTRIBUTE_MAYBE_UNUSED _GL_ATTRIBUTE_UNUSED -# endif +#if 201710L < __STDC_VERSION__ +# define _GL_ATTRIBUTE_MAYBE_UNUSED [[__maybe_unused__]] +#elif _GL_HAS_ATTRIBUTE (unused) +# define _GL_ATTRIBUTE_MAYBE_UNUSED __attribute__ ((__unused__)) +#else +# define _GL_ATTRIBUTE_MAYBE_UNUSED #endif -/* Alternative spelling of this macro, for convenience and for - compatibility with glibc/include/libc-symbols.h. */ -#define _GL_UNUSED _GL_ATTRIBUTE_MAYBE_UNUSED /* Earlier spellings of this macro. */ +#define _GL_UNUSED _GL_ATTRIBUTE_MAYBE_UNUSED #define _UNUSED_PARAMETER_ _GL_ATTRIBUTE_MAYBE_UNUSED -/* _GL_ATTRIBUTE_NODISCARD declares that the caller of the function should not - discard the return value. The compiler may warn if the caller does not use - the return value, unless the caller uses something like ignore_value. */ -/* Applies to: function, enumeration, class. */ -#ifndef _GL_ATTRIBUTE_NODISCARD -# ifndef _GL_BRACKET_BEFORE_ATTRIBUTE -# if defined __clang__ && defined __cplusplus - /* With clang up to 15.0.6 (at least), in C++ mode, [[__nodiscard__]] produces - a warning. - The 1000 below means a yet unknown threshold. When clang++ version X - starts supporting [[__nodiscard__]] without warning about it, you can - replace the 1000 with X. */ -# if __clang_major__ >= 1000 -# define _GL_ATTRIBUTE_NODISCARD [[__nodiscard__]] -# endif -# elif defined __has_c_attribute -# if __has_c_attribute (__nodiscard__) -# define _GL_ATTRIBUTE_NODISCARD [[__nodiscard__]] -# endif -# endif -# endif -# if !defined _GL_ATTRIBUTE_NODISCARD && _GL_HAS_ATTRIBUTE (warn_unused_result) -# define _GL_ATTRIBUTE_NODISCARD __attribute__ ((__warn_unused_result__)) -# endif -# ifndef _GL_ATTRIBUTE_NODISCARD -# define _GL_ATTRIBUTE_NODISCARD -# endif +#if _GL_HAS_ATTRIBUTE (malloc) +# define _GL_ATTRIBUTE_MALLOC __attribute__ ((__malloc__)) +#else +# define _GL_ATTRIBUTE_MALLOC #endif -/* _GL_ATTRIBUTE_NOINLINE tells that the compiler should not inline the - function. */ -/* Applies to: functions. */ -#ifndef _GL_ATTRIBUTE_NOINLINE -# if _GL_HAS_ATTRIBUTE (noinline) -# define _GL_ATTRIBUTE_NOINLINE __attribute__ ((__noinline__)) -# else -# define _GL_ATTRIBUTE_NOINLINE -# endif +#if 201710L < __STDC_VERSION__ +# define _GL_ATTRIBUTE_NODISCARD [[__nodiscard__]] +#elif _GL_HAS_ATTRIBUTE (warn_unused_result) +# define _GL_ATTRIBUTE_NODISCARD __attribute__ ((__warn_unused_result__)) +#else +# define _GL_ATTRIBUTE_NODISCARD #endif -/* _GL_ATTRIBUTE_NONNULL ((N1, N2,...)) declares that the arguments N1, N2,... - must not be NULL. - _GL_ATTRIBUTE_NONNULL () declares that all pointer arguments must not be - null. */ -/* Applies to: functions. */ -#ifndef _GL_ATTRIBUTE_NONNULL -# if _GL_HAS_ATTRIBUTE (nonnull) -# define _GL_ATTRIBUTE_NONNULL(args) __attribute__ ((__nonnull__ args)) -# else -# define _GL_ATTRIBUTE_NONNULL(args) -# endif +#if _GL_HAS_ATTRIBUTE (noinline) +# define _GL_ATTRIBUTE_NOINLINE __attribute__ ((__noinline__)) +#else +# define _GL_ATTRIBUTE_NOINLINE #endif -/* _GL_ATTRIBUTE_NONSTRING declares that the contents of a character array is - not meant to be NUL-terminated. */ -/* Applies to: struct/union members and variables that are arrays of element - type '[[un]signed] char'. */ -#ifndef _GL_ATTRIBUTE_NONSTRING -# if _GL_HAS_ATTRIBUTE (nonstring) -# define _GL_ATTRIBUTE_NONSTRING __attribute__ ((__nonstring__)) -# else -# define _GL_ATTRIBUTE_NONSTRING -# endif +#if _GL_HAS_ATTRIBUTE (nonnull) +# define _GL_ATTRIBUTE_NONNULL(args) __attribute__ ((__nonnull__ args)) +#else +# define _GL_ATTRIBUTE_NONNULL(args) +#endif + +#if _GL_HAS_ATTRIBUTE (nonstring) +# define _GL_ATTRIBUTE_NONSTRING __attribute__ ((__nonstring__)) +#else +# define _GL_ATTRIBUTE_NONSTRING #endif /* There is no _GL_ATTRIBUTE_NORETURN; use _Noreturn instead. */ -/* _GL_ATTRIBUTE_NOTHROW declares that the function does not throw exceptions. - */ -/* Applies to: functions. */ -#ifndef _GL_ATTRIBUTE_NOTHROW -# if _GL_HAS_ATTRIBUTE (nothrow) && !defined __cplusplus -# define _GL_ATTRIBUTE_NOTHROW __attribute__ ((__nothrow__)) -# else -# define _GL_ATTRIBUTE_NOTHROW -# endif +#if _GL_HAS_ATTRIBUTE (nothrow) && !defined __cplusplus +# define _GL_ATTRIBUTE_NOTHROW __attribute__ ((__nothrow__)) +#else +# define _GL_ATTRIBUTE_NOTHROW #endif -/* _GL_ATTRIBUTE_PACKED declares: - For struct members: The member has the smallest possible alignment. - For struct, union, class: All members have the smallest possible alignment, - minimizing the memory required. */ -/* Applies to: struct members, struct, union, - in C++ also: class. */ -#ifndef _GL_ATTRIBUTE_PACKED -# if _GL_HAS_ATTRIBUTE (packed) -# define _GL_ATTRIBUTE_PACKED __attribute__ ((__packed__)) -# else -# define _GL_ATTRIBUTE_PACKED -# endif +#if _GL_HAS_ATTRIBUTE (packed) +# define _GL_ATTRIBUTE_PACKED __attribute__ ((__packed__)) +#else +# define _GL_ATTRIBUTE_PACKED #endif -/* _GL_ATTRIBUTE_PURE declares that It is OK for a compiler to omit duplicate - calls to the function with the same arguments if observable state is not - changed between calls. - This attribute is safe for a function that does not affect - observable state, and always returns exactly once. - (This attribute is looser than _GL_ATTRIBUTE_CONST.) */ -/* Applies to: functions. */ -#ifndef _GL_ATTRIBUTE_PURE -# if _GL_HAS_ATTRIBUTE (pure) -# define _GL_ATTRIBUTE_PURE __attribute__ ((__pure__)) -# else -# define _GL_ATTRIBUTE_PURE -# endif +#if _GL_HAS_ATTRIBUTE (pure) +# define _GL_ATTRIBUTE_PURE __attribute__ ((__pure__)) +#else +# define _GL_ATTRIBUTE_PURE #endif -/* _GL_ATTRIBUTE_RETURNS_NONNULL declares that the function's return value is - a non-NULL pointer. */ -/* Applies to: functions. */ -#ifndef _GL_ATTRIBUTE_RETURNS_NONNULL -# if _GL_HAS_ATTRIBUTE (returns_nonnull) -# define _GL_ATTRIBUTE_RETURNS_NONNULL __attribute__ ((__returns_nonnull__)) -# else -# define _GL_ATTRIBUTE_RETURNS_NONNULL -# endif +#if _GL_HAS_ATTRIBUTE (returns_nonnull) +# define _GL_ATTRIBUTE_RETURNS_NONNULL __attribute__ ((__returns_nonnull__)) +#else +# define _GL_ATTRIBUTE_RETURNS_NONNULL #endif -/* _GL_ATTRIBUTE_SENTINEL(pos) declares that the variadic function expects a - trailing NULL argument. - _GL_ATTRIBUTE_SENTINEL () - The last argument is NULL (requires C99). - _GL_ATTRIBUTE_SENTINEL ((N)) - The (N+1)st argument from the end is NULL. */ -/* Applies to: functions. */ -#ifndef _GL_ATTRIBUTE_SENTINEL -# if _GL_HAS_ATTRIBUTE (sentinel) -# define _GL_ATTRIBUTE_SENTINEL(pos) __attribute__ ((__sentinel__ pos)) -# else -# define _GL_ATTRIBUTE_SENTINEL(pos) -# endif +#if _GL_HAS_ATTRIBUTE (sentinel) +# define _GL_ATTRIBUTE_SENTINEL(pos) __attribute__ ((__sentinel__ pos)) +#else +# define _GL_ATTRIBUTE_SENTINEL(pos) #endif -/* A helper macro. Don't use it directly. */ -#ifndef _GL_ATTRIBUTE_UNUSED -# if _GL_HAS_ATTRIBUTE (unused) -# define _GL_ATTRIBUTE_UNUSED __attribute__ ((__unused__)) -# else -# define _GL_ATTRIBUTE_UNUSED -# endif + +/* To support C++ as well as C, use _GL_UNUSED_LABEL with trailing ';'. */ +#if !defined __cplusplus || _GL_GNUC_PREREQ (4, 5) +# define _GL_UNUSED_LABEL _GL_ATTRIBUTE_MAYBE_UNUSED +#else +# define _GL_UNUSED_LABEL #endif -/* _GL_UNUSED_LABEL; declares that it is not a programming mistake if the - immediately preceding label is not used. The compiler should not warn - if the label is not used. */ -/* Applies to: label (both in C and C++). */ -/* Note that g++ < 4.5 does not support the '__attribute__ ((__unused__)) ;' - syntax. But clang does. */ -#ifndef _GL_UNUSED_LABEL -# if !(defined __cplusplus && !_GL_GNUC_PREREQ (4, 5)) || defined __clang__ -# define _GL_UNUSED_LABEL _GL_ATTRIBUTE_UNUSED +/* 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 + . + + 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 . 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 (ISO C 99 section 6.7.4.(3). + This bug is known to occur on: + + OS X 10.8 and earlier; see: + https://lists.gnu.org/r/bug-gnulib/2012-12/msg00023.html + + DragonFly; see + http://muscles.dragonflybsd.org/bulk/clang-master-potential/20141111_102002/logs/ah-tty-0.3.12.log + + FreeBSD; see: + https://lists.gnu.org/r/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 . + Assume DragonFly and FreeBSD will be similar. + + GCC 4.3 and above with -std=c99 or -std=gnu99 implements ISO C99 + inline semantics, unless -fgnu89-inline is used. It defines a macro + __GNUC_STDC_INLINE__ to indicate this situation or a macro + __GNUC_GNU_INLINE__ to indicate the opposite situation. + GCC 4.2 with -std=c99 or -std=gnu99 implements the GNU C inline + semantics but warns, unless -fgnu89-inline is used: + warning: C99 inline functions are not supported; using GNU89 + warning: to disable this warning use -fgnu89-inline or the gnu_inline function attribute + It defines a macro __GNUC_GNU_INLINE__ to indicate this situation. + */ +#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 __PGI \ + && !(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_UNUSED_LABEL +# 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 - -/* In C++, there is the concept of "language linkage", that encompasses - name mangling and function calling conventions. - The following macros start and end a block of "C" linkage. */ -#ifdef __cplusplus -# define _GL_BEGIN_C_LINKAGE extern "C" { -# define _GL_END_C_LINKAGE } +/* In GCC 4.6 (inclusive) to 5.1 (exclusive), + suppress bogus "no previous prototype for 'FOO'" + and "no previous declaration for 'FOO'" diagnostics, + when FOO is an inline function in the header; see + and + . */ +#if __GNUC__ == 4 && 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 +# 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_BEGIN_C_LINKAGE -# define _GL_END_C_LINKAGE +# define _GL_INLINE_HEADER_BEGIN +# define _GL_INLINE_HEADER_END #endif - /* Define to `int' if doesn't define. */ #undef gid_t @@ -1785,152 +1368,6 @@ /* Define to `int' if doesn't define. */ #undef uid_t -#if !defined HAVE_C_ALIGNASOF && __cplusplus < 201103 && !defined alignof -# if HAVE_STDALIGN_H -# include -# endif - -/* ISO C23 alignas and alignof for platforms that lack it. - - References: - ISO C23 (latest free draft - ) - sections 6.5.3.4, 6.7.5, 7.15. - C++11 (latest free draft - ) - section 18.10. */ - -/* alignof (TYPE), also known as _Alignof (TYPE), yields the alignment - requirement of a structure member (i.e., slot or field) that is of - type TYPE, as an integer constant expression. - - This differs from GCC's and clang's __alignof__ operator, which can - yield a better-performing alignment for an object of that type. For - example, on x86 with GCC and on Linux/x86 with clang, - __alignof__ (double) and __alignof__ (long long) are 8, whereas - alignof (double) and alignof (long long) are 4 unless the option - '-malign-double' is used. - - The result cannot be used as a value for an 'enum' constant, if you - want to be portable to HP-UX 10.20 cc and AIX 3.2.5 xlc. */ - -/* GCC releases before GCC 4.9 had a bug in _Alignof. See GCC bug 52023 - . - clang versions < 8.0.0 have the same bug. */ -# if (!defined __STDC_VERSION__ || __STDC_VERSION__ < 201112 \ - || (defined __GNUC__ && __GNUC__ < 4 + (__GNUC_MINOR__ < 9) \ - && !defined __clang__) \ - || (defined __clang__ && __clang_major__ < 8)) -# undef/**/_Alignof -# ifdef __cplusplus -# if (201103 <= __cplusplus || defined _MSC_VER) -# define _Alignof(type) alignof (type) -# else - template struct __alignof_helper { char __a; __t __b; }; -# define _Alignof(type) offsetof (__alignof_helper, __b) -# define _GL_STDALIGN_NEEDS_STDDEF 1 -# endif -# else -# if (defined __GNUC__ && 4 <= __GNUC__) || defined __clang__ -# define _Alignof(type) __builtin_offsetof (struct { char __a; type __b; }, __b) -# else -# define _Alignof(type) offsetof (struct { char __a; type __b; }, __b) -# define _GL_STDALIGN_NEEDS_STDDEF 1 -# endif -# endif -# endif -# if ! (defined __cplusplus && (201103 <= __cplusplus || defined _MSC_VER)) -# undef/**/alignof -# define alignof _Alignof -# endif - -/* alignas (A), also known as _Alignas (A), aligns a variable or type - to the alignment A, where A is an integer constant expression. For - example: - - int alignas (8) foo; - struct s { int a; int alignas (8) bar; }; - - aligns the address of FOO and the offset of BAR to be multiples of 8. - - A should be a power of two that is at least the type's alignment - and at most the implementation's alignment limit. This limit is - 2**28 on typical GNUish hosts, and 2**13 on MSVC. To be portable - to MSVC through at least version 10.0, A should be an integer - constant, as MSVC does not support expressions such as 1 << 3. - To be portable to Sun C 5.11, do not align auto variables to - anything stricter than their default alignment. - - The following C23 requirements are not supported here: - - - If A is zero, alignas has no effect. - - alignas can be used multiple times; the strictest one wins. - - alignas (TYPE) is equivalent to alignas (alignof (TYPE)). - - */ -# if !defined __STDC_VERSION__ || __STDC_VERSION__ < 201112 -# if defined __cplusplus && (201103 <= __cplusplus || defined _MSC_VER) -# define _Alignas(a) alignas (a) -# elif (!defined __attribute__ \ - && ((defined __APPLE__ && defined __MACH__ \ - ? 4 < __GNUC__ + (1 <= __GNUC_MINOR__) \ - : __GNUC__ && !defined __ibmxl__) \ - || (4 <= __clang_major__) \ - || (__ia64 && (61200 <= __HP_cc || 61200 <= __HP_aCC)) \ - || __ICC || 0x590 <= __SUNPRO_C || 0x0600 <= __xlC__)) -# define _Alignas(a) __attribute__ ((__aligned__ (a))) -# elif 1300 <= _MSC_VER -# define _Alignas(a) __declspec (align (a)) -# endif -# endif -# if !HAVE_STDALIGN_H -# if ((defined _Alignas \ - && !(defined __cplusplus \ - && (201103 <= __cplusplus || defined _MSC_VER))) \ - || (defined __STDC_VERSION__ && 201112 <= __STDC_VERSION__)) -# define alignas _Alignas -# endif -# endif - -# if _GL_STDALIGN_NEEDS_STDDEF -# include -# endif -#endif - -#ifndef HAVE_C_BOOL -# if !defined __cplusplus && !defined __bool_true_false_are_defined -# if HAVE_STDBOOL_H -# include -# else -# if defined __SUNPRO_C -# error " is not usable with this configuration. To make it usable, add -D_STDC_C99= to $CC." -# else -# error " does not exist on this platform. Use gnulib module 'stdbool-c99' instead of gnulib module 'stdbool'." -# endif -# endif -# endif -# if !true -# define true (!false) -# endif -#endif - -#if (!defined HAVE_C_STATIC_ASSERT && !defined assert \ - && (!defined __cplusplus \ - || (__cpp_static_assert < 201411 \ - && __GNUG__ < 6 && __clang_major__ < 6))) - #include - #undef/**/assert - #ifdef __sgi - #undef/**/__ASSERT_H__ - #endif - /* Solaris 11.4 defines static_assert as a macro with 2 arguments. - We need it also to be invocable with a single argument. */ - #if defined __sun && (__STDC_VERSION__ - 0 >= 201112L) && !defined __cplusplus - #undef/**/static_assert - #define static_assert _Static_assert - #endif -#endif - #define malloc GC_malloc #define realloc GC_realloc diff -Nru mmv-2.5/configure mmv-2.5.1/configure --- mmv-2.5/configure 2023-07-20 19:40:53.000000000 +0000 +++ mmv-2.5.1/configure 2023-08-08 11:08:17.000000000 +0000 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.71 for mmv 2.5. +# Generated by GNU Autoconf 2.71 for mmv 2.5.1. # # Report bugs to . # @@ -610,8 +610,8 @@ # Identity of this package. PACKAGE_NAME='mmv' PACKAGE_TARNAME='mmv' -PACKAGE_VERSION='2.5' -PACKAGE_STRING='mmv 2.5' +PACKAGE_VERSION='2.5.1' +PACKAGE_STRING='mmv 2.5.1' PACKAGE_BUGREPORT='rrt@sc3d.org' PACKAGE_URL='https://github.com/rrthomas/mmv' @@ -649,11 +649,8 @@ ac_header_c_list= ac_func_c_list= gl_getopt_required=POSIX -enable_year2038=no -ac_subst_vars='gltests_LIBOBJDEPS -gltests_LTLIBOBJS +ac_subst_vars='gltests_LTLIBOBJS gltests_LIBOBJS -gl_LIBOBJDEPS gl_LTLIBOBJS gl_LIBOBJS am__EXEEXT_FALSE @@ -670,63 +667,12 @@ PKG_CONFIG LIBGNU_LTLIBDEPS LIBGNU_LIBDEPS -GL_CFLAG_GNULIB_WARNINGS -GL_CFLAG_ALLOW_WARNINGS gltests_WITNESS -GL_COND_OBJ_WRITE_FALSE -GL_COND_OBJ_WRITE_TRUE -GL_GNULIB_MDA_WCSDUP -GL_GNULIB_WCSFTIME -GL_GNULIB_WCSWIDTH -GL_GNULIB_WCSTOK -GL_GNULIB_WCSSTR -GL_GNULIB_WCSPBRK -GL_GNULIB_WCSSPN -GL_GNULIB_WCSCSPN -GL_GNULIB_WCSRCHR -GL_GNULIB_WCSCHR -GL_GNULIB_WCSDUP -GL_GNULIB_WCSXFRM -GL_GNULIB_WCSCOLL -GL_GNULIB_WCSNCASECMP -GL_GNULIB_WCSCASECMP -GL_GNULIB_WCSNCMP -GL_GNULIB_WCSCMP -GL_GNULIB_WCSNCAT -GL_GNULIB_WCSCAT -GL_GNULIB_WCPNCPY -GL_GNULIB_WCSNCPY -GL_GNULIB_WCPCPY -GL_GNULIB_WCSCPY -GL_GNULIB_WCSNLEN -GL_GNULIB_WCSLEN -GL_GNULIB_WMEMSET -GL_GNULIB_WMEMPCPY -GL_GNULIB_WMEMMOVE -GL_GNULIB_WMEMCPY -GL_GNULIB_WMEMCMP -GL_GNULIB_WMEMCHR -GL_GNULIB_WCWIDTH -GL_GNULIB_WCSNRTOMBS -GL_GNULIB_WCSRTOMBS -GL_GNULIB_WCRTOMB -GL_GNULIB_MBSNRTOWCS -GL_GNULIB_MBSRTOWCS -GL_GNULIB_MBRLEN -GL_GNULIB_MBRTOWC -GL_GNULIB_MBSINIT -GL_GNULIB_WCTOB -GL_GNULIB_BTOWC HAVE_CRTDEFS_H HAVE_WINT_T NEXT_AS_FIRST_DIRECTIVE_WCHAR_H NEXT_WCHAR_H -REPLACE_WMEMPCPY -REPLACE_WMEMCMP REPLACE_WCSTOK -REPLACE_WCSSTR -REPLACE_WCSNCMP -REPLACE_WCSCMP REPLACE_WCSFTIME REPLACE_WCSWIDTH REPLACE_WCWIDTH @@ -783,25 +729,51 @@ HAVE_MBRTOWC HAVE_MBSINIT HAVE_BTOWC -GL_COND_OBJ_UNLINK_FALSE -GL_COND_OBJ_UNLINK_TRUE +GNULIB_MDA_WCSDUP +GNULIB_WCSFTIME +GNULIB_WCSWIDTH +GNULIB_WCSTOK +GNULIB_WCSSTR +GNULIB_WCSPBRK +GNULIB_WCSSPN +GNULIB_WCSCSPN +GNULIB_WCSRCHR +GNULIB_WCSCHR +GNULIB_WCSDUP +GNULIB_WCSXFRM +GNULIB_WCSCOLL +GNULIB_WCSNCASECMP +GNULIB_WCSCASECMP +GNULIB_WCSNCMP +GNULIB_WCSCMP +GNULIB_WCSNCAT +GNULIB_WCSCAT +GNULIB_WCPNCPY +GNULIB_WCSNCPY +GNULIB_WCPCPY +GNULIB_WCSCPY +GNULIB_WCSNLEN +GNULIB_WCSLEN +GNULIB_WMEMSET +GNULIB_WMEMPCPY +GNULIB_WMEMMOVE +GNULIB_WMEMCPY +GNULIB_WMEMCMP +GNULIB_WMEMCHR +GNULIB_WCWIDTH +GNULIB_WCSNRTOMBS +GNULIB_WCSRTOMBS +GNULIB_WCRTOMB +GNULIB_MBSNRTOWCS +GNULIB_MBSRTOWCS +GNULIB_MBRLEN +GNULIB_MBRTOWC +GNULIB_MBSINIT +GNULIB_WCTOB +GNULIB_BTOWC HAVE_UNISTD_H NEXT_AS_FIRST_DIRECTIVE_UNISTD_H NEXT_UNISTD_H -GL_GNULIB_MDA_TZSET -GL_GNULIB_TZSET -GL_GNULIB_TIME_RZ -GL_GNULIB_TIME_R -GL_GNULIB_TIMESPEC_GETRES -GL_GNULIB_TIMESPEC_GET -GL_GNULIB_TIMEGM -GL_GNULIB_TIME -GL_GNULIB_STRPTIME -GL_GNULIB_STRFTIME -GL_GNULIB_NANOSLEEP -GL_GNULIB_LOCALTIME -GL_GNULIB_MKTIME -GL_GNULIB_CTIME TIME_H_DEFINES_TIME_UTC UNISTD_H_DEFINES_STRUCT_TIMESPEC PTHREAD_H_DEFINES_STRUCT_TIMESPEC @@ -813,79 +785,50 @@ REPLACE_GMTIME GNULIB_GETTIMEOFDAY REPLACE_TZSET -REPLACE_TIMESPEC_GET REPLACE_TIMEGM -REPLACE_TIME REPLACE_STRFTIME REPLACE_NANOSLEEP REPLACE_MKTIME REPLACE_LOCALTIME_R REPLACE_CTIME HAVE_TIMEZONE_T -HAVE_TIMESPEC_GETRES HAVE_TIMESPEC_GET HAVE_TIMEGM HAVE_STRPTIME HAVE_NANOSLEEP HAVE_DECL_LOCALTIME_R -GL_COND_OBJ_SYMLINK_FALSE -GL_COND_OBJ_SYMLINK_TRUE +GNULIB_MDA_TZSET +GNULIB_TZSET +GNULIB_TIME_RZ +GNULIB_TIME_R +GNULIB_TIMESPEC_GET +GNULIB_TIMEGM +GNULIB_STRPTIME +GNULIB_STRFTIME +GNULIB_NANOSLEEP +GNULIB_LOCALTIME +GNULIB_MKTIME +GNULIB_CTIME NEXT_AS_FIRST_DIRECTIVE_STRING_H NEXT_STRING_H -GL_COND_OBJ_STRERROR_OVERRIDE_FALSE -GL_COND_OBJ_STRERROR_OVERRIDE_TRUE -GL_COND_OBJ_STRERROR_FALSE -GL_COND_OBJ_STRERROR_TRUE -GL_COND_OBJ_STRDUP_FALSE -GL_COND_OBJ_STRDUP_TRUE -LOCALE_FR_UTF8 NEXT_AS_FIRST_DIRECTIVE_STDLIB_H NEXT_STDLIB_H -GL_COND_OBJ_STDIO_WRITE_FALSE -GL_COND_OBJ_STDIO_WRITE_TRUE -GL_COND_OBJ_STDIO_READ_FALSE -GL_COND_OBJ_STDIO_READ_TRUE NEXT_AS_FIRST_DIRECTIVE_STDIO_H NEXT_STDIO_H -GL_GENERATE_STDINT_H_FALSE -GL_GENERATE_STDINT_H_TRUE -STDINT_H +NEXT_AS_FIRST_DIRECTIVE_STDDEF_H +NEXT_STDDEF_H GL_GENERATE_STDDEF_H_FALSE GL_GENERATE_STDDEF_H_TRUE STDDEF_H -NEXT_AS_FIRST_DIRECTIVE_STDDEF_H -NEXT_STDDEF_H HAVE_WCHAR_T HAVE_MAX_ALIGN_T REPLACE_NULL -GL_GENERATE_STDCKDINT_H_FALSE -GL_GENERATE_STDCKDINT_H_TRUE -STDCKDINT_H -GL_COND_OBJ_STAT_FALSE -GL_COND_OBJ_STAT_TRUE -GL_COND_OBJ_SIGNBIT3_FALSE -GL_COND_OBJ_SIGNBIT3_TRUE +HAVE__BOOL +GL_GENERATE_STDBOOL_H_FALSE +GL_GENERATE_STDBOOL_H_TRUE +STDBOOL_H NEXT_AS_FIRST_DIRECTIVE_SIGNAL_H NEXT_SIGNAL_H -GL_COND_OBJ_RMDIR_FALSE -GL_COND_OBJ_RMDIR_TRUE -GL_COND_OBJ_RENAME_FALSE -GL_COND_OBJ_RENAME_TRUE -GL_COND_OBJ_REALLOCARRAY_FALSE -GL_COND_OBJ_REALLOCARRAY_TRUE -GL_COND_OBJ_READLINK_FALSE -GL_COND_OBJ_READLINK_TRUE -GL_COND_OBJ_READ_FALSE -GL_COND_OBJ_READ_TRUE -GL_COND_OBJ_RAWMEMCHR_FALSE -GL_COND_OBJ_RAWMEMCHR_TRUE -GL_GNULIB_SIGACTION -GL_GNULIB_SIGPROCMASK -GL_GNULIB_SIGNAL_H_SIGPIPE -GL_GNULIB_RAISE -GL_GNULIB_PTHREAD_SIGMASK -GL_COND_OBJ_RAISE_FALSE -GL_COND_OBJ_RAISE_TRUE REPLACE_RAISE REPLACE_PTHREAD_SIGMASK HAVE_SIGHANDLER_T @@ -897,60 +840,11 @@ HAVE_RAISE HAVE_PTHREAD_SIGMASK HAVE_POSIX_SIGNALBLOCKING -GL_COND_OBJ_OPEN_FALSE -GL_COND_OBJ_OPEN_TRUE -GL_COND_OBJ_MSVC_NOTHROW_FALSE -GL_COND_OBJ_MSVC_NOTHROW_TRUE -GL_COND_OBJ_MSVC_INVAL_FALSE -GL_COND_OBJ_MSVC_INVAL_TRUE -GL_COND_OBJ_MEMPCPY_FALSE -GL_COND_OBJ_MEMPCPY_TRUE -GL_GNULIB_MDA_STRDUP -GL_GNULIB_MDA_MEMCCPY -GL_GNULIB_STRVERSCMP -GL_GNULIB_STRSIGNAL -GL_GNULIB_SIGDESCR_NP -GL_GNULIB_SIGABBREV_NP -GL_GNULIB_STRERRORNAME_NP -GL_GNULIB_STRERROR_R -GL_GNULIB_STRERROR -GL_GNULIB_MBSTOK_R -GL_GNULIB_MBSSEP -GL_GNULIB_MBSSPN -GL_GNULIB_MBSPBRK -GL_GNULIB_MBSCSPN -GL_GNULIB_MBSCASESTR -GL_GNULIB_MBSPCASECMP -GL_GNULIB_MBSNCASECMP -GL_GNULIB_MBSCASECMP -GL_GNULIB_MBSSTR -GL_GNULIB_MBSRCHR -GL_GNULIB_MBSCHR -GL_GNULIB_MBSNLEN -GL_GNULIB_MBSLEN -GL_GNULIB_STRTOK_R -GL_GNULIB_STRCASESTR -GL_GNULIB_STRSTR -GL_GNULIB_STRSEP -GL_GNULIB_STRPBRK -GL_GNULIB_STRNLEN -GL_GNULIB_STRNDUP -GL_GNULIB_STRNCAT -GL_GNULIB_STRDUP -GL_GNULIB_STRCHRNUL -GL_GNULIB_STPNCPY -GL_GNULIB_STPCPY -GL_GNULIB_RAWMEMCHR -GL_GNULIB_MEMSET_EXPLICIT -GL_GNULIB_MEMRCHR -GL_GNULIB_MEMPCPY -GL_GNULIB_MEMMEM -GL_GNULIB_MEMCHR -GL_GNULIB_FFSLL -GL_GNULIB_FFSL -GL_GNULIB_EXPLICIT_BZERO -GL_COND_OBJ_MEMCHR_FALSE -GL_COND_OBJ_MEMCHR_TRUE +GNULIB_SIGACTION +GNULIB_SIGPROCMASK +GNULIB_SIGNAL_H_SIGPIPE +GNULIB_RAISE +GNULIB_PTHREAD_SIGMASK UNDEFINE_STRTOK_R REPLACE_STRSIGNAL REPLACE_STRERRORNAME_NP @@ -965,8 +859,6 @@ REPLACE_STRDUP REPLACE_STRCHRNUL REPLACE_STPNCPY -REPLACE_STPCPY -REPLACE_MEMPCPY REPLACE_MEMMEM REPLACE_MEMCHR REPLACE_FFSLL @@ -988,32 +880,61 @@ HAVE_STPCPY HAVE_RAWMEMCHR HAVE_DECL_MEMRCHR -HAVE_MEMSET_EXPLICIT HAVE_MEMPCPY HAVE_DECL_MEMMEM HAVE_FFSLL HAVE_FFSL HAVE_EXPLICIT_BZERO +GNULIB_MDA_STRDUP +GNULIB_MDA_MEMCCPY HAVE_MBSLEN +GNULIB_STRVERSCMP +GNULIB_STRSIGNAL +GNULIB_SIGDESCR_NP +GNULIB_SIGABBREV_NP +GNULIB_STRERRORNAME_NP +GNULIB_STRERROR_R +GNULIB_STRERROR +GNULIB_MBSTOK_R +GNULIB_MBSSEP +GNULIB_MBSSPN +GNULIB_MBSPBRK +GNULIB_MBSCSPN +GNULIB_MBSCASESTR +GNULIB_MBSPCASECMP +GNULIB_MBSNCASECMP +GNULIB_MBSCASECMP +GNULIB_MBSSTR +GNULIB_MBSRCHR +GNULIB_MBSCHR +GNULIB_MBSNLEN +GNULIB_MBSLEN +GNULIB_STRTOK_R +GNULIB_STRCASESTR +GNULIB_STRSTR +GNULIB_STRSEP +GNULIB_STRPBRK +GNULIB_STRNLEN +GNULIB_STRNDUP +GNULIB_STRNCAT +GNULIB_STRDUP +GNULIB_STRCHRNUL +GNULIB_STPNCPY +GNULIB_STPCPY +GNULIB_RAWMEMCHR +GNULIB_MEMRCHR +GNULIB_MEMPCPY +GNULIB_MEMMEM +GNULIB_MEMCHR +GNULIB_FFSLL +GNULIB_FFSL +GNULIB_EXPLICIT_BZERO NEXT_AS_FIRST_DIRECTIVE_MATH_H NEXT_MATH_H -GL_COND_OBJ_LSTAT_FALSE -GL_COND_OBJ_LSTAT_TRUE -GL_COND_OBJ_LSEEK_FALSE -GL_COND_OBJ_LSEEK_TRUE WINDOWS_STAT_INODES WINDOWS_64_BIT_OFF_T NEXT_AS_FIRST_DIRECTIVE_SYS_TYPES_H NEXT_SYS_TYPES_H -GL_COND_OBJ_LINK_FALSE -GL_COND_OBJ_LINK_TRUE -GL_GENERATE_LIMITS_H_FALSE -GL_GENERATE_LIMITS_H_TRUE -LIMITS_H -GL_GNULIB_STRTOUMAX -GL_GNULIB_STRTOIMAX -GL_GNULIB_IMAXDIV -GL_GNULIB_IMAXABS NEXT_AS_FIRST_DIRECTIVE_INTTYPES_H NEXT_INTTYPES_H UINT64_MAX_EQ_ULONG_MAX @@ -1023,15 +944,18 @@ INT32_MAX_LT_INTMAX_MAX REPLACE_STRTOUMAX REPLACE_STRTOIMAX -REPLACE_IMAXDIV -REPLACE_IMAXABS -HAVE_IMAXDIV -HAVE_IMAXABS HAVE_IMAXDIV_T HAVE_DECL_STRTOUMAX HAVE_DECL_STRTOIMAX HAVE_DECL_IMAXDIV HAVE_DECL_IMAXABS +GNULIB_STRTOUMAX +GNULIB_STRTOIMAX +GNULIB_IMAXDIV +GNULIB_IMAXABS +GL_GENERATE_STDINT_H_FALSE +GL_GENERATE_STDINT_H_TRUE +STDINT_H HAVE_SYS_INTTYPES_H HAVE_SYS_BITYPES_H HAVE_C99_STDINT_H @@ -1054,52 +978,24 @@ HAVE_SYS_TYPES_H HAVE_INTTYPES_H HAVE_WCHAR_H +GL_GENERATE_LIMITS_H_FALSE +GL_GENERATE_LIMITS_H_TRUE +LIMITS_H NEXT_AS_FIRST_DIRECTIVE_LIMITS_H NEXT_LIMITS_H LTLIBINTL LIBINTL -GL_COND_OBJ_GETPROGNAME_FALSE -GL_COND_OBJ_GETPROGNAME_TRUE -GL_COND_OBJ_GETOPT_FALSE -GL_COND_OBJ_GETOPT_TRUE -GL_GENERATE_GETOPT_CDEFS_H_FALSE -GL_GENERATE_GETOPT_CDEFS_H_TRUE +GNULIB_GL_UNISTD_H_GETOPT GETOPT_CDEFS_H -GL_GENERATE_GETOPT_H_FALSE -GL_GENERATE_GETOPT_H_TRUE GETOPT_H HAVE_SYS_CDEFS_H HAVE_GETOPT_H NEXT_AS_FIRST_DIRECTIVE_GETOPT_H NEXT_GETOPT_H -GL_COND_OBJ_GETDTABLESIZE_FALSE -GL_COND_OBJ_GETDTABLESIZE_TRUE -GL_GNULIB_MDA_UMASK -GL_GNULIB_MDA_MKDIR -GL_GNULIB_MDA_CHMOD -GL_GNULIB_OVERRIDES_STRUCT_STAT -GL_GNULIB_UTIMENSAT -GL_GNULIB_STAT -GL_GNULIB_MKNODAT -GL_GNULIB_MKNOD -GL_GNULIB_MKFIFOAT -GL_GNULIB_MKFIFO -GL_GNULIB_MKDIRAT -GL_GNULIB_MKDIR -GL_GNULIB_LSTAT -GL_GNULIB_LCHMOD -GL_GNULIB_GETUMASK -GL_GNULIB_FUTIMENS -GL_GNULIB_FSTATAT -GL_GNULIB_FSTAT -GL_GNULIB_FCHMODAT -GL_GNULIB_CHMOD WINDOWS_64_BIT_ST_SIZE WINDOWS_STAT_TIMESPEC NEXT_AS_FIRST_DIRECTIVE_SYS_STAT_H NEXT_SYS_STAT_H -GL_COND_OBJ_FSTAT_FALSE -GL_COND_OBJ_FSTAT_TRUE REPLACE_UTIMENSAT REPLACE_STAT REPLACE_MKNODAT @@ -1112,7 +1008,6 @@ REPLACE_FSTATAT REPLACE_FSTAT REPLACE_FCHMODAT -REPLACE_CHMOD HAVE_UTIMENSAT HAVE_MKNODAT HAVE_MKNOD @@ -1125,109 +1020,25 @@ HAVE_FUTIMENS HAVE_FSTATAT HAVE_FCHMODAT -GL_COND_OBJ_FSETERR_FALSE -GL_COND_OBJ_FSETERR_TRUE -GL_GNULIB_MDA_YN -GL_GNULIB_MDA_Y1 -GL_GNULIB_MDA_Y0 -GL_GNULIB_MDA_JN -GL_GNULIB_MDA_J1 -GL_GNULIB_MDA_J0 -GL_GNULIB_TRUNCL -GL_GNULIB_TRUNCF -GL_GNULIB_TRUNC -GL_GNULIB_TANHF -GL_GNULIB_TANL -GL_GNULIB_TANF -GL_GNULIB_SQRTL -GL_GNULIB_SQRTF -GL_GNULIB_SINHF -GL_GNULIB_SINL -GL_GNULIB_SINF -GL_GNULIB_SIGNBIT -GL_GNULIB_ROUNDL -GL_GNULIB_ROUNDF -GL_GNULIB_ROUND -GL_GNULIB_RINTL -GL_GNULIB_RINTF -GL_GNULIB_RINT -GL_GNULIB_REMAINDERL -GL_GNULIB_REMAINDERF -GL_GNULIB_REMAINDER -GL_GNULIB_POWF -GL_GNULIB_MODFL -GL_GNULIB_MODFF -GL_GNULIB_MODF -GL_GNULIB_LOGBL -GL_GNULIB_LOGBF -GL_GNULIB_LOGB -GL_GNULIB_LOG2L -GL_GNULIB_LOG2F -GL_GNULIB_LOG2 -GL_GNULIB_LOG1PL -GL_GNULIB_LOG1PF -GL_GNULIB_LOG1P -GL_GNULIB_LOG10L -GL_GNULIB_LOG10F -GL_GNULIB_LOG10 -GL_GNULIB_LOGL -GL_GNULIB_LOGF -GL_GNULIB_LOG -GL_GNULIB_LDEXPL -GL_GNULIB_LDEXPF -GL_GNULIB_ISNANL -GL_GNULIB_ISNAND -GL_GNULIB_ISNANF -GL_GNULIB_ISNAN -GL_GNULIB_ISINF -GL_GNULIB_ISFINITE -GL_GNULIB_ILOGBL -GL_GNULIB_ILOGBF -GL_GNULIB_ILOGB -GL_GNULIB_HYPOTL -GL_GNULIB_HYPOTF -GL_GNULIB_HYPOT -GL_GNULIB_FREXPL -GL_GNULIB_FREXP -GL_GNULIB_FREXPF -GL_GNULIB_FMODL -GL_GNULIB_FMODF -GL_GNULIB_FMOD -GL_GNULIB_FMAL -GL_GNULIB_FMAF -GL_GNULIB_FMA -GL_GNULIB_FLOORL -GL_GNULIB_FLOORF -GL_GNULIB_FLOOR -GL_GNULIB_FABSL -GL_GNULIB_FABSF -GL_GNULIB_EXPM1L -GL_GNULIB_EXPM1F -GL_GNULIB_EXPM1 -GL_GNULIB_EXP2L -GL_GNULIB_EXP2F -GL_GNULIB_EXP2 -GL_GNULIB_EXPL -GL_GNULIB_EXPF -GL_GNULIB_COSHF -GL_GNULIB_COSL -GL_GNULIB_COSF -GL_GNULIB_COPYSIGNL -GL_GNULIB_COPYSIGNF -GL_GNULIB_COPYSIGN -GL_GNULIB_CEILL -GL_GNULIB_CEILF -GL_GNULIB_CEIL -GL_GNULIB_CBRTL -GL_GNULIB_CBRTF -GL_GNULIB_CBRT -GL_GNULIB_ATAN2F -GL_GNULIB_ATANL -GL_GNULIB_ATANF -GL_GNULIB_ASINL -GL_GNULIB_ASINF -GL_GNULIB_ACOSL -GL_GNULIB_ACOSF +GNULIB_MDA_UMASK +GNULIB_MDA_MKDIR +GNULIB_MDA_CHMOD +GNULIB_OVERRIDES_STRUCT_STAT +GNULIB_UTIMENSAT +GNULIB_STAT +GNULIB_MKNODAT +GNULIB_MKNOD +GNULIB_MKFIFOAT +GNULIB_MKFIFO +GNULIB_MKDIRAT +GNULIB_MKDIR +GNULIB_LSTAT +GNULIB_LCHMOD +GNULIB_GETUMASK +GNULIB_FUTIMENS +GNULIB_FSTATAT +GNULIB_FSTAT +GNULIB_FCHMODAT REPLACE_TRUNCL REPLACE_TRUNCF REPLACE_TRUNC @@ -1403,68 +1214,107 @@ HAVE_ASINF HAVE_ACOSL HAVE_ACOSF -GL_COND_OBJ_FREE_FALSE -GL_COND_OBJ_FREE_TRUE -GL_GNULIB_MDA_TEMPNAM -GL_GNULIB_MDA_PUTW -GL_GNULIB_MDA_GETW -GL_GNULIB_MDA_FILENO -GL_GNULIB_MDA_FDOPEN -GL_GNULIB_MDA_FCLOSEALL -GL_GNULIB_VSPRINTF_POSIX -GL_GNULIB_VSNPRINTF -GL_GNULIB_VPRINTF_POSIX -GL_GNULIB_VPRINTF -GL_GNULIB_VFPRINTF_POSIX -GL_GNULIB_VFPRINTF -GL_GNULIB_VDPRINTF -GL_GNULIB_VSCANF -GL_GNULIB_VFSCANF -GL_GNULIB_VASPRINTF -GL_GNULIB_TMPFILE -GL_GNULIB_STDIO_H_SIGPIPE -GL_GNULIB_STDIO_H_NONBLOCKING -GL_GNULIB_SPRINTF_POSIX -GL_GNULIB_SNPRINTF -GL_GNULIB_SCANF -GL_GNULIB_RENAMEAT -GL_GNULIB_RENAME -GL_GNULIB_REMOVE -GL_GNULIB_PUTS -GL_GNULIB_PUTCHAR -GL_GNULIB_PUTC -GL_GNULIB_PRINTF_POSIX -GL_GNULIB_PRINTF -GL_GNULIB_POPEN -GL_GNULIB_PERROR -GL_GNULIB_PCLOSE -GL_GNULIB_OBSTACK_PRINTF_POSIX -GL_GNULIB_OBSTACK_PRINTF -GL_GNULIB_GETLINE -GL_GNULIB_GETDELIM -GL_GNULIB_GETCHAR -GL_GNULIB_GETC -GL_GNULIB_FWRITE -GL_GNULIB_FTELLO -GL_GNULIB_FTELL -GL_GNULIB_FSEEKO -GL_GNULIB_FSEEK -GL_GNULIB_FSCANF -GL_GNULIB_FREOPEN -GL_GNULIB_FREAD -GL_GNULIB_FPUTS -GL_GNULIB_FPUTC -GL_GNULIB_FPURGE -GL_GNULIB_FPRINTF_POSIX -GL_GNULIB_FPRINTF -GL_GNULIB_FOPEN_GNU -GL_GNULIB_FOPEN -GL_GNULIB_FGETS -GL_GNULIB_FGETC -GL_GNULIB_FFLUSH -GL_GNULIB_FDOPEN -GL_GNULIB_FCLOSE -GL_GNULIB_DPRINTF +GNULIB_MDA_YN +GNULIB_MDA_Y1 +GNULIB_MDA_Y0 +GNULIB_MDA_JN +GNULIB_MDA_J1 +GNULIB_MDA_J0 +GNULIB_TRUNCL +GNULIB_TRUNCF +GNULIB_TRUNC +GNULIB_TANHF +GNULIB_TANL +GNULIB_TANF +GNULIB_SQRTL +GNULIB_SQRTF +GNULIB_SINHF +GNULIB_SINL +GNULIB_SINF +GNULIB_SIGNBIT +GNULIB_ROUNDL +GNULIB_ROUNDF +GNULIB_ROUND +GNULIB_RINTL +GNULIB_RINTF +GNULIB_RINT +GNULIB_REMAINDERL +GNULIB_REMAINDERF +GNULIB_REMAINDER +GNULIB_POWF +GNULIB_MODFL +GNULIB_MODFF +GNULIB_MODF +GNULIB_LOGBL +GNULIB_LOGBF +GNULIB_LOGB +GNULIB_LOG2L +GNULIB_LOG2F +GNULIB_LOG2 +GNULIB_LOG1PL +GNULIB_LOG1PF +GNULIB_LOG1P +GNULIB_LOG10L +GNULIB_LOG10F +GNULIB_LOG10 +GNULIB_LOGL +GNULIB_LOGF +GNULIB_LOG +GNULIB_LDEXPL +GNULIB_LDEXPF +GNULIB_ISNANL +GNULIB_ISNAND +GNULIB_ISNANF +GNULIB_ISNAN +GNULIB_ISINF +GNULIB_ISFINITE +GNULIB_ILOGBL +GNULIB_ILOGBF +GNULIB_ILOGB +GNULIB_HYPOTL +GNULIB_HYPOTF +GNULIB_HYPOT +GNULIB_FREXPL +GNULIB_FREXP +GNULIB_FREXPF +GNULIB_FMODL +GNULIB_FMODF +GNULIB_FMOD +GNULIB_FMAL +GNULIB_FMAF +GNULIB_FMA +GNULIB_FLOORL +GNULIB_FLOORF +GNULIB_FLOOR +GNULIB_FABSL +GNULIB_FABSF +GNULIB_EXPM1L +GNULIB_EXPM1F +GNULIB_EXPM1 +GNULIB_EXP2L +GNULIB_EXP2F +GNULIB_EXP2 +GNULIB_EXPL +GNULIB_EXPF +GNULIB_COSHF +GNULIB_COSL +GNULIB_COSF +GNULIB_COPYSIGNL +GNULIB_COPYSIGNF +GNULIB_COPYSIGN +GNULIB_CEILL +GNULIB_CEILF +GNULIB_CEIL +GNULIB_CBRTL +GNULIB_CBRTF +GNULIB_CBRT +GNULIB_ATAN2F +GNULIB_ATANL +GNULIB_ATANF +GNULIB_ASINL +GNULIB_ASINF +GNULIB_ACOSL +GNULIB_ACOSF REPLACE_VSPRINTF REPLACE_VSNPRINTF REPLACE_VPRINTF @@ -1492,7 +1342,6 @@ REPLACE_FREOPEN REPLACE_FPURGE REPLACE_FPRINTF -REPLACE_FOPEN_FOR_FOPEN_GNU REPLACE_FOPEN REPLACE_FFLUSH REPLACE_FDOPEN @@ -1508,73 +1357,112 @@ HAVE_DPRINTF HAVE_DECL_VSNPRINTF HAVE_DECL_SNPRINTF -HAVE_DECL_PUTW HAVE_DECL_OBSTACK_PRINTF -HAVE_DECL_GETW HAVE_DECL_GETLINE HAVE_DECL_GETDELIM HAVE_DECL_FTELLO HAVE_DECL_FSEEKO HAVE_DECL_FPURGE HAVE_DECL_FCLOSEALL +GNULIB_MDA_TEMPNAM +GNULIB_MDA_PUTW +GNULIB_MDA_GETW +GNULIB_MDA_FILENO +GNULIB_MDA_FDOPEN +GNULIB_MDA_FCLOSEALL +GNULIB_VSPRINTF_POSIX +GNULIB_VSNPRINTF +GNULIB_VPRINTF_POSIX +GNULIB_VPRINTF +GNULIB_VFPRINTF_POSIX +GNULIB_VFPRINTF +GNULIB_VDPRINTF +GNULIB_VSCANF +GNULIB_VFSCANF +GNULIB_VASPRINTF +GNULIB_TMPFILE +GNULIB_STDIO_H_SIGPIPE +GNULIB_STDIO_H_NONBLOCKING +GNULIB_SPRINTF_POSIX +GNULIB_SNPRINTF +GNULIB_SCANF +GNULIB_RENAMEAT +GNULIB_RENAME +GNULIB_REMOVE +GNULIB_PUTS +GNULIB_PUTCHAR +GNULIB_PUTC +GNULIB_PRINTF_POSIX +GNULIB_PRINTF +GNULIB_POPEN +GNULIB_PERROR +GNULIB_PCLOSE +GNULIB_OBSTACK_PRINTF_POSIX +GNULIB_OBSTACK_PRINTF +GNULIB_GETLINE +GNULIB_GETDELIM +GNULIB_GETCHAR +GNULIB_GETC +GNULIB_FWRITE +GNULIB_FTELLO +GNULIB_FTELL +GNULIB_FSEEKO +GNULIB_FSEEK +GNULIB_FSCANF +GNULIB_FREOPEN +GNULIB_FREAD +GNULIB_FPUTS +GNULIB_FPUTC +GNULIB_FPURGE +GNULIB_FPRINTF_POSIX +GNULIB_FPRINTF +GNULIB_FOPEN +GNULIB_FGETS +GNULIB_FGETC +GNULIB_FFLUSH +GNULIB_FDOPEN +GNULIB_FCLOSE +GNULIB_DPRINTF HAVE_FEATURES_H -GNULIBHEADERS_OVERRIDE_WINT_T +GNULIB_OVERRIDES_WINT_T APPLE_UNIVERSAL_BUILD HAVE_SAME_LONG_DOUBLE_AS_DOUBLE -GL_COND_OBJ_ITOLD_FALSE -GL_COND_OBJ_ITOLD_TRUE -GL_COND_OBJ_FLOAT_FALSE -GL_COND_OBJ_FLOAT_TRUE +REPLACE_ITOLD GL_GENERATE_FLOAT_H_FALSE GL_GENERATE_FLOAT_H_TRUE FLOAT_H -REPLACE_ITOLD NEXT_AS_FIRST_DIRECTIVE_FLOAT_H NEXT_FLOAT_H NEXT_AS_FIRST_DIRECTIVE_FCNTL_H NEXT_FCNTL_H -GL_GNULIB_MDA_OPEN -GL_GNULIB_MDA_CREAT -GL_GNULIB_OPENAT -GL_GNULIB_OPEN -GL_GNULIB_NONBLOCKING -GL_GNULIB_FCNTL -GL_GNULIB_CREAT -GL_COND_OBJ_FCNTL_FALSE -GL_COND_OBJ_FCNTL_TRUE REPLACE_OPENAT REPLACE_OPEN REPLACE_FCNTL REPLACE_CREAT HAVE_OPENAT HAVE_FCNTL -GL_GENERATE_ERROR_H_FALSE -GL_GENERATE_ERROR_H_TRUE -ERROR_H -GL_COND_OBJ_ERROR_FALSE -GL_COND_OBJ_ERROR_TRUE -REPLACE_ERROR_AT_LINE -REPLACE_ERROR -HAVE_ERROR_AT_LINE -HAVE_ERROR -HAVE_ERROR_H -NEXT_AS_FIRST_DIRECTIVE_ERROR_H -NEXT_ERROR_H -GL_GENERATE_ERRNO_H_FALSE -GL_GENERATE_ERRNO_H_TRUE -ERRNO_H +GNULIB_MDA_OPEN +GNULIB_MDA_CREAT +GNULIB_OPENAT +GNULIB_OPEN +GNULIB_NONBLOCKING +GNULIB_FCNTL +GNULIB_CREAT EOVERFLOW_VALUE EOVERFLOW_HIDDEN ENOLINK_VALUE ENOLINK_HIDDEN EMULTIHOP_VALUE EMULTIHOP_HIDDEN +GL_GENERATE_ERRNO_H_FALSE +GL_GENERATE_ERRNO_H_TRUE +ERRNO_H NEXT_AS_FIRST_DIRECTIVE_ERRNO_H NEXT_ERRNO_H -GL_COND_OBJ_DUP2_FALSE -GL_COND_OBJ_DUP2_TRUE -GL_COND_OBJ_CLOSE_FALSE -GL_COND_OBJ_CLOSE_TRUE +PRAGMA_COLUMNS +PRAGMA_SYSTEM_HEADER +INCLUDE_NEXT_AS_FIRST_DIRECTIVE +INCLUDE_NEXT HAVE_WINSOCK2_H HAVE_MSVC_INVALID_PARAMETER_HANDLER UNISTD_H_HAVE_WINSOCK2_H_AND_USE_SOCKETS @@ -1589,30 +1477,25 @@ REPLACE_SYMLINKAT REPLACE_SYMLINK REPLACE_SLEEP -REPLACE_SETHOSTNAME REPLACE_RMDIR REPLACE_READLINKAT REPLACE_READLINK REPLACE_READ REPLACE_PWRITE REPLACE_PREAD -REPLACE_PIPE2 REPLACE_LSEEK REPLACE_LINKAT REPLACE_LINK REPLACE_LCHOWN REPLACE_ISATTY -REPLACE_GETPASS_FOR_GETPASS_GNU REPLACE_GETPASS REPLACE_GETPAGESIZE REPLACE_GETGROUPS REPLACE_GETLOGIN_R -REPLACE_GETENTROPY REPLACE_GETDTABLESIZE REPLACE_GETDOMAINNAME REPLACE_GETCWD REPLACE_FTRUNCATE -REPLACE_FDATASYNC REPLACE_FCHOWNAT REPLACE_FACCESSAT REPLACE_EXECVPE @@ -1622,10 +1505,8 @@ REPLACE_EXECLP REPLACE_EXECLE REPLACE_EXECL -REPLACE_DUP3 REPLACE_DUP2 REPLACE_DUP -REPLACE_COPY_FILE_RANGE REPLACE_CLOSE REPLACE_CHOWN REPLACE_ACCESS @@ -1677,191 +1558,118 @@ HAVE_DUP3 HAVE_COPY_FILE_RANGE HAVE_CHOWN -GL_GNULIB_MDA_WRITE -GL_GNULIB_MDA_UNLINK -GL_GNULIB_MDA_SWAB -GL_GNULIB_MDA_RMDIR -GL_GNULIB_MDA_READ -GL_GNULIB_MDA_LSEEK -GL_GNULIB_MDA_ISATTY -GL_GNULIB_MDA_GETPID -GL_GNULIB_MDA_GETCWD -GL_GNULIB_MDA_EXECVPE -GL_GNULIB_MDA_EXECVP -GL_GNULIB_MDA_EXECVE -GL_GNULIB_MDA_EXECV -GL_GNULIB_MDA_EXECLP -GL_GNULIB_MDA_EXECLE -GL_GNULIB_MDA_EXECL -GL_GNULIB_MDA_DUP2 -GL_GNULIB_MDA_DUP -GL_GNULIB_MDA_CLOSE -GL_GNULIB_MDA_CHDIR -GL_GNULIB_MDA_ACCESS -GL_GNULIB_WRITE -GL_GNULIB_USLEEP -GL_GNULIB_UNLINKAT -GL_GNULIB_UNLINK -GL_GNULIB_UNISTD_H_SIGPIPE -GL_GNULIB_UNISTD_H_NONBLOCKING -GL_GNULIB_UNISTD_H_GETOPT -GL_GNULIB_TTYNAME_R -GL_GNULIB_TRUNCATE -GL_GNULIB_SYMLINKAT -GL_GNULIB_SYMLINK -GL_GNULIB_SLEEP -GL_GNULIB_SETHOSTNAME -GL_GNULIB_RMDIR -GL_GNULIB_READLINKAT -GL_GNULIB_READLINK -GL_GNULIB_READ -GL_GNULIB_PWRITE -GL_GNULIB_PREAD -GL_GNULIB_PIPE2 -GL_GNULIB_PIPE -GL_GNULIB_LSEEK -GL_GNULIB_LINKAT -GL_GNULIB_LINK -GL_GNULIB_LCHOWN -GL_GNULIB_ISATTY -GL_GNULIB_GROUP_MEMBER -GL_GNULIB_GETUSERSHELL -GL_GNULIB_GETPASS_GNU -GL_GNULIB_GETPASS -GL_GNULIB_GETPAGESIZE -GL_GNULIB_GETOPT_POSIX -GL_GNULIB_GETLOGIN_R -GL_GNULIB_GETLOGIN -GL_GNULIB_GETHOSTNAME -GL_GNULIB_GETGROUPS -GL_GNULIB_GETENTROPY -GL_GNULIB_GETDTABLESIZE -GL_GNULIB_GETDOMAINNAME -GL_GNULIB_GETCWD -GL_GNULIB_FTRUNCATE -GL_GNULIB_FSYNC -GL_GNULIB_FDATASYNC -GL_GNULIB_FCHOWNAT -GL_GNULIB_FCHDIR -GL_GNULIB_FACCESSAT -GL_GNULIB_EXECVPE -GL_GNULIB_EXECVP -GL_GNULIB_EXECVE -GL_GNULIB_EXECV -GL_GNULIB_EXECLP -GL_GNULIB_EXECLE -GL_GNULIB_EXECL -GL_GNULIB_EUIDACCESS -GL_GNULIB_ENVIRON -GL_GNULIB_DUP3 -GL_GNULIB_DUP2 -GL_GNULIB_DUP -GL_GNULIB_COPY_FILE_RANGE -GL_GNULIB_CLOSE -GL_GNULIB_CHOWN -GL_GNULIB_CHDIR -GL_GNULIB_ACCESS -GL_COND_OBJ_CANONICALIZE_LGPL_FALSE -GL_COND_OBJ_CANONICALIZE_LGPL_TRUE -GL_GNULIB_MDA_PUTENV -GL_GNULIB_MDA_MKTEMP -GL_GNULIB_MDA_GCVT -GL_GNULIB_MDA_FCVT -GL_GNULIB_MDA_ECVT -GL_GNULIB_WCTOMB -GL_GNULIB_UNSETENV -GL_GNULIB_UNLOCKPT -GL_GNULIB_SYSTEM_POSIX -GL_GNULIB_STRTOULL -GL_GNULIB_STRTOUL -GL_GNULIB_STRTOLL -GL_GNULIB_STRTOLD -GL_GNULIB_STRTOL -GL_GNULIB_STRTOD -GL_GNULIB_SETENV -GL_GNULIB_SECURE_GETENV -GL_GNULIB_RPMATCH -GL_GNULIB_REALPATH -GL_GNULIB_REALLOC_POSIX -GL_GNULIB_REALLOC_GNU -GL_GNULIB_REALLOCARRAY -GL_GNULIB_RANDOM_R -GL_GNULIB_RANDOM -GL_GNULIB_QSORT_R -GL_GNULIB_PUTENV -GL_GNULIB_PTSNAME_R -GL_GNULIB_PTSNAME -GL_GNULIB_POSIX_OPENPT -GL_GNULIB_POSIX_MEMALIGN -GL_GNULIB_MKSTEMPS -GL_GNULIB_MKSTEMP -GL_GNULIB_MKOSTEMPS -GL_GNULIB_MKOSTEMP -GL_GNULIB_MKDTEMP -GL_GNULIB_MBTOWC -GL_GNULIB_MBSTOWCS -GL_GNULIB_MALLOC_POSIX -GL_GNULIB_MALLOC_GNU -GL_GNULIB_GRANTPT -GL_GNULIB_GETSUBOPT -GL_GNULIB_GETPROGNAME -GL_GNULIB_GETLOADAVG -GL_GNULIB_FREE_POSIX -GL_GNULIB_CANONICALIZE_FILE_NAME -GL_GNULIB_CALLOC_POSIX -GL_GNULIB_CALLOC_GNU -GL_GNULIB_ATOLL -GL_GNULIB_ALIGNED_ALLOC -GL_GNULIB__EXIT +GNULIB_MDA_WRITE +GNULIB_MDA_UNLINK +GNULIB_MDA_SWAB +GNULIB_MDA_RMDIR +GNULIB_MDA_READ +GNULIB_MDA_LSEEK +GNULIB_MDA_ISATTY +GNULIB_MDA_GETPID +GNULIB_MDA_GETCWD +GNULIB_MDA_EXECVPE +GNULIB_MDA_EXECVP +GNULIB_MDA_EXECVE +GNULIB_MDA_EXECV +GNULIB_MDA_EXECLP +GNULIB_MDA_EXECLE +GNULIB_MDA_EXECL +GNULIB_MDA_DUP2 +GNULIB_MDA_DUP +GNULIB_MDA_CLOSE +GNULIB_MDA_CHDIR +GNULIB_MDA_ACCESS +GNULIB_WRITE +GNULIB_USLEEP +GNULIB_UNLINKAT +GNULIB_UNLINK +GNULIB_UNISTD_H_SIGPIPE +GNULIB_UNISTD_H_NONBLOCKING +GNULIB_TTYNAME_R +GNULIB_TRUNCATE +GNULIB_SYMLINKAT +GNULIB_SYMLINK +GNULIB_SLEEP +GNULIB_SETHOSTNAME +GNULIB_RMDIR +GNULIB_READLINKAT +GNULIB_READLINK +GNULIB_READ +GNULIB_PWRITE +GNULIB_PREAD +GNULIB_PIPE2 +GNULIB_PIPE +GNULIB_LSEEK +GNULIB_LINKAT +GNULIB_LINK +GNULIB_LCHOWN +GNULIB_ISATTY +GNULIB_GROUP_MEMBER +GNULIB_GETUSERSHELL +GNULIB_GETPASS +GNULIB_GETPAGESIZE +GNULIB_GETOPT_POSIX +GNULIB_GETLOGIN_R +GNULIB_GETLOGIN +GNULIB_GETHOSTNAME +GNULIB_GETGROUPS +GNULIB_GETENTROPY +GNULIB_GETDTABLESIZE +GNULIB_GETDOMAINNAME +GNULIB_GETCWD +GNULIB_FTRUNCATE +GNULIB_FSYNC +GNULIB_FDATASYNC +GNULIB_FCHOWNAT +GNULIB_FCHDIR +GNULIB_FACCESSAT +GNULIB_EXECVPE +GNULIB_EXECVP +GNULIB_EXECVE +GNULIB_EXECV +GNULIB_EXECLP +GNULIB_EXECLE +GNULIB_EXECL +GNULIB_EUIDACCESS +GNULIB_ENVIRON +GNULIB_DUP3 +GNULIB_DUP2 +GNULIB_DUP +GNULIB_COPY_FILE_RANGE +GNULIB_CLOSE +GNULIB_CHOWN +GNULIB_CHDIR +GNULIB_ACCESS REPLACE_WCTOMB REPLACE_UNSETENV -REPLACE_STRTOULL -REPLACE_STRTOUL -REPLACE_STRTOLL REPLACE_STRTOLD -REPLACE_STRTOL REPLACE_STRTOD REPLACE_SETSTATE REPLACE_SETENV REPLACE_REALPATH -REPLACE_REALLOCARRAY -REPLACE_REALLOC_FOR_REALLOC_POSIX -REPLACE_REALLOC_FOR_REALLOC_GNU +REPLACE_REALLOC REPLACE_RANDOM_R REPLACE_RANDOM REPLACE_QSORT_R REPLACE_PUTENV REPLACE_PTSNAME_R REPLACE_PTSNAME -REPLACE_POSIX_OPENPT REPLACE_POSIX_MEMALIGN REPLACE_MKSTEMP -REPLACE_MKOSTEMPS -REPLACE_MKOSTEMP REPLACE_MBTOWC -REPLACE_MBSTOWCS -REPLACE_MB_CUR_MAX -REPLACE_MALLOC_FOR_MALLOC_POSIX -REPLACE_MALLOC_FOR_MALLOC_GNU +REPLACE_MALLOC REPLACE_INITSTATE -REPLACE_GETSUBOPT -REPLACE_GETPROGNAME -REPLACE_GETLOADAVG REPLACE_FREE REPLACE_CANONICALIZE_FILE_NAME -REPLACE_CALLOC_FOR_CALLOC_POSIX -REPLACE_CALLOC_FOR_CALLOC_GNU +REPLACE_CALLOC REPLACE_ALIGNED_ALLOC -REPLACE__EXIT HAVE_DECL_UNSETENV HAVE_UNLOCKPT HAVE_SYS_LOADAVG_H HAVE_STRUCT_RANDOM_DATA HAVE_STRTOULL -HAVE_STRTOUL HAVE_STRTOLL HAVE_STRTOLD -HAVE_STRTOL HAVE_STRTOD HAVE_DECL_SETSTATE HAVE_SETSTATE @@ -1889,8 +1697,6 @@ HAVE_INITSTATE HAVE_GRANTPT HAVE_GETSUBOPT -HAVE_GETPROGNAME -HAVE_DECL_PROGRAM_INVOCATION_NAME HAVE_DECL_GETLOADAVG HAVE_DECL_GCVT HAVE_DECL_FCVT @@ -1899,19 +1705,53 @@ HAVE_ATOLL HAVE_ALIGNED_ALLOC HAVE__EXIT -GL_GENERATE_ASSERT_H_FALSE -GL_GENERATE_ASSERT_H_TRUE -ASSERT_H -NEXT_AS_FIRST_DIRECTIVE_ASSERT_H -NEXT_ASSERT_H -PRAGMA_COLUMNS -PRAGMA_SYSTEM_HEADER -INCLUDE_NEXT_AS_FIRST_DIRECTIVE -INCLUDE_NEXT +GNULIB_MDA_PUTENV +GNULIB_MDA_MKTEMP +GNULIB_MDA_GCVT +GNULIB_MDA_FCVT +GNULIB_MDA_ECVT +GNULIB_WCTOMB +GNULIB_UNSETENV +GNULIB_UNLOCKPT +GNULIB_SYSTEM_POSIX +GNULIB_STRTOULL +GNULIB_STRTOLL +GNULIB_STRTOLD +GNULIB_STRTOD +GNULIB_SETENV +GNULIB_SECURE_GETENV +GNULIB_RPMATCH +GNULIB_REALPATH +GNULIB_REALLOC_POSIX +GNULIB_REALLOCARRAY +GNULIB_RANDOM_R +GNULIB_RANDOM +GNULIB_QSORT_R +GNULIB_PUTENV +GNULIB_PTSNAME_R +GNULIB_PTSNAME +GNULIB_POSIX_OPENPT +GNULIB_POSIX_MEMALIGN +GNULIB_MKSTEMPS +GNULIB_MKSTEMP +GNULIB_MKOSTEMPS +GNULIB_MKOSTEMP +GNULIB_MKDTEMP +GNULIB_MBTOWC +GNULIB_MALLOC_POSIX +GNULIB_GRANTPT +GNULIB_GETSUBOPT +GNULIB_GETLOADAVG +GNULIB_FREE_POSIX +GNULIB_CANONICALIZE_FILE_NAME +GNULIB_CALLOC_POSIX +GNULIB_ATOLL +GNULIB_ALIGNED_ALLOC +GNULIB__EXIT +HAVE_ALLOCA_H GL_GENERATE_ALLOCA_H_FALSE GL_GENERATE_ALLOCA_H_TRUE ALLOCA_H -HAVE_ALLOCA_H ALLOCA GL_COND_LIBTOOL_FALSE GL_COND_LIBTOOL_TRUE @@ -2025,7 +1865,6 @@ enable_largefile enable_cross_guesses enable_gcc_warnings -enable_year2038 ' ac_precious_vars='build_alias host_alias @@ -2589,7 +2428,7 @@ # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures mmv 2.5 to adapt to many kinds of systems. +\`configure' configures mmv 2.5.1 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -2660,7 +2499,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of mmv 2.5:";; + short | recursive ) echo "Configuration of mmv 2.5.1:";; esac cat <<\_ACEOF @@ -2678,7 +2517,6 @@ --enable-cross-guesses={conservative|risky} specify policy for cross-compilation guesses --enable-gcc-warnings turn on lots of GCC warnings (for developers) - --enable-year2038 support timestamps after 2038 Some influential environment variables: CC C compiler command @@ -2766,7 +2604,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -mmv configure 2.5 +mmv configure 2.5.1 generated by GNU Autoconf 2.71 Copyright (C) 2021 Free Software Foundation, Inc. @@ -3099,63 +2937,6 @@ } # ac_fn_c_check_func -# ac_fn_check_decl LINENO SYMBOL VAR INCLUDES EXTRA-OPTIONS FLAG-VAR -# ------------------------------------------------------------------ -# Tests whether SYMBOL is declared in INCLUDES, setting cache variable VAR -# accordingly. Pass EXTRA-OPTIONS to the compiler, using FLAG-VAR. -ac_fn_check_decl () -{ - ac_save_ac_compile="$ac_compile" - if test -n "$ac_compile_for_check_decl"; then - ac_compile="$ac_compile_for_check_decl" - fi - as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack - as_decl_name=`echo $2|sed 's/ *(.*//'` - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether $as_decl_name is declared" >&5 -printf %s "checking whether $as_decl_name is declared... " >&6; } -if eval test \${$3+y} -then : - printf %s "(cached) " >&6 -else $as_nop - as_decl_use=`echo $2|sed -e 's/(/((/' -e 's/)/) 0&/' -e 's/,/) 0& (/g'` - eval ac_save_FLAGS=\$$6 - as_fn_append $6 " $5" - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -$4 -int -main (void) -{ -#ifndef $as_decl_name -#ifdef __cplusplus - (void) $as_decl_use; -#else - (void) $as_decl_name; -#endif -#endif - - ; - return 0; -} -_ACEOF -if ac_fn_c_try_compile "$LINENO" -then : - eval "$3=yes" -else $as_nop - eval "$3=no" -fi -rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext - eval $6=\$ac_save_FLAGS - -fi -eval ac_res=\$$3 - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 -printf "%s\n" "$ac_res" >&6; } - eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno - ac_compile="$ac_save_ac_compile" - -} # ac_fn_check_decl - # ac_fn_c_compute_int LINENO EXPR VAR INCLUDES # -------------------------------------------- # Tries to find the compile-time value of EXPR in a program that includes @@ -3345,6 +3126,63 @@ } # ac_fn_c_compute_int +# ac_fn_check_decl LINENO SYMBOL VAR INCLUDES EXTRA-OPTIONS FLAG-VAR +# ------------------------------------------------------------------ +# Tests whether SYMBOL is declared in INCLUDES, setting cache variable VAR +# accordingly. Pass EXTRA-OPTIONS to the compiler, using FLAG-VAR. +ac_fn_check_decl () +{ + ac_save_ac_compile="$ac_compile" + if test -n "$ac_compile_for_check_decl"; then + ac_compile="$ac_compile_for_check_decl" + fi + as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack + as_decl_name=`echo $2|sed 's/ *(.*//'` + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether $as_decl_name is declared" >&5 +printf %s "checking whether $as_decl_name is declared... " >&6; } +if eval test \${$3+y} +then : + printf %s "(cached) " >&6 +else $as_nop + as_decl_use=`echo $2|sed -e 's/(/((/' -e 's/)/) 0&/' -e 's/,/) 0& (/g'` + eval ac_save_FLAGS=\$$6 + as_fn_append $6 " $5" + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +$4 +int +main (void) +{ +#ifndef $as_decl_name +#ifdef __cplusplus + (void) $as_decl_use; +#else + (void) $as_decl_name; +#endif +#endif + + ; + return 0; +} +_ACEOF +if ac_fn_c_try_compile "$LINENO" +then : + eval "$3=yes" +else $as_nop + eval "$3=no" +fi +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext + eval $6=\$ac_save_FLAGS + +fi +eval ac_res=\$$3 + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 +printf "%s\n" "$ac_res" >&6; } + eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno + ac_compile="$ac_save_ac_compile" + +} # ac_fn_check_decl + # ac_fn_c_check_member LINENO AGGR MEMBER VAR INCLUDES # ---------------------------------------------------- # Tries to find if the field MEMBER exists in type AGGR, after including @@ -3428,7 +3266,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by mmv $as_me 2.5, which was +It was created by mmv $as_me 2.5.1, which was generated by GNU Autoconf 2.71. Invocation command line was $ $0$ac_configure_args_raw @@ -4019,21 +3857,23 @@ as_fn_append ac_header_c_list " wchar.h wchar_h HAVE_WCHAR_H" as_fn_append ac_header_c_list " minix/config.h minix_config_h HAVE_MINIX_CONFIG_H" as_fn_append ac_func_c_list " canonicalize_file_name HAVE_CANONICALIZE_FILE_NAME" +as_fn_append ac_func_c_list " faccessat HAVE_FACCESSAT" as_fn_append ac_func_c_list " realpath HAVE_REALPATH" as_fn_append ac_func_c_list " lstat HAVE_LSTAT" as_fn_append ac_header_c_list " sys/param.h sys_param_h HAVE_SYS_PARAM_H" as_fn_append ac_func_c_list " _set_invalid_parameter_handler HAVE__SET_INVALID_PARAMETER_HANDLER" as_fn_append ac_header_c_list " sys/socket.h sys_socket_h HAVE_SYS_SOCKET_H" -as_fn_append ac_header_c_list " error.h error_h HAVE_ERROR_H" as_fn_append ac_func_c_list " fcntl HAVE_FCNTL" as_fn_append ac_func_c_list " symlink HAVE_SYMLINK" -as_fn_append ac_func_c_list " snprintf HAVE_SNPRINTF" as_fn_append ac_func_c_list " vasnprintf HAVE_VASNPRINTF" as_fn_append ac_header_c_list " features.h features_h HAVE_FEATURES_H" +as_fn_append ac_func_c_list " snprintf HAVE_SNPRINTF" +as_fn_append ac_func_c_list " __fseterr HAVE___FSETERR" as_fn_append ac_func_c_list " getdtablesize HAVE_GETDTABLESIZE" gl_getopt_required=GNU as_fn_append ac_header_c_list " getopt.h getopt_h HAVE_GETOPT_H" as_fn_append ac_header_c_list " sys/cdefs.h sys_cdefs_h HAVE_SYS_CDEFS_H" +as_fn_append ac_func_c_list " getprogname HAVE_GETPROGNAME" as_fn_append ac_func_c_list " getexecname HAVE_GETEXECNAME" as_fn_append ac_header_c_list " limits.h limits_h HAVE_LIMITS_H" as_fn_append ac_func_c_list " link HAVE_LINK" @@ -4043,8 +3883,6 @@ gl_printf_safe=yes as_fn_append ac_func_c_list " readlink HAVE_READLINK" as_fn_append ac_header_c_list " sys/time.h sys_time_h HAVE_SYS_TIME_H" -as_fn_append ac_header_c_list " stdbool.h stdbool_h HAVE_STDBOOL_H" -as_fn_append ac_header_c_list " stdckdint.h stdckdint_h HAVE_STDCKDINT_H" as_fn_append ac_header_c_list " crtdefs.h crtdefs_h HAVE_CRTDEFS_H" # Auxiliary files required by this configure script. @@ -4728,7 +4566,7 @@ # Define the identity of the package. PACKAGE='mmv' - VERSION='2.5' + VERSION='2.5.1' printf "%s\n" "#define PACKAGE \"$PACKAGE\"" >>confdefs.h @@ -6338,8 +6176,6 @@ printf "%s\n" "#define __STDC_WANT_IEC_60559_DFP_EXT__ 1" >>confdefs.h - printf "%s\n" "#define __STDC_WANT_IEC_60559_EXT__ 1" >>confdefs.h - printf "%s\n" "#define __STDC_WANT_IEC_60559_FUNCS_EXT__ 1" >>confdefs.h printf "%s\n" "#define __STDC_WANT_IEC_60559_TYPES_EXT__ 1" >>confdefs.h @@ -7182,6 +7018,7 @@ + # IEEE behaviour is the default on all CPUs except Alpha and SH # (according to the test results of Bruno Haible's ieeefp/fenv_default.m4 # and the GCC 4.1.2 manual). @@ -7213,22 +7050,71 @@ then : enableval=$enable_largefile; fi -if test "$enable_largefile,$enable_year2038" != no,no -then : - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $CC option to enable large file support" >&5 -printf %s "checking for $CC option to enable large file support... " >&6; } -if test ${ac_cv_sys_largefile_opts+y} + +if test "$enable_largefile" != no; then + + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for special C compiler options needed for large files" >&5 +printf %s "checking for special C compiler options needed for large files... " >&6; } +if test ${ac_cv_sys_largefile_CC+y} then : printf %s "(cached) " >&6 else $as_nop - ac_save_CC="$CC" - ac_opt_found=no - for ac_opt in "none needed" "-D_FILE_OFFSET_BITS=64" "-D_LARGE_FILES=1" "-n32"; do - if test x"$ac_opt" != x"none needed" + ac_cv_sys_largefile_CC=no + if test "$GCC" != yes; then + ac_save_CC=$CC + while :; do + # IRIX 6.2 and later do not support large files by default, + # so use the C compiler's -n32 option if that helps. + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#include + /* Check that off_t can represent 2**63 - 1 correctly. + We can't simply define LARGE_OFF_T to be 9223372036854775807, + since some C++ compilers masquerading as C compilers + incorrectly reject 9223372036854775807. */ +#define LARGE_OFF_T (((off_t) 1 << 31 << 31) - 1 + ((off_t) 1 << 31 << 31)) + int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721 + && LARGE_OFF_T % 2147483647 == 1) + ? 1 : -1]; +int +main (void) +{ + + ; + return 0; +} +_ACEOF + if ac_fn_c_try_compile "$LINENO" then : - CC="$ac_save_CC $ac_opt" + break fi - cat confdefs.h - <<_ACEOF >conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.beam + CC="$CC -n32" + if ac_fn_c_try_compile "$LINENO" +then : + ac_cv_sys_largefile_CC=' -n32'; break +fi +rm -f core conftest.err conftest.$ac_objext conftest.beam + break + done + CC=$ac_save_CC + rm -f conftest.$ac_ext + fi +fi +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sys_largefile_CC" >&5 +printf "%s\n" "$ac_cv_sys_largefile_CC" >&6; } + if test "$ac_cv_sys_largefile_CC" != no; then + CC=$CC$ac_cv_sys_largefile_CC + fi + + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for _FILE_OFFSET_BITS value needed for large files" >&5 +printf %s "checking for _FILE_OFFSET_BITS value needed for large files... " >&6; } +if test ${ac_cv_sys_file_offset_bits+y} +then : + printf %s "(cached) " >&6 +else $as_nop + while :; do + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include /* Check that off_t can represent 2**63 - 1 correctly. @@ -7249,79 +7135,91 @@ _ACEOF if ac_fn_c_try_compile "$LINENO" then : - ac_cv_sys_largefile_opts="$ac_opt" - ac_opt_found=yes + ac_cv_sys_file_offset_bits=no; break fi rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext - test $ac_opt_found = no || break - done - CC="$ac_save_CC" - - - if test $ac_opt_found != yes; then - case $host_os in #( - mingw*) : - ac_cv_sys_largefile_opts="supported through gnulib" - ac_opt_found=yes - ;; #( - *) : - ;; -esac - fi + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#define _FILE_OFFSET_BITS 64 +#include + /* Check that off_t can represent 2**63 - 1 correctly. + We can't simply define LARGE_OFF_T to be 9223372036854775807, + since some C++ compilers masquerading as C compilers + incorrectly reject 9223372036854775807. */ +#define LARGE_OFF_T (((off_t) 1 << 31 << 31) - 1 + ((off_t) 1 << 31 << 31)) + int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721 + && LARGE_OFF_T % 2147483647 == 1) + ? 1 : -1]; +int +main (void) +{ - test $ac_opt_found = yes || ac_cv_sys_largefile_opts="support not detected" + ; + return 0; +} +_ACEOF +if ac_fn_c_try_compile "$LINENO" +then : + ac_cv_sys_file_offset_bits=64; break fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sys_largefile_opts" >&5 -printf "%s\n" "$ac_cv_sys_largefile_opts" >&6; } - -ac_have_largefile=yes -case $ac_cv_sys_largefile_opts in #( - "none needed") : - ;; #( - "supported through gnulib") : - ;; #( - "support not detected") : - ac_have_largefile=no ;; #( - "-D_FILE_OFFSET_BITS=64") : - -printf "%s\n" "#define _FILE_OFFSET_BITS 64" >>confdefs.h - ;; #( - "-D_LARGE_FILES=1") : - -printf "%s\n" "#define _LARGE_FILES 1" >>confdefs.h - ;; #( - "-n32") : - CC="$CC -n32" ;; #( - *) : - as_fn_error $? "internal error: bad value for \$ac_cv_sys_largefile_opts" "$LINENO" 5 ;; +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext + ac_cv_sys_file_offset_bits=unknown + break +done +fi +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sys_file_offset_bits" >&5 +printf "%s\n" "$ac_cv_sys_file_offset_bits" >&6; } +case $ac_cv_sys_file_offset_bits in #( + no | unknown) ;; + *) +printf "%s\n" "#define _FILE_OFFSET_BITS $ac_cv_sys_file_offset_bits" >>confdefs.h +;; esac - -if test "$enable_year2038" != no -then : - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $CC option for timestamps after 2038" >&5 -printf %s "checking for $CC option for timestamps after 2038... " >&6; } -if test ${ac_cv_sys_year2038_opts+y} +rm -rf conftest* + if test $ac_cv_sys_file_offset_bits = unknown; then + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for _LARGE_FILES value needed for large files" >&5 +printf %s "checking for _LARGE_FILES value needed for large files... " >&6; } +if test ${ac_cv_sys_large_files+y} then : printf %s "(cached) " >&6 else $as_nop - ac_save_CPPFLAGS="$CPPFLAGS" - ac_opt_found=no - for ac_opt in "none needed" "-D_TIME_BITS=64" "-D__MINGW_USE_VC2005_COMPAT" "-U_USE_32_BIT_TIME_T -D__MINGW_USE_VC2005_COMPAT"; do - if test x"$ac_opt" != x"none needed" + while :; do + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#include + /* Check that off_t can represent 2**63 - 1 correctly. + We can't simply define LARGE_OFF_T to be 9223372036854775807, + since some C++ compilers masquerading as C compilers + incorrectly reject 9223372036854775807. */ +#define LARGE_OFF_T (((off_t) 1 << 31 << 31) - 1 + ((off_t) 1 << 31 << 31)) + int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721 + && LARGE_OFF_T % 2147483647 == 1) + ? 1 : -1]; +int +main (void) +{ + + ; + return 0; +} +_ACEOF +if ac_fn_c_try_compile "$LINENO" then : - CPPFLAGS="$ac_save_CPPFLAGS $ac_opt" + ac_cv_sys_large_files=no; break fi - cat confdefs.h - <<_ACEOF >conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ - - #include - /* Check that time_t can represent 2**32 - 1 correctly. */ - #define LARGE_TIME_T \\ - ((time_t) (((time_t) 1 << 30) - 1 + 3 * ((time_t) 1 << 30))) - int verify_time_t_range[(LARGE_TIME_T / 65537 == 65535 - && LARGE_TIME_T % 65537 == 0) - ? 1 : -1]; - +#define _LARGE_FILES 1 +#include + /* Check that off_t can represent 2**63 - 1 correctly. + We can't simply define LARGE_OFF_T to be 9223372036854775807, + since some C++ compilers masquerading as C compilers + incorrectly reject 9223372036854775807. */ +#define LARGE_OFF_T (((off_t) 1 << 31 << 31) - 1 + ((off_t) 1 << 31 << 31)) + int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721 + && LARGE_OFF_T % 2147483647 == 1) + ? 1 : -1]; int main (void) { @@ -7332,64 +7230,39 @@ _ACEOF if ac_fn_c_try_compile "$LINENO" then : - ac_cv_sys_year2038_opts="$ac_opt" - ac_opt_found=yes + ac_cv_sys_large_files=1; break fi rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext - test $ac_opt_found = no || break - done - CPPFLAGS="$ac_save_CPPFLAGS" - test $ac_opt_found = yes || ac_cv_sys_year2038_opts="support not detected" + ac_cv_sys_large_files=unknown + break +done fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sys_year2038_opts" >&5 -printf "%s\n" "$ac_cv_sys_year2038_opts" >&6; } - -ac_have_year2038=yes -case $ac_cv_sys_year2038_opts in #( - "none needed") : - ;; #( - "support not detected") : - ac_have_year2038=no ;; #( - "-D_TIME_BITS=64") : - -printf "%s\n" "#define _TIME_BITS 64" >>confdefs.h - ;; #( - "-D__MINGW_USE_VC2005_COMPAT") : - -printf "%s\n" "#define __MINGW_USE_VC2005_COMPAT 1" >>confdefs.h - ;; #( - "-U_USE_32_BIT_TIME_T"*) : - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 -printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;} -as_fn_error $? "the 'time_t' type is currently forced to be 32-bit. It -will stop working after mid-January 2038. Remove -_USE_32BIT_TIME_T from the compiler flags. -See \`config.log' for more details" "$LINENO" 5; } ;; #( - *) : - as_fn_error $? "internal error: bad value for \$ac_cv_sys_year2038_opts" "$LINENO" 5 ;; +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sys_large_files" >&5 +printf "%s\n" "$ac_cv_sys_large_files" >&6; } +case $ac_cv_sys_large_files in #( + no | unknown) ;; + *) +printf "%s\n" "#define _LARGE_FILES $ac_cv_sys_large_files" >>confdefs.h +;; esac - +rm -rf conftest* + fi fi -fi # Pre-early section. + # Code from module absolute-header: - # Code from module alignasof: # Code from module alloca-opt: - # Code from module assert-h: # Code from module attribute: # Code from module basename-lgpl: # Code from module binary-io: # Code from module bootstrap: - # Code from module builtin-expect: # Code from module c99: - # Code from module calloc-gnu: - # Code from module calloc-posix: # Code from module canonicalize-lgpl: # Code from module chdir: # Code from module cloexec: @@ -7400,7 +7273,6 @@ # Code from module eloop-threshold: # Code from module errno: # Code from module error: - # Code from module error-h: # Code from module exitfail: # Code from module extensions: # Code from module extern-inline: @@ -7420,14 +7292,11 @@ # Code from module fseterr: # Code from module fstat: # Code from module funclib.sh: - # Code from module gen-header: # Code from module getdtablesize: # Code from module getopt-gnu: # Code from module getopt-posix: # Code from module getprogname: # Code from module gettext-h: - # Code from module glibc-internal/scratch_buffer: - # Code from module ialloc: # Code from module idx: # Code from module ignore-value: # Code from module include_next: @@ -7444,7 +7313,6 @@ # Code from module link: # Code from module lseek: # Code from module lstat: - # Code from module malloc-gnu: # Code from module malloc-posix: # Code from module malloca: # Code from module manywarnings: @@ -7467,12 +7335,11 @@ # Code from module rawmemchr: # Code from module read: # Code from module readlink: - # Code from module realloc-gnu: # Code from module realloc-posix: - # Code from module reallocarray: # Code from module rename: # Code from module rmdir: # Code from module same-inode: + # Code from module scratch_buffer: # Code from module signal-h: # Code from module signbit: # Code from module size_max: @@ -7486,15 +7353,9 @@ # Code from module stat-time: # Code from module std-gnu11: # Code from module stdbool: - # Code from module stdckdint: # Code from module stddef: # Code from module stdint: # Code from module stdio: - - - printf "%s\n" "#define __USE_MINGW_ANSI_STDIO 1" >>confdefs.h - - # Code from module stdlib: # Code from module strdup-posix: # Code from module strerror: @@ -7503,11 +7364,11 @@ # Code from module symlink: # Code from module sys_stat: # Code from module sys_types: - # Code from module time-h: + # Code from module time: # Code from module unistd: # Code from module unlink: - # Code from module vararrays: # Code from module vasnprintf: + # Code from module verify: # Code from module warnings: # Code from module wchar: # Code from module write: @@ -7720,8 +7581,6 @@ - - # Check whether --enable-cross-guesses was given. if test ${enable_cross_guesses+y} then : @@ -7910,126 +7769,49 @@ fi - - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether the preprocessor supports include_next" >&5 -printf %s "checking whether the preprocessor supports include_next... " >&6; } -if test ${gl_cv_have_include_next+y} -then : - printf %s "(cached) " >&6 -else $as_nop - rm -rf conftestd1a conftestd1b conftestd2 - mkdir conftestd1a conftestd1b conftestd2 - cat < conftestd1a/conftest.h -#define DEFINED_IN_CONFTESTD1 -#include_next -#ifdef DEFINED_IN_CONFTESTD2 -int foo; -#else -#error "include_next doesn't work" -#endif -EOF - cat < conftestd1b/conftest.h -#define DEFINED_IN_CONFTESTD1 -#include -#include_next -#ifdef DEFINED_IN_CONFTESTD2 -int foo; -#else -#error "include_next doesn't work" -#endif -EOF - cat < conftestd2/conftest.h -#ifndef DEFINED_IN_CONFTESTD1 -#error "include_next test doesn't work" -#endif -#define DEFINED_IN_CONFTESTD2 -EOF - gl_save_CPPFLAGS="$CPPFLAGS" - CPPFLAGS="$gl_save_CPPFLAGS -Iconftestd1b -Iconftestd2" - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -#include -_ACEOF -if ac_fn_c_try_compile "$LINENO" -then : - gl_cv_have_include_next=yes -else $as_nop - CPPFLAGS="$gl_save_CPPFLAGS -Iconftestd1a -Iconftestd2" - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -#include -_ACEOF -if ac_fn_c_try_compile "$LINENO" -then : - gl_cv_have_include_next=buggy -else $as_nop - gl_cv_have_include_next=no -fi -rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext - -fi -rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext - CPPFLAGS="$gl_save_CPPFLAGS" - rm -rf conftestd1a conftestd1b conftestd2 - -fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_have_include_next" >&5 -printf "%s\n" "$gl_cv_have_include_next" >&6; } - PRAGMA_SYSTEM_HEADER= - if test $gl_cv_have_include_next = yes; then - INCLUDE_NEXT=include_next - INCLUDE_NEXT_AS_FIRST_DIRECTIVE=include_next - if test -n "$GCC"; then - PRAGMA_SYSTEM_HEADER='#pragma GCC system_header' - fi - else - if test $gl_cv_have_include_next = buggy; then - INCLUDE_NEXT=include - INCLUDE_NEXT_AS_FIRST_DIRECTIVE=include_next - else - INCLUDE_NEXT=include - INCLUDE_NEXT_AS_FIRST_DIRECTIVE=include - fi - fi - - - - - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether source code line length is unlimited" >&5 -printf %s "checking whether source code line length is unlimited... " >&6; } -if test ${gl_cv_source_line_length_unlimited+y} -then : - printf %s "(cached) " >&6 -else $as_nop - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ - -#ifdef __TANDEM -choke me -#endif - -_ACEOF -if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | - $EGREP "choke me" >/dev/null 2>&1 -then : - gl_cv_source_line_length_unlimited=no -else $as_nop - gl_cv_source_line_length_unlimited=yes -fi -rm -rf conftest* - - -fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_source_line_length_unlimited" >&5 -printf "%s\n" "$gl_cv_source_line_length_unlimited" >&6; } - if test $gl_cv_source_line_length_unlimited = no; then - PRAGMA_COLUMNS="#pragma COLUMNS 10000" - else - PRAGMA_COLUMNS= - fi - - - + GNULIB__EXIT=0; + GNULIB_ALIGNED_ALLOC=0; + GNULIB_ATOLL=0; + GNULIB_CALLOC_POSIX=0; + GNULIB_CANONICALIZE_FILE_NAME=0; + GNULIB_FREE_POSIX=0; + GNULIB_GETLOADAVG=0; + GNULIB_GETSUBOPT=0; + GNULIB_GRANTPT=0; + GNULIB_MALLOC_POSIX=0; + GNULIB_MBTOWC=0; + GNULIB_MKDTEMP=0; + GNULIB_MKOSTEMP=0; + GNULIB_MKOSTEMPS=0; + GNULIB_MKSTEMP=0; + GNULIB_MKSTEMPS=0; + GNULIB_POSIX_MEMALIGN=0; + GNULIB_POSIX_OPENPT=0; + GNULIB_PTSNAME=0; + GNULIB_PTSNAME_R=0; + GNULIB_PUTENV=0; + GNULIB_QSORT_R=0; + GNULIB_RANDOM=0; + GNULIB_RANDOM_R=0; + GNULIB_REALLOCARRAY=0; + GNULIB_REALLOC_POSIX=0; + GNULIB_REALPATH=0; + GNULIB_RPMATCH=0; + GNULIB_SECURE_GETENV=0; + GNULIB_SETENV=0; + GNULIB_STRTOD=0; + GNULIB_STRTOLD=0; + GNULIB_STRTOLL=0; + GNULIB_STRTOULL=0; + GNULIB_SYSTEM_POSIX=0; + GNULIB_UNLOCKPT=0; + GNULIB_UNSETENV=0; + GNULIB_WCTOMB=0; + GNULIB_MDA_ECVT=1; + GNULIB_MDA_FCVT=1; + GNULIB_MDA_GCVT=1; + GNULIB_MDA_MKTEMP=1; + GNULIB_MDA_PUTENV=1; HAVE__EXIT=1; HAVE_ALIGNED_ALLOC=1; HAVE_ATOLL=1; @@ -8038,8 +7820,6 @@ HAVE_DECL_FCVT=1; HAVE_DECL_GCVT=1; HAVE_DECL_GETLOADAVG=1; - HAVE_DECL_PROGRAM_INVOCATION_NAME=1; - HAVE_GETPROGNAME=1; HAVE_GETSUBOPT=1; HAVE_GRANTPT=1; HAVE_INITSTATE=1; @@ -8067,356 +7847,38 @@ HAVE_SETSTATE=1; HAVE_DECL_SETSTATE=1; HAVE_STRTOD=1; - HAVE_STRTOL=1; HAVE_STRTOLD=1; HAVE_STRTOLL=1; - HAVE_STRTOUL=1; HAVE_STRTOULL=1; HAVE_STRUCT_RANDOM_DATA=1; HAVE_SYS_LOADAVG_H=0; HAVE_UNLOCKPT=1; HAVE_DECL_UNSETENV=1; - REPLACE__EXIT=0; REPLACE_ALIGNED_ALLOC=0; - REPLACE_CALLOC_FOR_CALLOC_GNU=0; - REPLACE_CALLOC_FOR_CALLOC_POSIX=0; + REPLACE_CALLOC=0; REPLACE_CANONICALIZE_FILE_NAME=0; REPLACE_FREE=0; - REPLACE_GETLOADAVG=0; - REPLACE_GETPROGNAME=0; - REPLACE_GETSUBOPT=0; REPLACE_INITSTATE=0; - REPLACE_MALLOC_FOR_MALLOC_GNU=0; - REPLACE_MALLOC_FOR_MALLOC_POSIX=0; - REPLACE_MB_CUR_MAX=0; - REPLACE_MBSTOWCS=0; + REPLACE_MALLOC=0; REPLACE_MBTOWC=0; - REPLACE_MKOSTEMP=0; - REPLACE_MKOSTEMPS=0; REPLACE_MKSTEMP=0; REPLACE_POSIX_MEMALIGN=0; - REPLACE_POSIX_OPENPT=0; REPLACE_PTSNAME=0; REPLACE_PTSNAME_R=0; REPLACE_PUTENV=0; REPLACE_QSORT_R=0; REPLACE_RANDOM=0; REPLACE_RANDOM_R=0; - REPLACE_REALLOC_FOR_REALLOC_GNU=0; - REPLACE_REALLOC_FOR_REALLOC_POSIX=0; - REPLACE_REALLOCARRAY=0; + REPLACE_REALLOC=0; REPLACE_REALPATH=0; REPLACE_SETENV=0; REPLACE_SETSTATE=0; REPLACE_STRTOD=0; - REPLACE_STRTOL=0; REPLACE_STRTOLD=0; - REPLACE_STRTOLL=0; - REPLACE_STRTOUL=0; - REPLACE_STRTOULL=0; REPLACE_UNSETENV=0; REPLACE_WCTOMB=0; - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether malloc is ptrdiff_t safe" >&5 -printf %s "checking whether malloc is ptrdiff_t safe... " >&6; } -if test ${gl_cv_malloc_ptrdiff+y} -then : - printf %s "(cached) " >&6 -else $as_nop - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -#include - -int -main (void) -{ -/* 64-bit ptrdiff_t is so wide that no practical platform - can exceed it. */ - #define WIDE_PTRDIFF (PTRDIFF_MAX >> 31 >> 31 != 0) - - /* On rare machines where size_t fits in ptrdiff_t there - is no problem. */ - #define NARROW_SIZE (SIZE_MAX <= PTRDIFF_MAX) - - /* glibc 2.30 and later malloc refuses to exceed ptrdiff_t - bounds even on 32-bit platforms. We don't know which - non-glibc systems are safe. */ - #define KNOWN_SAFE (2 < __GLIBC__ + (30 <= __GLIBC_MINOR__)) - - #if WIDE_PTRDIFF || NARROW_SIZE || KNOWN_SAFE - return 0; - #else - #error "malloc might not be ptrdiff_t safe" - syntax error - #endif - - ; - return 0; -} -_ACEOF -if ac_fn_c_try_compile "$LINENO" -then : - gl_cv_malloc_ptrdiff=yes -else $as_nop - gl_cv_malloc_ptrdiff=no -fi -rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext - -fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_malloc_ptrdiff" >&5 -printf "%s\n" "$gl_cv_malloc_ptrdiff" >&6; } - - - - - test "$gl_cv_malloc_ptrdiff" = yes || REPLACE_MALLOC_FOR_MALLOC_POSIX=1 - - - - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether malloc, realloc, calloc set errno on failure" >&5 -printf %s "checking whether malloc, realloc, calloc set errno on failure... " >&6; } -if test ${gl_cv_func_malloc_posix+y} -then : - printf %s "(cached) " >&6 -else $as_nop - - case "$host_os" in - mingw*) - gl_cv_func_malloc_posix=no ;; - irix* | solaris*) - - gl_cv_func_malloc_posix=no ;; - *) - gl_cv_func_malloc_posix=yes ;; - esac - -fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_malloc_posix" >&5 -printf "%s\n" "$gl_cv_func_malloc_posix" >&6; } - - - - - - if test "$gl_cv_func_malloc_posix" = yes; then - -printf "%s\n" "#define HAVE_MALLOC_POSIX 1" >>confdefs.h - - else - REPLACE_MALLOC_FOR_MALLOC_POSIX=1 - fi - - - - - if test $REPLACE_MALLOC_FOR_MALLOC_POSIX = 1; then - REPLACE_CALLOC_FOR_CALLOC_POSIX=1 - fi - - - - GL_GNULIB__EXIT=0 - - - - GL_GNULIB_ALIGNED_ALLOC=0 - - - - GL_GNULIB_ATOLL=0 - - - - GL_GNULIB_CALLOC_GNU=0 - - - - GL_GNULIB_CALLOC_POSIX=0 - - - - GL_GNULIB_CANONICALIZE_FILE_NAME=0 - - - - GL_GNULIB_FREE_POSIX=0 - - - - GL_GNULIB_GETLOADAVG=0 - - - - GL_GNULIB_GETPROGNAME=0 - - - - GL_GNULIB_GETSUBOPT=0 - - - - GL_GNULIB_GRANTPT=0 - - - - GL_GNULIB_MALLOC_GNU=0 - - - - GL_GNULIB_MALLOC_POSIX=0 - - - - GL_GNULIB_MBSTOWCS=0 - - - - GL_GNULIB_MBTOWC=0 - - - - GL_GNULIB_MKDTEMP=0 - - - - GL_GNULIB_MKOSTEMP=0 - - - - GL_GNULIB_MKOSTEMPS=0 - - - - GL_GNULIB_MKSTEMP=0 - - - - GL_GNULIB_MKSTEMPS=0 - - - - GL_GNULIB_POSIX_MEMALIGN=0 - - - - GL_GNULIB_POSIX_OPENPT=0 - - - - GL_GNULIB_PTSNAME=0 - - - - GL_GNULIB_PTSNAME_R=0 - - - - GL_GNULIB_PUTENV=0 - - - - GL_GNULIB_QSORT_R=0 - - - - GL_GNULIB_RANDOM=0 - - - - GL_GNULIB_RANDOM_R=0 - - - - GL_GNULIB_REALLOCARRAY=0 - - - - GL_GNULIB_REALLOC_GNU=0 - - - - GL_GNULIB_REALLOC_POSIX=0 - - - - GL_GNULIB_REALPATH=0 - - - - GL_GNULIB_RPMATCH=0 - - - - GL_GNULIB_SECURE_GETENV=0 - - - - GL_GNULIB_SETENV=0 - - - - GL_GNULIB_STRTOD=0 - - - - GL_GNULIB_STRTOL=0 - - - - GL_GNULIB_STRTOLD=0 - - - - GL_GNULIB_STRTOLL=0 - - - - GL_GNULIB_STRTOUL=0 - - - - GL_GNULIB_STRTOULL=0 - - - - GL_GNULIB_SYSTEM_POSIX=0 - - - - GL_GNULIB_UNLOCKPT=0 - - - - GL_GNULIB_UNSETENV=0 - - - - GL_GNULIB_WCTOMB=0 - - - - GL_GNULIB_MDA_ECVT=1 - - - - GL_GNULIB_MDA_FCVT=1 - - - - GL_GNULIB_MDA_GCVT=1 - - - - GL_GNULIB_MDA_MKTEMP=1 - - - - GL_GNULIB_MDA_PUTENV=1 - - - - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether lstat correctly handles trailing slash" >&5 printf %s "checking whether lstat correctly handles trailing slash... " >&6; } if test ${gl_cv_func_lstat_dereferences_slashed_symlink+y} @@ -8431,9 +7893,6 @@ linux-* | linux) # Guess yes on Linux systems. gl_cv_func_lstat_dereferences_slashed_symlink="guessing yes" ;; - midipix*) - # Guess yes on systems that emulate the Linux system calls. - gl_cv_func_lstat_dereferences_slashed_symlink="guessing yes" ;; *-gnu* | gnu*) # Guess yes on glibc systems. gl_cv_func_lstat_dereferences_slashed_symlink="guessing yes" ;; @@ -8500,85 +7959,6 @@ ac_func=$ac_item fi done -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $CC options needed to detect all undeclared functions" >&5 -printf %s "checking for $CC options needed to detect all undeclared functions... " >&6; } -if test ${ac_cv_c_undeclared_builtin_options+y} -then : - printf %s "(cached) " >&6 -else $as_nop - ac_save_CFLAGS=$CFLAGS - ac_cv_c_undeclared_builtin_options='cannot detect' - for ac_arg in '' -fno-builtin; do - CFLAGS="$ac_save_CFLAGS $ac_arg" - # This test program should *not* compile successfully. - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ - -int -main (void) -{ -(void) strchr; - ; - return 0; -} -_ACEOF -if ac_fn_c_try_compile "$LINENO" -then : - -else $as_nop - # This test program should compile successfully. - # No library function is consistently available on - # freestanding implementations, so test against a dummy - # declaration. Include always-available headers on the - # off chance that they somehow elicit warnings. - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -#include -#include -#include -#include -extern void ac_decl (int, char *); - -int -main (void) -{ -(void) ac_decl (0, (char *) 0); - (void) ac_decl; - - ; - return 0; -} -_ACEOF -if ac_fn_c_try_compile "$LINENO" -then : - if test x"$ac_arg" = x -then : - ac_cv_c_undeclared_builtin_options='none needed' -else $as_nop - ac_cv_c_undeclared_builtin_options=$ac_arg -fi - break -fi -rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext -fi -rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext - done - CFLAGS=$ac_save_CFLAGS - -fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_undeclared_builtin_options" >&5 -printf "%s\n" "$ac_cv_c_undeclared_builtin_options" >&6; } - case $ac_cv_c_undeclared_builtin_options in #( - 'cannot detect') : - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 -printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;} -as_fn_error $? "cannot make $CC report undeclared builtins -See \`config.log' for more details" "$LINENO" 5; } ;; #( - 'none needed') : - ac_c_undeclared_builtin_options='' ;; #( - *) : - ac_c_undeclared_builtin_options=$ac_cv_c_undeclared_builtin_options ;; -esac @@ -8877,74 +8257,6 @@ - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for faccessat" >&5 -printf %s "checking for faccessat... " >&6; } -if test ${gl_cv_onwards_func_faccessat+y} -then : - printf %s "(cached) " >&6 -else $as_nop - - exec 9>&6 6>/dev/null - - case "$host_os" in - - linux*-android*) - ac_fn_check_decl "$LINENO" "faccessat" "ac_cv_have_decl_faccessat" "#include -" "$ac_c_undeclared_builtin_options" "CFLAGS" -if test "x$ac_cv_have_decl_faccessat" = xyes -then : - -fi - if test $ac_cv_have_decl_faccessat = yes; then - ac_fn_c_check_func "$LINENO" "faccessat" "ac_cv_func_faccessat" -if test "x$ac_cv_func_faccessat" = xyes -then : - -fi - - if test $ac_cv_func_faccessat = yes; then - gl_cv_onwards_func_faccessat=yes - else - gl_cv_onwards_func_faccessat='future OS version' - fi - else - gl_cv_onwards_func_faccessat='future OS version' - fi - ;; - - - *) - ac_fn_c_check_func "$LINENO" "faccessat" "ac_cv_func_faccessat" -if test "x$ac_cv_func_faccessat" = xyes -then : - -fi - - gl_cv_onwards_func_faccessat=$ac_cv_func_faccessat - ;; - - esac - - exec 6>&9 9>&- - - -fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_onwards_func_faccessat" >&5 -printf "%s\n" "$gl_cv_onwards_func_faccessat" >&6; } - - case "$gl_cv_onwards_func_faccessat" in - future*) ac_cv_func_faccessat=no ;; - *) ac_cv_func_faccessat=$gl_cv_onwards_func_faccessat ;; - esac - if test $ac_cv_func_faccessat = yes; then - -printf "%s\n" "#define HAVE_FACCESSAT 1" >>confdefs.h - - fi - - - - case "$host_os" in mingw*) ;; *) ac_fn_c_check_func "$LINENO" "getcwd" "ac_cv_func_getcwd" @@ -8961,344 +8273,88 @@ - - GL_GNULIB_ACCESS=0 - - - - GL_GNULIB_CHDIR=0 - - - - GL_GNULIB_CHOWN=0 - - - - GL_GNULIB_CLOSE=0 - - - - GL_GNULIB_COPY_FILE_RANGE=0 - - - - GL_GNULIB_DUP=0 - - - - GL_GNULIB_DUP2=0 - - - - GL_GNULIB_DUP3=0 - - - - GL_GNULIB_ENVIRON=0 - - - - GL_GNULIB_EUIDACCESS=0 - - - - GL_GNULIB_EXECL=0 - - - - GL_GNULIB_EXECLE=0 - - - - GL_GNULIB_EXECLP=0 - - - - GL_GNULIB_EXECV=0 - - - - GL_GNULIB_EXECVE=0 - - - - GL_GNULIB_EXECVP=0 - - - - GL_GNULIB_EXECVPE=0 - - - - GL_GNULIB_FACCESSAT=0 - - - - GL_GNULIB_FCHDIR=0 - - - - GL_GNULIB_FCHOWNAT=0 - - - - GL_GNULIB_FDATASYNC=0 - - - - GL_GNULIB_FSYNC=0 - - - - GL_GNULIB_FTRUNCATE=0 - - - - GL_GNULIB_GETCWD=0 - - - - GL_GNULIB_GETDOMAINNAME=0 - - - - GL_GNULIB_GETDTABLESIZE=0 - - - - GL_GNULIB_GETENTROPY=0 - - - - GL_GNULIB_GETGROUPS=0 - - - - GL_GNULIB_GETHOSTNAME=0 - - - - GL_GNULIB_GETLOGIN=0 - - - - GL_GNULIB_GETLOGIN_R=0 - - - - GL_GNULIB_GETOPT_POSIX=0 - - - - GL_GNULIB_GETPAGESIZE=0 - - - - GL_GNULIB_GETPASS=0 - - - - GL_GNULIB_GETPASS_GNU=0 - - - - GL_GNULIB_GETUSERSHELL=0 - - - - GL_GNULIB_GROUP_MEMBER=0 - - - - GL_GNULIB_ISATTY=0 - - - - GL_GNULIB_LCHOWN=0 - - - - GL_GNULIB_LINK=0 - - - - GL_GNULIB_LINKAT=0 - - - - GL_GNULIB_LSEEK=0 - - - - GL_GNULIB_PIPE=0 - - - - GL_GNULIB_PIPE2=0 - - - - GL_GNULIB_PREAD=0 - - - - GL_GNULIB_PWRITE=0 - - - - GL_GNULIB_READ=0 - - - - GL_GNULIB_READLINK=0 - - - - GL_GNULIB_READLINKAT=0 - - - - GL_GNULIB_RMDIR=0 - - - - GL_GNULIB_SETHOSTNAME=0 - - - - GL_GNULIB_SLEEP=0 - - - - GL_GNULIB_SYMLINK=0 - - - - GL_GNULIB_SYMLINKAT=0 - - - - GL_GNULIB_TRUNCATE=0 - - - - GL_GNULIB_TTYNAME_R=0 - - - - GL_GNULIB_UNISTD_H_GETOPT=0 - - - - GL_GNULIB_UNISTD_H_NONBLOCKING=0 - - - - GL_GNULIB_UNISTD_H_SIGPIPE=0 - - - - GL_GNULIB_UNLINK=0 - - - - GL_GNULIB_UNLINKAT=0 - - - - GL_GNULIB_USLEEP=0 - - - - GL_GNULIB_WRITE=0 - - - - GL_GNULIB_MDA_ACCESS=1 - - - - GL_GNULIB_MDA_CHDIR=1 - - - - GL_GNULIB_MDA_CLOSE=1 - - - - GL_GNULIB_MDA_DUP=1 - - - - GL_GNULIB_MDA_DUP2=1 - - - - GL_GNULIB_MDA_EXECL=1 - - - - GL_GNULIB_MDA_EXECLE=1 - - - - GL_GNULIB_MDA_EXECLP=1 - - - - GL_GNULIB_MDA_EXECV=1 - - - - GL_GNULIB_MDA_EXECVE=1 - - - - GL_GNULIB_MDA_EXECVP=1 - - - - GL_GNULIB_MDA_EXECVPE=1 - - - - GL_GNULIB_MDA_GETCWD=1 - - - - GL_GNULIB_MDA_GETPID=1 - - - - GL_GNULIB_MDA_ISATTY=1 - - - - GL_GNULIB_MDA_LSEEK=1 - - - - GL_GNULIB_MDA_READ=1 - - - - GL_GNULIB_MDA_RMDIR=1 - - - - GL_GNULIB_MDA_SWAB=1 - - - - GL_GNULIB_MDA_UNLINK=1 - - - - GL_GNULIB_MDA_WRITE=1 - - - - + GNULIB_ACCESS=0; + GNULIB_CHDIR=0; + GNULIB_CHOWN=0; + GNULIB_CLOSE=0; + GNULIB_COPY_FILE_RANGE=0; + GNULIB_DUP=0; + GNULIB_DUP2=0; + GNULIB_DUP3=0; + GNULIB_ENVIRON=0; + GNULIB_EUIDACCESS=0; + GNULIB_EXECL=0; + GNULIB_EXECLE=0; + GNULIB_EXECLP=0; + GNULIB_EXECV=0; + GNULIB_EXECVE=0; + GNULIB_EXECVP=0; + GNULIB_EXECVPE=0; + GNULIB_FACCESSAT=0; + GNULIB_FCHDIR=0; + GNULIB_FCHOWNAT=0; + GNULIB_FDATASYNC=0; + GNULIB_FSYNC=0; + GNULIB_FTRUNCATE=0; + GNULIB_GETCWD=0; + GNULIB_GETDOMAINNAME=0; + GNULIB_GETDTABLESIZE=0; + GNULIB_GETENTROPY=0; + GNULIB_GETGROUPS=0; + GNULIB_GETHOSTNAME=0; + GNULIB_GETLOGIN=0; + GNULIB_GETLOGIN_R=0; + GNULIB_GETOPT_POSIX=0; + GNULIB_GETPAGESIZE=0; + GNULIB_GETPASS=0; + GNULIB_GETUSERSHELL=0; + GNULIB_GROUP_MEMBER=0; + GNULIB_ISATTY=0; + GNULIB_LCHOWN=0; + GNULIB_LINK=0; + GNULIB_LINKAT=0; + GNULIB_LSEEK=0; + GNULIB_PIPE=0; + GNULIB_PIPE2=0; + GNULIB_PREAD=0; + GNULIB_PWRITE=0; + GNULIB_READ=0; + GNULIB_READLINK=0; + GNULIB_READLINKAT=0; + GNULIB_RMDIR=0; + GNULIB_SETHOSTNAME=0; + GNULIB_SLEEP=0; + GNULIB_SYMLINK=0; + GNULIB_SYMLINKAT=0; + GNULIB_TRUNCATE=0; + GNULIB_TTYNAME_R=0; + GNULIB_UNISTD_H_NONBLOCKING=0; + GNULIB_UNISTD_H_SIGPIPE=0; + GNULIB_UNLINK=0; + GNULIB_UNLINKAT=0; + GNULIB_USLEEP=0; + GNULIB_WRITE=0; + GNULIB_MDA_ACCESS=1; + GNULIB_MDA_CHDIR=1; + GNULIB_MDA_CLOSE=1; + GNULIB_MDA_DUP=1; + GNULIB_MDA_DUP2=1; + GNULIB_MDA_EXECL=1; + GNULIB_MDA_EXECLE=1; + GNULIB_MDA_EXECLP=1; + GNULIB_MDA_EXECV=1; + GNULIB_MDA_EXECVE=1; + GNULIB_MDA_EXECVP=1; + GNULIB_MDA_EXECVPE=1; + GNULIB_MDA_GETCWD=1; + GNULIB_MDA_GETPID=1; + GNULIB_MDA_ISATTY=1; + GNULIB_MDA_LSEEK=1; + GNULIB_MDA_READ=1; + GNULIB_MDA_RMDIR=1; + GNULIB_MDA_SWAB=1; + GNULIB_MDA_UNLINK=1; + GNULIB_MDA_WRITE=1; HAVE_CHOWN=1; HAVE_COPY_FILE_RANGE=1; HAVE_DUP3=1; @@ -9350,10 +8406,8 @@ REPLACE_ACCESS=0; REPLACE_CHOWN=0; REPLACE_CLOSE=0; - REPLACE_COPY_FILE_RANGE=0; REPLACE_DUP=0; REPLACE_DUP2=0; - REPLACE_DUP3=0; REPLACE_EXECL=0; REPLACE_EXECLE=0; REPLACE_EXECLP=0; @@ -9363,30 +8417,25 @@ REPLACE_EXECVPE=0; REPLACE_FACCESSAT=0; REPLACE_FCHOWNAT=0; - REPLACE_FDATASYNC=0; REPLACE_FTRUNCATE=0; REPLACE_GETCWD=0; REPLACE_GETDOMAINNAME=0; REPLACE_GETDTABLESIZE=0; - REPLACE_GETENTROPY=0; REPLACE_GETLOGIN_R=0; REPLACE_GETGROUPS=0; REPLACE_GETPAGESIZE=0; REPLACE_GETPASS=0; - REPLACE_GETPASS_FOR_GETPASS_GNU=0; REPLACE_ISATTY=0; REPLACE_LCHOWN=0; REPLACE_LINK=0; REPLACE_LINKAT=0; REPLACE_LSEEK=0; - REPLACE_PIPE2=0; REPLACE_PREAD=0; REPLACE_PWRITE=0; REPLACE_READ=0; REPLACE_READLINK=0; REPLACE_READLINKAT=0; REPLACE_RMDIR=0; - REPLACE_SETHOSTNAME=0; REPLACE_SLEEP=0; REPLACE_SYMLINK=0; REPLACE_SYMLINKAT=0; @@ -9415,43 +8464,6 @@ - - - - - if test $HAVE_MSVC_INVALID_PARAMETER_HANDLER = 1; then - REPLACE_CLOSE=1 - fi - - - - - - - if test $ac_cv_header_sys_socket_h != yes; then - ac_fn_c_check_header_compile "$LINENO" "winsock2.h" "ac_cv_header_winsock2_h" "$ac_includes_default" -if test "x$ac_cv_header_winsock2_h" = xyes -then : - printf "%s\n" "#define HAVE_WINSOCK2_H 1" >>confdefs.h - -fi - - fi - if test "$ac_cv_header_winsock2_h" = yes; then - HAVE_WINSOCK2_H=1 - UNISTD_H_HAVE_WINSOCK2_H=1 - SYS_IOCTL_H_HAVE_WINSOCK2_H=1 - else - HAVE_WINSOCK2_H=0 - fi - - - if test $UNISTD_H_HAVE_WINSOCK2_H = 1; then - REPLACE_CLOSE=1 - fi - - - gl_mda_defines=' #if defined _WIN32 && !defined __CYGWIN__ #define access _access @@ -9509,6 +8521,126 @@ + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether the preprocessor supports include_next" >&5 +printf %s "checking whether the preprocessor supports include_next... " >&6; } +if test ${gl_cv_have_include_next+y} +then : + printf %s "(cached) " >&6 +else $as_nop + rm -rf conftestd1a conftestd1b conftestd2 + mkdir conftestd1a conftestd1b conftestd2 + cat < conftestd1a/conftest.h +#define DEFINED_IN_CONFTESTD1 +#include_next +#ifdef DEFINED_IN_CONFTESTD2 +int foo; +#else +#error "include_next doesn't work" +#endif +EOF + cat < conftestd1b/conftest.h +#define DEFINED_IN_CONFTESTD1 +#include +#include_next +#ifdef DEFINED_IN_CONFTESTD2 +int foo; +#else +#error "include_next doesn't work" +#endif +EOF + cat < conftestd2/conftest.h +#ifndef DEFINED_IN_CONFTESTD1 +#error "include_next test doesn't work" +#endif +#define DEFINED_IN_CONFTESTD2 +EOF + gl_save_CPPFLAGS="$CPPFLAGS" + CPPFLAGS="$gl_save_CPPFLAGS -Iconftestd1b -Iconftestd2" + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#include +_ACEOF +if ac_fn_c_try_compile "$LINENO" +then : + gl_cv_have_include_next=yes +else $as_nop + CPPFLAGS="$gl_save_CPPFLAGS -Iconftestd1a -Iconftestd2" + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#include +_ACEOF +if ac_fn_c_try_compile "$LINENO" +then : + gl_cv_have_include_next=buggy +else $as_nop + gl_cv_have_include_next=no +fi +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext + +fi +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext + CPPFLAGS="$gl_save_CPPFLAGS" + rm -rf conftestd1a conftestd1b conftestd2 + +fi +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_have_include_next" >&5 +printf "%s\n" "$gl_cv_have_include_next" >&6; } + PRAGMA_SYSTEM_HEADER= + if test $gl_cv_have_include_next = yes; then + INCLUDE_NEXT=include_next + INCLUDE_NEXT_AS_FIRST_DIRECTIVE=include_next + if test -n "$GCC"; then + PRAGMA_SYSTEM_HEADER='#pragma GCC system_header' + fi + else + if test $gl_cv_have_include_next = buggy; then + INCLUDE_NEXT=include + INCLUDE_NEXT_AS_FIRST_DIRECTIVE=include_next + else + INCLUDE_NEXT=include + INCLUDE_NEXT_AS_FIRST_DIRECTIVE=include + fi + fi + + + + + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether source code line length is unlimited" >&5 +printf %s "checking whether source code line length is unlimited... " >&6; } +if test ${gl_cv_source_line_length_unlimited+y} +then : + printf %s "(cached) " >&6 +else $as_nop + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +#ifdef __TANDEM +choke me +#endif + +_ACEOF +if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | + $EGREP "choke me" >/dev/null 2>&1 +then : + gl_cv_source_line_length_unlimited=no +else $as_nop + gl_cv_source_line_length_unlimited=yes +fi +rm -rf conftest* + + +fi +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_source_line_length_unlimited" >&5 +printf "%s\n" "$gl_cv_source_line_length_unlimited" >&6; } + if test $gl_cv_source_line_length_unlimited = no; then + PRAGMA_COLUMNS="#pragma COLUMNS 10000" + else + PRAGMA_COLUMNS= + fi + + + + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for complete errno.h" >&5 printf %s "checking for complete errno.h... " >&6; } if test ${gl_cv_header_errno_h_complete+y} @@ -9587,7 +8719,7 @@ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_header_errno_h_complete" >&5 printf "%s\n" "$gl_cv_header_errno_h_complete" >&6; } if test $gl_cv_header_errno_h_complete = yes; then - GL_GENERATE_ERRNO_H=false + ERRNO_H='' else @@ -9639,8 +8771,8 @@ gl_cv_absolute_errno_h=`(eval "$gl_absname_cpp conftest.$ac_ext") 2>&5 | sed -n "$gl_absolute_header_sed"` - gl_header=$gl_cv_absolute_errno_h - gl_cv_next_errno_h='"'$gl_header'"' + gl_header=$gl_cv_absolute_errno_h + gl_cv_next_errno_h='"'$gl_header'"' fi @@ -9661,10 +8793,19 @@ - GL_GENERATE_ERRNO_H=true + ERRNO_H='errno.h' fi - if $GL_GENERATE_ERRNO_H; then + if test -n "$ERRNO_H"; then + GL_GENERATE_ERRNO_H_TRUE= + GL_GENERATE_ERRNO_H_FALSE='#' +else + GL_GENERATE_ERRNO_H_TRUE='#' + GL_GENERATE_ERRNO_H_FALSE= +fi + + + if test -n "$ERRNO_H"; then { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for EMULTIHOP value" >&5 printf %s "checking for EMULTIHOP value... " >&6; } if test ${gl_cv_header_errno_h_EMULTIHOP+y} @@ -9739,7 +8880,7 @@ fi - if $GL_GENERATE_ERRNO_H; then + if test -n "$ERRNO_H"; then { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for ENOLINK value" >&5 printf %s "checking for ENOLINK value... " >&6; } if test ${gl_cv_header_errno_h_ENOLINK+y} @@ -9814,7 +8955,7 @@ fi - if $GL_GENERATE_ERRNO_H; then + if test -n "$ERRNO_H"; then { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for EOVERFLOW value" >&5 printf %s "checking for EOVERFLOW value... " >&6; } if test ${gl_cv_header_errno_h_EOVERFLOW+y} @@ -9889,321 +9030,85 @@ fi - - - - - - - - - - - - - if test $gl_cv_have_include_next = yes; then - gl_cv_next_error_h='<'error.h'>' - else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking absolute name of " >&5 -printf %s "checking absolute name of ... " >&6; } -if test ${gl_cv_next_error_h+y} -then : - printf %s "(cached) " >&6 -else $as_nop - - if test $ac_cv_header_error_h = yes; then - - - - - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -#include -_ACEOF - case "$host_os" in - aix*) gl_absname_cpp="$ac_cpp -C" ;; - *) gl_absname_cpp="$ac_cpp" ;; - esac - - case "$host_os" in - mingw*) - gl_dirsep_regex='[/\\]' - ;; - *) - gl_dirsep_regex='\/' - ;; - esac - gl_make_literal_regex_sed='s,[]$^\\.*/[],\\&,g' - gl_header_literal_regex=`echo 'error.h' \ - | 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 - }' - - gl_cv_absolute_error_h=`(eval "$gl_absname_cpp conftest.$ac_ext") 2>&5 | - sed -n "$gl_absolute_header_sed"` - - gl_header=$gl_cv_absolute_error_h - gl_cv_next_error_h='"'$gl_header'"' - else - gl_cv_next_error_h='<'error.h'>' - fi - - -fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_next_error_h" >&5 -printf "%s\n" "$gl_cv_next_error_h" >&6; } - fi - NEXT_ERROR_H=$gl_cv_next_error_h - - if test $gl_cv_have_include_next = yes || test $gl_cv_have_include_next = buggy; then - # INCLUDE_NEXT_AS_FIRST_DIRECTIVE='include_next' - gl_next_as_first_directive='<'error.h'>' - else - # INCLUDE_NEXT_AS_FIRST_DIRECTIVE='include' - gl_next_as_first_directive=$gl_cv_next_error_h - fi - NEXT_AS_FIRST_DIRECTIVE_ERROR_H=$gl_next_as_first_directive - - - - - if test $ac_cv_header_error_h = yes; then - HAVE_ERROR_H=1 - else - HAVE_ERROR_H=0 - fi - - - REPLACE_ERROR=0 - - - - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for error" >&5 -printf %s "checking for error... " >&6; } -if test ${gl_cv_onwards_func_error+y} -then : - printf %s "(cached) " >&6 -else $as_nop - - exec 9>&6 6>/dev/null - - case "$host_os" in - - linux*-android*) - ac_fn_check_decl "$LINENO" "error" "ac_cv_have_decl_error" "#include -" "$ac_c_undeclared_builtin_options" "CFLAGS" -if test "x$ac_cv_have_decl_error" = xyes -then : - -fi - if test $ac_cv_have_decl_error = yes; then - ac_fn_c_check_func "$LINENO" "error" "ac_cv_func_error" -if test "x$ac_cv_func_error" = xyes -then : - -fi - - if test $ac_cv_func_error = yes; then - gl_cv_onwards_func_error=yes - else - gl_cv_onwards_func_error='future OS version' - fi - else - gl_cv_onwards_func_error='future OS version' - fi - ;; - - - *) - ac_fn_c_check_func "$LINENO" "error" "ac_cv_func_error" -if test "x$ac_cv_func_error" = xyes -then : - -fi - - gl_cv_onwards_func_error=$ac_cv_func_error - ;; - - esac - - exec 6>&9 9>&- - - -fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_onwards_func_error" >&5 -printf "%s\n" "$gl_cv_onwards_func_error" >&6; } - - case "$gl_cv_onwards_func_error" in - future*) ac_cv_func_error=no ;; - *) ac_cv_func_error=$gl_cv_onwards_func_error ;; - esac - if test $ac_cv_func_error = yes; then - -printf "%s\n" "#define HAVE_ERROR 1" >>confdefs.h - - fi - - - if test $ac_cv_func_error = yes; then - HAVE_ERROR=1 - else - HAVE_ERROR=0 - case "$gl_cv_onwards_func_error" in - future*) REPLACE_ERROR=1 ;; - esac - fi - - ac_fn_check_decl "$LINENO" "error_at_line" "ac_cv_have_decl_error_at_line" "#include -" "$ac_c_undeclared_builtin_options" "CFLAGS" -if test "x$ac_cv_have_decl_error_at_line" = xyes -then : - -fi - if test $ac_cv_have_decl_error_at_line = yes; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for error_at_line" >&5 -printf %s "checking for error_at_line... " >&6; } -if test ${ac_cv_lib_error_at_line+y} -then : - printf %s "(cached) " >&6 -else $as_nop - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -#include -int -main (void) -{ -error_at_line (0, 0, "", 0, "an error occurred"); - ; - return 0; -} -_ACEOF -if ac_fn_c_try_link "$LINENO" -then : - ac_cv_lib_error_at_line=yes -else $as_nop - ac_cv_lib_error_at_line=no -fi -rm -f core conftest.err conftest.$ac_objext conftest.beam \ - conftest$ac_exeext conftest.$ac_ext -fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_error_at_line" >&5 -printf "%s\n" "$ac_cv_lib_error_at_line" >&6; } - else - ac_cv_lib_error_at_line=no - fi - if test $ac_cv_lib_error_at_line = yes; then - HAVE_ERROR_AT_LINE=1 - else - HAVE_ERROR_AT_LINE=0 - fi - REPLACE_ERROR_AT_LINE=0 - - if test $ac_cv_func_error = yes && test $ac_cv_lib_error_at_line = yes; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for working error function" >&5 -printf %s "checking for working error function... " >&6; } -if test ${gl_cv_func_working_error+y} +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $CC options needed to detect all undeclared functions" >&5 +printf %s "checking for $CC options needed to detect all undeclared functions... " >&6; } +if test ${ac_cv_c_undeclared_builtin_options+y} then : printf %s "(cached) " >&6 else $as_nop - if test $cross_compiling != yes; then - cat confdefs.h - <<_ACEOF >conftest.$ac_ext + ac_save_CFLAGS=$CFLAGS + ac_cv_c_undeclared_builtin_options='cannot detect' + for ac_arg in '' -fno-builtin; do + CFLAGS="$ac_save_CFLAGS $ac_arg" + # This test program should *not* compile successfully. + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ - #include - static void print_no_progname (void) {} - int main (void) { - - error_print_progname = print_no_progname; - error (0, 0, "foo"); - +(void) strchr; ; return 0; } - _ACEOF -if ac_fn_c_try_link "$LINENO" +if ac_fn_c_try_compile "$LINENO" then : - rm -f conftest.out - if test -s conftest$ac_exeext \ - && ./conftest$ac_exeext 2> conftest.out; then - if grep ' ' conftest.out >/dev/null; then - gl_cv_func_working_error=no - else - gl_cv_func_working_error=yes - fi - else - gl_cv_func_working_error=no - fi - rm -f conftest.out else $as_nop - gl_cv_func_working_error=no -fi -rm -f core conftest.err conftest.$ac_objext conftest.beam \ - conftest$ac_exeext conftest.$ac_ext - else - cat confdefs.h - <<_ACEOF >conftest.$ac_ext + # This test program should compile successfully. + # No library function is consistently available on + # freestanding implementations, so test against a dummy + # declaration. Include always-available headers on the + # off chance that they somehow elicit warnings. + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ - - #include +#include +#include +#include +#include +extern void ac_decl (int, char *); int main (void) { - - error (0, 0, "foo"); +(void) ac_decl (0, (char *) 0); + (void) ac_decl; ; return 0; } - _ACEOF if ac_fn_c_try_compile "$LINENO" then : - case "$host_os" in - # Guess yes on glibc systems. - *-gnu* | gnu*) gl_cv_func_working_error="guessing yes" ;; - # Guess no on Android. - linux*-android*) gl_cv_func_working_error="guessing no" ;; - # If we don't know, obey --enable-cross-guesses. - *) gl_cv_func_working_error="$gl_cross_guess_normal" ;; - esac - + if test x"$ac_arg" = x +then : + ac_cv_c_undeclared_builtin_options='none needed' else $as_nop - gl_cv_func_working_error=no + ac_cv_c_undeclared_builtin_options=$ac_arg +fi + break fi rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext - fi - fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_working_error" >&5 -printf "%s\n" "$gl_cv_func_working_error" >&6; } - case "$gl_cv_func_working_error" in - *no) - REPLACE_ERROR=1 - REPLACE_ERROR_AT_LINE=1 - ;; - esac - fi - - if test $HAVE_ERROR = 0 || test $REPLACE_ERROR = 1 \ - || test $HAVE_ERROR_AT_LINE = 0 || test $REPLACE_ERROR_AT_LINE = 1; then - GL_GENERATE_ERROR_H=true - else - GL_GENERATE_ERROR_H=false - fi - - - - +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext + done + CFLAGS=$ac_save_CFLAGS +fi +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_undeclared_builtin_options" >&5 +printf "%s\n" "$ac_cv_c_undeclared_builtin_options" >&6; } + case $ac_cv_c_undeclared_builtin_options in #( + 'cannot detect') : + { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;} +as_fn_error $? "cannot make $CC report undeclared builtins +See \`config.log' for more details" "$LINENO" 5; } ;; #( + 'none needed') : + ac_c_undeclared_builtin_options='' ;; #( + *) : + ac_c_undeclared_builtin_options=$ac_cv_c_undeclared_builtin_options ;; +esac ac_fn_check_decl "$LINENO" "strerror_r" "ac_cv_have_decl_strerror_r" "$ac_includes_default" "$ac_c_undeclared_builtin_options" "CFLAGS" if test "x$ac_cv_have_decl_strerror_r" = xyes @@ -10270,39 +9175,16 @@ XGETTEXT_EXTRA_OPTIONS= - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether ctype.h defines __header_inline" >&5 -printf %s "checking whether ctype.h defines __header_inline... " >&6; } -if test ${gl_cv_have___header_inline+y} -then : - printf %s "(cached) " >&6 -else $as_nop - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -#include - #ifndef __header_inline - #error " does not define __header_inline" - #endif - -_ACEOF -if ac_fn_c_try_cpp "$LINENO" -then : - gl_cv_have___header_inline=yes -else $as_nop - gl_cv_have___header_inline=no -fi -rm -f conftest.err conftest.i conftest.$ac_ext -fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_have___header_inline" >&5 -printf "%s\n" "$gl_cv_have___header_inline" >&6; } - if test "$gl_cv_have___header_inline" = yes; then - -printf "%s\n" "#define HAVE___HEADER_INLINE 1" >>confdefs.h - - fi - + GNULIB_CREAT=0; + GNULIB_FCNTL=0; + GNULIB_NONBLOCKING=0; + GNULIB_OPEN=0; + GNULIB_OPENAT=0; + GNULIB_MDA_CREAT=1; + GNULIB_MDA_OPEN=1; HAVE_FCNTL=1; HAVE_OPENAT=1; REPLACE_CREAT=0; @@ -10313,36 +9195,6 @@ - GL_GNULIB_CREAT=0 - - - - GL_GNULIB_FCNTL=0 - - - - GL_GNULIB_NONBLOCKING=0 - - - - GL_GNULIB_OPEN=0 - - - - GL_GNULIB_OPENAT=0 - - - - GL_GNULIB_MDA_CREAT=1 - - - - GL_GNULIB_MDA_OPEN=1 - - - - - @@ -10545,90 +9397,6 @@ fi - - - - - - - - - - - if test $gl_cv_have_include_next = yes; then - gl_cv_next_fcntl_h='<'fcntl.h'>' - else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking absolute name of " >&5 -printf %s "checking absolute name of ... " >&6; } -if test ${gl_cv_next_fcntl_h+y} -then : - printf %s "(cached) " >&6 -else $as_nop - - - - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -#include -_ACEOF - case "$host_os" in - aix*) gl_absname_cpp="$ac_cpp -C" ;; - *) gl_absname_cpp="$ac_cpp" ;; - esac - - case "$host_os" in - mingw*) - gl_dirsep_regex='[/\\]' - ;; - *) - gl_dirsep_regex='\/' - ;; - esac - gl_make_literal_regex_sed='s,[]$^\\.*/[],\\&,g' - gl_header_literal_regex=`echo 'fcntl.h' \ - | 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 - }' - - gl_cv_absolute_fcntl_h=`(eval "$gl_absname_cpp conftest.$ac_ext") 2>&5 | - sed -n "$gl_absolute_header_sed"` - - gl_header=$gl_cv_absolute_fcntl_h - gl_cv_next_fcntl_h='"'$gl_header'"' - - -fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_next_fcntl_h" >&5 -printf "%s\n" "$gl_cv_next_fcntl_h" >&6; } - fi - NEXT_FCNTL_H=$gl_cv_next_fcntl_h - - if test $gl_cv_have_include_next = yes || test $gl_cv_have_include_next = buggy; then - # INCLUDE_NEXT_AS_FIRST_DIRECTIVE='include_next' - gl_next_as_first_directive='<'fcntl.h'>' - else - # INCLUDE_NEXT_AS_FIRST_DIRECTIVE='include' - gl_next_as_first_directive=$gl_cv_next_fcntl_h - fi - NEXT_AS_FIRST_DIRECTIVE_FCNTL_H=$gl_next_as_first_directive - - - - - - - - - - - - - - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for stdint.h" >&5 printf %s "checking for stdint.h... " >&6; } if test ${gl_cv_header_stdint_h+y} @@ -10718,7 +9486,7 @@ # Guess yes on glibc systems. *-gnu* | gnu*) gl_cv_func_printf_sizes_c99="guessing yes";; # Guess yes on musl systems. - *-musl* | midipix*) gl_cv_func_printf_sizes_c99="guessing yes";; + *-musl*) gl_cv_func_printf_sizes_c99="guessing yes";; # Guess yes on FreeBSD >= 5. freebsd[1-4].*) gl_cv_func_printf_sizes_c99="guessing no";; freebsd* | kfreebsd*) gl_cv_func_printf_sizes_c99="guessing yes";; @@ -10820,105 +9588,6 @@ - - - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether printf supports size specifiers as in C23" >&5 -printf %s "checking whether printf supports size specifiers as in C23... " >&6; } -if test ${gl_cv_func_printf_sizes_c23+y} -then : - printf %s "(cached) " >&6 -else $as_nop - - if test "$cross_compiling" = yes -then : - - case "$host_os" in - # Guess no on glibc systems. - *-gnu* | gnu*) gl_cv_func_printf_sizes_c23="guessing no";; - # Guess no on musl systems. - *-musl* | midipix*) gl_cv_func_printf_sizes_c23="guessing no";; - # Guess no on Android. - linux*-android*) gl_cv_func_printf_sizes_c23="guessing no";; - # Guess no on native Windows. - mingw*) gl_cv_func_printf_sizes_c23="guessing no";; - # If we don't know, obey --enable-cross-guesses. - *) gl_cv_func_printf_sizes_c23="$gl_cross_guess_normal";; - esac - -else $as_nop - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ - -#include -#include -#include -#include -#if HAVE_STDINT_H_WITH_UINTMAX -# include -#endif -#if HAVE_INTTYPES_H_WITH_UINTMAX -# include -#endif -static char buf[100]; -int main () -{ - int result = 0; - buf[0] = '\0'; - if (sprintf (buf, "%w8u %d", (uint8_t) 123, 33, 44, 55) < 0 - || strcmp (buf, "123 33") != 0) - result |= 1; - buf[0] = '\0'; - if (sprintf (buf, "%wf8u %d", (uint_fast8_t) 123, 33, 44, 55) < 0 - || strcmp (buf, "123 33") != 0) - result |= 1; - buf[0] = '\0'; - if (sprintf (buf, "%w16u %d", (uint16_t) 12345, 33, 44, 55) < 0 - || strcmp (buf, "12345 33") != 0) - result |= 2; - buf[0] = '\0'; - if (sprintf (buf, "%wf16u %d", (uint_fast16_t) 12345, 33, 44, 55) < 0 - || strcmp (buf, "12345 33") != 0) - result |= 2; - buf[0] = '\0'; - if (sprintf (buf, "%w32u %d", (uint32_t) 12345671, 33, 44, 55) < 0 - || strcmp (buf, "12345671 33") != 0) - result |= 4; - buf[0] = '\0'; - if (sprintf (buf, "%wf32u %d", (uint_fast32_t) 12345671, 33, 44, 55) < 0 - || strcmp (buf, "12345671 33") != 0) - result |= 4; -#if HAVE_STDINT_H_WITH_UINTMAX || HAVE_INTTYPES_H_WITH_UINTMAX - buf[0] = '\0'; - if (sprintf (buf, "%w64u %d", (uint64_t) 12345671, 33, 44, 55) < 0 - || strcmp (buf, "12345671 33") != 0) - result |= 8; - buf[0] = '\0'; - if (sprintf (buf, "%wf64u %d", (uint_fast64_t) 12345671, 33, 44, 55) < 0 - || strcmp (buf, "12345671 33") != 0) - result |= 8; -#else - result |= 8; -#endif - return result; -} -_ACEOF -if ac_fn_c_try_run "$LINENO" -then : - gl_cv_func_printf_sizes_c23=yes -else $as_nop - gl_cv_func_printf_sizes_c23=no -fi -rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ - conftest.$ac_objext conftest.beam conftest.$ac_ext -fi - - -fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_printf_sizes_c23" >&5 -printf "%s\n" "$gl_cv_func_printf_sizes_c23" >&6; } - - - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether printf supports 'long double' arguments" >&5 printf %s "checking whether printf supports 'long double' arguments... " >&6; } if test ${gl_cv_func_printf_long_double+y} @@ -11011,7 +9680,7 @@ # Guess yes on glibc systems. *-gnu* | gnu*) gl_cv_func_printf_infinite="guessing yes";; # Guess yes on musl systems. - *-musl* | midipix*) gl_cv_func_printf_infinite="guessing yes";; + *-musl*) gl_cv_func_printf_infinite="guessing yes";; # Guess yes on FreeBSD >= 6. freebsd[1-5].*) gl_cv_func_printf_infinite="guessing no";; freebsd* | kfreebsd*) gl_cv_func_printf_infinite="guessing yes";; @@ -11450,7 +10119,7 @@ # Guess yes on glibc systems. *-gnu* | gnu*) gl_cv_func_printf_infinite_long_double="guessing yes";; # Guess yes on musl systems. - *-musl* | midipix*) gl_cv_func_printf_infinite_long_double="guessing yes";; + *-musl*) gl_cv_func_printf_infinite_long_double="guessing yes";; # Guess yes on FreeBSD >= 6. freebsd[1-5].*) gl_cv_func_printf_infinite_long_double="guessing no";; freebsd* | kfreebsd*) gl_cv_func_printf_infinite_long_double="guessing yes";; @@ -11811,7 +10480,7 @@ ;; # Guess yes on musl systems. - *-musl* | midipix*) gl_cv_func_printf_directive_a="guessing yes";; + *-musl*) gl_cv_func_printf_directive_a="guessing yes";; # Guess no on Android. linux*-android*) gl_cv_func_printf_directive_a="guessing no";; # Guess no on native Windows. @@ -11843,7 +10512,7 @@ && strcmp (buf, "-0X6.488P-1 33") != 0 && strcmp (buf, "-0XC.91P-2 33") != 0)) result |= 2; - /* This catches a FreeBSD 13.0 bug: it doesn't round. */ + /* This catches a FreeBSD 6.1 bug: it doesn't round. */ if (sprintf (buf, "%.2a %d", 1.51, 33, 44, 55) < 0 || (strcmp (buf, "0x1.83p+0 33") != 0 && strcmp (buf, "0x3.05p-1 33") != 0 @@ -11897,83 +10566,6 @@ - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether printf supports the 'b' directive" >&5 -printf %s "checking whether printf supports the 'b' directive... " >&6; } -if test ${gl_cv_func_printf_directive_b+y} -then : - printf %s "(cached) " >&6 -else $as_nop - - if test "$cross_compiling" = yes -then : - - case "$host_os" in - # Guess yes on glibc >= 2.35 systems. - *-gnu* | gnu*) - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ - - #include - #ifdef __GNU_LIBRARY__ - #if (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 35) || (__GLIBC__ > 2) - Lucky user - #endif - #endif - -_ACEOF -if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | - $EGREP "Lucky" >/dev/null 2>&1 -then : - gl_cv_func_printf_directive_uppercase_b="guessing yes" -else $as_nop - gl_cv_func_printf_directive_uppercase_b="guessing no" -fi -rm -rf conftest* - - ;; - # Guess no on musl systems. - *-musl* | midipix*) gl_cv_func_printf_directive_b="guessing no";; - # Guess no on Android. - linux*-android*) gl_cv_func_printf_directive_b="guessing no";; - # Guess no on native Windows. - mingw*) gl_cv_func_printf_directive_b="guessing no";; - # If we don't know, obey --enable-cross-guesses. - *) gl_cv_func_printf_directive_b="$gl_cross_guess_normal";; - esac - -else $as_nop - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ - -#include -#include -static char buf[100]; -int main () -{ - int result = 0; - if (sprintf (buf, "%b %d", 12345, 33, 44, 55) < 0 - || strcmp (buf, "11000000111001 33") != 0) - result |= 1; - return result; -} -_ACEOF -if ac_fn_c_try_run "$LINENO" -then : - gl_cv_func_printf_directive_b=yes -else $as_nop - gl_cv_func_printf_directive_b=no -fi -rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ - conftest.$ac_objext conftest.beam conftest.$ac_ext -fi - - -fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_printf_directive_b" >&5 -printf "%s\n" "$gl_cv_func_printf_directive_b" >&6; } - - - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether printf supports the 'F' directive" >&5 printf %s "checking whether printf supports the 'F' directive... " >&6; } if test ${gl_cv_func_printf_directive_f+y} @@ -11988,7 +10580,7 @@ # Guess yes on glibc systems. *-gnu* | gnu*) gl_cv_func_printf_directive_f="guessing yes";; # Guess yes on musl systems. - *-musl* | midipix*) gl_cv_func_printf_directive_f="guessing yes";; + *-musl*) gl_cv_func_printf_directive_f="guessing yes";; # Guess yes on FreeBSD >= 6. freebsd[1-5].*) gl_cv_func_printf_directive_f="guessing no";; freebsd* | kfreebsd*) gl_cv_func_printf_directive_f="guessing yes";; @@ -12248,63 +10840,6 @@ - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether printf supports the 'lc' directive correctly" >&5 -printf %s "checking whether printf supports the 'lc' directive correctly... " >&6; } -if test ${gl_cv_func_printf_directive_lc+y} -then : - printf %s "(cached) " >&6 -else $as_nop - - if test "$cross_compiling" = yes -then : - - case "$host_os" in - # Guess yes on musl libc. - *-musl* | midipix*) gl_cv_func_printf_directive_lc="guessing yes";; - # Guess no otherwise. - *) gl_cv_func_printf_directive_lc="guessing no";; - esac - -else $as_nop - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ - -#include -#include -#include -int main () -{ - int result = 0; - char buf[100]; - /* This test fails on glibc 2.35, FreeBSD 13.1, NetBSD 9.0, OpenBSD 7.2, - macOS 12.5, AIX 7.2, Solaris 11.4. - glibc 2.35 bug: */ - { - buf[0] = '\0'; - if (sprintf (buf, "%lc%lc%lc", (wint_t) 'a', (wint_t) 0, (wint_t) 'z') < 0 - || strcmp (buf, "az") != 0) - result |= 1; - } - return result; -} -_ACEOF -if ac_fn_c_try_run "$LINENO" -then : - gl_cv_func_printf_directive_lc=yes -else $as_nop - gl_cv_func_printf_directive_lc=no -fi -rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ - conftest.$ac_objext conftest.beam conftest.$ac_ext -fi - - -fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_printf_directive_lc" >&5 -printf "%s\n" "$gl_cv_func_printf_directive_lc" >&6; } - - - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether printf supports POSIX/XSI format strings with positions" >&5 printf %s "checking whether printf supports POSIX/XSI format strings with positions... " >&6; } if test ${gl_cv_func_printf_positions+y} @@ -12478,18 +11013,18 @@ then : case "$host_os" in - # Guess yes on glibc systems. - *-gnu* | gnu*) gl_cv_func_printf_flag_zero="guessing yes";; - # Guess yes on musl systems. - *-musl* | midipix*) gl_cv_func_printf_flag_zero="guessing yes";; - # Guess yes on BeOS. - beos*) gl_cv_func_printf_flag_zero="guessing yes";; - # Guess no on Android. - linux*-android*) gl_cv_func_printf_flag_zero="guessing no";; - # Guess no on native Windows. - mingw*) gl_cv_func_printf_flag_zero="guessing no";; - # If we don't know, obey --enable-cross-guesses. - *) gl_cv_func_printf_flag_zero="$gl_cross_guess_normal";; + # Guess yes on glibc systems. + *-gnu* | gnu*) gl_cv_func_printf_flag_zero="guessing yes";; + # Guess yes on musl systems. + *-musl*) gl_cv_func_printf_flag_zero="guessing yes";; + # Guess yes on BeOS. + beos*) gl_cv_func_printf_flag_zero="guessing yes";; + # Guess no on Android. + linux*-android*) gl_cv_func_printf_flag_zero="guessing no";; + # Guess no on native Windows. + mingw*) gl_cv_func_printf_flag_zero="guessing no";; + # If we don't know, obey --enable-cross-guesses. + *) gl_cv_func_printf_flag_zero="$gl_cross_guess_normal";; esac else $as_nop @@ -12876,314 +11411,16 @@ - - - - - - - - - - - - - - - - - gl_cv_func_fprintf_posix=no - case "$gl_cv_func_printf_sizes_c99" in + case "$gl_cv_func_printf_long_double" in *yes) - case "$gl_cv_func_printf_sizes_c23" in - *yes) - case "$gl_cv_func_printf_long_double" in - *yes) - case "$gl_cv_func_printf_infinite" in - *yes) - case "$gl_cv_func_printf_infinite_long_double" in - *yes) - case "$gl_cv_func_printf_directive_a" in - *yes) - case "$gl_cv_func_printf_directive_b" in - *yes) - case "$gl_cv_func_printf_directive_f" in - *yes) - case "$gl_cv_func_printf_directive_n" in - *yes) - case "$gl_cv_func_printf_directive_ls" in - *yes) - case "$gl_cv_func_printf_directive_lc" in - *yes) - case "$gl_cv_func_printf_positions" in - *yes) - case "$gl_cv_func_printf_flag_grouping" in - *yes) - case "$gl_cv_func_printf_flag_leftadjust" in - *yes) - case "$gl_cv_func_printf_flag_zero" in - *yes) - case "$gl_cv_func_printf_precision" in - *yes) - case "$gl_cv_func_printf_enomem" in - *yes) - # fprintf exists and is - # already POSIX compliant. - gl_cv_func_fprintf_posix=yes - ;; - esac - ;; - esac - ;; - esac - ;; - esac - ;; - esac - ;; - esac - ;; - esac - ;; - esac - ;; - esac - ;; - esac - ;; - esac - ;; - esac - ;; - esac - ;; - esac - ;; - esac - ;; - esac ;; - esac - - - - - - - - - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether snprintf returns a byte count as in C99" >&5 -printf %s "checking whether snprintf returns a byte count as in C99... " >&6; } -if test ${gl_cv_func_snprintf_retval_c99+y} -then : - printf %s "(cached) " >&6 -else $as_nop - - if test "$cross_compiling" = yes -then : - case "$host_os" in - # Guess yes on glibc systems. - *-gnu* | gnu*) gl_cv_func_snprintf_retval_c99="guessing yes";; - # Guess yes on musl systems. - *-musl* | midipix*) gl_cv_func_snprintf_retval_c99="guessing yes";; - # Guess yes on FreeBSD >= 5. - freebsd[1-4].*) gl_cv_func_snprintf_retval_c99="guessing no";; - freebsd* | kfreebsd*) gl_cv_func_snprintf_retval_c99="guessing yes";; - midnightbsd*) gl_cv_func_snprintf_retval_c99="guessing yes";; - # Guess yes on Mac OS X >= 10.3. - darwin[1-6].*) gl_cv_func_snprintf_retval_c99="guessing no";; - darwin*) gl_cv_func_snprintf_retval_c99="guessing yes";; - # Guess yes on OpenBSD >= 3.9. - openbsd[1-2].* | openbsd3.[0-8] | openbsd3.[0-8].*) - gl_cv_func_snprintf_retval_c99="guessing no";; - openbsd*) gl_cv_func_snprintf_retval_c99="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";; - # Guess yes on AIX >= 4. - aix[1-3]*) gl_cv_func_snprintf_retval_c99="guessing no";; - aix*) gl_cv_func_snprintf_retval_c99="guessing yes";; - # Guess yes on NetBSD >= 3. - netbsd[1-2]* | netbsdelf[1-2]* | netbsdaout[1-2]* | netbsdcoff[1-2]*) - gl_cv_func_snprintf_retval_c99="guessing no";; - netbsd*) gl_cv_func_snprintf_retval_c99="guessing yes";; - # Guess yes on BeOS. - beos*) gl_cv_func_snprintf_retval_c99="guessing yes";; - # Guess yes on Android. - linux*-android*) gl_cv_func_snprintf_retval_c99="guessing yes";; - # Guess yes on MSVC, no on mingw. - mingw*) cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ - -#ifdef _MSC_VER - Known -#endif - -_ACEOF -if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | - $EGREP "Known" >/dev/null 2>&1 -then : - gl_cv_func_snprintf_retval_c99="guessing yes" -else $as_nop - gl_cv_func_snprintf_retval_c99="guessing no" -fi -rm -rf conftest* - - ;; - # If we don't know, obey --enable-cross-guesses. - *) gl_cv_func_snprintf_retval_c99="$gl_cross_guess_normal";; - esac - -else $as_nop - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ - -#include -#include -#if HAVE_SNPRINTF -# define my_snprintf snprintf -#else -# include -static int my_snprintf (char *buf, int size, const char *format, ...) -{ - va_list args; - int ret; - va_start (args, format); - ret = vsnprintf (buf, size, format, args); - va_end (args); - return ret; -} -#endif -static char buf[100]; -int main () -{ - strcpy (buf, "ABCDEF"); - if (my_snprintf (buf, 3, "%d %d", 4567, 89) != 7) - return 1; - if (my_snprintf (buf, 0, "%d %d", 4567, 89) != 7) - return 2; - if (my_snprintf (NULL, 0, "%d %d", 4567, 89) != 7) - return 3; - return 0; -} -_ACEOF -if ac_fn_c_try_run "$LINENO" -then : - gl_cv_func_snprintf_retval_c99=yes -else $as_nop - gl_cv_func_snprintf_retval_c99=no -fi -rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ - conftest.$ac_objext conftest.beam conftest.$ac_ext -fi - - -fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_snprintf_retval_c99" >&5 -printf "%s\n" "$gl_cv_func_snprintf_retval_c99" >&6; } - - - - - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether snprintf truncates the result as in C99" >&5 -printf %s "checking whether snprintf truncates the result as in C99... " >&6; } -if test ${gl_cv_func_snprintf_truncation_c99+y} -then : - printf %s "(cached) " >&6 -else $as_nop - - if test "$cross_compiling" = yes -then : - - case "$host_os" in - # Guess yes on glibc systems. - *-gnu* | gnu*) gl_cv_func_snprintf_truncation_c99="guessing yes";; - # Guess yes on musl systems. - *-musl* | midipix*) gl_cv_func_snprintf_truncation_c99="guessing yes";; - # Guess yes on FreeBSD >= 5. - freebsd[1-4].*) gl_cv_func_snprintf_truncation_c99="guessing no";; - freebsd* | kfreebsd*) gl_cv_func_snprintf_truncation_c99="guessing yes";; - midnightbsd*) gl_cv_func_snprintf_truncation_c99="guessing yes";; - # Guess yes on Mac OS X >= 10.3. - darwin[1-6].*) gl_cv_func_snprintf_truncation_c99="guessing no";; - darwin*) gl_cv_func_snprintf_truncation_c99="guessing yes";; - # Guess yes on OpenBSD >= 3.9. - openbsd[1-2].* | openbsd3.[0-8] | openbsd3.[0-8].*) - gl_cv_func_snprintf_truncation_c99="guessing no";; - openbsd*) gl_cv_func_snprintf_truncation_c99="guessing yes";; - # Guess yes on Solaris >= 2.6. - solaris2.[0-5] | solaris2.[0-5].*) - gl_cv_func_snprintf_truncation_c99="guessing no";; - solaris*) gl_cv_func_snprintf_truncation_c99="guessing yes";; - # Guess yes on AIX >= 4. - aix[1-3]*) gl_cv_func_snprintf_truncation_c99="guessing no";; - aix*) gl_cv_func_snprintf_truncation_c99="guessing yes";; - # Guess yes on HP-UX >= 11. - hpux[7-9]* | hpux10*) gl_cv_func_snprintf_truncation_c99="guessing no";; - hpux*) gl_cv_func_snprintf_truncation_c99="guessing yes";; - # Guess yes on IRIX >= 6.5. - irix6.5) gl_cv_func_snprintf_truncation_c99="guessing yes";; - # Guess yes on OSF/1 >= 5. - osf[3-4]*) gl_cv_func_snprintf_truncation_c99="guessing no";; - osf*) gl_cv_func_snprintf_truncation_c99="guessing yes";; - # Guess yes on NetBSD >= 3. - netbsd[1-2]* | netbsdelf[1-2]* | netbsdaout[1-2]* | netbsdcoff[1-2]*) - gl_cv_func_snprintf_truncation_c99="guessing no";; - netbsd*) gl_cv_func_snprintf_truncation_c99="guessing yes";; - # Guess yes on BeOS. - beos*) gl_cv_func_snprintf_truncation_c99="guessing yes";; - # Guess yes on Android. - linux*-android*) gl_cv_func_snprintf_truncation_c99="guessing yes";; - # Guess no on native Windows. - mingw*) gl_cv_func_snprintf_truncation_c99="guessing no";; - # If we don't know, obey --enable-cross-guesses. - *) gl_cv_func_snprintf_truncation_c99="$gl_cross_guess_normal";; - esac - -else $as_nop - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ + *) -#include -#include -#if HAVE_SNPRINTF -# define my_snprintf snprintf -#else -# include -static int my_snprintf (char *buf, int size, const char *format, ...) -{ - va_list args; - int ret; - va_start (args, format); - ret = vsnprintf (buf, size, format, args); - va_end (args); - return ret; -} -#endif -static char buf[100]; -int main () -{ - strcpy (buf, "ABCDEF"); - my_snprintf (buf, 3, "%d %d", 4567, 89); - if (memcmp (buf, "45\0DEF", 6) != 0) - return 1; - return 0; -} -_ACEOF -if ac_fn_c_try_run "$LINENO" -then : - gl_cv_func_snprintf_truncation_c99=yes -else $as_nop - gl_cv_func_snprintf_truncation_c99=no -fi -rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ - conftest.$ac_objext conftest.beam conftest.$ac_ext -fi +printf "%s\n" "#define NEED_PRINTF_LONG_DOUBLE 1" >>confdefs.h + ;; + esac -fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_snprintf_truncation_c99" >&5 -printf "%s\n" "$gl_cv_func_snprintf_truncation_c99" >&6; } { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for wchar_t" >&5 @@ -13284,16 +11521,75 @@ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_type_wint_t_large_enough" >&5 printf "%s\n" "$gl_cv_type_wint_t_large_enough" >&6; } if test $gl_cv_type_wint_t_large_enough = no; then - GNULIBHEADERS_OVERRIDE_WINT_T=1 + GNULIB_OVERRIDES_WINT_T=1 else - GNULIBHEADERS_OVERRIDE_WINT_T=0 + GNULIB_OVERRIDES_WINT_T=0 fi else - GNULIBHEADERS_OVERRIDE_WINT_T=0 + GNULIB_OVERRIDES_WINT_T=0 fi + + + if test $ac_cv_header_features_h = yes; then + HAVE_FEATURES_H=1 + else + HAVE_FEATURES_H=0 + fi + + + + + + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for intmax_t" >&5 +printf %s "checking for intmax_t... " >&6; } +if test ${gt_cv_c_intmax_t+y} +then : + printf %s "(cached) " >&6 +else $as_nop + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +#include +#include +#if HAVE_STDINT_H_WITH_UINTMAX +#include +#endif +#if HAVE_INTTYPES_H_WITH_UINTMAX +#include +#endif + +int +main (void) +{ +intmax_t x = -1; return !x; + ; + return 0; +} +_ACEOF +if ac_fn_c_try_compile "$LINENO" +then : + gt_cv_c_intmax_t=yes +else $as_nop + gt_cv_c_intmax_t=no +fi +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext +fi +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gt_cv_c_intmax_t" >&5 +printf "%s\n" "$gt_cv_c_intmax_t" >&6; } + if test $gt_cv_c_intmax_t = yes; then + +printf "%s\n" "#define HAVE_INTMAX_T 1" >>confdefs.h + + else + +printf "%s\n" "#define intmax_t long long" >>confdefs.h + + fi + + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking where to find the exponent in a 'double'" >&5 printf %s "checking where to find the exponent in a 'double'... " >&6; } if test ${gl_cv_cc_double_expbit0+y} @@ -13652,12 +11948,222 @@ - ac_fn_c_check_func "$LINENO" "wcslen" "ac_cv_func_wcslen" -if test "x$ac_cv_func_wcslen" = xyes + + + + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether snprintf returns a byte count as in C99" >&5 +printf %s "checking whether snprintf returns a byte count as in C99... " >&6; } +if test ${gl_cv_func_snprintf_retval_c99+y} then : - printf "%s\n" "#define HAVE_WCSLEN 1" >>confdefs.h + printf %s "(cached) " >&6 +else $as_nop + + if test "$cross_compiling" = yes +then : + case "$host_os" in + # Guess yes on glibc systems. + *-gnu* | gnu*) gl_cv_func_snprintf_retval_c99="guessing yes";; + # Guess yes on musl systems. + *-musl*) gl_cv_func_snprintf_retval_c99="guessing yes";; + # Guess yes on FreeBSD >= 5. + freebsd[1-4].*) gl_cv_func_snprintf_retval_c99="guessing no";; + freebsd* | kfreebsd*) gl_cv_func_snprintf_retval_c99="guessing yes";; + midnightbsd*) gl_cv_func_snprintf_retval_c99="guessing yes";; + # Guess yes on Mac OS X >= 10.3. + darwin[1-6].*) gl_cv_func_snprintf_retval_c99="guessing no";; + darwin*) gl_cv_func_snprintf_retval_c99="guessing yes";; + # Guess yes on OpenBSD >= 3.9. + openbsd[1-2].* | openbsd3.[0-8] | openbsd3.[0-8].*) + gl_cv_func_snprintf_retval_c99="guessing no";; + openbsd*) gl_cv_func_snprintf_retval_c99="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";; + # Guess yes on AIX >= 4. + aix[1-3]*) gl_cv_func_snprintf_retval_c99="guessing no";; + aix*) gl_cv_func_snprintf_retval_c99="guessing yes";; + # Guess yes on NetBSD >= 3. + netbsd[1-2]* | netbsdelf[1-2]* | netbsdaout[1-2]* | netbsdcoff[1-2]*) + gl_cv_func_snprintf_retval_c99="guessing no";; + netbsd*) gl_cv_func_snprintf_retval_c99="guessing yes";; + # Guess yes on BeOS. + beos*) gl_cv_func_snprintf_retval_c99="guessing yes";; + # Guess yes on Android. + linux*-android*) gl_cv_func_snprintf_retval_c99="guessing yes";; + # Guess yes on MSVC, no on mingw. + mingw*) cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#ifdef _MSC_VER + Known +#endif + +_ACEOF +if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | + $EGREP "Known" >/dev/null 2>&1 +then : + gl_cv_func_snprintf_retval_c99="guessing yes" +else $as_nop + gl_cv_func_snprintf_retval_c99="guessing no" fi +rm -rf conftest* + + ;; + # If we don't know, obey --enable-cross-guesses. + *) gl_cv_func_snprintf_retval_c99="$gl_cross_guess_normal";; + esac + +else $as_nop + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +#include +#include +#if HAVE_SNPRINTF +# define my_snprintf snprintf +#else +# include +static int my_snprintf (char *buf, int size, const char *format, ...) +{ + va_list args; + int ret; + va_start (args, format); + ret = vsnprintf (buf, size, format, args); + va_end (args); + return ret; +} +#endif +static char buf[100]; +int main () +{ + strcpy (buf, "ABCDEF"); + if (my_snprintf (buf, 3, "%d %d", 4567, 89) != 7) + return 1; + if (my_snprintf (buf, 0, "%d %d", 4567, 89) != 7) + return 2; + if (my_snprintf (NULL, 0, "%d %d", 4567, 89) != 7) + return 3; + return 0; +} +_ACEOF +if ac_fn_c_try_run "$LINENO" +then : + gl_cv_func_snprintf_retval_c99=yes +else $as_nop + gl_cv_func_snprintf_retval_c99=no +fi +rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ + conftest.$ac_objext conftest.beam conftest.$ac_ext +fi + + +fi +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_snprintf_retval_c99" >&5 +printf "%s\n" "$gl_cv_func_snprintf_retval_c99" >&6; } + + + + + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether snprintf truncates the result as in C99" >&5 +printf %s "checking whether snprintf truncates the result as in C99... " >&6; } +if test ${gl_cv_func_snprintf_truncation_c99+y} +then : + printf %s "(cached) " >&6 +else $as_nop + + if test "$cross_compiling" = yes +then : + + case "$host_os" in + # Guess yes on glibc systems. + *-gnu* | gnu*) gl_cv_func_snprintf_truncation_c99="guessing yes";; + # Guess yes on musl systems. + *-musl*) gl_cv_func_snprintf_truncation_c99="guessing yes";; + # Guess yes on FreeBSD >= 5. + freebsd[1-4].*) gl_cv_func_snprintf_truncation_c99="guessing no";; + freebsd* | kfreebsd*) gl_cv_func_snprintf_truncation_c99="guessing yes";; + midnightbsd*) gl_cv_func_snprintf_truncation_c99="guessing yes";; + # Guess yes on Mac OS X >= 10.3. + darwin[1-6].*) gl_cv_func_snprintf_truncation_c99="guessing no";; + darwin*) gl_cv_func_snprintf_truncation_c99="guessing yes";; + # Guess yes on OpenBSD >= 3.9. + openbsd[1-2].* | openbsd3.[0-8] | openbsd3.[0-8].*) + gl_cv_func_snprintf_truncation_c99="guessing no";; + openbsd*) gl_cv_func_snprintf_truncation_c99="guessing yes";; + # Guess yes on Solaris >= 2.6. + solaris2.[0-5] | solaris2.[0-5].*) + gl_cv_func_snprintf_truncation_c99="guessing no";; + solaris*) gl_cv_func_snprintf_truncation_c99="guessing yes";; + # Guess yes on AIX >= 4. + aix[1-3]*) gl_cv_func_snprintf_truncation_c99="guessing no";; + aix*) gl_cv_func_snprintf_truncation_c99="guessing yes";; + # Guess yes on HP-UX >= 11. + hpux[7-9]* | hpux10*) gl_cv_func_snprintf_truncation_c99="guessing no";; + hpux*) gl_cv_func_snprintf_truncation_c99="guessing yes";; + # Guess yes on IRIX >= 6.5. + irix6.5) gl_cv_func_snprintf_truncation_c99="guessing yes";; + # Guess yes on OSF/1 >= 5. + osf[3-4]*) gl_cv_func_snprintf_truncation_c99="guessing no";; + osf*) gl_cv_func_snprintf_truncation_c99="guessing yes";; + # Guess yes on NetBSD >= 3. + netbsd[1-2]* | netbsdelf[1-2]* | netbsdaout[1-2]* | netbsdcoff[1-2]*) + gl_cv_func_snprintf_truncation_c99="guessing no";; + netbsd*) gl_cv_func_snprintf_truncation_c99="guessing yes";; + # Guess yes on BeOS. + beos*) gl_cv_func_snprintf_truncation_c99="guessing yes";; + # Guess yes on Android. + linux*-android*) gl_cv_func_snprintf_truncation_c99="guessing yes";; + # Guess no on native Windows. + mingw*) gl_cv_func_snprintf_truncation_c99="guessing no";; + # If we don't know, obey --enable-cross-guesses. + *) gl_cv_func_snprintf_truncation_c99="$gl_cross_guess_normal";; + esac + +else $as_nop + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +#include +#include +#if HAVE_SNPRINTF +# define my_snprintf snprintf +#else +# include +static int my_snprintf (char *buf, int size, const char *format, ...) +{ + va_list args; + int ret; + va_start (args, format); + ret = vsnprintf (buf, size, format, args); + va_end (args); + return ret; +} +#endif +static char buf[100]; +int main () +{ + strcpy (buf, "ABCDEF"); + my_snprintf (buf, 3, "%d %d", 4567, 89); + if (memcmp (buf, "45\0DEF", 6) != 0) + return 1; + return 0; +} +_ACEOF +if ac_fn_c_try_run "$LINENO" +then : + gl_cv_func_snprintf_truncation_c99=yes +else $as_nop + gl_cv_func_snprintf_truncation_c99=no +fi +rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ + conftest.$ac_objext conftest.beam conftest.$ac_ext +fi + + +fi +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_snprintf_truncation_c99" >&5 +printf "%s\n" "$gl_cv_func_snprintf_truncation_c99" >&6; } + @@ -13674,6 +12180,24 @@ printf "%s\n" "#define HAVE_STRNLEN 1" >>confdefs.h fi +ac_fn_c_check_func "$LINENO" "wcslen" "ac_cv_func_wcslen" +if test "x$ac_cv_func_wcslen" = xyes +then : + printf "%s\n" "#define HAVE_WCSLEN 1" >>confdefs.h + +fi +ac_fn_c_check_func "$LINENO" "wcsnlen" "ac_cv_func_wcsnlen" +if test "x$ac_cv_func_wcsnlen" = xyes +then : + printf "%s\n" "#define HAVE_WCSNLEN 1" >>confdefs.h + +fi +ac_fn_c_check_func "$LINENO" "mbrtowc" "ac_cv_func_mbrtowc" +if test "x$ac_cv_func_mbrtowc" = xyes +then : + printf "%s\n" "#define HAVE_MBRTOWC 1" >>confdefs.h + +fi ac_fn_c_check_func "$LINENO" "wcrtomb" "ac_cv_func_wcrtomb" if test "x$ac_cv_func_wcrtomb" = xyes then : @@ -13692,6 +12216,7 @@ printf "%s\n" "#define HAVE_DECL__SNPRINTF $ac_have_decl" >>confdefs.h + case "$gl_cv_func_snprintf_retval_c99" in *yes) @@ -13709,88 +12234,72 @@ esac - - - case "$gl_cv_func_printf_long_double" in - *yes) - ;; - *) - -printf "%s\n" "#define NEED_PRINTF_LONG_DOUBLE 1" >>confdefs.h - - ;; - esac - - - - - - if test $ac_cv_header_features_h = yes; then - HAVE_FEATURES_H=1 - else - HAVE_FEATURES_H=0 - fi - - - - - - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for intmax_t" >&5 -printf %s "checking for intmax_t... " >&6; } -if test ${gt_cv_c_intmax_t+y} -then : - printf %s "(cached) " >&6 -else $as_nop - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ - -#include -#include -#if HAVE_STDINT_H_WITH_UINTMAX -#include -#endif -#if HAVE_INTTYPES_H_WITH_UINTMAX -#include -#endif - -int -main (void) -{ -intmax_t x = -1; return !x; - ; - return 0; -} -_ACEOF -if ac_fn_c_try_compile "$LINENO" -then : - gt_cv_c_intmax_t=yes -else $as_nop - gt_cv_c_intmax_t=no -fi -rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext -fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gt_cv_c_intmax_t" >&5 -printf "%s\n" "$gt_cv_c_intmax_t" >&6; } - if test $gt_cv_c_intmax_t = yes; then - -printf "%s\n" "#define HAVE_INTMAX_T 1" >>confdefs.h - - else - -printf "%s\n" "#define intmax_t long long" >>confdefs.h - - fi - - + GNULIB_DPRINTF=0; + GNULIB_FCLOSE=0; + GNULIB_FDOPEN=0; + GNULIB_FFLUSH=0; + GNULIB_FGETC=0; + GNULIB_FGETS=0; + GNULIB_FOPEN=0; + GNULIB_FPRINTF=0; + GNULIB_FPRINTF_POSIX=0; + GNULIB_FPURGE=0; + GNULIB_FPUTC=0; + GNULIB_FPUTS=0; + GNULIB_FREAD=0; + GNULIB_FREOPEN=0; + GNULIB_FSCANF=0; + GNULIB_FSEEK=0; + GNULIB_FSEEKO=0; + GNULIB_FTELL=0; + GNULIB_FTELLO=0; + GNULIB_FWRITE=0; + GNULIB_GETC=0; + GNULIB_GETCHAR=0; + GNULIB_GETDELIM=0; + GNULIB_GETLINE=0; + GNULIB_OBSTACK_PRINTF=0; + GNULIB_OBSTACK_PRINTF_POSIX=0; + GNULIB_PCLOSE=0; + GNULIB_PERROR=0; + GNULIB_POPEN=0; + GNULIB_PRINTF=0; + GNULIB_PRINTF_POSIX=0; + GNULIB_PUTC=0; + GNULIB_PUTCHAR=0; + GNULIB_PUTS=0; + GNULIB_REMOVE=0; + GNULIB_RENAME=0; + GNULIB_RENAMEAT=0; + GNULIB_SCANF=0; + GNULIB_SNPRINTF=0; + GNULIB_SPRINTF_POSIX=0; + GNULIB_STDIO_H_NONBLOCKING=0; + GNULIB_STDIO_H_SIGPIPE=0; + GNULIB_TMPFILE=0; + GNULIB_VASPRINTF=0; + GNULIB_VFSCANF=0; + GNULIB_VSCANF=0; + GNULIB_VDPRINTF=0; + GNULIB_VFPRINTF=0; + GNULIB_VFPRINTF_POSIX=0; + GNULIB_VPRINTF=0; + GNULIB_VPRINTF_POSIX=0; + GNULIB_VSNPRINTF=0; + GNULIB_VSPRINTF_POSIX=0; + GNULIB_MDA_FCLOSEALL=1; + GNULIB_MDA_FDOPEN=1; + GNULIB_MDA_FILENO=1; + GNULIB_MDA_GETW=1; + GNULIB_MDA_PUTW=1; + GNULIB_MDA_TEMPNAM=1; HAVE_DECL_FCLOSEALL=1; HAVE_DECL_FPURGE=1; HAVE_DECL_FSEEKO=1; HAVE_DECL_FTELLO=1; HAVE_DECL_GETDELIM=1; HAVE_DECL_GETLINE=1; - HAVE_DECL_GETW=1; HAVE_DECL_OBSTACK_PRINTF=1; - HAVE_DECL_PUTW=1; HAVE_DECL_SNPRINTF=1; HAVE_DECL_VSNPRINTF=1; HAVE_DPRINTF=1; @@ -13806,7 +12315,6 @@ REPLACE_FDOPEN=0; REPLACE_FFLUSH=0; REPLACE_FOPEN=0; - REPLACE_FOPEN_FOR_FOPEN_GNU=0; REPLACE_FPRINTF=0; REPLACE_FPURGE=0; REPLACE_FREOPEN=0; @@ -13836,248 +12344,107 @@ REPLACE_VSPRINTF=0; - - GL_GNULIB_DPRINTF=0 - - - - GL_GNULIB_FCLOSE=0 - - - - GL_GNULIB_FDOPEN=0 - - - - GL_GNULIB_FFLUSH=0 - - - - GL_GNULIB_FGETC=0 - - - - GL_GNULIB_FGETS=0 - - - - GL_GNULIB_FOPEN=0 - - - - GL_GNULIB_FOPEN_GNU=0 - - - - GL_GNULIB_FPRINTF=0 - - - - GL_GNULIB_FPRINTF_POSIX=0 - - - - GL_GNULIB_FPURGE=0 - - - - GL_GNULIB_FPUTC=0 - - - - GL_GNULIB_FPUTS=0 - - - - GL_GNULIB_FREAD=0 - - - - GL_GNULIB_FREOPEN=0 - - - - GL_GNULIB_FSCANF=0 - - - - GL_GNULIB_FSEEK=0 - - - - GL_GNULIB_FSEEKO=0 - - - - GL_GNULIB_FTELL=0 - - - - GL_GNULIB_FTELLO=0 - - - - GL_GNULIB_FWRITE=0 - - - - GL_GNULIB_GETC=0 - - - - GL_GNULIB_GETCHAR=0 - - - - GL_GNULIB_GETDELIM=0 - - - - GL_GNULIB_GETLINE=0 - - - - GL_GNULIB_OBSTACK_PRINTF=0 - - - - GL_GNULIB_OBSTACK_PRINTF_POSIX=0 - - - - GL_GNULIB_PCLOSE=0 - - - - GL_GNULIB_PERROR=0 - - - - GL_GNULIB_POPEN=0 - - - - GL_GNULIB_PRINTF=0 - - - - GL_GNULIB_PRINTF_POSIX=0 - - - - GL_GNULIB_PUTC=0 - - - - GL_GNULIB_PUTCHAR=0 - - - - GL_GNULIB_PUTS=0 - - - - GL_GNULIB_REMOVE=0 - - - - GL_GNULIB_RENAME=0 - - - - GL_GNULIB_RENAMEAT=0 - - - - GL_GNULIB_SCANF=0 - - - - GL_GNULIB_SNPRINTF=0 - - - - GL_GNULIB_SPRINTF_POSIX=0 - - - - GL_GNULIB_STDIO_H_NONBLOCKING=0 - - - - GL_GNULIB_STDIO_H_SIGPIPE=0 - - - - GL_GNULIB_TMPFILE=0 - - - - GL_GNULIB_VASPRINTF=0 - - - - GL_GNULIB_VFSCANF=0 - - - - GL_GNULIB_VSCANF=0 - - - - GL_GNULIB_VDPRINTF=0 - - - - GL_GNULIB_VFPRINTF=0 - - - - GL_GNULIB_VFPRINTF_POSIX=0 - - - - GL_GNULIB_VPRINTF=0 - - - - GL_GNULIB_VPRINTF_POSIX=0 - - - - GL_GNULIB_VSNPRINTF=0 - - - - GL_GNULIB_VSPRINTF_POSIX=0 - - - - GL_GNULIB_MDA_FCLOSEALL=1 - - - - GL_GNULIB_MDA_FDOPEN=1 - - - - GL_GNULIB_MDA_FILENO=1 - - - - GL_GNULIB_MDA_GETW=1 - - - - GL_GNULIB_MDA_PUTW=1 - - - - GL_GNULIB_MDA_TEMPNAM=1 - - - - + GNULIB_ACOSF=0; + GNULIB_ACOSL=0; + GNULIB_ASINF=0; + GNULIB_ASINL=0; + GNULIB_ATANF=0; + GNULIB_ATANL=0; + GNULIB_ATAN2F=0; + GNULIB_CBRT=0; + GNULIB_CBRTF=0; + GNULIB_CBRTL=0; + GNULIB_CEIL=0; + GNULIB_CEILF=0; + GNULIB_CEILL=0; + GNULIB_COPYSIGN=0; + GNULIB_COPYSIGNF=0; + GNULIB_COPYSIGNL=0; + GNULIB_COSF=0; + GNULIB_COSL=0; + GNULIB_COSHF=0; + GNULIB_EXPF=0; + GNULIB_EXPL=0; + GNULIB_EXP2=0; + GNULIB_EXP2F=0; + GNULIB_EXP2L=0; + GNULIB_EXPM1=0; + GNULIB_EXPM1F=0; + GNULIB_EXPM1L=0; + GNULIB_FABSF=0; + GNULIB_FABSL=0; + GNULIB_FLOOR=0; + GNULIB_FLOORF=0; + GNULIB_FLOORL=0; + GNULIB_FMA=0; + GNULIB_FMAF=0; + GNULIB_FMAL=0; + GNULIB_FMOD=0; + GNULIB_FMODF=0; + GNULIB_FMODL=0; + GNULIB_FREXPF=0; + GNULIB_FREXP=0; + GNULIB_FREXPL=0; + GNULIB_HYPOT=0; + GNULIB_HYPOTF=0; + GNULIB_HYPOTL=0; + GNULIB_ILOGB=0; + GNULIB_ILOGBF=0; + GNULIB_ILOGBL=0; + GNULIB_ISFINITE=0; + GNULIB_ISINF=0; + GNULIB_ISNAN=0; + GNULIB_ISNANF=0; + GNULIB_ISNAND=0; + GNULIB_ISNANL=0; + GNULIB_LDEXPF=0; + GNULIB_LDEXPL=0; + GNULIB_LOG=0; + GNULIB_LOGF=0; + GNULIB_LOGL=0; + GNULIB_LOG10=0; + GNULIB_LOG10F=0; + GNULIB_LOG10L=0; + GNULIB_LOG1P=0; + GNULIB_LOG1PF=0; + GNULIB_LOG1PL=0; + GNULIB_LOG2=0; + GNULIB_LOG2F=0; + GNULIB_LOG2L=0; + GNULIB_LOGB=0; + GNULIB_LOGBF=0; + GNULIB_LOGBL=0; + GNULIB_MODF=0; + GNULIB_MODFF=0; + GNULIB_MODFL=0; + GNULIB_POWF=0; + GNULIB_REMAINDER=0; + GNULIB_REMAINDERF=0; + GNULIB_REMAINDERL=0; + GNULIB_RINT=0; + GNULIB_RINTF=0; + GNULIB_RINTL=0; + GNULIB_ROUND=0; + GNULIB_ROUNDF=0; + GNULIB_ROUNDL=0; + GNULIB_SIGNBIT=0; + GNULIB_SINF=0; + GNULIB_SINL=0; + GNULIB_SINHF=0; + GNULIB_SQRTF=0; + GNULIB_SQRTL=0; + GNULIB_TANF=0; + GNULIB_TANL=0; + GNULIB_TANHF=0; + GNULIB_TRUNC=0; + GNULIB_TRUNCF=0; + GNULIB_TRUNCL=0; + GNULIB_MDA_J0=1; + GNULIB_MDA_J1=1; + GNULIB_MDA_JN=1; + GNULIB_MDA_Y0=1; + GNULIB_MDA_Y1=1; + GNULIB_MDA_YN=1; HAVE_ACOSF=1; HAVE_ACOSL=1; HAVE_ASINF=1; @@ -14298,411 +12665,25 @@ - GL_GNULIB_ACOSF=0 - - - - GL_GNULIB_ACOSL=0 - - - - GL_GNULIB_ASINF=0 - - - - GL_GNULIB_ASINL=0 - - - - GL_GNULIB_ATANF=0 - - - - GL_GNULIB_ATANL=0 - - - - GL_GNULIB_ATAN2F=0 - - - - GL_GNULIB_CBRT=0 - - - - GL_GNULIB_CBRTF=0 - - - - GL_GNULIB_CBRTL=0 - - - - GL_GNULIB_CEIL=0 - - - - GL_GNULIB_CEILF=0 - - - - GL_GNULIB_CEILL=0 - - - - GL_GNULIB_COPYSIGN=0 - - - - GL_GNULIB_COPYSIGNF=0 - - - - GL_GNULIB_COPYSIGNL=0 - - - - GL_GNULIB_COSF=0 - - - - GL_GNULIB_COSL=0 - - - - GL_GNULIB_COSHF=0 - - - - GL_GNULIB_EXPF=0 - - - - GL_GNULIB_EXPL=0 - - - - GL_GNULIB_EXP2=0 - - - - GL_GNULIB_EXP2F=0 - - - - GL_GNULIB_EXP2L=0 - - - - GL_GNULIB_EXPM1=0 - - - - GL_GNULIB_EXPM1F=0 - - - - GL_GNULIB_EXPM1L=0 - - - - GL_GNULIB_FABSF=0 - - - - GL_GNULIB_FABSL=0 - - - - GL_GNULIB_FLOOR=0 - - - - GL_GNULIB_FLOORF=0 - - - - GL_GNULIB_FLOORL=0 - - - - GL_GNULIB_FMA=0 - - - - GL_GNULIB_FMAF=0 - - - - GL_GNULIB_FMAL=0 - - - - GL_GNULIB_FMOD=0 - - - - GL_GNULIB_FMODF=0 - - - - GL_GNULIB_FMODL=0 - - - - GL_GNULIB_FREXPF=0 - - - - GL_GNULIB_FREXP=0 - - - - GL_GNULIB_FREXPL=0 - - - - GL_GNULIB_HYPOT=0 - - - - GL_GNULIB_HYPOTF=0 - - - - GL_GNULIB_HYPOTL=0 - - - - GL_GNULIB_ILOGB=0 - - - - GL_GNULIB_ILOGBF=0 - - - - GL_GNULIB_ILOGBL=0 - - - - GL_GNULIB_ISFINITE=0 - - - - GL_GNULIB_ISINF=0 - - - - GL_GNULIB_ISNAN=0 - - - - GL_GNULIB_ISNANF=0 - - - - GL_GNULIB_ISNAND=0 - - - - GL_GNULIB_ISNANL=0 - - - - GL_GNULIB_LDEXPF=0 - - - - GL_GNULIB_LDEXPL=0 - - - - GL_GNULIB_LOG=0 - - - - GL_GNULIB_LOGF=0 - - - - GL_GNULIB_LOGL=0 - - - - GL_GNULIB_LOG10=0 - - - - GL_GNULIB_LOG10F=0 - - - - GL_GNULIB_LOG10L=0 - - - - GL_GNULIB_LOG1P=0 - - - - GL_GNULIB_LOG1PF=0 - - - - GL_GNULIB_LOG1PL=0 - - - - GL_GNULIB_LOG2=0 - - - - GL_GNULIB_LOG2F=0 - - - - GL_GNULIB_LOG2L=0 - - - - GL_GNULIB_LOGB=0 - - - - GL_GNULIB_LOGBF=0 - - - - GL_GNULIB_LOGBL=0 - - - - GL_GNULIB_MODF=0 - - - - GL_GNULIB_MODFF=0 - - - - GL_GNULIB_MODFL=0 - - - - GL_GNULIB_POWF=0 - - - - GL_GNULIB_REMAINDER=0 - - - - GL_GNULIB_REMAINDERF=0 - - - - GL_GNULIB_REMAINDERL=0 - - - - GL_GNULIB_RINT=0 - - - - GL_GNULIB_RINTF=0 - - - - GL_GNULIB_RINTL=0 - - - - GL_GNULIB_ROUND=0 - - - - GL_GNULIB_ROUNDF=0 - - - - GL_GNULIB_ROUNDL=0 - - - - GL_GNULIB_SIGNBIT=0 - - - - GL_GNULIB_SINF=0 - - - - GL_GNULIB_SINL=0 - - - - GL_GNULIB_SINHF=0 - - - - GL_GNULIB_SQRTF=0 - - - - GL_GNULIB_SQRTL=0 - - - - GL_GNULIB_TANF=0 - - - - GL_GNULIB_TANL=0 - - - - GL_GNULIB_TANHF=0 - - - - GL_GNULIB_TRUNC=0 - - - - GL_GNULIB_TRUNCF=0 - - - - GL_GNULIB_TRUNCL=0 - - - - GL_GNULIB_MDA_J0=1 - - - - GL_GNULIB_MDA_J1=1 - - - - GL_GNULIB_MDA_JN=1 - - - - GL_GNULIB_MDA_Y0=1 - - - - GL_GNULIB_MDA_Y1=1 - - - - GL_GNULIB_MDA_YN=1 - - - - + GNULIB_FCHMODAT=0; + GNULIB_FSTAT=0; + GNULIB_FSTATAT=0; + GNULIB_FUTIMENS=0; + GNULIB_GETUMASK=0; + GNULIB_LCHMOD=0; + GNULIB_LSTAT=0; + GNULIB_MKDIR=0; + GNULIB_MKDIRAT=0; + GNULIB_MKFIFO=0; + GNULIB_MKFIFOAT=0; + GNULIB_MKNOD=0; + GNULIB_MKNODAT=0; + GNULIB_STAT=0; + GNULIB_UTIMENSAT=0; + GNULIB_OVERRIDES_STRUCT_STAT=0; + GNULIB_MDA_CHMOD=1; + GNULIB_MDA_MKDIR=1; + GNULIB_MDA_UMASK=1; HAVE_FCHMODAT=1; HAVE_FSTATAT=1; HAVE_FUTIMENS=1; @@ -14715,7 +12696,6 @@ HAVE_MKNOD=1; HAVE_MKNODAT=1; HAVE_UTIMENSAT=1; - REPLACE_CHMOD=0; REPLACE_FCHMODAT=0; REPLACE_FSTAT=0; REPLACE_FSTATAT=0; @@ -14964,8 +12944,8 @@ gl_cv_absolute_sys_stat_h=`(eval "$gl_absname_cpp conftest.$ac_ext") 2>&5 | sed -n "$gl_absolute_header_sed"` - gl_header=$gl_cv_absolute_sys_stat_h - gl_cv_next_sys_stat_h='"'$gl_header'"' + gl_header=$gl_cv_absolute_sys_stat_h + gl_cv_next_sys_stat_h='"'$gl_header'"' else gl_cv_next_sys_stat_h='<'sys/stat.h'>' fi @@ -15036,92 +13016,6 @@ esac - - - - - - GL_GNULIB_CHMOD=0 - - - - GL_GNULIB_FCHMODAT=0 - - - - GL_GNULIB_FSTAT=0 - - - - GL_GNULIB_FSTATAT=0 - - - - GL_GNULIB_FUTIMENS=0 - - - - GL_GNULIB_GETUMASK=0 - - - - GL_GNULIB_LCHMOD=0 - - - - GL_GNULIB_LSTAT=0 - - - - GL_GNULIB_MKDIR=0 - - - - GL_GNULIB_MKDIRAT=0 - - - - GL_GNULIB_MKFIFO=0 - - - - GL_GNULIB_MKFIFOAT=0 - - - - GL_GNULIB_MKNOD=0 - - - - GL_GNULIB_MKNODAT=0 - - - - GL_GNULIB_STAT=0 - - - - GL_GNULIB_UTIMENSAT=0 - - - - GL_GNULIB_OVERRIDES_STRUCT_STAT=0 - - - - GL_GNULIB_MDA_CHMOD=1 - - - - GL_GNULIB_MDA_MKDIR=1 - - - - GL_GNULIB_MDA_UMASK=1 - - - - ac_fn_check_decl "$LINENO" "getdtablesize" "ac_cv_have_decl_getdtablesize" "$ac_includes_default" "$ac_c_undeclared_builtin_options" "CFLAGS" if test "x$ac_cv_have_decl_getdtablesize" = xyes then : @@ -15190,8 +13084,8 @@ gl_cv_absolute_getopt_h=`(eval "$gl_absname_cpp conftest.$ac_ext") 2>&5 | sed -n "$gl_absolute_header_sed"` - gl_header=$gl_cv_absolute_getopt_h - gl_cv_next_getopt_h='"'$gl_header'"' + gl_header=$gl_cv_absolute_getopt_h + gl_cv_next_getopt_h='"'$gl_header'"' else gl_cv_next_getopt_h='<'getopt.h'>' fi @@ -15759,6 +13653,7 @@ + if test $gl_cv_have_include_next = yes; then gl_cv_next_limits_h='<'limits.h'>' else @@ -15804,8 +13699,8 @@ gl_cv_absolute_limits_h=`(eval "$gl_absname_cpp conftest.$ac_ext") 2>&5 | sed -n "$gl_absolute_header_sed"` - gl_header=$gl_cv_absolute_limits_h - gl_cv_next_limits_h='"'$gl_header'"' + gl_header=$gl_cv_absolute_limits_h + gl_cv_next_limits_h='"'$gl_header'"' else gl_cv_next_limits_h='<'limits.h'>' fi @@ -15830,8 +13725,8 @@ - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether limits.h has WORD_BIT, BOOL_WIDTH etc." >&5 -printf %s "checking whether limits.h has WORD_BIT, BOOL_WIDTH etc.... " >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether limits.h has LLONG_MAX, WORD_BIT, ULLONG_WIDTH etc." >&5 +printf %s "checking whether limits.h has LLONG_MAX, WORD_BIT, ULLONG_WIDTH etc.... " >&6; } if test ${gl_cv_header_limits_width+y} then : printf %s "(cached) " >&6 @@ -15845,9 +13740,6 @@ long long llm = LLONG_MAX; int wb = WORD_BIT; int ullw = ULLONG_WIDTH; - int bw = BOOL_WIDTH; - int bm = BOOL_MAX; - int mblm = MB_LEN_MAX; int main (void) @@ -15867,36 +13759,18 @@ fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_header_limits_width" >&5 printf "%s\n" "$gl_cv_header_limits_width" >&6; } - GL_GENERATE_LIMITS_H=true - if test "$gl_cv_header_limits_width" = yes -then : - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether limits.h has SSIZE_MAX" >&5 -printf %s "checking whether limits.h has SSIZE_MAX... " >&6; } -if test ${gl_cv_header_limits_ssize_max+y} -then : - printf %s "(cached) " >&6 -else $as_nop - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -#include - #ifndef SSIZE_MAX - #error "SSIZE_MAX is not defined" - #endif + if test "$gl_cv_header_limits_width" = yes; then + LIMITS_H= + else + LIMITS_H=limits.h + fi -_ACEOF -if ac_fn_c_try_compile "$LINENO" -then : - gl_cv_header_limits_ssize_max=yes -else $as_nop - gl_cv_header_limits_ssize_max=no -fi -rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext -fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_header_limits_ssize_max" >&5 -printf "%s\n" "$gl_cv_header_limits_ssize_max" >&6; } - if test "$gl_cv_header_limits_ssize_max" = yes; then - GL_GENERATE_LIMITS_H=false - fi + if test -n "$LIMITS_H"; then + GL_GENERATE_LIMITS_H_TRUE= + GL_GENERATE_LIMITS_H_FALSE='#' +else + GL_GENERATE_LIMITS_H_TRUE='#' + GL_GENERATE_LIMITS_H_FALSE= fi @@ -15905,6 +13779,7 @@ + printf "%s\n" "#define HAVE_LONG_LONG_INT 1" >>confdefs.h @@ -15989,8 +13864,8 @@ gl_cv_absolute_stdint_h=`(eval "$gl_absname_cpp conftest.$ac_ext") 2>&5 | sed -n "$gl_absolute_header_sed"` - gl_header=$gl_cv_absolute_stdint_h - gl_cv_next_stdint_h='"'$gl_header'"' + gl_header=$gl_cv_absolute_stdint_h + gl_cv_next_stdint_h='"'$gl_header'"' else gl_cv_next_stdint_h='<'stdint.h'>' fi @@ -16143,7 +14018,7 @@ PTRDIFF_MIN == TYPE_MINIMUM (ptrdiff_t) && PTRDIFF_MAX == TYPE_MAXIMUM (ptrdiff_t) ? 1 : -1; - /* Detect bug in FreeBSD 6.0/ia64 and FreeBSD 13.0/arm64. */ + /* Detect bug in FreeBSD 6.0 / ia64. */ int check_SIG_ATOMIC: SIG_ATOMIC_MIN == TYPE_MINIMUM (sig_atomic_t) && SIG_ATOMIC_MAX == TYPE_MAXIMUM (sig_atomic_t) @@ -16304,7 +14179,7 @@ HAVE_C99_STDINT_H=0 HAVE_SYS_BITYPES_H=0 HAVE_SYS_INTTYPES_H=0 - GL_GENERATE_STDINT_H=true + STDINT_H=stdint.h case "$gl_cv_header_working_stdint_h" in *yes) HAVE_C99_STDINT_H=1 @@ -16401,7 +14276,7 @@ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_header_stdint_width" >&5 printf "%s\n" "$gl_cv_header_stdint_width" >&6; } if test "$gl_cv_header_stdint_width" = yes; then - GL_GENERATE_STDINT_H=false + STDINT_H= fi ;; *) @@ -16699,7 +14574,7 @@ - if test $GNULIBHEADERS_OVERRIDE_WINT_T = 1; then + if test $GNULIB_OVERRIDES_WINT_T = 1; then BITSIZEOF_WINT_T=32 fi @@ -16708,23 +14583,40 @@ - GL_GENERATE_LIMITS_H=true + LIMITS_H='limits.h' + if test -n "$LIMITS_H"; then + GL_GENERATE_LIMITS_H_TRUE= + GL_GENERATE_LIMITS_H_FALSE='#' +else + GL_GENERATE_LIMITS_H_TRUE='#' + GL_GENERATE_LIMITS_H_FALSE= +fi + + if test -n "$STDINT_H"; then + GL_GENERATE_STDINT_H_TRUE= + GL_GENERATE_STDINT_H_FALSE='#' +else + GL_GENERATE_STDINT_H_TRUE='#' + GL_GENERATE_STDINT_H_FALSE= +fi + + + GNULIB_IMAXABS=0; + GNULIB_IMAXDIV=0; + GNULIB_STRTOIMAX=0; + GNULIB_STRTOUMAX=0; HAVE_DECL_IMAXABS=1; HAVE_DECL_IMAXDIV=1; HAVE_DECL_STRTOIMAX=1; HAVE_DECL_STRTOUMAX=1; HAVE_IMAXDIV_T=1; - HAVE_IMAXABS=1; - HAVE_IMAXDIV=1; - REPLACE_IMAXABS=0; - REPLACE_IMAXDIV=0; REPLACE_STRTOIMAX=0; REPLACE_STRTOUMAX=0; INT32_MAX_LT_INTMAX_MAX=1; @@ -16792,8 +14684,8 @@ gl_cv_absolute_inttypes_h=`(eval "$gl_absname_cpp conftest.$ac_ext") 2>&5 | sed -n "$gl_absolute_header_sed"` - gl_header=$gl_cv_absolute_inttypes_h - gl_cv_next_inttypes_h='"'$gl_header'"' + gl_header=$gl_cv_absolute_inttypes_h + gl_cv_next_inttypes_h='"'$gl_header'"' else gl_cv_next_inttypes_h='<'inttypes.h'>' fi @@ -16827,24 +14719,6 @@ - - GL_GNULIB_IMAXABS=0 - - - - GL_GNULIB_IMAXDIV=0 - - - - GL_GNULIB_STRTOIMAX=0 - - - - GL_GNULIB_STRTOUMAX=0 - - - - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking where to find the exponent in a 'float'" >&5 printf %s "checking where to find the exponent in a 'float'... " >&6; } if test ${gl_cv_cc_float_expbit0+y} @@ -16954,153 +14828,6 @@ - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking where to find the exponent in a 'long double'" >&5 -printf %s "checking where to find the exponent in a 'long double'... " >&6; } -if test ${gl_cv_cc_long_double_expbit0+y} -then : - printf %s "(cached) " >&6 -else $as_nop - - if test "$cross_compiling" = yes -then : - - gl_cv_cc_long_double_expbit0="unknown" - case "$host_os" in - mingw*) # On native Windows (little-endian), we know the result - # in two cases: mingw, MSVC. - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ - -#ifdef __MINGW32__ - Known -#endif - -_ACEOF -if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | - $EGREP "Known" >/dev/null 2>&1 -then : - gl_cv_cc_long_double_expbit0="word 2 bit 0" -fi -rm -rf conftest* - - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ - -#ifdef _MSC_VER - Known -#endif - -_ACEOF -if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | - $EGREP "Known" >/dev/null 2>&1 -then : - gl_cv_cc_long_double_expbit0="word 1 bit 20" -fi -rm -rf conftest* - - ;; - esac - -else $as_nop - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ - -#include -#include -#include -#include -#define NWORDS \ - ((sizeof (long double) + sizeof (unsigned int) - 1) / sizeof (unsigned int)) -typedef union { long double value; unsigned int word[NWORDS]; } - memory_long_double; -static unsigned int ored_words[NWORDS]; -static unsigned int anded_words[NWORDS]; -static void add_to_ored_words (long double *x) -{ - memory_long_double m; - size_t i; - /* Clear it first, in case - sizeof (long double) < sizeof (memory_long_double). */ - memset (&m, 0, sizeof (memory_long_double)); - m.value = *x; - for (i = 0; i < NWORDS; i++) - { - ored_words[i] |= m.word[i]; - anded_words[i] &= m.word[i]; - } -} -int main () -{ - static long double samples[5] = { 0.25L, 0.5L, 1.0L, 2.0L, 4.0L }; - size_t j; - FILE *fp = fopen ("conftest.out", "w"); - if (fp == NULL) - return 1; - for (j = 0; j < NWORDS; j++) - anded_words[j] = ~ (unsigned int) 0; - for (j = 0; j < 5; j++) - add_to_ored_words (&samples[j]); - /* Remove bits that are common (e.g. if representation of the first mantissa - bit is explicit). */ - for (j = 0; j < NWORDS; j++) - ored_words[j] &= ~anded_words[j]; - /* Now find the nonzero word. */ - for (j = 0; j < NWORDS; j++) - if (ored_words[j] != 0) - break; - if (j < NWORDS) - { - size_t i; - for (i = j + 1; i < NWORDS; i++) - if (ored_words[i] != 0) - { - fprintf (fp, "unknown"); - return (fclose (fp) != 0); - } - for (i = 0; ; i++) - if ((ored_words[j] >> i) & 1) - { - fprintf (fp, "word %d bit %d", (int) j, (int) i); - return (fclose (fp) != 0); - } - } - fprintf (fp, "unknown"); - return (fclose (fp) != 0); -} - -_ACEOF -if ac_fn_c_try_run "$LINENO" -then : - gl_cv_cc_long_double_expbit0=`cat conftest.out` -else $as_nop - gl_cv_cc_long_double_expbit0="unknown" -fi -rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ - conftest.$ac_objext conftest.beam conftest.$ac_ext -fi - - rm -f conftest.out - -fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_cc_long_double_expbit0" >&5 -printf "%s\n" "$gl_cv_cc_long_double_expbit0" >&6; } - case "$gl_cv_cc_long_double_expbit0" in - word*bit*) - word=`echo "$gl_cv_cc_long_double_expbit0" | sed -e 's/word //' -e 's/ bit.*//'` - bit=`echo "$gl_cv_cc_long_double_expbit0" | sed -e 's/word.*bit //'` - -printf "%s\n" "#define LDBL_EXPBIT0_WORD $word" >>confdefs.h - - -printf "%s\n" "#define LDBL_EXPBIT0_BIT $bit" >>confdefs.h - - ;; - esac - - - - - @@ -17121,6 +14848,7 @@ + if test $gl_cv_have_include_next = yes; then gl_cv_next_sys_types_h='<'sys/types.h'>' else @@ -17163,8 +14891,8 @@ gl_cv_absolute_sys_types_h=`(eval "$gl_absname_cpp conftest.$ac_ext") 2>&5 | sed -n "$gl_absolute_header_sed"` - gl_header=$gl_cv_absolute_sys_types_h - gl_cv_next_sys_types_h='"'$gl_header'"' + gl_header=$gl_cv_absolute_sys_types_h + gl_cv_next_sys_types_h='"'$gl_header'"' fi @@ -17198,9 +14926,43 @@ + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether malloc, realloc, calloc are POSIX compliant" >&5 +printf %s "checking whether malloc, realloc, calloc are POSIX compliant... " >&6; } +if test ${gl_cv_func_malloc_posix+y} +then : + printf %s "(cached) " >&6 +else $as_nop + + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether malloc (0) returns nonnull" >&5 -printf %s "checking whether malloc (0) returns nonnull... " >&6; } +int +main (void) +{ +#if defined _WIN32 && ! defined __CYGWIN__ + choke me + #endif + + ; + return 0; +} +_ACEOF +if ac_fn_c_try_compile "$LINENO" +then : + gl_cv_func_malloc_posix=yes +else $as_nop + gl_cv_func_malloc_posix=no +fi +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext + +fi +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_malloc_posix" >&5 +printf "%s\n" "$gl_cv_func_malloc_posix" >&6; } + + + + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for GNU libc compatible malloc" >&5 +printf %s "checking for GNU libc compatible malloc... " >&6; } if test ${ac_cv_func_malloc_0_nonnull+y} then : printf %s "(cached) " >&6 @@ -17209,9 +14971,8 @@ then : case "$host_os" in # Guess yes on platforms where we know the result. - *-gnu* | freebsd* | netbsd* | openbsd* | bitrig* \ - | gnu* | *-musl* | midipix* | midnightbsd* \ - | hpux* | solaris* | cygwin* | mingw* | msys* ) + *-gnu* | gnu* | *-musl* | freebsd* | midnightbsd* | netbsd* | openbsd* \ + | hpux* | solaris* | cygwin* | mingw*) ac_cv_func_malloc_0_nonnull="guessing yes" ;; # If we don't know, obey --enable-cross-guesses. *) ac_cv_func_malloc_0_nonnull="$gl_cross_guess_normal" ;; @@ -17225,7 +14986,7 @@ int main (void) { -void *p = malloc (0); +char *p = malloc (0); int result = !p; free (p); return result; @@ -17248,171 +15009,17 @@ fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_func_malloc_0_nonnull" >&5 printf "%s\n" "$ac_cv_func_malloc_0_nonnull" >&6; } - case $ac_cv_func_malloc_0_nonnull in #( - *yes) : - gl_cv_func_malloc_0_nonnull=1 ;; #( - *) : - gl_cv_func_malloc_0_nonnull=0 ;; -esac - - -printf "%s\n" "#define MALLOC_0_IS_NONNULL $gl_cv_func_malloc_0_nonnull" >>confdefs.h - - - - - - - - - - - - - - - if test $gl_cv_have_include_next = yes; then - gl_cv_next_math_h='<'math.h'>' - else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking absolute name of " >&5 -printf %s "checking absolute name of ... " >&6; } -if test ${gl_cv_next_math_h+y} -then : - printf %s "(cached) " >&6 -else $as_nop - - if test $ac_cv_header_math_h = yes; then - - - - - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -#include -_ACEOF - case "$host_os" in - aix*) gl_absname_cpp="$ac_cpp -C" ;; - *) gl_absname_cpp="$ac_cpp" ;; - esac - - case "$host_os" in - mingw*) - gl_dirsep_regex='[/\\]' + case "$ac_cv_func_malloc_0_nonnull" in + *yes) + gl_cv_func_malloc_0_nonnull=1 ;; *) - gl_dirsep_regex='\/' + gl_cv_func_malloc_0_nonnull=0 ;; esac - gl_make_literal_regex_sed='s,[]$^\\.*/[],\\&,g' - gl_header_literal_regex=`echo 'math.h' \ - | 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 - }' - - gl_cv_absolute_math_h=`(eval "$gl_absname_cpp conftest.$ac_ext") 2>&5 | - sed -n "$gl_absolute_header_sed"` - - gl_header=$gl_cv_absolute_math_h - gl_cv_next_math_h='"'$gl_header'"' - else - gl_cv_next_math_h='<'math.h'>' - fi - - -fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_next_math_h" >&5 -printf "%s\n" "$gl_cv_next_math_h" >&6; } - fi - NEXT_MATH_H=$gl_cv_next_math_h - - if test $gl_cv_have_include_next = yes || test $gl_cv_have_include_next = buggy; then - # INCLUDE_NEXT_AS_FIRST_DIRECTIVE='include_next' - gl_next_as_first_directive='<'math.h'>' - else - # INCLUDE_NEXT_AS_FIRST_DIRECTIVE='include' - gl_next_as_first_directive=$gl_cv_next_math_h - fi - NEXT_AS_FIRST_DIRECTIVE_MATH_H=$gl_next_as_first_directive - - - - - - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether NAN macro works" >&5 -printf %s "checking whether NAN macro works... " >&6; } -if test ${gl_cv_header_math_nan_works+y} -then : - printf %s "(cached) " >&6 -else $as_nop - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -#include -int -main (void) -{ -/* Solaris 10 has a broken definition of NAN. Other platforms - fail to provide NAN, or provide it only in C99 mode; this - test only needs to fail when NAN is provided but wrong. */ - float f = 1.0f; -#ifdef NAN - f = NAN; -#endif - return f == 0; - ; - return 0; -} -_ACEOF -if ac_fn_c_try_compile "$LINENO" -then : - gl_cv_header_math_nan_works=yes -else $as_nop - gl_cv_header_math_nan_works=no -fi -rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext -fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_header_math_nan_works" >&5 -printf "%s\n" "$gl_cv_header_math_nan_works" >&6; } - if test $gl_cv_header_math_nan_works = no; then - REPLACE_NAN=1 - fi - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether HUGE_VAL works" >&5 -printf %s "checking whether HUGE_VAL works... " >&6; } -if test ${gl_cv_header_math_huge_val_works+y} -then : - printf %s "(cached) " >&6 -else $as_nop - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -#include -int -main (void) -{ -/* Solaris 10 has a broken definition of HUGE_VAL. */ - double d = HUGE_VAL; - return d == 0; - ; - return 0; -} -_ACEOF -if ac_fn_c_try_compile "$LINENO" -then : - gl_cv_header_math_huge_val_works=yes -else $as_nop - gl_cv_header_math_huge_val_works=no -fi -rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext -fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_header_math_huge_val_works" >&5 -printf "%s\n" "$gl_cv_header_math_huge_val_works" >&6; } - if test $gl_cv_header_math_huge_val_works = no; then - REPLACE_HUGE_VAL=1 - fi +printf "%s\n" "#define MALLOC_0_IS_NONNULL $gl_cv_func_malloc_0_nonnull" >>confdefs.h @@ -17485,13 +15092,55 @@ + GNULIB_EXPLICIT_BZERO=0; + GNULIB_FFSL=0; + GNULIB_FFSLL=0; + GNULIB_MEMCHR=0; + GNULIB_MEMMEM=0; + GNULIB_MEMPCPY=0; + GNULIB_MEMRCHR=0; + GNULIB_RAWMEMCHR=0; + GNULIB_STPCPY=0; + GNULIB_STPNCPY=0; + GNULIB_STRCHRNUL=0; + GNULIB_STRDUP=0; + GNULIB_STRNCAT=0; + GNULIB_STRNDUP=0; + GNULIB_STRNLEN=0; + GNULIB_STRPBRK=0; + GNULIB_STRSEP=0; + GNULIB_STRSTR=0; + GNULIB_STRCASESTR=0; + GNULIB_STRTOK_R=0; + GNULIB_MBSLEN=0; + GNULIB_MBSNLEN=0; + GNULIB_MBSCHR=0; + GNULIB_MBSRCHR=0; + GNULIB_MBSSTR=0; + GNULIB_MBSCASECMP=0; + GNULIB_MBSNCASECMP=0; + GNULIB_MBSPCASECMP=0; + GNULIB_MBSCASESTR=0; + GNULIB_MBSCSPN=0; + GNULIB_MBSPBRK=0; + GNULIB_MBSSPN=0; + GNULIB_MBSSEP=0; + GNULIB_MBSTOK_R=0; + GNULIB_STRERROR=0; + GNULIB_STRERROR_R=0; + GNULIB_STRERRORNAME_NP=0; + GNULIB_SIGABBREV_NP=0; + GNULIB_SIGDESCR_NP=0; + GNULIB_STRSIGNAL=0; + GNULIB_STRVERSCMP=0; HAVE_MBSLEN=0; + GNULIB_MDA_MEMCCPY=1; + GNULIB_MDA_STRDUP=1; HAVE_EXPLICIT_BZERO=1; HAVE_FFSL=1; HAVE_FFSLL=1; HAVE_DECL_MEMMEM=1; HAVE_MEMPCPY=1; - HAVE_MEMSET_EXPLICIT=1; HAVE_DECL_MEMRCHR=1; HAVE_RAWMEMCHR=1; HAVE_STPCPY=1; @@ -17513,8 +15162,6 @@ REPLACE_FFSLL=0; REPLACE_MEMCHR=0; REPLACE_MEMMEM=0; - REPLACE_MEMPCPY=0; - REPLACE_STPCPY=0; REPLACE_STPNCPY=0; REPLACE_STRCHRNUL=0; REPLACE_STRDUP=0; @@ -17653,184 +15300,6 @@ - GL_GNULIB_EXPLICIT_BZERO=0 - - - - GL_GNULIB_FFSL=0 - - - - GL_GNULIB_FFSLL=0 - - - - GL_GNULIB_MEMCHR=0 - - - - GL_GNULIB_MEMMEM=0 - - - - GL_GNULIB_MEMPCPY=0 - - - - GL_GNULIB_MEMRCHR=0 - - - - GL_GNULIB_MEMSET_EXPLICIT=0 - - - - GL_GNULIB_RAWMEMCHR=0 - - - - GL_GNULIB_STPCPY=0 - - - - GL_GNULIB_STPNCPY=0 - - - - GL_GNULIB_STRCHRNUL=0 - - - - GL_GNULIB_STRDUP=0 - - - - GL_GNULIB_STRNCAT=0 - - - - GL_GNULIB_STRNDUP=0 - - - - GL_GNULIB_STRNLEN=0 - - - - GL_GNULIB_STRPBRK=0 - - - - GL_GNULIB_STRSEP=0 - - - - GL_GNULIB_STRSTR=0 - - - - GL_GNULIB_STRCASESTR=0 - - - - GL_GNULIB_STRTOK_R=0 - - - - GL_GNULIB_MBSLEN=0 - - - - GL_GNULIB_MBSNLEN=0 - - - - GL_GNULIB_MBSCHR=0 - - - - GL_GNULIB_MBSRCHR=0 - - - - GL_GNULIB_MBSSTR=0 - - - - GL_GNULIB_MBSCASECMP=0 - - - - GL_GNULIB_MBSNCASECMP=0 - - - - GL_GNULIB_MBSPCASECMP=0 - - - - GL_GNULIB_MBSCASESTR=0 - - - - GL_GNULIB_MBSCSPN=0 - - - - GL_GNULIB_MBSPBRK=0 - - - - GL_GNULIB_MBSSPN=0 - - - - GL_GNULIB_MBSSEP=0 - - - - GL_GNULIB_MBSTOK_R=0 - - - - GL_GNULIB_STRERROR=0 - - - - GL_GNULIB_STRERROR_R=0 - - - - GL_GNULIB_STRERRORNAME_NP=0 - - - - GL_GNULIB_SIGABBREV_NP=0 - - - - GL_GNULIB_SIGDESCR_NP=0 - - - - GL_GNULIB_STRSIGNAL=0 - - - - GL_GNULIB_STRVERSCMP=0 - - - - GL_GNULIB_MDA_MEMCCPY=1 - - - - GL_GNULIB_MDA_STRDUP=1 - - - - - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether defines MIN and MAX" >&5 @@ -17981,6 +15450,11 @@ + GNULIB_PTHREAD_SIGMASK=0; + GNULIB_RAISE=0; + GNULIB_SIGNAL_H_SIGPIPE=0; + GNULIB_SIGPROCMASK=0; + GNULIB_SIGACTION=0; HAVE_POSIX_SIGNALBLOCKING=1; HAVE_PTHREAD_SIGMASK=1; HAVE_RAISE=1; @@ -17997,35 +15471,6 @@ - GL_GNULIB_PTHREAD_SIGMASK=0 - - - - GL_GNULIB_RAISE=0 - - - - GL_GNULIB_SIGNAL_H_SIGPIPE=0 - - - - GL_GNULIB_SIGPROCMASK=0 - - - - GL_GNULIB_SIGACTION=0 - - - - - - - - if test $REPLACE_MALLOC_FOR_MALLOC_POSIX = 1; then - REPLACE_REALLOC_FOR_REALLOC_POSIX=1 - fi - - ac_fn_c_check_type "$LINENO" "sigset_t" "ac_cv_type_sigset_t" " #include /* Mingw defines sigset_t not in , but in . */ @@ -18079,297 +15524,77 @@ fi - - - - - - - - - - - if test $gl_cv_have_include_next = yes; then - gl_cv_next_signal_h='<'signal.h'>' - else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking absolute name of " >&5 -printf %s "checking absolute name of ... " >&6; } -if test ${gl_cv_next_signal_h+y} +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for stdbool.h that conforms to C99" >&5 +printf %s "checking for stdbool.h that conforms to C99... " >&6; } +if test ${ac_cv_header_stdbool_h+y} then : printf %s "(cached) " >&6 else $as_nop - - - cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ -#include -_ACEOF - case "$host_os" in - aix*) gl_absname_cpp="$ac_cpp -C" ;; - *) gl_absname_cpp="$ac_cpp" ;; - esac - - case "$host_os" in - mingw*) - gl_dirsep_regex='[/\\]' - ;; - *) - gl_dirsep_regex='\/' - ;; - esac - gl_make_literal_regex_sed='s,[]$^\\.*/[],\\&,g' - gl_header_literal_regex=`echo 'signal.h' \ - | 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 - }' - - gl_cv_absolute_signal_h=`(eval "$gl_absname_cpp conftest.$ac_ext") 2>&5 | - sed -n "$gl_absolute_header_sed"` - - gl_header=$gl_cv_absolute_signal_h - gl_cv_next_signal_h='"'$gl_header'"' - - -fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_next_signal_h" >&5 -printf "%s\n" "$gl_cv_next_signal_h" >&6; } - fi - NEXT_SIGNAL_H=$gl_cv_next_signal_h - - if test $gl_cv_have_include_next = yes || test $gl_cv_have_include_next = buggy; then - # INCLUDE_NEXT_AS_FIRST_DIRECTIVE='include_next' - gl_next_as_first_directive='<'signal.h'>' - else - # INCLUDE_NEXT_AS_FIRST_DIRECTIVE='include' - gl_next_as_first_directive=$gl_cv_next_signal_h - fi - NEXT_AS_FIRST_DIRECTIVE_SIGNAL_H=$gl_next_as_first_directive - - - - - -# AIX declares sig_atomic_t to already include volatile, and C89 compilers -# then choke on 'volatile sig_atomic_t'. C99 requires that it compile. - ac_fn_c_check_type "$LINENO" "volatile sig_atomic_t" "ac_cv_type_volatile_sig_atomic_t" " -#include - -" -if test "x$ac_cv_type_volatile_sig_atomic_t" = xyes -then : - -else $as_nop - HAVE_TYPE_VOLATILE_SIG_ATOMIC_T=0 -fi - - - - - - - - ac_fn_c_check_type "$LINENO" "sighandler_t" "ac_cv_type_sighandler_t" " -#include - -" -if test "x$ac_cv_type_sighandler_t" = xyes -then : - -else $as_nop - HAVE_SIGHANDLER_T=0 -fi - - - - - - - - - - - - - - - - - - - - - - - - - - - gl_cv_func_sprintf_posix=no - case "$gl_cv_func_printf_sizes_c99" in - *yes) - case "$gl_cv_func_printf_sizes_c23" in - *yes) - case "$gl_cv_func_printf_long_double" in - *yes) - case "$gl_cv_func_printf_infinite" in - *yes) - case "$gl_cv_func_printf_infinite_long_double" in - *yes) - case "$gl_cv_func_printf_directive_a" in - *yes) - case "$gl_cv_func_printf_directive_b" in - *yes) - case "$gl_cv_func_printf_directive_f" in - *yes) - case "$gl_cv_func_printf_directive_n" in - *yes) - case "$gl_cv_func_printf_directive_ls" in - *yes) - case "$gl_cv_func_printf_directive_lc" in - *yes) - case "$gl_cv_func_printf_positions" in - *yes) - case "$gl_cv_func_printf_flag_grouping" in - *yes) - case "$gl_cv_func_printf_flag_leftadjust" in - *yes) - case "$gl_cv_func_printf_flag_zero" in - *yes) - case "$gl_cv_func_printf_precision" in - *yes) - case "$gl_cv_func_printf_enomem" in - *yes) - # sprintf exists and is - # already POSIX compliant. - gl_cv_func_sprintf_posix=yes - ;; - esac - ;; - esac - ;; - esac - ;; - esac - ;; - esac - ;; - esac - ;; - esac - ;; - esac - ;; - esac - ;; - esac - ;; - esac - ;; - esac - ;; - esac - ;; - esac - ;; - esac - ;; - esac - ;; - esac - - - - - - REPLACE_NULL=0; - HAVE_MAX_ALIGN_T=1; - HAVE_WCHAR_T=1; - - - + #include + #ifdef __cplusplus + typedef bool Bool; + #else + typedef _Bool Bool; + #ifndef bool + "error: bool is not defined" + #endif + #ifndef false + "error: false is not defined" + #endif + #if false + "error: false is not 0" + #endif + #ifndef true + "error: true is not defined" + #endif + #if true != 1 + "error: true is not 1" + #endif + #endif + #ifndef __bool_true_false_are_defined + "error: __bool_true_false_are_defined is not defined" + #endif - GL_GENERATE_STDDEF_H=false + struct s { Bool s: 1; Bool t; bool u: 1; bool v; } s; - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for good max_align_t" >&5 -printf %s "checking for good max_align_t... " >&6; } -if test ${gl_cv_type_max_align_t+y} -then : - printf %s "(cached) " >&6 -else $as_nop - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -/* On FreeBSD 12.0/x86, max_align_t defined by has - the correct alignment with the default (wrong) definition of - _Alignof, but a wrong alignment as soon as we activate an - ISO C compliant _Alignof definition. */ - #if ((defined __GNUC__ && 4 <= __GNUC__) || defined __clang__) && !defined __cplusplus - #define _Alignof(type) __builtin_offsetof (struct { char __a; type __b; }, __b) - #endif - #include - unsigned int s = sizeof (max_align_t); - #if defined __GNUC__ || defined __clang__ || defined __IBM__ALIGNOF__ - int check1[2 * (__alignof__ (double) <= __alignof__ (max_align_t)) - 1]; - int check2[2 * (__alignof__ (long double) <= __alignof__ (max_align_t)) - 1]; - #endif - typedef struct { char a; max_align_t b; } max_helper; - typedef struct { char a; long b; } long_helper; - typedef struct { char a; double b; } double_helper; - typedef struct { char a; long double b; } long_double_helper; - int check3[2 * (offsetof (long_helper, b) <= offsetof (max_helper, b)) - 1]; - int check4[2 * (offsetof (double_helper, b) <= offsetof (max_helper, b)) - 1]; - int check5[2 * (offsetof (long_double_helper, b) <= offsetof (max_helper, b)) - 1]; + char a[true == 1 ? 1 : -1]; + char b[false == 0 ? 1 : -1]; + char c[__bool_true_false_are_defined == 1 ? 1 : -1]; + char d[(bool) 0.5 == true ? 1 : -1]; + /* See body of main program for 'e'. */ + char f[(Bool) 0.0 == false ? 1 : -1]; + char g[true]; + char h[sizeof (Bool)]; + char i[sizeof s.t]; + enum { j = false, k = true, l = false * true, m = true * 256 }; + /* The following fails for + HP aC++/ANSI C B3910B A.05.55 [Dec 04 2003]. */ + Bool n[m]; + char o[sizeof n == m * sizeof n[0] ? 1 : -1]; + char p[-1 - (Bool) 0 < 0 && -1 - (bool) 0 < 0 ? 1 : -1]; + /* Catch a bug in an HP-UX C compiler. See + https://gcc.gnu.org/ml/gcc-patches/2003-12/msg02303.html + https://lists.gnu.org/r/bug-coreutils/2005-11/msg00161.html + */ + Bool q = true; + Bool *pq = &q; + bool *qq = &q; int main (void) { - ; - return 0; -} -_ACEOF -if ac_fn_c_try_compile "$LINENO" -then : - gl_cv_type_max_align_t=yes -else $as_nop - gl_cv_type_max_align_t=no -fi -rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext - -fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_type_max_align_t" >&5 -printf "%s\n" "$gl_cv_type_max_align_t" >&6; } - if test $gl_cv_type_max_align_t = no; then - HAVE_MAX_ALIGN_T=0 - GL_GENERATE_STDDEF_H=true - fi - - if test $gt_cv_c_wchar_t = no; then - HAVE_WCHAR_T=0 - GL_GENERATE_STDDEF_H=true - fi - - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether NULL can be used in arbitrary expressions" >&5 -printf %s "checking whether NULL can be used in arbitrary expressions... " >&6; } -if test ${gl_cv_decl_null_works+y} -then : - printf %s "(cached) " >&6 -else $as_nop - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -#include - int test[2 * (sizeof NULL == sizeof (void *)) -1]; - -int -main (void) -{ + bool e = &s; + *pq |= q; *pq |= ! q; + *qq |= q; *qq |= ! q; + /* Refer to every declared value, to avoid compiler optimizations. */ + return (!a + !b + !c + !d + !e + !f + !g + !h + !i + !!j + !k + !!l + + !m + !n + !o + !p + !q + !pq + !qq); ; return 0; @@ -18377,140 +15602,28 @@ _ACEOF if ac_fn_c_try_compile "$LINENO" then : - gl_cv_decl_null_works=yes + ac_cv_header_stdbool_h=yes else $as_nop - gl_cv_decl_null_works=no + ac_cv_header_stdbool_h=no fi rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_decl_null_works" >&5 -printf "%s\n" "$gl_cv_decl_null_works" >&6; } - if test $gl_cv_decl_null_works = no; then - REPLACE_NULL=1 - GL_GENERATE_STDDEF_H=true - fi - - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for unreachable" >&5 -printf %s "checking for unreachable... " >&6; } -if test ${gl_cv_func_unreachable+y} +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_header_stdbool_h" >&5 +printf "%s\n" "$ac_cv_header_stdbool_h" >&6; } + ac_fn_c_check_type "$LINENO" "_Bool" "ac_cv_type__Bool" "$ac_includes_default" +if test "x$ac_cv_type__Bool" = xyes then : - printf %s "(cached) " >&6 -else $as_nop - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -#include -int -main (void) -{ -unreachable (); +printf "%s\n" "#define HAVE__BOOL 1" >>confdefs.h - ; - return 0; -} -_ACEOF -if ac_fn_c_try_link "$LINENO" -then : - gl_cv_func_unreachable=yes -else $as_nop - gl_cv_func_unreachable=no -fi -rm -f core conftest.err conftest.$ac_objext conftest.beam \ - conftest$ac_exeext conftest.$ac_ext fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_unreachable" >&5 -printf "%s\n" "$gl_cv_func_unreachable" >&6; } - if test $gl_cv_func_unreachable = no; then - GL_GENERATE_STDDEF_H=true - fi - - if $GL_GENERATE_STDDEF_H; then - - - - - - if test $gl_cv_have_include_next = yes; then - gl_cv_next_stddef_h='<'stddef.h'>' - else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking absolute name of " >&5 -printf %s "checking absolute name of ... " >&6; } -if test ${gl_cv_next_stddef_h+y} -then : - printf %s "(cached) " >&6 -else $as_nop - - - - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -#include -_ACEOF - case "$host_os" in - aix*) gl_absname_cpp="$ac_cpp -C" ;; - *) gl_absname_cpp="$ac_cpp" ;; - esac - - case "$host_os" in - mingw*) - gl_dirsep_regex='[/\\]' - ;; - *) - gl_dirsep_regex='\/' - ;; - esac - gl_make_literal_regex_sed='s,[]$^\\.*/[],\\&,g' - gl_header_literal_regex=`echo 'stddef.h' \ - | 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 - }' - - gl_cv_absolute_stddef_h=`(eval "$gl_absname_cpp conftest.$ac_ext") 2>&5 | - sed -n "$gl_absolute_header_sed"` - - gl_header=$gl_cv_absolute_stddef_h - gl_cv_next_stddef_h='"'$gl_header'"' - - -fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_next_stddef_h" >&5 -printf "%s\n" "$gl_cv_next_stddef_h" >&6; } - fi - NEXT_STDDEF_H=$gl_cv_next_stddef_h - - if test $gl_cv_have_include_next = yes || test $gl_cv_have_include_next = buggy; then - # INCLUDE_NEXT_AS_FIRST_DIRECTIVE='include_next' - gl_next_as_first_directive='<'stddef.h'>' - else - # INCLUDE_NEXT_AS_FIRST_DIRECTIVE='include' - gl_next_as_first_directive=$gl_cv_next_stddef_h - fi - NEXT_AS_FIRST_DIRECTIVE_STDDEF_H=$gl_next_as_first_directive - - - - - fi - - - - - - case "$host_os" in - *-musl* | midipix*) - -printf "%s\n" "#define MUSL_LIBC 1" >>confdefs.h - - ;; - esac + REPLACE_NULL=0; + HAVE_MAX_ALIGN_T=1; + HAVE_WCHAR_T=1; ac_fn_check_decl "$LINENO" "fcloseall" "ac_cv_have_decl_fcloseall" "$ac_includes_default" "$ac_c_undeclared_builtin_options" "CFLAGS" if test "x$ac_cv_have_decl_fcloseall" = xyes @@ -18521,336 +15634,6 @@ fi printf "%s\n" "#define HAVE_DECL_FCLOSEALL $ac_have_decl" >>confdefs.h -ac_fn_check_decl "$LINENO" "getw" "ac_cv_have_decl_getw" "$ac_includes_default" "$ac_c_undeclared_builtin_options" "CFLAGS" -if test "x$ac_cv_have_decl_getw" = xyes -then : - ac_have_decl=1 -else $as_nop - ac_have_decl=0 -fi -printf "%s\n" "#define HAVE_DECL_GETW $ac_have_decl" >>confdefs.h - -ac_fn_check_decl "$LINENO" "putw" "ac_cv_have_decl_putw" "$ac_includes_default" "$ac_c_undeclared_builtin_options" "CFLAGS" -if test "x$ac_cv_have_decl_putw" = xyes -then : - ac_have_decl=1 -else $as_nop - ac_have_decl=0 -fi -printf "%s\n" "#define HAVE_DECL_PUTW $ac_have_decl" >>confdefs.h - - - - - - - - - - - - if test $gl_cv_have_include_next = yes; then - gl_cv_next_stdio_h='<'stdio.h'>' - else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking absolute name of " >&5 -printf %s "checking absolute name of ... " >&6; } -if test ${gl_cv_next_stdio_h+y} -then : - printf %s "(cached) " >&6 -else $as_nop - - - - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -#include -_ACEOF - case "$host_os" in - aix*) gl_absname_cpp="$ac_cpp -C" ;; - *) gl_absname_cpp="$ac_cpp" ;; - esac - - case "$host_os" in - mingw*) - gl_dirsep_regex='[/\\]' - ;; - *) - gl_dirsep_regex='\/' - ;; - esac - gl_make_literal_regex_sed='s,[]$^\\.*/[],\\&,g' - gl_header_literal_regex=`echo 'stdio.h' \ - | 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 - }' - - gl_cv_absolute_stdio_h=`(eval "$gl_absname_cpp conftest.$ac_ext") 2>&5 | - sed -n "$gl_absolute_header_sed"` - - gl_header=$gl_cv_absolute_stdio_h - gl_cv_next_stdio_h='"'$gl_header'"' - - -fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_next_stdio_h" >&5 -printf "%s\n" "$gl_cv_next_stdio_h" >&6; } - fi - NEXT_STDIO_H=$gl_cv_next_stdio_h - - if test $gl_cv_have_include_next = yes || test $gl_cv_have_include_next = buggy; then - # INCLUDE_NEXT_AS_FIRST_DIRECTIVE='include_next' - gl_next_as_first_directive='<'stdio.h'>' - else - # INCLUDE_NEXT_AS_FIRST_DIRECTIVE='include' - gl_next_as_first_directive=$gl_cv_next_stdio_h - fi - NEXT_AS_FIRST_DIRECTIVE_STDIO_H=$gl_next_as_first_directive - - - - - - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking which flavor of printf attribute matches inttypes macros" >&5 -printf %s "checking which flavor of printf attribute matches inttypes macros... " >&6; } -if test ${gl_cv_func_printf_attribute_flavor+y} -then : - printf %s "(cached) " >&6 -else $as_nop - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ - - #define __STDC_FORMAT_MACROS 1 - #include - #include - /* For non-mingw systems, compilation will trivially succeed. - For mingw, compilation will succeed for older mingw (system - printf, "I64d") and fail for newer mingw (gnu printf, "lld"). */ - #if (defined _WIN32 && ! defined __CYGWIN__) && \ - (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 4)) - extern char PRIdMAX_probe[sizeof PRIdMAX == sizeof "I64d" ? 1 : -1]; - #endif - -int -main (void) -{ - - ; - return 0; -} -_ACEOF -if ac_fn_c_try_compile "$LINENO" -then : - gl_cv_func_printf_attribute_flavor=system -else $as_nop - gl_cv_func_printf_attribute_flavor=gnu -fi -rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext -fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_printf_attribute_flavor" >&5 -printf "%s\n" "$gl_cv_func_printf_attribute_flavor" >&6; } - if test "$gl_cv_func_printf_attribute_flavor" = gnu; then - -printf "%s\n" "#define GNULIB_PRINTF_ATTRIBUTE_FLAVOR_GNU 1" >>confdefs.h - - fi - - - - - - - - - - - - - - - - if test $ac_cv_have_decl_fcloseall = no; then - HAVE_DECL_FCLOSEALL=0 - fi - - - if test $ac_cv_have_decl_getw = no; then - HAVE_DECL_GETW=0 - fi - - - if test $ac_cv_have_decl_putw = no; then - HAVE_DECL_PUTW=0 - fi - - - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for nl_langinfo and CODESET" >&5 -printf %s "checking for nl_langinfo and CODESET... " >&6; } -if test ${am_cv_langinfo_codeset+y} -then : - printf %s "(cached) " >&6 -else $as_nop - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -#include -int -main (void) -{ -char* cs = nl_langinfo(CODESET); return !cs; - ; - return 0; -} -_ACEOF -if ac_fn_c_try_link "$LINENO" -then : - am_cv_langinfo_codeset=yes -else $as_nop - am_cv_langinfo_codeset=no -fi -rm -f core conftest.err conftest.$ac_objext conftest.beam \ - conftest$ac_exeext conftest.$ac_ext - -fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $am_cv_langinfo_codeset" >&5 -printf "%s\n" "$am_cv_langinfo_codeset" >&6; } - if test $am_cv_langinfo_codeset = yes; then - -printf "%s\n" "#define HAVE_LANGINFO_CODESET 1" >>confdefs.h - - fi - - - - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for a french Unicode locale" >&5 -printf %s "checking for a french Unicode locale... " >&6; } -if test ${gt_cv_locale_fr_utf8+y} -then : - printf %s "(cached) " >&6 -else $as_nop - - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ - -#include -#include -#if HAVE_LANGINFO_CODESET -# include -#endif -#include -#include -struct tm t; -char buf[16]; -int main () { - /* On BeOS and Haiku, locales are not implemented in libc. Rather, libintl - imitates locale dependent behaviour by looking at the environment - variables, and all locales use the UTF-8 encoding. */ -#if !(defined __BEOS__ || defined __HAIKU__) - /* Check whether the given locale name is recognized by the system. */ -# if defined _WIN32 && !defined __CYGWIN__ - /* On native Windows, setlocale(category, "") looks at the system settings, - not at the environment variables. Also, when an encoding suffix such - as ".65001" or ".54936" is specified, it succeeds but sets the LC_CTYPE - category of the locale to "C". */ - if (setlocale (LC_ALL, getenv ("LC_ALL")) == NULL - || strcmp (setlocale (LC_CTYPE, NULL), "C") == 0) - return 1; -# else - if (setlocale (LC_ALL, "") == NULL) return 1; -# endif - /* Check whether nl_langinfo(CODESET) is nonempty and not "ASCII" or "646". - On Mac OS X 10.3.5 (Darwin 7.5) in the fr_FR locale, nl_langinfo(CODESET) - is empty, and the behaviour of Tcl 8.4 in this locale is not useful. - On OpenBSD 4.0, when an unsupported locale is specified, setlocale() - succeeds but then nl_langinfo(CODESET) is "646". In this situation, - some unit tests fail. */ -# if HAVE_LANGINFO_CODESET - { - const char *cs = nl_langinfo (CODESET); - if (cs[0] == '\0' || strcmp (cs, "ASCII") == 0 || strcmp (cs, "646") == 0) - return 1; - } -# endif -# ifdef __CYGWIN__ - /* On Cygwin, avoid locale names without encoding suffix, because the - locale_charset() function relies on the encoding suffix. Note that - LC_ALL is set on the command line. */ - if (strchr (getenv ("LC_ALL"), '.') == NULL) return 1; -# endif - /* Check whether in the abbreviation of the second month, the second - character (should be U+00E9: LATIN SMALL LETTER E WITH ACUTE) is - two bytes long, with UTF-8 encoding. */ - t.tm_year = 1975 - 1900; t.tm_mon = 2 - 1; t.tm_mday = 4; - if (strftime (buf, sizeof (buf), "%b", &t) < 4 - || buf[1] != (char) 0xc3 || buf[2] != (char) 0xa9 || buf[3] != 'v') - return 1; -#endif -#if !defined __BIONIC__ /* Bionic libc's 'struct lconv' is just a dummy. */ - /* Check whether the decimal separator is a comma. - On NetBSD 3.0 in the fr_FR.ISO8859-1 locale, localeconv()->decimal_point - are nl_langinfo(RADIXCHAR) are both ".". */ - if (localeconv () ->decimal_point[0] != ',') return 1; -#endif - return 0; -} - -_ACEOF - if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5 - (eval $ac_link) 2>&5 - ac_status=$? - printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; } && test -s conftest$ac_exeext; then - case "$host_os" in - # Handle native Windows specially, because there setlocale() interprets - # "ar" as "Arabic" or "Arabic_Saudi Arabia.1256", - # "fr" or "fra" as "French" or "French_France.1252", - # "ge"(!) or "deu"(!) as "German" or "German_Germany.1252", - # "ja" as "Japanese" or "Japanese_Japan.932", - # and similar. - mingw*) - # Test for the hypothetical native Windows locale name. - if (LC_ALL=French_France.65001 LC_TIME= LC_CTYPE= ./conftest; exit) 2>/dev/null; then - gt_cv_locale_fr_utf8=French_France.65001 - else - # None found. - gt_cv_locale_fr_utf8=none - fi - ;; - *) - # Setting LC_ALL is not enough. Need to set LC_TIME to empty, because - # otherwise on Mac OS X 10.3.5 the LC_TIME=C from the beginning of the - # configure script would override the LC_ALL setting. Likewise for - # LC_CTYPE, which is also set at the beginning of the configure script. - # Test for the usual locale name. - if (LC_ALL=fr_FR LC_TIME= LC_CTYPE= ./conftest; exit) 2>/dev/null; then - gt_cv_locale_fr_utf8=fr_FR - else - # Test for the locale name with explicit encoding suffix. - if (LC_ALL=fr_FR.UTF-8 LC_TIME= LC_CTYPE= ./conftest; exit) 2>/dev/null; then - gt_cv_locale_fr_utf8=fr_FR.UTF-8 - else - # Test for the Solaris 7 locale name. - if (LC_ALL=fr.UTF-8 LC_TIME= LC_CTYPE= ./conftest; exit) 2>/dev/null; then - gt_cv_locale_fr_utf8=fr.UTF-8 - else - # None found. - gt_cv_locale_fr_utf8=none - fi - fi - fi - ;; - esac - fi - rm -fr conftest* - -fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gt_cv_locale_fr_utf8" >&5 -printf "%s\n" "$gt_cv_locale_fr_utf8" >&6; } - LOCALE_FR_UTF8=$gt_cv_locale_fr_utf8 - - ac_fn_check_decl "$LINENO" "ecvt" "ac_cv_have_decl_ecvt" "$ac_includes_default" "$ac_c_undeclared_builtin_options" "CFLAGS" if test "x$ac_cv_have_decl_ecvt" = xyes then : @@ -18878,156 +15661,6 @@ fi printf "%s\n" "#define HAVE_DECL_GCVT $ac_have_decl" >>confdefs.h - - - - - - - - - - - if test $gl_cv_have_include_next = yes; then - gl_cv_next_stdlib_h='<'stdlib.h'>' - else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking absolute name of " >&5 -printf %s "checking absolute name of ... " >&6; } -if test ${gl_cv_next_stdlib_h+y} -then : - printf %s "(cached) " >&6 -else $as_nop - - - - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -#include -_ACEOF - case "$host_os" in - aix*) gl_absname_cpp="$ac_cpp -C" ;; - *) gl_absname_cpp="$ac_cpp" ;; - esac - - case "$host_os" in - mingw*) - gl_dirsep_regex='[/\\]' - ;; - *) - gl_dirsep_regex='\/' - ;; - esac - gl_make_literal_regex_sed='s,[]$^\\.*/[],\\&,g' - gl_header_literal_regex=`echo 'stdlib.h' \ - | 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 - }' - - gl_cv_absolute_stdlib_h=`(eval "$gl_absname_cpp conftest.$ac_ext") 2>&5 | - sed -n "$gl_absolute_header_sed"` - - gl_header=$gl_cv_absolute_stdlib_h - gl_cv_next_stdlib_h='"'$gl_header'"' - - -fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_next_stdlib_h" >&5 -printf "%s\n" "$gl_cv_next_stdlib_h" >&6; } - fi - NEXT_STDLIB_H=$gl_cv_next_stdlib_h - - if test $gl_cv_have_include_next = yes || test $gl_cv_have_include_next = buggy; then - # INCLUDE_NEXT_AS_FIRST_DIRECTIVE='include_next' - gl_next_as_first_directive='<'stdlib.h'>' - else - # INCLUDE_NEXT_AS_FIRST_DIRECTIVE='include' - gl_next_as_first_directive=$gl_cv_next_stdlib_h - fi - NEXT_AS_FIRST_DIRECTIVE_STDLIB_H=$gl_next_as_first_directive - - - - - - - - - - - - - - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether MB_CUR_MAX is correct" >&5 -printf %s "checking whether MB_CUR_MAX is correct... " >&6; } -if test ${gl_cv_macro_MB_CUR_MAX_good+y} -then : - printf %s "(cached) " >&6 -else $as_nop - - case "$host_os" in - # Guess no on Solaris. - solaris*) gl_cv_macro_MB_CUR_MAX_good="guessing no" ;; - # Guess yes otherwise. - *) gl_cv_macro_MB_CUR_MAX_good="guessing yes" ;; - esac - if test $LOCALE_FR_UTF8 != none; then - if test "$cross_compiling" = yes -then : - : -else $as_nop - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ - -#include -#include -int main () -{ - int result = 0; - if (setlocale (LC_ALL, "$LOCALE_FR_UTF8") != NULL) - { - if (MB_CUR_MAX < 4) - result |= 1; - } - return result; -} -_ACEOF -if ac_fn_c_try_run "$LINENO" -then : - gl_cv_macro_MB_CUR_MAX_good=yes -else $as_nop - gl_cv_macro_MB_CUR_MAX_good=no -fi -rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ - conftest.$ac_objext conftest.beam conftest.$ac_ext -fi - - fi - -fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_macro_MB_CUR_MAX_good" >&5 -printf "%s\n" "$gl_cv_macro_MB_CUR_MAX_good" >&6; } - case "$gl_cv_macro_MB_CUR_MAX_good" in - *yes) ;; - *) REPLACE_MB_CUR_MAX=1 ;; - esac - - - if test $ac_cv_have_decl_ecvt = no; then - HAVE_DECL_ECVT=0 - fi - - if test $ac_cv_have_decl_fcvt = no; then - HAVE_DECL_FCVT=0 - fi - - if test $ac_cv_have_decl_gcvt = no; then - HAVE_DECL_GCVT=0 - fi - ac_fn_check_decl "$LINENO" "strdup" "ac_cv_have_decl_strdup" "$ac_includes_default" "$ac_c_undeclared_builtin_options" "CFLAGS" if test "x$ac_cv_have_decl_strdup" = xyes then : @@ -19048,14 +15681,14 @@ if test "$cross_compiling" = yes then : case "$host_os" in - # Guess yes on glibc systems. - *-gnu* | gnu*) gl_cv_func_strerror_0_works="guessing yes" ;; - # Guess yes on musl systems. - *-musl* | midipix*) gl_cv_func_strerror_0_works="guessing yes" ;; - # Guess yes on native Windows. - mingw*) gl_cv_func_strerror_0_works="guessing yes" ;; - # If we don't know, obey --enable-cross-guesses. - *) gl_cv_func_strerror_0_works="$gl_cross_guess_normal" ;; + # Guess yes on glibc systems. + *-gnu* | gnu*) gl_cv_func_strerror_0_works="guessing yes" ;; + # Guess yes on musl systems. + *-musl*) gl_cv_func_strerror_0_works="guessing yes" ;; + # Guess yes on native Windows. + mingw*) gl_cv_func_strerror_0_works="guessing yes" ;; + # If we don't know, obey --enable-cross-guesses. + *) gl_cv_func_strerror_0_works="$gl_cross_guess_normal" ;; esac else $as_nop @@ -19156,8 +15789,8 @@ gl_cv_absolute_string_h=`(eval "$gl_absname_cpp conftest.$ac_ext") 2>&5 | sed -n "$gl_absolute_header_sed"` - gl_header=$gl_cv_absolute_string_h - gl_cv_next_string_h='"'$gl_header'"' + gl_header=$gl_cv_absolute_string_h + gl_cv_next_string_h='"'$gl_header'"' fi @@ -19186,23 +15819,30 @@ - - + GNULIB_CTIME=0; + GNULIB_MKTIME=0; + GNULIB_LOCALTIME=0; + GNULIB_NANOSLEEP=0; + GNULIB_STRFTIME=0; + GNULIB_STRPTIME=0; + GNULIB_TIMEGM=0; + GNULIB_TIMESPEC_GET=0; + GNULIB_TIME_R=0; + GNULIB_TIME_RZ=0; + GNULIB_TZSET=0; + GNULIB_MDA_TZSET=1; HAVE_DECL_LOCALTIME_R=1; HAVE_NANOSLEEP=1; HAVE_STRPTIME=1; HAVE_TIMEGM=1; HAVE_TIMESPEC_GET=1; - HAVE_TIMESPEC_GETRES=1; HAVE_TIMEZONE_T=0; REPLACE_CTIME=GNULIB_PORTCHECK; REPLACE_LOCALTIME_R=GNULIB_PORTCHECK; REPLACE_MKTIME=GNULIB_PORTCHECK; REPLACE_NANOSLEEP=GNULIB_PORTCHECK; REPLACE_STRFTIME=GNULIB_PORTCHECK; - REPLACE_TIME=0; REPLACE_TIMEGM=GNULIB_PORTCHECK; - REPLACE_TIMESPEC_GET=GNULIB_PORTCHECK; REPLACE_TZSET=GNULIB_PORTCHECK; : ${GNULIB_GETTIMEOFDAY=0}; @@ -19401,8 +16041,8 @@ gl_cv_absolute_time_h=`(eval "$gl_absname_cpp conftest.$ac_ext") 2>&5 | sed -n "$gl_absolute_header_sed"` - gl_header=$gl_cv_absolute_time_h - gl_cv_next_time_h='"'$gl_header'"' + gl_header=$gl_cv_absolute_time_h + gl_cv_next_time_h='"'$gl_header'"' fi @@ -19427,10 +16067,6 @@ - - - - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for TIME_UTC in " >&5 printf %s "checking for TIME_UTC in ... " >&6; } if test ${gl_cv_time_h_has_TIME_UTC+y} @@ -19466,64 +16102,6 @@ fi - - - GL_GNULIB_CTIME=0 - - - - GL_GNULIB_MKTIME=0 - - - - GL_GNULIB_LOCALTIME=0 - - - - GL_GNULIB_NANOSLEEP=0 - - - - GL_GNULIB_STRFTIME=0 - - - - GL_GNULIB_STRPTIME=0 - - - - GL_GNULIB_TIME=0 - - - - GL_GNULIB_TIMEGM=0 - - - - GL_GNULIB_TIMESPEC_GET=0 - - - - GL_GNULIB_TIMESPEC_GETRES=0 - - - - GL_GNULIB_TIME_R=0 - - - - GL_GNULIB_TIME_RZ=0 - - - - GL_GNULIB_TZSET=0 - - - - GL_GNULIB_MDA_TZSET=1 - - - ac_fn_check_decl "$LINENO" "execvpe" "ac_cv_have_decl_execvpe" "$ac_includes_default" "$ac_c_undeclared_builtin_options" "CFLAGS" if test "x$ac_cv_have_decl_execvpe" = xyes then : @@ -19534,110 +16112,48 @@ printf "%s\n" "#define HAVE_DECL_EXECVPE $ac_have_decl" >>confdefs.h - - - - - - - - - - - - if test $gl_cv_have_include_next = yes; then - gl_cv_next_unistd_h='<'unistd.h'>' - else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking absolute name of " >&5 -printf %s "checking absolute name of ... " >&6; } -if test ${gl_cv_next_unistd_h+y} -then : - printf %s "(cached) " >&6 -else $as_nop - - if test $ac_cv_header_unistd_h = yes; then - - - - - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -#include -_ACEOF - case "$host_os" in - aix*) gl_absname_cpp="$ac_cpp -C" ;; - *) gl_absname_cpp="$ac_cpp" ;; - esac - - case "$host_os" in - mingw*) - gl_dirsep_regex='[/\\]' - ;; - *) - gl_dirsep_regex='\/' - ;; - esac - gl_make_literal_regex_sed='s,[]$^\\.*/[],\\&,g' - gl_header_literal_regex=`echo 'unistd.h' \ - | 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 - }' - - gl_cv_absolute_unistd_h=`(eval "$gl_absname_cpp conftest.$ac_ext") 2>&5 | - sed -n "$gl_absolute_header_sed"` - - gl_header=$gl_cv_absolute_unistd_h - gl_cv_next_unistd_h='"'$gl_header'"' - else - gl_cv_next_unistd_h='<'unistd.h'>' - fi - - -fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_next_unistd_h" >&5 -printf "%s\n" "$gl_cv_next_unistd_h" >&6; } - fi - NEXT_UNISTD_H=$gl_cv_next_unistd_h - - if test $gl_cv_have_include_next = yes || test $gl_cv_have_include_next = buggy; then - # INCLUDE_NEXT_AS_FIRST_DIRECTIVE='include_next' - gl_next_as_first_directive='<'unistd.h'>' - else - # INCLUDE_NEXT_AS_FIRST_DIRECTIVE='include' - gl_next_as_first_directive=$gl_cv_next_unistd_h - fi - NEXT_AS_FIRST_DIRECTIVE_UNISTD_H=$gl_next_as_first_directive - - - - - if test $ac_cv_header_unistd_h = yes; then - HAVE_UNISTD_H=1 - else - HAVE_UNISTD_H=0 - fi - - - - - - - - - - - - - - if test $ac_cv_have_decl_execvpe = no; then - HAVE_DECL_EXECVPE=0 - fi - - + GNULIB_BTOWC=0; + GNULIB_WCTOB=0; + GNULIB_MBSINIT=0; + GNULIB_MBRTOWC=0; + GNULIB_MBRLEN=0; + GNULIB_MBSRTOWCS=0; + GNULIB_MBSNRTOWCS=0; + GNULIB_WCRTOMB=0; + GNULIB_WCSRTOMBS=0; + GNULIB_WCSNRTOMBS=0; + GNULIB_WCWIDTH=0; + GNULIB_WMEMCHR=0; + GNULIB_WMEMCMP=0; + GNULIB_WMEMCPY=0; + GNULIB_WMEMMOVE=0; + GNULIB_WMEMPCPY=0; + GNULIB_WMEMSET=0; + GNULIB_WCSLEN=0; + GNULIB_WCSNLEN=0; + GNULIB_WCSCPY=0; + GNULIB_WCPCPY=0; + GNULIB_WCSNCPY=0; + GNULIB_WCPNCPY=0; + GNULIB_WCSCAT=0; + GNULIB_WCSNCAT=0; + GNULIB_WCSCMP=0; + GNULIB_WCSNCMP=0; + GNULIB_WCSCASECMP=0; + GNULIB_WCSNCASECMP=0; + GNULIB_WCSCOLL=0; + GNULIB_WCSXFRM=0; + GNULIB_WCSDUP=0; + GNULIB_WCSCHR=0; + GNULIB_WCSRCHR=0; + GNULIB_WCSCSPN=0; + GNULIB_WCSSPN=0; + GNULIB_WCSPBRK=0; + GNULIB_WCSSTR=0; + GNULIB_WCSTOK=0; + GNULIB_WCSWIDTH=0; + GNULIB_WCSFTIME=0; + GNULIB_MDA_WCSDUP=1; HAVE_BTOWC=1; HAVE_MBSINIT=1; HAVE_MBRTOWC=1; @@ -19694,12 +16210,7 @@ REPLACE_WCWIDTH=0; REPLACE_WCSWIDTH=0; REPLACE_WCSFTIME=0; - REPLACE_WCSCMP=0; - REPLACE_WCSNCMP=0; - REPLACE_WCSSTR=0; REPLACE_WCSTOK=0; - REPLACE_WMEMCMP=0; - REPLACE_WMEMPCPY=0; @@ -19784,386 +16295,6 @@ - - - - - - - - - - - - if test $gl_cv_have_include_next = yes; then - gl_cv_next_wchar_h='<'wchar.h'>' - else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking absolute name of " >&5 -printf %s "checking absolute name of ... " >&6; } -if test ${gl_cv_next_wchar_h+y} -then : - printf %s "(cached) " >&6 -else $as_nop - - if test $ac_cv_header_wchar_h = yes; then - - - - - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -#include -_ACEOF - case "$host_os" in - aix*) gl_absname_cpp="$ac_cpp -C" ;; - *) gl_absname_cpp="$ac_cpp" ;; - esac - - case "$host_os" in - mingw*) - gl_dirsep_regex='[/\\]' - ;; - *) - gl_dirsep_regex='\/' - ;; - esac - gl_make_literal_regex_sed='s,[]$^\\.*/[],\\&,g' - gl_header_literal_regex=`echo 'wchar.h' \ - | 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 - }' - - gl_cv_absolute_wchar_h=`(eval "$gl_absname_cpp conftest.$ac_ext") 2>&5 | - sed -n "$gl_absolute_header_sed"` - - gl_header=$gl_cv_absolute_wchar_h - gl_cv_next_wchar_h='"'$gl_header'"' - else - gl_cv_next_wchar_h='<'wchar.h'>' - fi - - -fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_next_wchar_h" >&5 -printf "%s\n" "$gl_cv_next_wchar_h" >&6; } - fi - NEXT_WCHAR_H=$gl_cv_next_wchar_h - - if test $gl_cv_have_include_next = yes || test $gl_cv_have_include_next = buggy; then - # INCLUDE_NEXT_AS_FIRST_DIRECTIVE='include_next' - gl_next_as_first_directive='<'wchar.h'>' - else - # INCLUDE_NEXT_AS_FIRST_DIRECTIVE='include' - gl_next_as_first_directive=$gl_cv_next_wchar_h - fi - NEXT_AS_FIRST_DIRECTIVE_WCHAR_H=$gl_next_as_first_directive - - - - - if test $ac_cv_header_wchar_h = yes; then - HAVE_WCHAR_H=1 - else - HAVE_WCHAR_H=0 - fi - - - - - - if test $gt_cv_c_wint_t = yes; then - HAVE_WINT_T=1 - else - HAVE_WINT_T=0 - fi - - - - - - - - - - - ac_fn_check_decl "$LINENO" "wcsdup" "ac_cv_have_decl_wcsdup" " - #include - -" "$ac_c_undeclared_builtin_options" "CFLAGS" -if test "x$ac_cv_have_decl_wcsdup" = xyes -then : - ac_have_decl=1 -else $as_nop - ac_have_decl=0 -fi -printf "%s\n" "#define HAVE_DECL_WCSDUP $ac_have_decl" >>confdefs.h - - if test $ac_cv_have_decl_wcsdup = no; then - HAVE_DECL_WCSDUP=0 - fi - - - - GL_GNULIB_BTOWC=0 - - - - GL_GNULIB_WCTOB=0 - - - - GL_GNULIB_MBSINIT=0 - - - - GL_GNULIB_MBRTOWC=0 - - - - GL_GNULIB_MBRLEN=0 - - - - GL_GNULIB_MBSRTOWCS=0 - - - - GL_GNULIB_MBSNRTOWCS=0 - - - - GL_GNULIB_WCRTOMB=0 - - - - GL_GNULIB_WCSRTOMBS=0 - - - - GL_GNULIB_WCSNRTOMBS=0 - - - - GL_GNULIB_WCWIDTH=0 - - - - GL_GNULIB_WMEMCHR=0 - - - - GL_GNULIB_WMEMCMP=0 - - - - GL_GNULIB_WMEMCPY=0 - - - - GL_GNULIB_WMEMMOVE=0 - - - - GL_GNULIB_WMEMPCPY=0 - - - - GL_GNULIB_WMEMSET=0 - - - - GL_GNULIB_WCSLEN=0 - - - - GL_GNULIB_WCSNLEN=0 - - - - GL_GNULIB_WCSCPY=0 - - - - GL_GNULIB_WCPCPY=0 - - - - GL_GNULIB_WCSNCPY=0 - - - - GL_GNULIB_WCPNCPY=0 - - - - GL_GNULIB_WCSCAT=0 - - - - GL_GNULIB_WCSNCAT=0 - - - - GL_GNULIB_WCSCMP=0 - - - - GL_GNULIB_WCSNCMP=0 - - - - GL_GNULIB_WCSCASECMP=0 - - - - GL_GNULIB_WCSNCASECMP=0 - - - - GL_GNULIB_WCSCOLL=0 - - - - GL_GNULIB_WCSXFRM=0 - - - - GL_GNULIB_WCSDUP=0 - - - - GL_GNULIB_WCSCHR=0 - - - - GL_GNULIB_WCSRCHR=0 - - - - GL_GNULIB_WCSCSPN=0 - - - - GL_GNULIB_WCSSPN=0 - - - - GL_GNULIB_WCSPBRK=0 - - - - GL_GNULIB_WCSSTR=0 - - - - GL_GNULIB_WCSTOK=0 - - - - GL_GNULIB_WCSWIDTH=0 - - - - GL_GNULIB_WCSFTIME=0 - - - - GL_GNULIB_MDA_WCSDUP=1 - - - - - - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for C compiler option to allow warnings" >&5 -printf %s "checking for C compiler option to allow warnings... " >&6; } -if test ${gl_cv_cc_wallow+y} -then : - printf %s "(cached) " >&6 -else $as_nop - rm -f conftest* - echo 'int dummy;' > conftest.c - { ac_try='${CC-cc} $CFLAGS $CPPFLAGS -c conftest.c 2>conftest1.err' - { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_try\""; } >&5 - (eval $ac_try) 2>&5 - ac_status=$? - printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; }; } >/dev/null - { ac_try='${CC-cc} $CFLAGS $CPPFLAGS -Wno-error -c conftest.c 2>conftest2.err' - { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_try\""; } >&5 - (eval $ac_try) 2>&5 - ac_status=$? - printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; }; } >/dev/null - if test $? = 0 && test `wc -l < conftest1.err` = `wc -l < conftest2.err`; then - gl_cv_cc_wallow='-Wno-error' - else - gl_cv_cc_wallow=none - fi - rm -f conftest* - -fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_cc_wallow" >&5 -printf "%s\n" "$gl_cv_cc_wallow" >&6; } - case "$gl_cv_cc_wallow" in - none) GL_CFLAG_ALLOW_WARNINGS='' ;; - *) GL_CFLAG_ALLOW_WARNINGS="$gl_cv_cc_wallow" ;; - esac - - - - - GL_CFLAG_GNULIB_WARNINGS='' - if test -n "$GL_CFLAG_ALLOW_WARNINGS"; then - cat > conftest.c <<\EOF - #if __GNUC__ >= 3 || (__clang_major__ + (__clang_minor__ >= 9) > 3) - -Wno-cast-qual - -Wno-conversion - -Wno-float-equal - -Wno-sign-compare - -Wno-undef - -Wno-unused-function - -Wno-unused-parameter - #endif - #if __GNUC__ + (__GNUC_MINOR__ >= 9) > 4 || (__clang_major__ + (__clang_minor__ >= 9) > 3) - -Wno-float-conversion - #endif - #if __GNUC__ >= 7 || (__clang_major__ + (__clang_minor__ >= 9) > 3) - -Wimplicit-fallthrough - #endif - #if __GNUC__ >= 4 && __GNUC__ < 11 && !defined __clang__ - -Wno-missing-field-initializers - #endif - #if __GNUC__ + (__GNUC_MINOR__ >= 8) > 4 || (__clang_major__ + (__clang_minor__ >= 9) > 3) - -Wno-pedantic - #endif - #if __GNUC__ + (__GNUC_MINOR__ >= 3) > 4 || (__clang_major__ + (__clang_minor__ >= 9) > 3) - -Wno-sign-conversion - -Wno-type-limits - #endif - #if __GNUC__ + (__GNUC_MINOR__ >= 5) > 4 - -Wno-unsuffixed-float-constants - #endif -EOF - gl_command="$CC $CFLAGS $CPPFLAGS -E conftest.c > conftest.out" - if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$gl_command\""; } >&5 - (eval $gl_command) 2>&5 - ac_status=$? - printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; }; then - gl_options=`grep -v '#' conftest.out` - for word in $gl_options; do - GL_CFLAG_GNULIB_WARNINGS="$GL_CFLAG_GNULIB_WARNINGS $word" - done - fi - rm -f conftest.c conftest.out - fi - - - if false; then GL_COND_LIBTOOL_TRUE= GL_COND_LIBTOOL_FALSE='#' @@ -20186,95 +16317,7 @@ - - gl_source_base='lib' - gl_source_base_prefix= - - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for alignas and alignof" >&5 -printf %s "checking for alignas and alignof... " >&6; } -if test ${gl_cv_header_working_stdalign_h+y} -then : - printf %s "(cached) " >&6 -else $as_nop - gl_save_CFLAGS=$CFLAGS - for gl_working in "yes, keywords" "yes, macros"; do - case $gl_working in #( - *stdalign.h*) : - CFLAGS="$gl_save_CFLAGS -DINCLUDE_STDALIGN_H" ;; #( - *) : - ;; -esac - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -#include - #ifdef INCLUDE_STDALIGN_H - #include - #endif - #include - - /* Test that alignof yields a result consistent with offsetof. - This catches GCC bug 52023 - . */ - #ifdef __cplusplus - template struct alignof_helper { char a; t b; }; - # define ao(type) offsetof (alignof_helper, b) - #else - # define ao(type) offsetof (struct { char a; type b; }, b) - #endif - char test_double[ao (double) % _Alignof (double) == 0 ? 1 : -1]; - char test_long[ao (long int) % _Alignof (long int) == 0 ? 1 : -1]; - char test_alignof[alignof (double) == _Alignof (double) ? 1 : -1]; - - /* Test alignas only on platforms where gnulib can help. */ - #if \ - ((defined __cplusplus && 201103 <= __cplusplus) \ - || (__TINYC__ && defined __attribute__) \ - || (defined __APPLE__ && defined __MACH__ \ - ? 4 < __GNUC__ + (1 <= __GNUC_MINOR__) \ - : __GNUC__) \ - || (__ia64 && (61200 <= __HP_cc || 61200 <= __HP_aCC)) \ - || __ICC || 0x590 <= __SUNPRO_C || 0x0600 <= __xlC__ \ - || 1300 <= _MSC_VER) - struct alignas_test { char c; char alignas (8) alignas_8; }; - char test_alignas[offsetof (struct alignas_test, alignas_8) == 8 - ? 1 : -1]; - #endif - -int -main (void) -{ - - ; - return 0; -} -_ACEOF -if ac_fn_c_try_compile "$LINENO" -then : - gl_cv_header_working_stdalign_h=$gl_working -else $as_nop - gl_cv_header_working_stdalign_h=no -fi -rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext - - CFLAGS=$gl_save_CFLAGS - test "$gl_cv_header_working_stdalign_h" != no && break - done -fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_header_working_stdalign_h" >&5 -printf "%s\n" "$gl_cv_header_working_stdalign_h" >&6; } - - case $gl_cv_header_working_stdalign_h in #( - yes*keyword*) : - -printf "%s\n" "#define HAVE_C_ALIGNASOF 1" >>confdefs.h - ;; #( - *) : - ;; -esac - - - if test $ac_cv_func_alloca_works = no; then @@ -20315,426 +16358,33 @@ printf "%s\n" "#define HAVE_ALLOCA 1" >>confdefs.h - GL_GENERATE_ALLOCA_H=true + ALLOCA_H=alloca.h else - GL_GENERATE_ALLOCA_H=false + ALLOCA_H= fi else - GL_GENERATE_ALLOCA_H=true + ALLOCA_H=alloca.h fi - if test $ac_cv_working_alloca_h = yes; then - HAVE_ALLOCA_H=1 - else - HAVE_ALLOCA_H=0 - fi - - - - - - - case "$GL_GENERATE_ALLOCA_H" in - false) ALLOCA_H='' ;; - true) - if test -z "$ALLOCA_H"; then - ALLOCA_H="${gl_source_base_prefix}alloca.h" - fi - ;; - *) echo "*** GL_GENERATE_ALLOCA_H is not set correctly" 1>&2; exit 1 ;; - esac - - - if $GL_GENERATE_ALLOCA_H; then + if test -n "$ALLOCA_H"; then GL_GENERATE_ALLOCA_H_TRUE= GL_GENERATE_ALLOCA_H_FALSE='#' else GL_GENERATE_ALLOCA_H_TRUE='#' GL_GENERATE_ALLOCA_H_FALSE= fi -: - if test -z "${GL_GENERATE_ALLOCA_H_TRUE}" && test -z "${GL_GENERATE_ALLOCA_H_FALSE}"; then - GL_GENERATE_ALLOCA_H_TRUE='#' - GL_GENERATE_ALLOCA_H_FALSE='#' - fi - - - - - - - - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for static_assert" >&5 -printf %s "checking for static_assert... " >&6; } -if test ${gl_cv_static_assert+y} -then : - printf %s "(cached) " >&6 -else $as_nop - gl_save_CFLAGS=$CFLAGS - for gl_working in "yes, a keyword" "yes, an macro"; do - case $gl_working in #( - *assert.h*) : - CFLAGS="$gl_save_CFLAGS -DINCLUDE_ASSERT_H" ;; #( - *) : - ;; -esac - - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -#if defined __clang__ && __STDC_VERSION__ < 202311 - #pragma clang diagnostic error "-Wc2x-extensions" - #pragma clang diagnostic error "-Wc++1z-extensions" - #endif - #ifdef INCLUDE_ASSERT_H - #include - #endif - static_assert (2 + 2 == 4, "arithmetic does not work"); - static_assert (2 + 2 == 4); - -int -main (void) -{ - - static_assert (sizeof (char) == 1, "sizeof does not work"); - static_assert (sizeof (char) == 1); - - ; - return 0; -} -_ACEOF -if ac_fn_c_try_compile "$LINENO" -then : - gl_cv_static_assert=$gl_working -else $as_nop - gl_cv_static_assert=no -fi -rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext - CFLAGS=$gl_save_CFLAGS - test "$gl_cv_static_assert" != no && break - done -fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_static_assert" >&5 -printf "%s\n" "$gl_cv_static_assert" >&6; } - - GL_GENERATE_ASSERT_H=false - case $gl_cv_static_assert in #( - yes*keyword*) : - -printf "%s\n" "#define HAVE_C_STATIC_ASSERT 1" >>confdefs.h - ;; #( - no) : - GL_GENERATE_ASSERT_H=true - - - - - - - - - if test $gl_cv_have_include_next = yes; then - gl_cv_next_assert_h='<'assert.h'>' - else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking absolute name of " >&5 -printf %s "checking absolute name of ... " >&6; } -if test ${gl_cv_next_assert_h+y} -then : - printf %s "(cached) " >&6 -else $as_nop - - - - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -#include -_ACEOF - case "$host_os" in - aix*) gl_absname_cpp="$ac_cpp -C" ;; - *) gl_absname_cpp="$ac_cpp" ;; - esac - - case "$host_os" in - mingw*) - gl_dirsep_regex='[/\\]' - ;; - *) - gl_dirsep_regex='\/' - ;; - esac - gl_make_literal_regex_sed='s,[]$^\\.*/[],\\&,g' - gl_header_literal_regex=`echo 'assert.h' \ - | 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 - }' - - gl_cv_absolute_assert_h=`(eval "$gl_absname_cpp conftest.$ac_ext") 2>&5 | - sed -n "$gl_absolute_header_sed"` - - gl_header=$gl_cv_absolute_assert_h - gl_cv_next_assert_h='"'$gl_header'"' - - -fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_next_assert_h" >&5 -printf "%s\n" "$gl_cv_next_assert_h" >&6; } - fi - NEXT_ASSERT_H=$gl_cv_next_assert_h - - if test $gl_cv_have_include_next = yes || test $gl_cv_have_include_next = buggy; then - # INCLUDE_NEXT_AS_FIRST_DIRECTIVE='include_next' - gl_next_as_first_directive='<'assert.h'>' - else - # INCLUDE_NEXT_AS_FIRST_DIRECTIVE='include' - gl_next_as_first_directive=$gl_cv_next_assert_h - fi - NEXT_AS_FIRST_DIRECTIVE_ASSERT_H=$gl_next_as_first_directive - - - - ;; #( - *) : - ;; -esac - - - - - - case "$GL_GENERATE_ASSERT_H" in - false) ASSERT_H='' ;; - true) - if test -z "$ASSERT_H"; then - ASSERT_H="${gl_source_base_prefix}assert.h" - fi - ;; - *) echo "*** GL_GENERATE_ASSERT_H is not set correctly" 1>&2; exit 1 ;; - esac - - - if $GL_GENERATE_ASSERT_H; then - GL_GENERATE_ASSERT_H_TRUE= - GL_GENERATE_ASSERT_H_FALSE='#' -else - GL_GENERATE_ASSERT_H_TRUE='#' - GL_GENERATE_ASSERT_H_FALSE= -fi -: - if test -z "${GL_GENERATE_ASSERT_H_TRUE}" && test -z "${GL_GENERATE_ASSERT_H_FALSE}"; then - GL_GENERATE_ASSERT_H_TRUE='#' - GL_GENERATE_ASSERT_H_FALSE='#' - fi - - - - - - - - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for __builtin_expect" >&5 -printf %s "checking for __builtin_expect... " >&6; } -if test ${gl_cv___builtin_expect+y} -then : - printf %s "(cached) " >&6 -else $as_nop - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ - - int - main (int argc, char **argv) - { - argc = __builtin_expect (argc, 100); - return argv[argc != 100][0]; - } -_ACEOF -if ac_fn_c_try_link "$LINENO" -then : - gl_cv___builtin_expect=yes -else $as_nop - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ - - #include - int - main (int argc, char **argv) - { - argc = __builtin_expect (argc, 100); - return argv[argc != 100][0]; - } -_ACEOF -if ac_fn_c_try_link "$LINENO" -then : - gl_cv___builtin_expect="in " -else $as_nop - gl_cv___builtin_expect=no -fi -rm -f core conftest.err conftest.$ac_objext conftest.beam \ - conftest$ac_exeext conftest.$ac_ext -fi -rm -f core conftest.err conftest.$ac_objext conftest.beam \ - conftest$ac_exeext conftest.$ac_ext -fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv___builtin_expect" >&5 -printf "%s\n" "$gl_cv___builtin_expect" >&6; } - if test "$gl_cv___builtin_expect" = yes; then - printf "%s\n" "#define HAVE___BUILTIN_EXPECT 1" >>confdefs.h - - elif test "$gl_cv___builtin_expect" = "in "; then - printf "%s\n" "#define HAVE___BUILTIN_EXPECT 2" >>confdefs.h - - fi - - - - - - REPLACE_CALLOC_FOR_CALLOC_GNU="$REPLACE_CALLOC_FOR_CALLOC_POSIX" - if test $REPLACE_CALLOC_FOR_CALLOC_GNU = 0; then - - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether calloc (0, n) and calloc (n, 0) return nonnull" >&5 -printf %s "checking whether calloc (0, n) and calloc (n, 0) return nonnull... " >&6; } -if test ${ac_cv_func_calloc_0_nonnull+y} -then : - printf %s "(cached) " >&6 -else $as_nop - if test $cross_compiling != yes; then - ac_cv_func_calloc_0_nonnull=yes - if test "$cross_compiling" = yes -then : - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 -printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;} -as_fn_error $? "cannot run test program while cross compiling -See \`config.log' for more details" "$LINENO" 5; } -else $as_nop - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -$ac_includes_default -int -main (void) -{ -int result = 0; - char * volatile p = calloc (0, 0); - if (!p) - result |= 1; - free (p); - return result; - - ; - return 0; -} -_ACEOF -if ac_fn_c_try_run "$LINENO" -then : - -else $as_nop - ac_cv_func_calloc_0_nonnull=no -fi -rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ - conftest.$ac_objext conftest.beam conftest.$ac_ext -fi - - else - case "$host_os" in - # Guess yes on glibc systems. - *-gnu* | gnu*) ac_cv_func_calloc_0_nonnull="guessing yes" ;; - # Guess yes on musl systems. - *-musl* | midipix*) ac_cv_func_calloc_0_nonnull="guessing yes" ;; - # Guess yes on native Windows. - mingw*) ac_cv_func_calloc_0_nonnull="guessing yes" ;; - # If we don't know, obey --enable-cross-guesses. - *) ac_cv_func_calloc_0_nonnull="$gl_cross_guess_normal" ;; - esac - fi - -fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_func_calloc_0_nonnull" >&5 -printf "%s\n" "$ac_cv_func_calloc_0_nonnull" >&6; } - case $ac_cv_func_calloc_0_nonnull in #( - *yes) : - ;; #( - *) : - REPLACE_CALLOC_FOR_CALLOC_GNU=1 ;; -esac - - fi - - if test $REPLACE_CALLOC_FOR_CALLOC_GNU = 1; then - - - - - - - - - gl_LIBOBJS="$gl_LIBOBJS calloc.$ac_objext" - - fi - - - - - - - - - - GL_GNULIB_CALLOC_GNU=1 - - - - - -printf "%s\n" "#define GNULIB_TEST_CALLOC_GNU 1" >>confdefs.h - - - - - - - if test $REPLACE_MALLOC_FOR_MALLOC_POSIX = 1; then - REPLACE_CALLOC_FOR_CALLOC_POSIX=1 - fi - - if test $REPLACE_CALLOC_FOR_CALLOC_POSIX = 1; then - - - - - - - - - gl_LIBOBJS="$gl_LIBOBJS calloc.$ac_objext" - + if test $ac_cv_working_alloca_h = yes; then + HAVE_ALLOCA_H=1 + else + HAVE_ALLOCA_H=0 fi - - - - - GL_GNULIB_CALLOC_POSIX=1 - - - - - -printf "%s\n" "#define GNULIB_TEST_CALLOC_POSIX 1" >>confdefs.h - - - - - - if test $ac_cv_func_canonicalize_file_name = no; then HAVE_CANONICALIZE_FILE_NAME=0 if test $ac_cv_func_realpath = no; then @@ -20756,35 +16406,29 @@ esac fi + if test $HAVE_CANONICALIZE_FILE_NAME = 0 || test $REPLACE_CANONICALIZE_FILE_NAME = 1; then - if test $HAVE_CANONICALIZE_FILE_NAME = 0 || test $REPLACE_CANONICALIZE_FILE_NAME = 1; then - GL_COND_OBJ_CANONICALIZE_LGPL_TRUE= - GL_COND_OBJ_CANONICALIZE_LGPL_FALSE='#' -else - GL_COND_OBJ_CANONICALIZE_LGPL_TRUE='#' - GL_COND_OBJ_CANONICALIZE_LGPL_FALSE= -fi -: - if test -z "${GL_COND_OBJ_CANONICALIZE_LGPL_TRUE}" && test -z "${GL_COND_OBJ_CANONICALIZE_LGPL_FALSE}"; then - GL_COND_OBJ_CANONICALIZE_LGPL_TRUE='#' - GL_COND_OBJ_CANONICALIZE_LGPL_FALSE='#' - fi -printf "%s\n" "#define GNULIB_CANONICALIZE_LGPL 1" >>confdefs.h + gl_LIBOBJS="$gl_LIBOBJS canonicalize-lgpl.$ac_objext" + fi +printf "%s\n" "#define GNULIB_CANONICALIZE_LGPL 1" >>confdefs.h - GL_GNULIB_CANONICALIZE_FILE_NAME=1 + + + + GNULIB_CANONICALIZE_FILE_NAME=1 @@ -20799,61 +16443,74 @@ + GNULIB_REALPATH=1 - GL_GNULIB_REALPATH=1 +printf "%s\n" "#define GNULIB_TEST_REALPATH 1" >>confdefs.h -printf "%s\n" "#define GNULIB_TEST_REALPATH 1" >>confdefs.h + GNULIB_CHDIR=1 +printf "%s\n" "#define GNULIB_TEST_CHDIR 1" >>confdefs.h - GL_GNULIB_CHDIR=1 +printf "%s\n" "#define GNULIB_TEST_CLOEXEC 1" >>confdefs.h -printf "%s\n" "#define GNULIB_TEST_CHDIR 1" >>confdefs.h + if test $HAVE_MSVC_INVALID_PARAMETER_HANDLER = 1; then + REPLACE_CLOSE=1 + fi -printf "%s\n" "#define GNULIB_TEST_CLOEXEC 1" >>confdefs.h - if test $REPLACE_CLOSE = 1; then - GL_COND_OBJ_CLOSE_TRUE= - GL_COND_OBJ_CLOSE_FALSE='#' -else - GL_COND_OBJ_CLOSE_TRUE='#' - GL_COND_OBJ_CLOSE_FALSE= + if test $ac_cv_header_sys_socket_h != yes; then + ac_fn_c_check_header_compile "$LINENO" "winsock2.h" "ac_cv_header_winsock2_h" "$ac_includes_default" +if test "x$ac_cv_header_winsock2_h" = xyes +then : + printf "%s\n" "#define HAVE_WINSOCK2_H 1" >>confdefs.h + fi -: - if test -z "${GL_COND_OBJ_CLOSE_TRUE}" && test -z "${GL_COND_OBJ_CLOSE_FALSE}"; then - GL_COND_OBJ_CLOSE_TRUE='#' - GL_COND_OBJ_CLOSE_FALSE='#' + fi + if test "$ac_cv_header_winsock2_h" = yes; then + HAVE_WINSOCK2_H=1 + UNISTD_H_HAVE_WINSOCK2_H=1 + SYS_IOCTL_H_HAVE_WINSOCK2_H=1 + else + HAVE_WINSOCK2_H=0 + fi + + + if test $UNISTD_H_HAVE_WINSOCK2_H = 1; then + REPLACE_CLOSE=1 + fi + if test $REPLACE_CLOSE = 1; then @@ -20861,7 +16518,16 @@ - GL_GNULIB_CLOSE=1 + + gl_LIBOBJS="$gl_LIBOBJS close.$ac_objext" + + fi + + + + + + GNULIB_CLOSE=1 @@ -21036,105 +16702,81 @@ esac - - if test $REPLACE_DUP2 = 1; then - GL_COND_OBJ_DUP2_TRUE= - GL_COND_OBJ_DUP2_FALSE='#' -else - GL_COND_OBJ_DUP2_TRUE='#' - GL_COND_OBJ_DUP2_FALSE= -fi -: - if test -z "${GL_COND_OBJ_DUP2_TRUE}" && test -z "${GL_COND_OBJ_DUP2_FALSE}"; then - GL_COND_OBJ_DUP2_TRUE='#' - GL_COND_OBJ_DUP2_FALSE='#' - fi - - if test -z "$GL_COND_OBJ_DUP2_TRUE"; then : - + if test $REPLACE_DUP2 = 1; then -fi - + gl_LIBOBJS="$gl_LIBOBJS dup2.$ac_objext" - GL_GNULIB_DUP2=1 + fi -printf "%s\n" "#define GNULIB_TEST_DUP2 1" >>confdefs.h + GNULIB_DUP2=1 +printf "%s\n" "#define GNULIB_TEST_DUP2 1" >>confdefs.h - case "$GL_GENERATE_ERRNO_H" in - false) ERRNO_H='' ;; - true) - if test -z "$ERRNO_H"; then - ERRNO_H="${gl_source_base_prefix}errno.h" - fi - ;; - *) echo "*** GL_GENERATE_ERRNO_H is not set correctly" 1>&2; exit 1 ;; - esac - if $GL_GENERATE_ERRNO_H; then - GL_GENERATE_ERRNO_H_TRUE= - GL_GENERATE_ERRNO_H_FALSE='#' -else - GL_GENERATE_ERRNO_H_TRUE='#' - GL_GENERATE_ERRNO_H_FALSE= + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for error_at_line" >&5 +printf %s "checking for error_at_line... " >&6; } +if test ${ac_cv_lib_error_at_line+y} +then : + printf %s "(cached) " >&6 +else $as_nop + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#include +int +main (void) +{ +error_at_line (0, 0, "", 0, "an error occurred"); + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO" +then : + ac_cv_lib_error_at_line=yes +else $as_nop + ac_cv_lib_error_at_line=no fi -: - if test -z "${GL_GENERATE_ERRNO_H_TRUE}" && test -z "${GL_GENERATE_ERRNO_H_FALSE}"; then - GL_GENERATE_ERRNO_H_TRUE='#' - GL_GENERATE_ERRNO_H_FALSE='#' - fi - - - - +rm -f core conftest.err conftest.$ac_objext conftest.beam \ + conftest$ac_exeext conftest.$ac_ext +fi +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_error_at_line" >&5 +printf "%s\n" "$ac_cv_lib_error_at_line" >&6; } + if test $ac_cv_lib_error_at_line = no; then - if test $GL_GENERATE_ERROR_H = true; then - GL_COND_OBJ_ERROR_TRUE= - GL_COND_OBJ_ERROR_FALSE='#' -else - GL_COND_OBJ_ERROR_TRUE='#' - GL_COND_OBJ_ERROR_FALSE= -fi -: - if test -z "${GL_COND_OBJ_ERROR_TRUE}" && test -z "${GL_COND_OBJ_ERROR_FALSE}"; then - GL_COND_OBJ_ERROR_TRUE='#' - GL_COND_OBJ_ERROR_FALSE='#' - fi - if test -z "$GL_COND_OBJ_ERROR_TRUE"; then : + gl_LIBOBJS="$gl_LIBOBJS error.$ac_objext" : - -fi + fi XGETTEXT_EXTRA_OPTIONS="$XGETTEXT_EXTRA_OPTIONS --flag=error:3:c-format" @@ -21148,40 +16790,6 @@ - case "$GL_GENERATE_ERROR_H" in - false) ERROR_H='' ;; - true) - if test -z "$ERROR_H"; then - ERROR_H="${gl_source_base_prefix}error.h" - fi - ;; - *) echo "*** GL_GENERATE_ERROR_H is not set correctly" 1>&2; exit 1 ;; - esac - - - if $GL_GENERATE_ERROR_H; then - GL_GENERATE_ERROR_H_TRUE= - GL_GENERATE_ERROR_H_FALSE='#' -else - GL_GENERATE_ERROR_H_TRUE='#' - GL_GENERATE_ERROR_H_FALSE= -fi -: - if test -z "${GL_GENERATE_ERROR_H_TRUE}" && test -z "${GL_GENERATE_ERROR_H_FALSE}"; then - GL_GENERATE_ERROR_H_TRUE='#' - GL_GENERATE_ERROR_H_FALSE='#' - fi - - - - - - - - - - - if test $ac_cv_func_fcntl = no; then @@ -21376,30 +16984,24 @@ fi + if test $HAVE_FCNTL = 0 || test $REPLACE_FCNTL = 1; then + - if test $HAVE_FCNTL = 0 || test $REPLACE_FCNTL = 1; then - GL_COND_OBJ_FCNTL_TRUE= - GL_COND_OBJ_FCNTL_FALSE='#' -else - GL_COND_OBJ_FCNTL_TRUE='#' - GL_COND_OBJ_FCNTL_FALSE= -fi -: - if test -z "${GL_COND_OBJ_FCNTL_TRUE}" && test -z "${GL_COND_OBJ_FCNTL_FALSE}"; then - GL_COND_OBJ_FCNTL_TRUE='#' - GL_COND_OBJ_FCNTL_FALSE='#' - fi + gl_LIBOBJS="$gl_LIBOBJS fcntl.$ac_objext" + + fi - GL_GNULIB_FCNTL=1 + + GNULIB_FCNTL=1 @@ -21419,16 +17021,93 @@ - GL_GENERATE_FLOAT_H=false + + if test $gl_cv_have_include_next = yes; then + gl_cv_next_fcntl_h='<'fcntl.h'>' + else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking absolute name of " >&5 +printf %s "checking absolute name of ... " >&6; } +if test ${gl_cv_next_fcntl_h+y} +then : + printf %s "(cached) " >&6 +else $as_nop + + + + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#include +_ACEOF + case "$host_os" in + aix*) gl_absname_cpp="$ac_cpp -C" ;; + *) gl_absname_cpp="$ac_cpp" ;; + esac + + case "$host_os" in + mingw*) + gl_dirsep_regex='[/\\]' + ;; + *) + gl_dirsep_regex='\/' + ;; + esac + gl_make_literal_regex_sed='s,[]$^\\.*/[],\\&,g' + gl_header_literal_regex=`echo 'fcntl.h' \ + | 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 + }' + + gl_cv_absolute_fcntl_h=`(eval "$gl_absname_cpp conftest.$ac_ext") 2>&5 | + sed -n "$gl_absolute_header_sed"` + + gl_header=$gl_cv_absolute_fcntl_h + gl_cv_next_fcntl_h='"'$gl_header'"' + + +fi +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_next_fcntl_h" >&5 +printf "%s\n" "$gl_cv_next_fcntl_h" >&6; } + fi + NEXT_FCNTL_H=$gl_cv_next_fcntl_h + + if test $gl_cv_have_include_next = yes || test $gl_cv_have_include_next = buggy; then + # INCLUDE_NEXT_AS_FIRST_DIRECTIVE='include_next' + gl_next_as_first_directive='<'fcntl.h'>' + else + # INCLUDE_NEXT_AS_FIRST_DIRECTIVE='include' + gl_next_as_first_directive=$gl_cv_next_fcntl_h + fi + NEXT_AS_FIRST_DIRECTIVE_FCNTL_H=$gl_next_as_first_directive + + + + + + + + + + + + + + + + + FLOAT_H= REPLACE_FLOAT_LDBL=0 case "$host_os" in aix* | beos* | openbsd* | mirbsd* | irix*) - GL_GENERATE_FLOAT_H=true + FLOAT_H=float.h ;; freebsd* | dragonfly*) case "$host_cpu" in i[34567]86 ) - GL_GENERATE_FLOAT_H=true + FLOAT_H=float.h ;; x86_64 ) # On x86_64 systems, the C compiler may still be generating @@ -21446,7 +17125,7 @@ then : else $as_nop - GL_GENERATE_FLOAT_H=true + FLOAT_H=float.h fi rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext ;; @@ -21455,14 +17134,14 @@ linux*) case "$host_cpu" in powerpc*) - GL_GENERATE_FLOAT_H=true + FLOAT_H=float.h ;; esac ;; esac case "$host_os" in aix* | freebsd* | dragonfly* | linux*) - if $GL_GENERATE_FLOAT_H; then + if test -n "$FLOAT_H"; then REPLACE_FLOAT_LDBL=1 fi ;; @@ -21533,11 +17212,11 @@ case "$gl_cv_func_itold_works" in *no) REPLACE_ITOLD=1 - GL_GENERATE_FLOAT_H=true + FLOAT_H=float.h ;; esac - if $GL_GENERATE_FLOAT_H; then + if test -n "$FLOAT_H"; then @@ -21588,8 +17267,8 @@ gl_cv_absolute_float_h=`(eval "$gl_absname_cpp conftest.$ac_ext") 2>&5 | sed -n "$gl_absolute_header_sed"` - gl_header=$gl_cv_absolute_float_h - gl_cv_next_float_h='"'$gl_header'"' + gl_header=$gl_cv_absolute_float_h + gl_cv_next_float_h='"'$gl_header'"' fi @@ -21612,34 +17291,29 @@ fi + if test -n "$FLOAT_H"; then + GL_GENERATE_FLOAT_H_TRUE= + GL_GENERATE_FLOAT_H_FALSE='#' +else + GL_GENERATE_FLOAT_H_TRUE='#' + GL_GENERATE_FLOAT_H_FALSE= +fi + + if test $REPLACE_FLOAT_LDBL = 1; then - case "$GL_GENERATE_FLOAT_H" in - false) FLOAT_H='' ;; - true) - if test -z "$FLOAT_H"; then - FLOAT_H="${gl_source_base_prefix}float.h" - fi - ;; - *) echo "*** GL_GENERATE_FLOAT_H is not set correctly" 1>&2; exit 1 ;; - esac - if $GL_GENERATE_FLOAT_H; then - GL_GENERATE_FLOAT_H_TRUE= - GL_GENERATE_FLOAT_H_FALSE='#' -else - GL_GENERATE_FLOAT_H_TRUE='#' - GL_GENERATE_FLOAT_H_FALSE= -fi -: - if test -z "${GL_GENERATE_FLOAT_H_TRUE}" && test -z "${GL_GENERATE_FLOAT_H_FALSE}"; then - GL_GENERATE_FLOAT_H_TRUE='#' - GL_GENERATE_FLOAT_H_FALSE='#' + + + + gl_LIBOBJS="$gl_LIBOBJS float.$ac_objext" + fi + if test $REPLACE_ITOLD = 1; then @@ -21647,41 +17321,89 @@ - if test $REPLACE_FLOAT_LDBL = 1; then - GL_COND_OBJ_FLOAT_TRUE= - GL_COND_OBJ_FLOAT_FALSE='#' -else - GL_COND_OBJ_FLOAT_TRUE='#' - GL_COND_OBJ_FLOAT_FALSE= -fi -: - if test -z "${GL_COND_OBJ_FLOAT_TRUE}" && test -z "${GL_COND_OBJ_FLOAT_FALSE}"; then - GL_COND_OBJ_FLOAT_TRUE='#' - GL_COND_OBJ_FLOAT_FALSE='#' - fi + gl_LIBOBJS="$gl_LIBOBJS itold.$ac_objext" - if test $REPLACE_ITOLD = 1; then - GL_COND_OBJ_ITOLD_TRUE= - GL_COND_OBJ_ITOLD_FALSE='#' -else - GL_COND_OBJ_ITOLD_TRUE='#' - GL_COND_OBJ_ITOLD_FALSE= -fi -: - if test -z "${GL_COND_OBJ_ITOLD_TRUE}" && test -z "${GL_COND_OBJ_ITOLD_FALSE}"; then - GL_COND_OBJ_ITOLD_TRUE='#' - GL_COND_OBJ_ITOLD_FALSE='#' fi - if test $gl_cv_func_fprintf_posix = no; then + + + + + + + + gl_cv_func_fprintf_posix=no + case "$gl_cv_func_printf_sizes_c99" in + *yes) + case "$gl_cv_func_printf_long_double" in + *yes) + case "$gl_cv_func_printf_infinite" in + *yes) + case "$gl_cv_func_printf_infinite_long_double" in + *yes) + case "$gl_cv_func_printf_directive_a" in + *yes) + case "$gl_cv_func_printf_directive_f" in + *yes) + case "$gl_cv_func_printf_directive_n" in + *yes) + case "$gl_cv_func_printf_directive_ls" in + *yes) + case "$gl_cv_func_printf_positions" in + *yes) + case "$gl_cv_func_printf_flag_grouping" in + *yes) + case "$gl_cv_func_printf_flag_leftadjust" in + *yes) + case "$gl_cv_func_printf_flag_zero" in + *yes) + case "$gl_cv_func_printf_precision" in + *yes) + case "$gl_cv_func_printf_enomem" in + *yes) + # fprintf exists and is + # already POSIX compliant. + gl_cv_func_fprintf_posix=yes + ;; + esac + ;; + esac + ;; + esac + ;; + esac + ;; + esac + ;; + esac + ;; + esac + ;; + esac + ;; + esac + ;; + esac + ;; + esac + ;; + esac + ;; + esac + ;; + esac + if test $gl_cv_func_fprintf_posix = no; then + + + case "$gl_cv_func_printf_infinite" in *yes) ;; @@ -21718,86 +17440,13 @@ printf "%s\n" "#define NEED_PRINTF_DIRECTIVE_A 1" >>confdefs.h - - - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for nl_langinfo" >&5 -printf %s "checking for nl_langinfo... " >&6; } -if test ${gl_cv_onwards_func_nl_langinfo+y} -then : - printf %s "(cached) " >&6 -else $as_nop - - exec 9>&6 6>/dev/null - - case "$host_os" in - - linux*-android*) - ac_fn_check_decl "$LINENO" "nl_langinfo" "ac_cv_have_decl_nl_langinfo" "#include -" "$ac_c_undeclared_builtin_options" "CFLAGS" -if test "x$ac_cv_have_decl_nl_langinfo" = xyes -then : - -fi - if test $ac_cv_have_decl_nl_langinfo = yes; then - ac_fn_c_check_func "$LINENO" "nl_langinfo" "ac_cv_func_nl_langinfo" -if test "x$ac_cv_func_nl_langinfo" = xyes -then : - -fi - - if test $ac_cv_func_nl_langinfo = yes; then - gl_cv_onwards_func_nl_langinfo=yes - else - gl_cv_onwards_func_nl_langinfo='future OS version' - fi - else - gl_cv_onwards_func_nl_langinfo='future OS version' - fi - ;; - - - *) - ac_fn_c_check_func "$LINENO" "nl_langinfo" "ac_cv_func_nl_langinfo" + ac_fn_c_check_func "$LINENO" "nl_langinfo" "ac_cv_func_nl_langinfo" if test "x$ac_cv_func_nl_langinfo" = xyes then : + printf "%s\n" "#define HAVE_NL_LANGINFO 1" >>confdefs.h fi - gl_cv_onwards_func_nl_langinfo=$ac_cv_func_nl_langinfo - ;; - - esac - - exec 6>&9 9>&- - - -fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_onwards_func_nl_langinfo" >&5 -printf "%s\n" "$gl_cv_onwards_func_nl_langinfo" >&6; } - - case "$gl_cv_onwards_func_nl_langinfo" in - future*) ac_cv_func_nl_langinfo=no ;; - *) ac_cv_func_nl_langinfo=$gl_cv_onwards_func_nl_langinfo ;; - esac - if test $ac_cv_func_nl_langinfo = yes; then - -printf "%s\n" "#define HAVE_NL_LANGINFO 1" >>confdefs.h - - fi - - - ;; - esac - - - - case "$gl_cv_func_printf_directive_b" in - *yes) - ;; - *) - -printf "%s\n" "#define NEED_PRINTF_DIRECTIVE_B 1" >>confdefs.h - ;; esac @@ -21827,18 +17476,6 @@ - case "$gl_cv_func_printf_directive_lc" in - *yes) - ;; - *) - -printf "%s\n" "#define NEED_PRINTF_DIRECTIVE_LC 1" >>confdefs.h - - ;; - esac - - - case "$gl_cv_func_printf_flag_grouping" in *yes) ;; @@ -21919,7 +17556,6 @@ - gl_LIBOBJS="$gl_LIBOBJS vasnprintf.$ac_objext" @@ -22008,11 +17644,7 @@ - - - - - GL_GNULIB_FPRINTF_POSIX=1 + GNULIB_FPRINTF_POSIX=1 @@ -22070,35 +17702,25 @@ *) REPLACE_FREE=1 ;; esac + if test $REPLACE_FREE = 1; then - if test $REPLACE_FREE = 1; then - GL_COND_OBJ_FREE_TRUE= - GL_COND_OBJ_FREE_FALSE='#' -else - GL_COND_OBJ_FREE_TRUE='#' - GL_COND_OBJ_FREE_FALSE= -fi -: - if test -z "${GL_COND_OBJ_FREE_TRUE}" && test -z "${GL_COND_OBJ_FREE_FALSE}"; then - GL_COND_OBJ_FREE_TRUE='#' - GL_COND_OBJ_FREE_FALSE='#' - fi - if test -z "$GL_COND_OBJ_FREE_TRUE"; then : - : -fi + gl_LIBOBJS="$gl_LIBOBJS free.$ac_objext" + + : + fi - GL_GNULIB_FREE_POSIX=1 + GNULIB_FREE_POSIX=1 @@ -22262,11 +17884,7 @@ - - - - - GL_GNULIB_FREXP=1 + GNULIB_FREXP=1 @@ -22486,11 +18104,7 @@ - - - - - GL_GNULIB_FREXPL=1 + GNULIB_FREXPL=1 @@ -22503,116 +18117,40 @@ - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for __fseterr" >&5 -printf %s "checking for __fseterr... " >&6; } -if test ${gl_cv_onwards_func___fseterr+y} -then : - printf %s "(cached) " >&6 -else $as_nop - - exec 9>&6 6>/dev/null + if test $ac_cv_func___fseterr = no; then - case "$host_os" in - linux*-android*) - ac_fn_check_decl "$LINENO" "__fseterr" "ac_cv_have_decl___fseterr" "#include - #include -" "$ac_c_undeclared_builtin_options" "CFLAGS" -if test "x$ac_cv_have_decl___fseterr" = xyes -then : -fi - if test $ac_cv_have_decl___fseterr = yes; then - ac_fn_c_check_func "$LINENO" "__fseterr" "ac_cv_func___fseterr" -if test "x$ac_cv_func___fseterr" = xyes -then : - -fi - - if test $ac_cv_func___fseterr = yes; then - gl_cv_onwards_func___fseterr=yes - else - gl_cv_onwards_func___fseterr='future OS version' - fi - else - gl_cv_onwards_func___fseterr='future OS version' - fi - ;; - *) - ac_fn_c_check_func "$LINENO" "__fseterr" "ac_cv_func___fseterr" -if test "x$ac_cv_func___fseterr" = xyes -then : -fi - gl_cv_onwards_func___fseterr=$ac_cv_func___fseterr - ;; + gl_LIBOBJS="$gl_LIBOBJS fseterr.$ac_objext" - esac + fi - exec 6>&9 9>&- -fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_onwards_func___fseterr" >&5 -printf "%s\n" "$gl_cv_onwards_func___fseterr" >&6; } - case "$gl_cv_onwards_func___fseterr" in - future*) ac_cv_func___fseterr=no ;; - *) ac_cv_func___fseterr=$gl_cv_onwards_func___fseterr ;; + case "$host_os" in + mingw* | solaris*) + REPLACE_FSTAT=1 + ;; esac - if test $ac_cv_func___fseterr = yes; then -printf "%s\n" "#define HAVE___FSETERR 1" >>confdefs.h - fi + if test $REPLACE_FSTAT = 1; then - if test $ac_cv_func___fseterr = no; then - GL_COND_OBJ_FSETERR_TRUE= - GL_COND_OBJ_FSETERR_FALSE='#' -else - GL_COND_OBJ_FSETERR_TRUE='#' - GL_COND_OBJ_FSETERR_FALSE= -fi -: - if test -z "${GL_COND_OBJ_FSETERR_TRUE}" && test -z "${GL_COND_OBJ_FSETERR_FALSE}"; then - GL_COND_OBJ_FSETERR_TRUE='#' - GL_COND_OBJ_FSETERR_FALSE='#' - fi - - case "$host_os" in - mingw* | solaris*) - REPLACE_FSTAT=1 - ;; - esac - - - - - if test $REPLACE_FSTAT = 1; then - GL_COND_OBJ_FSTAT_TRUE= - GL_COND_OBJ_FSTAT_FALSE='#' -else - GL_COND_OBJ_FSTAT_TRUE='#' - GL_COND_OBJ_FSTAT_FALSE= -fi -: - if test -z "${GL_COND_OBJ_FSTAT_TRUE}" && test -z "${GL_COND_OBJ_FSTAT_FALSE}"; then - GL_COND_OBJ_FSTAT_TRUE='#' - GL_COND_OBJ_FSTAT_FALSE='#' - fi - if test -z "$GL_COND_OBJ_FSTAT_TRUE"; then : + gl_LIBOBJS="$gl_LIBOBJS fstat.$ac_objext" case "$host_os" in mingw*) @@ -22633,18 +18171,13 @@ : - -fi - - - - + fi - GL_GNULIB_FSTAT=1 + GNULIB_FSTAT=1 @@ -22725,35 +18258,25 @@ HAVE_GETDTABLESIZE=0 fi + if test $HAVE_GETDTABLESIZE = 0 || test $REPLACE_GETDTABLESIZE = 1; then + - if test $HAVE_GETDTABLESIZE = 0 || test $REPLACE_GETDTABLESIZE = 1; then - GL_COND_OBJ_GETDTABLESIZE_TRUE= - GL_COND_OBJ_GETDTABLESIZE_FALSE='#' -else - GL_COND_OBJ_GETDTABLESIZE_TRUE='#' - GL_COND_OBJ_GETDTABLESIZE_FALSE= -fi -: - if test -z "${GL_COND_OBJ_GETDTABLESIZE_TRUE}" && test -z "${GL_COND_OBJ_GETDTABLESIZE_FALSE}"; then - GL_COND_OBJ_GETDTABLESIZE_TRUE='#' - GL_COND_OBJ_GETDTABLESIZE_FALSE='#' - fi - if test -z "$GL_COND_OBJ_GETDTABLESIZE_TRUE"; then : - : -fi + gl_LIBOBJS="$gl_LIBOBJS getdtablesize.$ac_objext" + : + fi - GL_GNULIB_GETDTABLESIZE=1 + GNULIB_GETDTABLESIZE=1 @@ -22777,8 +18300,6 @@ REPLACE_GETOPT=1 fi - GL_GENERATE_GETOPT_H=false - GL_GENERATE_GETOPT_CDEFS_H=false if test $REPLACE_GETOPT = 1; then @@ -22792,39 +18313,14 @@ printf "%s\n" "#define __GETOPT_PREFIX rpl_" >>confdefs.h - GL_GENERATE_GETOPT_H=true - GL_GENERATE_GETOPT_CDEFS_H=true - - fi - - + GETOPT_H=getopt.h + GETOPT_CDEFS_H=getopt-cdefs.h - case "$GL_GENERATE_GETOPT_H" in - false) GETOPT_H='' ;; - true) - if test -z "$GETOPT_H"; then - GETOPT_H="${gl_source_base_prefix}getopt.h" - fi - ;; - *) echo "*** GL_GENERATE_GETOPT_H is not set correctly" 1>&2; exit 1 ;; - esac - - - if $GL_GENERATE_GETOPT_H; then - GL_GENERATE_GETOPT_H_TRUE= - GL_GENERATE_GETOPT_H_FALSE='#' -else - GL_GENERATE_GETOPT_H_TRUE='#' - GL_GENERATE_GETOPT_H_FALSE= -fi -: - if test -z "${GL_GENERATE_GETOPT_H_TRUE}" && test -z "${GL_GENERATE_GETOPT_H_FALSE}"; then - GL_GENERATE_GETOPT_H_TRUE='#' - GL_GENERATE_GETOPT_H_FALSE='#' fi + if test $REPLACE_GETOPT = 1; then @@ -22833,72 +18329,27 @@ - case "$GL_GENERATE_GETOPT_CDEFS_H" in - false) GETOPT_CDEFS_H='' ;; - true) - if test -z "$GETOPT_CDEFS_H"; then - GETOPT_CDEFS_H="${gl_source_base_prefix}getopt-cdefs.h" - fi - ;; - *) echo "*** GL_GENERATE_GETOPT_CDEFS_H is not set correctly" 1>&2; exit 1 ;; - esac - - - if $GL_GENERATE_GETOPT_CDEFS_H; then - GL_GENERATE_GETOPT_CDEFS_H_TRUE= - GL_GENERATE_GETOPT_CDEFS_H_FALSE='#' -else - GL_GENERATE_GETOPT_CDEFS_H_TRUE='#' - GL_GENERATE_GETOPT_CDEFS_H_FALSE= -fi -: - if test -z "${GL_GENERATE_GETOPT_CDEFS_H_TRUE}" && test -z "${GL_GENERATE_GETOPT_CDEFS_H_FALSE}"; then - GL_GENERATE_GETOPT_CDEFS_H_TRUE='#' - GL_GENERATE_GETOPT_CDEFS_H_FALSE='#' - fi - - - - - - - - if test $REPLACE_GETOPT = 1; then - GL_COND_OBJ_GETOPT_TRUE= - GL_COND_OBJ_GETOPT_FALSE='#' -else - GL_COND_OBJ_GETOPT_TRUE='#' - GL_COND_OBJ_GETOPT_FALSE= -fi -: - if test -z "${GL_COND_OBJ_GETOPT_TRUE}" && test -z "${GL_COND_OBJ_GETOPT_FALSE}"; then - GL_COND_OBJ_GETOPT_TRUE='#' - GL_COND_OBJ_GETOPT_FALSE='#' - fi - - if test -z "$GL_COND_OBJ_GETOPT_TRUE"; then : - + gl_LIBOBJS="$gl_LIBOBJS getopt.$ac_objext" - GL_GNULIB_UNISTD_H_GETOPT=1 -fi - - + gl_LIBOBJS="$gl_LIBOBJS getopt1.$ac_objext" + GNULIB_GL_UNISTD_H_GETOPT=1 + fi - GL_GNULIB_GETOPT_POSIX=1 + GNULIB_GETOPT_POSIX=1 @@ -22911,116 +18362,6 @@ - - - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for getprogname" >&5 -printf %s "checking for getprogname... " >&6; } -if test ${gl_cv_onwards_func_getprogname+y} -then : - printf %s "(cached) " >&6 -else $as_nop - - exec 9>&6 6>/dev/null - - case "$host_os" in - - linux*-android*) - ac_fn_check_decl "$LINENO" "getprogname" "ac_cv_have_decl_getprogname" "#include -" "$ac_c_undeclared_builtin_options" "CFLAGS" -if test "x$ac_cv_have_decl_getprogname" = xyes -then : - -fi - if test $ac_cv_have_decl_getprogname = yes; then - ac_fn_c_check_func "$LINENO" "getprogname" "ac_cv_func_getprogname" -if test "x$ac_cv_func_getprogname" = xyes -then : - -fi - - if test $ac_cv_func_getprogname = yes; then - gl_cv_onwards_func_getprogname=yes - else - gl_cv_onwards_func_getprogname='future OS version' - fi - else - gl_cv_onwards_func_getprogname='future OS version' - fi - ;; - - - *) - ac_fn_c_check_func "$LINENO" "getprogname" "ac_cv_func_getprogname" -if test "x$ac_cv_func_getprogname" = xyes -then : - -fi - - gl_cv_onwards_func_getprogname=$ac_cv_func_getprogname - ;; - - esac - - exec 6>&9 9>&- - - -fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_onwards_func_getprogname" >&5 -printf "%s\n" "$gl_cv_onwards_func_getprogname" >&6; } - - case "$gl_cv_onwards_func_getprogname" in - future*) ac_cv_func_getprogname=no ;; - *) ac_cv_func_getprogname=$gl_cv_onwards_func_getprogname ;; - esac - if test $ac_cv_func_getprogname = yes; then - -printf "%s\n" "#define HAVE_GETPROGNAME 1" >>confdefs.h - - fi - - - if test $ac_cv_func_getprogname = no; then - HAVE_GETPROGNAME=0 - case "$gl_cv_onwards_func_getprogname" in - future*) REPLACE_GETPROGNAME=1 ;; - esac - fi - ac_fn_check_decl "$LINENO" "program_invocation_name" "ac_cv_have_decl_program_invocation_name" "#include -" "$ac_c_undeclared_builtin_options" "CFLAGS" -if test "x$ac_cv_have_decl_program_invocation_name" = xyes -then : - ac_have_decl=1 -else $as_nop - ac_have_decl=0 -fi -printf "%s\n" "#define HAVE_DECL_PROGRAM_INVOCATION_NAME $ac_have_decl" >>confdefs.h -if test $ac_have_decl = 1 -then : - -else $as_nop - HAVE_DECL_PROGRAM_INVOCATION_NAME=0 -fi - - - - if test $HAVE_GETPROGNAME = 0 || test $REPLACE_GETPROGNAME = 1; then - GL_COND_OBJ_GETPROGNAME_TRUE= - GL_COND_OBJ_GETPROGNAME_FALSE='#' -else - GL_COND_OBJ_GETPROGNAME_TRUE='#' - GL_COND_OBJ_GETPROGNAME_FALSE= -fi -: - if test -z "${GL_COND_OBJ_GETPROGNAME_TRUE}" && test -z "${GL_COND_OBJ_GETPROGNAME_FALSE}"; then - GL_COND_OBJ_GETPROGNAME_TRUE='#' - GL_COND_OBJ_GETPROGNAME_FALSE='#' - fi - - if test -z "$GL_COND_OBJ_GETPROGNAME_TRUE"; then : - - - - ac_found=0 ac_fn_check_decl "$LINENO" "program_invocation_name" "ac_cv_have_decl_program_invocation_name" "#include " "$ac_c_undeclared_builtin_options" "CFLAGS" @@ -23109,34 +18450,6 @@ fi -fi - - - - - - - - - - GL_GNULIB_GETPROGNAME=1 - - - - - -printf "%s\n" "#define GNULIB_TEST_GETPROGNAME 1" >>confdefs.h - - - - - - - - - - - @@ -23379,6 +18692,113 @@ + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking where to find the exponent in a 'float'" >&5 +printf %s "checking where to find the exponent in a 'float'... " >&6; } +if test ${gl_cv_cc_float_expbit0+y} +then : + printf %s "(cached) " >&6 +else $as_nop + + if test "$cross_compiling" = yes +then : + gl_cv_cc_float_expbit0="word 0 bit 23" +else $as_nop + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +#include +#include +#include +#include +#define NWORDS \ + ((sizeof (float) + sizeof (unsigned int) - 1) / sizeof (unsigned int)) +typedef union { float value; unsigned int word[NWORDS]; } memory_float; +static unsigned int ored_words[NWORDS]; +static unsigned int anded_words[NWORDS]; +static void add_to_ored_words (float x) +{ + memory_float m; + size_t i; + /* Clear it first, in case + sizeof (float) < sizeof (memory_float). */ + memset (&m, 0, sizeof (memory_float)); + m.value = x; + for (i = 0; i < NWORDS; i++) + { + ored_words[i] |= m.word[i]; + anded_words[i] &= m.word[i]; + } +} +int main () +{ + size_t j; + FILE *fp = fopen ("conftest.out", "w"); + if (fp == NULL) + return 1; + for (j = 0; j < NWORDS; j++) + anded_words[j] = ~ (unsigned int) 0; + add_to_ored_words (0.25f); + add_to_ored_words (0.5f); + add_to_ored_words (1.0f); + add_to_ored_words (2.0f); + add_to_ored_words (4.0f); + /* Remove bits that are common (e.g. if representation of the first mantissa + bit is explicit). */ + for (j = 0; j < NWORDS; j++) + ored_words[j] &= ~anded_words[j]; + /* Now find the nonzero word. */ + for (j = 0; j < NWORDS; j++) + if (ored_words[j] != 0) + break; + if (j < NWORDS) + { + size_t i; + for (i = j + 1; i < NWORDS; i++) + if (ored_words[i] != 0) + { + fprintf (fp, "unknown"); + return (fclose (fp) != 0); + } + for (i = 0; ; i++) + if ((ored_words[j] >> i) & 1) + { + fprintf (fp, "word %d bit %d", (int) j, (int) i); + return (fclose (fp) != 0); + } + } + fprintf (fp, "unknown"); + return (fclose (fp) != 0); +} + +_ACEOF +if ac_fn_c_try_run "$LINENO" +then : + gl_cv_cc_float_expbit0=`cat conftest.out` +else $as_nop + gl_cv_cc_float_expbit0="unknown" +fi +rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ + conftest.$ac_objext conftest.beam conftest.$ac_ext +fi + + rm -f conftest.out + +fi +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_cc_float_expbit0" >&5 +printf "%s\n" "$gl_cv_cc_float_expbit0" >&6; } + case "$gl_cv_cc_float_expbit0" in + word*bit*) + word=`echo "$gl_cv_cc_float_expbit0" | sed -e 's/word //' -e 's/ bit.*//'` + bit=`echo "$gl_cv_cc_float_expbit0" | sed -e 's/word.*bit //'` + +printf "%s\n" "#define FLT_EXPBIT0_WORD $word" >>confdefs.h + + +printf "%s\n" "#define FLT_EXPBIT0_BIT $bit" >>confdefs.h + + ;; + esac + fi @@ -23614,6 +19034,150 @@ + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking where to find the exponent in a 'long double'" >&5 +printf %s "checking where to find the exponent in a 'long double'... " >&6; } +if test ${gl_cv_cc_long_double_expbit0+y} +then : + printf %s "(cached) " >&6 +else $as_nop + + if test "$cross_compiling" = yes +then : + + gl_cv_cc_long_double_expbit0="unknown" + case "$host_os" in + mingw*) # On native Windows (little-endian), we know the result + # in two cases: mingw, MSVC. + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +#ifdef __MINGW32__ + Known +#endif + +_ACEOF +if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | + $EGREP "Known" >/dev/null 2>&1 +then : + gl_cv_cc_long_double_expbit0="word 2 bit 0" +fi +rm -rf conftest* + + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +#ifdef _MSC_VER + Known +#endif + +_ACEOF +if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | + $EGREP "Known" >/dev/null 2>&1 +then : + gl_cv_cc_long_double_expbit0="word 1 bit 20" +fi +rm -rf conftest* + + ;; + esac + +else $as_nop + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +#include +#include +#include +#include +#define NWORDS \ + ((sizeof (long double) + sizeof (unsigned int) - 1) / sizeof (unsigned int)) +typedef union { long double value; unsigned int word[NWORDS]; } + memory_long_double; +static unsigned int ored_words[NWORDS]; +static unsigned int anded_words[NWORDS]; +static void add_to_ored_words (long double *x) +{ + memory_long_double m; + size_t i; + /* Clear it first, in case + sizeof (long double) < sizeof (memory_long_double). */ + memset (&m, 0, sizeof (memory_long_double)); + m.value = *x; + for (i = 0; i < NWORDS; i++) + { + ored_words[i] |= m.word[i]; + anded_words[i] &= m.word[i]; + } +} +int main () +{ + static long double samples[5] = { 0.25L, 0.5L, 1.0L, 2.0L, 4.0L }; + size_t j; + FILE *fp = fopen ("conftest.out", "w"); + if (fp == NULL) + return 1; + for (j = 0; j < NWORDS; j++) + anded_words[j] = ~ (unsigned int) 0; + for (j = 0; j < 5; j++) + add_to_ored_words (&samples[j]); + /* Remove bits that are common (e.g. if representation of the first mantissa + bit is explicit). */ + for (j = 0; j < NWORDS; j++) + ored_words[j] &= ~anded_words[j]; + /* Now find the nonzero word. */ + for (j = 0; j < NWORDS; j++) + if (ored_words[j] != 0) + break; + if (j < NWORDS) + { + size_t i; + for (i = j + 1; i < NWORDS; i++) + if (ored_words[i] != 0) + { + fprintf (fp, "unknown"); + return (fclose (fp) != 0); + } + for (i = 0; ; i++) + if ((ored_words[j] >> i) & 1) + { + fprintf (fp, "word %d bit %d", (int) j, (int) i); + return (fclose (fp) != 0); + } + } + fprintf (fp, "unknown"); + return (fclose (fp) != 0); +} + +_ACEOF +if ac_fn_c_try_run "$LINENO" +then : + gl_cv_cc_long_double_expbit0=`cat conftest.out` +else $as_nop + gl_cv_cc_long_double_expbit0="unknown" +fi +rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ + conftest.$ac_objext conftest.beam conftest.$ac_ext +fi + + rm -f conftest.out + +fi +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_cc_long_double_expbit0" >&5 +printf "%s\n" "$gl_cv_cc_long_double_expbit0" >&6; } + case "$gl_cv_cc_long_double_expbit0" in + word*bit*) + word=`echo "$gl_cv_cc_long_double_expbit0" | sed -e 's/word //' -e 's/ bit.*//'` + bit=`echo "$gl_cv_cc_long_double_expbit0" | sed -e 's/word.*bit //'` + +printf "%s\n" "#define LDBL_EXPBIT0_WORD $word" >>confdefs.h + + +printf "%s\n" "#define LDBL_EXPBIT0_BIT $bit" >>confdefs.h + + ;; + esac + + fi @@ -23656,39 +19220,6 @@ - - case "$GL_GENERATE_LIMITS_H" in - false) LIMITS_H='' ;; - true) - if test -z "$LIMITS_H"; then - LIMITS_H="${gl_source_base_prefix}limits.h" - fi - ;; - *) echo "*** GL_GENERATE_LIMITS_H is not set correctly" 1>&2; exit 1 ;; - esac - - - if $GL_GENERATE_LIMITS_H; then - GL_GENERATE_LIMITS_H_TRUE= - GL_GENERATE_LIMITS_H_FALSE='#' -else - GL_GENERATE_LIMITS_H_TRUE='#' - GL_GENERATE_LIMITS_H_FALSE= -fi -: - if test -z "${GL_GENERATE_LIMITS_H_TRUE}" && test -z "${GL_GENERATE_LIMITS_H_FALSE}"; then - GL_GENERATE_LIMITS_H_TRUE='#' - GL_GENERATE_LIMITS_H_FALSE='#' - fi - - - - - - - - - if test $ac_cv_func_link = no; then HAVE_LINK=0 else @@ -23708,8 +19239,6 @@ case "$host_os" in # Guess yes on Linux systems. linux-* | linux) gl_cv_func_link_works="guessing yes" ;; - # Guess yes on systems that emulate the Linux system calls. - midipix*) gl_cv_func_link_works="guessing yes" ;; # Guess yes on glibc systems. *-gnu* | gnu*) gl_cv_func_link_works="guessing yes" ;; # If we don't know, obey --enable-cross-guesses. @@ -23764,30 +19293,24 @@ esac fi + if test $HAVE_LINK = 0 || test $REPLACE_LINK = 1; then + + - if test $HAVE_LINK = 0 || test $REPLACE_LINK = 1; then - GL_COND_OBJ_LINK_TRUE= - GL_COND_OBJ_LINK_FALSE='#' -else - GL_COND_OBJ_LINK_TRUE='#' - GL_COND_OBJ_LINK_FALSE= -fi -: - if test -z "${GL_COND_OBJ_LINK_TRUE}" && test -z "${GL_COND_OBJ_LINK_FALSE}"; then - GL_COND_OBJ_LINK_TRUE='#' - GL_COND_OBJ_LINK_FALSE='#' - fi + gl_LIBOBJS="$gl_LIBOBJS link.$ac_objext" + + fi - GL_GNULIB_LINK=1 + GNULIB_LINK=1 @@ -23811,7 +19334,7 @@ else $as_nop case "$host_os" in mingw*) - gl_cv_func_lseek_pipe=no + gl_cv_func_lseek_pipe=no ;; *) if test $cross_compiling = no; then @@ -23879,7 +19402,7 @@ fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_lseek_pipe" >&5 printf "%s\n" "$gl_cv_func_lseek_pipe" >&6; } - if test "$gl_cv_func_lseek_pipe" = no; then + if test $gl_cv_func_lseek_pipe = no; then REPLACE_LSEEK=1 printf "%s\n" "#define LSEEK_PIPE_BROKEN 1" >>confdefs.h @@ -23891,69 +19414,24 @@ REPLACE_LSEEK=1 fi - if test $REPLACE_LSEEK = 0 -then : - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether SEEK_DATA works but is incompatible with GNU" >&5 -printf %s "checking whether SEEK_DATA works but is incompatible with GNU... " >&6; } -if test ${gl_cv_func_lseek_works_but_incompatible+y} -then : - printf %s "(cached) " >&6 -else $as_nop - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ - #include - #if defined __APPLE__ && defined __MACH__ && defined SEEK_DATA - # ifdef __ENVIRONMENT_MAC_OS_X_VERSION_MIN_REQUIRED__ - # include - # endif - # if 99990000 <= MAC_OS_X_VERSION_MIN_REQUIRED - # define LSEEK_WORKS_BUT_IS_INCOMPATIBLE_WITH_GNU - # endif - #endif - #ifndef LSEEK_WORKS_BUT_IS_INCOMPATIBLE_WITH_GNU - #error "No need to work around the bug" - #endif + if test $REPLACE_LSEEK = 1; then -_ACEOF -if ac_fn_c_try_cpp "$LINENO" -then : - gl_cv_func_lseek_works_but_incompatible=yes -else $as_nop - gl_cv_func_lseek_works_but_incompatible=no -fi -rm -f conftest.err conftest.i conftest.$ac_ext -fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_lseek_works_but_incompatible" >&5 -printf "%s\n" "$gl_cv_func_lseek_works_but_incompatible" >&6; } - if test "$gl_cv_func_lseek_works_but_incompatible" = yes; then - REPLACE_LSEEK=1 - fi -fi - if test $REPLACE_LSEEK = 1; then - GL_COND_OBJ_LSEEK_TRUE= - GL_COND_OBJ_LSEEK_FALSE='#' -else - GL_COND_OBJ_LSEEK_TRUE='#' - GL_COND_OBJ_LSEEK_FALSE= -fi -: - if test -z "${GL_COND_OBJ_LSEEK_TRUE}" && test -z "${GL_COND_OBJ_LSEEK_FALSE}"; then - GL_COND_OBJ_LSEEK_TRUE='#' - GL_COND_OBJ_LSEEK_FALSE='#' - fi + gl_LIBOBJS="$gl_LIBOBJS lseek.$ac_objext" + + fi - GL_GNULIB_LSEEK=1 + GNULIB_LSEEK=1 @@ -23978,25 +19456,8 @@ HAVE_LSTAT=0 fi + if test $REPLACE_LSTAT = 1; then - if test $REPLACE_LSTAT = 1; then - GL_COND_OBJ_LSTAT_TRUE= - GL_COND_OBJ_LSTAT_FALSE='#' -else - GL_COND_OBJ_LSTAT_TRUE='#' - GL_COND_OBJ_LSTAT_FALSE= -fi -: - if test -z "${GL_COND_OBJ_LSTAT_TRUE}" && test -z "${GL_COND_OBJ_LSTAT_FALSE}"; then - GL_COND_OBJ_LSTAT_TRUE='#' - GL_COND_OBJ_LSTAT_FALSE='#' - fi - - if test -z "$GL_COND_OBJ_LSTAT_TRUE"; then : - - : - -fi @@ -24004,83 +19465,37 @@ + gl_LIBOBJS="$gl_LIBOBJS lstat.$ac_objext" + : + fi - GL_GNULIB_LSTAT=1 + GNULIB_LSTAT=1 -printf "%s\n" "#define GNULIB_TEST_LSTAT 1" >>confdefs.h +printf "%s\n" "#define GNULIB_TEST_LSTAT 1" >>confdefs.h - REPLACE_MALLOC_FOR_MALLOC_GNU="$REPLACE_MALLOC_FOR_MALLOC_POSIX" - if test $REPLACE_MALLOC_FOR_MALLOC_GNU = 0; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether malloc (0) returns nonnull" >&5 -printf %s "checking whether malloc (0) returns nonnull... " >&6; } -if test ${ac_cv_func_malloc_0_nonnull+y} -then : - printf %s "(cached) " >&6 -else $as_nop - if test "$cross_compiling" = yes -then : - case "$host_os" in - # Guess yes on platforms where we know the result. - *-gnu* | freebsd* | netbsd* | openbsd* | bitrig* \ - | gnu* | *-musl* | midipix* | midnightbsd* \ - | hpux* | solaris* | cygwin* | mingw* | msys* ) - ac_cv_func_malloc_0_nonnull="guessing yes" ;; - # If we don't know, obey --enable-cross-guesses. - *) ac_cv_func_malloc_0_nonnull="$gl_cross_guess_normal" ;; - esac - -else $as_nop - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -#include -int -main (void) -{ -void *p = malloc (0); - int result = !p; - free (p); - return result; - ; - return 0; -} -_ACEOF -if ac_fn_c_try_run "$LINENO" -then : - ac_cv_func_malloc_0_nonnull=yes -else $as_nop - ac_cv_func_malloc_0_nonnull=no -fi -rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ - conftest.$ac_objext conftest.beam conftest.$ac_ext -fi + if test $gl_cv_func_malloc_posix = yes; then -fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_func_malloc_0_nonnull" >&5 -printf "%s\n" "$ac_cv_func_malloc_0_nonnull" >&6; } - case $ac_cv_func_malloc_0_nonnull in #( - *yes) : - ;; #( - *) : - REPLACE_MALLOC_FOR_MALLOC_GNU=1 ;; -esac +printf "%s\n" "#define HAVE_MALLOC_POSIX 1" >>confdefs.h + else + REPLACE_MALLOC=1 fi - if test $REPLACE_MALLOC_FOR_MALLOC_GNU = 1; then + if test $REPLACE_MALLOC = 1; then @@ -24097,33 +19512,23 @@ + GNULIB_MALLOC_POSIX=1 - GL_GNULIB_MALLOC_GNU=1 - - - - -printf "%s\n" "#define GNULIB_TEST_MALLOC_GNU 1" >>confdefs.h - - - - - if test $REPLACE_MALLOC_FOR_MALLOC_POSIX = 1; then +printf "%s\n" "#define GNULIB_TEST_MALLOC_POSIX 1" >>confdefs.h +printf "%s\n" "#define GNULIB_MALLOC_POSIX 1" >>confdefs.h - gl_LIBOBJS="$gl_LIBOBJS malloc.$ac_objext" - fi @@ -24133,60 +19538,156 @@ - GL_GNULIB_MALLOC_POSIX=1 - + if test $gl_cv_have_include_next = yes; then + gl_cv_next_math_h='<'math.h'>' + else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking absolute name of " >&5 +printf %s "checking absolute name of ... " >&6; } +if test ${gl_cv_next_math_h+y} +then : + printf %s "(cached) " >&6 +else $as_nop -printf "%s\n" "#define GNULIB_TEST_MALLOC_POSIX 1" >>confdefs.h + if test $ac_cv_header_math_h = yes; then + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#include +_ACEOF + case "$host_os" in + aix*) gl_absname_cpp="$ac_cpp -C" ;; + *) gl_absname_cpp="$ac_cpp" ;; + esac + case "$host_os" in + mingw*) + gl_dirsep_regex='[/\\]' + ;; + *) + gl_dirsep_regex='\/' + ;; + esac + gl_make_literal_regex_sed='s,[]$^\\.*/[],\\&,g' + gl_header_literal_regex=`echo 'math.h' \ + | 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 + }' + gl_cv_absolute_math_h=`(eval "$gl_absname_cpp conftest.$ac_ext") 2>&5 | + sed -n "$gl_absolute_header_sed"` + gl_header=$gl_cv_absolute_math_h + gl_cv_next_math_h='"'$gl_header'"' + else + gl_cv_next_math_h='<'math.h'>' + fi +fi +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_next_math_h" >&5 +printf "%s\n" "$gl_cv_next_math_h" >&6; } + fi + NEXT_MATH_H=$gl_cv_next_math_h + if test $gl_cv_have_include_next = yes || test $gl_cv_have_include_next = buggy; then + # INCLUDE_NEXT_AS_FIRST_DIRECTIVE='include_next' + gl_next_as_first_directive='<'math.h'>' + else + # INCLUDE_NEXT_AS_FIRST_DIRECTIVE='include' + gl_next_as_first_directive=$gl_cv_next_math_h + fi + NEXT_AS_FIRST_DIRECTIVE_MATH_H=$gl_next_as_first_directive - if test $REPLACE_MEMCHR = 1; then - GL_COND_OBJ_MEMCHR_TRUE= - GL_COND_OBJ_MEMCHR_FALSE='#' -else - GL_COND_OBJ_MEMCHR_TRUE='#' - GL_COND_OBJ_MEMCHR_FALSE= + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether NAN macro works" >&5 +printf %s "checking whether NAN macro works... " >&6; } +if test ${gl_cv_header_math_nan_works+y} +then : + printf %s "(cached) " >&6 +else $as_nop + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#include +int +main (void) +{ +/* Solaris 10 has a broken definition of NAN. Other platforms + fail to provide NAN, or provide it only in C99 mode; this + test only needs to fail when NAN is provided but wrong. */ + float f = 1.0f; +#ifdef NAN + f = NAN; +#endif + return f == 0; + ; + return 0; +} +_ACEOF +if ac_fn_c_try_compile "$LINENO" +then : + gl_cv_header_math_nan_works=yes +else $as_nop + gl_cv_header_math_nan_works=no fi -: - if test -z "${GL_COND_OBJ_MEMCHR_TRUE}" && test -z "${GL_COND_OBJ_MEMCHR_FALSE}"; then - GL_COND_OBJ_MEMCHR_TRUE='#' - GL_COND_OBJ_MEMCHR_FALSE='#' +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext +fi +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_header_math_nan_works" >&5 +printf "%s\n" "$gl_cv_header_math_nan_works" >&6; } + if test $gl_cv_header_math_nan_works = no; then + REPLACE_NAN=1 fi - - if test -z "$GL_COND_OBJ_MEMCHR_TRUE"; then : - - - ac_fn_c_check_header_compile "$LINENO" "bp-sym.h" "ac_cv_header_bp_sym_h" "$ac_includes_default" -if test "x$ac_cv_header_bp_sym_h" = xyes + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether HUGE_VAL works" >&5 +printf %s "checking whether HUGE_VAL works... " >&6; } +if test ${gl_cv_header_math_huge_val_works+y} then : - printf "%s\n" "#define HAVE_BP_SYM_H 1" >>confdefs.h - + printf %s "(cached) " >&6 +else $as_nop + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#include +int +main (void) +{ +/* Solaris 10 has a broken definition of HUGE_VAL. */ + double d = HUGE_VAL; + return d == 0; + ; + return 0; +} +_ACEOF +if ac_fn_c_try_compile "$LINENO" +then : + gl_cv_header_math_huge_val_works=yes +else $as_nop + gl_cv_header_math_huge_val_works=no fi - - - +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext fi +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_header_math_huge_val_works" >&5 +printf "%s\n" "$gl_cv_header_math_huge_val_works" >&6; } + if test $gl_cv_header_math_huge_val_works = no; then + REPLACE_HUGE_VAL=1 + fi + if test $REPLACE_MEMCHR = 1; then @@ -24195,123 +19696,77 @@ - GL_GNULIB_MEMCHR=1 + gl_LIBOBJS="$gl_LIBOBJS memchr.$ac_objext" + ac_fn_c_check_header_compile "$LINENO" "bp-sym.h" "ac_cv_header_bp_sym_h" "$ac_includes_default" +if test "x$ac_cv_header_bp_sym_h" = xyes +then : + printf "%s\n" "#define HAVE_BP_SYM_H 1" >>confdefs.h +fi -printf "%s\n" "#define GNULIB_TEST_MEMCHR 1" >>confdefs.h + fi + GNULIB_MEMCHR=1 +printf "%s\n" "#define GNULIB_TEST_MEMCHR 1" >>confdefs.h - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for mempcpy" >&5 -printf %s "checking for mempcpy... " >&6; } -if test ${gl_cv_onwards_func_mempcpy+y} -then : - printf %s "(cached) " >&6 -else $as_nop - exec 9>&6 6>/dev/null - case "$host_os" in - linux*-android*) - ac_fn_check_decl "$LINENO" "mempcpy" "ac_cv_have_decl_mempcpy" "#include -" "$ac_c_undeclared_builtin_options" "CFLAGS" -if test "x$ac_cv_have_decl_mempcpy" = xyes -then : -fi - if test $ac_cv_have_decl_mempcpy = yes; then - ac_fn_c_check_func "$LINENO" "mempcpy" "ac_cv_func_mempcpy" -if test "x$ac_cv_func_mempcpy" = xyes -then : -fi - if test $ac_cv_func_mempcpy = yes; then - gl_cv_onwards_func_mempcpy=yes - else - gl_cv_onwards_func_mempcpy='future OS version' - fi - else - gl_cv_onwards_func_mempcpy='future OS version' - fi - ;; - *) - ac_fn_c_check_func "$LINENO" "mempcpy" "ac_cv_func_mempcpy" + ac_fn_c_check_func "$LINENO" "mempcpy" "ac_cv_func_mempcpy" if test "x$ac_cv_func_mempcpy" = xyes then : + printf "%s\n" "#define HAVE_MEMPCPY 1" >>confdefs.h fi - gl_cv_onwards_func_mempcpy=$ac_cv_func_mempcpy - ;; + if test $ac_cv_func_mempcpy = no; then + HAVE_MEMPCPY=0 + fi - esac + if test $HAVE_MEMPCPY = 0; then - exec 6>&9 9>&- -fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_onwards_func_mempcpy" >&5 -printf "%s\n" "$gl_cv_onwards_func_mempcpy" >&6; } - case "$gl_cv_onwards_func_mempcpy" in - future*) ac_cv_func_mempcpy=no ;; - *) ac_cv_func_mempcpy=$gl_cv_onwards_func_mempcpy ;; - esac - if test $ac_cv_func_mempcpy = yes; then -printf "%s\n" "#define HAVE_MEMPCPY 1" >>confdefs.h - fi - if test $ac_cv_func_mempcpy = no; then - HAVE_MEMPCPY=0 - case "$gl_cv_onwards_func_mempcpy" in - future*) REPLACE_MEMPCPY=1 ;; - esac - fi + gl_LIBOBJS="$gl_LIBOBJS mempcpy.$ac_objext" - if test $HAVE_MEMPCPY = 0 || test $REPLACE_MEMPCPY = 1; then - GL_COND_OBJ_MEMPCPY_TRUE= - GL_COND_OBJ_MEMPCPY_FALSE='#' -else - GL_COND_OBJ_MEMPCPY_TRUE='#' - GL_COND_OBJ_MEMPCPY_FALSE= -fi -: - if test -z "${GL_COND_OBJ_MEMPCPY_TRUE}" && test -z "${GL_COND_OBJ_MEMPCPY_FALSE}"; then - GL_COND_OBJ_MEMPCPY_TRUE='#' - GL_COND_OBJ_MEMPCPY_FALSE='#' + : + fi - if test -z "$GL_COND_OBJ_MEMPCPY_TRUE"; then : - : -fi + GNULIB_MEMPCPY=1 +printf "%s\n" "#define GNULIB_TEST_MEMPCPY 1" >>confdefs.h @@ -24319,51 +19774,31 @@ + if test $HAVE_MSVC_INVALID_PARAMETER_HANDLER = 1; then - GL_GNULIB_MEMPCPY=1 -printf "%s\n" "#define GNULIB_TEST_MEMPCPY 1" >>confdefs.h + gl_LIBOBJS="$gl_LIBOBJS msvc-inval.$ac_objext" + fi + if test $HAVE_MSVC_INVALID_PARAMETER_HANDLER = 1; then - if test $HAVE_MSVC_INVALID_PARAMETER_HANDLER = 1; then - GL_COND_OBJ_MSVC_INVAL_TRUE= - GL_COND_OBJ_MSVC_INVAL_FALSE='#' -else - GL_COND_OBJ_MSVC_INVAL_TRUE='#' - GL_COND_OBJ_MSVC_INVAL_FALSE= -fi -: - if test -z "${GL_COND_OBJ_MSVC_INVAL_TRUE}" && test -z "${GL_COND_OBJ_MSVC_INVAL_FALSE}"; then - GL_COND_OBJ_MSVC_INVAL_TRUE='#' - GL_COND_OBJ_MSVC_INVAL_FALSE='#' - fi - if test $HAVE_MSVC_INVALID_PARAMETER_HANDLER = 1; then - GL_COND_OBJ_MSVC_NOTHROW_TRUE= - GL_COND_OBJ_MSVC_NOTHROW_FALSE='#' -else - GL_COND_OBJ_MSVC_NOTHROW_TRUE='#' - GL_COND_OBJ_MSVC_NOTHROW_FALSE= -fi -: - if test -z "${GL_COND_OBJ_MSVC_NOTHROW_TRUE}" && test -z "${GL_COND_OBJ_MSVC_NOTHROW_FALSE}"; then - GL_COND_OBJ_MSVC_NOTHROW_TRUE='#' - GL_COND_OBJ_MSVC_NOTHROW_FALSE='#' - fi + gl_LIBOBJS="$gl_LIBOBJS msvc-nothrow.$ac_objext" + fi printf "%s\n" "#define GNULIB_MSVC_NOTHROW 1" >>confdefs.h @@ -24462,38 +19897,28 @@ + if test $REPLACE_OPEN = 1; then - if test $REPLACE_OPEN = 1; then - GL_COND_OBJ_OPEN_TRUE= - GL_COND_OBJ_OPEN_FALSE='#' -else - GL_COND_OBJ_OPEN_TRUE='#' - GL_COND_OBJ_OPEN_FALSE= -fi -: - if test -z "${GL_COND_OBJ_OPEN_TRUE}" && test -z "${GL_COND_OBJ_OPEN_FALSE}"; then - GL_COND_OBJ_OPEN_TRUE='#' - GL_COND_OBJ_OPEN_FALSE='#' - fi - if test -z "$GL_COND_OBJ_OPEN_TRUE"; then : - : -fi + + gl_LIBOBJS="$gl_LIBOBJS open.$ac_objext" + : + fi - GL_GNULIB_OPEN=1 + GNULIB_OPEN=1 @@ -25023,35 +20448,25 @@ fi + if test $HAVE_RAISE = 0 || test $REPLACE_RAISE = 1; then + - if test $HAVE_RAISE = 0 || test $REPLACE_RAISE = 1; then - GL_COND_OBJ_RAISE_TRUE= - GL_COND_OBJ_RAISE_FALSE='#' -else - GL_COND_OBJ_RAISE_TRUE='#' - GL_COND_OBJ_RAISE_FALSE= -fi -: - if test -z "${GL_COND_OBJ_RAISE_TRUE}" && test -z "${GL_COND_OBJ_RAISE_FALSE}"; then - GL_COND_OBJ_RAISE_TRUE='#' - GL_COND_OBJ_RAISE_FALSE='#' - fi - if test -z "$GL_COND_OBJ_RAISE_TRUE"; then : - : -fi + gl_LIBOBJS="$gl_LIBOBJS raise.$ac_objext" + : + fi - GL_GNULIB_RAISE=1 + GNULIB_RAISE=1 @@ -25076,25 +20491,7 @@ HAVE_RAWMEMCHR=0 fi - - if test $HAVE_RAWMEMCHR = 0; then - GL_COND_OBJ_RAWMEMCHR_TRUE= - GL_COND_OBJ_RAWMEMCHR_FALSE='#' -else - GL_COND_OBJ_RAWMEMCHR_TRUE='#' - GL_COND_OBJ_RAWMEMCHR_FALSE= -fi -: - if test -z "${GL_COND_OBJ_RAWMEMCHR_TRUE}" && test -z "${GL_COND_OBJ_RAWMEMCHR_FALSE}"; then - GL_COND_OBJ_RAWMEMCHR_TRUE='#' - GL_COND_OBJ_RAWMEMCHR_FALSE='#' - fi - - if test -z "$GL_COND_OBJ_RAWMEMCHR_TRUE"; then : - - : - -fi + if test $HAVE_RAWMEMCHR = 0; then @@ -25103,13 +20500,16 @@ + gl_LIBOBJS="$gl_LIBOBJS rawmemchr.$ac_objext" + : + fi - GL_GNULIB_RAWMEMCHR=1 + GNULIB_RAWMEMCHR=1 @@ -25129,35 +20529,25 @@ + if test $REPLACE_READ = 1; then - if test $REPLACE_READ = 1; then - GL_COND_OBJ_READ_TRUE= - GL_COND_OBJ_READ_FALSE='#' -else - GL_COND_OBJ_READ_TRUE='#' - GL_COND_OBJ_READ_FALSE= -fi -: - if test -z "${GL_COND_OBJ_READ_TRUE}" && test -z "${GL_COND_OBJ_READ_FALSE}"; then - GL_COND_OBJ_READ_TRUE='#' - GL_COND_OBJ_READ_FALSE='#' - fi - if test -z "$GL_COND_OBJ_READ_TRUE"; then : - : -fi + gl_LIBOBJS="$gl_LIBOBJS read.$ac_objext" + + : + fi - GL_GNULIB_READ=1 + GNULIB_READ=1 @@ -25217,9 +20607,6 @@ # Guess yes on Linux or glibc systems. linux-* | linux | *-gnu* | gnu*) gl_cv_func_readlink_trailing_slash="guessing yes" ;; - # Guess yes on systems that emulate the Linux system calls. - midipix*) - gl_cv_func_readlink_trailing_slash="guessing yes" ;; # Guess no on AIX or HP-UX. aix* | hpux*) gl_cv_func_readlink_trailing_slash="guessing no" ;; @@ -25284,9 +20671,6 @@ # Guess yes on Linux or glibc systems. linux-* | linux | *-gnu* | gnu*) gl_cv_func_readlink_truncate="guessing yes" ;; - # Guess yes on systems that emulate the Linux system calls. - midipix*) - gl_cv_func_readlink_truncate="guessing yes" ;; # Guess no on AIX or HP-UX. aix* | hpux*) gl_cv_func_readlink_truncate="guessing no" ;; @@ -25338,27 +20722,8 @@ esac fi + if test $HAVE_READLINK = 0 || test $REPLACE_READLINK = 1; then - if test $HAVE_READLINK = 0 || test $REPLACE_READLINK = 1; then - GL_COND_OBJ_READLINK_TRUE= - GL_COND_OBJ_READLINK_FALSE='#' -else - GL_COND_OBJ_READLINK_TRUE='#' - GL_COND_OBJ_READLINK_FALSE= -fi -: - if test -z "${GL_COND_OBJ_READLINK_TRUE}" && test -z "${GL_COND_OBJ_READLINK_FALSE}"; then - GL_COND_OBJ_READLINK_TRUE='#' - GL_COND_OBJ_READLINK_FALSE='#' - fi - - if test -z "$GL_COND_OBJ_READLINK_TRUE"; then : - - - : - - -fi @@ -25366,91 +20731,10 @@ + gl_LIBOBJS="$gl_LIBOBJS readlink.$ac_objext" - GL_GNULIB_READLINK=1 - - - - - -printf "%s\n" "#define GNULIB_TEST_READLINK 1" >>confdefs.h - - - - - - - if test $REPLACE_REALLOC_FOR_REALLOC_GNU = 0; then - - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether realloc (0, 0) returns nonnull" >&5 -printf %s "checking whether realloc (0, 0) returns nonnull... " >&6; } -if test ${ac_cv_func_realloc_0_nonnull+y} -then : - printf %s "(cached) " >&6 -else $as_nop - if test "$cross_compiling" = yes -then : - case "$host_os" in - # Guess yes on platforms where we know the result. - *-gnu* | freebsd* | netbsd* | openbsd* | bitrig* \ - | gnu* | *-musl* | midipix* | midnightbsd* \ - | hpux* | solaris* | cygwin* | mingw* | msys* ) - ac_cv_func_realloc_0_nonnull="guessing yes" ;; - # If we don't know, obey --enable-cross-guesses. - *) ac_cv_func_realloc_0_nonnull="$gl_cross_guess_normal" ;; - esac - -else $as_nop - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -#include - -int -main (void) -{ -void *p = realloc (0, 0); - int result = !p; - free (p); - return result; - ; - return 0; -} - -_ACEOF -if ac_fn_c_try_run "$LINENO" -then : - ac_cv_func_realloc_0_nonnull=yes -else $as_nop - ac_cv_func_realloc_0_nonnull=no -fi -rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ - conftest.$ac_objext conftest.beam conftest.$ac_ext -fi - - -fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_func_realloc_0_nonnull" >&5 -printf "%s\n" "$ac_cv_func_realloc_0_nonnull" >&6; } - case $ac_cv_func_realloc_0_nonnull in #( - *yes) : - ;; #( - *) : - REPLACE_REALLOC_FOR_REALLOC_GNU=1 ;; -esac - - fi - - if test $REPLACE_REALLOC_FOR_REALLOC_GNU = 1; then - - - - - - - - - gl_LIBOBJS="$gl_LIBOBJS realloc.$ac_objext" + : fi @@ -25458,28 +20742,28 @@ + GNULIB_READLINK=1 - GL_GNULIB_REALLOC_GNU=1 - - +printf "%s\n" "#define GNULIB_TEST_READLINK 1" >>confdefs.h -printf "%s\n" "#define GNULIB_TEST_REALLOC_GNU 1" >>confdefs.h + if test $gl_cv_func_malloc_posix = yes; then +printf "%s\n" "#define HAVE_REALLOC_POSIX 1" >>confdefs.h - if test $REPLACE_MALLOC_FOR_MALLOC_POSIX = 1; then - REPLACE_REALLOC_FOR_REALLOC_POSIX=1 + else + REPLACE_REALLOC=1 fi - if test $REPLACE_REALLOC_FOR_REALLOC_POSIX = 1; then + if test $REPLACE_REALLOC = 1; then @@ -25496,11 +20780,7 @@ - - - - - GL_GNULIB_REALLOC_POSIX=1 + GNULIB_REALLOC_POSIX=1 @@ -25512,127 +20792,7 @@ - - - - - - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for reallocarray" >&5 -printf %s "checking for reallocarray... " >&6; } -if test ${gl_cv_onwards_func_reallocarray+y} -then : - printf %s "(cached) " >&6 -else $as_nop - - exec 9>&6 6>/dev/null - - case "$host_os" in - - linux*-android*) - ac_fn_check_decl "$LINENO" "reallocarray" "ac_cv_have_decl_reallocarray" "#include -" "$ac_c_undeclared_builtin_options" "CFLAGS" -if test "x$ac_cv_have_decl_reallocarray" = xyes -then : - -fi - if test $ac_cv_have_decl_reallocarray = yes; then - ac_fn_c_check_func "$LINENO" "reallocarray" "ac_cv_func_reallocarray" -if test "x$ac_cv_func_reallocarray" = xyes -then : - -fi - - if test $ac_cv_func_reallocarray = yes; then - gl_cv_onwards_func_reallocarray=yes - else - gl_cv_onwards_func_reallocarray='future OS version' - fi - else - gl_cv_onwards_func_reallocarray='future OS version' - fi - ;; - - - *) - ac_fn_c_check_func "$LINENO" "reallocarray" "ac_cv_func_reallocarray" -if test "x$ac_cv_func_reallocarray" = xyes -then : - -fi - - gl_cv_onwards_func_reallocarray=$ac_cv_func_reallocarray - ;; - - esac - - exec 6>&9 9>&- - - -fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_onwards_func_reallocarray" >&5 -printf "%s\n" "$gl_cv_onwards_func_reallocarray" >&6; } - - case "$gl_cv_onwards_func_reallocarray" in - future*) ac_cv_func_reallocarray=no ;; - *) ac_cv_func_reallocarray=$gl_cv_onwards_func_reallocarray ;; - esac - if test $ac_cv_func_reallocarray = yes; then - -printf "%s\n" "#define HAVE_REALLOCARRAY 1" >>confdefs.h - - fi - - - if test "$ac_cv_func_reallocarray" = no; then - HAVE_REALLOCARRAY=0 - case "$gl_cv_onwards_func_reallocarray" in - future*) REPLACE_REALLOCARRAY=1 ;; - esac - elif test "$gl_cv_malloc_ptrdiff" = no; then - REPLACE_REALLOCARRAY=1 - fi - - - if test $HAVE_REALLOCARRAY = 0 || test $REPLACE_REALLOCARRAY = 1; then - GL_COND_OBJ_REALLOCARRAY_TRUE= - GL_COND_OBJ_REALLOCARRAY_FALSE='#' -else - GL_COND_OBJ_REALLOCARRAY_TRUE='#' - GL_COND_OBJ_REALLOCARRAY_FALSE= -fi -: - if test -z "${GL_COND_OBJ_REALLOCARRAY_TRUE}" && test -z "${GL_COND_OBJ_REALLOCARRAY_FALSE}"; then - GL_COND_OBJ_REALLOCARRAY_TRUE='#' - GL_COND_OBJ_REALLOCARRAY_FALSE='#' - fi - - if test -z "$GL_COND_OBJ_REALLOCARRAY_TRUE"; then : - - : - -fi - - -printf "%s\n" "#define GNULIB_REALLOCARRAY 1" >>confdefs.h - - - - - - - - - - - - GL_GNULIB_REALLOCARRAY=1 - - - - - -printf "%s\n" "#define GNULIB_TEST_REALLOCARRAY 1" >>confdefs.h - +printf "%s\n" "#define GNULIB_REALLOC_POSIX 1" >>confdefs.h @@ -25658,8 +20818,6 @@ case "$host_os" in # Guess yes on Linux systems. linux-* | linux) gl_cv_func_rename_slash_dst_works="guessing yes" ;; - # Guess yes on systems that emulate the Linux system calls. - midipix*) gl_cv_func_rename_slash_dst_works="guessing yes" ;; # Guess yes on glibc systems. *-gnu*) gl_cv_func_rename_slash_dst_works="guessing yes" ;; # Guess no on native Windows. @@ -25736,8 +20894,6 @@ case "$host_os" in # Guess yes on Linux systems. linux-* | linux) gl_cv_func_rename_slash_src_works="guessing yes" ;; - # Guess yes on systems that emulate the Linux system calls. - midipix*) gl_cv_func_rename_slash_src_works="guessing yes" ;; # Guess yes on glibc systems. *-gnu*) gl_cv_func_rename_slash_src_works="guessing yes" ;; # Guess yes on native Windows. @@ -25868,8 +21024,6 @@ case "$host_os" in # Guess yes on Linux systems. linux-* | linux) gl_cv_func_rename_link_works="guessing yes" ;; - # Guess yes on systems that emulate the Linux system calls. - midipix*) gl_cv_func_rename_link_works="guessing yes" ;; # Guess yes on glibc systems. *-gnu*) gl_cv_func_rename_link_works="guessing yes" ;; # Guess yes on native Windows. @@ -25963,19 +21117,8 @@ ;; esac + if test $REPLACE_RENAME = 1; then - if test $REPLACE_RENAME = 1; then - GL_COND_OBJ_RENAME_TRUE= - GL_COND_OBJ_RENAME_FALSE='#' -else - GL_COND_OBJ_RENAME_TRUE='#' - GL_COND_OBJ_RENAME_FALSE= -fi -: - if test -z "${GL_COND_OBJ_RENAME_TRUE}" && test -z "${GL_COND_OBJ_RENAME_FALSE}"; then - GL_COND_OBJ_RENAME_TRUE='#' - GL_COND_OBJ_RENAME_FALSE='#' - fi @@ -25983,10 +21126,15 @@ + gl_LIBOBJS="$gl_LIBOBJS rename.$ac_objext" + + fi + + - GL_GNULIB_RENAME=1 + GNULIB_RENAME=1 @@ -26012,8 +21160,6 @@ case "$host_os" in # Guess yes on Linux systems. linux-* | linux) gl_cv_func_rmdir_works="guessing yes" ;; - # Guess yes on systems that emulate the Linux system calls. - midipix*) gl_cv_func_rmdir_works="guessing yes" ;; # Guess yes on glibc systems. *-gnu* | gnu*) gl_cv_func_rmdir_works="guessing yes" ;; # Guess no on native Windows. @@ -26073,19 +21219,8 @@ ;; esac + if test $REPLACE_RMDIR = 1; then - if test $REPLACE_RMDIR = 1; then - GL_COND_OBJ_RMDIR_TRUE= - GL_COND_OBJ_RMDIR_FALSE='#' -else - GL_COND_OBJ_RMDIR_TRUE='#' - GL_COND_OBJ_RMDIR_FALSE= -fi -: - if test -z "${GL_COND_OBJ_RMDIR_TRUE}" && test -z "${GL_COND_OBJ_RMDIR_FALSE}"; then - GL_COND_OBJ_RMDIR_TRUE='#' - GL_COND_OBJ_RMDIR_FALSE='#' - fi @@ -26093,10 +21228,15 @@ + gl_LIBOBJS="$gl_LIBOBJS rmdir.$ac_objext" + + fi + + - GL_GNULIB_RMDIR=1 + GNULIB_RMDIR=1 @@ -26116,6 +21256,112 @@ + + if test $gl_cv_have_include_next = yes; then + gl_cv_next_signal_h='<'signal.h'>' + else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking absolute name of " >&5 +printf %s "checking absolute name of ... " >&6; } +if test ${gl_cv_next_signal_h+y} +then : + printf %s "(cached) " >&6 +else $as_nop + + + + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#include +_ACEOF + case "$host_os" in + aix*) gl_absname_cpp="$ac_cpp -C" ;; + *) gl_absname_cpp="$ac_cpp" ;; + esac + + case "$host_os" in + mingw*) + gl_dirsep_regex='[/\\]' + ;; + *) + gl_dirsep_regex='\/' + ;; + esac + gl_make_literal_regex_sed='s,[]$^\\.*/[],\\&,g' + gl_header_literal_regex=`echo 'signal.h' \ + | 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 + }' + + gl_cv_absolute_signal_h=`(eval "$gl_absname_cpp conftest.$ac_ext") 2>&5 | + sed -n "$gl_absolute_header_sed"` + + gl_header=$gl_cv_absolute_signal_h + gl_cv_next_signal_h='"'$gl_header'"' + + +fi +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_next_signal_h" >&5 +printf "%s\n" "$gl_cv_next_signal_h" >&6; } + fi + NEXT_SIGNAL_H=$gl_cv_next_signal_h + + if test $gl_cv_have_include_next = yes || test $gl_cv_have_include_next = buggy; then + # INCLUDE_NEXT_AS_FIRST_DIRECTIVE='include_next' + gl_next_as_first_directive='<'signal.h'>' + else + # INCLUDE_NEXT_AS_FIRST_DIRECTIVE='include' + gl_next_as_first_directive=$gl_cv_next_signal_h + fi + NEXT_AS_FIRST_DIRECTIVE_SIGNAL_H=$gl_next_as_first_directive + + + + + +# AIX declares sig_atomic_t to already include volatile, and C89 compilers +# then choke on 'volatile sig_atomic_t'. C99 requires that it compile. + ac_fn_c_check_type "$LINENO" "volatile sig_atomic_t" "ac_cv_type_volatile_sig_atomic_t" " +#include + +" +if test "x$ac_cv_type_volatile_sig_atomic_t" = xyes +then : + +else $as_nop + HAVE_TYPE_VOLATILE_SIG_ATOMIC_T=0 +fi + + + + + + + + ac_fn_c_check_type "$LINENO" "sighandler_t" "ac_cv_type_sighandler_t" " +#include + +" +if test "x$ac_cv_type_sighandler_t" = xyes +then : + +else $as_nop + HAVE_SIGHANDLER_T=0 +fi + + + + + + + + + + + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for signbit macro" >&5 printf %s "checking for signbit macro... " >&6; } if test ${gl_cv_func_signbit+y} @@ -26126,14 +21372,14 @@ if test "$cross_compiling" = yes then : case "$host_os" in - # Guess yes on glibc systems. - *-gnu* | gnu*) gl_cv_func_signbit="guessing yes" ;; - # Guess yes on musl systems. - *-musl* | midipix*) gl_cv_func_signbit="guessing yes" ;; - # Guess yes on native Windows. - mingw*) gl_cv_func_signbit="guessing yes" ;; - # If we don't know, obey --enable-cross-guesses. - *) gl_cv_func_signbit="$gl_cross_guess_normal" ;; + # Guess yes on glibc systems. + *-gnu* | gnu*) gl_cv_func_signbit="guessing yes" ;; + # Guess yes on musl systems. + *-musl*) gl_cv_func_signbit="guessing yes" ;; + # Guess yes on native Windows. + mingw*) gl_cv_func_signbit="guessing yes" ;; + # If we don't know, obey --enable-cross-guesses. + *) gl_cv_func_signbit="$gl_cross_guess_normal" ;; esac else $as_nop @@ -26251,19 +21497,19 @@ if test "$cross_compiling" = yes then : case "$host_os" in - # Guess yes on glibc systems. - *-gnu* | gnu*) gl_cv_func_signbit_builtins="guessing yes" ;; - # Guess yes on musl systems. - *-musl* | midipix*) gl_cv_func_signbit_builtins="guessing yes" ;; - # Guess yes on mingw, no on MSVC. - mingw*) if test -n "$GCC"; then - gl_cv_func_signbit_builtins="guessing yes" - else - gl_cv_func_signbit_builtins="guessing no" - fi - ;; - # If we don't know, obey --enable-cross-guesses. - *) gl_cv_func_signbit_builtins="$gl_cross_guess_normal" ;; + # Guess yes on glibc systems. + *-gnu* | gnu*) gl_cv_func_signbit_builtins="guessing yes" ;; + # Guess yes on musl systems. + *-musl*) gl_cv_func_signbit_builtins="guessing yes" ;; + # Guess yes on mingw, no on MSVC. + mingw*) if test -n "$GCC"; then + gl_cv_func_signbit_builtins="guessing yes" + else + gl_cv_func_signbit_builtins="guessing no" + fi + ;; + # If we don't know, obey --enable-cross-guesses. + *) gl_cv_func_signbit_builtins="$gl_cross_guess_normal" ;; esac else $as_nop @@ -26857,30 +22103,44 @@ fi fi + if test $REPLACE_SIGNBIT = 1; then + - if test $REPLACE_SIGNBIT = 1; then - GL_COND_OBJ_SIGNBIT3_TRUE= - GL_COND_OBJ_SIGNBIT3_FALSE='#' -else - GL_COND_OBJ_SIGNBIT3_TRUE='#' - GL_COND_OBJ_SIGNBIT3_FALSE= -fi -: - if test -z "${GL_COND_OBJ_SIGNBIT3_TRUE}" && test -z "${GL_COND_OBJ_SIGNBIT3_FALSE}"; then - GL_COND_OBJ_SIGNBIT3_TRUE='#' - GL_COND_OBJ_SIGNBIT3_FALSE='#' - fi + gl_LIBOBJS="$gl_LIBOBJS signbitf.$ac_objext" - GL_GNULIB_SIGNBIT=1 + + + + + + gl_LIBOBJS="$gl_LIBOBJS signbitd.$ac_objext" + + + + + + + + + + gl_LIBOBJS="$gl_LIBOBJS signbitl.$ac_objext" + + fi + + + + + + GNULIB_SIGNBIT=1 @@ -26985,12 +22245,83 @@ - if test $gl_cv_func_sprintf_posix = no; then + + + + + + + + + gl_cv_func_sprintf_posix=no + case "$gl_cv_func_printf_sizes_c99" in + *yes) + case "$gl_cv_func_printf_long_double" in + *yes) + case "$gl_cv_func_printf_infinite" in + *yes) + case "$gl_cv_func_printf_infinite_long_double" in + *yes) + case "$gl_cv_func_printf_directive_a" in + *yes) + case "$gl_cv_func_printf_directive_f" in + *yes) + case "$gl_cv_func_printf_directive_n" in + *yes) + case "$gl_cv_func_printf_directive_ls" in + *yes) + case "$gl_cv_func_printf_positions" in + *yes) + case "$gl_cv_func_printf_flag_grouping" in + *yes) + case "$gl_cv_func_printf_flag_leftadjust" in + *yes) + case "$gl_cv_func_printf_flag_zero" in + *yes) + case "$gl_cv_func_printf_precision" in + *yes) + case "$gl_cv_func_printf_enomem" in + *yes) + # sprintf exists and is + # already POSIX compliant. + gl_cv_func_sprintf_posix=yes + ;; + esac + ;; + esac + ;; + esac + ;; + esac + ;; + esac + ;; + esac + ;; + esac + ;; + esac + ;; + esac + ;; + esac + ;; + esac + ;; + esac + ;; + esac + ;; + esac + if test $gl_cv_func_sprintf_posix = no; then + + + case "$gl_cv_func_printf_infinite" in *yes) ;; @@ -27027,86 +22358,13 @@ printf "%s\n" "#define NEED_PRINTF_DIRECTIVE_A 1" >>confdefs.h - - - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for nl_langinfo" >&5 -printf %s "checking for nl_langinfo... " >&6; } -if test ${gl_cv_onwards_func_nl_langinfo+y} -then : - printf %s "(cached) " >&6 -else $as_nop - - exec 9>&6 6>/dev/null - - case "$host_os" in - - linux*-android*) - ac_fn_check_decl "$LINENO" "nl_langinfo" "ac_cv_have_decl_nl_langinfo" "#include -" "$ac_c_undeclared_builtin_options" "CFLAGS" -if test "x$ac_cv_have_decl_nl_langinfo" = xyes -then : - -fi - if test $ac_cv_have_decl_nl_langinfo = yes; then - ac_fn_c_check_func "$LINENO" "nl_langinfo" "ac_cv_func_nl_langinfo" + ac_fn_c_check_func "$LINENO" "nl_langinfo" "ac_cv_func_nl_langinfo" if test "x$ac_cv_func_nl_langinfo" = xyes then : + printf "%s\n" "#define HAVE_NL_LANGINFO 1" >>confdefs.h fi - if test $ac_cv_func_nl_langinfo = yes; then - gl_cv_onwards_func_nl_langinfo=yes - else - gl_cv_onwards_func_nl_langinfo='future OS version' - fi - else - gl_cv_onwards_func_nl_langinfo='future OS version' - fi - ;; - - - *) - ac_fn_c_check_func "$LINENO" "nl_langinfo" "ac_cv_func_nl_langinfo" -if test "x$ac_cv_func_nl_langinfo" = xyes -then : - -fi - - gl_cv_onwards_func_nl_langinfo=$ac_cv_func_nl_langinfo - ;; - - esac - - exec 6>&9 9>&- - - -fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_onwards_func_nl_langinfo" >&5 -printf "%s\n" "$gl_cv_onwards_func_nl_langinfo" >&6; } - - case "$gl_cv_onwards_func_nl_langinfo" in - future*) ac_cv_func_nl_langinfo=no ;; - *) ac_cv_func_nl_langinfo=$gl_cv_onwards_func_nl_langinfo ;; - esac - if test $ac_cv_func_nl_langinfo = yes; then - -printf "%s\n" "#define HAVE_NL_LANGINFO 1" >>confdefs.h - - fi - - - ;; - esac - - - - case "$gl_cv_func_printf_directive_b" in - *yes) - ;; - *) - -printf "%s\n" "#define NEED_PRINTF_DIRECTIVE_B 1" >>confdefs.h - ;; esac @@ -27136,18 +22394,6 @@ - case "$gl_cv_func_printf_directive_lc" in - *yes) - ;; - *) - -printf "%s\n" "#define NEED_PRINTF_DIRECTIVE_LC 1" >>confdefs.h - - ;; - esac - - - case "$gl_cv_func_printf_flag_grouping" in *yes) ;; @@ -27228,7 +22474,6 @@ - gl_LIBOBJS="$gl_LIBOBJS vasnprintf.$ac_objext" @@ -27314,11 +22559,7 @@ - - - - - GL_GNULIB_SPRINTF_POSIX=1 + GNULIB_SPRINTF_POSIX=1 @@ -27331,7 +22572,7 @@ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for ssize_t" >&5 printf %s "checking for ssize_t... " >&6; } -if test ${gl_cv_ssize_t+y} +if test ${gt_cv_ssize_t+y} then : printf %s "(cached) " >&6 else $as_nop @@ -27349,51 +22590,17 @@ _ACEOF if ac_fn_c_try_compile "$LINENO" then : - gl_cv_ssize_t=yes + gt_cv_ssize_t=yes else $as_nop - gl_cv_ssize_t=no + gt_cv_ssize_t=no fi rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_ssize_t" >&5 -printf "%s\n" "$gl_cv_ssize_t" >&6; } - if test $gl_cv_ssize_t = no; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether size_t is wider than 'long'" >&5 -printf %s "checking whether size_t is wider than 'long'... " >&6; } -if test ${gl_cv_size_t_large+y} -then : - printf %s "(cached) " >&6 -else $as_nop - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -#include - typedef int array [2 * (sizeof (size_t) > sizeof (long)) - 1]; +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gt_cv_ssize_t" >&5 +printf "%s\n" "$gt_cv_ssize_t" >&6; } + if test $gt_cv_ssize_t = no; then -int -main (void) -{ - - ; - return 0; -} -_ACEOF -if ac_fn_c_try_compile "$LINENO" -then : - gl_cv_size_t_large=yes -else $as_nop - gl_cv_size_t_large=no -fi -rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext -fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_size_t_large" >&5 -printf "%s\n" "$gl_cv_size_t_large" >&6; } - if test $gl_cv_size_t_large = yes; then - gl_def_ssize_t='long long' - else - gl_def_ssize_t='long' - fi - -printf "%s\n" "#define ssize_t $gl_def_ssize_t" >>confdefs.h +printf "%s\n" "#define ssize_t int" >>confdefs.h fi @@ -27422,8 +22629,6 @@ case "$host_os" in # Guess yes on Linux systems. linux-* | linux) gl_cv_func_stat_file_slash="guessing yes" ;; - # Guess yes on systems that emulate the Linux system calls. - midipix*) gl_cv_func_stat_file_slash="guessing yes" ;; # Guess yes on glibc systems. *-gnu* | gnu*) gl_cv_func_stat_file_slash="guessing yes" ;; # If we don't know, obey --enable-cross-guesses. @@ -27480,21 +22685,16 @@ ;; esac + if test $REPLACE_STAT = 1; then + + - if test $REPLACE_STAT = 1; then - GL_COND_OBJ_STAT_TRUE= - GL_COND_OBJ_STAT_FALSE='#' -else - GL_COND_OBJ_STAT_TRUE='#' - GL_COND_OBJ_STAT_FALSE= -fi -: - if test -z "${GL_COND_OBJ_STAT_TRUE}" && test -z "${GL_COND_OBJ_STAT_FALSE}"; then - GL_COND_OBJ_STAT_TRUE='#' - GL_COND_OBJ_STAT_FALSE='#' - fi - if test -z "$GL_COND_OBJ_STAT_TRUE"; then : + + + + + gl_LIBOBJS="$gl_LIBOBJS stat.$ac_objext" case "$host_os" in mingw*) @@ -27515,18 +22715,13 @@ : - -fi - - - - + fi - GL_GNULIB_STAT=1 + GNULIB_STAT=1 @@ -27670,73 +22865,39 @@ - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for bool, true, false" >&5 -printf %s "checking for bool, true, false... " >&6; } -if test ${gl_cv_c_bool+y} -then : - printf %s "(cached) " >&6 -else $as_nop - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ - - #if true == false - #error "true == false" - #endif - extern bool b; - bool b = true == false; -_ACEOF -if ac_fn_c_try_compile "$LINENO" -then : - gl_cv_c_bool=yes -else $as_nop - gl_cv_c_bool=no -fi -rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext -fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_c_bool" >&5 -printf "%s\n" "$gl_cv_c_bool" >&6; } - if test "$gl_cv_c_bool" = yes; then - -printf "%s\n" "#define HAVE_C_BOOL 1" >>confdefs.h - - fi - - - - if test $ac_cv_header_stdckdint_h = yes; then - GL_GENERATE_STDCKDINT_H=false + if test "$ac_cv_header_stdbool_h" = yes; then + case "$host_os" in + solaris*) + if test -z "$GCC"; then + STDBOOL_H='stdbool.h' + else + STDBOOL_H='' + fi + ;; + *) + STDBOOL_H='' + ;; + esac else - GL_GENERATE_STDCKDINT_H=true + STDBOOL_H='stdbool.h' fi - - - - case "$GL_GENERATE_STDCKDINT_H" in - false) STDCKDINT_H='' ;; - true) - if test -z "$STDCKDINT_H"; then - STDCKDINT_H="${gl_source_base_prefix}stdckdint.h" - fi - ;; - *) echo "*** GL_GENERATE_STDCKDINT_H is not set correctly" 1>&2; exit 1 ;; - esac - - - if $GL_GENERATE_STDCKDINT_H; then - GL_GENERATE_STDCKDINT_H_TRUE= - GL_GENERATE_STDCKDINT_H_FALSE='#' + if test -n "$STDBOOL_H"; then + GL_GENERATE_STDBOOL_H_TRUE= + GL_GENERATE_STDBOOL_H_FALSE='#' else - GL_GENERATE_STDCKDINT_H_TRUE='#' - GL_GENERATE_STDCKDINT_H_FALSE= + GL_GENERATE_STDBOOL_H_TRUE='#' + GL_GENERATE_STDBOOL_H_FALSE= fi -: - if test -z "${GL_GENERATE_STDCKDINT_H_TRUE}" && test -z "${GL_GENERATE_STDCKDINT_H_FALSE}"; then - GL_GENERATE_STDCKDINT_H_TRUE='#' - GL_GENERATE_STDCKDINT_H_FALSE='#' + + + if test "$ac_cv_type__Bool" = yes; then + HAVE__BOOL=1 + else + HAVE__BOOL=0 fi @@ -27746,39 +22907,103 @@ + STDDEF_H= + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for good max_align_t" >&5 +printf %s "checking for good max_align_t... " >&6; } +if test ${gl_cv_type_max_align_t+y} +then : + printf %s "(cached) " >&6 +else $as_nop + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#include + unsigned int s = sizeof (max_align_t); + #if defined __GNUC__ || defined __clang__ || defined __IBM__ALIGNOF__ + int check1[2 * (__alignof__ (double) <= __alignof__ (max_align_t)) - 1]; + int check2[2 * (__alignof__ (long double) <= __alignof__ (max_align_t)) - 1]; + #endif + typedef struct { char a; max_align_t b; } max_helper; + typedef struct { char a; long b; } long_helper; + typedef struct { char a; double b; } double_helper; + typedef struct { char a; long double b; } long_double_helper; + int check3[2 * (offsetof (long_helper, b) <= offsetof (max_helper, b)) - 1]; + int check4[2 * (offsetof (double_helper, b) <= offsetof (max_helper, b)) - 1]; + int check5[2 * (offsetof (long_double_helper, b) <= offsetof (max_helper, b)) - 1]; +int +main (void) +{ + ; + return 0; +} +_ACEOF +if ac_fn_c_try_compile "$LINENO" +then : + gl_cv_type_max_align_t=yes +else $as_nop + gl_cv_type_max_align_t=no +fi +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext +fi +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_type_max_align_t" >&5 +printf "%s\n" "$gl_cv_type_max_align_t" >&6; } + if test $gl_cv_type_max_align_t = no; then + HAVE_MAX_ALIGN_T=0 + STDDEF_H=stddef.h + fi + if test $gt_cv_c_wchar_t = no; then + HAVE_WCHAR_T=0 + STDDEF_H=stddef.h + fi + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether NULL can be used in arbitrary expressions" >&5 +printf %s "checking whether NULL can be used in arbitrary expressions... " >&6; } +if test ${gl_cv_decl_null_works+y} +then : + printf %s "(cached) " >&6 +else $as_nop + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#include + int test[2 * (sizeof NULL == sizeof (void *)) -1]; +int +main (void) +{ - case "$GL_GENERATE_STDDEF_H" in - false) STDDEF_H='' ;; - true) - if test -z "$STDDEF_H"; then - STDDEF_H="${gl_source_base_prefix}stddef.h" - fi - ;; - *) echo "*** GL_GENERATE_STDDEF_H is not set correctly" 1>&2; exit 1 ;; - esac + ; + return 0; +} +_ACEOF +if ac_fn_c_try_compile "$LINENO" +then : + gl_cv_decl_null_works=yes +else $as_nop + gl_cv_decl_null_works=no +fi +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext +fi +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_decl_null_works" >&5 +printf "%s\n" "$gl_cv_decl_null_works" >&6; } + if test $gl_cv_decl_null_works = no; then + REPLACE_NULL=1 + STDDEF_H=stddef.h + fi - if $GL_GENERATE_STDDEF_H; then + if test -n "$STDDEF_H"; then GL_GENERATE_STDDEF_H_TRUE= GL_GENERATE_STDDEF_H_FALSE='#' else GL_GENERATE_STDDEF_H_TRUE='#' GL_GENERATE_STDDEF_H_FALSE= fi -: - if test -z "${GL_GENERATE_STDDEF_H_TRUE}" && test -z "${GL_GENERATE_STDDEF_H_FALSE}"; then - GL_GENERATE_STDDEF_H_TRUE='#' - GL_GENERATE_STDDEF_H_FALSE='#' - fi - + if test -n "$STDDEF_H"; then @@ -27787,151 +23012,224 @@ - - case "$GL_GENERATE_STDINT_H" in - false) STDINT_H='' ;; - true) - if test -z "$STDINT_H"; then - STDINT_H="${gl_source_base_prefix}stdint.h" - fi - ;; - *) echo "*** GL_GENERATE_STDINT_H is not set correctly" 1>&2; exit 1 ;; - esac - - - if $GL_GENERATE_STDINT_H; then - GL_GENERATE_STDINT_H_TRUE= - GL_GENERATE_STDINT_H_FALSE='#' -else - GL_GENERATE_STDINT_H_TRUE='#' - GL_GENERATE_STDINT_H_FALSE= -fi -: - if test -z "${GL_GENERATE_STDINT_H_TRUE}" && test -z "${GL_GENERATE_STDINT_H_FALSE}"; then - GL_GENERATE_STDINT_H_TRUE='#' - GL_GENERATE_STDINT_H_FALSE='#' - fi - - - - - + if test $gl_cv_have_include_next = yes; then + gl_cv_next_stddef_h='<'stddef.h'>' + else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking absolute name of " >&5 +printf %s "checking absolute name of ... " >&6; } +if test ${gl_cv_next_stddef_h+y} +then : + printf %s "(cached) " >&6 +else $as_nop + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#include +_ACEOF + case "$host_os" in + aix*) gl_absname_cpp="$ac_cpp -C" ;; + *) gl_absname_cpp="$ac_cpp" ;; + esac - case "$GL_GENERATE_LIMITS_H" in - false) LIMITS_H='' ;; - true) - if test -z "$LIMITS_H"; then - LIMITS_H="${gl_source_base_prefix}limits.h" - fi + case "$host_os" in + mingw*) + gl_dirsep_regex='[/\\]' + ;; + *) + gl_dirsep_regex='\/' ;; - *) echo "*** GL_GENERATE_LIMITS_H is not set correctly" 1>&2; exit 1 ;; esac + gl_make_literal_regex_sed='s,[]$^\\.*/[],\\&,g' + gl_header_literal_regex=`echo 'stddef.h' \ + | 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 + }' + gl_cv_absolute_stddef_h=`(eval "$gl_absname_cpp conftest.$ac_ext") 2>&5 | + sed -n "$gl_absolute_header_sed"` - if $GL_GENERATE_LIMITS_H; then - GL_GENERATE_LIMITS_H_TRUE= - GL_GENERATE_LIMITS_H_FALSE='#' -else - GL_GENERATE_LIMITS_H_TRUE='#' - GL_GENERATE_LIMITS_H_FALSE= -fi -: - if test -z "${GL_GENERATE_LIMITS_H_TRUE}" && test -z "${GL_GENERATE_LIMITS_H_FALSE}"; then - GL_GENERATE_LIMITS_H_TRUE='#' - GL_GENERATE_LIMITS_H_FALSE='#' - fi - - - - - - - - - + gl_header=$gl_cv_absolute_stddef_h + gl_cv_next_stddef_h='"'$gl_header'"' +fi +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_next_stddef_h" >&5 +printf "%s\n" "$gl_cv_next_stddef_h" >&6; } + fi + NEXT_STDDEF_H=$gl_cv_next_stddef_h + if test $gl_cv_have_include_next = yes || test $gl_cv_have_include_next = buggy; then + # INCLUDE_NEXT_AS_FIRST_DIRECTIVE='include_next' + gl_next_as_first_directive='<'stddef.h'>' + else + # INCLUDE_NEXT_AS_FIRST_DIRECTIVE='include' + gl_next_as_first_directive=$gl_cv_next_stddef_h + fi + NEXT_AS_FIRST_DIRECTIVE_STDDEF_H=$gl_next_as_first_directive - if test $REPLACE_STDIO_READ_FUNCS = 1; then - GL_COND_OBJ_STDIO_READ_TRUE= - GL_COND_OBJ_STDIO_READ_FALSE='#' -else - GL_COND_OBJ_STDIO_READ_TRUE='#' - GL_COND_OBJ_STDIO_READ_FALSE= -fi -: - if test -z "${GL_COND_OBJ_STDIO_READ_TRUE}" && test -z "${GL_COND_OBJ_STDIO_READ_FALSE}"; then - GL_COND_OBJ_STDIO_READ_TRUE='#' - GL_COND_OBJ_STDIO_READ_FALSE='#' - fi - if test $REPLACE_STDIO_WRITE_FUNCS = 1; then - GL_COND_OBJ_STDIO_WRITE_TRUE= - GL_COND_OBJ_STDIO_WRITE_FALSE='#' -else - GL_COND_OBJ_STDIO_WRITE_TRUE='#' - GL_COND_OBJ_STDIO_WRITE_FALSE= -fi -: - if test -z "${GL_COND_OBJ_STDIO_WRITE_TRUE}" && test -z "${GL_COND_OBJ_STDIO_WRITE_FALSE}"; then - GL_COND_OBJ_STDIO_WRITE_TRUE='#' - GL_COND_OBJ_STDIO_WRITE_FALSE='#' fi + printf "%s\n" "#define __USE_MINGW_ANSI_STDIO 1" >>confdefs.h - GL_GNULIB_FSCANF=1 - -printf "%s\n" "#define GNULIB_TEST_FSCANF 1" >>confdefs.h + if test $gl_cv_have_include_next = yes; then + gl_cv_next_stdio_h='<'stdio.h'>' + else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking absolute name of " >&5 +printf %s "checking absolute name of ... " >&6; } +if test ${gl_cv_next_stdio_h+y} +then : + printf %s "(cached) " >&6 +else $as_nop + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#include +_ACEOF + case "$host_os" in + aix*) gl_absname_cpp="$ac_cpp -C" ;; + *) gl_absname_cpp="$ac_cpp" ;; + esac + case "$host_os" in + mingw*) + gl_dirsep_regex='[/\\]' + ;; + *) + gl_dirsep_regex='\/' + ;; + esac + gl_make_literal_regex_sed='s,[]$^\\.*/[],\\&,g' + gl_header_literal_regex=`echo 'stdio.h' \ + | 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 + }' -printf "%s\n" "#define GNULIB_FSCANF 1" >>confdefs.h + gl_cv_absolute_stdio_h=`(eval "$gl_absname_cpp conftest.$ac_ext") 2>&5 | + sed -n "$gl_absolute_header_sed"` + gl_header=$gl_cv_absolute_stdio_h + gl_cv_next_stdio_h='"'$gl_header'"' +fi +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_next_stdio_h" >&5 +printf "%s\n" "$gl_cv_next_stdio_h" >&6; } + fi + NEXT_STDIO_H=$gl_cv_next_stdio_h + if test $gl_cv_have_include_next = yes || test $gl_cv_have_include_next = buggy; then + # INCLUDE_NEXT_AS_FIRST_DIRECTIVE='include_next' + gl_next_as_first_directive='<'stdio.h'>' + else + # INCLUDE_NEXT_AS_FIRST_DIRECTIVE='include' + gl_next_as_first_directive=$gl_cv_next_stdio_h + fi + NEXT_AS_FIRST_DIRECTIVE_STDIO_H=$gl_next_as_first_directive + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking which flavor of printf attribute matches inttypes macros" >&5 +printf %s "checking which flavor of printf attribute matches inttypes macros... " >&6; } +if test ${gl_cv_func_printf_attribute_flavor+y} +then : + printf %s "(cached) " >&6 +else $as_nop + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + #define __STDC_FORMAT_MACROS 1 + #include + #include + /* For non-mingw systems, compilation will trivially succeed. + For mingw, compilation will succeed for older mingw (system + printf, "I64d") and fail for newer mingw (gnu printf, "lld"). */ + #if (defined _WIN32 && ! defined __CYGWIN__) && \ + (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 4)) + extern char PRIdMAX_probe[sizeof PRIdMAX == sizeof "I64d" ? 1 : -1]; + #endif - GL_GNULIB_SCANF=1 +int +main (void) +{ + ; + return 0; +} +_ACEOF +if ac_fn_c_try_compile "$LINENO" +then : + gl_cv_func_printf_attribute_flavor=system +else $as_nop + gl_cv_func_printf_attribute_flavor=gnu +fi +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext +fi +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_printf_attribute_flavor" >&5 +printf "%s\n" "$gl_cv_func_printf_attribute_flavor" >&6; } + if test "$gl_cv_func_printf_attribute_flavor" = gnu; then +printf "%s\n" "#define GNULIB_PRINTF_ATTRIBUTE_FLAVOR_GNU 1" >>confdefs.h + fi + GNULIB_FSCANF=1 -printf "%s\n" "#define GNULIB_TEST_SCANF 1" >>confdefs.h +printf "%s\n" "#define GNULIB_FSCANF 1" >>confdefs.h + GNULIB_SCANF=1 printf "%s\n" "#define GNULIB_SCANF 1" >>confdefs.h + GNULIB_FGETC=1 + GNULIB_GETC=1 + GNULIB_GETCHAR=1 + GNULIB_FGETS=1 + GNULIB_FREAD=1 + + + 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 @@ -27941,279 +23239,86 @@ - GL_GNULIB_FGETC=1 - - - - - -printf "%s\n" "#define GNULIB_TEST_FGETC 1" >>confdefs.h - - - - - - - - - - - - - GL_GNULIB_GETC=1 - - - - - -printf "%s\n" "#define GNULIB_TEST_GETC 1" >>confdefs.h - - - - - - - - - - - - - GL_GNULIB_GETCHAR=1 - - - - - -printf "%s\n" "#define GNULIB_TEST_GETCHAR 1" >>confdefs.h - - - - - - - - - - - - - GL_GNULIB_FGETS=1 - - - - - -printf "%s\n" "#define GNULIB_TEST_FGETS 1" >>confdefs.h - - - - - - - - - - - - - GL_GNULIB_FREAD=1 - - - - - -printf "%s\n" "#define GNULIB_TEST_FREAD 1" >>confdefs.h - - - - - - - - - - - - - GL_GNULIB_FPRINTF=1 - - - - - -printf "%s\n" "#define GNULIB_TEST_FPRINTF 1" >>confdefs.h - - - - - - - - - - - - - GL_GNULIB_PRINTF=1 - - - - - -printf "%s\n" "#define GNULIB_TEST_PRINTF 1" >>confdefs.h - - - - - - - - - - - - - GL_GNULIB_VFPRINTF=1 - - - - - -printf "%s\n" "#define GNULIB_TEST_VFPRINTF 1" >>confdefs.h - - - - - - - - - - - - - GL_GNULIB_VPRINTF=1 - - - - - -printf "%s\n" "#define GNULIB_TEST_VPRINTF 1" >>confdefs.h - - - - - - - - - - - - - GL_GNULIB_FPUTC=1 - - - - - -printf "%s\n" "#define GNULIB_TEST_FPUTC 1" >>confdefs.h - - - - - - - - - - - - - GL_GNULIB_PUTC=1 - - - - - -printf "%s\n" "#define GNULIB_TEST_PUTC 1" >>confdefs.h - - - - - - - - - - - - - GL_GNULIB_PUTCHAR=1 - - - - - -printf "%s\n" "#define GNULIB_TEST_PUTCHAR 1" >>confdefs.h - - - - - - - - - - - - - GL_GNULIB_FPUTS=1 - - - - - -printf "%s\n" "#define GNULIB_TEST_FPUTS 1" >>confdefs.h - - - - - - - - + if test $ac_cv_have_decl_fcloseall = no; then + HAVE_DECL_FCLOSEALL=0 + fi - GL_GNULIB_PUTS=1 -printf "%s\n" "#define GNULIB_TEST_PUTS 1" >>confdefs.h + if test $gl_cv_have_include_next = yes; then + gl_cv_next_stdlib_h='<'stdlib.h'>' + else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking absolute name of " >&5 +printf %s "checking absolute name of ... " >&6; } +if test ${gl_cv_next_stdlib_h+y} +then : + printf %s "(cached) " >&6 +else $as_nop + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#include +_ACEOF + case "$host_os" in + aix*) gl_absname_cpp="$ac_cpp -C" ;; + *) gl_absname_cpp="$ac_cpp" ;; + esac + case "$host_os" in + mingw*) + gl_dirsep_regex='[/\\]' + ;; + *) + gl_dirsep_regex='\/' + ;; + esac + gl_make_literal_regex_sed='s,[]$^\\.*/[],\\&,g' + gl_header_literal_regex=`echo 'stdlib.h' \ + | 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 + }' + gl_cv_absolute_stdlib_h=`(eval "$gl_absname_cpp conftest.$ac_ext") 2>&5 | + sed -n "$gl_absolute_header_sed"` + gl_header=$gl_cv_absolute_stdlib_h + gl_cv_next_stdlib_h='"'$gl_header'"' +fi +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_next_stdlib_h" >&5 +printf "%s\n" "$gl_cv_next_stdlib_h" >&6; } + fi + NEXT_STDLIB_H=$gl_cv_next_stdlib_h - GL_GNULIB_FWRITE=1 + if test $gl_cv_have_include_next = yes || test $gl_cv_have_include_next = buggy; then + # INCLUDE_NEXT_AS_FIRST_DIRECTIVE='include_next' + gl_next_as_first_directive='<'stdlib.h'>' + else + # INCLUDE_NEXT_AS_FIRST_DIRECTIVE='include' + gl_next_as_first_directive=$gl_cv_next_stdlib_h + fi + NEXT_AS_FIRST_DIRECTIVE_STDLIB_H=$gl_next_as_first_directive -printf "%s\n" "#define GNULIB_TEST_FWRITE 1" >>confdefs.h @@ -28221,8 +23326,17 @@ + if test $ac_cv_have_decl_ecvt = no; then + HAVE_DECL_ECVT=0 + fi + if test $ac_cv_have_decl_fcvt = no; then + HAVE_DECL_FCVT=0 + fi + if test $ac_cv_have_decl_gcvt = no; then + HAVE_DECL_GCVT=0 + fi @@ -28235,25 +23349,7 @@ HAVE_DECL_STRDUP=0 fi - - if test $REPLACE_STRDUP = 1; then - GL_COND_OBJ_STRDUP_TRUE= - GL_COND_OBJ_STRDUP_FALSE='#' -else - GL_COND_OBJ_STRDUP_TRUE='#' - GL_COND_OBJ_STRDUP_FALSE= -fi -: - if test -z "${GL_COND_OBJ_STRDUP_TRUE}" && test -z "${GL_COND_OBJ_STRDUP_FALSE}"; then - GL_COND_OBJ_STRDUP_TRUE='#' - GL_COND_OBJ_STRDUP_FALSE='#' - fi - - if test -z "$GL_COND_OBJ_STRDUP_TRUE"; then : - - : - -fi + if test $REPLACE_STRDUP = 1; then @@ -28262,13 +23358,16 @@ + gl_LIBOBJS="$gl_LIBOBJS strdup.$ac_objext" + : + fi - GL_GNULIB_STRDUP=1 + GNULIB_STRDUP=1 @@ -28283,7 +23382,7 @@ - if test "$GL_GENERATE_ERRNO_H:$REPLACE_STRERROR_0" = false:0; then + if test "$ERRNO_H:$REPLACE_STRERROR_0" = :0; then { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for working strerror function" >&5 printf %s "checking for working strerror function... " >&6; } if test ${gl_cv_func_working_strerror+y} @@ -28293,12 +23392,12 @@ if test "$cross_compiling" = yes then : case "$host_os" in - # Guess yes on glibc systems. - *-gnu* | gnu*) gl_cv_func_working_strerror="guessing yes" ;; - # Guess yes on musl systems. - *-musl* | midipix*) gl_cv_func_working_strerror="guessing yes" ;; - # If we don't know, obey --enable-cross-guesses. - *) gl_cv_func_working_strerror="$gl_cross_guess_normal" ;; + # Guess yes on glibc systems. + *-gnu* | gnu*) gl_cv_func_working_strerror="guessing yes" ;; + # Guess yes on musl systems. + *-musl*) gl_cv_func_working_strerror="guessing yes" ;; + # If we don't know, obey --enable-cross-guesses. + *) gl_cv_func_working_strerror="$gl_cross_guess_normal" ;; esac else $as_nop @@ -28339,30 +23438,21 @@ REPLACE_STRERROR=1 fi + if test $REPLACE_STRERROR = 1; then - if test $REPLACE_STRERROR = 1; then - GL_COND_OBJ_STRERROR_TRUE= - GL_COND_OBJ_STRERROR_FALSE='#' -else - GL_COND_OBJ_STRERROR_TRUE='#' - GL_COND_OBJ_STRERROR_FALSE= -fi -: - if test -z "${GL_COND_OBJ_STRERROR_TRUE}" && test -z "${GL_COND_OBJ_STRERROR_FALSE}"; then - GL_COND_OBJ_STRERROR_TRUE='#' - GL_COND_OBJ_STRERROR_FALSE='#' - fi -printf "%s\n" "#define GNULIB_STRERROR 1" >>confdefs.h + gl_LIBOBJS="$gl_LIBOBJS strerror.$ac_objext" + fi +printf "%s\n" "#define GNULIB_STRERROR 1" >>confdefs.h @@ -28370,35 +23460,28 @@ + GNULIB_STRERROR=1 - GL_GNULIB_STRERROR=1 +printf "%s\n" "#define GNULIB_TEST_STRERROR 1" >>confdefs.h -printf "%s\n" "#define GNULIB_TEST_STRERROR 1" >>confdefs.h + if test -n "$ERRNO_H" || test $REPLACE_STRERROR_0 = 1; then + + - if test -n "$ERRNO_H" || test $REPLACE_STRERROR_0 = 1; then - GL_COND_OBJ_STRERROR_OVERRIDE_TRUE= - GL_COND_OBJ_STRERROR_OVERRIDE_FALSE='#' -else - GL_COND_OBJ_STRERROR_OVERRIDE_TRUE='#' - GL_COND_OBJ_STRERROR_OVERRIDE_FALSE= -fi -: - if test -z "${GL_COND_OBJ_STRERROR_OVERRIDE_TRUE}" && test -z "${GL_COND_OBJ_STRERROR_OVERRIDE_FALSE}"; then - GL_COND_OBJ_STRERROR_OVERRIDE_TRUE='#' - GL_COND_OBJ_STRERROR_OVERRIDE_FALSE='#' - fi - if test -z "$GL_COND_OBJ_STRERROR_OVERRIDE_TRUE"; then : + + + gl_LIBOBJS="$gl_LIBOBJS strerror-override.$ac_objext" @@ -28422,17 +23505,7 @@ fi - -fi - - - - - - - - - + fi @@ -28453,8 +23526,6 @@ case "$host_os" in # Guess yes on Linux systems. linux-* | linux) gl_cv_func_symlink_works="guessing yes" ;; - # Guess yes on systems that emulate the Linux system calls. - midipix*) gl_cv_func_symlink_works="guessing yes" ;; # Guess yes on glibc systems. *-gnu* | gnu*) gl_cv_func_symlink_works="guessing yes" ;; # If we don't know, obey --enable-cross-guesses. @@ -28504,19 +23575,8 @@ esac fi + if test $HAVE_SYMLINK = 0 || test $REPLACE_SYMLINK = 1; then - if test $HAVE_SYMLINK = 0 || test $REPLACE_SYMLINK = 1; then - GL_COND_OBJ_SYMLINK_TRUE= - GL_COND_OBJ_SYMLINK_FALSE='#' -else - GL_COND_OBJ_SYMLINK_TRUE='#' - GL_COND_OBJ_SYMLINK_FALSE= -fi -: - if test -z "${GL_COND_OBJ_SYMLINK_TRUE}" && test -z "${GL_COND_OBJ_SYMLINK_FALSE}"; then - GL_COND_OBJ_SYMLINK_TRUE='#' - GL_COND_OBJ_SYMLINK_FALSE='#' - fi @@ -28524,10 +23584,15 @@ + gl_LIBOBJS="$gl_LIBOBJS symlink.$ac_objext" + + fi + + - GL_GNULIB_SYMLINK=1 + GNULIB_SYMLINK=1 @@ -28551,6 +23616,113 @@ + if test $gl_cv_have_include_next = yes; then + gl_cv_next_sys_stat_h='<'sys/stat.h'>' + else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking absolute name of " >&5 +printf %s "checking absolute name of ... " >&6; } +if test ${gl_cv_next_sys_stat_h+y} +then : + printf %s "(cached) " >&6 +else $as_nop + + if test $ac_cv_header_sys_stat_h = yes; then + + + + + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#include +_ACEOF + case "$host_os" in + aix*) gl_absname_cpp="$ac_cpp -C" ;; + *) gl_absname_cpp="$ac_cpp" ;; + esac + + case "$host_os" in + mingw*) + gl_dirsep_regex='[/\\]' + ;; + *) + gl_dirsep_regex='\/' + ;; + esac + gl_make_literal_regex_sed='s,[]$^\\.*/[],\\&,g' + gl_header_literal_regex=`echo 'sys/stat.h' \ + | 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 + }' + + gl_cv_absolute_sys_stat_h=`(eval "$gl_absname_cpp conftest.$ac_ext") 2>&5 | + sed -n "$gl_absolute_header_sed"` + + gl_header=$gl_cv_absolute_sys_stat_h + gl_cv_next_sys_stat_h='"'$gl_header'"' + else + gl_cv_next_sys_stat_h='<'sys/stat.h'>' + fi + + +fi +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_next_sys_stat_h" >&5 +printf "%s\n" "$gl_cv_next_sys_stat_h" >&6; } + fi + NEXT_SYS_STAT_H=$gl_cv_next_sys_stat_h + + if test $gl_cv_have_include_next = yes || test $gl_cv_have_include_next = buggy; then + # INCLUDE_NEXT_AS_FIRST_DIRECTIVE='include_next' + gl_next_as_first_directive='<'sys/stat.h'>' + else + # INCLUDE_NEXT_AS_FIRST_DIRECTIVE='include' + gl_next_as_first_directive=$gl_cv_next_sys_stat_h + fi + NEXT_AS_FIRST_DIRECTIVE_SYS_STAT_H=$gl_next_as_first_directive + + + + + + + + + WINDOWS_STAT_TIMESPEC=0 + + + + + + + + + ac_fn_c_check_type "$LINENO" "nlink_t" "ac_cv_type_nlink_t" "#include + #include +" +if test "x$ac_cv_type_nlink_t" = xyes +then : + +else $as_nop + +printf "%s\n" "#define nlink_t int" >>confdefs.h + +fi + + + + + + + + + + + + + @@ -28564,6 +23736,97 @@ + if test $gl_cv_have_include_next = yes; then + gl_cv_next_unistd_h='<'unistd.h'>' + else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking absolute name of " >&5 +printf %s "checking absolute name of ... " >&6; } +if test ${gl_cv_next_unistd_h+y} +then : + printf %s "(cached) " >&6 +else $as_nop + + if test $ac_cv_header_unistd_h = yes; then + + + + + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#include +_ACEOF + case "$host_os" in + aix*) gl_absname_cpp="$ac_cpp -C" ;; + *) gl_absname_cpp="$ac_cpp" ;; + esac + + case "$host_os" in + mingw*) + gl_dirsep_regex='[/\\]' + ;; + *) + gl_dirsep_regex='\/' + ;; + esac + gl_make_literal_regex_sed='s,[]$^\\.*/[],\\&,g' + gl_header_literal_regex=`echo 'unistd.h' \ + | 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 + }' + + gl_cv_absolute_unistd_h=`(eval "$gl_absname_cpp conftest.$ac_ext") 2>&5 | + sed -n "$gl_absolute_header_sed"` + + gl_header=$gl_cv_absolute_unistd_h + gl_cv_next_unistd_h='"'$gl_header'"' + else + gl_cv_next_unistd_h='<'unistd.h'>' + fi + + +fi +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_next_unistd_h" >&5 +printf "%s\n" "$gl_cv_next_unistd_h" >&6; } + fi + NEXT_UNISTD_H=$gl_cv_next_unistd_h + + if test $gl_cv_have_include_next = yes || test $gl_cv_have_include_next = buggy; then + # INCLUDE_NEXT_AS_FIRST_DIRECTIVE='include_next' + gl_next_as_first_directive='<'unistd.h'>' + else + # INCLUDE_NEXT_AS_FIRST_DIRECTIVE='include' + gl_next_as_first_directive=$gl_cv_next_unistd_h + fi + NEXT_AS_FIRST_DIRECTIVE_UNISTD_H=$gl_next_as_first_directive + + + + + if test $ac_cv_header_unistd_h = yes; then + HAVE_UNISTD_H=1 + else + HAVE_UNISTD_H=0 + fi + + + + + + + + + + + + + + if test $ac_cv_have_decl_execvpe = no; then + HAVE_DECL_EXECVPE=0 + fi @@ -28586,8 +23849,6 @@ case "$host_os" in # Guess yes on Linux systems. linux-* | linux) gl_cv_func_unlink_honors_slashes="guessing yes" ;; - # Guess yes on systems that emulate the Linux system calls. - midipix*) gl_cv_func_unlink_honors_slashes="guessing yes" ;; # Guess yes on glibc systems. *-gnu*) gl_cv_func_unlink_honors_slashes="guessing yes" ;; # Guess no on native Windows. @@ -28739,120 +24000,32 @@ ;; esac - - if test $REPLACE_UNLINK = 1; then - GL_COND_OBJ_UNLINK_TRUE= - GL_COND_OBJ_UNLINK_FALSE='#' -else - GL_COND_OBJ_UNLINK_TRUE='#' - GL_COND_OBJ_UNLINK_FALSE= -fi -: - if test -z "${GL_COND_OBJ_UNLINK_TRUE}" && test -z "${GL_COND_OBJ_UNLINK_FALSE}"; then - GL_COND_OBJ_UNLINK_TRUE='#' - GL_COND_OBJ_UNLINK_FALSE='#' - fi - - - - + if test $REPLACE_UNLINK = 1; then - GL_GNULIB_UNLINK=1 + gl_LIBOBJS="$gl_LIBOBJS unlink.$ac_objext" + fi -printf "%s\n" "#define GNULIB_TEST_UNLINK 1" >>confdefs.h - - - - - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for variable-length arrays" >&5 -printf %s "checking for variable-length arrays... " >&6; } -if test ${ac_cv_c_vararrays+y} -then : - printf %s "(cached) " >&6 -else $as_nop - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -#ifdef __STDC_NO_VLA__ - defined - #endif -_ACEOF -if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | - $EGREP "defined" >/dev/null 2>&1 -then : - ac_cv_c_vararrays='no: __STDC_NO_VLA__ is defined' -else $as_nop - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -/* Test for VLA support. This test is partly inspired - from examples in the C standard. Use at least two VLA - functions to detect the GCC 3.4.3 bug described in: - https://lists.gnu.org/archive/html/bug-gnulib/2014-08/msg00014.html - */ - #ifdef __STDC_NO_VLA__ - syntax error; - #else - extern int n; - int B[100]; - int fvla (int m, int C[m][m]); - int - simple (int count, int all[static count]) - { - return all[count - 1]; - } - int - fvla (int m, int C[m][m]) - { - typedef int VLA[m][m]; - VLA x; - int D[m]; - static int (*q)[m] = &B; - int (*s)[n] = q; - return C && &x[0][0] == &D[0] && &D[0] == s[0]; - } - #endif + GNULIB_UNLINK=1 -int -main (void) -{ - ; - return 0; -} -_ACEOF -if ac_fn_c_try_compile "$LINENO" -then : - ac_cv_c_vararrays=yes -else $as_nop - ac_cv_c_vararrays=no -fi -rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext -fi -rm -rf conftest* -fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_vararrays" >&5 -printf "%s\n" "$ac_cv_c_vararrays" >&6; } - if test "$ac_cv_c_vararrays" = yes; then -printf "%s\n" "#define HAVE_C_VARARRAYS 1" >>confdefs.h - elif test "$ac_cv_c_vararrays" = no; then +printf "%s\n" "#define GNULIB_TEST_UNLINK 1" >>confdefs.h -printf "%s\n" "#define __STDC_NO_VLA__ 1" >>confdefs.h - fi @@ -28945,46 +24118,147 @@ + if test $gl_cv_have_include_next = yes; then + gl_cv_next_wchar_h='<'wchar.h'>' + else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking absolute name of " >&5 +printf %s "checking absolute name of ... " >&6; } +if test ${gl_cv_next_wchar_h+y} +then : + printf %s "(cached) " >&6 +else $as_nop + if test $ac_cv_header_wchar_h = yes; then - if test $HAVE_MSVC_INVALID_PARAMETER_HANDLER = 1; then - REPLACE_WRITE=1 - fi + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#include +_ACEOF + case "$host_os" in + aix*) gl_absname_cpp="$ac_cpp -C" ;; + *) gl_absname_cpp="$ac_cpp" ;; + esac + case "$host_os" in + mingw*) + gl_dirsep_regex='[/\\]' + ;; + *) + gl_dirsep_regex='\/' + ;; + esac + gl_make_literal_regex_sed='s,[]$^\\.*/[],\\&,g' + gl_header_literal_regex=`echo 'wchar.h' \ + | 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 + }' + gl_cv_absolute_wchar_h=`(eval "$gl_absname_cpp conftest.$ac_ext") 2>&5 | + sed -n "$gl_absolute_header_sed"` + + gl_header=$gl_cv_absolute_wchar_h + gl_cv_next_wchar_h='"'$gl_header'"' + else + gl_cv_next_wchar_h='<'wchar.h'>' + fi - if test $REPLACE_WRITE = 1; then - GL_COND_OBJ_WRITE_TRUE= - GL_COND_OBJ_WRITE_FALSE='#' -else - GL_COND_OBJ_WRITE_TRUE='#' - GL_COND_OBJ_WRITE_FALSE= fi -: - if test -z "${GL_COND_OBJ_WRITE_TRUE}" && test -z "${GL_COND_OBJ_WRITE_FALSE}"; then - GL_COND_OBJ_WRITE_TRUE='#' - GL_COND_OBJ_WRITE_FALSE='#' +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_next_wchar_h" >&5 +printf "%s\n" "$gl_cv_next_wchar_h" >&6; } + fi + NEXT_WCHAR_H=$gl_cv_next_wchar_h + + if test $gl_cv_have_include_next = yes || test $gl_cv_have_include_next = buggy; then + # INCLUDE_NEXT_AS_FIRST_DIRECTIVE='include_next' + gl_next_as_first_directive='<'wchar.h'>' + else + # INCLUDE_NEXT_AS_FIRST_DIRECTIVE='include' + gl_next_as_first_directive=$gl_cv_next_wchar_h + fi + NEXT_AS_FIRST_DIRECTIVE_WCHAR_H=$gl_next_as_first_directive + + + + + if test $ac_cv_header_wchar_h = yes; then + HAVE_WCHAR_H=1 + else + HAVE_WCHAR_H=0 fi - if test -z "$GL_COND_OBJ_WRITE_TRUE"; then : - : + + + if test $gt_cv_c_wint_t = yes; then + HAVE_WINT_T=1 + else + HAVE_WINT_T=0 + fi + + + + + + + + + + + ac_fn_check_decl "$LINENO" "wcsdup" "ac_cv_have_decl_wcsdup" " + #include + +" "$ac_c_undeclared_builtin_options" "CFLAGS" +if test "x$ac_cv_have_decl_wcsdup" = xyes +then : + ac_have_decl=1 +else $as_nop + ac_have_decl=0 fi +printf "%s\n" "#define HAVE_DECL_WCSDUP $ac_have_decl" >>confdefs.h + if test $ac_cv_have_decl_wcsdup = no; then + HAVE_DECL_WCSDUP=0 + fi + if test $HAVE_MSVC_INVALID_PARAMETER_HANDLER = 1; then + REPLACE_WRITE=1 + fi + + + + + if test $REPLACE_WRITE = 1; then + - GL_GNULIB_WRITE=1 + + + + + gl_LIBOBJS="$gl_LIBOBJS write.$ac_objext" + + : + fi + + + + + + GNULIB_WRITE=1 @@ -29025,8 +24299,6 @@ - - gltests_libdeps= gltests_ltlibdeps= @@ -29039,10 +24311,7 @@ - - gl_source_base='tests' - gl_source_base_prefix= gltests_WITNESS=IN_`echo "${PACKAGE-$PACKAGE_TARNAME}" | LC_ALL=C tr abcdefghijklmnopqrstuvwxyz ABCDEFGHIJKLMNOPQRSTUVWXYZ | LC_ALL=C sed -e 's/[^A-Z0-9_]/_/g'`_GNULIB_TESTS gl_module_indicator_condition=$gltests_WITNESS @@ -29055,9 +24324,6 @@ - - - LIBGNU_LIBDEPS="$gl_libdeps" LIBGNU_LTLIBDEPS="$gl_ltlibdeps" @@ -29314,8 +24580,7 @@ - if test -n "$GCC" -then : + if test -n "$GCC"; then { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether -Wno-missing-field-initializers is supported" >&5 printf %s "checking whether -Wno-missing-field-initializers is supported... " >&6; } @@ -29349,9 +24614,7 @@ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_cc_nomfi_supported" >&5 printf "%s\n" "$gl_cv_cc_nomfi_supported" >&6; } - if test "$gl_cv_cc_nomfi_supported" = yes -then : - + if test "$gl_cv_cc_nomfi_supported" = yes; then { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether -Wno-missing-field-initializers is needed" >&5 printf %s "checking whether -Wno-missing-field-initializers is needed... " >&6; } if test ${gl_cv_cc_nomfi_needed+y} @@ -29389,8 +24652,7 @@ fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_cc_nomfi_needed" >&5 printf "%s\n" "$gl_cv_cc_nomfi_needed" >&6; } - -fi + fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether -Wuninitialized is supported" >&5 printf %s "checking whether -Wuninitialized is supported... " >&6; } @@ -29424,7 +24686,7 @@ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_cc_uninitialized_supported" >&5 printf "%s\n" "$gl_cv_cc_uninitialized_supported" >&6; } -fi + fi # List all gcc warning categories. # To compare this list to your installed GCC's, run this Bash command: @@ -29435,7 +24697,7 @@ # <(LC_ALL=C gcc --help=warnings | sed -n 's/^ \(-[^ ]*\) .*/\1/p' | sort) warnings= - for gl_manywarn_item in -fanalyzer -fstrict-flex-arrays \ + for gl_manywarn_item in -fanalyzer -fno-common \ -Wall \ -Warith-conversion \ -Wbad-function-cast \ @@ -29463,7 +24725,6 @@ -Wpointer-arith \ -Wshadow \ -Wstack-protector \ - -Wstrict-flex-arrays \ -Wstrict-overflow \ -Wstrict-prototypes \ -Wsuggest-attribute=cold \ @@ -29494,30 +24755,23 @@ # them here so that the above 'comm' command doesn't report a false match. as_fn_append warnings ' -Warray-bounds=2' as_fn_append warnings ' -Wattribute-alias=2' - as_fn_append warnings ' -Wbidi-chars=any,ucn' as_fn_append warnings ' -Wformat-overflow=2' as_fn_append warnings ' -Wformat=2' as_fn_append warnings ' -Wformat-truncation=2' as_fn_append warnings ' -Wimplicit-fallthrough=5' as_fn_append warnings ' -Wshift-overflow=2' - as_fn_append warnings ' -Wuse-after-free=3' as_fn_append warnings ' -Wunused-const-variable=2' as_fn_append warnings ' -Wvla-larger-than=4031' # These are needed for older GCC versions. - if test -n "$GCC" && gl_gcc_version=`($CC --version) 2>/dev/null`; then - case $gl_gcc_version in + if test -n "$GCC"; then + case `($CC --version) 2>/dev/null` in 'gcc (GCC) '[0-3].* | \ 'gcc (GCC) '4.[0-7].*) as_fn_append warnings ' -fdiagnostics-show-option' as_fn_append warnings ' -funit-at-a-time' ;; esac - case $gl_gcc_version in - 'gcc (GCC) '[0-9].*) - as_fn_append warnings ' -fno-common' - ;; - esac fi # Disable specific options as needed. @@ -29529,9 +24783,15 @@ as_fn_append warnings ' -Wno-uninitialized' fi - # This warning have too many false alarms in GCC 11.2.1. - # https://gcc.gnu.org/bugzilla/show_bug.cgi?id=101713 + # Some warnings have too many false alarms in GCC 10.1. + # https://gcc.gnu.org/bugzilla/show_bug.cgi?id=93695 + as_fn_append warnings ' -Wno-analyzer-double-free' + # https://gcc.gnu.org/bugzilla/show_bug.cgi?id=94458 as_fn_append warnings ' -Wno-analyzer-malloc-leak' + # https://gcc.gnu.org/bugzilla/show_bug.cgi?id=94851 + as_fn_append warnings ' -Wno-analyzer-null-dereference' + # https://gcc.gnu.org/bugzilla/show_bug.cgi?id=95758 + as_fn_append warnings ' -Wno-analyzer-use-after-free' ac_ext=c ac_cpp='$CPP $CPPFLAGS' @@ -29895,71 +25155,75 @@ as_fn_error $? "conditional \"am__fastdepCC\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi -# Check whether --enable-year2038 was given. -if test ${enable_year2038+y} -then : - enableval=$enable_year2038; -fi - if test -z "${GL_COND_LIBTOOL_TRUE}" && test -z "${GL_COND_LIBTOOL_FALSE}"; then as_fn_error $? "conditional \"GL_COND_LIBTOOL\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi +if test -z "${GL_GENERATE_ALLOCA_H_TRUE}" && test -z "${GL_GENERATE_ALLOCA_H_FALSE}"; then + as_fn_error $? "conditional \"GL_GENERATE_ALLOCA_H\" was never defined. +Usually this means the macro was only invoked conditionally." "$LINENO" 5 +fi +if test -z "${GL_GENERATE_ERRNO_H_TRUE}" && test -z "${GL_GENERATE_ERRNO_H_FALSE}"; then + as_fn_error $? "conditional \"GL_GENERATE_ERRNO_H\" was never defined. +Usually this means the macro was only invoked conditionally." "$LINENO" 5 +fi +if test -z "${GL_GENERATE_FLOAT_H_TRUE}" && test -z "${GL_GENERATE_FLOAT_H_FALSE}"; then + as_fn_error $? "conditional \"GL_GENERATE_FLOAT_H\" was never defined. +Usually this means the macro was only invoked conditionally." "$LINENO" 5 +fi +if test -z "${GL_GENERATE_LIMITS_H_TRUE}" && test -z "${GL_GENERATE_LIMITS_H_FALSE}"; then + as_fn_error $? "conditional \"GL_GENERATE_LIMITS_H\" was never defined. +Usually this means the macro was only invoked conditionally." "$LINENO" 5 +fi +if test -z "${GL_GENERATE_LIMITS_H_TRUE}" && test -z "${GL_GENERATE_LIMITS_H_FALSE}"; then + as_fn_error $? "conditional \"GL_GENERATE_LIMITS_H\" was never defined. +Usually this means the macro was only invoked conditionally." "$LINENO" 5 +fi +if test -z "${GL_GENERATE_STDINT_H_TRUE}" && test -z "${GL_GENERATE_STDINT_H_FALSE}"; then + as_fn_error $? "conditional \"GL_GENERATE_STDINT_H\" was never defined. +Usually this means the macro was only invoked conditionally." "$LINENO" 5 +fi +if test -z "${GL_GENERATE_STDBOOL_H_TRUE}" && test -z "${GL_GENERATE_STDBOOL_H_FALSE}"; then + as_fn_error $? "conditional \"GL_GENERATE_STDBOOL_H\" was never defined. +Usually this means the macro was only invoked conditionally." "$LINENO" 5 +fi +if test -z "${GL_GENERATE_STDDEF_H_TRUE}" && test -z "${GL_GENERATE_STDDEF_H_FALSE}"; then + as_fn_error $? "conditional \"GL_GENERATE_STDDEF_H\" was never defined. +Usually this means the macro was only invoked conditionally." "$LINENO" 5 +fi gl_libobjs= gl_ltlibobjs= - gl_libobjdeps= if test -n "$gl_LIBOBJS"; then # Remove the extension. sed_drop_objext='s/\.o$//;s/\.obj$//' - sed_dirname1='s,//*,/,g' - sed_dirname2='s,\(.\)/$,\1,' - sed_dirname3='s,^[^/]*$,.,' - sed_dirname4='s,\(.\)/[^/]*$,\1,' - sed_basename1='s,.*/,,' for i in `for i in $gl_LIBOBJS; do echo "$i"; done | sed -e "$sed_drop_objext" | sort | uniq`; do gl_libobjs="$gl_libobjs $i.$ac_objext" gl_ltlibobjs="$gl_ltlibobjs $i.lo" - i_dir=`echo "$i" | sed -e "$sed_dirname1" -e "$sed_dirname2" -e "$sed_dirname3" -e "$sed_dirname4"` - i_base=`echo "$i" | sed -e "$sed_basename1"` - gl_libobjdeps="$gl_libobjdeps $i_dir/\$(DEPDIR)/$i_base.Po" done fi gl_LIBOBJS=$gl_libobjs gl_LTLIBOBJS=$gl_ltlibobjs - gl_LIBOBJDEPS=$gl_libobjdeps - gltests_libobjs= gltests_ltlibobjs= - gltests_libobjdeps= if test -n "$gltests_LIBOBJS"; then # Remove the extension. sed_drop_objext='s/\.o$//;s/\.obj$//' - sed_dirname1='s,//*,/,g' - sed_dirname2='s,\(.\)/$,\1,' - sed_dirname3='s,^[^/]*$,.,' - sed_dirname4='s,\(.\)/[^/]*$,\1,' - sed_basename1='s,.*/,,' for i in `for i in $gltests_LIBOBJS; do echo "$i"; done | sed -e "$sed_drop_objext" | sort | uniq`; do gltests_libobjs="$gltests_libobjs $i.$ac_objext" gltests_ltlibobjs="$gltests_ltlibobjs $i.lo" - i_dir=`echo "$i" | sed -e "$sed_dirname1" -e "$sed_dirname2" -e "$sed_dirname3" -e "$sed_dirname4"` - i_base=`echo "$i" | sed -e "$sed_basename1"` - gltests_libobjdeps="$gltests_libobjdeps $i_dir/\$(DEPDIR)/$i_base.Po" done fi gltests_LIBOBJS=$gltests_libobjs gltests_LTLIBOBJS=$gltests_ltlibobjs - gltests_LIBOBJDEPS=$gltests_libobjdeps - : "${CONFIG_STATUS=./config.status}" @@ -30351,7 +25615,7 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by mmv $as_me 2.5, which was +This file was extended by mmv $as_me 2.5.1, which was generated by GNU Autoconf 2.71. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -30420,7 +25684,7 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config='$ac_cs_config_escaped' ac_cs_version="\\ -mmv config.status 2.5 +mmv config.status 2.5.1 configured by $0, generated by GNU Autoconf 2.71, with options \\"\$ac_cs_config\\" diff -Nru mmv-2.5/configure.ac mmv-2.5.1/configure.ac --- mmv-2.5/configure.ac 2023-07-20 19:39:53.000000000 +0000 +++ mmv-2.5.1/configure.ac 2023-08-08 11:05:25.000000000 +0000 @@ -20,7 +20,7 @@ AC_PREREQ([2.71]) dnl Initialise autoconf and automake -AC_INIT([mmv],[2.5],[rrt@sc3d.org],[],[https://github.com/rrthomas/mmv]) +AC_INIT([mmv],[2.5.1],[rrt@sc3d.org],[],[https://github.com/rrthomas/mmv]) AC_CONFIG_AUX_DIR([build-aux]) AM_INIT_AUTOMAKE([-Wall]) m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])]) diff -Nru mmv-2.5/debian/changelog mmv-2.5.1/debian/changelog --- mmv-2.5/debian/changelog 2023-07-21 11:29:31.000000000 +0000 +++ mmv-2.5.1/debian/changelog 2023-11-27 14:02:42.000000000 +0000 @@ -1,3 +1,17 @@ +mmv (2.5.1-1~ppa~mantic) mantic; urgency=high + + * Backport to mantic. + + -- tomx3 Mon, 27 Nov 2023 15:02:42 +0100 + +mmv (2.5.1-1) unstable; urgency=high + + * Upstream bugfix release. + + Fixes realloc() crash by reverting to an older gnulib release. + (Closes: #1042020) + + -- Axel Beckert Wed, 06 Sep 2023 22:40:52 +0200 + mmv (2.5-1) unstable; urgency=medium * Minor upstream bugfix release. diff -Nru mmv-2.5/debian/control mmv-2.5.1/debian/control --- mmv-2.5/debian/control 2023-06-14 22:09:01.000000000 +0000 +++ mmv-2.5.1/debian/control 2023-11-27 14:01:34.000000000 +0000 @@ -1,6 +1,5 @@ Source: mmv -Maintainer: Rhonda D'Vine -Uploaders: Axel Beckert +Maintainer: tomx3 Section: utils Priority: optional Standards-Version: 4.6.2 diff -Nru mmv-2.5/lib/Makefile.am mmv-2.5.1/lib/Makefile.am --- mmv-2.5/lib/Makefile.am 2023-07-17 21:21:05.000000000 +0000 +++ mmv-2.5.1/lib/Makefile.am 2023-08-08 11:02:52.000000000 +0000 @@ -1,10 +1,10 @@ ## DO NOT EDIT! GENERATED AUTOMATICALLY! ## Process this file with automake to produce Makefile.in. -# Copyright (C) 2002-2023 Free Software Foundation, Inc. +# Copyright (C) 2002-2021 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 -# the Free Software Foundation, either version 3 of the License, or +# the Free Software Foundation; either version 3 of the License, or # (at your option) any later version. # # This file is distributed in the hope that it will be useful, @@ -54,7 +54,7 @@ # write \ # xalloc -AUTOMAKE_OPTIONS = 1.14 gnits subdir-objects +AUTOMAKE_OPTIONS = 1.11 gnits subdir-objects SUBDIRS = noinst_HEADERS = @@ -76,7 +76,6 @@ noinst_LIBRARIES += libgnu.a libgnu_a_SOURCES = -libgnu_a_CFLAGS = $(AM_CFLAGS) $(GL_CFLAG_GNULIB_WARNINGS) libgnu_a_LIBADD = $(gl_LIBOBJS) libgnu_a_DEPENDENCIES = $(gl_LIBOBJS) EXTRA_libgnu_a_SOURCES = @@ -98,10 +97,11 @@ # doesn't have one that works with the given compiler. if GL_GENERATE_ALLOCA_H alloca.h: alloca.in.h $(top_builddir)/config.status - $(gl_V_at)$(SED_HEADER_STDOUT) \ - -e 's|@''HAVE_ALLOCA_H''@|$(HAVE_ALLOCA_H)|g' \ - $(srcdir)/alloca.in.h > $@-t - $(AM_V_at)mv $@-t $@ + $(AM_V_GEN)rm -f $@-t $@ && \ + { echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \ + sed -e 's|@''HAVE_ALLOCA_H''@|$(HAVE_ALLOCA_H)|g' < $(srcdir)/alloca.in.h; \ + } > $@-t && \ + mv -f $@-t $@ else alloca.h: $(top_builddir)/config.status rm -f $@ @@ -112,37 +112,6 @@ ## end gnulib module alloca-opt -## begin gnulib module assert-h - -BUILT_SOURCES += $(ASSERT_H) - -# We need the following in order to create when the system -# doesn't have one that works with the given compiler. -if GL_GENERATE_ASSERT_H -assert.h: assert.in.h verify.h $(top_builddir)/config.status - $(gl_V_at){ $(SED_HEADER_STDOUT) \ - -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_ASSERT_H''@|$(NEXT_ASSERT_H)|g' \ - < $(srcdir)/assert.in.h && \ - sed -e '/@assert.h omit start@/,/@assert.h omit end@/d' \ - -e 's|_gl_verify|_gl_static_assert|g' \ - -e 's|_GL_VERIFY|_GL_STATIC_ASSERT|g' \ - -e 's|_GL\(_STATIC_ASSERT_H\)|_GL\1|g' \ - < $(srcdir)/verify.h; \ - } > $@-t - $(AM_V_at)mv $@-t $@ -else -assert.h: $(top_builddir)/config.status - rm -f $@ -endif -MOSTLYCLEANFILES += assert.h assert.h-t - -EXTRA_DIST += assert.in.h verify.h - -## end gnulib module assert-h - ## begin gnulib module attribute @@ -171,29 +140,12 @@ ## end gnulib module bootstrap -## begin gnulib module calloc-gnu - - -EXTRA_DIST += calloc.c - -EXTRA_libgnu_a_SOURCES += calloc.c - -## end gnulib module calloc-gnu - -## begin gnulib module calloc-posix - - -EXTRA_DIST += calloc.c - -EXTRA_libgnu_a_SOURCES += calloc.c +## begin gnulib module canonicalize-lgpl -## end gnulib module calloc-posix -## begin gnulib module canonicalize-lgpl +EXTRA_DIST += canonicalize-lgpl.c -if GL_COND_OBJ_CANONICALIZE_LGPL -libgnu_a_SOURCES += canonicalize-lgpl.c -endif +EXTRA_libgnu_a_SOURCES += canonicalize-lgpl.c ## end gnulib module canonicalize-lgpl @@ -207,9 +159,10 @@ ## begin gnulib module close -if GL_COND_OBJ_CLOSE -libgnu_a_SOURCES += close.c -endif + +EXTRA_DIST += close.c + +EXTRA_libgnu_a_SOURCES += close.c ## end gnulib module close @@ -223,9 +176,10 @@ ## begin gnulib module dup2 -if GL_COND_OBJ_DUP2 -libgnu_a_SOURCES += dup2.c -endif + +EXTRA_DIST += dup2.c + +EXTRA_libgnu_a_SOURCES += dup2.c ## end gnulib module dup2 @@ -244,8 +198,9 @@ # doesn't have one that is POSIX compliant. if GL_GENERATE_ERRNO_H errno.h: errno.in.h $(top_builddir)/config.status - $(gl_V_at)$(SED_HEADER_STDOUT) \ - -e 's|@''GUARD_PREFIX''@|GL|g' \ + $(AM_V_GEN)rm -f $@-t $@ && \ + { echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */' && \ + sed -e 's|@''GUARD_PREFIX''@|GL|g' \ -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \ -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \ -e 's|@''PRAGMA_COLUMNS''@|@PRAGMA_COLUMNS@|g' \ @@ -256,8 +211,9 @@ -e 's|@''ENOLINK_VALUE''@|$(ENOLINK_VALUE)|g' \ -e 's|@''EOVERFLOW_HIDDEN''@|$(EOVERFLOW_HIDDEN)|g' \ -e 's|@''EOVERFLOW_VALUE''@|$(EOVERFLOW_VALUE)|g' \ - $(srcdir)/errno.in.h > $@-t - $(AM_V_at)mv $@-t $@ + < $(srcdir)/errno.in.h; \ + } > $@-t && \ + mv $@-t $@ else errno.h: $(top_builddir)/config.status rm -f $@ @@ -270,42 +226,12 @@ ## begin gnulib module error -if GL_COND_OBJ_ERROR -libgnu_a_SOURCES += error.c -endif - -## end gnulib module error - -## begin gnulib module error-h -BUILT_SOURCES += $(ERROR_H) +EXTRA_DIST += error.c error.h -# We need the following in order to create when the system -# doesn't have one that works. -if GL_GENERATE_ERROR_H -error.h: error.in.h $(top_builddir)/config.status $(CXXDEFS_H) - $(gl_V_at)$(SED_HEADER_STDOUT) \ - -e 's|@''GUARD_PREFIX''@|GL|g' \ - -e 's|@''HAVE_ERROR_H''@|$(HAVE_ERROR_H)|g' \ - -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \ - -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \ - -e 's|@''NEXT_ERROR_H''@|$(NEXT_ERROR_H)|g' \ - -e 's|@''HAVE_ERROR''@|$(HAVE_ERROR)|g' \ - -e 's|@''HAVE_ERROR_AT_LINE''@|$(HAVE_ERROR_AT_LINE)|g' \ - -e 's|@''REPLACE_ERROR''@|$(REPLACE_ERROR)|g' \ - -e 's|@''REPLACE_ERROR_AT_LINE''@|$(REPLACE_ERROR_AT_LINE)|g' \ - -e '/definitions of _GL_FUNCDECL_RPL/r $(CXXDEFS_H)' \ - $(srcdir)/error.in.h > $@-t - $(AM_V_at)mv $@-t $@ -else -error.h: $(top_builddir)/config.status - rm -f $@ -endif -MOSTLYCLEANFILES += error.h error.h-t - -EXTRA_DIST += error.in.h +EXTRA_libgnu_a_SOURCES += error.c -## end gnulib module error-h +## end gnulib module error ## begin gnulib module exitfail @@ -324,9 +250,10 @@ ## begin gnulib module fcntl -if GL_COND_OBJ_FCNTL -libgnu_a_SOURCES += fcntl.c -endif + +EXTRA_DIST += fcntl.c + +EXTRA_libgnu_a_SOURCES += fcntl.c ## end gnulib module fcntl @@ -337,19 +264,20 @@ # We need the following in order to create when the system # doesn't have one that works with the given compiler. fcntl.h: fcntl.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_NONNULL_H) $(WARN_ON_USE_H) - $(gl_V_at)$(SED_HEADER_STDOUT) \ - -e 's|@''GUARD_PREFIX''@|GL|g' \ + $(AM_V_GEN)rm -f $@-t $@ && \ + { echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \ + sed -e 's|@''GUARD_PREFIX''@|GL|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_FCNTL_H''@|$(NEXT_FCNTL_H)|g' \ - -e 's/@''GNULIB_CREAT''@/$(GL_GNULIB_CREAT)/g' \ - -e 's/@''GNULIB_FCNTL''@/$(GL_GNULIB_FCNTL)/g' \ - -e 's/@''GNULIB_NONBLOCKING''@/$(GL_GNULIB_NONBLOCKING)/g' \ - -e 's/@''GNULIB_OPEN''@/$(GL_GNULIB_OPEN)/g' \ - -e 's/@''GNULIB_OPENAT''@/$(GL_GNULIB_OPENAT)/g' \ - -e 's/@''GNULIB_MDA_CREAT''@/$(GL_GNULIB_MDA_CREAT)/g' \ - -e 's/@''GNULIB_MDA_OPEN''@/$(GL_GNULIB_MDA_OPEN)/g' \ + -e 's/@''GNULIB_CREAT''@/$(GNULIB_CREAT)/g' \ + -e 's/@''GNULIB_FCNTL''@/$(GNULIB_FCNTL)/g' \ + -e 's/@''GNULIB_NONBLOCKING''@/$(GNULIB_NONBLOCKING)/g' \ + -e 's/@''GNULIB_OPEN''@/$(GNULIB_OPEN)/g' \ + -e 's/@''GNULIB_OPENAT''@/$(GNULIB_OPENAT)/g' \ + -e 's/@''GNULIB_MDA_CREAT''@/$(GNULIB_MDA_CREAT)/g' \ + -e 's/@''GNULIB_MDA_OPEN''@/$(GNULIB_MDA_OPEN)/g' \ -e 's|@''HAVE_FCNTL''@|$(HAVE_FCNTL)|g' \ -e 's|@''HAVE_OPENAT''@|$(HAVE_OPENAT)|g' \ -e 's|@''REPLACE_CREAT''@|$(REPLACE_CREAT)|g' \ @@ -359,8 +287,9 @@ -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)' \ - $(srcdir)/fcntl.in.h > $@-t - $(AM_V_at)mv $@-t $@ + < $(srcdir)/fcntl.in.h; \ + } > $@-t && \ + mv $@-t $@ MOSTLYCLEANFILES += fcntl.h fcntl.h-t EXTRA_DIST += fcntl.in.h @@ -390,29 +319,26 @@ # doesn't have one that works with the given compiler. if GL_GENERATE_FLOAT_H float.h: float.in.h $(top_builddir)/config.status - $(gl_V_at)$(SED_HEADER_STDOUT) \ - -e 's|@''GUARD_PREFIX''@|GL|g' \ + $(AM_V_GEN)rm -f $@-t $@ && \ + { echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */' && \ + sed -e 's|@''GUARD_PREFIX''@|GL|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_FLOAT_H''@|$(NEXT_FLOAT_H)|g' \ -e 's|@''REPLACE_ITOLD''@|$(REPLACE_ITOLD)|g' \ - $(srcdir)/float.in.h > $@-t - $(AM_V_at)mv $@-t $@ + < $(srcdir)/float.in.h; \ + } > $@-t && \ + mv $@-t $@ else float.h: $(top_builddir)/config.status rm -f $@ endif MOSTLYCLEANFILES += float.h float.h-t -if GL_COND_OBJ_FLOAT -libgnu_a_SOURCES += float.c -endif -if GL_COND_OBJ_ITOLD -libgnu_a_SOURCES += itold.c -endif +EXTRA_DIST += float.c float.in.h itold.c -EXTRA_DIST += float.in.h +EXTRA_libgnu_a_SOURCES += float.c itold.c ## end gnulib module float @@ -434,9 +360,10 @@ ## begin gnulib module free-posix -if GL_COND_OBJ_FREE -libgnu_a_SOURCES += free.c -endif + +EXTRA_DIST += free.c + +EXTRA_libgnu_a_SOURCES += free.c ## end gnulib module free-posix @@ -460,23 +387,19 @@ ## begin gnulib module fseterr -if GL_COND_OBJ_FSETERR -libgnu_a_SOURCES += fseterr.c -endif -EXTRA_DIST += fseterr.h stdio-impl.h +EXTRA_DIST += fseterr.c fseterr.h stdio-impl.h + +EXTRA_libgnu_a_SOURCES += fseterr.c ## end gnulib module fseterr ## begin gnulib module fstat -if GL_COND_OBJ_FSTAT -libgnu_a_SOURCES += fstat.c -endif -EXTRA_DIST += stat-w32.c stat-w32.h +EXTRA_DIST += fstat.c stat-w32.c stat-w32.h -EXTRA_libgnu_a_SOURCES += stat-w32.c +EXTRA_libgnu_a_SOURCES += fstat.c stat-w32.c ## end gnulib module fstat @@ -487,30 +410,12 @@ ## end gnulib module funclib.sh -## begin gnulib module gen-header - -# In 'sed', replace the pattern space with a "DO NOT EDIT" comment. -SED_HEADER_NOEDIT = s,.*,/* DO NOT EDIT! GENERATED AUTOMATICALLY! */, - -# '$(SED_HEADER_STDOUT) -e "..."' runs 'sed' but first outputs "DO NOT EDIT". -SED_HEADER_STDOUT = sed -e 1h -e '1$(SED_HEADER_NOEDIT)' -e 1G - -# '$(SED_HEADER_TO_AT_t) FILE' copies FILE to $@-t, prepending a leading -# "DO_NOT_EDIT". Although this could be done more simply via: -# SED_HEADER_TO_AT_t = $(SED_HEADER_STDOUT) > $@-t -# the -n and 'w' avoid a fork+exec, at least when GNU Make is used. -SED_HEADER_TO_AT_t = $(SED_HEADER_STDOUT) -n -e 'w $@-t' - -# Use $(gl_V_at) instead of $(AM_V_GEN) or $(AM_V_at) on a line that -gl_V_at = $(AM_V_GEN) +## begin gnulib module getdtablesize -## end gnulib module gen-header -## begin gnulib module getdtablesize +EXTRA_DIST += getdtablesize.c -if GL_COND_OBJ_GETDTABLESIZE -libgnu_a_SOURCES += getdtablesize.c -endif +EXTRA_libgnu_a_SOURCES += getdtablesize.c ## end gnulib module getdtablesize @@ -520,51 +425,39 @@ # We need the following in order to create when the system # doesn't have one that works with the given compiler. -if GL_GENERATE_GETOPT_H getopt.h: getopt.in.h $(top_builddir)/config.status $(ARG_NONNULL_H) - $(gl_V_at)$(SED_HEADER_STDOUT) \ - -e 's|@''GUARD_PREFIX''@|GL|g' \ + $(AM_V_GEN)rm -f $@-t $@ && \ + { echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \ + sed -e 's|@''GUARD_PREFIX''@|GL|g' \ -e 's|@''HAVE_GETOPT_H''@|$(HAVE_GETOPT_H)|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_GETOPT_H''@|$(NEXT_GETOPT_H)|g' \ -e '/definition of _GL_ARG_NONNULL/r $(ARG_NONNULL_H)' \ - $(srcdir)/getopt.in.h > $@-t - $(AM_V_at)mv $@-t $@ -else -getopt.h: $(top_builddir)/config.status - rm -f $@ -endif + < $(srcdir)/getopt.in.h; \ + } > $@-t && \ + mv -f $@-t $@ -if GL_GENERATE_GETOPT_CDEFS_H getopt-cdefs.h: getopt-cdefs.in.h $(top_builddir)/config.status - $(AM_V_GEN)$(SED_HEADER_STDOUT) \ - -e 's|@''HAVE_SYS_CDEFS_H''@|$(HAVE_SYS_CDEFS_H)|g' \ - $(srcdir)/getopt-cdefs.in.h > $@-t - $(AM_V_at)mv $@-t $@ -else -getopt-cdefs.h: $(top_builddir)/config.status - rm -f $@ -endif + $(AM_V_GEN)rm -f $@-t $@ && \ + { echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \ + sed -e 's|@''HAVE_SYS_CDEFS_H''@|$(HAVE_SYS_CDEFS_H)|g' \ + < $(srcdir)/getopt-cdefs.in.h; \ + } > $@-t && \ + mv -f $@-t $@ MOSTLYCLEANFILES += getopt.h getopt.h-t getopt-cdefs.h getopt-cdefs.h-t -if GL_COND_OBJ_GETOPT -libgnu_a_SOURCES += getopt.c getopt1.c -endif +EXTRA_DIST += getopt-cdefs.in.h getopt-core.h getopt-ext.h getopt-pfx-core.h getopt-pfx-ext.h getopt.c getopt.in.h getopt1.c getopt_int.h -EXTRA_DIST += getopt-cdefs.in.h getopt-core.h getopt-ext.h getopt-pfx-core.h getopt-pfx-ext.h getopt.in.h getopt_int.h +EXTRA_libgnu_a_SOURCES += getopt.c getopt1.c ## end gnulib module getopt-posix ## begin gnulib module getprogname -if GL_COND_OBJ_GETPROGNAME -libgnu_a_SOURCES += getprogname.c -endif - -EXTRA_DIST += getprogname.h +libgnu_a_SOURCES += getprogname.h getprogname.c ## end gnulib module getprogname @@ -574,35 +467,6 @@ ## end gnulib module gettext-h -## begin gnulib module glibc-internal/scratch_buffer - -BUILT_SOURCES += malloc/scratch_buffer.gl.h - -malloc/scratch_buffer.gl.h: malloc/scratch_buffer.h - $(AM_V_GEN)$(MKDIR_P) '%reldir%/malloc' - $(AM_V_at)$(SED_HEADER_STDOUT) \ - -e 's|__always_inline|inline _GL_ATTRIBUTE_ALWAYS_INLINE|g' \ - -e 's|__glibc_likely|_GL_LIKELY|g' \ - -e 's|__glibc_unlikely|_GL_UNLIKELY|g' \ - -e '/libc_hidden_proto/d' \ - $(srcdir)/malloc/scratch_buffer.h > $@-t - $(AM_V_at)mv $@-t $@ -MOSTLYCLEANFILES += malloc/scratch_buffer.gl.h malloc/scratch_buffer.gl.h-t - -libgnu_a_SOURCES += malloc/scratch_buffer_grow.c malloc/scratch_buffer_grow_preserve.c malloc/scratch_buffer_set_array_size.c - -EXTRA_DIST += malloc/scratch_buffer.h scratch_buffer.h - -## end gnulib module glibc-internal/scratch_buffer - -## begin gnulib module ialloc - -libgnu_a_SOURCES += ialloc.c - -EXTRA_DIST += ialloc.h - -## end gnulib module ialloc - ## begin gnulib module idx libgnu_a_SOURCES += idx.h @@ -626,7 +490,7 @@ ## begin gnulib module intprops -EXTRA_DIST += intprops-internal.h intprops.h +EXTRA_DIST += intprops.h ## end gnulib module intprops @@ -637,25 +501,24 @@ # We need the following in order to create when the system # doesn't have one that works with the given compiler. inttypes.h: inttypes.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(WARN_ON_USE_H) $(ARG_NONNULL_H) - $(gl_V_at)$(SED_HEADER_STDOUT) \ - -e 's/@''HAVE_INTTYPES_H''@/$(HAVE_INTTYPES_H)/g' \ + $(AM_V_GEN)rm -f $@-t $@ && \ + { echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \ + sed -e 's/@''HAVE_INTTYPES_H''@/$(HAVE_INTTYPES_H)/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_INTTYPES_H''@|$(NEXT_INTTYPES_H)|g' \ -e 's/@''APPLE_UNIVERSAL_BUILD''@/$(APPLE_UNIVERSAL_BUILD)/g' \ -e 's/@''PRIPTR_PREFIX''@/$(PRIPTR_PREFIX)/g' \ - -e 's/@''GNULIB_IMAXABS''@/$(GL_GNULIB_IMAXABS)/g' \ - -e 's/@''GNULIB_IMAXDIV''@/$(GL_GNULIB_IMAXDIV)/g' \ - -e 's/@''GNULIB_STRTOIMAX''@/$(GL_GNULIB_STRTOIMAX)/g' \ - -e 's/@''GNULIB_STRTOUMAX''@/$(GL_GNULIB_STRTOUMAX)/g' \ + -e 's/@''GNULIB_IMAXABS''@/$(GNULIB_IMAXABS)/g' \ + -e 's/@''GNULIB_IMAXDIV''@/$(GNULIB_IMAXDIV)/g' \ + -e 's/@''GNULIB_STRTOIMAX''@/$(GNULIB_STRTOIMAX)/g' \ + -e 's/@''GNULIB_STRTOUMAX''@/$(GNULIB_STRTOUMAX)/g' \ -e 's/@''HAVE_DECL_IMAXABS''@/$(HAVE_DECL_IMAXABS)/g' \ -e 's/@''HAVE_DECL_IMAXDIV''@/$(HAVE_DECL_IMAXDIV)/g' \ -e 's/@''HAVE_DECL_STRTOIMAX''@/$(HAVE_DECL_STRTOIMAX)/g' \ -e 's/@''HAVE_DECL_STRTOUMAX''@/$(HAVE_DECL_STRTOUMAX)/g' \ -e 's/@''HAVE_IMAXDIV_T''@/$(HAVE_IMAXDIV_T)/g' \ - -e 's/@''REPLACE_IMAXABS''@/$(REPLACE_IMAXABS)/g' \ - -e 's/@''REPLACE_IMAXDIV''@/$(REPLACE_IMAXDIV)/g' \ -e 's/@''REPLACE_STRTOIMAX''@/$(REPLACE_STRTOIMAX)/g' \ -e 's/@''REPLACE_STRTOUMAX''@/$(REPLACE_STRTOUMAX)/g' \ -e 's/@''INT32_MAX_LT_INTMAX_MAX''@/$(INT32_MAX_LT_INTMAX_MAX)/g' \ @@ -665,8 +528,9 @@ -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)' \ - $(srcdir)/inttypes.in.h > $@-t - $(AM_V_at)mv $@-t $@ + < $(srcdir)/inttypes.in.h; \ + } > $@-t && \ + mv $@-t $@ MOSTLYCLEANFILES += inttypes.h inttypes.h-t EXTRA_DIST += inttypes.in.h @@ -715,14 +579,16 @@ # doesn't have one that is compatible with GNU. if GL_GENERATE_LIMITS_H limits.h: limits.in.h $(top_builddir)/config.status - $(gl_V_at)$(SED_HEADER_STDOUT) \ - -e 's|@''GUARD_PREFIX''@|GL|g' \ + $(AM_V_GEN)rm -f $@-t $@ && \ + { echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */' && \ + sed -e 's|@''GUARD_PREFIX''@|GL|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_LIMITS_H''@|$(NEXT_LIMITS_H)|g' \ - $(srcdir)/limits.in.h > $@-t - $(AM_V_at)mv $@-t $@ + < $(srcdir)/limits.in.h; \ + } > $@-t && \ + mv $@-t $@ else limits.h: $(top_builddir)/config.status rm -f $@ @@ -735,36 +601,30 @@ ## begin gnulib module link -if GL_COND_OBJ_LINK -libgnu_a_SOURCES += link.c -endif + +EXTRA_DIST += link.c + +EXTRA_libgnu_a_SOURCES += link.c ## end gnulib module link ## begin gnulib module lseek -if GL_COND_OBJ_LSEEK -libgnu_a_SOURCES += lseek.c -endif -## end gnulib module lseek +EXTRA_DIST += lseek.c -## begin gnulib module lstat +EXTRA_libgnu_a_SOURCES += lseek.c -if GL_COND_OBJ_LSTAT -libgnu_a_SOURCES += lstat.c -endif +## end gnulib module lseek -## end gnulib module lstat +## begin gnulib module lstat -## begin gnulib module malloc-gnu +EXTRA_DIST += lstat.c -EXTRA_DIST += malloc.c +EXTRA_libgnu_a_SOURCES += lstat.c -EXTRA_libgnu_a_SOURCES += malloc.c - -## end gnulib module malloc-gnu +## end gnulib module lstat ## begin gnulib module malloc-posix @@ -791,114 +651,115 @@ # We need the following in order to create when the system # doesn't have one that works with the given compiler. math.h: math.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_NONNULL_H) $(WARN_ON_USE_H) - $(gl_V_at)$(SED_HEADER_STDOUT) \ - -e 's|@''GUARD_PREFIX''@|GL|g' \ + $(AM_V_GEN)rm -f $@-t $@ && \ + { echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */' && \ + sed -e 's|@''GUARD_PREFIX''@|GL|g' \ -e 's|@''INCLUDE_NEXT_AS_FIRST_DIRECTIVE''@|$(INCLUDE_NEXT_AS_FIRST_DIRECTIVE)|g' \ -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \ -e 's|@''PRAGMA_COLUMNS''@|@PRAGMA_COLUMNS@|g' \ -e 's|@''NEXT_AS_FIRST_DIRECTIVE_MATH_H''@|$(NEXT_AS_FIRST_DIRECTIVE_MATH_H)|g' \ - -e 's/@''GNULIB_ACOSF''@/$(GL_GNULIB_ACOSF)/g' \ - -e 's/@''GNULIB_ACOSL''@/$(GL_GNULIB_ACOSL)/g' \ - -e 's/@''GNULIB_ASINF''@/$(GL_GNULIB_ASINF)/g' \ - -e 's/@''GNULIB_ASINL''@/$(GL_GNULIB_ASINL)/g' \ - -e 's/@''GNULIB_ATANF''@/$(GL_GNULIB_ATANF)/g' \ - -e 's/@''GNULIB_ATANL''@/$(GL_GNULIB_ATANL)/g' \ - -e 's/@''GNULIB_ATAN2F''@/$(GL_GNULIB_ATAN2F)/g' \ - -e 's/@''GNULIB_CBRT''@/$(GL_GNULIB_CBRT)/g' \ - -e 's/@''GNULIB_CBRTF''@/$(GL_GNULIB_CBRTF)/g' \ - -e 's/@''GNULIB_CBRTL''@/$(GL_GNULIB_CBRTL)/g' \ - -e 's/@''GNULIB_CEIL''@/$(GL_GNULIB_CEIL)/g' \ - -e 's/@''GNULIB_CEILF''@/$(GL_GNULIB_CEILF)/g' \ - -e 's/@''GNULIB_CEILL''@/$(GL_GNULIB_CEILL)/g' \ - -e 's/@''GNULIB_COPYSIGN''@/$(GL_GNULIB_COPYSIGN)/g' \ - -e 's/@''GNULIB_COPYSIGNF''@/$(GL_GNULIB_COPYSIGNF)/g' \ - -e 's/@''GNULIB_COPYSIGNL''@/$(GL_GNULIB_COPYSIGNL)/g' \ - -e 's/@''GNULIB_COSF''@/$(GL_GNULIB_COSF)/g' \ - -e 's/@''GNULIB_COSL''@/$(GL_GNULIB_COSL)/g' \ - -e 's/@''GNULIB_COSHF''@/$(GL_GNULIB_COSHF)/g' \ - -e 's/@''GNULIB_EXPF''@/$(GL_GNULIB_EXPF)/g' \ - -e 's/@''GNULIB_EXPL''@/$(GL_GNULIB_EXPL)/g' \ - -e 's/@''GNULIB_EXP2''@/$(GL_GNULIB_EXP2)/g' \ - -e 's/@''GNULIB_EXP2F''@/$(GL_GNULIB_EXP2F)/g' \ - -e 's/@''GNULIB_EXP2L''@/$(GL_GNULIB_EXP2L)/g' \ - -e 's/@''GNULIB_EXPM1''@/$(GL_GNULIB_EXPM1)/g' \ - -e 's/@''GNULIB_EXPM1F''@/$(GL_GNULIB_EXPM1F)/g' \ - -e 's/@''GNULIB_EXPM1L''@/$(GL_GNULIB_EXPM1L)/g' \ - -e 's/@''GNULIB_FABSF''@/$(GL_GNULIB_FABSF)/g' \ - -e 's/@''GNULIB_FABSL''@/$(GL_GNULIB_FABSL)/g' \ - -e 's/@''GNULIB_FLOOR''@/$(GL_GNULIB_FLOOR)/g' \ - -e 's/@''GNULIB_FLOORF''@/$(GL_GNULIB_FLOORF)/g' \ - -e 's/@''GNULIB_FLOORL''@/$(GL_GNULIB_FLOORL)/g' \ - -e 's/@''GNULIB_FMA''@/$(GL_GNULIB_FMA)/g' \ - -e 's/@''GNULIB_FMAF''@/$(GL_GNULIB_FMAF)/g' \ - -e 's/@''GNULIB_FMAL''@/$(GL_GNULIB_FMAL)/g' \ - -e 's/@''GNULIB_FMOD''@/$(GL_GNULIB_FMOD)/g' \ - -e 's/@''GNULIB_FMODF''@/$(GL_GNULIB_FMODF)/g' \ - -e 's/@''GNULIB_FMODL''@/$(GL_GNULIB_FMODL)/g' \ - -e 's/@''GNULIB_FREXPF''@/$(GL_GNULIB_FREXPF)/g' \ - -e 's/@''GNULIB_FREXP''@/$(GL_GNULIB_FREXP)/g' \ - -e 's/@''GNULIB_FREXPL''@/$(GL_GNULIB_FREXPL)/g' \ - -e 's/@''GNULIB_HYPOT''@/$(GL_GNULIB_HYPOT)/g' \ - -e 's/@''GNULIB_HYPOTF''@/$(GL_GNULIB_HYPOTF)/g' \ - -e 's/@''GNULIB_HYPOTL''@/$(GL_GNULIB_HYPOTL)/g' \ + -e 's/@''GNULIB_ACOSF''@/$(GNULIB_ACOSF)/g' \ + -e 's/@''GNULIB_ACOSL''@/$(GNULIB_ACOSL)/g' \ + -e 's/@''GNULIB_ASINF''@/$(GNULIB_ASINF)/g' \ + -e 's/@''GNULIB_ASINL''@/$(GNULIB_ASINL)/g' \ + -e 's/@''GNULIB_ATANF''@/$(GNULIB_ATANF)/g' \ + -e 's/@''GNULIB_ATANL''@/$(GNULIB_ATANL)/g' \ + -e 's/@''GNULIB_ATAN2F''@/$(GNULIB_ATAN2F)/g' \ + -e 's/@''GNULIB_CBRT''@/$(GNULIB_CBRT)/g' \ + -e 's/@''GNULIB_CBRTF''@/$(GNULIB_CBRTF)/g' \ + -e 's/@''GNULIB_CBRTL''@/$(GNULIB_CBRTL)/g' \ + -e 's/@''GNULIB_CEIL''@/$(GNULIB_CEIL)/g' \ + -e 's/@''GNULIB_CEILF''@/$(GNULIB_CEILF)/g' \ + -e 's/@''GNULIB_CEILL''@/$(GNULIB_CEILL)/g' \ + -e 's/@''GNULIB_COPYSIGN''@/$(GNULIB_COPYSIGN)/g' \ + -e 's/@''GNULIB_COPYSIGNF''@/$(GNULIB_COPYSIGNF)/g' \ + -e 's/@''GNULIB_COPYSIGNL''@/$(GNULIB_COPYSIGNL)/g' \ + -e 's/@''GNULIB_COSF''@/$(GNULIB_COSF)/g' \ + -e 's/@''GNULIB_COSL''@/$(GNULIB_COSL)/g' \ + -e 's/@''GNULIB_COSHF''@/$(GNULIB_COSHF)/g' \ + -e 's/@''GNULIB_EXPF''@/$(GNULIB_EXPF)/g' \ + -e 's/@''GNULIB_EXPL''@/$(GNULIB_EXPL)/g' \ + -e 's/@''GNULIB_EXP2''@/$(GNULIB_EXP2)/g' \ + -e 's/@''GNULIB_EXP2F''@/$(GNULIB_EXP2F)/g' \ + -e 's/@''GNULIB_EXP2L''@/$(GNULIB_EXP2L)/g' \ + -e 's/@''GNULIB_EXPM1''@/$(GNULIB_EXPM1)/g' \ + -e 's/@''GNULIB_EXPM1F''@/$(GNULIB_EXPM1F)/g' \ + -e 's/@''GNULIB_EXPM1L''@/$(GNULIB_EXPM1L)/g' \ + -e 's/@''GNULIB_FABSF''@/$(GNULIB_FABSF)/g' \ + -e 's/@''GNULIB_FABSL''@/$(GNULIB_FABSL)/g' \ + -e 's/@''GNULIB_FLOOR''@/$(GNULIB_FLOOR)/g' \ + -e 's/@''GNULIB_FLOORF''@/$(GNULIB_FLOORF)/g' \ + -e 's/@''GNULIB_FLOORL''@/$(GNULIB_FLOORL)/g' \ + -e 's/@''GNULIB_FMA''@/$(GNULIB_FMA)/g' \ + -e 's/@''GNULIB_FMAF''@/$(GNULIB_FMAF)/g' \ + -e 's/@''GNULIB_FMAL''@/$(GNULIB_FMAL)/g' \ + -e 's/@''GNULIB_FMOD''@/$(GNULIB_FMOD)/g' \ + -e 's/@''GNULIB_FMODF''@/$(GNULIB_FMODF)/g' \ + -e 's/@''GNULIB_FMODL''@/$(GNULIB_FMODL)/g' \ + -e 's/@''GNULIB_FREXPF''@/$(GNULIB_FREXPF)/g' \ + -e 's/@''GNULIB_FREXP''@/$(GNULIB_FREXP)/g' \ + -e 's/@''GNULIB_FREXPL''@/$(GNULIB_FREXPL)/g' \ + -e 's/@''GNULIB_HYPOT''@/$(GNULIB_HYPOT)/g' \ + -e 's/@''GNULIB_HYPOTF''@/$(GNULIB_HYPOTF)/g' \ + -e 's/@''GNULIB_HYPOTL''@/$(GNULIB_HYPOTL)/g' \ < $(srcdir)/math.in.h | \ - sed -e 's/@''GNULIB_ILOGB''@/$(GL_GNULIB_ILOGB)/g' \ - -e 's/@''GNULIB_ILOGBF''@/$(GL_GNULIB_ILOGBF)/g' \ - -e 's/@''GNULIB_ILOGBL''@/$(GL_GNULIB_ILOGBL)/g' \ - -e 's/@''GNULIB_ISFINITE''@/$(GL_GNULIB_ISFINITE)/g' \ - -e 's/@''GNULIB_ISINF''@/$(GL_GNULIB_ISINF)/g' \ - -e 's/@''GNULIB_ISNAN''@/$(GL_GNULIB_ISNAN)/g' \ - -e 's/@''GNULIB_ISNANF''@/$(GL_GNULIB_ISNANF)/g' \ - -e 's/@''GNULIB_ISNAND''@/$(GL_GNULIB_ISNAND)/g' \ - -e 's/@''GNULIB_ISNANL''@/$(GL_GNULIB_ISNANL)/g' \ - -e 's/@''GNULIB_LDEXPF''@/$(GL_GNULIB_LDEXPF)/g' \ - -e 's/@''GNULIB_LDEXPL''@/$(GL_GNULIB_LDEXPL)/g' \ - -e 's/@''GNULIB_LOG''@/$(GL_GNULIB_LOG)/g' \ - -e 's/@''GNULIB_LOGF''@/$(GL_GNULIB_LOGF)/g' \ - -e 's/@''GNULIB_LOGL''@/$(GL_GNULIB_LOGL)/g' \ - -e 's/@''GNULIB_LOG10''@/$(GL_GNULIB_LOG10)/g' \ - -e 's/@''GNULIB_LOG10F''@/$(GL_GNULIB_LOG10F)/g' \ - -e 's/@''GNULIB_LOG10L''@/$(GL_GNULIB_LOG10L)/g' \ - -e 's/@''GNULIB_LOG1P''@/$(GL_GNULIB_LOG1P)/g' \ - -e 's/@''GNULIB_LOG1PF''@/$(GL_GNULIB_LOG1PF)/g' \ - -e 's/@''GNULIB_LOG1PL''@/$(GL_GNULIB_LOG1PL)/g' \ - -e 's/@''GNULIB_LOG2''@/$(GL_GNULIB_LOG2)/g' \ - -e 's/@''GNULIB_LOG2F''@/$(GL_GNULIB_LOG2F)/g' \ - -e 's/@''GNULIB_LOG2L''@/$(GL_GNULIB_LOG2L)/g' \ - -e 's/@''GNULIB_LOGB''@/$(GL_GNULIB_LOGB)/g' \ - -e 's/@''GNULIB_LOGBF''@/$(GL_GNULIB_LOGBF)/g' \ - -e 's/@''GNULIB_LOGBL''@/$(GL_GNULIB_LOGBL)/g' \ - -e 's/@''GNULIB_MODF''@/$(GL_GNULIB_MODF)/g' \ - -e 's/@''GNULIB_MODFF''@/$(GL_GNULIB_MODFF)/g' \ - -e 's/@''GNULIB_MODFL''@/$(GL_GNULIB_MODFL)/g' \ - -e 's/@''GNULIB_POWF''@/$(GL_GNULIB_POWF)/g' \ - -e 's/@''GNULIB_REMAINDER''@/$(GL_GNULIB_REMAINDER)/g' \ - -e 's/@''GNULIB_REMAINDERF''@/$(GL_GNULIB_REMAINDERF)/g' \ - -e 's/@''GNULIB_REMAINDERL''@/$(GL_GNULIB_REMAINDERL)/g' \ - -e 's/@''GNULIB_RINT''@/$(GL_GNULIB_RINT)/g' \ - -e 's/@''GNULIB_RINTF''@/$(GL_GNULIB_RINTF)/g' \ - -e 's/@''GNULIB_RINTL''@/$(GL_GNULIB_RINTL)/g' \ - -e 's/@''GNULIB_ROUND''@/$(GL_GNULIB_ROUND)/g' \ - -e 's/@''GNULIB_ROUNDF''@/$(GL_GNULIB_ROUNDF)/g' \ - -e 's/@''GNULIB_ROUNDL''@/$(GL_GNULIB_ROUNDL)/g' \ - -e 's/@''GNULIB_SIGNBIT''@/$(GL_GNULIB_SIGNBIT)/g' \ - -e 's/@''GNULIB_SINF''@/$(GL_GNULIB_SINF)/g' \ - -e 's/@''GNULIB_SINL''@/$(GL_GNULIB_SINL)/g' \ - -e 's/@''GNULIB_SINHF''@/$(GL_GNULIB_SINHF)/g' \ - -e 's/@''GNULIB_SQRTF''@/$(GL_GNULIB_SQRTF)/g' \ - -e 's/@''GNULIB_SQRTL''@/$(GL_GNULIB_SQRTL)/g' \ - -e 's/@''GNULIB_TANF''@/$(GL_GNULIB_TANF)/g' \ - -e 's/@''GNULIB_TANL''@/$(GL_GNULIB_TANL)/g' \ - -e 's/@''GNULIB_TANHF''@/$(GL_GNULIB_TANHF)/g' \ - -e 's/@''GNULIB_TRUNC''@/$(GL_GNULIB_TRUNC)/g' \ - -e 's/@''GNULIB_TRUNCF''@/$(GL_GNULIB_TRUNCF)/g' \ - -e 's/@''GNULIB_TRUNCL''@/$(GL_GNULIB_TRUNCL)/g' \ - -e 's/@''GNULIB_MDA_J0''@/$(GL_GNULIB_MDA_J0)/g' \ - -e 's/@''GNULIB_MDA_J1''@/$(GL_GNULIB_MDA_J1)/g' \ - -e 's/@''GNULIB_MDA_JN''@/$(GL_GNULIB_MDA_JN)/g' \ - -e 's/@''GNULIB_MDA_Y0''@/$(GL_GNULIB_MDA_Y0)/g' \ - -e 's/@''GNULIB_MDA_Y1''@/$(GL_GNULIB_MDA_Y1)/g' \ - -e 's/@''GNULIB_MDA_YN''@/$(GL_GNULIB_MDA_YN)/g' \ + sed -e 's/@''GNULIB_ILOGB''@/$(GNULIB_ILOGB)/g' \ + -e 's/@''GNULIB_ILOGBF''@/$(GNULIB_ILOGBF)/g' \ + -e 's/@''GNULIB_ILOGBL''@/$(GNULIB_ILOGBL)/g' \ + -e 's/@''GNULIB_ISFINITE''@/$(GNULIB_ISFINITE)/g' \ + -e 's/@''GNULIB_ISINF''@/$(GNULIB_ISINF)/g' \ + -e 's/@''GNULIB_ISNAN''@/$(GNULIB_ISNAN)/g' \ + -e 's/@''GNULIB_ISNANF''@/$(GNULIB_ISNANF)/g' \ + -e 's/@''GNULIB_ISNAND''@/$(GNULIB_ISNAND)/g' \ + -e 's/@''GNULIB_ISNANL''@/$(GNULIB_ISNANL)/g' \ + -e 's/@''GNULIB_LDEXPF''@/$(GNULIB_LDEXPF)/g' \ + -e 's/@''GNULIB_LDEXPL''@/$(GNULIB_LDEXPL)/g' \ + -e 's/@''GNULIB_LOG''@/$(GNULIB_LOG)/g' \ + -e 's/@''GNULIB_LOGF''@/$(GNULIB_LOGF)/g' \ + -e 's/@''GNULIB_LOGL''@/$(GNULIB_LOGL)/g' \ + -e 's/@''GNULIB_LOG10''@/$(GNULIB_LOG10)/g' \ + -e 's/@''GNULIB_LOG10F''@/$(GNULIB_LOG10F)/g' \ + -e 's/@''GNULIB_LOG10L''@/$(GNULIB_LOG10L)/g' \ + -e 's/@''GNULIB_LOG1P''@/$(GNULIB_LOG1P)/g' \ + -e 's/@''GNULIB_LOG1PF''@/$(GNULIB_LOG1PF)/g' \ + -e 's/@''GNULIB_LOG1PL''@/$(GNULIB_LOG1PL)/g' \ + -e 's/@''GNULIB_LOG2''@/$(GNULIB_LOG2)/g' \ + -e 's/@''GNULIB_LOG2F''@/$(GNULIB_LOG2F)/g' \ + -e 's/@''GNULIB_LOG2L''@/$(GNULIB_LOG2L)/g' \ + -e 's/@''GNULIB_LOGB''@/$(GNULIB_LOGB)/g' \ + -e 's/@''GNULIB_LOGBF''@/$(GNULIB_LOGBF)/g' \ + -e 's/@''GNULIB_LOGBL''@/$(GNULIB_LOGBL)/g' \ + -e 's/@''GNULIB_MODF''@/$(GNULIB_MODF)/g' \ + -e 's/@''GNULIB_MODFF''@/$(GNULIB_MODFF)/g' \ + -e 's/@''GNULIB_MODFL''@/$(GNULIB_MODFL)/g' \ + -e 's/@''GNULIB_POWF''@/$(GNULIB_POWF)/g' \ + -e 's/@''GNULIB_REMAINDER''@/$(GNULIB_REMAINDER)/g' \ + -e 's/@''GNULIB_REMAINDERF''@/$(GNULIB_REMAINDERF)/g' \ + -e 's/@''GNULIB_REMAINDERL''@/$(GNULIB_REMAINDERL)/g' \ + -e 's/@''GNULIB_RINT''@/$(GNULIB_RINT)/g' \ + -e 's/@''GNULIB_RINTF''@/$(GNULIB_RINTF)/g' \ + -e 's/@''GNULIB_RINTL''@/$(GNULIB_RINTL)/g' \ + -e 's/@''GNULIB_ROUND''@/$(GNULIB_ROUND)/g' \ + -e 's/@''GNULIB_ROUNDF''@/$(GNULIB_ROUNDF)/g' \ + -e 's/@''GNULIB_ROUNDL''@/$(GNULIB_ROUNDL)/g' \ + -e 's/@''GNULIB_SIGNBIT''@/$(GNULIB_SIGNBIT)/g' \ + -e 's/@''GNULIB_SINF''@/$(GNULIB_SINF)/g' \ + -e 's/@''GNULIB_SINL''@/$(GNULIB_SINL)/g' \ + -e 's/@''GNULIB_SINHF''@/$(GNULIB_SINHF)/g' \ + -e 's/@''GNULIB_SQRTF''@/$(GNULIB_SQRTF)/g' \ + -e 's/@''GNULIB_SQRTL''@/$(GNULIB_SQRTL)/g' \ + -e 's/@''GNULIB_TANF''@/$(GNULIB_TANF)/g' \ + -e 's/@''GNULIB_TANL''@/$(GNULIB_TANL)/g' \ + -e 's/@''GNULIB_TANHF''@/$(GNULIB_TANHF)/g' \ + -e 's/@''GNULIB_TRUNC''@/$(GNULIB_TRUNC)/g' \ + -e 's/@''GNULIB_TRUNCF''@/$(GNULIB_TRUNCF)/g' \ + -e 's/@''GNULIB_TRUNCL''@/$(GNULIB_TRUNCL)/g' \ + -e 's/@''GNULIB_MDA_J0''@/$(GNULIB_MDA_J0)/g' \ + -e 's/@''GNULIB_MDA_J1''@/$(GNULIB_MDA_J1)/g' \ + -e 's/@''GNULIB_MDA_JN''@/$(GNULIB_MDA_JN)/g' \ + -e 's/@''GNULIB_MDA_Y0''@/$(GNULIB_MDA_Y0)/g' \ + -e 's/@''GNULIB_MDA_Y1''@/$(GNULIB_MDA_Y1)/g' \ + -e 's/@''GNULIB_MDA_YN''@/$(GNULIB_MDA_YN)/g' \ | \ sed -e 's|@''HAVE_ACOSF''@|$(HAVE_ACOSF)|g' \ -e 's|@''HAVE_ACOSL''@|$(HAVE_ACOSL)|g' \ @@ -1079,9 +940,9 @@ -e 's|@''REPLACE_TRUNCL''@|$(REPLACE_TRUNCL)|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)' \ - > $@-t - $(AM_V_at)mv $@-t $@ + -e '/definition of _GL_WARN_ON_USE/r $(WARN_ON_USE_H)'; \ + } > $@-t && \ + mv $@-t $@ MOSTLYCLEANFILES += math.h math.h-t EXTRA_DIST += math.in.h @@ -1090,19 +951,19 @@ ## begin gnulib module memchr -if GL_COND_OBJ_MEMCHR -libgnu_a_SOURCES += memchr.c -endif -EXTRA_DIST += memchr.valgrind +EXTRA_DIST += memchr.c memchr.valgrind + +EXTRA_libgnu_a_SOURCES += memchr.c ## end gnulib module memchr ## begin gnulib module mempcpy -if GL_COND_OBJ_MEMPCPY -libgnu_a_SOURCES += mempcpy.c -endif + +EXTRA_DIST += mempcpy.c + +EXTRA_libgnu_a_SOURCES += mempcpy.c ## end gnulib module mempcpy @@ -1114,29 +975,28 @@ ## begin gnulib module msvc-inval -if GL_COND_OBJ_MSVC_INVAL -libgnu_a_SOURCES += msvc-inval.c -endif -EXTRA_DIST += msvc-inval.h +EXTRA_DIST += msvc-inval.c msvc-inval.h + +EXTRA_libgnu_a_SOURCES += msvc-inval.c ## end gnulib module msvc-inval ## begin gnulib module msvc-nothrow -if GL_COND_OBJ_MSVC_NOTHROW -libgnu_a_SOURCES += msvc-nothrow.c -endif -EXTRA_DIST += msvc-nothrow.h +EXTRA_DIST += msvc-nothrow.c msvc-nothrow.h + +EXTRA_libgnu_a_SOURCES += msvc-nothrow.c ## end gnulib module msvc-nothrow ## begin gnulib module open -if GL_COND_OBJ_OPEN -libgnu_a_SOURCES += open.c -endif + +EXTRA_DIST += open.c + +EXTRA_libgnu_a_SOURCES += open.c ## end gnulib module open @@ -1180,46 +1040,39 @@ ## begin gnulib module raise -if GL_COND_OBJ_RAISE -libgnu_a_SOURCES += raise.c -endif + +EXTRA_DIST += raise.c + +EXTRA_libgnu_a_SOURCES += raise.c ## end gnulib module raise ## begin gnulib module rawmemchr -if GL_COND_OBJ_RAWMEMCHR -libgnu_a_SOURCES += rawmemchr.c -endif -EXTRA_DIST += rawmemchr.valgrind +EXTRA_DIST += rawmemchr.c rawmemchr.valgrind + +EXTRA_libgnu_a_SOURCES += rawmemchr.c ## end gnulib module rawmemchr ## begin gnulib module read -if GL_COND_OBJ_READ -libgnu_a_SOURCES += read.c -endif -## end gnulib module read +EXTRA_DIST += read.c -## begin gnulib module readlink - -if GL_COND_OBJ_READLINK -libgnu_a_SOURCES += readlink.c -endif +EXTRA_libgnu_a_SOURCES += read.c -## end gnulib module readlink +## end gnulib module read -## begin gnulib module realloc-gnu +## begin gnulib module readlink -EXTRA_DIST += realloc.c +EXTRA_DIST += readlink.c -EXTRA_libgnu_a_SOURCES += realloc.c +EXTRA_libgnu_a_SOURCES += readlink.c -## end gnulib module realloc-gnu +## end gnulib module readlink ## begin gnulib module realloc-posix @@ -1230,27 +1083,21 @@ ## end gnulib module realloc-posix -## begin gnulib module reallocarray - -if GL_COND_OBJ_REALLOCARRAY -libgnu_a_SOURCES += reallocarray.c -endif +## begin gnulib module rename -## end gnulib module reallocarray -## begin gnulib module rename +EXTRA_DIST += rename.c -if GL_COND_OBJ_RENAME -libgnu_a_SOURCES += rename.c -endif +EXTRA_libgnu_a_SOURCES += rename.c ## end gnulib module rename ## begin gnulib module rmdir -if GL_COND_OBJ_RMDIR -libgnu_a_SOURCES += rmdir.c -endif + +EXTRA_DIST += rmdir.c + +EXTRA_libgnu_a_SOURCES += rmdir.c ## end gnulib module rmdir @@ -1261,6 +1108,14 @@ ## end gnulib module same-inode +## begin gnulib module scratch_buffer + +libgnu_a_SOURCES += malloc/scratch_buffer_dupfree.c malloc/scratch_buffer_grow.c malloc/scratch_buffer_grow_preserve.c malloc/scratch_buffer_set_array_size.c + +EXTRA_DIST += malloc/scratch_buffer.h scratch_buffer.h + +## end gnulib module scratch_buffer + ## begin gnulib module signal-h BUILT_SOURCES += signal.h @@ -1268,17 +1123,18 @@ # We need the following in order to create when the system # doesn't have a complete one. signal.h: signal.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_NONNULL_H) $(WARN_ON_USE_H) - $(gl_V_at)$(SED_HEADER_STDOUT) \ - -e 's|@''GUARD_PREFIX''@|GL|g' \ + $(AM_V_GEN)rm -f $@-t $@ && \ + { echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */' && \ + sed -e 's|@''GUARD_PREFIX''@|GL|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_SIGNAL_H''@|$(NEXT_SIGNAL_H)|g' \ - -e 's/@''GNULIB_PTHREAD_SIGMASK''@/$(GL_GNULIB_PTHREAD_SIGMASK)/g' \ - -e 's/@''GNULIB_RAISE''@/$(GL_GNULIB_RAISE)/g' \ - -e 's/@''GNULIB_SIGNAL_H_SIGPIPE''@/$(GL_GNULIB_SIGNAL_H_SIGPIPE)/g' \ - -e 's/@''GNULIB_SIGPROCMASK''@/$(GL_GNULIB_SIGPROCMASK)/g' \ - -e 's/@''GNULIB_SIGACTION''@/$(GL_GNULIB_SIGACTION)/g' \ + -e 's/@''GNULIB_PTHREAD_SIGMASK''@/$(GNULIB_PTHREAD_SIGMASK)/g' \ + -e 's/@''GNULIB_RAISE''@/$(GNULIB_RAISE)/g' \ + -e 's/@''GNULIB_SIGNAL_H_SIGPIPE''@/$(GNULIB_SIGNAL_H_SIGPIPE)/g' \ + -e 's/@''GNULIB_SIGPROCMASK''@/$(GNULIB_SIGPROCMASK)/g' \ + -e 's/@''GNULIB_SIGACTION''@/$(GNULIB_SIGACTION)/g' \ -e 's|@''HAVE_POSIX_SIGNALBLOCKING''@|$(HAVE_POSIX_SIGNALBLOCKING)|g' \ -e 's|@''HAVE_PTHREAD_SIGMASK''@|$(HAVE_PTHREAD_SIGMASK)|g' \ -e 's|@''HAVE_RAISE''@|$(HAVE_RAISE)|g' \ @@ -1293,8 +1149,9 @@ -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)' \ - $(srcdir)/signal.in.h > $@-t - $(AM_V_at)mv $@-t $@ + < $(srcdir)/signal.in.h; \ + } > $@-t && \ + mv $@-t $@ MOSTLYCLEANFILES += signal.h signal.h-t EXTRA_DIST += signal.in.h @@ -1303,11 +1160,10 @@ ## begin gnulib module signbit -if GL_COND_OBJ_SIGNBIT3 -libgnu_a_SOURCES += signbitf.c signbitd.c signbitl.c -endif -EXTRA_DIST += float+.h +EXTRA_DIST += float+.h signbitd.c signbitf.c signbitl.c + +EXTRA_libgnu_a_SOURCES += signbitd.c signbitf.c signbitl.c ## end gnulib module signbit @@ -1376,13 +1232,10 @@ ## begin gnulib module stat -if GL_COND_OBJ_STAT -libgnu_a_SOURCES += stat.c -endif -EXTRA_DIST += stat-w32.c stat-w32.h +EXTRA_DIST += stat-w32.c stat-w32.h stat.c -EXTRA_libgnu_a_SOURCES += stat-w32.c +EXTRA_libgnu_a_SOURCES += stat-w32.c stat.c ## end gnulib module stat @@ -1394,26 +1247,28 @@ ## end gnulib module stat-time -## begin gnulib module stdckdint +## begin gnulib module stdbool -BUILT_SOURCES += $(STDCKDINT_H) +BUILT_SOURCES += $(STDBOOL_H) -# We need the following in order to create when the system -# doesn't have one that works with the given compiler. -if GL_GENERATE_STDCKDINT_H -stdckdint.h: stdckdint.in.h $(top_builddir)/config.status - $(gl_V_at)$(SED_HEADER_STDOUT) \ - $(srcdir)/stdckdint.in.h > $@-t - $(AM_V_at)mv $@-t $@ +# We need the following in order to create when the system +# doesn't have one that works. +if GL_GENERATE_STDBOOL_H +stdbool.h: stdbool.in.h $(top_builddir)/config.status + $(AM_V_GEN)rm -f $@-t $@ && \ + { echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \ + sed -e 's/@''HAVE__BOOL''@/$(HAVE__BOOL)/g' < $(srcdir)/stdbool.in.h; \ + } > $@-t && \ + mv $@-t $@ else -stdckdint.h: $(top_builddir)/config.status +stdbool.h: $(top_builddir)/config.status rm -f $@ endif -MOSTLYCLEANFILES += stdckdint.h stdckdint.h-t +MOSTLYCLEANFILES += stdbool.h stdbool.h-t -EXTRA_DIST += intprops-internal.h stdckdint.in.h +EXTRA_DIST += stdbool.in.h -## end gnulib module stdckdint +## end gnulib module stdbool ## begin gnulib module stddef @@ -1423,8 +1278,9 @@ # doesn't have one that works with the given compiler. if GL_GENERATE_STDDEF_H stddef.h: stddef.in.h $(top_builddir)/config.status - $(gl_V_at)$(SED_HEADER_STDOUT) \ - -e 's|@''GUARD_PREFIX''@|GL|g' \ + $(AM_V_GEN)rm -f $@-t $@ && \ + { echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */' && \ + sed -e 's|@''GUARD_PREFIX''@|GL|g' \ -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \ -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \ -e 's|@''PRAGMA_COLUMNS''@|@PRAGMA_COLUMNS@|g' \ @@ -1432,8 +1288,9 @@ -e 's|@''HAVE_MAX_ALIGN_T''@|$(HAVE_MAX_ALIGN_T)|g' \ -e 's|@''HAVE_WCHAR_T''@|$(HAVE_WCHAR_T)|g' \ -e 's|@''REPLACE_NULL''@|$(REPLACE_NULL)|g' \ - $(srcdir)/stddef.in.h > $@-t - $(AM_V_at)mv $@-t $@ + < $(srcdir)/stddef.in.h; \ + } > $@-t && \ + mv $@-t $@ else stddef.h: $(top_builddir)/config.status rm -f $@ @@ -1452,8 +1309,9 @@ # doesn't have one that works with the given compiler. if GL_GENERATE_STDINT_H stdint.h: stdint.in.h $(top_builddir)/config.status - $(gl_V_at)$(SED_HEADER_STDOUT) \ - -e 's|@''GUARD_PREFIX''@|GL|g' \ + $(AM_V_GEN)rm -f $@-t $@ && \ + { echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \ + sed -e 's|@''GUARD_PREFIX''@|GL|g' \ -e 's/@''HAVE_STDINT_H''@/$(HAVE_STDINT_H)/g' \ -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \ -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \ @@ -1479,9 +1337,10 @@ -e 's/@''BITSIZEOF_WINT_T''@/$(BITSIZEOF_WINT_T)/g' \ -e 's/@''HAVE_SIGNED_WINT_T''@/$(HAVE_SIGNED_WINT_T)/g' \ -e 's/@''WINT_T_SUFFIX''@/$(WINT_T_SUFFIX)/g' \ - -e 's/@''GNULIBHEADERS_OVERRIDE_WINT_T''@/$(GNULIBHEADERS_OVERRIDE_WINT_T)/g' \ - $(srcdir)/stdint.in.h > $@-t - $(AM_V_at)mv $@-t $@ + -e 's/@''GNULIB_OVERRIDES_WINT_T''@/$(GNULIB_OVERRIDES_WINT_T)/g' \ + < $(srcdir)/stdint.in.h; \ + } > $@-t && \ + mv $@-t $@ else stdint.h: $(top_builddir)/config.status rm -f $@ @@ -1499,72 +1358,72 @@ # We need the following in order to create 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) - $(gl_V_at)$(SED_HEADER_STDOUT) \ - -e 's|@''GUARD_PREFIX''@|GL|g' \ + $(AM_V_GEN)rm -f $@-t $@ && \ + { echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */' && \ + sed -e 's|@''GUARD_PREFIX''@|GL|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''@/$(GL_GNULIB_DPRINTF)/g' \ - -e 's/@''GNULIB_FCLOSE''@/$(GL_GNULIB_FCLOSE)/g' \ - -e 's/@''GNULIB_FDOPEN''@/$(GL_GNULIB_FDOPEN)/g' \ - -e 's/@''GNULIB_FFLUSH''@/$(GL_GNULIB_FFLUSH)/g' \ - -e 's/@''GNULIB_FGETC''@/$(GL_GNULIB_FGETC)/g' \ - -e 's/@''GNULIB_FGETS''@/$(GL_GNULIB_FGETS)/g' \ - -e 's/@''GNULIB_FOPEN''@/$(GL_GNULIB_FOPEN)/g' \ - -e 's/@''GNULIB_FOPEN_GNU''@/$(GL_GNULIB_FOPEN_GNU)/g' \ - -e 's/@''GNULIB_FPRINTF''@/$(GL_GNULIB_FPRINTF)/g' \ - -e 's/@''GNULIB_FPRINTF_POSIX''@/$(GL_GNULIB_FPRINTF_POSIX)/g' \ - -e 's/@''GNULIB_FPURGE''@/$(GL_GNULIB_FPURGE)/g' \ - -e 's/@''GNULIB_FPUTC''@/$(GL_GNULIB_FPUTC)/g' \ - -e 's/@''GNULIB_FPUTS''@/$(GL_GNULIB_FPUTS)/g' \ - -e 's/@''GNULIB_FREAD''@/$(GL_GNULIB_FREAD)/g' \ - -e 's/@''GNULIB_FREOPEN''@/$(GL_GNULIB_FREOPEN)/g' \ - -e 's/@''GNULIB_FSCANF''@/$(GL_GNULIB_FSCANF)/g' \ - -e 's/@''GNULIB_FSEEK''@/$(GL_GNULIB_FSEEK)/g' \ - -e 's/@''GNULIB_FSEEKO''@/$(GL_GNULIB_FSEEKO)/g' \ - -e 's/@''GNULIB_FTELL''@/$(GL_GNULIB_FTELL)/g' \ - -e 's/@''GNULIB_FTELLO''@/$(GL_GNULIB_FTELLO)/g' \ - -e 's/@''GNULIB_FWRITE''@/$(GL_GNULIB_FWRITE)/g' \ - -e 's/@''GNULIB_GETC''@/$(GL_GNULIB_GETC)/g' \ - -e 's/@''GNULIB_GETCHAR''@/$(GL_GNULIB_GETCHAR)/g' \ - -e 's/@''GNULIB_GETDELIM''@/$(GL_GNULIB_GETDELIM)/g' \ - -e 's/@''GNULIB_GETLINE''@/$(GL_GNULIB_GETLINE)/g' \ - -e 's/@''GNULIB_OBSTACK_PRINTF''@/$(GL_GNULIB_OBSTACK_PRINTF)/g' \ - -e 's/@''GNULIB_OBSTACK_PRINTF_POSIX''@/$(GL_GNULIB_OBSTACK_PRINTF_POSIX)/g' \ - -e 's/@''GNULIB_PCLOSE''@/$(GL_GNULIB_PCLOSE)/g' \ - -e 's/@''GNULIB_PERROR''@/$(GL_GNULIB_PERROR)/g' \ - -e 's/@''GNULIB_POPEN''@/$(GL_GNULIB_POPEN)/g' \ - -e 's/@''GNULIB_PRINTF''@/$(GL_GNULIB_PRINTF)/g' \ - -e 's/@''GNULIB_PRINTF_POSIX''@/$(GL_GNULIB_PRINTF_POSIX)/g' \ - -e 's/@''GNULIB_PUTC''@/$(GL_GNULIB_PUTC)/g' \ - -e 's/@''GNULIB_PUTCHAR''@/$(GL_GNULIB_PUTCHAR)/g' \ - -e 's/@''GNULIB_PUTS''@/$(GL_GNULIB_PUTS)/g' \ - -e 's/@''GNULIB_REMOVE''@/$(GL_GNULIB_REMOVE)/g' \ - -e 's/@''GNULIB_RENAME''@/$(GL_GNULIB_RENAME)/g' \ - -e 's/@''GNULIB_RENAMEAT''@/$(GL_GNULIB_RENAMEAT)/g' \ - -e 's/@''GNULIB_SCANF''@/$(GL_GNULIB_SCANF)/g' \ - -e 's/@''GNULIB_SNPRINTF''@/$(GL_GNULIB_SNPRINTF)/g' \ - -e 's/@''GNULIB_SPRINTF_POSIX''@/$(GL_GNULIB_SPRINTF_POSIX)/g' \ - -e 's/@''GNULIB_STDIO_H_NONBLOCKING''@/$(GL_GNULIB_STDIO_H_NONBLOCKING)/g' \ - -e 's/@''GNULIB_STDIO_H_SIGPIPE''@/$(GL_GNULIB_STDIO_H_SIGPIPE)/g' \ - -e 's/@''GNULIB_TMPFILE''@/$(GL_GNULIB_TMPFILE)/g' \ - -e 's/@''GNULIB_VASPRINTF''@/$(GL_GNULIB_VASPRINTF)/g' \ - -e 's/@''GNULIB_VDPRINTF''@/$(GL_GNULIB_VDPRINTF)/g' \ - -e 's/@''GNULIB_VFPRINTF''@/$(GL_GNULIB_VFPRINTF)/g' \ - -e 's/@''GNULIB_VFPRINTF_POSIX''@/$(GL_GNULIB_VFPRINTF_POSIX)/g' \ - -e 's/@''GNULIB_VFSCANF''@/$(GL_GNULIB_VFSCANF)/g' \ - -e 's/@''GNULIB_VSCANF''@/$(GL_GNULIB_VSCANF)/g' \ - -e 's/@''GNULIB_VPRINTF''@/$(GL_GNULIB_VPRINTF)/g' \ - -e 's/@''GNULIB_VPRINTF_POSIX''@/$(GL_GNULIB_VPRINTF_POSIX)/g' \ - -e 's/@''GNULIB_VSNPRINTF''@/$(GL_GNULIB_VSNPRINTF)/g' \ - -e 's/@''GNULIB_VSPRINTF_POSIX''@/$(GL_GNULIB_VSPRINTF_POSIX)/g' \ - -e 's/@''GNULIB_MDA_FCLOSEALL''@/$(GL_GNULIB_MDA_FCLOSEALL)/g' \ - -e 's/@''GNULIB_MDA_FDOPEN''@/$(GL_GNULIB_MDA_FDOPEN)/g' \ - -e 's/@''GNULIB_MDA_FILENO''@/$(GL_GNULIB_MDA_FILENO)/g' \ - -e 's/@''GNULIB_MDA_GETW''@/$(GL_GNULIB_MDA_GETW)/g' \ - -e 's/@''GNULIB_MDA_PUTW''@/$(GL_GNULIB_MDA_PUTW)/g' \ - -e 's/@''GNULIB_MDA_TEMPNAM''@/$(GL_GNULIB_MDA_TEMPNAM)/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' \ + -e 's/@''GNULIB_MDA_FCLOSEALL''@/$(GNULIB_MDA_FCLOSEALL)/g' \ + -e 's/@''GNULIB_MDA_FDOPEN''@/$(GNULIB_MDA_FDOPEN)/g' \ + -e 's/@''GNULIB_MDA_FILENO''@/$(GNULIB_MDA_FILENO)/g' \ + -e 's/@''GNULIB_MDA_GETW''@/$(GNULIB_MDA_GETW)/g' \ + -e 's/@''GNULIB_MDA_PUTW''@/$(GNULIB_MDA_PUTW)/g' \ + -e 's/@''GNULIB_MDA_TEMPNAM''@/$(GNULIB_MDA_TEMPNAM)/g' \ < $(srcdir)/stdio.in.h | \ sed -e 's|@''HAVE_DECL_FCLOSEALL''@|$(HAVE_DECL_FCLOSEALL)|g' \ -e 's|@''HAVE_DECL_FPURGE''@|$(HAVE_DECL_FPURGE)|g' \ @@ -1572,9 +1431,7 @@ -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_GETW''@|$(HAVE_DECL_GETW)|g' \ -e 's|@''HAVE_DECL_OBSTACK_PRINTF''@|$(HAVE_DECL_OBSTACK_PRINTF)|g' \ - -e 's|@''HAVE_DECL_PUTW''@|$(HAVE_DECL_PUTW)|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' \ @@ -1590,7 +1447,6 @@ -e 's|@''REPLACE_FDOPEN''@|$(REPLACE_FDOPEN)|g' \ -e 's|@''REPLACE_FFLUSH''@|$(REPLACE_FFLUSH)|g' \ -e 's|@''REPLACE_FOPEN''@|$(REPLACE_FOPEN)|g' \ - -e 's|@''REPLACE_FOPEN_FOR_FOPEN_GNU''@|$(REPLACE_FOPEN_FOR_FOPEN_GNU)|g' \ -e 's|@''REPLACE_FPRINTF''@|$(REPLACE_FPRINTF)|g' \ -e 's|@''REPLACE_FPURGE''@|$(REPLACE_FPURGE)|g' \ -e 's|@''REPLACE_FREOPEN''@|$(REPLACE_FREOPEN)|g' \ @@ -1621,18 +1477,11 @@ -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)' \ - > $@-t - $(AM_V_at)mv $@-t $@ + -e '/definition of _GL_WARN_ON_USE/r $(WARN_ON_USE_H)'; \ + } > $@-t && \ + mv $@-t $@ MOSTLYCLEANFILES += stdio.h stdio.h-t -if GL_COND_OBJ_STDIO_READ -libgnu_a_SOURCES += stdio-read.c -endif -if GL_COND_OBJ_STDIO_WRITE -libgnu_a_SOURCES += stdio-write.c -endif - EXTRA_DIST += stdio.in.h ## end gnulib module stdio @@ -1645,62 +1494,56 @@ # doesn't have one that works with the given compiler. stdlib.h: stdlib.in.h $(top_builddir)/config.status $(CXXDEFS_H) \ $(_NORETURN_H) $(ARG_NONNULL_H) $(WARN_ON_USE_H) - $(gl_V_at)$(SED_HEADER_STDOUT) \ - -e 's|@''GUARD_PREFIX''@|GL|g' \ + $(AM_V_GEN)rm -f $@-t $@ && \ + { echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */' && \ + sed -e 's|@''GUARD_PREFIX''@|GL|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_STDLIB_H''@|$(NEXT_STDLIB_H)|g' \ - -e 's/@''GNULIB__EXIT''@/$(GL_GNULIB__EXIT)/g' \ - -e 's/@''GNULIB_ALIGNED_ALLOC''@/$(GL_GNULIB_ALIGNED_ALLOC)/g' \ - -e 's/@''GNULIB_ATOLL''@/$(GL_GNULIB_ATOLL)/g' \ - -e 's/@''GNULIB_CALLOC_GNU''@/$(GL_GNULIB_CALLOC_GNU)/g' \ - -e 's/@''GNULIB_CALLOC_POSIX''@/$(GL_GNULIB_CALLOC_POSIX)/g' \ - -e 's/@''GNULIB_CANONICALIZE_FILE_NAME''@/$(GL_GNULIB_CANONICALIZE_FILE_NAME)/g' \ - -e 's/@''GNULIB_FREE_POSIX''@/$(GL_GNULIB_FREE_POSIX)/g' \ - -e 's/@''GNULIB_GETLOADAVG''@/$(GL_GNULIB_GETLOADAVG)/g' \ - -e 's/@''GNULIB_GETPROGNAME''@/$(GL_GNULIB_GETPROGNAME)/g' \ - -e 's/@''GNULIB_GETSUBOPT''@/$(GL_GNULIB_GETSUBOPT)/g' \ - -e 's/@''GNULIB_GRANTPT''@/$(GL_GNULIB_GRANTPT)/g' \ - -e 's/@''GNULIB_MALLOC_GNU''@/$(GL_GNULIB_MALLOC_GNU)/g' \ - -e 's/@''GNULIB_MALLOC_POSIX''@/$(GL_GNULIB_MALLOC_POSIX)/g' \ - -e 's/@''GNULIB_MBSTOWCS''@/$(GL_GNULIB_MBSTOWCS)/g' \ - -e 's/@''GNULIB_MBTOWC''@/$(GL_GNULIB_MBTOWC)/g' \ - -e 's/@''GNULIB_MKDTEMP''@/$(GL_GNULIB_MKDTEMP)/g' \ - -e 's/@''GNULIB_MKOSTEMP''@/$(GL_GNULIB_MKOSTEMP)/g' \ - -e 's/@''GNULIB_MKOSTEMPS''@/$(GL_GNULIB_MKOSTEMPS)/g' \ - -e 's/@''GNULIB_MKSTEMP''@/$(GL_GNULIB_MKSTEMP)/g' \ - -e 's/@''GNULIB_MKSTEMPS''@/$(GL_GNULIB_MKSTEMPS)/g' \ - -e 's/@''GNULIB_POSIX_MEMALIGN''@/$(GL_GNULIB_POSIX_MEMALIGN)/g' \ - -e 's/@''GNULIB_POSIX_OPENPT''@/$(GL_GNULIB_POSIX_OPENPT)/g' \ - -e 's/@''GNULIB_PTSNAME''@/$(GL_GNULIB_PTSNAME)/g' \ - -e 's/@''GNULIB_PTSNAME_R''@/$(GL_GNULIB_PTSNAME_R)/g' \ - -e 's/@''GNULIB_PUTENV''@/$(GL_GNULIB_PUTENV)/g' \ - -e 's/@''GNULIB_QSORT_R''@/$(GL_GNULIB_QSORT_R)/g' \ - -e 's/@''GNULIB_RANDOM''@/$(GL_GNULIB_RANDOM)/g' \ - -e 's/@''GNULIB_RANDOM_R''@/$(GL_GNULIB_RANDOM_R)/g' \ - -e 's/@''GNULIB_REALLOC_GNU''@/$(GL_GNULIB_REALLOC_GNU)/g' \ - -e 's/@''GNULIB_REALLOC_POSIX''@/$(GL_GNULIB_REALLOC_POSIX)/g' \ - -e 's/@''GNULIB_REALLOCARRAY''@/$(GL_GNULIB_REALLOCARRAY)/g' \ - -e 's/@''GNULIB_REALPATH''@/$(GL_GNULIB_REALPATH)/g' \ - -e 's/@''GNULIB_RPMATCH''@/$(GL_GNULIB_RPMATCH)/g' \ - -e 's/@''GNULIB_SECURE_GETENV''@/$(GL_GNULIB_SECURE_GETENV)/g' \ - -e 's/@''GNULIB_SETENV''@/$(GL_GNULIB_SETENV)/g' \ - -e 's/@''GNULIB_STRTOD''@/$(GL_GNULIB_STRTOD)/g' \ - -e 's/@''GNULIB_STRTOL''@/$(GL_GNULIB_STRTOL)/g' \ - -e 's/@''GNULIB_STRTOLD''@/$(GL_GNULIB_STRTOLD)/g' \ - -e 's/@''GNULIB_STRTOLL''@/$(GL_GNULIB_STRTOLL)/g' \ - -e 's/@''GNULIB_STRTOUL''@/$(GL_GNULIB_STRTOUL)/g' \ - -e 's/@''GNULIB_STRTOULL''@/$(GL_GNULIB_STRTOULL)/g' \ - -e 's/@''GNULIB_SYSTEM_POSIX''@/$(GL_GNULIB_SYSTEM_POSIX)/g' \ - -e 's/@''GNULIB_UNLOCKPT''@/$(GL_GNULIB_UNLOCKPT)/g' \ - -e 's/@''GNULIB_UNSETENV''@/$(GL_GNULIB_UNSETENV)/g' \ - -e 's/@''GNULIB_WCTOMB''@/$(GL_GNULIB_WCTOMB)/g' \ - -e 's/@''GNULIB_MDA_ECVT''@/$(GL_GNULIB_MDA_ECVT)/g' \ - -e 's/@''GNULIB_MDA_FCVT''@/$(GL_GNULIB_MDA_FCVT)/g' \ - -e 's/@''GNULIB_MDA_GCVT''@/$(GL_GNULIB_MDA_GCVT)/g' \ - -e 's/@''GNULIB_MDA_MKTEMP''@/$(GL_GNULIB_MDA_MKTEMP)/g' \ - -e 's/@''GNULIB_MDA_PUTENV''@/$(GL_GNULIB_MDA_PUTENV)/g' \ + -e 's/@''GNULIB__EXIT''@/$(GNULIB__EXIT)/g' \ + -e 's/@''GNULIB_ALIGNED_ALLOC''@/$(GNULIB_ALIGNED_ALLOC)/g' \ + -e 's/@''GNULIB_ATOLL''@/$(GNULIB_ATOLL)/g' \ + -e 's/@''GNULIB_CALLOC_POSIX''@/$(GNULIB_CALLOC_POSIX)/g' \ + -e 's/@''GNULIB_CANONICALIZE_FILE_NAME''@/$(GNULIB_CANONICALIZE_FILE_NAME)/g' \ + -e 's/@''GNULIB_FREE_POSIX''@/$(GNULIB_FREE_POSIX)/g' \ + -e 's/@''GNULIB_GETLOADAVG''@/$(GNULIB_GETLOADAVG)/g' \ + -e 's/@''GNULIB_GETSUBOPT''@/$(GNULIB_GETSUBOPT)/g' \ + -e 's/@''GNULIB_GRANTPT''@/$(GNULIB_GRANTPT)/g' \ + -e 's/@''GNULIB_MALLOC_POSIX''@/$(GNULIB_MALLOC_POSIX)/g' \ + -e 's/@''GNULIB_MBTOWC''@/$(GNULIB_MBTOWC)/g' \ + -e 's/@''GNULIB_MKDTEMP''@/$(GNULIB_MKDTEMP)/g' \ + -e 's/@''GNULIB_MKOSTEMP''@/$(GNULIB_MKOSTEMP)/g' \ + -e 's/@''GNULIB_MKOSTEMPS''@/$(GNULIB_MKOSTEMPS)/g' \ + -e 's/@''GNULIB_MKSTEMP''@/$(GNULIB_MKSTEMP)/g' \ + -e 's/@''GNULIB_MKSTEMPS''@/$(GNULIB_MKSTEMPS)/g' \ + -e 's/@''GNULIB_POSIX_MEMALIGN''@/$(GNULIB_POSIX_MEMALIGN)/g' \ + -e 's/@''GNULIB_POSIX_OPENPT''@/$(GNULIB_POSIX_OPENPT)/g' \ + -e 's/@''GNULIB_PTSNAME''@/$(GNULIB_PTSNAME)/g' \ + -e 's/@''GNULIB_PTSNAME_R''@/$(GNULIB_PTSNAME_R)/g' \ + -e 's/@''GNULIB_PUTENV''@/$(GNULIB_PUTENV)/g' \ + -e 's/@''GNULIB_QSORT_R''@/$(GNULIB_QSORT_R)/g' \ + -e 's/@''GNULIB_RANDOM''@/$(GNULIB_RANDOM)/g' \ + -e 's/@''GNULIB_RANDOM_R''@/$(GNULIB_RANDOM_R)/g' \ + -e 's/@''GNULIB_REALLOC_POSIX''@/$(GNULIB_REALLOC_POSIX)/g' \ + -e 's/@''GNULIB_REALLOCARRAY''@/$(GNULIB_REALLOCARRAY)/g' \ + -e 's/@''GNULIB_REALPATH''@/$(GNULIB_REALPATH)/g' \ + -e 's/@''GNULIB_RPMATCH''@/$(GNULIB_RPMATCH)/g' \ + -e 's/@''GNULIB_SECURE_GETENV''@/$(GNULIB_SECURE_GETENV)/g' \ + -e 's/@''GNULIB_SETENV''@/$(GNULIB_SETENV)/g' \ + -e 's/@''GNULIB_STRTOD''@/$(GNULIB_STRTOD)/g' \ + -e 's/@''GNULIB_STRTOLD''@/$(GNULIB_STRTOLD)/g' \ + -e 's/@''GNULIB_STRTOLL''@/$(GNULIB_STRTOLL)/g' \ + -e 's/@''GNULIB_STRTOULL''@/$(GNULIB_STRTOULL)/g' \ + -e 's/@''GNULIB_SYSTEM_POSIX''@/$(GNULIB_SYSTEM_POSIX)/g' \ + -e 's/@''GNULIB_UNLOCKPT''@/$(GNULIB_UNLOCKPT)/g' \ + -e 's/@''GNULIB_UNSETENV''@/$(GNULIB_UNSETENV)/g' \ + -e 's/@''GNULIB_WCTOMB''@/$(GNULIB_WCTOMB)/g' \ + -e 's/@''GNULIB_MDA_ECVT''@/$(GNULIB_MDA_ECVT)/g' \ + -e 's/@''GNULIB_MDA_FCVT''@/$(GNULIB_MDA_FCVT)/g' \ + -e 's/@''GNULIB_MDA_GCVT''@/$(GNULIB_MDA_GCVT)/g' \ + -e 's/@''GNULIB_MDA_MKTEMP''@/$(GNULIB_MDA_MKTEMP)/g' \ + -e 's/@''GNULIB_MDA_PUTENV''@/$(GNULIB_MDA_PUTENV)/g' \ < $(srcdir)/stdlib.in.h | \ sed -e 's|@''HAVE__EXIT''@|$(HAVE__EXIT)|g' \ -e 's|@''HAVE_ALIGNED_ALLOC''@|$(HAVE_ALIGNED_ALLOC)|g' \ @@ -1710,8 +1553,6 @@ -e 's|@''HAVE_DECL_FCVT''@|$(HAVE_DECL_FCVT)|g' \ -e 's|@''HAVE_DECL_GCVT''@|$(HAVE_DECL_GCVT)|g' \ -e 's|@''HAVE_DECL_GETLOADAVG''@|$(HAVE_DECL_GETLOADAVG)|g' \ - -e 's|@''HAVE_DECL_PROGRAM_INVOCATION_NAME''@|$(HAVE_DECL_PROGRAM_INVOCATION_NAME)|g' \ - -e 's|@''HAVE_GETPROGNAME''@|$(HAVE_GETPROGNAME)|g' \ -e 's|@''HAVE_GETSUBOPT''@|$(HAVE_GETSUBOPT)|g' \ -e 's|@''HAVE_GRANTPT''@|$(HAVE_GRANTPT)|g' \ -e 's|@''HAVE_INITSTATE''@|$(HAVE_INITSTATE)|g' \ @@ -1738,61 +1579,42 @@ -e 's|@''HAVE_SETSTATE''@|$(HAVE_SETSTATE)|g' \ -e 's|@''HAVE_DECL_SETSTATE''@|$(HAVE_DECL_SETSTATE)|g' \ -e 's|@''HAVE_STRTOD''@|$(HAVE_STRTOD)|g' \ - -e 's|@''HAVE_STRTOL''@|$(HAVE_STRTOL)|g' \ -e 's|@''HAVE_STRTOLD''@|$(HAVE_STRTOLD)|g' \ -e 's|@''HAVE_STRTOLL''@|$(HAVE_STRTOLL)|g' \ - -e 's|@''HAVE_STRTOUL''@|$(HAVE_STRTOUL)|g' \ -e 's|@''HAVE_STRTOULL''@|$(HAVE_STRTOULL)|g' \ -e 's|@''HAVE_STRUCT_RANDOM_DATA''@|$(HAVE_STRUCT_RANDOM_DATA)|g' \ -e 's|@''HAVE_SYS_LOADAVG_H''@|$(HAVE_SYS_LOADAVG_H)|g' \ -e 's|@''HAVE_UNLOCKPT''@|$(HAVE_UNLOCKPT)|g' \ -e 's|@''HAVE_DECL_UNSETENV''@|$(HAVE_DECL_UNSETENV)|g' \ - -e 's|@''REPLACE__EXIT''@|$(REPLACE__EXIT)|g' \ -e 's|@''REPLACE_ALIGNED_ALLOC''@|$(REPLACE_ALIGNED_ALLOC)|g' \ - -e 's|@''REPLACE_CALLOC_FOR_CALLOC_GNU''@|$(REPLACE_CALLOC_FOR_CALLOC_GNU)|g' \ - -e 's|@''REPLACE_CALLOC_FOR_CALLOC_POSIX''@|$(REPLACE_CALLOC_FOR_CALLOC_POSIX)|g' \ + -e 's|@''REPLACE_CALLOC''@|$(REPLACE_CALLOC)|g' \ -e 's|@''REPLACE_CANONICALIZE_FILE_NAME''@|$(REPLACE_CANONICALIZE_FILE_NAME)|g' \ -e 's|@''REPLACE_FREE''@|$(REPLACE_FREE)|g' \ - -e 's|@''REPLACE_GETLOADAVG''@|$(REPLACE_GETLOADAVG)|g' \ - -e 's|@''REPLACE_GETPROGNAME''@|$(REPLACE_GETPROGNAME)|g' \ - -e 's|@''REPLACE_GETSUBOPT''@|$(REPLACE_GETSUBOPT)|g' \ -e 's|@''REPLACE_INITSTATE''@|$(REPLACE_INITSTATE)|g' \ - -e 's|@''REPLACE_MALLOC_FOR_MALLOC_GNU''@|$(REPLACE_MALLOC_FOR_MALLOC_GNU)|g' \ - -e 's|@''REPLACE_MALLOC_FOR_MALLOC_POSIX''@|$(REPLACE_MALLOC_FOR_MALLOC_POSIX)|g' \ - -e 's|@''REPLACE_MB_CUR_MAX''@|$(REPLACE_MB_CUR_MAX)|g' \ - -e 's|@''REPLACE_MBSTOWCS''@|$(REPLACE_MBSTOWCS)|g' \ + -e 's|@''REPLACE_MALLOC''@|$(REPLACE_MALLOC)|g' \ -e 's|@''REPLACE_MBTOWC''@|$(REPLACE_MBTOWC)|g' \ - -e 's|@''REPLACE_MKOSTEMP''@|$(REPLACE_MKOSTEMP)|g' \ - -e 's|@''REPLACE_MKOSTEMPS''@|$(REPLACE_MKOSTEMPS)|g' \ -e 's|@''REPLACE_MKSTEMP''@|$(REPLACE_MKSTEMP)|g' \ -e 's|@''REPLACE_POSIX_MEMALIGN''@|$(REPLACE_POSIX_MEMALIGN)|g' \ - -e 's|@''REPLACE_POSIX_OPENPT''@|$(REPLACE_POSIX_OPENPT)|g' \ -e 's|@''REPLACE_PTSNAME''@|$(REPLACE_PTSNAME)|g' \ -e 's|@''REPLACE_PTSNAME_R''@|$(REPLACE_PTSNAME_R)|g' \ -e 's|@''REPLACE_PUTENV''@|$(REPLACE_PUTENV)|g' \ -e 's|@''REPLACE_QSORT_R''@|$(REPLACE_QSORT_R)|g' \ -e 's|@''REPLACE_RANDOM''@|$(REPLACE_RANDOM)|g' \ -e 's|@''REPLACE_RANDOM_R''@|$(REPLACE_RANDOM_R)|g' \ - -e 's|@''REPLACE_REALLOC_FOR_REALLOC_GNU''@|$(REPLACE_REALLOC_FOR_REALLOC_GNU)|g' \ - -e 's|@''REPLACE_REALLOC_FOR_REALLOC_POSIX''@|$(REPLACE_REALLOC_FOR_REALLOC_POSIX)|g' \ - -e 's|@''REPLACE_REALLOCARRAY''@|$(REPLACE_REALLOCARRAY)|g' \ + -e 's|@''REPLACE_REALLOC''@|$(REPLACE_REALLOC)|g' \ -e 's|@''REPLACE_REALPATH''@|$(REPLACE_REALPATH)|g' \ -e 's|@''REPLACE_SETENV''@|$(REPLACE_SETENV)|g' \ -e 's|@''REPLACE_SETSTATE''@|$(REPLACE_SETSTATE)|g' \ -e 's|@''REPLACE_STRTOD''@|$(REPLACE_STRTOD)|g' \ - -e 's|@''REPLACE_STRTOL''@|$(REPLACE_STRTOL)|g' \ -e 's|@''REPLACE_STRTOLD''@|$(REPLACE_STRTOLD)|g' \ - -e 's|@''REPLACE_STRTOLL''@|$(REPLACE_STRTOLL)|g' \ - -e 's|@''REPLACE_STRTOUL''@|$(REPLACE_STRTOUL)|g' \ - -e 's|@''REPLACE_STRTOULL''@|$(REPLACE_STRTOULL)|g' \ -e 's|@''REPLACE_UNSETENV''@|$(REPLACE_UNSETENV)|g' \ -e 's|@''REPLACE_WCTOMB''@|$(REPLACE_WCTOMB)|g' \ -e '/definitions of _GL_FUNCDECL_RPL/r $(CXXDEFS_H)' \ -e '/definition of _Noreturn/r $(_NORETURN_H)' \ -e '/definition of _GL_ARG_NONNULL/r $(ARG_NONNULL_H)' \ - -e '/definition of _GL_WARN_ON_USE/r $(WARN_ON_USE_H)' \ - > $@-t - $(AM_V_at)mv $@-t $@ + -e '/definition of _GL_WARN_ON_USE/r $(WARN_ON_USE_H)'; \ + } > $@-t && \ + mv $@-t $@ MOSTLYCLEANFILES += stdlib.h stdlib.h-t EXTRA_DIST += stdlib.in.h @@ -1801,27 +1623,28 @@ ## begin gnulib module strdup-posix -if GL_COND_OBJ_STRDUP -libgnu_a_SOURCES += strdup.c -endif + +EXTRA_DIST += strdup.c + +EXTRA_libgnu_a_SOURCES += strdup.c ## end gnulib module strdup-posix ## begin gnulib module strerror -if GL_COND_OBJ_STRERROR -libgnu_a_SOURCES += strerror.c -endif + +EXTRA_DIST += strerror.c + +EXTRA_libgnu_a_SOURCES += strerror.c ## end gnulib module strerror ## begin gnulib module strerror-override -if GL_COND_OBJ_STRERROR_OVERRIDE -libgnu_a_SOURCES += strerror-override.c -endif -EXTRA_DIST += strerror-override.h +EXTRA_DIST += strerror-override.c strerror-override.h + +EXTRA_libgnu_a_SOURCES += strerror-override.c ## end gnulib module strerror-override @@ -1832,57 +1655,56 @@ # We need the following in order to create when the system # doesn't have one that works with the given compiler. string.h: string.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_NONNULL_H) $(WARN_ON_USE_H) - $(gl_V_at)$(SED_HEADER_STDOUT) \ - -e 's|@''GUARD_PREFIX''@|GL|g' \ + $(AM_V_GEN)rm -f $@-t $@ && \ + { echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */' && \ + sed -e 's|@''GUARD_PREFIX''@|GL|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_STRING_H''@|$(NEXT_STRING_H)|g' \ - -e 's/@''GNULIB_EXPLICIT_BZERO''@/$(GL_GNULIB_EXPLICIT_BZERO)/g' \ - -e 's/@''GNULIB_FFSL''@/$(GL_GNULIB_FFSL)/g' \ - -e 's/@''GNULIB_FFSLL''@/$(GL_GNULIB_FFSLL)/g' \ - -e 's/@''GNULIB_MBSLEN''@/$(GL_GNULIB_MBSLEN)/g' \ - -e 's/@''GNULIB_MBSNLEN''@/$(GL_GNULIB_MBSNLEN)/g' \ - -e 's/@''GNULIB_MBSCHR''@/$(GL_GNULIB_MBSCHR)/g' \ - -e 's/@''GNULIB_MBSRCHR''@/$(GL_GNULIB_MBSRCHR)/g' \ - -e 's/@''GNULIB_MBSSTR''@/$(GL_GNULIB_MBSSTR)/g' \ - -e 's/@''GNULIB_MBSCASECMP''@/$(GL_GNULIB_MBSCASECMP)/g' \ - -e 's/@''GNULIB_MBSNCASECMP''@/$(GL_GNULIB_MBSNCASECMP)/g' \ - -e 's/@''GNULIB_MBSPCASECMP''@/$(GL_GNULIB_MBSPCASECMP)/g' \ - -e 's/@''GNULIB_MBSCASESTR''@/$(GL_GNULIB_MBSCASESTR)/g' \ - -e 's/@''GNULIB_MBSCSPN''@/$(GL_GNULIB_MBSCSPN)/g' \ - -e 's/@''GNULIB_MBSPBRK''@/$(GL_GNULIB_MBSPBRK)/g' \ - -e 's/@''GNULIB_MBSSPN''@/$(GL_GNULIB_MBSSPN)/g' \ - -e 's/@''GNULIB_MBSSEP''@/$(GL_GNULIB_MBSSEP)/g' \ - -e 's/@''GNULIB_MBSTOK_R''@/$(GL_GNULIB_MBSTOK_R)/g' \ - -e 's/@''GNULIB_MEMCHR''@/$(GL_GNULIB_MEMCHR)/g' \ - -e 's/@''GNULIB_MEMMEM''@/$(GL_GNULIB_MEMMEM)/g' \ - -e 's/@''GNULIB_MEMPCPY''@/$(GL_GNULIB_MEMPCPY)/g' \ - -e 's/@''GNULIB_MEMRCHR''@/$(GL_GNULIB_MEMRCHR)/g' \ - -e 's/@''GNULIB_MEMSET_EXPLICIT''@/$(GL_GNULIB_MEMSET_EXPLICIT)/g' \ - -e 's/@''GNULIB_RAWMEMCHR''@/$(GL_GNULIB_RAWMEMCHR)/g' \ - -e 's/@''GNULIB_STPCPY''@/$(GL_GNULIB_STPCPY)/g' \ - -e 's/@''GNULIB_STPNCPY''@/$(GL_GNULIB_STPNCPY)/g' \ - -e 's/@''GNULIB_STRCHRNUL''@/$(GL_GNULIB_STRCHRNUL)/g' \ - -e 's/@''GNULIB_STRDUP''@/$(GL_GNULIB_STRDUP)/g' \ - -e 's/@''GNULIB_STRNCAT''@/$(GL_GNULIB_STRNCAT)/g' \ - -e 's/@''GNULIB_STRNDUP''@/$(GL_GNULIB_STRNDUP)/g' \ - -e 's/@''GNULIB_STRNLEN''@/$(GL_GNULIB_STRNLEN)/g' \ - -e 's/@''GNULIB_STRPBRK''@/$(GL_GNULIB_STRPBRK)/g' \ - -e 's/@''GNULIB_STRSEP''@/$(GL_GNULIB_STRSEP)/g' \ - -e 's/@''GNULIB_STRSTR''@/$(GL_GNULIB_STRSTR)/g' \ - -e 's/@''GNULIB_STRCASESTR''@/$(GL_GNULIB_STRCASESTR)/g' \ - -e 's/@''GNULIB_STRTOK_R''@/$(GL_GNULIB_STRTOK_R)/g' \ - -e 's/@''GNULIB_STRERROR''@/$(GL_GNULIB_STRERROR)/g' \ - -e 's/@''GNULIB_STRERROR_R''@/$(GL_GNULIB_STRERROR_R)/g' \ - -e 's/@''GNULIB_STRERRORNAME_NP''@/$(GL_GNULIB_STRERRORNAME_NP)/g' \ - -e 's/@''GNULIB_SIGABBREV_NP''@/$(GL_GNULIB_SIGABBREV_NP)/g' \ - -e 's/@''GNULIB_SIGDESCR_NP''@/$(GL_GNULIB_SIGDESCR_NP)/g' \ - -e 's/@''GNULIB_STRSIGNAL''@/$(GL_GNULIB_STRSIGNAL)/g' \ - -e 's/@''GNULIB_STRVERSCMP''@/$(GL_GNULIB_STRVERSCMP)/g' \ - -e 's/@''GNULIB_MDA_MEMCCPY''@/$(GL_GNULIB_MDA_MEMCCPY)/g' \ - -e 's/@''GNULIB_MDA_STRDUP''@/$(GL_GNULIB_MDA_STRDUP)/g' \ - -e 's/@''GNULIB_FREE_POSIX''@/$(GL_GNULIB_FREE_POSIX)/g' \ + -e 's/@''GNULIB_EXPLICIT_BZERO''@/$(GNULIB_EXPLICIT_BZERO)/g' \ + -e 's/@''GNULIB_FFSL''@/$(GNULIB_FFSL)/g' \ + -e 's/@''GNULIB_FFSLL''@/$(GNULIB_FFSLL)/g' \ + -e 's/@''GNULIB_MBSLEN''@/$(GNULIB_MBSLEN)/g' \ + -e 's/@''GNULIB_MBSNLEN''@/$(GNULIB_MBSNLEN)/g' \ + -e 's/@''GNULIB_MBSCHR''@/$(GNULIB_MBSCHR)/g' \ + -e 's/@''GNULIB_MBSRCHR''@/$(GNULIB_MBSRCHR)/g' \ + -e 's/@''GNULIB_MBSSTR''@/$(GNULIB_MBSSTR)/g' \ + -e 's/@''GNULIB_MBSCASECMP''@/$(GNULIB_MBSCASECMP)/g' \ + -e 's/@''GNULIB_MBSNCASECMP''@/$(GNULIB_MBSNCASECMP)/g' \ + -e 's/@''GNULIB_MBSPCASECMP''@/$(GNULIB_MBSPCASECMP)/g' \ + -e 's/@''GNULIB_MBSCASESTR''@/$(GNULIB_MBSCASESTR)/g' \ + -e 's/@''GNULIB_MBSCSPN''@/$(GNULIB_MBSCSPN)/g' \ + -e 's/@''GNULIB_MBSPBRK''@/$(GNULIB_MBSPBRK)/g' \ + -e 's/@''GNULIB_MBSSPN''@/$(GNULIB_MBSSPN)/g' \ + -e 's/@''GNULIB_MBSSEP''@/$(GNULIB_MBSSEP)/g' \ + -e 's/@''GNULIB_MBSTOK_R''@/$(GNULIB_MBSTOK_R)/g' \ + -e 's/@''GNULIB_MEMCHR''@/$(GNULIB_MEMCHR)/g' \ + -e 's/@''GNULIB_MEMMEM''@/$(GNULIB_MEMMEM)/g' \ + -e 's/@''GNULIB_MEMPCPY''@/$(GNULIB_MEMPCPY)/g' \ + -e 's/@''GNULIB_MEMRCHR''@/$(GNULIB_MEMRCHR)/g' \ + -e 's/@''GNULIB_RAWMEMCHR''@/$(GNULIB_RAWMEMCHR)/g' \ + -e 's/@''GNULIB_STPCPY''@/$(GNULIB_STPCPY)/g' \ + -e 's/@''GNULIB_STPNCPY''@/$(GNULIB_STPNCPY)/g' \ + -e 's/@''GNULIB_STRCHRNUL''@/$(GNULIB_STRCHRNUL)/g' \ + -e 's/@''GNULIB_STRDUP''@/$(GNULIB_STRDUP)/g' \ + -e 's/@''GNULIB_STRNCAT''@/$(GNULIB_STRNCAT)/g' \ + -e 's/@''GNULIB_STRNDUP''@/$(GNULIB_STRNDUP)/g' \ + -e 's/@''GNULIB_STRNLEN''@/$(GNULIB_STRNLEN)/g' \ + -e 's/@''GNULIB_STRPBRK''@/$(GNULIB_STRPBRK)/g' \ + -e 's/@''GNULIB_STRSEP''@/$(GNULIB_STRSEP)/g' \ + -e 's/@''GNULIB_STRSTR''@/$(GNULIB_STRSTR)/g' \ + -e 's/@''GNULIB_STRCASESTR''@/$(GNULIB_STRCASESTR)/g' \ + -e 's/@''GNULIB_STRTOK_R''@/$(GNULIB_STRTOK_R)/g' \ + -e 's/@''GNULIB_STRERROR''@/$(GNULIB_STRERROR)/g' \ + -e 's/@''GNULIB_STRERROR_R''@/$(GNULIB_STRERROR_R)/g' \ + -e 's/@''GNULIB_STRERRORNAME_NP''@/$(GNULIB_STRERRORNAME_NP)/g' \ + -e 's/@''GNULIB_SIGABBREV_NP''@/$(GNULIB_SIGABBREV_NP)/g' \ + -e 's/@''GNULIB_SIGDESCR_NP''@/$(GNULIB_SIGDESCR_NP)/g' \ + -e 's/@''GNULIB_STRSIGNAL''@/$(GNULIB_STRSIGNAL)/g' \ + -e 's/@''GNULIB_STRVERSCMP''@/$(GNULIB_STRVERSCMP)/g' \ + -e 's/@''GNULIB_MDA_MEMCCPY''@/$(GNULIB_MDA_MEMCCPY)/g' \ + -e 's/@''GNULIB_MDA_STRDUP''@/$(GNULIB_MDA_STRDUP)/g' \ < $(srcdir)/string.in.h | \ sed -e 's|@''HAVE_EXPLICIT_BZERO''@|$(HAVE_EXPLICIT_BZERO)|g' \ -e 's|@''HAVE_FFSL''@|$(HAVE_FFSL)|g' \ @@ -1891,7 +1713,6 @@ -e 's|@''HAVE_DECL_MEMMEM''@|$(HAVE_DECL_MEMMEM)|g' \ -e 's|@''HAVE_MEMPCPY''@|$(HAVE_MEMPCPY)|g' \ -e 's|@''HAVE_DECL_MEMRCHR''@|$(HAVE_DECL_MEMRCHR)|g' \ - -e 's|@''HAVE_MEMSET_EXPLICIT''@|$(HAVE_MEMSET_EXPLICIT)|g' \ -e 's|@''HAVE_RAWMEMCHR''@|$(HAVE_RAWMEMCHR)|g' \ -e 's|@''HAVE_STPCPY''@|$(HAVE_STPCPY)|g' \ -e 's|@''HAVE_STPNCPY''@|$(HAVE_STPNCPY)|g' \ @@ -1912,9 +1733,6 @@ -e 's|@''REPLACE_FFSLL''@|$(REPLACE_FFSLL)|g' \ -e 's|@''REPLACE_MEMCHR''@|$(REPLACE_MEMCHR)|g' \ -e 's|@''REPLACE_MEMMEM''@|$(REPLACE_MEMMEM)|g' \ - -e 's|@''REPLACE_MEMPCPY''@|$(REPLACE_MEMPCPY)|g' \ - -e 's|@''REPLACE_FREE''@|$(REPLACE_FREE)|g' \ - -e 's|@''REPLACE_STPCPY''@|$(REPLACE_STPCPY)|g' \ -e 's|@''REPLACE_STPNCPY''@|$(REPLACE_STPNCPY)|g' \ -e 's|@''REPLACE_STRCHRNUL''@|$(REPLACE_STRCHRNUL)|g' \ -e 's|@''REPLACE_STRDUP''@|$(REPLACE_STRDUP)|g' \ @@ -1931,9 +1749,10 @@ -e 's|@''UNDEFINE_STRTOK_R''@|$(UNDEFINE_STRTOK_R)|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)' \ - > $@-t - $(AM_V_at)mv $@-t $@ + -e '/definition of _GL_WARN_ON_USE/r $(WARN_ON_USE_H)'; \ + < $(srcdir)/string.in.h; \ + } > $@-t && \ + mv $@-t $@ MOSTLYCLEANFILES += string.h string.h-t EXTRA_DIST += string.in.h @@ -1942,9 +1761,10 @@ ## begin gnulib module symlink -if GL_COND_OBJ_SYMLINK -libgnu_a_SOURCES += symlink.c -endif + +EXTRA_DIST += symlink.c + +EXTRA_libgnu_a_SOURCES += symlink.c ## end gnulib module symlink @@ -1955,35 +1775,35 @@ # We need the following in order to create when the system # has one that is incomplete. sys/stat.h: sys_stat.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_NONNULL_H) $(WARN_ON_USE_H) - $(AM_V_GEN)$(MKDIR_P) '%reldir%/sys' - $(AM_V_at)$(SED_HEADER_STDOUT) \ - -e 's|@''GUARD_PREFIX''@|GL|g' \ + $(AM_V_at)$(MKDIR_P) sys + $(AM_V_GEN)rm -f $@-t $@ && \ + { echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \ + sed -e 's|@''GUARD_PREFIX''@|GL|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_SYS_STAT_H''@|$(NEXT_SYS_STAT_H)|g' \ -e 's|@''WINDOWS_64_BIT_ST_SIZE''@|$(WINDOWS_64_BIT_ST_SIZE)|g' \ -e 's|@''WINDOWS_STAT_TIMESPEC''@|$(WINDOWS_STAT_TIMESPEC)|g' \ - -e 's/@''GNULIB_CHMOD''@/$(GL_GNULIB_CHMOD)/g' \ - -e 's/@''GNULIB_FCHMODAT''@/$(GL_GNULIB_FCHMODAT)/g' \ - -e 's/@''GNULIB_FSTAT''@/$(GL_GNULIB_FSTAT)/g' \ - -e 's/@''GNULIB_FSTATAT''@/$(GL_GNULIB_FSTATAT)/g' \ - -e 's/@''GNULIB_FUTIMENS''@/$(GL_GNULIB_FUTIMENS)/g' \ - -e 's/@''GNULIB_GETUMASK''@/$(GL_GNULIB_GETUMASK)/g' \ - -e 's/@''GNULIB_LCHMOD''@/$(GL_GNULIB_LCHMOD)/g' \ - -e 's/@''GNULIB_LSTAT''@/$(GL_GNULIB_LSTAT)/g' \ - -e 's/@''GNULIB_MKDIR''@/$(GL_GNULIB_MKDIR)/g' \ - -e 's/@''GNULIB_MKDIRAT''@/$(GL_GNULIB_MKDIRAT)/g' \ - -e 's/@''GNULIB_MKFIFO''@/$(GL_GNULIB_MKFIFO)/g' \ - -e 's/@''GNULIB_MKFIFOAT''@/$(GL_GNULIB_MKFIFOAT)/g' \ - -e 's/@''GNULIB_MKNOD''@/$(GL_GNULIB_MKNOD)/g' \ - -e 's/@''GNULIB_MKNODAT''@/$(GL_GNULIB_MKNODAT)/g' \ - -e 's/@''GNULIB_STAT''@/$(GL_GNULIB_STAT)/g' \ - -e 's/@''GNULIB_UTIMENSAT''@/$(GL_GNULIB_UTIMENSAT)/g' \ - -e 's/@''GNULIB_OVERRIDES_STRUCT_STAT''@/$(GL_GNULIB_OVERRIDES_STRUCT_STAT)/g' \ - -e 's/@''GNULIB_MDA_CHMOD''@/$(GL_GNULIB_MDA_CHMOD)/g' \ - -e 's/@''GNULIB_MDA_MKDIR''@/$(GL_GNULIB_MDA_MKDIR)/g' \ - -e 's/@''GNULIB_MDA_UMASK''@/$(GL_GNULIB_MDA_UMASK)/g' \ + -e 's/@''GNULIB_FCHMODAT''@/$(GNULIB_FCHMODAT)/g' \ + -e 's/@''GNULIB_FSTAT''@/$(GNULIB_FSTAT)/g' \ + -e 's/@''GNULIB_FSTATAT''@/$(GNULIB_FSTATAT)/g' \ + -e 's/@''GNULIB_FUTIMENS''@/$(GNULIB_FUTIMENS)/g' \ + -e 's/@''GNULIB_GETUMASK''@/$(GNULIB_GETUMASK)/g' \ + -e 's/@''GNULIB_LCHMOD''@/$(GNULIB_LCHMOD)/g' \ + -e 's/@''GNULIB_LSTAT''@/$(GNULIB_LSTAT)/g' \ + -e 's/@''GNULIB_MKDIR''@/$(GNULIB_MKDIR)/g' \ + -e 's/@''GNULIB_MKDIRAT''@/$(GNULIB_MKDIRAT)/g' \ + -e 's/@''GNULIB_MKFIFO''@/$(GNULIB_MKFIFO)/g' \ + -e 's/@''GNULIB_MKFIFOAT''@/$(GNULIB_MKFIFOAT)/g' \ + -e 's/@''GNULIB_MKNOD''@/$(GNULIB_MKNOD)/g' \ + -e 's/@''GNULIB_MKNODAT''@/$(GNULIB_MKNODAT)/g' \ + -e 's/@''GNULIB_STAT''@/$(GNULIB_STAT)/g' \ + -e 's/@''GNULIB_UTIMENSAT''@/$(GNULIB_UTIMENSAT)/g' \ + -e 's/@''GNULIB_OVERRIDES_STRUCT_STAT''@/$(GNULIB_OVERRIDES_STRUCT_STAT)/g' \ + -e 's/@''GNULIB_MDA_CHMOD''@/$(GNULIB_MDA_CHMOD)/g' \ + -e 's/@''GNULIB_MDA_MKDIR''@/$(GNULIB_MDA_MKDIR)/g' \ + -e 's/@''GNULIB_MDA_UMASK''@/$(GNULIB_MDA_UMASK)/g' \ -e 's|@''HAVE_FCHMODAT''@|$(HAVE_FCHMODAT)|g' \ -e 's|@''HAVE_FSTATAT''@|$(HAVE_FSTATAT)|g' \ -e 's|@''HAVE_FUTIMENS''@|$(HAVE_FUTIMENS)|g' \ @@ -1996,7 +1816,6 @@ -e 's|@''HAVE_MKNOD''@|$(HAVE_MKNOD)|g' \ -e 's|@''HAVE_MKNODAT''@|$(HAVE_MKNODAT)|g' \ -e 's|@''HAVE_UTIMENSAT''@|$(HAVE_UTIMENSAT)|g' \ - -e 's|@''REPLACE_CHMOD''@|$(REPLACE_CHMOD)|g' \ -e 's|@''REPLACE_FCHMODAT''@|$(REPLACE_FCHMODAT)|g' \ -e 's|@''REPLACE_FSTAT''@|$(REPLACE_FSTAT)|g' \ -e 's|@''REPLACE_FSTATAT''@|$(REPLACE_FSTATAT)|g' \ @@ -2012,8 +1831,9 @@ -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)' \ - $(srcdir)/sys_stat.in.h > $@-t - $(AM_V_at)mv $@-t $@ + < $(srcdir)/sys_stat.in.h; \ + } > $@-t && \ + mv $@-t $@ MOSTLYCLEANFILES += sys/stat.h sys/stat.h-t MOSTLYCLEANDIRS += sys @@ -2028,56 +1848,56 @@ # We need the following in order to create when the system # doesn't have one that works with the given compiler. sys/types.h: sys_types.in.h $(top_builddir)/config.status - $(AM_V_GEN)$(MKDIR_P) '%reldir%/sys' - $(AM_V_at)$(SED_HEADER_STDOUT) \ - -e 's|@''GUARD_PREFIX''@|GL|g' \ + $(AM_V_at)$(MKDIR_P) sys + $(AM_V_GEN)rm -f $@-t $@ && \ + { echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \ + sed -e 's|@''GUARD_PREFIX''@|GL|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_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 > $@-t - $(AM_V_at)mv $@-t $@ + < $(srcdir)/sys_types.in.h; \ + } > $@-t && \ + mv $@-t $@ MOSTLYCLEANFILES += sys/types.h sys/types.h-t EXTRA_DIST += sys_types.in.h ## end gnulib module sys_types -## begin gnulib module time-h +## begin gnulib module time BUILT_SOURCES += time.h # We need the following in order to create when the system # doesn't have one that works with the given compiler. time.h: time.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_NONNULL_H) $(WARN_ON_USE_H) - $(gl_V_at)$(SED_HEADER_STDOUT) \ - -e 's|@''GUARD_PREFIX''@|GL|g' \ + $(AM_V_GEN)rm -f $@-t $@ && \ + { echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */' && \ + sed -e 's|@''GUARD_PREFIX''@|GL|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_TIME_H''@|$(NEXT_TIME_H)|g' \ - -e 's/@''GNULIB_CTIME''@/$(GL_GNULIB_CTIME)/g' \ - -e 's/@''GNULIB_LOCALTIME''@/$(GL_GNULIB_LOCALTIME)/g' \ - -e 's/@''GNULIB_MKTIME''@/$(GL_GNULIB_MKTIME)/g' \ - -e 's/@''GNULIB_NANOSLEEP''@/$(GL_GNULIB_NANOSLEEP)/g' \ - -e 's/@''GNULIB_STRFTIME''@/$(GL_GNULIB_STRFTIME)/g' \ - -e 's/@''GNULIB_STRPTIME''@/$(GL_GNULIB_STRPTIME)/g' \ - -e 's/@''GNULIB_TIME''@/$(GL_GNULIB_TIME)/g' \ - -e 's/@''GNULIB_TIMEGM''@/$(GL_GNULIB_TIMEGM)/g' \ - -e 's/@''GNULIB_TIMESPEC_GET''@/$(GL_GNULIB_TIMESPEC_GET)/g' \ - -e 's/@''GNULIB_TIMESPEC_GETRES''@/$(GL_GNULIB_TIMESPEC_GETRES)/g' \ - -e 's/@''GNULIB_TIME_R''@/$(GL_GNULIB_TIME_R)/g' \ - -e 's/@''GNULIB_TIME_RZ''@/$(GL_GNULIB_TIME_RZ)/g' \ - -e 's/@''GNULIB_TZSET''@/$(GL_GNULIB_TZSET)/g' \ - -e 's/@''GNULIB_MDA_TZSET''@/$(GL_GNULIB_MDA_TZSET)/g' \ + -e 's/@''GNULIB_CTIME''@/$(GNULIB_CTIME)/g' \ + -e 's/@''GNULIB_LOCALTIME''@/$(GNULIB_LOCALTIME)/g' \ + -e 's/@''GNULIB_MKTIME''@/$(GNULIB_MKTIME)/g' \ + -e 's/@''GNULIB_NANOSLEEP''@/$(GNULIB_NANOSLEEP)/g' \ + -e 's/@''GNULIB_STRFTIME''@/$(GNULIB_STRFTIME)/g' \ + -e 's/@''GNULIB_STRPTIME''@/$(GNULIB_STRPTIME)/g' \ + -e 's/@''GNULIB_TIMEGM''@/$(GNULIB_TIMEGM)/g' \ + -e 's/@''GNULIB_TIMESPEC_GET''@/$(GNULIB_TIMESPEC_GET)/g' \ + -e 's/@''GNULIB_TIME_R''@/$(GNULIB_TIME_R)/g' \ + -e 's/@''GNULIB_TIME_RZ''@/$(GNULIB_TIME_RZ)/g' \ + -e 's/@''GNULIB_TZSET''@/$(GNULIB_TZSET)/g' \ + -e 's/@''GNULIB_MDA_TZSET''@/$(GNULIB_MDA_TZSET)/g' \ -e 's|@''HAVE_DECL_LOCALTIME_R''@|$(HAVE_DECL_LOCALTIME_R)|g' \ -e 's|@''HAVE_NANOSLEEP''@|$(HAVE_NANOSLEEP)|g' \ -e 's|@''HAVE_STRPTIME''@|$(HAVE_STRPTIME)|g' \ -e 's|@''HAVE_TIMEGM''@|$(HAVE_TIMEGM)|g' \ -e 's|@''HAVE_TIMESPEC_GET''@|$(HAVE_TIMESPEC_GET)|g' \ - -e 's|@''HAVE_TIMESPEC_GETRES''@|$(HAVE_TIMESPEC_GETRES)|g' \ -e 's|@''HAVE_TIMEZONE_T''@|$(HAVE_TIMEZONE_T)|g' \ -e 's|@''REPLACE_CTIME''@|$(REPLACE_CTIME)|g' \ -e 's|@''REPLACE_GMTIME''@|$(REPLACE_GMTIME)|g' \ @@ -2086,9 +1906,7 @@ -e 's|@''REPLACE_MKTIME''@|$(REPLACE_MKTIME)|g' \ -e 's|@''REPLACE_NANOSLEEP''@|$(REPLACE_NANOSLEEP)|g' \ -e 's|@''REPLACE_STRFTIME''@|$(REPLACE_STRFTIME)|g' \ - -e 's|@''REPLACE_TIME''@|$(REPLACE_TIME)|g' \ -e 's|@''REPLACE_TIMEGM''@|$(REPLACE_TIMEGM)|g' \ - -e 's|@''REPLACE_TIMESPEC_GET''@|$(REPLACE_TIMESPEC_GET)|g' \ -e 's|@''REPLACE_TZSET''@|$(REPLACE_TZSET)|g' \ -e 's|@''PTHREAD_H_DEFINES_STRUCT_TIMESPEC''@|$(PTHREAD_H_DEFINES_STRUCT_TIMESPEC)|g' \ -e 's|@''SYS_TIME_H_DEFINES_STRUCT_TIMESPEC''@|$(SYS_TIME_H_DEFINES_STRUCT_TIMESPEC)|g' \ @@ -2098,13 +1916,14 @@ -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)' \ - $(srcdir)/time.in.h > $@-t - $(AM_V_at)mv $@-t $@ + < $(srcdir)/time.in.h; \ + } > $@-t && \ + mv $@-t $@ MOSTLYCLEANFILES += time.h time.h-t EXTRA_DIST += time.in.h -## end gnulib module time-h +## end gnulib module time ## begin gnulib module unistd @@ -2114,98 +1933,98 @@ # We need the following in order to create an empty placeholder for # when the system doesn't have one. unistd.h: unistd.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_NONNULL_H) $(WARN_ON_USE_H) - $(gl_V_at)$(SED_HEADER_STDOUT) \ - -e 's|@''GUARD_PREFIX''@|GL|g' \ + $(AM_V_GEN)rm -f $@-t $@ && \ + { echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \ + sed -e 's|@''GUARD_PREFIX''@|GL|g' \ -e 's|@''HAVE_UNISTD_H''@|$(HAVE_UNISTD_H)|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_UNISTD_H''@|$(NEXT_UNISTD_H)|g' \ -e 's|@''WINDOWS_64_BIT_OFF_T''@|$(WINDOWS_64_BIT_OFF_T)|g' \ - -e 's/@''GNULIB_ACCESS''@/$(GL_GNULIB_ACCESS)/g' \ - -e 's/@''GNULIB_CHDIR''@/$(GL_GNULIB_CHDIR)/g' \ - -e 's/@''GNULIB_CHOWN''@/$(GL_GNULIB_CHOWN)/g' \ - -e 's/@''GNULIB_CLOSE''@/$(GL_GNULIB_CLOSE)/g' \ - -e 's/@''GNULIB_COPY_FILE_RANGE''@/$(GL_GNULIB_COPY_FILE_RANGE)/g' \ - -e 's/@''GNULIB_DUP''@/$(GL_GNULIB_DUP)/g' \ - -e 's/@''GNULIB_DUP2''@/$(GL_GNULIB_DUP2)/g' \ - -e 's/@''GNULIB_DUP3''@/$(GL_GNULIB_DUP3)/g' \ - -e 's/@''GNULIB_ENVIRON''@/$(GL_GNULIB_ENVIRON)/g' \ - -e 's/@''GNULIB_EUIDACCESS''@/$(GL_GNULIB_EUIDACCESS)/g' \ - -e 's/@''GNULIB_EXECL''@/$(GL_GNULIB_EXECL)/g' \ - -e 's/@''GNULIB_EXECLE''@/$(GL_GNULIB_EXECLE)/g' \ - -e 's/@''GNULIB_EXECLP''@/$(GL_GNULIB_EXECLP)/g' \ - -e 's/@''GNULIB_EXECV''@/$(GL_GNULIB_EXECV)/g' \ - -e 's/@''GNULIB_EXECVE''@/$(GL_GNULIB_EXECVE)/g' \ - -e 's/@''GNULIB_EXECVP''@/$(GL_GNULIB_EXECVP)/g' \ - -e 's/@''GNULIB_EXECVPE''@/$(GL_GNULIB_EXECVPE)/g' \ - -e 's/@''GNULIB_FACCESSAT''@/$(GL_GNULIB_FACCESSAT)/g' \ - -e 's/@''GNULIB_FCHDIR''@/$(GL_GNULIB_FCHDIR)/g' \ - -e 's/@''GNULIB_FCHOWNAT''@/$(GL_GNULIB_FCHOWNAT)/g' \ - -e 's/@''GNULIB_FDATASYNC''@/$(GL_GNULIB_FDATASYNC)/g' \ - -e 's/@''GNULIB_FSYNC''@/$(GL_GNULIB_FSYNC)/g' \ - -e 's/@''GNULIB_FTRUNCATE''@/$(GL_GNULIB_FTRUNCATE)/g' \ - -e 's/@''GNULIB_GETCWD''@/$(GL_GNULIB_GETCWD)/g' \ - -e 's/@''GNULIB_GETDOMAINNAME''@/$(GL_GNULIB_GETDOMAINNAME)/g' \ - -e 's/@''GNULIB_GETDTABLESIZE''@/$(GL_GNULIB_GETDTABLESIZE)/g' \ - -e 's/@''GNULIB_GETENTROPY''@/$(GL_GNULIB_GETENTROPY)/g' \ - -e 's/@''GNULIB_GETGROUPS''@/$(GL_GNULIB_GETGROUPS)/g' \ - -e 's/@''GNULIB_GETHOSTNAME''@/$(GL_GNULIB_GETHOSTNAME)/g' \ - -e 's/@''GNULIB_GETLOGIN''@/$(GL_GNULIB_GETLOGIN)/g' \ - -e 's/@''GNULIB_GETLOGIN_R''@/$(GL_GNULIB_GETLOGIN_R)/g' \ - -e 's/@''GNULIB_GETOPT_POSIX''@/$(GL_GNULIB_GETOPT_POSIX)/g' \ - -e 's/@''GNULIB_GETPAGESIZE''@/$(GL_GNULIB_GETPAGESIZE)/g' \ - -e 's/@''GNULIB_GETPASS''@/$(GL_GNULIB_GETPASS)/g' \ - -e 's/@''GNULIB_GETPASS_GNU''@/$(GL_GNULIB_GETPASS_GNU)/g' \ - -e 's/@''GNULIB_GETUSERSHELL''@/$(GL_GNULIB_GETUSERSHELL)/g' \ - -e 's/@''GNULIB_GROUP_MEMBER''@/$(GL_GNULIB_GROUP_MEMBER)/g' \ - -e 's/@''GNULIB_ISATTY''@/$(GL_GNULIB_ISATTY)/g' \ - -e 's/@''GNULIB_LCHOWN''@/$(GL_GNULIB_LCHOWN)/g' \ - -e 's/@''GNULIB_LINK''@/$(GL_GNULIB_LINK)/g' \ - -e 's/@''GNULIB_LINKAT''@/$(GL_GNULIB_LINKAT)/g' \ - -e 's/@''GNULIB_LSEEK''@/$(GL_GNULIB_LSEEK)/g' \ - -e 's/@''GNULIB_PIPE''@/$(GL_GNULIB_PIPE)/g' \ - -e 's/@''GNULIB_PIPE2''@/$(GL_GNULIB_PIPE2)/g' \ - -e 's/@''GNULIB_PREAD''@/$(GL_GNULIB_PREAD)/g' \ - -e 's/@''GNULIB_PWRITE''@/$(GL_GNULIB_PWRITE)/g' \ - -e 's/@''GNULIB_READ''@/$(GL_GNULIB_READ)/g' \ - -e 's/@''GNULIB_READLINK''@/$(GL_GNULIB_READLINK)/g' \ - -e 's/@''GNULIB_READLINKAT''@/$(GL_GNULIB_READLINKAT)/g' \ - -e 's/@''GNULIB_RMDIR''@/$(GL_GNULIB_RMDIR)/g' \ - -e 's/@''GNULIB_SETHOSTNAME''@/$(GL_GNULIB_SETHOSTNAME)/g' \ - -e 's/@''GNULIB_SLEEP''@/$(GL_GNULIB_SLEEP)/g' \ - -e 's/@''GNULIB_SYMLINK''@/$(GL_GNULIB_SYMLINK)/g' \ - -e 's/@''GNULIB_SYMLINKAT''@/$(GL_GNULIB_SYMLINKAT)/g' \ - -e 's/@''GNULIB_TRUNCATE''@/$(GL_GNULIB_TRUNCATE)/g' \ - -e 's/@''GNULIB_TTYNAME_R''@/$(GL_GNULIB_TTYNAME_R)/g' \ - -e 's/@''GNULIB_UNISTD_H_GETOPT''@/0$(GL_GNULIB_UNISTD_H_GETOPT)/g' \ - -e 's/@''GNULIB_UNISTD_H_NONBLOCKING''@/$(GL_GNULIB_UNISTD_H_NONBLOCKING)/g' \ - -e 's/@''GNULIB_UNISTD_H_SIGPIPE''@/$(GL_GNULIB_UNISTD_H_SIGPIPE)/g' \ - -e 's/@''GNULIB_UNLINK''@/$(GL_GNULIB_UNLINK)/g' \ - -e 's/@''GNULIB_UNLINKAT''@/$(GL_GNULIB_UNLINKAT)/g' \ - -e 's/@''GNULIB_USLEEP''@/$(GL_GNULIB_USLEEP)/g' \ - -e 's/@''GNULIB_WRITE''@/$(GL_GNULIB_WRITE)/g' \ - -e 's/@''GNULIB_MDA_ACCESS''@/$(GL_GNULIB_MDA_ACCESS)/g' \ - -e 's/@''GNULIB_MDA_CHDIR''@/$(GL_GNULIB_MDA_CHDIR)/g' \ - -e 's/@''GNULIB_MDA_CLOSE''@/$(GL_GNULIB_MDA_CLOSE)/g' \ - -e 's/@''GNULIB_MDA_DUP''@/$(GL_GNULIB_MDA_DUP)/g' \ - -e 's/@''GNULIB_MDA_DUP2''@/$(GL_GNULIB_MDA_DUP2)/g' \ - -e 's/@''GNULIB_MDA_EXECL''@/$(GL_GNULIB_MDA_EXECL)/g' \ - -e 's/@''GNULIB_MDA_EXECLE''@/$(GL_GNULIB_MDA_EXECLE)/g' \ - -e 's/@''GNULIB_MDA_EXECLP''@/$(GL_GNULIB_MDA_EXECLP)/g' \ - -e 's/@''GNULIB_MDA_EXECV''@/$(GL_GNULIB_MDA_EXECV)/g' \ - -e 's/@''GNULIB_MDA_EXECVE''@/$(GL_GNULIB_MDA_EXECVE)/g' \ - -e 's/@''GNULIB_MDA_EXECVP''@/$(GL_GNULIB_MDA_EXECVP)/g' \ - -e 's/@''GNULIB_MDA_EXECVPE''@/$(GL_GNULIB_MDA_EXECVPE)/g' \ - -e 's/@''GNULIB_MDA_GETCWD''@/$(GL_GNULIB_MDA_GETCWD)/g' \ - -e 's/@''GNULIB_MDA_GETPID''@/$(GL_GNULIB_MDA_GETPID)/g' \ - -e 's/@''GNULIB_MDA_ISATTY''@/$(GL_GNULIB_MDA_ISATTY)/g' \ - -e 's/@''GNULIB_MDA_LSEEK''@/$(GL_GNULIB_MDA_LSEEK)/g' \ - -e 's/@''GNULIB_MDA_READ''@/$(GL_GNULIB_MDA_READ)/g' \ - -e 's/@''GNULIB_MDA_RMDIR''@/$(GL_GNULIB_MDA_RMDIR)/g' \ - -e 's/@''GNULIB_MDA_SWAB''@/$(GL_GNULIB_MDA_SWAB)/g' \ - -e 's/@''GNULIB_MDA_UNLINK''@/$(GL_GNULIB_MDA_UNLINK)/g' \ - -e 's/@''GNULIB_MDA_WRITE''@/$(GL_GNULIB_MDA_WRITE)/g' \ + -e 's/@''GNULIB_ACCESS''@/$(GNULIB_ACCESS)/g' \ + -e 's/@''GNULIB_CHDIR''@/$(GNULIB_CHDIR)/g' \ + -e 's/@''GNULIB_CHOWN''@/$(GNULIB_CHOWN)/g' \ + -e 's/@''GNULIB_CLOSE''@/$(GNULIB_CLOSE)/g' \ + -e 's/@''GNULIB_COPY_FILE_RANGE''@/$(GNULIB_COPY_FILE_RANGE)/g' \ + -e 's/@''GNULIB_DUP''@/$(GNULIB_DUP)/g' \ + -e 's/@''GNULIB_DUP2''@/$(GNULIB_DUP2)/g' \ + -e 's/@''GNULIB_DUP3''@/$(GNULIB_DUP3)/g' \ + -e 's/@''GNULIB_ENVIRON''@/$(GNULIB_ENVIRON)/g' \ + -e 's/@''GNULIB_EUIDACCESS''@/$(GNULIB_EUIDACCESS)/g' \ + -e 's/@''GNULIB_EXECL''@/$(GNULIB_EXECL)/g' \ + -e 's/@''GNULIB_EXECLE''@/$(GNULIB_EXECLE)/g' \ + -e 's/@''GNULIB_EXECLP''@/$(GNULIB_EXECLP)/g' \ + -e 's/@''GNULIB_EXECV''@/$(GNULIB_EXECV)/g' \ + -e 's/@''GNULIB_EXECVE''@/$(GNULIB_EXECVE)/g' \ + -e 's/@''GNULIB_EXECVP''@/$(GNULIB_EXECVP)/g' \ + -e 's/@''GNULIB_EXECVPE''@/$(GNULIB_EXECVPE)/g' \ + -e 's/@''GNULIB_FACCESSAT''@/$(GNULIB_FACCESSAT)/g' \ + -e 's/@''GNULIB_FCHDIR''@/$(GNULIB_FCHDIR)/g' \ + -e 's/@''GNULIB_FCHOWNAT''@/$(GNULIB_FCHOWNAT)/g' \ + -e 's/@''GNULIB_FDATASYNC''@/$(GNULIB_FDATASYNC)/g' \ + -e 's/@''GNULIB_FSYNC''@/$(GNULIB_FSYNC)/g' \ + -e 's/@''GNULIB_FTRUNCATE''@/$(GNULIB_FTRUNCATE)/g' \ + -e 's/@''GNULIB_GETCWD''@/$(GNULIB_GETCWD)/g' \ + -e 's/@''GNULIB_GETDOMAINNAME''@/$(GNULIB_GETDOMAINNAME)/g' \ + -e 's/@''GNULIB_GETDTABLESIZE''@/$(GNULIB_GETDTABLESIZE)/g' \ + -e 's/@''GNULIB_GETENTROPY''@/$(GNULIB_GETENTROPY)/g' \ + -e 's/@''GNULIB_GETGROUPS''@/$(GNULIB_GETGROUPS)/g' \ + -e 's/@''GNULIB_GETHOSTNAME''@/$(GNULIB_GETHOSTNAME)/g' \ + -e 's/@''GNULIB_GETLOGIN''@/$(GNULIB_GETLOGIN)/g' \ + -e 's/@''GNULIB_GETLOGIN_R''@/$(GNULIB_GETLOGIN_R)/g' \ + -e 's/@''GNULIB_GETOPT_POSIX''@/$(GNULIB_GETOPT_POSIX)/g' \ + -e 's/@''GNULIB_GETPAGESIZE''@/$(GNULIB_GETPAGESIZE)/g' \ + -e 's/@''GNULIB_GETPASS''@/$(GNULIB_GETPASS)/g' \ + -e 's/@''GNULIB_GETUSERSHELL''@/$(GNULIB_GETUSERSHELL)/g' \ + -e 's/@''GNULIB_GROUP_MEMBER''@/$(GNULIB_GROUP_MEMBER)/g' \ + -e 's/@''GNULIB_ISATTY''@/$(GNULIB_ISATTY)/g' \ + -e 's/@''GNULIB_LCHOWN''@/$(GNULIB_LCHOWN)/g' \ + -e 's/@''GNULIB_LINK''@/$(GNULIB_LINK)/g' \ + -e 's/@''GNULIB_LINKAT''@/$(GNULIB_LINKAT)/g' \ + -e 's/@''GNULIB_LSEEK''@/$(GNULIB_LSEEK)/g' \ + -e 's/@''GNULIB_PIPE''@/$(GNULIB_PIPE)/g' \ + -e 's/@''GNULIB_PIPE2''@/$(GNULIB_PIPE2)/g' \ + -e 's/@''GNULIB_PREAD''@/$(GNULIB_PREAD)/g' \ + -e 's/@''GNULIB_PWRITE''@/$(GNULIB_PWRITE)/g' \ + -e 's/@''GNULIB_READ''@/$(GNULIB_READ)/g' \ + -e 's/@''GNULIB_READLINK''@/$(GNULIB_READLINK)/g' \ + -e 's/@''GNULIB_READLINKAT''@/$(GNULIB_READLINKAT)/g' \ + -e 's/@''GNULIB_RMDIR''@/$(GNULIB_RMDIR)/g' \ + -e 's/@''GNULIB_SETHOSTNAME''@/$(GNULIB_SETHOSTNAME)/g' \ + -e 's/@''GNULIB_SLEEP''@/$(GNULIB_SLEEP)/g' \ + -e 's/@''GNULIB_SYMLINK''@/$(GNULIB_SYMLINK)/g' \ + -e 's/@''GNULIB_SYMLINKAT''@/$(GNULIB_SYMLINKAT)/g' \ + -e 's/@''GNULIB_TRUNCATE''@/$(GNULIB_TRUNCATE)/g' \ + -e 's/@''GNULIB_TTYNAME_R''@/$(GNULIB_TTYNAME_R)/g' \ + -e 's/@''GNULIB_UNISTD_H_GETOPT''@/0$(GNULIB_GL_UNISTD_H_GETOPT)/g' \ + -e 's/@''GNULIB_UNISTD_H_NONBLOCKING''@/$(GNULIB_UNISTD_H_NONBLOCKING)/g' \ + -e 's/@''GNULIB_UNISTD_H_SIGPIPE''@/$(GNULIB_UNISTD_H_SIGPIPE)/g' \ + -e 's/@''GNULIB_UNLINK''@/$(GNULIB_UNLINK)/g' \ + -e 's/@''GNULIB_UNLINKAT''@/$(GNULIB_UNLINKAT)/g' \ + -e 's/@''GNULIB_USLEEP''@/$(GNULIB_USLEEP)/g' \ + -e 's/@''GNULIB_WRITE''@/$(GNULIB_WRITE)/g' \ + -e 's/@''GNULIB_MDA_ACCESS''@/$(GNULIB_MDA_ACCESS)/g' \ + -e 's/@''GNULIB_MDA_CHDIR''@/$(GNULIB_MDA_CHDIR)/g' \ + -e 's/@''GNULIB_MDA_CLOSE''@/$(GNULIB_MDA_CLOSE)/g' \ + -e 's/@''GNULIB_MDA_DUP''@/$(GNULIB_MDA_DUP)/g' \ + -e 's/@''GNULIB_MDA_DUP2''@/$(GNULIB_MDA_DUP2)/g' \ + -e 's/@''GNULIB_MDA_EXECL''@/$(GNULIB_MDA_EXECL)/g' \ + -e 's/@''GNULIB_MDA_EXECLE''@/$(GNULIB_MDA_EXECLE)/g' \ + -e 's/@''GNULIB_MDA_EXECLP''@/$(GNULIB_MDA_EXECLP)/g' \ + -e 's/@''GNULIB_MDA_EXECV''@/$(GNULIB_MDA_EXECV)/g' \ + -e 's/@''GNULIB_MDA_EXECVE''@/$(GNULIB_MDA_EXECVE)/g' \ + -e 's/@''GNULIB_MDA_EXECVP''@/$(GNULIB_MDA_EXECVP)/g' \ + -e 's/@''GNULIB_MDA_EXECVPE''@/$(GNULIB_MDA_EXECVPE)/g' \ + -e 's/@''GNULIB_MDA_GETCWD''@/$(GNULIB_MDA_GETCWD)/g' \ + -e 's/@''GNULIB_MDA_GETPID''@/$(GNULIB_MDA_GETPID)/g' \ + -e 's/@''GNULIB_MDA_ISATTY''@/$(GNULIB_MDA_ISATTY)/g' \ + -e 's/@''GNULIB_MDA_LSEEK''@/$(GNULIB_MDA_LSEEK)/g' \ + -e 's/@''GNULIB_MDA_READ''@/$(GNULIB_MDA_READ)/g' \ + -e 's/@''GNULIB_MDA_RMDIR''@/$(GNULIB_MDA_RMDIR)/g' \ + -e 's/@''GNULIB_MDA_SWAB''@/$(GNULIB_MDA_SWAB)/g' \ + -e 's/@''GNULIB_MDA_UNLINK''@/$(GNULIB_MDA_UNLINK)/g' \ + -e 's/@''GNULIB_MDA_WRITE''@/$(GNULIB_MDA_WRITE)/g' \ < $(srcdir)/unistd.in.h | \ sed -e 's|@''HAVE_CHOWN''@|$(HAVE_CHOWN)|g' \ -e 's|@''HAVE_COPY_FILE_RANGE''@|$(HAVE_COPY_FILE_RANGE)|g' \ @@ -2258,10 +2077,8 @@ sed -e 's|@''REPLACE_ACCESS''@|$(REPLACE_ACCESS)|g' \ -e 's|@''REPLACE_CHOWN''@|$(REPLACE_CHOWN)|g' \ -e 's|@''REPLACE_CLOSE''@|$(REPLACE_CLOSE)|g' \ - -e 's|@''REPLACE_COPY_FILE_RANGE''@|$(REPLACE_COPY_FILE_RANGE)|g' \ -e 's|@''REPLACE_DUP''@|$(REPLACE_DUP)|g' \ -e 's|@''REPLACE_DUP2''@|$(REPLACE_DUP2)|g' \ - -e 's|@''REPLACE_DUP3''@|$(REPLACE_DUP3)|g' \ -e 's|@''REPLACE_EXECL''@|$(REPLACE_EXECL)|g' \ -e 's|@''REPLACE_EXECLE''@|$(REPLACE_EXECLE)|g' \ -e 's|@''REPLACE_EXECLP''@|$(REPLACE_EXECLP)|g' \ @@ -2271,30 +2088,25 @@ -e 's|@''REPLACE_EXECVPE''@|$(REPLACE_EXECVPE)|g' \ -e 's|@''REPLACE_FACCESSAT''@|$(REPLACE_FACCESSAT)|g' \ -e 's|@''REPLACE_FCHOWNAT''@|$(REPLACE_FCHOWNAT)|g' \ - -e 's|@''REPLACE_FDATASYNC''@|$(REPLACE_FDATASYNC)|g' \ -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_GETENTROPY''@|$(REPLACE_GETENTROPY)|g' \ -e 's|@''REPLACE_GETLOGIN_R''@|$(REPLACE_GETLOGIN_R)|g' \ -e 's|@''REPLACE_GETGROUPS''@|$(REPLACE_GETGROUPS)|g' \ -e 's|@''REPLACE_GETPAGESIZE''@|$(REPLACE_GETPAGESIZE)|g' \ -e 's|@''REPLACE_GETPASS''@|$(REPLACE_GETPASS)|g' \ - -e 's|@''REPLACE_GETPASS_FOR_GETPASS_GNU''@|$(REPLACE_GETPASS_FOR_GETPASS_GNU)|g' \ -e 's|@''REPLACE_ISATTY''@|$(REPLACE_ISATTY)|g' \ -e 's|@''REPLACE_LCHOWN''@|$(REPLACE_LCHOWN)|g' \ -e 's|@''REPLACE_LINK''@|$(REPLACE_LINK)|g' \ -e 's|@''REPLACE_LINKAT''@|$(REPLACE_LINKAT)|g' \ -e 's|@''REPLACE_LSEEK''@|$(REPLACE_LSEEK)|g' \ - -e 's|@''REPLACE_PIPE2''@|$(REPLACE_PIPE2)|g' \ -e 's|@''REPLACE_PREAD''@|$(REPLACE_PREAD)|g' \ -e 's|@''REPLACE_PWRITE''@|$(REPLACE_PWRITE)|g' \ -e 's|@''REPLACE_READ''@|$(REPLACE_READ)|g' \ -e 's|@''REPLACE_READLINK''@|$(REPLACE_READLINK)|g' \ -e 's|@''REPLACE_READLINKAT''@|$(REPLACE_READLINKAT)|g' \ -e 's|@''REPLACE_RMDIR''@|$(REPLACE_RMDIR)|g' \ - -e 's|@''REPLACE_SETHOSTNAME''@|$(REPLACE_SETHOSTNAME)|g' \ -e 's|@''REPLACE_SLEEP''@|$(REPLACE_SLEEP)|g' \ -e 's|@''REPLACE_SYMLINK''@|$(REPLACE_SYMLINK)|g' \ -e 's|@''REPLACE_SYMLINKAT''@|$(REPLACE_SYMLINKAT)|g' \ @@ -2309,9 +2121,9 @@ -e 's|@''UNISTD_H_HAVE_WINSOCK2_H_AND_USE_SOCKETS''@|$(UNISTD_H_HAVE_WINSOCK2_H_AND_USE_SOCKETS)|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)' \ - > $@-t - $(AM_V_at)mv $@-t $@ + -e '/definition of _GL_WARN_ON_USE/r $(WARN_ON_USE_H)'; \ + } > $@-t && \ + mv $@-t $@ MOSTLYCLEANFILES += unistd.h unistd.h-t EXTRA_DIST += unistd.in.h @@ -2320,9 +2132,10 @@ ## begin gnulib module unlink -if GL_COND_OBJ_UNLINK -libgnu_a_SOURCES += unlink.c -endif + +EXTRA_DIST += unlink.c + +EXTRA_libgnu_a_SOURCES += unlink.c ## end gnulib module unlink @@ -2335,6 +2148,13 @@ ## end gnulib module vasnprintf +## begin gnulib module verify + + +EXTRA_DIST += verify.h + +## end gnulib module verify + ## begin gnulib module wchar BUILT_SOURCES += wchar.h @@ -2342,8 +2162,9 @@ # We need the following in order to create when the system # version does not work standalone. wchar.h: wchar.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_NONNULL_H) $(WARN_ON_USE_H) - $(gl_V_at)$(SED_HEADER_STDOUT) \ - -e 's|@''GUARD_PREFIX''@|GL|g' \ + $(AM_V_GEN)rm -f $@-t $@ && \ + { echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \ + sed -e 's|@''GUARD_PREFIX''@|GL|g' \ -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \ -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \ -e 's|@''PRAGMA_COLUMNS''@|@PRAGMA_COLUMNS@|g' \ @@ -2351,50 +2172,49 @@ -e 's|@''NEXT_WCHAR_H''@|$(NEXT_WCHAR_H)|g' \ -e 's|@''HAVE_WCHAR_H''@|$(HAVE_WCHAR_H)|g' \ -e 's/@''HAVE_CRTDEFS_H''@/$(HAVE_CRTDEFS_H)/g' \ - -e 's/@''GNULIBHEADERS_OVERRIDE_WINT_T''@/$(GNULIBHEADERS_OVERRIDE_WINT_T)/g' \ - -e 's/@''GNULIB_BTOWC''@/$(GL_GNULIB_BTOWC)/g' \ - -e 's/@''GNULIB_WCTOB''@/$(GL_GNULIB_WCTOB)/g' \ - -e 's/@''GNULIB_MBSINIT''@/$(GL_GNULIB_MBSINIT)/g' \ - -e 's/@''GNULIB_MBRTOWC''@/$(GL_GNULIB_MBRTOWC)/g' \ - -e 's/@''GNULIB_MBRLEN''@/$(GL_GNULIB_MBRLEN)/g' \ - -e 's/@''GNULIB_MBSRTOWCS''@/$(GL_GNULIB_MBSRTOWCS)/g' \ - -e 's/@''GNULIB_MBSNRTOWCS''@/$(GL_GNULIB_MBSNRTOWCS)/g' \ - -e 's/@''GNULIB_WCRTOMB''@/$(GL_GNULIB_WCRTOMB)/g' \ - -e 's/@''GNULIB_WCSRTOMBS''@/$(GL_GNULIB_WCSRTOMBS)/g' \ - -e 's/@''GNULIB_WCSNRTOMBS''@/$(GL_GNULIB_WCSNRTOMBS)/g' \ - -e 's/@''GNULIB_WCWIDTH''@/$(GL_GNULIB_WCWIDTH)/g' \ - -e 's/@''GNULIB_WMEMCHR''@/$(GL_GNULIB_WMEMCHR)/g' \ - -e 's/@''GNULIB_WMEMCMP''@/$(GL_GNULIB_WMEMCMP)/g' \ - -e 's/@''GNULIB_WMEMCPY''@/$(GL_GNULIB_WMEMCPY)/g' \ - -e 's/@''GNULIB_WMEMMOVE''@/$(GL_GNULIB_WMEMMOVE)/g' \ - -e 's/@''GNULIB_WMEMPCPY''@/$(GL_GNULIB_WMEMPCPY)/g' \ - -e 's/@''GNULIB_WMEMSET''@/$(GL_GNULIB_WMEMSET)/g' \ - -e 's/@''GNULIB_WCSLEN''@/$(GL_GNULIB_WCSLEN)/g' \ - -e 's/@''GNULIB_WCSNLEN''@/$(GL_GNULIB_WCSNLEN)/g' \ - -e 's/@''GNULIB_WCSCPY''@/$(GL_GNULIB_WCSCPY)/g' \ - -e 's/@''GNULIB_WCPCPY''@/$(GL_GNULIB_WCPCPY)/g' \ - -e 's/@''GNULIB_WCSNCPY''@/$(GL_GNULIB_WCSNCPY)/g' \ - -e 's/@''GNULIB_WCPNCPY''@/$(GL_GNULIB_WCPNCPY)/g' \ - -e 's/@''GNULIB_WCSCAT''@/$(GL_GNULIB_WCSCAT)/g' \ - -e 's/@''GNULIB_WCSNCAT''@/$(GL_GNULIB_WCSNCAT)/g' \ - -e 's/@''GNULIB_WCSCMP''@/$(GL_GNULIB_WCSCMP)/g' \ - -e 's/@''GNULIB_WCSNCMP''@/$(GL_GNULIB_WCSNCMP)/g' \ - -e 's/@''GNULIB_WCSCASECMP''@/$(GL_GNULIB_WCSCASECMP)/g' \ - -e 's/@''GNULIB_WCSNCASECMP''@/$(GL_GNULIB_WCSNCASECMP)/g' \ - -e 's/@''GNULIB_WCSCOLL''@/$(GL_GNULIB_WCSCOLL)/g' \ - -e 's/@''GNULIB_WCSXFRM''@/$(GL_GNULIB_WCSXFRM)/g' \ - -e 's/@''GNULIB_WCSDUP''@/$(GL_GNULIB_WCSDUP)/g' \ - -e 's/@''GNULIB_WCSCHR''@/$(GL_GNULIB_WCSCHR)/g' \ - -e 's/@''GNULIB_WCSRCHR''@/$(GL_GNULIB_WCSRCHR)/g' \ - -e 's/@''GNULIB_WCSCSPN''@/$(GL_GNULIB_WCSCSPN)/g' \ - -e 's/@''GNULIB_WCSSPN''@/$(GL_GNULIB_WCSSPN)/g' \ - -e 's/@''GNULIB_WCSPBRK''@/$(GL_GNULIB_WCSPBRK)/g' \ - -e 's/@''GNULIB_WCSSTR''@/$(GL_GNULIB_WCSSTR)/g' \ - -e 's/@''GNULIB_WCSTOK''@/$(GL_GNULIB_WCSTOK)/g' \ - -e 's/@''GNULIB_WCSWIDTH''@/$(GL_GNULIB_WCSWIDTH)/g' \ - -e 's/@''GNULIB_WCSFTIME''@/$(GL_GNULIB_WCSFTIME)/g' \ - -e 's/@''GNULIB_MDA_WCSDUP''@/$(GL_GNULIB_MDA_WCSDUP)/g' \ - -e 's/@''GNULIB_FREE_POSIX''@/$(GL_GNULIB_FREE_POSIX)/g' \ + -e 's/@''GNULIB_OVERRIDES_WINT_T''@/$(GNULIB_OVERRIDES_WINT_T)/g' \ + -e 's/@''GNULIB_BTOWC''@/$(GNULIB_BTOWC)/g' \ + -e 's/@''GNULIB_WCTOB''@/$(GNULIB_WCTOB)/g' \ + -e 's/@''GNULIB_MBSINIT''@/$(GNULIB_MBSINIT)/g' \ + -e 's/@''GNULIB_MBRTOWC''@/$(GNULIB_MBRTOWC)/g' \ + -e 's/@''GNULIB_MBRLEN''@/$(GNULIB_MBRLEN)/g' \ + -e 's/@''GNULIB_MBSRTOWCS''@/$(GNULIB_MBSRTOWCS)/g' \ + -e 's/@''GNULIB_MBSNRTOWCS''@/$(GNULIB_MBSNRTOWCS)/g' \ + -e 's/@''GNULIB_WCRTOMB''@/$(GNULIB_WCRTOMB)/g' \ + -e 's/@''GNULIB_WCSRTOMBS''@/$(GNULIB_WCSRTOMBS)/g' \ + -e 's/@''GNULIB_WCSNRTOMBS''@/$(GNULIB_WCSNRTOMBS)/g' \ + -e 's/@''GNULIB_WCWIDTH''@/$(GNULIB_WCWIDTH)/g' \ + -e 's/@''GNULIB_WMEMCHR''@/$(GNULIB_WMEMCHR)/g' \ + -e 's/@''GNULIB_WMEMCMP''@/$(GNULIB_WMEMCMP)/g' \ + -e 's/@''GNULIB_WMEMCPY''@/$(GNULIB_WMEMCPY)/g' \ + -e 's/@''GNULIB_WMEMMOVE''@/$(GNULIB_WMEMMOVE)/g' \ + -e 's/@''GNULIB_WMEMPCPY''@/$(GNULIB_WMEMPCPY)/g' \ + -e 's/@''GNULIB_WMEMSET''@/$(GNULIB_WMEMSET)/g' \ + -e 's/@''GNULIB_WCSLEN''@/$(GNULIB_WCSLEN)/g' \ + -e 's/@''GNULIB_WCSNLEN''@/$(GNULIB_WCSNLEN)/g' \ + -e 's/@''GNULIB_WCSCPY''@/$(GNULIB_WCSCPY)/g' \ + -e 's/@''GNULIB_WCPCPY''@/$(GNULIB_WCPCPY)/g' \ + -e 's/@''GNULIB_WCSNCPY''@/$(GNULIB_WCSNCPY)/g' \ + -e 's/@''GNULIB_WCPNCPY''@/$(GNULIB_WCPNCPY)/g' \ + -e 's/@''GNULIB_WCSCAT''@/$(GNULIB_WCSCAT)/g' \ + -e 's/@''GNULIB_WCSNCAT''@/$(GNULIB_WCSNCAT)/g' \ + -e 's/@''GNULIB_WCSCMP''@/$(GNULIB_WCSCMP)/g' \ + -e 's/@''GNULIB_WCSNCMP''@/$(GNULIB_WCSNCMP)/g' \ + -e 's/@''GNULIB_WCSCASECMP''@/$(GNULIB_WCSCASECMP)/g' \ + -e 's/@''GNULIB_WCSNCASECMP''@/$(GNULIB_WCSNCASECMP)/g' \ + -e 's/@''GNULIB_WCSCOLL''@/$(GNULIB_WCSCOLL)/g' \ + -e 's/@''GNULIB_WCSXFRM''@/$(GNULIB_WCSXFRM)/g' \ + -e 's/@''GNULIB_WCSDUP''@/$(GNULIB_WCSDUP)/g' \ + -e 's/@''GNULIB_WCSCHR''@/$(GNULIB_WCSCHR)/g' \ + -e 's/@''GNULIB_WCSRCHR''@/$(GNULIB_WCSRCHR)/g' \ + -e 's/@''GNULIB_WCSCSPN''@/$(GNULIB_WCSCSPN)/g' \ + -e 's/@''GNULIB_WCSSPN''@/$(GNULIB_WCSSPN)/g' \ + -e 's/@''GNULIB_WCSPBRK''@/$(GNULIB_WCSPBRK)/g' \ + -e 's/@''GNULIB_WCSSTR''@/$(GNULIB_WCSSTR)/g' \ + -e 's/@''GNULIB_WCSTOK''@/$(GNULIB_WCSTOK)/g' \ + -e 's/@''GNULIB_WCSWIDTH''@/$(GNULIB_WCSWIDTH)/g' \ + -e 's/@''GNULIB_WCSFTIME''@/$(GNULIB_WCSFTIME)/g' \ + -e 's/@''GNULIB_MDA_WCSDUP''@/$(GNULIB_MDA_WCSDUP)/g' \ < $(srcdir)/wchar.in.h | \ sed -e 's|@''HAVE_WINT_T''@|$(HAVE_WINT_T)|g' \ -e 's|@''HAVE_BTOWC''@|$(HAVE_BTOWC)|g' \ @@ -2443,7 +2263,6 @@ sed -e 's|@''REPLACE_MBSTATE_T''@|$(REPLACE_MBSTATE_T)|g' \ -e 's|@''REPLACE_BTOWC''@|$(REPLACE_BTOWC)|g' \ -e 's|@''REPLACE_WCTOB''@|$(REPLACE_WCTOB)|g' \ - -e 's|@''REPLACE_FREE''@|$(REPLACE_FREE)|g' \ -e 's|@''REPLACE_MBSINIT''@|$(REPLACE_MBSINIT)|g' \ -e 's|@''REPLACE_MBRTOWC''@|$(REPLACE_MBRTOWC)|g' \ -e 's|@''REPLACE_MBRLEN''@|$(REPLACE_MBRLEN)|g' \ @@ -2455,17 +2274,12 @@ -e 's|@''REPLACE_WCWIDTH''@|$(REPLACE_WCWIDTH)|g' \ -e 's|@''REPLACE_WCSWIDTH''@|$(REPLACE_WCSWIDTH)|g' \ -e 's|@''REPLACE_WCSFTIME''@|$(REPLACE_WCSFTIME)|g' \ - -e 's|@''REPLACE_WCSCMP''@|$(REPLACE_WCSCMP)|g' \ - -e 's|@''REPLACE_WCSNCMP''@|$(REPLACE_WCSNCMP)|g' \ - -e 's|@''REPLACE_WCSSTR''@|$(REPLACE_WCSSTR)|g' \ -e 's|@''REPLACE_WCSTOK''@|$(REPLACE_WCSTOK)|g' \ - -e 's|@''REPLACE_WMEMCMP''@|$(REPLACE_WMEMCMP)|g' \ - -e 's|@''REPLACE_WMEMPCPY''@|$(REPLACE_WMEMPCPY)|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)' \ - > $@-t - $(AM_V_at)mv $@-t $@ + -e '/definition of _GL_WARN_ON_USE/r $(WARN_ON_USE_H)'; \ + } > $@-t && \ + mv $@-t $@ MOSTLYCLEANFILES += wchar.h wchar.h-t EXTRA_DIST += wchar.in.h @@ -2474,9 +2288,10 @@ ## begin gnulib module write -if GL_COND_OBJ_WRITE -libgnu_a_SOURCES += write.c -endif + +EXTRA_DIST += write.c + +EXTRA_libgnu_a_SOURCES += write.c ## end gnulib module write @@ -2517,7 +2332,3 @@ fi; \ done; \ : -distclean-local: distclean-gnulib-libobjs -distclean-gnulib-libobjs: - -rm -f @gl_LIBOBJDEPS@ -maintainer-clean-local: distclean-gnulib-libobjs diff -Nru mmv-2.5/lib/Makefile.in mmv-2.5.1/lib/Makefile.in --- mmv-2.5/lib/Makefile.in 2023-07-20 19:40:54.000000000 +0000 +++ mmv-2.5.1/lib/Makefile.in 2023-08-08 11:08:17.000000000 +0000 @@ -14,11 +14,11 @@ @SET_MAKE@ -# Copyright (C) 2002-2023 Free Software Foundation, Inc. +# Copyright (C) 2002-2021 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 -# the Free Software Foundation, either version 3 of the License, or +# the Free Software Foundation; either version 3 of the License, or # (at your option) any later version. # # This file is distributed in the hope that it will be useful, @@ -144,58 +144,17 @@ POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ -@GL_COND_OBJ_CANONICALIZE_LGPL_TRUE@am__append_1 = canonicalize-lgpl.c -@GL_COND_OBJ_CLOSE_TRUE@am__append_2 = close.c -@GL_COND_OBJ_DUP2_TRUE@am__append_3 = dup2.c -@GL_COND_OBJ_ERROR_TRUE@am__append_4 = error.c -@GL_COND_OBJ_FCNTL_TRUE@am__append_5 = fcntl.c -@GL_COND_OBJ_FLOAT_TRUE@am__append_6 = float.c -@GL_COND_OBJ_ITOLD_TRUE@am__append_7 = itold.c -@GL_COND_OBJ_FREE_TRUE@am__append_8 = free.c -@GL_COND_OBJ_FSETERR_TRUE@am__append_9 = fseterr.c -@GL_COND_OBJ_FSTAT_TRUE@am__append_10 = fstat.c -@GL_COND_OBJ_GETDTABLESIZE_TRUE@am__append_11 = getdtablesize.c -@GL_COND_OBJ_GETOPT_TRUE@am__append_12 = getopt.c getopt1.c -@GL_COND_OBJ_GETPROGNAME_TRUE@am__append_13 = getprogname.c -@GL_COND_OBJ_LINK_TRUE@am__append_14 = link.c -@GL_COND_OBJ_LSEEK_TRUE@am__append_15 = lseek.c -@GL_COND_OBJ_LSTAT_TRUE@am__append_16 = lstat.c -@GL_COND_OBJ_MEMCHR_TRUE@am__append_17 = memchr.c -@GL_COND_OBJ_MEMPCPY_TRUE@am__append_18 = mempcpy.c -@GL_COND_OBJ_MSVC_INVAL_TRUE@am__append_19 = msvc-inval.c -@GL_COND_OBJ_MSVC_NOTHROW_TRUE@am__append_20 = msvc-nothrow.c -@GL_COND_OBJ_OPEN_TRUE@am__append_21 = open.c -@GL_COND_OBJ_RAISE_TRUE@am__append_22 = raise.c -@GL_COND_OBJ_RAWMEMCHR_TRUE@am__append_23 = rawmemchr.c -@GL_COND_OBJ_READ_TRUE@am__append_24 = read.c -@GL_COND_OBJ_READLINK_TRUE@am__append_25 = readlink.c -@GL_COND_OBJ_REALLOCARRAY_TRUE@am__append_26 = reallocarray.c -@GL_COND_OBJ_RENAME_TRUE@am__append_27 = rename.c -@GL_COND_OBJ_RMDIR_TRUE@am__append_28 = rmdir.c -@GL_COND_OBJ_SIGNBIT3_TRUE@am__append_29 = signbitf.c signbitd.c signbitl.c -@GL_COND_OBJ_STAT_TRUE@am__append_30 = stat.c -@GL_COND_OBJ_STDIO_READ_TRUE@am__append_31 = stdio-read.c -@GL_COND_OBJ_STDIO_WRITE_TRUE@am__append_32 = stdio-write.c -@GL_COND_OBJ_STRDUP_TRUE@am__append_33 = strdup.c -@GL_COND_OBJ_STRERROR_TRUE@am__append_34 = strerror.c -@GL_COND_OBJ_STRERROR_OVERRIDE_TRUE@am__append_35 = strerror-override.c -@GL_COND_OBJ_SYMLINK_TRUE@am__append_36 = symlink.c -@GL_COND_OBJ_UNLINK_TRUE@am__append_37 = unlink.c -@GL_COND_OBJ_WRITE_TRUE@am__append_38 = write.c subdir = lib ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/00gnulib.m4 \ $(top_srcdir)/m4/__inline.m4 \ $(top_srcdir)/m4/absolute-header.m4 $(top_srcdir)/m4/alloca.m4 \ - $(top_srcdir)/m4/assert_h.m4 \ - $(top_srcdir)/m4/builtin-expect.m4 $(top_srcdir)/m4/c-bool.m4 \ - $(top_srcdir)/m4/calloc.m4 $(top_srcdir)/m4/canonicalize.m4 \ - $(top_srcdir)/m4/close.m4 $(top_srcdir)/m4/codeset.m4 \ + $(top_srcdir)/m4/canonicalize.m4 $(top_srcdir)/m4/close.m4 \ $(top_srcdir)/m4/double-slash-root.m4 $(top_srcdir)/m4/dup2.m4 \ $(top_srcdir)/m4/eealloc.m4 $(top_srcdir)/m4/errno_h.m4 \ - $(top_srcdir)/m4/error.m4 $(top_srcdir)/m4/error_h.m4 \ - $(top_srcdir)/m4/exponentd.m4 $(top_srcdir)/m4/exponentf.m4 \ - $(top_srcdir)/m4/exponentl.m4 $(top_srcdir)/m4/extensions.m4 \ + $(top_srcdir)/m4/error.m4 $(top_srcdir)/m4/exponentd.m4 \ + $(top_srcdir)/m4/exponentf.m4 $(top_srcdir)/m4/exponentl.m4 \ + $(top_srcdir)/m4/extensions.m4 \ $(top_srcdir)/m4/extern-inline.m4 $(top_srcdir)/m4/fcntl-o.m4 \ $(top_srcdir)/m4/fcntl.m4 $(top_srcdir)/m4/fcntl_h.m4 \ $(top_srcdir)/m4/float_h.m4 $(top_srcdir)/m4/fpieee.m4 \ @@ -211,32 +170,32 @@ $(top_srcdir)/m4/isnand.m4 $(top_srcdir)/m4/isnanf.m4 \ $(top_srcdir)/m4/isnanl.m4 $(top_srcdir)/m4/largefile.m4 \ $(top_srcdir)/m4/ldexpl.m4 $(top_srcdir)/m4/limits-h.m4 \ - $(top_srcdir)/m4/link.m4 $(top_srcdir)/m4/locale-fr.m4 \ - $(top_srcdir)/m4/lseek.m4 $(top_srcdir)/m4/lstat.m4 \ - $(top_srcdir)/m4/malloc.m4 $(top_srcdir)/m4/malloca.m4 \ - $(top_srcdir)/m4/manywarnings.m4 $(top_srcdir)/m4/math_h.m4 \ - $(top_srcdir)/m4/memchr.m4 $(top_srcdir)/m4/mempcpy.m4 \ - $(top_srcdir)/m4/minmax.m4 $(top_srcdir)/m4/mmap-anon.m4 \ - $(top_srcdir)/m4/mode_t.m4 $(top_srcdir)/m4/msvc-inval.m4 \ + $(top_srcdir)/m4/link.m4 $(top_srcdir)/m4/lseek.m4 \ + $(top_srcdir)/m4/lstat.m4 $(top_srcdir)/m4/malloc.m4 \ + $(top_srcdir)/m4/malloca.m4 $(top_srcdir)/m4/manywarnings.m4 \ + $(top_srcdir)/m4/math_h.m4 $(top_srcdir)/m4/memchr.m4 \ + $(top_srcdir)/m4/mempcpy.m4 $(top_srcdir)/m4/minmax.m4 \ + $(top_srcdir)/m4/mmap-anon.m4 $(top_srcdir)/m4/mode_t.m4 \ + $(top_srcdir)/m4/msvc-inval.m4 \ $(top_srcdir)/m4/msvc-nothrow.m4 $(top_srcdir)/m4/multiarch.m4 \ - $(top_srcdir)/m4/musl.m4 $(top_srcdir)/m4/nocrash.m4 \ - $(top_srcdir)/m4/off_t.m4 $(top_srcdir)/m4/open-cloexec.m4 \ + $(top_srcdir)/m4/nocrash.m4 $(top_srcdir)/m4/off_t.m4 \ + $(top_srcdir)/m4/open-cloexec.m4 \ $(top_srcdir)/m4/open-slash.m4 $(top_srcdir)/m4/open.m4 \ $(top_srcdir)/m4/pathmax.m4 $(top_srcdir)/m4/printf-frexp.m4 \ $(top_srcdir)/m4/printf-frexpl.m4 $(top_srcdir)/m4/printf.m4 \ $(top_srcdir)/m4/raise.m4 $(top_srcdir)/m4/rawmemchr.m4 \ $(top_srcdir)/m4/read.m4 $(top_srcdir)/m4/readlink.m4 \ - $(top_srcdir)/m4/realloc.m4 $(top_srcdir)/m4/reallocarray.m4 \ - $(top_srcdir)/m4/rename.m4 $(top_srcdir)/m4/rmdir.m4 \ - $(top_srcdir)/m4/signal_h.m4 $(top_srcdir)/m4/signbit.m4 \ - $(top_srcdir)/m4/size_max.m4 $(top_srcdir)/m4/sprintf-posix.m4 \ - $(top_srcdir)/m4/ssize_t.m4 $(top_srcdir)/m4/stat-time.m4 \ - $(top_srcdir)/m4/stat.m4 $(top_srcdir)/m4/stdalign.m4 \ - $(top_srcdir)/m4/stddef_h.m4 $(top_srcdir)/m4/stdint.m4 \ - $(top_srcdir)/m4/stdint_h.m4 $(top_srcdir)/m4/stdio_h.m4 \ - $(top_srcdir)/m4/stdlib_h.m4 $(top_srcdir)/m4/strdup.m4 \ - $(top_srcdir)/m4/strerror.m4 $(top_srcdir)/m4/string_h.m4 \ - $(top_srcdir)/m4/symlink.m4 $(top_srcdir)/m4/sys_socket_h.m4 \ + $(top_srcdir)/m4/realloc.m4 $(top_srcdir)/m4/rename.m4 \ + $(top_srcdir)/m4/rmdir.m4 $(top_srcdir)/m4/signal_h.m4 \ + $(top_srcdir)/m4/signbit.m4 $(top_srcdir)/m4/size_max.m4 \ + $(top_srcdir)/m4/sprintf-posix.m4 $(top_srcdir)/m4/ssize_t.m4 \ + $(top_srcdir)/m4/stat-time.m4 $(top_srcdir)/m4/stat.m4 \ + $(top_srcdir)/m4/stdbool.m4 $(top_srcdir)/m4/stddef_h.m4 \ + $(top_srcdir)/m4/stdint.m4 $(top_srcdir)/m4/stdint_h.m4 \ + $(top_srcdir)/m4/stdio_h.m4 $(top_srcdir)/m4/stdlib_h.m4 \ + $(top_srcdir)/m4/strdup.m4 $(top_srcdir)/m4/strerror.m4 \ + $(top_srcdir)/m4/string_h.m4 $(top_srcdir)/m4/symlink.m4 \ + $(top_srcdir)/m4/sys_socket_h.m4 \ $(top_srcdir)/m4/sys_stat_h.m4 $(top_srcdir)/m4/sys_types_h.m4 \ $(top_srcdir)/m4/time_h.m4 $(top_srcdir)/m4/unistd_h.m4 \ $(top_srcdir)/m4/unlink.m4 $(top_srcdir)/m4/vasnprintf.m4 \ @@ -261,98 +220,18 @@ am__v_AR_1 = libgnu_a_AR = $(AR) $(ARFLAGS) am__DEPENDENCIES_1 = -am__libgnu_a_SOURCES_DIST = basename-lgpl.c binary-io.h binary-io.c \ - canonicalize-lgpl.c cloexec.c close.c dirname-lgpl.c \ - stripslash.c dup2.c error.c exitfail.c fcntl.c fd-hook.c \ - float.c itold.c free.c fseterr.c fstat.c getdtablesize.c \ - getopt.c getopt1.c getprogname.c gettext.h \ - malloc/scratch_buffer_grow.c \ - malloc/scratch_buffer_grow_preserve.c \ - malloc/scratch_buffer_set_array_size.c ialloc.c idx.h link.c \ - lseek.c lstat.c malloca.c math.c memchr.c mempcpy.c minmax.h \ - msvc-inval.c msvc-nothrow.c open.c printf-frexp.c \ - printf-frexpl.c progname.h progname.c raise.c rawmemchr.c \ - read.c readlink.c reallocarray.c rename.c rmdir.c signbitf.c \ - signbitd.c signbitl.c size_max.h stat.c stat-time.c \ - stdio-read.c stdio-write.c strdup.c strerror.c \ - strerror-override.c symlink.c unistd.c unlink.c write.c \ - xmalloc.c xalloc-die.c xsize.h xsize.c -@GL_COND_OBJ_CANONICALIZE_LGPL_TRUE@am__objects_1 = libgnu_a-canonicalize-lgpl.$(OBJEXT) -@GL_COND_OBJ_CLOSE_TRUE@am__objects_2 = libgnu_a-close.$(OBJEXT) -@GL_COND_OBJ_DUP2_TRUE@am__objects_3 = libgnu_a-dup2.$(OBJEXT) -@GL_COND_OBJ_ERROR_TRUE@am__objects_4 = libgnu_a-error.$(OBJEXT) -@GL_COND_OBJ_FCNTL_TRUE@am__objects_5 = libgnu_a-fcntl.$(OBJEXT) -@GL_COND_OBJ_FLOAT_TRUE@am__objects_6 = libgnu_a-float.$(OBJEXT) -@GL_COND_OBJ_ITOLD_TRUE@am__objects_7 = libgnu_a-itold.$(OBJEXT) -@GL_COND_OBJ_FREE_TRUE@am__objects_8 = libgnu_a-free.$(OBJEXT) -@GL_COND_OBJ_FSETERR_TRUE@am__objects_9 = libgnu_a-fseterr.$(OBJEXT) -@GL_COND_OBJ_FSTAT_TRUE@am__objects_10 = libgnu_a-fstat.$(OBJEXT) -@GL_COND_OBJ_GETDTABLESIZE_TRUE@am__objects_11 = libgnu_a-getdtablesize.$(OBJEXT) -@GL_COND_OBJ_GETOPT_TRUE@am__objects_12 = libgnu_a-getopt.$(OBJEXT) \ -@GL_COND_OBJ_GETOPT_TRUE@ libgnu_a-getopt1.$(OBJEXT) -@GL_COND_OBJ_GETPROGNAME_TRUE@am__objects_13 = \ -@GL_COND_OBJ_GETPROGNAME_TRUE@ libgnu_a-getprogname.$(OBJEXT) am__dirstamp = $(am__leading_dot)dirstamp -@GL_COND_OBJ_LINK_TRUE@am__objects_14 = libgnu_a-link.$(OBJEXT) -@GL_COND_OBJ_LSEEK_TRUE@am__objects_15 = libgnu_a-lseek.$(OBJEXT) -@GL_COND_OBJ_LSTAT_TRUE@am__objects_16 = libgnu_a-lstat.$(OBJEXT) -@GL_COND_OBJ_MEMCHR_TRUE@am__objects_17 = libgnu_a-memchr.$(OBJEXT) -@GL_COND_OBJ_MEMPCPY_TRUE@am__objects_18 = libgnu_a-mempcpy.$(OBJEXT) -@GL_COND_OBJ_MSVC_INVAL_TRUE@am__objects_19 = \ -@GL_COND_OBJ_MSVC_INVAL_TRUE@ libgnu_a-msvc-inval.$(OBJEXT) -@GL_COND_OBJ_MSVC_NOTHROW_TRUE@am__objects_20 = libgnu_a-msvc-nothrow.$(OBJEXT) -@GL_COND_OBJ_OPEN_TRUE@am__objects_21 = libgnu_a-open.$(OBJEXT) -@GL_COND_OBJ_RAISE_TRUE@am__objects_22 = libgnu_a-raise.$(OBJEXT) -@GL_COND_OBJ_RAWMEMCHR_TRUE@am__objects_23 = \ -@GL_COND_OBJ_RAWMEMCHR_TRUE@ libgnu_a-rawmemchr.$(OBJEXT) -@GL_COND_OBJ_READ_TRUE@am__objects_24 = libgnu_a-read.$(OBJEXT) -@GL_COND_OBJ_READLINK_TRUE@am__objects_25 = \ -@GL_COND_OBJ_READLINK_TRUE@ libgnu_a-readlink.$(OBJEXT) -@GL_COND_OBJ_REALLOCARRAY_TRUE@am__objects_26 = libgnu_a-reallocarray.$(OBJEXT) -@GL_COND_OBJ_RENAME_TRUE@am__objects_27 = libgnu_a-rename.$(OBJEXT) -@GL_COND_OBJ_RMDIR_TRUE@am__objects_28 = libgnu_a-rmdir.$(OBJEXT) -@GL_COND_OBJ_SIGNBIT3_TRUE@am__objects_29 = \ -@GL_COND_OBJ_SIGNBIT3_TRUE@ libgnu_a-signbitf.$(OBJEXT) \ -@GL_COND_OBJ_SIGNBIT3_TRUE@ libgnu_a-signbitd.$(OBJEXT) \ -@GL_COND_OBJ_SIGNBIT3_TRUE@ libgnu_a-signbitl.$(OBJEXT) -@GL_COND_OBJ_STAT_TRUE@am__objects_30 = libgnu_a-stat.$(OBJEXT) -@GL_COND_OBJ_STDIO_READ_TRUE@am__objects_31 = \ -@GL_COND_OBJ_STDIO_READ_TRUE@ libgnu_a-stdio-read.$(OBJEXT) -@GL_COND_OBJ_STDIO_WRITE_TRUE@am__objects_32 = \ -@GL_COND_OBJ_STDIO_WRITE_TRUE@ libgnu_a-stdio-write.$(OBJEXT) -@GL_COND_OBJ_STRDUP_TRUE@am__objects_33 = libgnu_a-strdup.$(OBJEXT) -@GL_COND_OBJ_STRERROR_TRUE@am__objects_34 = \ -@GL_COND_OBJ_STRERROR_TRUE@ libgnu_a-strerror.$(OBJEXT) -@GL_COND_OBJ_STRERROR_OVERRIDE_TRUE@am__objects_35 = libgnu_a-strerror-override.$(OBJEXT) -@GL_COND_OBJ_SYMLINK_TRUE@am__objects_36 = libgnu_a-symlink.$(OBJEXT) -@GL_COND_OBJ_UNLINK_TRUE@am__objects_37 = libgnu_a-unlink.$(OBJEXT) -@GL_COND_OBJ_WRITE_TRUE@am__objects_38 = libgnu_a-write.$(OBJEXT) -am_libgnu_a_OBJECTS = libgnu_a-basename-lgpl.$(OBJEXT) \ - libgnu_a-binary-io.$(OBJEXT) $(am__objects_1) \ - libgnu_a-cloexec.$(OBJEXT) $(am__objects_2) \ - libgnu_a-dirname-lgpl.$(OBJEXT) libgnu_a-stripslash.$(OBJEXT) \ - $(am__objects_3) $(am__objects_4) libgnu_a-exitfail.$(OBJEXT) \ - $(am__objects_5) libgnu_a-fd-hook.$(OBJEXT) $(am__objects_6) \ - $(am__objects_7) $(am__objects_8) $(am__objects_9) \ - $(am__objects_10) $(am__objects_11) $(am__objects_12) \ - $(am__objects_13) \ - malloc/libgnu_a-scratch_buffer_grow.$(OBJEXT) \ - malloc/libgnu_a-scratch_buffer_grow_preserve.$(OBJEXT) \ - malloc/libgnu_a-scratch_buffer_set_array_size.$(OBJEXT) \ - libgnu_a-ialloc.$(OBJEXT) $(am__objects_14) $(am__objects_15) \ - $(am__objects_16) libgnu_a-malloca.$(OBJEXT) \ - libgnu_a-math.$(OBJEXT) $(am__objects_17) $(am__objects_18) \ - $(am__objects_19) $(am__objects_20) $(am__objects_21) \ - libgnu_a-printf-frexp.$(OBJEXT) \ - libgnu_a-printf-frexpl.$(OBJEXT) libgnu_a-progname.$(OBJEXT) \ - $(am__objects_22) $(am__objects_23) $(am__objects_24) \ - $(am__objects_25) $(am__objects_26) $(am__objects_27) \ - $(am__objects_28) $(am__objects_29) $(am__objects_30) \ - libgnu_a-stat-time.$(OBJEXT) $(am__objects_31) \ - $(am__objects_32) $(am__objects_33) $(am__objects_34) \ - $(am__objects_35) $(am__objects_36) libgnu_a-unistd.$(OBJEXT) \ - $(am__objects_37) $(am__objects_38) libgnu_a-xmalloc.$(OBJEXT) \ - libgnu_a-xalloc-die.$(OBJEXT) libgnu_a-xsize.$(OBJEXT) +am_libgnu_a_OBJECTS = basename-lgpl.$(OBJEXT) binary-io.$(OBJEXT) \ + cloexec.$(OBJEXT) dirname-lgpl.$(OBJEXT) stripslash.$(OBJEXT) \ + exitfail.$(OBJEXT) fd-hook.$(OBJEXT) getprogname.$(OBJEXT) \ + malloca.$(OBJEXT) math.$(OBJEXT) printf-frexp.$(OBJEXT) \ + printf-frexpl.$(OBJEXT) progname.$(OBJEXT) \ + malloc/scratch_buffer_dupfree.$(OBJEXT) \ + malloc/scratch_buffer_grow.$(OBJEXT) \ + malloc/scratch_buffer_grow_preserve.$(OBJEXT) \ + malloc/scratch_buffer_set_array_size.$(OBJEXT) \ + stat-time.$(OBJEXT) unistd.$(OBJEXT) xmalloc.$(OBJEXT) \ + xalloc-die.$(OBJEXT) xsize.$(OBJEXT) libgnu_a_OBJECTS = $(am_libgnu_a_OBJECTS) AM_V_P = $(am__v_P_@AM_V@) am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) @@ -369,68 +248,46 @@ DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) depcomp = $(SHELL) $(top_srcdir)/build-aux/depcomp am__maybe_remake_depfiles = depfiles -am__depfiles_remade = ./$(DEPDIR)/libgnu_a-asnprintf.Po \ - ./$(DEPDIR)/libgnu_a-basename-lgpl.Po \ - ./$(DEPDIR)/libgnu_a-binary-io.Po \ - ./$(DEPDIR)/libgnu_a-calloc.Po \ - ./$(DEPDIR)/libgnu_a-canonicalize-lgpl.Po \ - ./$(DEPDIR)/libgnu_a-cloexec.Po ./$(DEPDIR)/libgnu_a-close.Po \ - ./$(DEPDIR)/libgnu_a-dirname-lgpl.Po \ - ./$(DEPDIR)/libgnu_a-dup2.Po ./$(DEPDIR)/libgnu_a-error.Po \ - ./$(DEPDIR)/libgnu_a-exitfail.Po ./$(DEPDIR)/libgnu_a-fcntl.Po \ - ./$(DEPDIR)/libgnu_a-fd-hook.Po ./$(DEPDIR)/libgnu_a-float.Po \ - ./$(DEPDIR)/libgnu_a-fprintf.Po ./$(DEPDIR)/libgnu_a-free.Po \ - ./$(DEPDIR)/libgnu_a-frexp.Po ./$(DEPDIR)/libgnu_a-frexpl.Po \ - ./$(DEPDIR)/libgnu_a-fseterr.Po ./$(DEPDIR)/libgnu_a-fstat.Po \ - ./$(DEPDIR)/libgnu_a-getdtablesize.Po \ - ./$(DEPDIR)/libgnu_a-getopt.Po ./$(DEPDIR)/libgnu_a-getopt1.Po \ - ./$(DEPDIR)/libgnu_a-getprogname.Po \ - ./$(DEPDIR)/libgnu_a-ialloc.Po ./$(DEPDIR)/libgnu_a-isnan.Po \ - ./$(DEPDIR)/libgnu_a-isnand.Po ./$(DEPDIR)/libgnu_a-isnanf.Po \ - ./$(DEPDIR)/libgnu_a-isnanl.Po ./$(DEPDIR)/libgnu_a-itold.Po \ - ./$(DEPDIR)/libgnu_a-link.Po ./$(DEPDIR)/libgnu_a-lseek.Po \ - ./$(DEPDIR)/libgnu_a-lstat.Po ./$(DEPDIR)/libgnu_a-malloc.Po \ - ./$(DEPDIR)/libgnu_a-malloca.Po ./$(DEPDIR)/libgnu_a-math.Po \ - ./$(DEPDIR)/libgnu_a-memchr.Po ./$(DEPDIR)/libgnu_a-mempcpy.Po \ - ./$(DEPDIR)/libgnu_a-msvc-inval.Po \ - ./$(DEPDIR)/libgnu_a-msvc-nothrow.Po \ - ./$(DEPDIR)/libgnu_a-open.Po \ - ./$(DEPDIR)/libgnu_a-printf-args.Po \ - ./$(DEPDIR)/libgnu_a-printf-frexp.Po \ - ./$(DEPDIR)/libgnu_a-printf-frexpl.Po \ - ./$(DEPDIR)/libgnu_a-printf-parse.Po \ - ./$(DEPDIR)/libgnu_a-progname.Po ./$(DEPDIR)/libgnu_a-raise.Po \ - ./$(DEPDIR)/libgnu_a-rawmemchr.Po ./$(DEPDIR)/libgnu_a-read.Po \ - ./$(DEPDIR)/libgnu_a-readlink.Po \ - ./$(DEPDIR)/libgnu_a-realloc.Po \ - ./$(DEPDIR)/libgnu_a-reallocarray.Po \ - ./$(DEPDIR)/libgnu_a-rename.Po ./$(DEPDIR)/libgnu_a-rmdir.Po \ - ./$(DEPDIR)/libgnu_a-signbitd.Po \ - ./$(DEPDIR)/libgnu_a-signbitf.Po \ - ./$(DEPDIR)/libgnu_a-signbitl.Po \ - ./$(DEPDIR)/libgnu_a-sprintf.Po \ - ./$(DEPDIR)/libgnu_a-stat-time.Po \ - ./$(DEPDIR)/libgnu_a-stat-w32.Po ./$(DEPDIR)/libgnu_a-stat.Po \ - ./$(DEPDIR)/libgnu_a-stdio-read.Po \ - ./$(DEPDIR)/libgnu_a-stdio-write.Po \ - ./$(DEPDIR)/libgnu_a-strdup.Po \ - ./$(DEPDIR)/libgnu_a-strerror-override.Po \ - ./$(DEPDIR)/libgnu_a-strerror.Po \ - ./$(DEPDIR)/libgnu_a-stripslash.Po \ - ./$(DEPDIR)/libgnu_a-symlink.Po ./$(DEPDIR)/libgnu_a-unistd.Po \ - ./$(DEPDIR)/libgnu_a-unlink.Po \ - ./$(DEPDIR)/libgnu_a-vasnprintf.Po \ - ./$(DEPDIR)/libgnu_a-write.Po \ - ./$(DEPDIR)/libgnu_a-xalloc-die.Po \ - ./$(DEPDIR)/libgnu_a-xmalloc.Po ./$(DEPDIR)/libgnu_a-xsize.Po \ - malloc/$(DEPDIR)/libgnu_a-scratch_buffer_grow.Po \ - malloc/$(DEPDIR)/libgnu_a-scratch_buffer_grow_preserve.Po \ - malloc/$(DEPDIR)/libgnu_a-scratch_buffer_set_array_size.Po +am__depfiles_remade = ./$(DEPDIR)/asnprintf.Po \ + ./$(DEPDIR)/basename-lgpl.Po ./$(DEPDIR)/binary-io.Po \ + ./$(DEPDIR)/canonicalize-lgpl.Po ./$(DEPDIR)/cloexec.Po \ + ./$(DEPDIR)/close.Po ./$(DEPDIR)/dirname-lgpl.Po \ + ./$(DEPDIR)/dup2.Po ./$(DEPDIR)/error.Po \ + ./$(DEPDIR)/exitfail.Po ./$(DEPDIR)/fcntl.Po \ + ./$(DEPDIR)/fd-hook.Po ./$(DEPDIR)/float.Po \ + ./$(DEPDIR)/fprintf.Po ./$(DEPDIR)/free.Po \ + ./$(DEPDIR)/frexp.Po ./$(DEPDIR)/frexpl.Po \ + ./$(DEPDIR)/fseterr.Po ./$(DEPDIR)/fstat.Po \ + ./$(DEPDIR)/getdtablesize.Po ./$(DEPDIR)/getopt.Po \ + ./$(DEPDIR)/getopt1.Po ./$(DEPDIR)/getprogname.Po \ + ./$(DEPDIR)/isnan.Po ./$(DEPDIR)/isnand.Po \ + ./$(DEPDIR)/isnanf.Po ./$(DEPDIR)/isnanl.Po \ + ./$(DEPDIR)/itold.Po ./$(DEPDIR)/link.Po ./$(DEPDIR)/lseek.Po \ + ./$(DEPDIR)/lstat.Po ./$(DEPDIR)/malloc.Po \ + ./$(DEPDIR)/malloca.Po ./$(DEPDIR)/math.Po \ + ./$(DEPDIR)/memchr.Po ./$(DEPDIR)/mempcpy.Po \ + ./$(DEPDIR)/msvc-inval.Po ./$(DEPDIR)/msvc-nothrow.Po \ + ./$(DEPDIR)/open.Po ./$(DEPDIR)/printf-args.Po \ + ./$(DEPDIR)/printf-frexp.Po ./$(DEPDIR)/printf-frexpl.Po \ + ./$(DEPDIR)/printf-parse.Po ./$(DEPDIR)/progname.Po \ + ./$(DEPDIR)/raise.Po ./$(DEPDIR)/rawmemchr.Po \ + ./$(DEPDIR)/read.Po ./$(DEPDIR)/readlink.Po \ + ./$(DEPDIR)/realloc.Po ./$(DEPDIR)/rename.Po \ + ./$(DEPDIR)/rmdir.Po ./$(DEPDIR)/signbitd.Po \ + ./$(DEPDIR)/signbitf.Po ./$(DEPDIR)/signbitl.Po \ + ./$(DEPDIR)/sprintf.Po ./$(DEPDIR)/stat-time.Po \ + ./$(DEPDIR)/stat-w32.Po ./$(DEPDIR)/stat.Po \ + ./$(DEPDIR)/strdup.Po ./$(DEPDIR)/strerror-override.Po \ + ./$(DEPDIR)/strerror.Po ./$(DEPDIR)/stripslash.Po \ + ./$(DEPDIR)/symlink.Po ./$(DEPDIR)/unistd.Po \ + ./$(DEPDIR)/unlink.Po ./$(DEPDIR)/vasnprintf.Po \ + ./$(DEPDIR)/write.Po ./$(DEPDIR)/xalloc-die.Po \ + ./$(DEPDIR)/xmalloc.Po ./$(DEPDIR)/xsize.Po \ + malloc/$(DEPDIR)/scratch_buffer_dupfree.Po \ + malloc/$(DEPDIR)/scratch_buffer_grow.Po \ + malloc/$(DEPDIR)/scratch_buffer_grow_preserve.Po \ + malloc/$(DEPDIR)/scratch_buffer_set_array_size.Po am__mv = mv -f -AM_V_lt = $(am__v_lt_@AM_V@) -am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@) -am__v_lt_0 = --silent -am__v_lt_1 = COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) AM_V_CC = $(am__v_CC_@AM_V@) @@ -444,7 +301,7 @@ am__v_CCLD_0 = @echo " CCLD " $@; am__v_CCLD_1 = SOURCES = $(libgnu_a_SOURCES) $(EXTRA_libgnu_a_SOURCES) -DIST_SOURCES = $(am__libgnu_a_SOURCES_DIST) $(EXTRA_libgnu_a_SOURCES) +DIST_SOURCES = $(libgnu_a_SOURCES) $(EXTRA_libgnu_a_SOURCES) RECURSIVE_TARGETS = all-recursive check-recursive cscopelist-recursive \ ctags-recursive dvi-recursive html-recursive info-recursive \ install-data-recursive install-dvi-recursive \ @@ -521,7 +378,6 @@ APPLE_UNIVERSAL_BUILD = @APPLE_UNIVERSAL_BUILD@ AR = @AR@ ARFLAGS = @ARFLAGS@ -ASSERT_H = @ASSERT_H@ AUTOCONF = @AUTOCONF@ AUTOHEADER = @AUTOHEADER@ AUTOMAKE = @AUTOMAKE@ @@ -554,447 +410,431 @@ EOVERFLOW_HIDDEN = @EOVERFLOW_HIDDEN@ EOVERFLOW_VALUE = @EOVERFLOW_VALUE@ ERRNO_H = @ERRNO_H@ -ERROR_H = @ERROR_H@ ETAGS = @ETAGS@ EXEEXT = @EXEEXT@ FLOAT_H = @FLOAT_H@ GETOPT_CDEFS_H = @GETOPT_CDEFS_H@ GETOPT_H = @GETOPT_H@ -GL_CFLAG_ALLOW_WARNINGS = @GL_CFLAG_ALLOW_WARNINGS@ -GL_CFLAG_GNULIB_WARNINGS = @GL_CFLAG_GNULIB_WARNINGS@ -GL_GNULIB_ACCESS = @GL_GNULIB_ACCESS@ -GL_GNULIB_ACOSF = @GL_GNULIB_ACOSF@ -GL_GNULIB_ACOSL = @GL_GNULIB_ACOSL@ -GL_GNULIB_ALIGNED_ALLOC = @GL_GNULIB_ALIGNED_ALLOC@ -GL_GNULIB_ASINF = @GL_GNULIB_ASINF@ -GL_GNULIB_ASINL = @GL_GNULIB_ASINL@ -GL_GNULIB_ATAN2F = @GL_GNULIB_ATAN2F@ -GL_GNULIB_ATANF = @GL_GNULIB_ATANF@ -GL_GNULIB_ATANL = @GL_GNULIB_ATANL@ -GL_GNULIB_ATOLL = @GL_GNULIB_ATOLL@ -GL_GNULIB_BTOWC = @GL_GNULIB_BTOWC@ -GL_GNULIB_CALLOC_GNU = @GL_GNULIB_CALLOC_GNU@ -GL_GNULIB_CALLOC_POSIX = @GL_GNULIB_CALLOC_POSIX@ -GL_GNULIB_CANONICALIZE_FILE_NAME = @GL_GNULIB_CANONICALIZE_FILE_NAME@ -GL_GNULIB_CBRT = @GL_GNULIB_CBRT@ -GL_GNULIB_CBRTF = @GL_GNULIB_CBRTF@ -GL_GNULIB_CBRTL = @GL_GNULIB_CBRTL@ -GL_GNULIB_CEIL = @GL_GNULIB_CEIL@ -GL_GNULIB_CEILF = @GL_GNULIB_CEILF@ -GL_GNULIB_CEILL = @GL_GNULIB_CEILL@ -GL_GNULIB_CHDIR = @GL_GNULIB_CHDIR@ -GL_GNULIB_CHMOD = @GL_GNULIB_CHMOD@ -GL_GNULIB_CHOWN = @GL_GNULIB_CHOWN@ -GL_GNULIB_CLOSE = @GL_GNULIB_CLOSE@ -GL_GNULIB_COPYSIGN = @GL_GNULIB_COPYSIGN@ -GL_GNULIB_COPYSIGNF = @GL_GNULIB_COPYSIGNF@ -GL_GNULIB_COPYSIGNL = @GL_GNULIB_COPYSIGNL@ -GL_GNULIB_COPY_FILE_RANGE = @GL_GNULIB_COPY_FILE_RANGE@ -GL_GNULIB_COSF = @GL_GNULIB_COSF@ -GL_GNULIB_COSHF = @GL_GNULIB_COSHF@ -GL_GNULIB_COSL = @GL_GNULIB_COSL@ -GL_GNULIB_CREAT = @GL_GNULIB_CREAT@ -GL_GNULIB_CTIME = @GL_GNULIB_CTIME@ -GL_GNULIB_DPRINTF = @GL_GNULIB_DPRINTF@ -GL_GNULIB_DUP = @GL_GNULIB_DUP@ -GL_GNULIB_DUP2 = @GL_GNULIB_DUP2@ -GL_GNULIB_DUP3 = @GL_GNULIB_DUP3@ -GL_GNULIB_ENVIRON = @GL_GNULIB_ENVIRON@ -GL_GNULIB_EUIDACCESS = @GL_GNULIB_EUIDACCESS@ -GL_GNULIB_EXECL = @GL_GNULIB_EXECL@ -GL_GNULIB_EXECLE = @GL_GNULIB_EXECLE@ -GL_GNULIB_EXECLP = @GL_GNULIB_EXECLP@ -GL_GNULIB_EXECV = @GL_GNULIB_EXECV@ -GL_GNULIB_EXECVE = @GL_GNULIB_EXECVE@ -GL_GNULIB_EXECVP = @GL_GNULIB_EXECVP@ -GL_GNULIB_EXECVPE = @GL_GNULIB_EXECVPE@ -GL_GNULIB_EXP2 = @GL_GNULIB_EXP2@ -GL_GNULIB_EXP2F = @GL_GNULIB_EXP2F@ -GL_GNULIB_EXP2L = @GL_GNULIB_EXP2L@ -GL_GNULIB_EXPF = @GL_GNULIB_EXPF@ -GL_GNULIB_EXPL = @GL_GNULIB_EXPL@ -GL_GNULIB_EXPLICIT_BZERO = @GL_GNULIB_EXPLICIT_BZERO@ -GL_GNULIB_EXPM1 = @GL_GNULIB_EXPM1@ -GL_GNULIB_EXPM1F = @GL_GNULIB_EXPM1F@ -GL_GNULIB_EXPM1L = @GL_GNULIB_EXPM1L@ -GL_GNULIB_FABSF = @GL_GNULIB_FABSF@ -GL_GNULIB_FABSL = @GL_GNULIB_FABSL@ -GL_GNULIB_FACCESSAT = @GL_GNULIB_FACCESSAT@ -GL_GNULIB_FCHDIR = @GL_GNULIB_FCHDIR@ -GL_GNULIB_FCHMODAT = @GL_GNULIB_FCHMODAT@ -GL_GNULIB_FCHOWNAT = @GL_GNULIB_FCHOWNAT@ -GL_GNULIB_FCLOSE = @GL_GNULIB_FCLOSE@ -GL_GNULIB_FCNTL = @GL_GNULIB_FCNTL@ -GL_GNULIB_FDATASYNC = @GL_GNULIB_FDATASYNC@ -GL_GNULIB_FDOPEN = @GL_GNULIB_FDOPEN@ -GL_GNULIB_FFLUSH = @GL_GNULIB_FFLUSH@ -GL_GNULIB_FFSL = @GL_GNULIB_FFSL@ -GL_GNULIB_FFSLL = @GL_GNULIB_FFSLL@ -GL_GNULIB_FGETC = @GL_GNULIB_FGETC@ -GL_GNULIB_FGETS = @GL_GNULIB_FGETS@ -GL_GNULIB_FLOOR = @GL_GNULIB_FLOOR@ -GL_GNULIB_FLOORF = @GL_GNULIB_FLOORF@ -GL_GNULIB_FLOORL = @GL_GNULIB_FLOORL@ -GL_GNULIB_FMA = @GL_GNULIB_FMA@ -GL_GNULIB_FMAF = @GL_GNULIB_FMAF@ -GL_GNULIB_FMAL = @GL_GNULIB_FMAL@ -GL_GNULIB_FMOD = @GL_GNULIB_FMOD@ -GL_GNULIB_FMODF = @GL_GNULIB_FMODF@ -GL_GNULIB_FMODL = @GL_GNULIB_FMODL@ -GL_GNULIB_FOPEN = @GL_GNULIB_FOPEN@ -GL_GNULIB_FOPEN_GNU = @GL_GNULIB_FOPEN_GNU@ -GL_GNULIB_FPRINTF = @GL_GNULIB_FPRINTF@ -GL_GNULIB_FPRINTF_POSIX = @GL_GNULIB_FPRINTF_POSIX@ -GL_GNULIB_FPURGE = @GL_GNULIB_FPURGE@ -GL_GNULIB_FPUTC = @GL_GNULIB_FPUTC@ -GL_GNULIB_FPUTS = @GL_GNULIB_FPUTS@ -GL_GNULIB_FREAD = @GL_GNULIB_FREAD@ -GL_GNULIB_FREE_POSIX = @GL_GNULIB_FREE_POSIX@ -GL_GNULIB_FREOPEN = @GL_GNULIB_FREOPEN@ -GL_GNULIB_FREXP = @GL_GNULIB_FREXP@ -GL_GNULIB_FREXPF = @GL_GNULIB_FREXPF@ -GL_GNULIB_FREXPL = @GL_GNULIB_FREXPL@ -GL_GNULIB_FSCANF = @GL_GNULIB_FSCANF@ -GL_GNULIB_FSEEK = @GL_GNULIB_FSEEK@ -GL_GNULIB_FSEEKO = @GL_GNULIB_FSEEKO@ -GL_GNULIB_FSTAT = @GL_GNULIB_FSTAT@ -GL_GNULIB_FSTATAT = @GL_GNULIB_FSTATAT@ -GL_GNULIB_FSYNC = @GL_GNULIB_FSYNC@ -GL_GNULIB_FTELL = @GL_GNULIB_FTELL@ -GL_GNULIB_FTELLO = @GL_GNULIB_FTELLO@ -GL_GNULIB_FTRUNCATE = @GL_GNULIB_FTRUNCATE@ -GL_GNULIB_FUTIMENS = @GL_GNULIB_FUTIMENS@ -GL_GNULIB_FWRITE = @GL_GNULIB_FWRITE@ -GL_GNULIB_GETC = @GL_GNULIB_GETC@ -GL_GNULIB_GETCHAR = @GL_GNULIB_GETCHAR@ -GL_GNULIB_GETCWD = @GL_GNULIB_GETCWD@ -GL_GNULIB_GETDELIM = @GL_GNULIB_GETDELIM@ -GL_GNULIB_GETDOMAINNAME = @GL_GNULIB_GETDOMAINNAME@ -GL_GNULIB_GETDTABLESIZE = @GL_GNULIB_GETDTABLESIZE@ -GL_GNULIB_GETENTROPY = @GL_GNULIB_GETENTROPY@ -GL_GNULIB_GETGROUPS = @GL_GNULIB_GETGROUPS@ -GL_GNULIB_GETHOSTNAME = @GL_GNULIB_GETHOSTNAME@ -GL_GNULIB_GETLINE = @GL_GNULIB_GETLINE@ -GL_GNULIB_GETLOADAVG = @GL_GNULIB_GETLOADAVG@ -GL_GNULIB_GETLOGIN = @GL_GNULIB_GETLOGIN@ -GL_GNULIB_GETLOGIN_R = @GL_GNULIB_GETLOGIN_R@ -GL_GNULIB_GETOPT_POSIX = @GL_GNULIB_GETOPT_POSIX@ -GL_GNULIB_GETPAGESIZE = @GL_GNULIB_GETPAGESIZE@ -GL_GNULIB_GETPASS = @GL_GNULIB_GETPASS@ -GL_GNULIB_GETPASS_GNU = @GL_GNULIB_GETPASS_GNU@ -GL_GNULIB_GETPROGNAME = @GL_GNULIB_GETPROGNAME@ -GL_GNULIB_GETSUBOPT = @GL_GNULIB_GETSUBOPT@ -GL_GNULIB_GETUMASK = @GL_GNULIB_GETUMASK@ -GL_GNULIB_GETUSERSHELL = @GL_GNULIB_GETUSERSHELL@ -GL_GNULIB_GRANTPT = @GL_GNULIB_GRANTPT@ -GL_GNULIB_GROUP_MEMBER = @GL_GNULIB_GROUP_MEMBER@ -GL_GNULIB_HYPOT = @GL_GNULIB_HYPOT@ -GL_GNULIB_HYPOTF = @GL_GNULIB_HYPOTF@ -GL_GNULIB_HYPOTL = @GL_GNULIB_HYPOTL@ -GL_GNULIB_ILOGB = @GL_GNULIB_ILOGB@ -GL_GNULIB_ILOGBF = @GL_GNULIB_ILOGBF@ -GL_GNULIB_ILOGBL = @GL_GNULIB_ILOGBL@ -GL_GNULIB_IMAXABS = @GL_GNULIB_IMAXABS@ -GL_GNULIB_IMAXDIV = @GL_GNULIB_IMAXDIV@ -GL_GNULIB_ISATTY = @GL_GNULIB_ISATTY@ -GL_GNULIB_ISFINITE = @GL_GNULIB_ISFINITE@ -GL_GNULIB_ISINF = @GL_GNULIB_ISINF@ -GL_GNULIB_ISNAN = @GL_GNULIB_ISNAN@ -GL_GNULIB_ISNAND = @GL_GNULIB_ISNAND@ -GL_GNULIB_ISNANF = @GL_GNULIB_ISNANF@ -GL_GNULIB_ISNANL = @GL_GNULIB_ISNANL@ -GL_GNULIB_LCHMOD = @GL_GNULIB_LCHMOD@ -GL_GNULIB_LCHOWN = @GL_GNULIB_LCHOWN@ -GL_GNULIB_LDEXPF = @GL_GNULIB_LDEXPF@ -GL_GNULIB_LDEXPL = @GL_GNULIB_LDEXPL@ -GL_GNULIB_LINK = @GL_GNULIB_LINK@ -GL_GNULIB_LINKAT = @GL_GNULIB_LINKAT@ -GL_GNULIB_LOCALTIME = @GL_GNULIB_LOCALTIME@ -GL_GNULIB_LOG = @GL_GNULIB_LOG@ -GL_GNULIB_LOG10 = @GL_GNULIB_LOG10@ -GL_GNULIB_LOG10F = @GL_GNULIB_LOG10F@ -GL_GNULIB_LOG10L = @GL_GNULIB_LOG10L@ -GL_GNULIB_LOG1P = @GL_GNULIB_LOG1P@ -GL_GNULIB_LOG1PF = @GL_GNULIB_LOG1PF@ -GL_GNULIB_LOG1PL = @GL_GNULIB_LOG1PL@ -GL_GNULIB_LOG2 = @GL_GNULIB_LOG2@ -GL_GNULIB_LOG2F = @GL_GNULIB_LOG2F@ -GL_GNULIB_LOG2L = @GL_GNULIB_LOG2L@ -GL_GNULIB_LOGB = @GL_GNULIB_LOGB@ -GL_GNULIB_LOGBF = @GL_GNULIB_LOGBF@ -GL_GNULIB_LOGBL = @GL_GNULIB_LOGBL@ -GL_GNULIB_LOGF = @GL_GNULIB_LOGF@ -GL_GNULIB_LOGL = @GL_GNULIB_LOGL@ -GL_GNULIB_LSEEK = @GL_GNULIB_LSEEK@ -GL_GNULIB_LSTAT = @GL_GNULIB_LSTAT@ -GL_GNULIB_MALLOC_GNU = @GL_GNULIB_MALLOC_GNU@ -GL_GNULIB_MALLOC_POSIX = @GL_GNULIB_MALLOC_POSIX@ -GL_GNULIB_MBRLEN = @GL_GNULIB_MBRLEN@ -GL_GNULIB_MBRTOWC = @GL_GNULIB_MBRTOWC@ -GL_GNULIB_MBSCASECMP = @GL_GNULIB_MBSCASECMP@ -GL_GNULIB_MBSCASESTR = @GL_GNULIB_MBSCASESTR@ -GL_GNULIB_MBSCHR = @GL_GNULIB_MBSCHR@ -GL_GNULIB_MBSCSPN = @GL_GNULIB_MBSCSPN@ -GL_GNULIB_MBSINIT = @GL_GNULIB_MBSINIT@ -GL_GNULIB_MBSLEN = @GL_GNULIB_MBSLEN@ -GL_GNULIB_MBSNCASECMP = @GL_GNULIB_MBSNCASECMP@ -GL_GNULIB_MBSNLEN = @GL_GNULIB_MBSNLEN@ -GL_GNULIB_MBSNRTOWCS = @GL_GNULIB_MBSNRTOWCS@ -GL_GNULIB_MBSPBRK = @GL_GNULIB_MBSPBRK@ -GL_GNULIB_MBSPCASECMP = @GL_GNULIB_MBSPCASECMP@ -GL_GNULIB_MBSRCHR = @GL_GNULIB_MBSRCHR@ -GL_GNULIB_MBSRTOWCS = @GL_GNULIB_MBSRTOWCS@ -GL_GNULIB_MBSSEP = @GL_GNULIB_MBSSEP@ -GL_GNULIB_MBSSPN = @GL_GNULIB_MBSSPN@ -GL_GNULIB_MBSSTR = @GL_GNULIB_MBSSTR@ -GL_GNULIB_MBSTOK_R = @GL_GNULIB_MBSTOK_R@ -GL_GNULIB_MBSTOWCS = @GL_GNULIB_MBSTOWCS@ -GL_GNULIB_MBTOWC = @GL_GNULIB_MBTOWC@ -GL_GNULIB_MDA_ACCESS = @GL_GNULIB_MDA_ACCESS@ -GL_GNULIB_MDA_CHDIR = @GL_GNULIB_MDA_CHDIR@ -GL_GNULIB_MDA_CHMOD = @GL_GNULIB_MDA_CHMOD@ -GL_GNULIB_MDA_CLOSE = @GL_GNULIB_MDA_CLOSE@ -GL_GNULIB_MDA_CREAT = @GL_GNULIB_MDA_CREAT@ -GL_GNULIB_MDA_DUP = @GL_GNULIB_MDA_DUP@ -GL_GNULIB_MDA_DUP2 = @GL_GNULIB_MDA_DUP2@ -GL_GNULIB_MDA_ECVT = @GL_GNULIB_MDA_ECVT@ -GL_GNULIB_MDA_EXECL = @GL_GNULIB_MDA_EXECL@ -GL_GNULIB_MDA_EXECLE = @GL_GNULIB_MDA_EXECLE@ -GL_GNULIB_MDA_EXECLP = @GL_GNULIB_MDA_EXECLP@ -GL_GNULIB_MDA_EXECV = @GL_GNULIB_MDA_EXECV@ -GL_GNULIB_MDA_EXECVE = @GL_GNULIB_MDA_EXECVE@ -GL_GNULIB_MDA_EXECVP = @GL_GNULIB_MDA_EXECVP@ -GL_GNULIB_MDA_EXECVPE = @GL_GNULIB_MDA_EXECVPE@ -GL_GNULIB_MDA_FCLOSEALL = @GL_GNULIB_MDA_FCLOSEALL@ -GL_GNULIB_MDA_FCVT = @GL_GNULIB_MDA_FCVT@ -GL_GNULIB_MDA_FDOPEN = @GL_GNULIB_MDA_FDOPEN@ -GL_GNULIB_MDA_FILENO = @GL_GNULIB_MDA_FILENO@ -GL_GNULIB_MDA_GCVT = @GL_GNULIB_MDA_GCVT@ -GL_GNULIB_MDA_GETCWD = @GL_GNULIB_MDA_GETCWD@ -GL_GNULIB_MDA_GETPID = @GL_GNULIB_MDA_GETPID@ -GL_GNULIB_MDA_GETW = @GL_GNULIB_MDA_GETW@ -GL_GNULIB_MDA_ISATTY = @GL_GNULIB_MDA_ISATTY@ -GL_GNULIB_MDA_J0 = @GL_GNULIB_MDA_J0@ -GL_GNULIB_MDA_J1 = @GL_GNULIB_MDA_J1@ -GL_GNULIB_MDA_JN = @GL_GNULIB_MDA_JN@ -GL_GNULIB_MDA_LSEEK = @GL_GNULIB_MDA_LSEEK@ -GL_GNULIB_MDA_MEMCCPY = @GL_GNULIB_MDA_MEMCCPY@ -GL_GNULIB_MDA_MKDIR = @GL_GNULIB_MDA_MKDIR@ -GL_GNULIB_MDA_MKTEMP = @GL_GNULIB_MDA_MKTEMP@ -GL_GNULIB_MDA_OPEN = @GL_GNULIB_MDA_OPEN@ -GL_GNULIB_MDA_PUTENV = @GL_GNULIB_MDA_PUTENV@ -GL_GNULIB_MDA_PUTW = @GL_GNULIB_MDA_PUTW@ -GL_GNULIB_MDA_READ = @GL_GNULIB_MDA_READ@ -GL_GNULIB_MDA_RMDIR = @GL_GNULIB_MDA_RMDIR@ -GL_GNULIB_MDA_STRDUP = @GL_GNULIB_MDA_STRDUP@ -GL_GNULIB_MDA_SWAB = @GL_GNULIB_MDA_SWAB@ -GL_GNULIB_MDA_TEMPNAM = @GL_GNULIB_MDA_TEMPNAM@ -GL_GNULIB_MDA_TZSET = @GL_GNULIB_MDA_TZSET@ -GL_GNULIB_MDA_UMASK = @GL_GNULIB_MDA_UMASK@ -GL_GNULIB_MDA_UNLINK = @GL_GNULIB_MDA_UNLINK@ -GL_GNULIB_MDA_WCSDUP = @GL_GNULIB_MDA_WCSDUP@ -GL_GNULIB_MDA_WRITE = @GL_GNULIB_MDA_WRITE@ -GL_GNULIB_MDA_Y0 = @GL_GNULIB_MDA_Y0@ -GL_GNULIB_MDA_Y1 = @GL_GNULIB_MDA_Y1@ -GL_GNULIB_MDA_YN = @GL_GNULIB_MDA_YN@ -GL_GNULIB_MEMCHR = @GL_GNULIB_MEMCHR@ -GL_GNULIB_MEMMEM = @GL_GNULIB_MEMMEM@ -GL_GNULIB_MEMPCPY = @GL_GNULIB_MEMPCPY@ -GL_GNULIB_MEMRCHR = @GL_GNULIB_MEMRCHR@ -GL_GNULIB_MEMSET_EXPLICIT = @GL_GNULIB_MEMSET_EXPLICIT@ -GL_GNULIB_MKDIR = @GL_GNULIB_MKDIR@ -GL_GNULIB_MKDIRAT = @GL_GNULIB_MKDIRAT@ -GL_GNULIB_MKDTEMP = @GL_GNULIB_MKDTEMP@ -GL_GNULIB_MKFIFO = @GL_GNULIB_MKFIFO@ -GL_GNULIB_MKFIFOAT = @GL_GNULIB_MKFIFOAT@ -GL_GNULIB_MKNOD = @GL_GNULIB_MKNOD@ -GL_GNULIB_MKNODAT = @GL_GNULIB_MKNODAT@ -GL_GNULIB_MKOSTEMP = @GL_GNULIB_MKOSTEMP@ -GL_GNULIB_MKOSTEMPS = @GL_GNULIB_MKOSTEMPS@ -GL_GNULIB_MKSTEMP = @GL_GNULIB_MKSTEMP@ -GL_GNULIB_MKSTEMPS = @GL_GNULIB_MKSTEMPS@ -GL_GNULIB_MKTIME = @GL_GNULIB_MKTIME@ -GL_GNULIB_MODF = @GL_GNULIB_MODF@ -GL_GNULIB_MODFF = @GL_GNULIB_MODFF@ -GL_GNULIB_MODFL = @GL_GNULIB_MODFL@ -GL_GNULIB_NANOSLEEP = @GL_GNULIB_NANOSLEEP@ -GL_GNULIB_NONBLOCKING = @GL_GNULIB_NONBLOCKING@ -GL_GNULIB_OBSTACK_PRINTF = @GL_GNULIB_OBSTACK_PRINTF@ -GL_GNULIB_OBSTACK_PRINTF_POSIX = @GL_GNULIB_OBSTACK_PRINTF_POSIX@ -GL_GNULIB_OPEN = @GL_GNULIB_OPEN@ -GL_GNULIB_OPENAT = @GL_GNULIB_OPENAT@ -GL_GNULIB_OVERRIDES_STRUCT_STAT = @GL_GNULIB_OVERRIDES_STRUCT_STAT@ -GL_GNULIB_PCLOSE = @GL_GNULIB_PCLOSE@ -GL_GNULIB_PERROR = @GL_GNULIB_PERROR@ -GL_GNULIB_PIPE = @GL_GNULIB_PIPE@ -GL_GNULIB_PIPE2 = @GL_GNULIB_PIPE2@ -GL_GNULIB_POPEN = @GL_GNULIB_POPEN@ -GL_GNULIB_POSIX_MEMALIGN = @GL_GNULIB_POSIX_MEMALIGN@ -GL_GNULIB_POSIX_OPENPT = @GL_GNULIB_POSIX_OPENPT@ -GL_GNULIB_POWF = @GL_GNULIB_POWF@ -GL_GNULIB_PREAD = @GL_GNULIB_PREAD@ -GL_GNULIB_PRINTF = @GL_GNULIB_PRINTF@ -GL_GNULIB_PRINTF_POSIX = @GL_GNULIB_PRINTF_POSIX@ -GL_GNULIB_PTHREAD_SIGMASK = @GL_GNULIB_PTHREAD_SIGMASK@ -GL_GNULIB_PTSNAME = @GL_GNULIB_PTSNAME@ -GL_GNULIB_PTSNAME_R = @GL_GNULIB_PTSNAME_R@ -GL_GNULIB_PUTC = @GL_GNULIB_PUTC@ -GL_GNULIB_PUTCHAR = @GL_GNULIB_PUTCHAR@ -GL_GNULIB_PUTENV = @GL_GNULIB_PUTENV@ -GL_GNULIB_PUTS = @GL_GNULIB_PUTS@ -GL_GNULIB_PWRITE = @GL_GNULIB_PWRITE@ -GL_GNULIB_QSORT_R = @GL_GNULIB_QSORT_R@ -GL_GNULIB_RAISE = @GL_GNULIB_RAISE@ -GL_GNULIB_RANDOM = @GL_GNULIB_RANDOM@ -GL_GNULIB_RANDOM_R = @GL_GNULIB_RANDOM_R@ -GL_GNULIB_RAWMEMCHR = @GL_GNULIB_RAWMEMCHR@ -GL_GNULIB_READ = @GL_GNULIB_READ@ -GL_GNULIB_READLINK = @GL_GNULIB_READLINK@ -GL_GNULIB_READLINKAT = @GL_GNULIB_READLINKAT@ -GL_GNULIB_REALLOCARRAY = @GL_GNULIB_REALLOCARRAY@ -GL_GNULIB_REALLOC_GNU = @GL_GNULIB_REALLOC_GNU@ -GL_GNULIB_REALLOC_POSIX = @GL_GNULIB_REALLOC_POSIX@ -GL_GNULIB_REALPATH = @GL_GNULIB_REALPATH@ -GL_GNULIB_REMAINDER = @GL_GNULIB_REMAINDER@ -GL_GNULIB_REMAINDERF = @GL_GNULIB_REMAINDERF@ -GL_GNULIB_REMAINDERL = @GL_GNULIB_REMAINDERL@ -GL_GNULIB_REMOVE = @GL_GNULIB_REMOVE@ -GL_GNULIB_RENAME = @GL_GNULIB_RENAME@ -GL_GNULIB_RENAMEAT = @GL_GNULIB_RENAMEAT@ -GL_GNULIB_RINT = @GL_GNULIB_RINT@ -GL_GNULIB_RINTF = @GL_GNULIB_RINTF@ -GL_GNULIB_RINTL = @GL_GNULIB_RINTL@ -GL_GNULIB_RMDIR = @GL_GNULIB_RMDIR@ -GL_GNULIB_ROUND = @GL_GNULIB_ROUND@ -GL_GNULIB_ROUNDF = @GL_GNULIB_ROUNDF@ -GL_GNULIB_ROUNDL = @GL_GNULIB_ROUNDL@ -GL_GNULIB_RPMATCH = @GL_GNULIB_RPMATCH@ -GL_GNULIB_SCANF = @GL_GNULIB_SCANF@ -GL_GNULIB_SECURE_GETENV = @GL_GNULIB_SECURE_GETENV@ -GL_GNULIB_SETENV = @GL_GNULIB_SETENV@ -GL_GNULIB_SETHOSTNAME = @GL_GNULIB_SETHOSTNAME@ -GL_GNULIB_SIGABBREV_NP = @GL_GNULIB_SIGABBREV_NP@ -GL_GNULIB_SIGACTION = @GL_GNULIB_SIGACTION@ -GL_GNULIB_SIGDESCR_NP = @GL_GNULIB_SIGDESCR_NP@ -GL_GNULIB_SIGNAL_H_SIGPIPE = @GL_GNULIB_SIGNAL_H_SIGPIPE@ -GL_GNULIB_SIGNBIT = @GL_GNULIB_SIGNBIT@ -GL_GNULIB_SIGPROCMASK = @GL_GNULIB_SIGPROCMASK@ -GL_GNULIB_SINF = @GL_GNULIB_SINF@ -GL_GNULIB_SINHF = @GL_GNULIB_SINHF@ -GL_GNULIB_SINL = @GL_GNULIB_SINL@ -GL_GNULIB_SLEEP = @GL_GNULIB_SLEEP@ -GL_GNULIB_SNPRINTF = @GL_GNULIB_SNPRINTF@ -GL_GNULIB_SPRINTF_POSIX = @GL_GNULIB_SPRINTF_POSIX@ -GL_GNULIB_SQRTF = @GL_GNULIB_SQRTF@ -GL_GNULIB_SQRTL = @GL_GNULIB_SQRTL@ -GL_GNULIB_STAT = @GL_GNULIB_STAT@ -GL_GNULIB_STDIO_H_NONBLOCKING = @GL_GNULIB_STDIO_H_NONBLOCKING@ -GL_GNULIB_STDIO_H_SIGPIPE = @GL_GNULIB_STDIO_H_SIGPIPE@ -GL_GNULIB_STPCPY = @GL_GNULIB_STPCPY@ -GL_GNULIB_STPNCPY = @GL_GNULIB_STPNCPY@ -GL_GNULIB_STRCASESTR = @GL_GNULIB_STRCASESTR@ -GL_GNULIB_STRCHRNUL = @GL_GNULIB_STRCHRNUL@ -GL_GNULIB_STRDUP = @GL_GNULIB_STRDUP@ -GL_GNULIB_STRERROR = @GL_GNULIB_STRERROR@ -GL_GNULIB_STRERRORNAME_NP = @GL_GNULIB_STRERRORNAME_NP@ -GL_GNULIB_STRERROR_R = @GL_GNULIB_STRERROR_R@ -GL_GNULIB_STRFTIME = @GL_GNULIB_STRFTIME@ -GL_GNULIB_STRNCAT = @GL_GNULIB_STRNCAT@ -GL_GNULIB_STRNDUP = @GL_GNULIB_STRNDUP@ -GL_GNULIB_STRNLEN = @GL_GNULIB_STRNLEN@ -GL_GNULIB_STRPBRK = @GL_GNULIB_STRPBRK@ -GL_GNULIB_STRPTIME = @GL_GNULIB_STRPTIME@ -GL_GNULIB_STRSEP = @GL_GNULIB_STRSEP@ -GL_GNULIB_STRSIGNAL = @GL_GNULIB_STRSIGNAL@ -GL_GNULIB_STRSTR = @GL_GNULIB_STRSTR@ -GL_GNULIB_STRTOD = @GL_GNULIB_STRTOD@ -GL_GNULIB_STRTOIMAX = @GL_GNULIB_STRTOIMAX@ -GL_GNULIB_STRTOK_R = @GL_GNULIB_STRTOK_R@ -GL_GNULIB_STRTOL = @GL_GNULIB_STRTOL@ -GL_GNULIB_STRTOLD = @GL_GNULIB_STRTOLD@ -GL_GNULIB_STRTOLL = @GL_GNULIB_STRTOLL@ -GL_GNULIB_STRTOUL = @GL_GNULIB_STRTOUL@ -GL_GNULIB_STRTOULL = @GL_GNULIB_STRTOULL@ -GL_GNULIB_STRTOUMAX = @GL_GNULIB_STRTOUMAX@ -GL_GNULIB_STRVERSCMP = @GL_GNULIB_STRVERSCMP@ -GL_GNULIB_SYMLINK = @GL_GNULIB_SYMLINK@ -GL_GNULIB_SYMLINKAT = @GL_GNULIB_SYMLINKAT@ -GL_GNULIB_SYSTEM_POSIX = @GL_GNULIB_SYSTEM_POSIX@ -GL_GNULIB_TANF = @GL_GNULIB_TANF@ -GL_GNULIB_TANHF = @GL_GNULIB_TANHF@ -GL_GNULIB_TANL = @GL_GNULIB_TANL@ -GL_GNULIB_TIME = @GL_GNULIB_TIME@ -GL_GNULIB_TIMEGM = @GL_GNULIB_TIMEGM@ -GL_GNULIB_TIMESPEC_GET = @GL_GNULIB_TIMESPEC_GET@ -GL_GNULIB_TIMESPEC_GETRES = @GL_GNULIB_TIMESPEC_GETRES@ -GL_GNULIB_TIME_R = @GL_GNULIB_TIME_R@ -GL_GNULIB_TIME_RZ = @GL_GNULIB_TIME_RZ@ -GL_GNULIB_TMPFILE = @GL_GNULIB_TMPFILE@ -GL_GNULIB_TRUNC = @GL_GNULIB_TRUNC@ -GL_GNULIB_TRUNCATE = @GL_GNULIB_TRUNCATE@ -GL_GNULIB_TRUNCF = @GL_GNULIB_TRUNCF@ -GL_GNULIB_TRUNCL = @GL_GNULIB_TRUNCL@ -GL_GNULIB_TTYNAME_R = @GL_GNULIB_TTYNAME_R@ -GL_GNULIB_TZSET = @GL_GNULIB_TZSET@ -GL_GNULIB_UNISTD_H_GETOPT = @GL_GNULIB_UNISTD_H_GETOPT@ -GL_GNULIB_UNISTD_H_NONBLOCKING = @GL_GNULIB_UNISTD_H_NONBLOCKING@ -GL_GNULIB_UNISTD_H_SIGPIPE = @GL_GNULIB_UNISTD_H_SIGPIPE@ -GL_GNULIB_UNLINK = @GL_GNULIB_UNLINK@ -GL_GNULIB_UNLINKAT = @GL_GNULIB_UNLINKAT@ -GL_GNULIB_UNLOCKPT = @GL_GNULIB_UNLOCKPT@ -GL_GNULIB_UNSETENV = @GL_GNULIB_UNSETENV@ -GL_GNULIB_USLEEP = @GL_GNULIB_USLEEP@ -GL_GNULIB_UTIMENSAT = @GL_GNULIB_UTIMENSAT@ -GL_GNULIB_VASPRINTF = @GL_GNULIB_VASPRINTF@ -GL_GNULIB_VDPRINTF = @GL_GNULIB_VDPRINTF@ -GL_GNULIB_VFPRINTF = @GL_GNULIB_VFPRINTF@ -GL_GNULIB_VFPRINTF_POSIX = @GL_GNULIB_VFPRINTF_POSIX@ -GL_GNULIB_VFSCANF = @GL_GNULIB_VFSCANF@ -GL_GNULIB_VPRINTF = @GL_GNULIB_VPRINTF@ -GL_GNULIB_VPRINTF_POSIX = @GL_GNULIB_VPRINTF_POSIX@ -GL_GNULIB_VSCANF = @GL_GNULIB_VSCANF@ -GL_GNULIB_VSNPRINTF = @GL_GNULIB_VSNPRINTF@ -GL_GNULIB_VSPRINTF_POSIX = @GL_GNULIB_VSPRINTF_POSIX@ -GL_GNULIB_WCPCPY = @GL_GNULIB_WCPCPY@ -GL_GNULIB_WCPNCPY = @GL_GNULIB_WCPNCPY@ -GL_GNULIB_WCRTOMB = @GL_GNULIB_WCRTOMB@ -GL_GNULIB_WCSCASECMP = @GL_GNULIB_WCSCASECMP@ -GL_GNULIB_WCSCAT = @GL_GNULIB_WCSCAT@ -GL_GNULIB_WCSCHR = @GL_GNULIB_WCSCHR@ -GL_GNULIB_WCSCMP = @GL_GNULIB_WCSCMP@ -GL_GNULIB_WCSCOLL = @GL_GNULIB_WCSCOLL@ -GL_GNULIB_WCSCPY = @GL_GNULIB_WCSCPY@ -GL_GNULIB_WCSCSPN = @GL_GNULIB_WCSCSPN@ -GL_GNULIB_WCSDUP = @GL_GNULIB_WCSDUP@ -GL_GNULIB_WCSFTIME = @GL_GNULIB_WCSFTIME@ -GL_GNULIB_WCSLEN = @GL_GNULIB_WCSLEN@ -GL_GNULIB_WCSNCASECMP = @GL_GNULIB_WCSNCASECMP@ -GL_GNULIB_WCSNCAT = @GL_GNULIB_WCSNCAT@ -GL_GNULIB_WCSNCMP = @GL_GNULIB_WCSNCMP@ -GL_GNULIB_WCSNCPY = @GL_GNULIB_WCSNCPY@ -GL_GNULIB_WCSNLEN = @GL_GNULIB_WCSNLEN@ -GL_GNULIB_WCSNRTOMBS = @GL_GNULIB_WCSNRTOMBS@ -GL_GNULIB_WCSPBRK = @GL_GNULIB_WCSPBRK@ -GL_GNULIB_WCSRCHR = @GL_GNULIB_WCSRCHR@ -GL_GNULIB_WCSRTOMBS = @GL_GNULIB_WCSRTOMBS@ -GL_GNULIB_WCSSPN = @GL_GNULIB_WCSSPN@ -GL_GNULIB_WCSSTR = @GL_GNULIB_WCSSTR@ -GL_GNULIB_WCSTOK = @GL_GNULIB_WCSTOK@ -GL_GNULIB_WCSWIDTH = @GL_GNULIB_WCSWIDTH@ -GL_GNULIB_WCSXFRM = @GL_GNULIB_WCSXFRM@ -GL_GNULIB_WCTOB = @GL_GNULIB_WCTOB@ -GL_GNULIB_WCTOMB = @GL_GNULIB_WCTOMB@ -GL_GNULIB_WCWIDTH = @GL_GNULIB_WCWIDTH@ -GL_GNULIB_WMEMCHR = @GL_GNULIB_WMEMCHR@ -GL_GNULIB_WMEMCMP = @GL_GNULIB_WMEMCMP@ -GL_GNULIB_WMEMCPY = @GL_GNULIB_WMEMCPY@ -GL_GNULIB_WMEMMOVE = @GL_GNULIB_WMEMMOVE@ -GL_GNULIB_WMEMPCPY = @GL_GNULIB_WMEMPCPY@ -GL_GNULIB_WMEMSET = @GL_GNULIB_WMEMSET@ -GL_GNULIB_WRITE = @GL_GNULIB_WRITE@ -GL_GNULIB__EXIT = @GL_GNULIB__EXIT@ -GNULIBHEADERS_OVERRIDE_WINT_T = @GNULIBHEADERS_OVERRIDE_WINT_T@ +GNULIB_ACCESS = @GNULIB_ACCESS@ +GNULIB_ACOSF = @GNULIB_ACOSF@ +GNULIB_ACOSL = @GNULIB_ACOSL@ +GNULIB_ALIGNED_ALLOC = @GNULIB_ALIGNED_ALLOC@ +GNULIB_ASINF = @GNULIB_ASINF@ +GNULIB_ASINL = @GNULIB_ASINL@ +GNULIB_ATAN2F = @GNULIB_ATAN2F@ +GNULIB_ATANF = @GNULIB_ATANF@ +GNULIB_ATANL = @GNULIB_ATANL@ +GNULIB_ATOLL = @GNULIB_ATOLL@ +GNULIB_BTOWC = @GNULIB_BTOWC@ +GNULIB_CALLOC_POSIX = @GNULIB_CALLOC_POSIX@ +GNULIB_CANONICALIZE_FILE_NAME = @GNULIB_CANONICALIZE_FILE_NAME@ +GNULIB_CBRT = @GNULIB_CBRT@ +GNULIB_CBRTF = @GNULIB_CBRTF@ +GNULIB_CBRTL = @GNULIB_CBRTL@ +GNULIB_CEIL = @GNULIB_CEIL@ +GNULIB_CEILF = @GNULIB_CEILF@ +GNULIB_CEILL = @GNULIB_CEILL@ +GNULIB_CHDIR = @GNULIB_CHDIR@ +GNULIB_CHOWN = @GNULIB_CHOWN@ +GNULIB_CLOSE = @GNULIB_CLOSE@ +GNULIB_COPYSIGN = @GNULIB_COPYSIGN@ +GNULIB_COPYSIGNF = @GNULIB_COPYSIGNF@ +GNULIB_COPYSIGNL = @GNULIB_COPYSIGNL@ +GNULIB_COPY_FILE_RANGE = @GNULIB_COPY_FILE_RANGE@ +GNULIB_COSF = @GNULIB_COSF@ +GNULIB_COSHF = @GNULIB_COSHF@ +GNULIB_COSL = @GNULIB_COSL@ +GNULIB_CREAT = @GNULIB_CREAT@ +GNULIB_CTIME = @GNULIB_CTIME@ +GNULIB_DPRINTF = @GNULIB_DPRINTF@ +GNULIB_DUP = @GNULIB_DUP@ +GNULIB_DUP2 = @GNULIB_DUP2@ +GNULIB_DUP3 = @GNULIB_DUP3@ +GNULIB_ENVIRON = @GNULIB_ENVIRON@ +GNULIB_EUIDACCESS = @GNULIB_EUIDACCESS@ +GNULIB_EXECL = @GNULIB_EXECL@ +GNULIB_EXECLE = @GNULIB_EXECLE@ +GNULIB_EXECLP = @GNULIB_EXECLP@ +GNULIB_EXECV = @GNULIB_EXECV@ +GNULIB_EXECVE = @GNULIB_EXECVE@ +GNULIB_EXECVP = @GNULIB_EXECVP@ +GNULIB_EXECVPE = @GNULIB_EXECVPE@ +GNULIB_EXP2 = @GNULIB_EXP2@ +GNULIB_EXP2F = @GNULIB_EXP2F@ +GNULIB_EXP2L = @GNULIB_EXP2L@ +GNULIB_EXPF = @GNULIB_EXPF@ +GNULIB_EXPL = @GNULIB_EXPL@ +GNULIB_EXPLICIT_BZERO = @GNULIB_EXPLICIT_BZERO@ +GNULIB_EXPM1 = @GNULIB_EXPM1@ +GNULIB_EXPM1F = @GNULIB_EXPM1F@ +GNULIB_EXPM1L = @GNULIB_EXPM1L@ +GNULIB_FABSF = @GNULIB_FABSF@ +GNULIB_FABSL = @GNULIB_FABSL@ +GNULIB_FACCESSAT = @GNULIB_FACCESSAT@ +GNULIB_FCHDIR = @GNULIB_FCHDIR@ +GNULIB_FCHMODAT = @GNULIB_FCHMODAT@ +GNULIB_FCHOWNAT = @GNULIB_FCHOWNAT@ +GNULIB_FCLOSE = @GNULIB_FCLOSE@ +GNULIB_FCNTL = @GNULIB_FCNTL@ +GNULIB_FDATASYNC = @GNULIB_FDATASYNC@ +GNULIB_FDOPEN = @GNULIB_FDOPEN@ +GNULIB_FFLUSH = @GNULIB_FFLUSH@ +GNULIB_FFSL = @GNULIB_FFSL@ +GNULIB_FFSLL = @GNULIB_FFSLL@ +GNULIB_FGETC = @GNULIB_FGETC@ +GNULIB_FGETS = @GNULIB_FGETS@ +GNULIB_FLOOR = @GNULIB_FLOOR@ +GNULIB_FLOORF = @GNULIB_FLOORF@ +GNULIB_FLOORL = @GNULIB_FLOORL@ +GNULIB_FMA = @GNULIB_FMA@ +GNULIB_FMAF = @GNULIB_FMAF@ +GNULIB_FMAL = @GNULIB_FMAL@ +GNULIB_FMOD = @GNULIB_FMOD@ +GNULIB_FMODF = @GNULIB_FMODF@ +GNULIB_FMODL = @GNULIB_FMODL@ +GNULIB_FOPEN = @GNULIB_FOPEN@ +GNULIB_FPRINTF = @GNULIB_FPRINTF@ +GNULIB_FPRINTF_POSIX = @GNULIB_FPRINTF_POSIX@ +GNULIB_FPURGE = @GNULIB_FPURGE@ +GNULIB_FPUTC = @GNULIB_FPUTC@ +GNULIB_FPUTS = @GNULIB_FPUTS@ +GNULIB_FREAD = @GNULIB_FREAD@ +GNULIB_FREE_POSIX = @GNULIB_FREE_POSIX@ +GNULIB_FREOPEN = @GNULIB_FREOPEN@ +GNULIB_FREXP = @GNULIB_FREXP@ +GNULIB_FREXPF = @GNULIB_FREXPF@ +GNULIB_FREXPL = @GNULIB_FREXPL@ +GNULIB_FSCANF = @GNULIB_FSCANF@ +GNULIB_FSEEK = @GNULIB_FSEEK@ +GNULIB_FSEEKO = @GNULIB_FSEEKO@ +GNULIB_FSTAT = @GNULIB_FSTAT@ +GNULIB_FSTATAT = @GNULIB_FSTATAT@ +GNULIB_FSYNC = @GNULIB_FSYNC@ +GNULIB_FTELL = @GNULIB_FTELL@ +GNULIB_FTELLO = @GNULIB_FTELLO@ +GNULIB_FTRUNCATE = @GNULIB_FTRUNCATE@ +GNULIB_FUTIMENS = @GNULIB_FUTIMENS@ +GNULIB_FWRITE = @GNULIB_FWRITE@ +GNULIB_GETC = @GNULIB_GETC@ +GNULIB_GETCHAR = @GNULIB_GETCHAR@ +GNULIB_GETCWD = @GNULIB_GETCWD@ +GNULIB_GETDELIM = @GNULIB_GETDELIM@ +GNULIB_GETDOMAINNAME = @GNULIB_GETDOMAINNAME@ +GNULIB_GETDTABLESIZE = @GNULIB_GETDTABLESIZE@ +GNULIB_GETENTROPY = @GNULIB_GETENTROPY@ +GNULIB_GETGROUPS = @GNULIB_GETGROUPS@ +GNULIB_GETHOSTNAME = @GNULIB_GETHOSTNAME@ +GNULIB_GETLINE = @GNULIB_GETLINE@ +GNULIB_GETLOADAVG = @GNULIB_GETLOADAVG@ +GNULIB_GETLOGIN = @GNULIB_GETLOGIN@ +GNULIB_GETLOGIN_R = @GNULIB_GETLOGIN_R@ +GNULIB_GETOPT_POSIX = @GNULIB_GETOPT_POSIX@ +GNULIB_GETPAGESIZE = @GNULIB_GETPAGESIZE@ +GNULIB_GETPASS = @GNULIB_GETPASS@ +GNULIB_GETSUBOPT = @GNULIB_GETSUBOPT@ GNULIB_GETTIMEOFDAY = @GNULIB_GETTIMEOFDAY@ +GNULIB_GETUMASK = @GNULIB_GETUMASK@ +GNULIB_GETUSERSHELL = @GNULIB_GETUSERSHELL@ +GNULIB_GL_UNISTD_H_GETOPT = @GNULIB_GL_UNISTD_H_GETOPT@ +GNULIB_GRANTPT = @GNULIB_GRANTPT@ +GNULIB_GROUP_MEMBER = @GNULIB_GROUP_MEMBER@ +GNULIB_HYPOT = @GNULIB_HYPOT@ +GNULIB_HYPOTF = @GNULIB_HYPOTF@ +GNULIB_HYPOTL = @GNULIB_HYPOTL@ +GNULIB_ILOGB = @GNULIB_ILOGB@ +GNULIB_ILOGBF = @GNULIB_ILOGBF@ +GNULIB_ILOGBL = @GNULIB_ILOGBL@ +GNULIB_IMAXABS = @GNULIB_IMAXABS@ +GNULIB_IMAXDIV = @GNULIB_IMAXDIV@ +GNULIB_ISATTY = @GNULIB_ISATTY@ +GNULIB_ISFINITE = @GNULIB_ISFINITE@ +GNULIB_ISINF = @GNULIB_ISINF@ +GNULIB_ISNAN = @GNULIB_ISNAN@ +GNULIB_ISNAND = @GNULIB_ISNAND@ +GNULIB_ISNANF = @GNULIB_ISNANF@ +GNULIB_ISNANL = @GNULIB_ISNANL@ +GNULIB_LCHMOD = @GNULIB_LCHMOD@ +GNULIB_LCHOWN = @GNULIB_LCHOWN@ +GNULIB_LDEXPF = @GNULIB_LDEXPF@ +GNULIB_LDEXPL = @GNULIB_LDEXPL@ +GNULIB_LINK = @GNULIB_LINK@ +GNULIB_LINKAT = @GNULIB_LINKAT@ +GNULIB_LOCALTIME = @GNULIB_LOCALTIME@ +GNULIB_LOG = @GNULIB_LOG@ +GNULIB_LOG10 = @GNULIB_LOG10@ +GNULIB_LOG10F = @GNULIB_LOG10F@ +GNULIB_LOG10L = @GNULIB_LOG10L@ +GNULIB_LOG1P = @GNULIB_LOG1P@ +GNULIB_LOG1PF = @GNULIB_LOG1PF@ +GNULIB_LOG1PL = @GNULIB_LOG1PL@ +GNULIB_LOG2 = @GNULIB_LOG2@ +GNULIB_LOG2F = @GNULIB_LOG2F@ +GNULIB_LOG2L = @GNULIB_LOG2L@ +GNULIB_LOGB = @GNULIB_LOGB@ +GNULIB_LOGBF = @GNULIB_LOGBF@ +GNULIB_LOGBL = @GNULIB_LOGBL@ +GNULIB_LOGF = @GNULIB_LOGF@ +GNULIB_LOGL = @GNULIB_LOGL@ +GNULIB_LSEEK = @GNULIB_LSEEK@ +GNULIB_LSTAT = @GNULIB_LSTAT@ +GNULIB_MALLOC_POSIX = @GNULIB_MALLOC_POSIX@ +GNULIB_MBRLEN = @GNULIB_MBRLEN@ +GNULIB_MBRTOWC = @GNULIB_MBRTOWC@ +GNULIB_MBSCASECMP = @GNULIB_MBSCASECMP@ +GNULIB_MBSCASESTR = @GNULIB_MBSCASESTR@ +GNULIB_MBSCHR = @GNULIB_MBSCHR@ +GNULIB_MBSCSPN = @GNULIB_MBSCSPN@ +GNULIB_MBSINIT = @GNULIB_MBSINIT@ +GNULIB_MBSLEN = @GNULIB_MBSLEN@ +GNULIB_MBSNCASECMP = @GNULIB_MBSNCASECMP@ +GNULIB_MBSNLEN = @GNULIB_MBSNLEN@ +GNULIB_MBSNRTOWCS = @GNULIB_MBSNRTOWCS@ +GNULIB_MBSPBRK = @GNULIB_MBSPBRK@ +GNULIB_MBSPCASECMP = @GNULIB_MBSPCASECMP@ +GNULIB_MBSRCHR = @GNULIB_MBSRCHR@ +GNULIB_MBSRTOWCS = @GNULIB_MBSRTOWCS@ +GNULIB_MBSSEP = @GNULIB_MBSSEP@ +GNULIB_MBSSPN = @GNULIB_MBSSPN@ +GNULIB_MBSSTR = @GNULIB_MBSSTR@ +GNULIB_MBSTOK_R = @GNULIB_MBSTOK_R@ +GNULIB_MBTOWC = @GNULIB_MBTOWC@ +GNULIB_MDA_ACCESS = @GNULIB_MDA_ACCESS@ +GNULIB_MDA_CHDIR = @GNULIB_MDA_CHDIR@ +GNULIB_MDA_CHMOD = @GNULIB_MDA_CHMOD@ +GNULIB_MDA_CLOSE = @GNULIB_MDA_CLOSE@ +GNULIB_MDA_CREAT = @GNULIB_MDA_CREAT@ +GNULIB_MDA_DUP = @GNULIB_MDA_DUP@ +GNULIB_MDA_DUP2 = @GNULIB_MDA_DUP2@ +GNULIB_MDA_ECVT = @GNULIB_MDA_ECVT@ +GNULIB_MDA_EXECL = @GNULIB_MDA_EXECL@ +GNULIB_MDA_EXECLE = @GNULIB_MDA_EXECLE@ +GNULIB_MDA_EXECLP = @GNULIB_MDA_EXECLP@ +GNULIB_MDA_EXECV = @GNULIB_MDA_EXECV@ +GNULIB_MDA_EXECVE = @GNULIB_MDA_EXECVE@ +GNULIB_MDA_EXECVP = @GNULIB_MDA_EXECVP@ +GNULIB_MDA_EXECVPE = @GNULIB_MDA_EXECVPE@ +GNULIB_MDA_FCLOSEALL = @GNULIB_MDA_FCLOSEALL@ +GNULIB_MDA_FCVT = @GNULIB_MDA_FCVT@ +GNULIB_MDA_FDOPEN = @GNULIB_MDA_FDOPEN@ +GNULIB_MDA_FILENO = @GNULIB_MDA_FILENO@ +GNULIB_MDA_GCVT = @GNULIB_MDA_GCVT@ +GNULIB_MDA_GETCWD = @GNULIB_MDA_GETCWD@ +GNULIB_MDA_GETPID = @GNULIB_MDA_GETPID@ +GNULIB_MDA_GETW = @GNULIB_MDA_GETW@ +GNULIB_MDA_ISATTY = @GNULIB_MDA_ISATTY@ +GNULIB_MDA_J0 = @GNULIB_MDA_J0@ +GNULIB_MDA_J1 = @GNULIB_MDA_J1@ +GNULIB_MDA_JN = @GNULIB_MDA_JN@ +GNULIB_MDA_LSEEK = @GNULIB_MDA_LSEEK@ +GNULIB_MDA_MEMCCPY = @GNULIB_MDA_MEMCCPY@ +GNULIB_MDA_MKDIR = @GNULIB_MDA_MKDIR@ +GNULIB_MDA_MKTEMP = @GNULIB_MDA_MKTEMP@ +GNULIB_MDA_OPEN = @GNULIB_MDA_OPEN@ +GNULIB_MDA_PUTENV = @GNULIB_MDA_PUTENV@ +GNULIB_MDA_PUTW = @GNULIB_MDA_PUTW@ +GNULIB_MDA_READ = @GNULIB_MDA_READ@ +GNULIB_MDA_RMDIR = @GNULIB_MDA_RMDIR@ +GNULIB_MDA_STRDUP = @GNULIB_MDA_STRDUP@ +GNULIB_MDA_SWAB = @GNULIB_MDA_SWAB@ +GNULIB_MDA_TEMPNAM = @GNULIB_MDA_TEMPNAM@ +GNULIB_MDA_TZSET = @GNULIB_MDA_TZSET@ +GNULIB_MDA_UMASK = @GNULIB_MDA_UMASK@ +GNULIB_MDA_UNLINK = @GNULIB_MDA_UNLINK@ +GNULIB_MDA_WCSDUP = @GNULIB_MDA_WCSDUP@ +GNULIB_MDA_WRITE = @GNULIB_MDA_WRITE@ +GNULIB_MDA_Y0 = @GNULIB_MDA_Y0@ +GNULIB_MDA_Y1 = @GNULIB_MDA_Y1@ +GNULIB_MDA_YN = @GNULIB_MDA_YN@ +GNULIB_MEMCHR = @GNULIB_MEMCHR@ +GNULIB_MEMMEM = @GNULIB_MEMMEM@ +GNULIB_MEMPCPY = @GNULIB_MEMPCPY@ +GNULIB_MEMRCHR = @GNULIB_MEMRCHR@ +GNULIB_MKDIR = @GNULIB_MKDIR@ +GNULIB_MKDIRAT = @GNULIB_MKDIRAT@ +GNULIB_MKDTEMP = @GNULIB_MKDTEMP@ +GNULIB_MKFIFO = @GNULIB_MKFIFO@ +GNULIB_MKFIFOAT = @GNULIB_MKFIFOAT@ +GNULIB_MKNOD = @GNULIB_MKNOD@ +GNULIB_MKNODAT = @GNULIB_MKNODAT@ +GNULIB_MKOSTEMP = @GNULIB_MKOSTEMP@ +GNULIB_MKOSTEMPS = @GNULIB_MKOSTEMPS@ +GNULIB_MKSTEMP = @GNULIB_MKSTEMP@ +GNULIB_MKSTEMPS = @GNULIB_MKSTEMPS@ +GNULIB_MKTIME = @GNULIB_MKTIME@ +GNULIB_MODF = @GNULIB_MODF@ +GNULIB_MODFF = @GNULIB_MODFF@ +GNULIB_MODFL = @GNULIB_MODFL@ +GNULIB_NANOSLEEP = @GNULIB_NANOSLEEP@ +GNULIB_NONBLOCKING = @GNULIB_NONBLOCKING@ +GNULIB_OBSTACK_PRINTF = @GNULIB_OBSTACK_PRINTF@ +GNULIB_OBSTACK_PRINTF_POSIX = @GNULIB_OBSTACK_PRINTF_POSIX@ +GNULIB_OPEN = @GNULIB_OPEN@ +GNULIB_OPENAT = @GNULIB_OPENAT@ +GNULIB_OVERRIDES_STRUCT_STAT = @GNULIB_OVERRIDES_STRUCT_STAT@ +GNULIB_OVERRIDES_WINT_T = @GNULIB_OVERRIDES_WINT_T@ +GNULIB_PCLOSE = @GNULIB_PCLOSE@ +GNULIB_PERROR = @GNULIB_PERROR@ +GNULIB_PIPE = @GNULIB_PIPE@ +GNULIB_PIPE2 = @GNULIB_PIPE2@ +GNULIB_POPEN = @GNULIB_POPEN@ +GNULIB_POSIX_MEMALIGN = @GNULIB_POSIX_MEMALIGN@ +GNULIB_POSIX_OPENPT = @GNULIB_POSIX_OPENPT@ +GNULIB_POWF = @GNULIB_POWF@ +GNULIB_PREAD = @GNULIB_PREAD@ +GNULIB_PRINTF = @GNULIB_PRINTF@ +GNULIB_PRINTF_POSIX = @GNULIB_PRINTF_POSIX@ +GNULIB_PTHREAD_SIGMASK = @GNULIB_PTHREAD_SIGMASK@ +GNULIB_PTSNAME = @GNULIB_PTSNAME@ +GNULIB_PTSNAME_R = @GNULIB_PTSNAME_R@ +GNULIB_PUTC = @GNULIB_PUTC@ +GNULIB_PUTCHAR = @GNULIB_PUTCHAR@ +GNULIB_PUTENV = @GNULIB_PUTENV@ +GNULIB_PUTS = @GNULIB_PUTS@ +GNULIB_PWRITE = @GNULIB_PWRITE@ +GNULIB_QSORT_R = @GNULIB_QSORT_R@ +GNULIB_RAISE = @GNULIB_RAISE@ +GNULIB_RANDOM = @GNULIB_RANDOM@ +GNULIB_RANDOM_R = @GNULIB_RANDOM_R@ +GNULIB_RAWMEMCHR = @GNULIB_RAWMEMCHR@ +GNULIB_READ = @GNULIB_READ@ +GNULIB_READLINK = @GNULIB_READLINK@ +GNULIB_READLINKAT = @GNULIB_READLINKAT@ +GNULIB_REALLOCARRAY = @GNULIB_REALLOCARRAY@ +GNULIB_REALLOC_POSIX = @GNULIB_REALLOC_POSIX@ +GNULIB_REALPATH = @GNULIB_REALPATH@ +GNULIB_REMAINDER = @GNULIB_REMAINDER@ +GNULIB_REMAINDERF = @GNULIB_REMAINDERF@ +GNULIB_REMAINDERL = @GNULIB_REMAINDERL@ +GNULIB_REMOVE = @GNULIB_REMOVE@ +GNULIB_RENAME = @GNULIB_RENAME@ +GNULIB_RENAMEAT = @GNULIB_RENAMEAT@ +GNULIB_RINT = @GNULIB_RINT@ +GNULIB_RINTF = @GNULIB_RINTF@ +GNULIB_RINTL = @GNULIB_RINTL@ +GNULIB_RMDIR = @GNULIB_RMDIR@ +GNULIB_ROUND = @GNULIB_ROUND@ +GNULIB_ROUNDF = @GNULIB_ROUNDF@ +GNULIB_ROUNDL = @GNULIB_ROUNDL@ +GNULIB_RPMATCH = @GNULIB_RPMATCH@ +GNULIB_SCANF = @GNULIB_SCANF@ +GNULIB_SECURE_GETENV = @GNULIB_SECURE_GETENV@ +GNULIB_SETENV = @GNULIB_SETENV@ +GNULIB_SETHOSTNAME = @GNULIB_SETHOSTNAME@ +GNULIB_SIGABBREV_NP = @GNULIB_SIGABBREV_NP@ +GNULIB_SIGACTION = @GNULIB_SIGACTION@ +GNULIB_SIGDESCR_NP = @GNULIB_SIGDESCR_NP@ +GNULIB_SIGNAL_H_SIGPIPE = @GNULIB_SIGNAL_H_SIGPIPE@ +GNULIB_SIGNBIT = @GNULIB_SIGNBIT@ +GNULIB_SIGPROCMASK = @GNULIB_SIGPROCMASK@ +GNULIB_SINF = @GNULIB_SINF@ +GNULIB_SINHF = @GNULIB_SINHF@ +GNULIB_SINL = @GNULIB_SINL@ +GNULIB_SLEEP = @GNULIB_SLEEP@ +GNULIB_SNPRINTF = @GNULIB_SNPRINTF@ +GNULIB_SPRINTF_POSIX = @GNULIB_SPRINTF_POSIX@ +GNULIB_SQRTF = @GNULIB_SQRTF@ +GNULIB_SQRTL = @GNULIB_SQRTL@ +GNULIB_STAT = @GNULIB_STAT@ +GNULIB_STDIO_H_NONBLOCKING = @GNULIB_STDIO_H_NONBLOCKING@ +GNULIB_STDIO_H_SIGPIPE = @GNULIB_STDIO_H_SIGPIPE@ +GNULIB_STPCPY = @GNULIB_STPCPY@ +GNULIB_STPNCPY = @GNULIB_STPNCPY@ +GNULIB_STRCASESTR = @GNULIB_STRCASESTR@ +GNULIB_STRCHRNUL = @GNULIB_STRCHRNUL@ +GNULIB_STRDUP = @GNULIB_STRDUP@ +GNULIB_STRERROR = @GNULIB_STRERROR@ +GNULIB_STRERRORNAME_NP = @GNULIB_STRERRORNAME_NP@ +GNULIB_STRERROR_R = @GNULIB_STRERROR_R@ +GNULIB_STRFTIME = @GNULIB_STRFTIME@ +GNULIB_STRNCAT = @GNULIB_STRNCAT@ +GNULIB_STRNDUP = @GNULIB_STRNDUP@ +GNULIB_STRNLEN = @GNULIB_STRNLEN@ +GNULIB_STRPBRK = @GNULIB_STRPBRK@ +GNULIB_STRPTIME = @GNULIB_STRPTIME@ +GNULIB_STRSEP = @GNULIB_STRSEP@ +GNULIB_STRSIGNAL = @GNULIB_STRSIGNAL@ +GNULIB_STRSTR = @GNULIB_STRSTR@ +GNULIB_STRTOD = @GNULIB_STRTOD@ +GNULIB_STRTOIMAX = @GNULIB_STRTOIMAX@ +GNULIB_STRTOK_R = @GNULIB_STRTOK_R@ +GNULIB_STRTOLD = @GNULIB_STRTOLD@ +GNULIB_STRTOLL = @GNULIB_STRTOLL@ +GNULIB_STRTOULL = @GNULIB_STRTOULL@ +GNULIB_STRTOUMAX = @GNULIB_STRTOUMAX@ +GNULIB_STRVERSCMP = @GNULIB_STRVERSCMP@ +GNULIB_SYMLINK = @GNULIB_SYMLINK@ +GNULIB_SYMLINKAT = @GNULIB_SYMLINKAT@ +GNULIB_SYSTEM_POSIX = @GNULIB_SYSTEM_POSIX@ +GNULIB_TANF = @GNULIB_TANF@ +GNULIB_TANHF = @GNULIB_TANHF@ +GNULIB_TANL = @GNULIB_TANL@ +GNULIB_TIMEGM = @GNULIB_TIMEGM@ +GNULIB_TIMESPEC_GET = @GNULIB_TIMESPEC_GET@ +GNULIB_TIME_R = @GNULIB_TIME_R@ +GNULIB_TIME_RZ = @GNULIB_TIME_RZ@ +GNULIB_TMPFILE = @GNULIB_TMPFILE@ +GNULIB_TRUNC = @GNULIB_TRUNC@ +GNULIB_TRUNCATE = @GNULIB_TRUNCATE@ +GNULIB_TRUNCF = @GNULIB_TRUNCF@ +GNULIB_TRUNCL = @GNULIB_TRUNCL@ +GNULIB_TTYNAME_R = @GNULIB_TTYNAME_R@ +GNULIB_TZSET = @GNULIB_TZSET@ +GNULIB_UNISTD_H_NONBLOCKING = @GNULIB_UNISTD_H_NONBLOCKING@ +GNULIB_UNISTD_H_SIGPIPE = @GNULIB_UNISTD_H_SIGPIPE@ +GNULIB_UNLINK = @GNULIB_UNLINK@ +GNULIB_UNLINKAT = @GNULIB_UNLINKAT@ +GNULIB_UNLOCKPT = @GNULIB_UNLOCKPT@ +GNULIB_UNSETENV = @GNULIB_UNSETENV@ +GNULIB_USLEEP = @GNULIB_USLEEP@ +GNULIB_UTIMENSAT = @GNULIB_UTIMENSAT@ +GNULIB_VASPRINTF = @GNULIB_VASPRINTF@ +GNULIB_VDPRINTF = @GNULIB_VDPRINTF@ +GNULIB_VFPRINTF = @GNULIB_VFPRINTF@ +GNULIB_VFPRINTF_POSIX = @GNULIB_VFPRINTF_POSIX@ +GNULIB_VFSCANF = @GNULIB_VFSCANF@ +GNULIB_VPRINTF = @GNULIB_VPRINTF@ +GNULIB_VPRINTF_POSIX = @GNULIB_VPRINTF_POSIX@ +GNULIB_VSCANF = @GNULIB_VSCANF@ +GNULIB_VSNPRINTF = @GNULIB_VSNPRINTF@ +GNULIB_VSPRINTF_POSIX = @GNULIB_VSPRINTF_POSIX@ +GNULIB_WCPCPY = @GNULIB_WCPCPY@ +GNULIB_WCPNCPY = @GNULIB_WCPNCPY@ +GNULIB_WCRTOMB = @GNULIB_WCRTOMB@ +GNULIB_WCSCASECMP = @GNULIB_WCSCASECMP@ +GNULIB_WCSCAT = @GNULIB_WCSCAT@ +GNULIB_WCSCHR = @GNULIB_WCSCHR@ +GNULIB_WCSCMP = @GNULIB_WCSCMP@ +GNULIB_WCSCOLL = @GNULIB_WCSCOLL@ +GNULIB_WCSCPY = @GNULIB_WCSCPY@ +GNULIB_WCSCSPN = @GNULIB_WCSCSPN@ +GNULIB_WCSDUP = @GNULIB_WCSDUP@ +GNULIB_WCSFTIME = @GNULIB_WCSFTIME@ +GNULIB_WCSLEN = @GNULIB_WCSLEN@ +GNULIB_WCSNCASECMP = @GNULIB_WCSNCASECMP@ +GNULIB_WCSNCAT = @GNULIB_WCSNCAT@ +GNULIB_WCSNCMP = @GNULIB_WCSNCMP@ +GNULIB_WCSNCPY = @GNULIB_WCSNCPY@ +GNULIB_WCSNLEN = @GNULIB_WCSNLEN@ +GNULIB_WCSNRTOMBS = @GNULIB_WCSNRTOMBS@ +GNULIB_WCSPBRK = @GNULIB_WCSPBRK@ +GNULIB_WCSRCHR = @GNULIB_WCSRCHR@ +GNULIB_WCSRTOMBS = @GNULIB_WCSRTOMBS@ +GNULIB_WCSSPN = @GNULIB_WCSSPN@ +GNULIB_WCSSTR = @GNULIB_WCSSTR@ +GNULIB_WCSTOK = @GNULIB_WCSTOK@ +GNULIB_WCSWIDTH = @GNULIB_WCSWIDTH@ +GNULIB_WCSXFRM = @GNULIB_WCSXFRM@ +GNULIB_WCTOB = @GNULIB_WCTOB@ +GNULIB_WCTOMB = @GNULIB_WCTOMB@ +GNULIB_WCWIDTH = @GNULIB_WCWIDTH@ +GNULIB_WMEMCHR = @GNULIB_WMEMCHR@ +GNULIB_WMEMCMP = @GNULIB_WMEMCMP@ +GNULIB_WMEMCPY = @GNULIB_WMEMCPY@ +GNULIB_WMEMMOVE = @GNULIB_WMEMMOVE@ +GNULIB_WMEMPCPY = @GNULIB_WMEMPCPY@ +GNULIB_WMEMSET = @GNULIB_WMEMSET@ +GNULIB_WRITE = @GNULIB_WRITE@ +GNULIB__EXIT = @GNULIB__EXIT@ GREP = @GREP@ HAVE_ACOSF = @HAVE_ACOSF@ HAVE_ACOSL = @HAVE_ACOSL@ @@ -1056,7 +896,6 @@ HAVE_DECL_GETLOGIN_R = @HAVE_DECL_GETLOGIN_R@ HAVE_DECL_GETPAGESIZE = @HAVE_DECL_GETPAGESIZE@ HAVE_DECL_GETUSERSHELL = @HAVE_DECL_GETUSERSHELL@ -HAVE_DECL_GETW = @HAVE_DECL_GETW@ HAVE_DECL_IMAXABS = @HAVE_DECL_IMAXABS@ HAVE_DECL_IMAXDIV = @HAVE_DECL_IMAXDIV@ HAVE_DECL_INITSTATE = @HAVE_DECL_INITSTATE@ @@ -1071,8 +910,6 @@ HAVE_DECL_MEMMEM = @HAVE_DECL_MEMMEM@ HAVE_DECL_MEMRCHR = @HAVE_DECL_MEMRCHR@ HAVE_DECL_OBSTACK_PRINTF = @HAVE_DECL_OBSTACK_PRINTF@ -HAVE_DECL_PROGRAM_INVOCATION_NAME = @HAVE_DECL_PROGRAM_INVOCATION_NAME@ -HAVE_DECL_PUTW = @HAVE_DECL_PUTW@ HAVE_DECL_REMAINDER = @HAVE_DECL_REMAINDER@ HAVE_DECL_REMAINDERL = @HAVE_DECL_REMAINDERL@ HAVE_DECL_RINTF = @HAVE_DECL_RINTF@ @@ -1106,9 +943,6 @@ HAVE_DECL_WCWIDTH = @HAVE_DECL_WCWIDTH@ HAVE_DPRINTF = @HAVE_DPRINTF@ HAVE_DUP3 = @HAVE_DUP3@ -HAVE_ERROR = @HAVE_ERROR@ -HAVE_ERROR_AT_LINE = @HAVE_ERROR_AT_LINE@ -HAVE_ERROR_H = @HAVE_ERROR_H@ HAVE_EUIDACCESS = @HAVE_EUIDACCESS@ HAVE_EXECVPE = @HAVE_EXECVPE@ HAVE_EXPF = @HAVE_EXPF@ @@ -1147,7 +981,6 @@ HAVE_GETOPT_H = @HAVE_GETOPT_H@ HAVE_GETPAGESIZE = @HAVE_GETPAGESIZE@ HAVE_GETPASS = @HAVE_GETPASS@ -HAVE_GETPROGNAME = @HAVE_GETPROGNAME@ HAVE_GETSUBOPT = @HAVE_GETSUBOPT@ HAVE_GETUMASK = @HAVE_GETUMASK@ HAVE_GRANTPT = @HAVE_GRANTPT@ @@ -1157,8 +990,6 @@ HAVE_ILOGB = @HAVE_ILOGB@ HAVE_ILOGBF = @HAVE_ILOGBF@ HAVE_ILOGBL = @HAVE_ILOGBL@ -HAVE_IMAXABS = @HAVE_IMAXABS@ -HAVE_IMAXDIV = @HAVE_IMAXDIV@ HAVE_IMAXDIV_T = @HAVE_IMAXDIV_T@ HAVE_INITSTATE = @HAVE_INITSTATE@ HAVE_INTTYPES_H = @HAVE_INTTYPES_H@ @@ -1189,7 +1020,6 @@ HAVE_MBSRTOWCS = @HAVE_MBSRTOWCS@ HAVE_MBTOWC = @HAVE_MBTOWC@ HAVE_MEMPCPY = @HAVE_MEMPCPY@ -HAVE_MEMSET_EXPLICIT = @HAVE_MEMSET_EXPLICIT@ HAVE_MKDIRAT = @HAVE_MKDIRAT@ HAVE_MKDTEMP = @HAVE_MKDTEMP@ HAVE_MKFIFO = @HAVE_MKFIFO@ @@ -1265,10 +1095,8 @@ HAVE_STRPTIME = @HAVE_STRPTIME@ HAVE_STRSEP = @HAVE_STRSEP@ HAVE_STRTOD = @HAVE_STRTOD@ -HAVE_STRTOL = @HAVE_STRTOL@ HAVE_STRTOLD = @HAVE_STRTOLD@ HAVE_STRTOLL = @HAVE_STRTOLL@ -HAVE_STRTOUL = @HAVE_STRTOUL@ HAVE_STRTOULL = @HAVE_STRTOULL@ HAVE_STRUCT_RANDOM_DATA = @HAVE_STRUCT_RANDOM_DATA@ HAVE_STRUCT_SIGACTION_SA_SIGACTION = @HAVE_STRUCT_SIGACTION_SA_SIGACTION@ @@ -1286,7 +1114,6 @@ HAVE_TANL = @HAVE_TANL@ HAVE_TIMEGM = @HAVE_TIMEGM@ HAVE_TIMESPEC_GET = @HAVE_TIMESPEC_GET@ -HAVE_TIMESPEC_GETRES = @HAVE_TIMESPEC_GETRES@ HAVE_TIMEZONE_T = @HAVE_TIMEZONE_T@ HAVE_TYPE_VOLATILE_SIG_ATOMIC_T = @HAVE_TYPE_VOLATILE_SIG_ATOMIC_T@ HAVE_UNISTD_H = @HAVE_UNISTD_H@ @@ -1333,6 +1160,7 @@ HAVE_WMEMMOVE = @HAVE_WMEMMOVE@ HAVE_WMEMPCPY = @HAVE_WMEMPCPY@ HAVE_WMEMSET = @HAVE_WMEMSET@ +HAVE__BOOL = @HAVE__BOOL@ HAVE__EXIT = @HAVE__EXIT@ HELP2MAN = @HELP2MAN@ INCLUDE_NEXT = @INCLUDE_NEXT@ @@ -1353,15 +1181,11 @@ LIBS = @LIBS@ LIMITS_H = @LIMITS_H@ LN_S = @LN_S@ -LOCALE_FR_UTF8 = @LOCALE_FR_UTF8@ LTLIBINTL = @LTLIBINTL@ LTLIBOBJS = @LTLIBOBJS@ MAKEINFO = @MAKEINFO@ MKDIR_P = @MKDIR_P@ -NEXT_ASSERT_H = @NEXT_ASSERT_H@ -NEXT_AS_FIRST_DIRECTIVE_ASSERT_H = @NEXT_AS_FIRST_DIRECTIVE_ASSERT_H@ NEXT_AS_FIRST_DIRECTIVE_ERRNO_H = @NEXT_AS_FIRST_DIRECTIVE_ERRNO_H@ -NEXT_AS_FIRST_DIRECTIVE_ERROR_H = @NEXT_AS_FIRST_DIRECTIVE_ERROR_H@ NEXT_AS_FIRST_DIRECTIVE_FCNTL_H = @NEXT_AS_FIRST_DIRECTIVE_FCNTL_H@ NEXT_AS_FIRST_DIRECTIVE_FLOAT_H = @NEXT_AS_FIRST_DIRECTIVE_FLOAT_H@ NEXT_AS_FIRST_DIRECTIVE_GETOPT_H = @NEXT_AS_FIRST_DIRECTIVE_GETOPT_H@ @@ -1380,7 +1204,6 @@ NEXT_AS_FIRST_DIRECTIVE_UNISTD_H = @NEXT_AS_FIRST_DIRECTIVE_UNISTD_H@ NEXT_AS_FIRST_DIRECTIVE_WCHAR_H = @NEXT_AS_FIRST_DIRECTIVE_WCHAR_H@ NEXT_ERRNO_H = @NEXT_ERRNO_H@ -NEXT_ERROR_H = @NEXT_ERROR_H@ NEXT_FCNTL_H = @NEXT_FCNTL_H@ NEXT_FLOAT_H = @NEXT_FLOAT_H@ NEXT_GETOPT_H = @NEXT_GETOPT_H@ @@ -1423,18 +1246,15 @@ REPLACE_ATAN2F = @REPLACE_ATAN2F@ REPLACE_ATANF = @REPLACE_ATANF@ REPLACE_BTOWC = @REPLACE_BTOWC@ -REPLACE_CALLOC_FOR_CALLOC_GNU = @REPLACE_CALLOC_FOR_CALLOC_GNU@ -REPLACE_CALLOC_FOR_CALLOC_POSIX = @REPLACE_CALLOC_FOR_CALLOC_POSIX@ +REPLACE_CALLOC = @REPLACE_CALLOC@ REPLACE_CANONICALIZE_FILE_NAME = @REPLACE_CANONICALIZE_FILE_NAME@ REPLACE_CBRTF = @REPLACE_CBRTF@ REPLACE_CBRTL = @REPLACE_CBRTL@ REPLACE_CEIL = @REPLACE_CEIL@ REPLACE_CEILF = @REPLACE_CEILF@ REPLACE_CEILL = @REPLACE_CEILL@ -REPLACE_CHMOD = @REPLACE_CHMOD@ REPLACE_CHOWN = @REPLACE_CHOWN@ REPLACE_CLOSE = @REPLACE_CLOSE@ -REPLACE_COPY_FILE_RANGE = @REPLACE_COPY_FILE_RANGE@ REPLACE_COSF = @REPLACE_COSF@ REPLACE_COSHF = @REPLACE_COSHF@ REPLACE_CREAT = @REPLACE_CREAT@ @@ -1442,9 +1262,6 @@ REPLACE_DPRINTF = @REPLACE_DPRINTF@ REPLACE_DUP = @REPLACE_DUP@ REPLACE_DUP2 = @REPLACE_DUP2@ -REPLACE_DUP3 = @REPLACE_DUP3@ -REPLACE_ERROR = @REPLACE_ERROR@ -REPLACE_ERROR_AT_LINE = @REPLACE_ERROR_AT_LINE@ REPLACE_EXECL = @REPLACE_EXECL@ REPLACE_EXECLE = @REPLACE_EXECLE@ REPLACE_EXECLP = @REPLACE_EXECLP@ @@ -1465,7 +1282,6 @@ REPLACE_FCHOWNAT = @REPLACE_FCHOWNAT@ REPLACE_FCLOSE = @REPLACE_FCLOSE@ REPLACE_FCNTL = @REPLACE_FCNTL@ -REPLACE_FDATASYNC = @REPLACE_FDATASYNC@ REPLACE_FDOPEN = @REPLACE_FDOPEN@ REPLACE_FFLUSH = @REPLACE_FFLUSH@ REPLACE_FFSLL = @REPLACE_FFSLL@ @@ -1479,7 +1295,6 @@ REPLACE_FMODF = @REPLACE_FMODF@ REPLACE_FMODL = @REPLACE_FMODL@ REPLACE_FOPEN = @REPLACE_FOPEN@ -REPLACE_FOPEN_FOR_FOPEN_GNU = @REPLACE_FOPEN_FOR_FOPEN_GNU@ REPLACE_FPRINTF = @REPLACE_FPRINTF@ REPLACE_FPURGE = @REPLACE_FPURGE@ REPLACE_FREE = @REPLACE_FREE@ @@ -1499,16 +1314,11 @@ REPLACE_GETDELIM = @REPLACE_GETDELIM@ REPLACE_GETDOMAINNAME = @REPLACE_GETDOMAINNAME@ REPLACE_GETDTABLESIZE = @REPLACE_GETDTABLESIZE@ -REPLACE_GETENTROPY = @REPLACE_GETENTROPY@ REPLACE_GETGROUPS = @REPLACE_GETGROUPS@ REPLACE_GETLINE = @REPLACE_GETLINE@ -REPLACE_GETLOADAVG = @REPLACE_GETLOADAVG@ REPLACE_GETLOGIN_R = @REPLACE_GETLOGIN_R@ REPLACE_GETPAGESIZE = @REPLACE_GETPAGESIZE@ REPLACE_GETPASS = @REPLACE_GETPASS@ -REPLACE_GETPASS_FOR_GETPASS_GNU = @REPLACE_GETPASS_FOR_GETPASS_GNU@ -REPLACE_GETPROGNAME = @REPLACE_GETPROGNAME@ -REPLACE_GETSUBOPT = @REPLACE_GETSUBOPT@ REPLACE_GMTIME = @REPLACE_GMTIME@ REPLACE_HUGE_VAL = @REPLACE_HUGE_VAL@ REPLACE_HYPOT = @REPLACE_HYPOT@ @@ -1517,8 +1327,6 @@ REPLACE_ILOGB = @REPLACE_ILOGB@ REPLACE_ILOGBF = @REPLACE_ILOGBF@ REPLACE_ILOGBL = @REPLACE_ILOGBL@ -REPLACE_IMAXABS = @REPLACE_IMAXABS@ -REPLACE_IMAXDIV = @REPLACE_IMAXDIV@ REPLACE_INITSTATE = @REPLACE_INITSTATE@ REPLACE_ISATTY = @REPLACE_ISATTY@ REPLACE_ISFINITE = @REPLACE_ISFINITE@ @@ -1548,27 +1356,21 @@ REPLACE_LOGL = @REPLACE_LOGL@ REPLACE_LSEEK = @REPLACE_LSEEK@ REPLACE_LSTAT = @REPLACE_LSTAT@ -REPLACE_MALLOC_FOR_MALLOC_GNU = @REPLACE_MALLOC_FOR_MALLOC_GNU@ -REPLACE_MALLOC_FOR_MALLOC_POSIX = @REPLACE_MALLOC_FOR_MALLOC_POSIX@ +REPLACE_MALLOC = @REPLACE_MALLOC@ REPLACE_MBRLEN = @REPLACE_MBRLEN@ REPLACE_MBRTOWC = @REPLACE_MBRTOWC@ REPLACE_MBSINIT = @REPLACE_MBSINIT@ REPLACE_MBSNRTOWCS = @REPLACE_MBSNRTOWCS@ REPLACE_MBSRTOWCS = @REPLACE_MBSRTOWCS@ REPLACE_MBSTATE_T = @REPLACE_MBSTATE_T@ -REPLACE_MBSTOWCS = @REPLACE_MBSTOWCS@ REPLACE_MBTOWC = @REPLACE_MBTOWC@ -REPLACE_MB_CUR_MAX = @REPLACE_MB_CUR_MAX@ REPLACE_MEMCHR = @REPLACE_MEMCHR@ REPLACE_MEMMEM = @REPLACE_MEMMEM@ -REPLACE_MEMPCPY = @REPLACE_MEMPCPY@ REPLACE_MKDIR = @REPLACE_MKDIR@ REPLACE_MKFIFO = @REPLACE_MKFIFO@ REPLACE_MKFIFOAT = @REPLACE_MKFIFOAT@ REPLACE_MKNOD = @REPLACE_MKNOD@ REPLACE_MKNODAT = @REPLACE_MKNODAT@ -REPLACE_MKOSTEMP = @REPLACE_MKOSTEMP@ -REPLACE_MKOSTEMPS = @REPLACE_MKOSTEMPS@ REPLACE_MKSTEMP = @REPLACE_MKSTEMP@ REPLACE_MKTIME = @REPLACE_MKTIME@ REPLACE_MODF = @REPLACE_MODF@ @@ -1581,10 +1383,8 @@ REPLACE_OPEN = @REPLACE_OPEN@ REPLACE_OPENAT = @REPLACE_OPENAT@ REPLACE_PERROR = @REPLACE_PERROR@ -REPLACE_PIPE2 = @REPLACE_PIPE2@ REPLACE_POPEN = @REPLACE_POPEN@ REPLACE_POSIX_MEMALIGN = @REPLACE_POSIX_MEMALIGN@ -REPLACE_POSIX_OPENPT = @REPLACE_POSIX_OPENPT@ REPLACE_PREAD = @REPLACE_PREAD@ REPLACE_PRINTF = @REPLACE_PRINTF@ REPLACE_PTHREAD_SIGMASK = @REPLACE_PTHREAD_SIGMASK@ @@ -1599,9 +1399,7 @@ REPLACE_READ = @REPLACE_READ@ REPLACE_READLINK = @REPLACE_READLINK@ REPLACE_READLINKAT = @REPLACE_READLINKAT@ -REPLACE_REALLOCARRAY = @REPLACE_REALLOCARRAY@ -REPLACE_REALLOC_FOR_REALLOC_GNU = @REPLACE_REALLOC_FOR_REALLOC_GNU@ -REPLACE_REALLOC_FOR_REALLOC_POSIX = @REPLACE_REALLOC_FOR_REALLOC_POSIX@ +REPLACE_REALLOC = @REPLACE_REALLOC@ REPLACE_REALPATH = @REPLACE_REALPATH@ REPLACE_REMAINDER = @REPLACE_REMAINDER@ REPLACE_REMAINDERF = @REPLACE_REMAINDERF@ @@ -1615,7 +1413,6 @@ REPLACE_ROUNDF = @REPLACE_ROUNDF@ REPLACE_ROUNDL = @REPLACE_ROUNDL@ REPLACE_SETENV = @REPLACE_SETENV@ -REPLACE_SETHOSTNAME = @REPLACE_SETHOSTNAME@ REPLACE_SETSTATE = @REPLACE_SETSTATE@ REPLACE_SIGNBIT = @REPLACE_SIGNBIT@ REPLACE_SIGNBIT_USING_BUILTINS = @REPLACE_SIGNBIT_USING_BUILTINS@ @@ -1629,7 +1426,6 @@ REPLACE_STAT = @REPLACE_STAT@ REPLACE_STDIO_READ_FUNCS = @REPLACE_STDIO_READ_FUNCS@ REPLACE_STDIO_WRITE_FUNCS = @REPLACE_STDIO_WRITE_FUNCS@ -REPLACE_STPCPY = @REPLACE_STPCPY@ REPLACE_STPNCPY = @REPLACE_STPNCPY@ REPLACE_STRCASESTR = @REPLACE_STRCASESTR@ REPLACE_STRCHRNUL = @REPLACE_STRCHRNUL@ @@ -1646,19 +1442,13 @@ REPLACE_STRTOD = @REPLACE_STRTOD@ REPLACE_STRTOIMAX = @REPLACE_STRTOIMAX@ REPLACE_STRTOK_R = @REPLACE_STRTOK_R@ -REPLACE_STRTOL = @REPLACE_STRTOL@ REPLACE_STRTOLD = @REPLACE_STRTOLD@ -REPLACE_STRTOLL = @REPLACE_STRTOLL@ -REPLACE_STRTOUL = @REPLACE_STRTOUL@ -REPLACE_STRTOULL = @REPLACE_STRTOULL@ REPLACE_STRTOUMAX = @REPLACE_STRTOUMAX@ REPLACE_SYMLINK = @REPLACE_SYMLINK@ REPLACE_SYMLINKAT = @REPLACE_SYMLINKAT@ REPLACE_TANF = @REPLACE_TANF@ REPLACE_TANHF = @REPLACE_TANHF@ -REPLACE_TIME = @REPLACE_TIME@ REPLACE_TIMEGM = @REPLACE_TIMEGM@ -REPLACE_TIMESPEC_GET = @REPLACE_TIMESPEC_GET@ REPLACE_TMPFILE = @REPLACE_TMPFILE@ REPLACE_TRUNC = @REPLACE_TRUNC@ REPLACE_TRUNCATE = @REPLACE_TRUNCATE@ @@ -1678,26 +1468,20 @@ REPLACE_VSNPRINTF = @REPLACE_VSNPRINTF@ REPLACE_VSPRINTF = @REPLACE_VSPRINTF@ REPLACE_WCRTOMB = @REPLACE_WCRTOMB@ -REPLACE_WCSCMP = @REPLACE_WCSCMP@ REPLACE_WCSFTIME = @REPLACE_WCSFTIME@ -REPLACE_WCSNCMP = @REPLACE_WCSNCMP@ REPLACE_WCSNRTOMBS = @REPLACE_WCSNRTOMBS@ REPLACE_WCSRTOMBS = @REPLACE_WCSRTOMBS@ -REPLACE_WCSSTR = @REPLACE_WCSSTR@ REPLACE_WCSTOK = @REPLACE_WCSTOK@ REPLACE_WCSWIDTH = @REPLACE_WCSWIDTH@ REPLACE_WCTOB = @REPLACE_WCTOB@ REPLACE_WCTOMB = @REPLACE_WCTOMB@ REPLACE_WCWIDTH = @REPLACE_WCWIDTH@ -REPLACE_WMEMCMP = @REPLACE_WMEMCMP@ -REPLACE_WMEMPCPY = @REPLACE_WMEMPCPY@ REPLACE_WRITE = @REPLACE_WRITE@ -REPLACE__EXIT = @REPLACE__EXIT@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ SIG_ATOMIC_T_SUFFIX = @SIG_ATOMIC_T_SUFFIX@ SIZE_T_SUFFIX = @SIZE_T_SUFFIX@ -STDCKDINT_H = @STDCKDINT_H@ +STDBOOL_H = @STDBOOL_H@ STDDEF_H = @STDDEF_H@ STDINT_H = @STDINT_H@ STRIP = @STRIP@ @@ -1742,10 +1526,8 @@ docdir = @docdir@ dvidir = @dvidir@ exec_prefix = @exec_prefix@ -gl_LIBOBJDEPS = @gl_LIBOBJDEPS@ gl_LIBOBJS = @gl_LIBOBJS@ gl_LTLIBOBJS = @gl_LTLIBOBJS@ -gltests_LIBOBJDEPS = @gltests_LIBOBJDEPS@ gltests_LIBOBJS = @gltests_LIBOBJS@ gltests_LTLIBOBJS = @gltests_LTLIBOBJS@ gltests_WITNESS = @gltests_WITNESS@ @@ -1778,55 +1560,56 @@ top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ -AUTOMAKE_OPTIONS = 1.14 gnits subdir-objects +AUTOMAKE_OPTIONS = 1.11 gnits subdir-objects SUBDIRS = noinst_HEADERS = noinst_LIBRARIES = libgnu.a noinst_LTLIBRARIES = -EXTRA_DIST = alloca.in.h assert.in.h verify.h attribute.h \ - basename-lgpl.h $(top_srcdir)/build-aux/bootstrap.in calloc.c \ - calloc.c cloexec.h dirname.h eloop-threshold.h errno.in.h \ - error.in.h exitfail.h $(top_srcdir)/build-aux/extract-trace \ - fcntl.in.h fd-hook.h filename.h float.in.h fprintf.c fpucw.h \ - frexp.c frexp.c frexpl.c fseterr.h stdio-impl.h stat-w32.c \ - stat-w32.h $(top_srcdir)/build-aux/funclib.sh \ +EXTRA_DIST = alloca.in.h attribute.h basename-lgpl.h \ + $(top_srcdir)/build-aux/bootstrap.in canonicalize-lgpl.c \ + cloexec.h close.c dirname.h dup2.c eloop-threshold.h \ + errno.in.h error.c error.h exitfail.h \ + $(top_srcdir)/build-aux/extract-trace fcntl.c fcntl.in.h \ + fd-hook.h filename.h float.c float.in.h itold.c fprintf.c \ + fpucw.h free.c frexp.c frexp.c frexpl.c fseterr.c fseterr.h \ + stdio-impl.h fstat.c stat-w32.c stat-w32.h \ + $(top_srcdir)/build-aux/funclib.sh getdtablesize.c \ getopt-cdefs.in.h getopt-core.h getopt-ext.h getopt-pfx-core.h \ - getopt-pfx-ext.h getopt.in.h getopt_int.h getprogname.h \ - malloc/scratch_buffer.h scratch_buffer.h ialloc.h \ + getopt-pfx-ext.h getopt.c getopt.in.h getopt1.c getopt_int.h \ ignore-value.h $(top_srcdir)/build-aux/inline-source \ - intprops-internal.h intprops.h inttypes.in.h float+.h isnan.c \ - isnand-nolibm.h isnand.c float+.h isnan.c isnanf-nolibm.h \ - isnanf.c float+.h isnan.c isnanl-nolibm.h isnanl.c cdefs.h \ - libc-config.h limits.in.h malloc.c malloc.c malloca.h \ - math.in.h memchr.valgrind msvc-inval.h msvc-nothrow.h \ + intprops.h inttypes.in.h float+.h isnan.c isnand-nolibm.h \ + isnand.c float+.h isnan.c isnanf-nolibm.h isnanf.c float+.h \ + isnan.c isnanl-nolibm.h isnanl.c cdefs.h libc-config.h \ + limits.in.h link.c lseek.c lstat.c malloc.c malloca.h \ + math.in.h memchr.c memchr.valgrind mempcpy.c msvc-inval.c \ + msvc-inval.h msvc-nothrow.c msvc-nothrow.h open.c \ $(top_srcdir)/build-aux/options-parser pathmax.h \ - printf-frexp.h printf-frexp.c printf-frexpl.h \ - rawmemchr.valgrind realloc.c realloc.c same-inode.h \ - signal.in.h float+.h _Noreturn.h arg-nonnull.h c++defs.h \ - warn-on-use.h sprintf.c stat-w32.c stat-w32.h stat-time.h \ - intprops-internal.h stdckdint.in.h stddef.in.h stdint.in.h \ - stdio.in.h stdlib.in.h strerror-override.h string.in.h \ - sys_stat.in.h sys_types.in.h time.in.h unistd.in.h asnprintf.c \ - float+.h printf-args.c printf-args.h printf-parse.c \ - printf-parse.h vasnprintf.c vasnprintf.h wchar.in.h xalloc.h \ - xalloc.h xalloc-oversized.h -BUILT_SOURCES = $(ALLOCA_H) $(ASSERT_H) $(ERRNO_H) $(ERROR_H) fcntl.h \ - $(FLOAT_H) $(GETOPT_H) $(GETOPT_CDEFS_H) \ - malloc/scratch_buffer.gl.h inttypes.h $(LIMITS_H) math.h \ - signal.h $(STDCKDINT_H) $(STDDEF_H) $(STDINT_H) stdio.h \ - stdlib.h string.h sys/stat.h sys/types.h time.h unistd.h \ - wchar.h + printf-frexp.h printf-frexp.c printf-frexpl.h raise.c \ + rawmemchr.c rawmemchr.valgrind read.c readlink.c realloc.c \ + rename.c rmdir.c same-inode.h malloc/scratch_buffer.h \ + scratch_buffer.h signal.in.h float+.h signbitd.c signbitf.c \ + signbitl.c _Noreturn.h arg-nonnull.h c++defs.h warn-on-use.h \ + sprintf.c stat-w32.c stat-w32.h stat.c stat-time.h \ + stdbool.in.h stddef.in.h stdint.in.h stdio.in.h stdlib.in.h \ + strdup.c strerror.c strerror-override.c strerror-override.h \ + string.in.h symlink.c sys_stat.in.h sys_types.in.h time.in.h \ + unistd.in.h unlink.c asnprintf.c float+.h printf-args.c \ + printf-args.h printf-parse.c printf-parse.h vasnprintf.c \ + vasnprintf.h verify.h wchar.in.h write.c xalloc.h xalloc.h \ + xalloc-oversized.h +BUILT_SOURCES = $(ALLOCA_H) $(ERRNO_H) fcntl.h $(FLOAT_H) $(GETOPT_H) \ + $(GETOPT_CDEFS_H) inttypes.h $(LIMITS_H) math.h signal.h \ + $(STDBOOL_H) $(STDDEF_H) $(STDINT_H) stdio.h stdlib.h string.h \ + sys/stat.h sys/types.h time.h unistd.h wchar.h SUFFIXES = -MOSTLYCLEANFILES = core *.stackdump alloca.h alloca.h-t assert.h \ - assert.h-t errno.h errno.h-t error.h error.h-t fcntl.h \ - fcntl.h-t float.h float.h-t getopt.h getopt.h-t getopt-cdefs.h \ - getopt-cdefs.h-t malloc/scratch_buffer.gl.h \ - malloc/scratch_buffer.gl.h-t inttypes.h inttypes.h-t limits.h \ - limits.h-t math.h math.h-t signal.h signal.h-t stdckdint.h \ - stdckdint.h-t stddef.h stddef.h-t stdint.h stdint.h-t stdio.h \ - stdio.h-t stdlib.h stdlib.h-t string.h string.h-t sys/stat.h \ - sys/stat.h-t sys/types.h sys/types.h-t time.h time.h-t \ - unistd.h unistd.h-t wchar.h wchar.h-t +MOSTLYCLEANFILES = core *.stackdump alloca.h alloca.h-t errno.h \ + errno.h-t fcntl.h fcntl.h-t float.h float.h-t getopt.h \ + getopt.h-t getopt-cdefs.h getopt-cdefs.h-t inttypes.h \ + inttypes.h-t limits.h limits.h-t math.h math.h-t signal.h \ + signal.h-t stdbool.h stdbool.h-t stddef.h stddef.h-t stdint.h \ + stdint.h-t stdio.h stdio.h-t stdlib.h stdlib.h-t string.h \ + string.h-t sys/stat.h sys/stat.h-t sys/types.h sys/types.h-t \ + time.h time.h-t unistd.h unistd.h-t wchar.h wchar.h-t MOSTLYCLEANDIRS = sys CLEANFILES = DISTCLEANFILES = @@ -1834,55 +1617,32 @@ # No GNU Make output. AM_CPPFLAGS = AM_CFLAGS = -libgnu_a_SOURCES = basename-lgpl.c binary-io.h binary-io.c \ - $(am__append_1) cloexec.c $(am__append_2) dirname-lgpl.c \ - stripslash.c $(am__append_3) $(am__append_4) exitfail.c \ - $(am__append_5) fd-hook.c $(am__append_6) $(am__append_7) \ - $(am__append_8) $(am__append_9) $(am__append_10) \ - $(am__append_11) $(am__append_12) $(am__append_13) gettext.h \ - malloc/scratch_buffer_grow.c \ - malloc/scratch_buffer_grow_preserve.c \ - malloc/scratch_buffer_set_array_size.c ialloc.c idx.h \ - $(am__append_14) $(am__append_15) $(am__append_16) malloca.c \ - math.c $(am__append_17) $(am__append_18) minmax.h \ - $(am__append_19) $(am__append_20) $(am__append_21) \ +libgnu_a_SOURCES = basename-lgpl.c binary-io.h binary-io.c cloexec.c \ + dirname-lgpl.c stripslash.c exitfail.c fd-hook.c getprogname.h \ + getprogname.c gettext.h idx.h malloca.c math.c minmax.h \ printf-frexp.c printf-frexpl.c progname.h progname.c \ - $(am__append_22) $(am__append_23) $(am__append_24) \ - $(am__append_25) $(am__append_26) $(am__append_27) \ - $(am__append_28) $(am__append_29) size_max.h $(am__append_30) \ - stat-time.c $(am__append_31) $(am__append_32) $(am__append_33) \ - $(am__append_34) $(am__append_35) $(am__append_36) unistd.c \ - $(am__append_37) $(am__append_38) xmalloc.c xalloc-die.c \ - xsize.h xsize.c -libgnu_a_CFLAGS = $(AM_CFLAGS) $(GL_CFLAG_GNULIB_WARNINGS) + malloc/scratch_buffer_dupfree.c malloc/scratch_buffer_grow.c \ + malloc/scratch_buffer_grow_preserve.c \ + malloc/scratch_buffer_set_array_size.c size_max.h stat-time.c \ + unistd.c xmalloc.c xalloc-die.c xsize.h xsize.c libgnu_a_LIBADD = $(gl_LIBOBJS) libgnu_a_DEPENDENCIES = $(gl_LIBOBJS) -EXTRA_libgnu_a_SOURCES = calloc.c calloc.c fprintf.c frexp.c frexp.c \ - frexpl.c stat-w32.c isnan.c isnand.c isnan.c isnanf.c isnan.c \ - isnanl.c malloc.c malloc.c printf-frexp.c realloc.c realloc.c \ - sprintf.c stat-w32.c asnprintf.c printf-args.c printf-parse.c \ - vasnprintf.c +EXTRA_libgnu_a_SOURCES = canonicalize-lgpl.c close.c dup2.c error.c \ + fcntl.c float.c itold.c fprintf.c free.c frexp.c frexp.c \ + frexpl.c fseterr.c fstat.c stat-w32.c getdtablesize.c getopt.c \ + getopt1.c isnan.c isnand.c isnan.c isnanf.c isnan.c isnanl.c \ + link.c lseek.c lstat.c malloc.c memchr.c mempcpy.c \ + msvc-inval.c msvc-nothrow.c open.c printf-frexp.c raise.c \ + rawmemchr.c read.c readlink.c realloc.c rename.c rmdir.c \ + signbitd.c signbitf.c signbitl.c sprintf.c stat-w32.c stat.c \ + strdup.c strerror.c strerror-override.c symlink.c unlink.c \ + asnprintf.c printf-args.c printf-parse.c vasnprintf.c write.c # 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__ || __clang__ || 60000000 <= __DECC_VER) -# In 'sed', replace the pattern space with a "DO NOT EDIT" comment. -SED_HEADER_NOEDIT = s,.*,/* DO NOT EDIT! GENERATED AUTOMATICALLY! */, - -# '$(SED_HEADER_STDOUT) -e "..."' runs 'sed' but first outputs "DO NOT EDIT". -SED_HEADER_STDOUT = sed -e 1h -e '1$(SED_HEADER_NOEDIT)' -e 1G - -# '$(SED_HEADER_TO_AT_t) FILE' copies FILE to $@-t, prepending a leading -# "DO_NOT_EDIT". Although this could be done more simply via: -# SED_HEADER_TO_AT_t = $(SED_HEADER_STDOUT) > $@-t -# the -n and 'w' avoid a fork+exec, at least when GNU Make is used. -SED_HEADER_TO_AT_t = $(SED_HEADER_STDOUT) -n -e 'w $@-t' - -# Use $(gl_V_at) instead of $(AM_V_GEN) or $(AM_V_at) on a line that -gl_V_at = $(AM_V_GEN) - # Because this Makefile snippet defines a variable used by other # gnulib Makefile snippets, it must be present in all makefiles that # need it. This is ensured by the applicability 'all' defined above. @@ -1956,11 +1716,13 @@ malloc/$(DEPDIR)/$(am__dirstamp): @$(MKDIR_P) malloc/$(DEPDIR) @: > malloc/$(DEPDIR)/$(am__dirstamp) -malloc/libgnu_a-scratch_buffer_grow.$(OBJEXT): malloc/$(am__dirstamp) \ +malloc/scratch_buffer_dupfree.$(OBJEXT): malloc/$(am__dirstamp) \ malloc/$(DEPDIR)/$(am__dirstamp) -malloc/libgnu_a-scratch_buffer_grow_preserve.$(OBJEXT): \ - malloc/$(am__dirstamp) malloc/$(DEPDIR)/$(am__dirstamp) -malloc/libgnu_a-scratch_buffer_set_array_size.$(OBJEXT): \ +malloc/scratch_buffer_grow.$(OBJEXT): malloc/$(am__dirstamp) \ + malloc/$(DEPDIR)/$(am__dirstamp) +malloc/scratch_buffer_grow_preserve.$(OBJEXT): malloc/$(am__dirstamp) \ + malloc/$(DEPDIR)/$(am__dirstamp) +malloc/scratch_buffer_set_array_size.$(OBJEXT): \ malloc/$(am__dirstamp) malloc/$(DEPDIR)/$(am__dirstamp) libgnu.a: $(libgnu_a_OBJECTS) $(libgnu_a_DEPENDENCIES) $(EXTRA_libgnu_a_DEPENDENCIES) @@ -1975,84 +1737,80 @@ distclean-compile: -rm -f *.tab.c -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgnu_a-asnprintf.Po@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgnu_a-basename-lgpl.Po@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgnu_a-binary-io.Po@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgnu_a-calloc.Po@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgnu_a-canonicalize-lgpl.Po@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgnu_a-cloexec.Po@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgnu_a-close.Po@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgnu_a-dirname-lgpl.Po@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgnu_a-dup2.Po@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgnu_a-error.Po@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgnu_a-exitfail.Po@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgnu_a-fcntl.Po@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgnu_a-fd-hook.Po@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgnu_a-float.Po@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgnu_a-fprintf.Po@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgnu_a-free.Po@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgnu_a-frexp.Po@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgnu_a-frexpl.Po@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgnu_a-fseterr.Po@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgnu_a-fstat.Po@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgnu_a-getdtablesize.Po@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgnu_a-getopt.Po@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgnu_a-getopt1.Po@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgnu_a-getprogname.Po@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgnu_a-ialloc.Po@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgnu_a-isnan.Po@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgnu_a-isnand.Po@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgnu_a-isnanf.Po@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgnu_a-isnanl.Po@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgnu_a-itold.Po@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgnu_a-link.Po@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgnu_a-lseek.Po@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgnu_a-lstat.Po@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgnu_a-malloc.Po@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgnu_a-malloca.Po@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgnu_a-math.Po@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgnu_a-memchr.Po@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgnu_a-mempcpy.Po@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgnu_a-msvc-inval.Po@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgnu_a-msvc-nothrow.Po@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgnu_a-open.Po@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgnu_a-printf-args.Po@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgnu_a-printf-frexp.Po@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgnu_a-printf-frexpl.Po@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgnu_a-printf-parse.Po@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgnu_a-progname.Po@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgnu_a-raise.Po@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgnu_a-rawmemchr.Po@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgnu_a-read.Po@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgnu_a-readlink.Po@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgnu_a-realloc.Po@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgnu_a-reallocarray.Po@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgnu_a-rename.Po@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgnu_a-rmdir.Po@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgnu_a-signbitd.Po@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgnu_a-signbitf.Po@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgnu_a-signbitl.Po@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgnu_a-sprintf.Po@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgnu_a-stat-time.Po@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgnu_a-stat-w32.Po@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgnu_a-stat.Po@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgnu_a-stdio-read.Po@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgnu_a-stdio-write.Po@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgnu_a-strdup.Po@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgnu_a-strerror-override.Po@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgnu_a-strerror.Po@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgnu_a-stripslash.Po@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgnu_a-symlink.Po@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgnu_a-unistd.Po@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgnu_a-unlink.Po@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgnu_a-vasnprintf.Po@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgnu_a-write.Po@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgnu_a-xalloc-die.Po@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgnu_a-xmalloc.Po@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgnu_a-xsize.Po@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@malloc/$(DEPDIR)/libgnu_a-scratch_buffer_grow.Po@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@malloc/$(DEPDIR)/libgnu_a-scratch_buffer_grow_preserve.Po@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@malloc/$(DEPDIR)/libgnu_a-scratch_buffer_set_array_size.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/asnprintf.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/basename-lgpl.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/binary-io.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/canonicalize-lgpl.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cloexec.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/close.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/dirname-lgpl.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/dup2.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/error.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/exitfail.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/fcntl.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/fd-hook.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/float.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/fprintf.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/free.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/frexp.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/frexpl.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/fseterr.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/fstat.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/getdtablesize.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/getopt.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/getopt1.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/getprogname.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/isnan.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/isnand.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/isnanf.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/isnanl.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/itold.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/link.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/lseek.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/lstat.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/malloc.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/malloca.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/math.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/memchr.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mempcpy.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/msvc-inval.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/msvc-nothrow.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/open.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/printf-args.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/printf-frexp.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/printf-frexpl.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/printf-parse.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/progname.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/raise.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/rawmemchr.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/read.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/readlink.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/realloc.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/rename.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/rmdir.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/signbitd.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/signbitf.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/signbitl.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/sprintf.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/stat-time.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/stat-w32.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/stat.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/strdup.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/strerror-override.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/strerror.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/stripslash.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/symlink.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/unistd.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/unlink.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/vasnprintf.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/write.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xalloc-die.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xmalloc.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xsize.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@malloc/$(DEPDIR)/scratch_buffer_dupfree.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@malloc/$(DEPDIR)/scratch_buffer_grow.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@malloc/$(DEPDIR)/scratch_buffer_grow_preserve.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@malloc/$(DEPDIR)/scratch_buffer_set_array_size.Po@am__quote@ # am--include-marker $(am__depfiles_remade): @$(MKDIR_P) $(@D) @@ -2076,1098 +1834,6 @@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'` -libgnu_a-basename-lgpl.o: basename-lgpl.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgnu_a_CFLAGS) $(CFLAGS) -MT libgnu_a-basename-lgpl.o -MD -MP -MF $(DEPDIR)/libgnu_a-basename-lgpl.Tpo -c -o libgnu_a-basename-lgpl.o `test -f 'basename-lgpl.c' || echo '$(srcdir)/'`basename-lgpl.c -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libgnu_a-basename-lgpl.Tpo $(DEPDIR)/libgnu_a-basename-lgpl.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='basename-lgpl.c' object='libgnu_a-basename-lgpl.o' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgnu_a_CFLAGS) $(CFLAGS) -c -o libgnu_a-basename-lgpl.o `test -f 'basename-lgpl.c' || echo '$(srcdir)/'`basename-lgpl.c - -libgnu_a-basename-lgpl.obj: basename-lgpl.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgnu_a_CFLAGS) $(CFLAGS) -MT libgnu_a-basename-lgpl.obj -MD -MP -MF $(DEPDIR)/libgnu_a-basename-lgpl.Tpo -c -o libgnu_a-basename-lgpl.obj `if test -f 'basename-lgpl.c'; then $(CYGPATH_W) 'basename-lgpl.c'; else $(CYGPATH_W) '$(srcdir)/basename-lgpl.c'; fi` -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libgnu_a-basename-lgpl.Tpo $(DEPDIR)/libgnu_a-basename-lgpl.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='basename-lgpl.c' object='libgnu_a-basename-lgpl.obj' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgnu_a_CFLAGS) $(CFLAGS) -c -o libgnu_a-basename-lgpl.obj `if test -f 'basename-lgpl.c'; then $(CYGPATH_W) 'basename-lgpl.c'; else $(CYGPATH_W) '$(srcdir)/basename-lgpl.c'; fi` - -libgnu_a-binary-io.o: binary-io.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgnu_a_CFLAGS) $(CFLAGS) -MT libgnu_a-binary-io.o -MD -MP -MF $(DEPDIR)/libgnu_a-binary-io.Tpo -c -o libgnu_a-binary-io.o `test -f 'binary-io.c' || echo '$(srcdir)/'`binary-io.c -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libgnu_a-binary-io.Tpo $(DEPDIR)/libgnu_a-binary-io.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='binary-io.c' object='libgnu_a-binary-io.o' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgnu_a_CFLAGS) $(CFLAGS) -c -o libgnu_a-binary-io.o `test -f 'binary-io.c' || echo '$(srcdir)/'`binary-io.c - -libgnu_a-binary-io.obj: binary-io.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgnu_a_CFLAGS) $(CFLAGS) -MT libgnu_a-binary-io.obj -MD -MP -MF $(DEPDIR)/libgnu_a-binary-io.Tpo -c -o libgnu_a-binary-io.obj `if test -f 'binary-io.c'; then $(CYGPATH_W) 'binary-io.c'; else $(CYGPATH_W) '$(srcdir)/binary-io.c'; fi` -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libgnu_a-binary-io.Tpo $(DEPDIR)/libgnu_a-binary-io.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='binary-io.c' object='libgnu_a-binary-io.obj' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgnu_a_CFLAGS) $(CFLAGS) -c -o libgnu_a-binary-io.obj `if test -f 'binary-io.c'; then $(CYGPATH_W) 'binary-io.c'; else $(CYGPATH_W) '$(srcdir)/binary-io.c'; fi` - -libgnu_a-canonicalize-lgpl.o: canonicalize-lgpl.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgnu_a_CFLAGS) $(CFLAGS) -MT libgnu_a-canonicalize-lgpl.o -MD -MP -MF $(DEPDIR)/libgnu_a-canonicalize-lgpl.Tpo -c -o libgnu_a-canonicalize-lgpl.o `test -f 'canonicalize-lgpl.c' || echo '$(srcdir)/'`canonicalize-lgpl.c -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libgnu_a-canonicalize-lgpl.Tpo $(DEPDIR)/libgnu_a-canonicalize-lgpl.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='canonicalize-lgpl.c' object='libgnu_a-canonicalize-lgpl.o' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgnu_a_CFLAGS) $(CFLAGS) -c -o libgnu_a-canonicalize-lgpl.o `test -f 'canonicalize-lgpl.c' || echo '$(srcdir)/'`canonicalize-lgpl.c - -libgnu_a-canonicalize-lgpl.obj: canonicalize-lgpl.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgnu_a_CFLAGS) $(CFLAGS) -MT libgnu_a-canonicalize-lgpl.obj -MD -MP -MF $(DEPDIR)/libgnu_a-canonicalize-lgpl.Tpo -c -o libgnu_a-canonicalize-lgpl.obj `if test -f 'canonicalize-lgpl.c'; then $(CYGPATH_W) 'canonicalize-lgpl.c'; else $(CYGPATH_W) '$(srcdir)/canonicalize-lgpl.c'; fi` -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libgnu_a-canonicalize-lgpl.Tpo $(DEPDIR)/libgnu_a-canonicalize-lgpl.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='canonicalize-lgpl.c' object='libgnu_a-canonicalize-lgpl.obj' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgnu_a_CFLAGS) $(CFLAGS) -c -o libgnu_a-canonicalize-lgpl.obj `if test -f 'canonicalize-lgpl.c'; then $(CYGPATH_W) 'canonicalize-lgpl.c'; else $(CYGPATH_W) '$(srcdir)/canonicalize-lgpl.c'; fi` - -libgnu_a-cloexec.o: cloexec.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgnu_a_CFLAGS) $(CFLAGS) -MT libgnu_a-cloexec.o -MD -MP -MF $(DEPDIR)/libgnu_a-cloexec.Tpo -c -o libgnu_a-cloexec.o `test -f 'cloexec.c' || echo '$(srcdir)/'`cloexec.c -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libgnu_a-cloexec.Tpo $(DEPDIR)/libgnu_a-cloexec.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='cloexec.c' object='libgnu_a-cloexec.o' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgnu_a_CFLAGS) $(CFLAGS) -c -o libgnu_a-cloexec.o `test -f 'cloexec.c' || echo '$(srcdir)/'`cloexec.c - -libgnu_a-cloexec.obj: cloexec.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgnu_a_CFLAGS) $(CFLAGS) -MT libgnu_a-cloexec.obj -MD -MP -MF $(DEPDIR)/libgnu_a-cloexec.Tpo -c -o libgnu_a-cloexec.obj `if test -f 'cloexec.c'; then $(CYGPATH_W) 'cloexec.c'; else $(CYGPATH_W) '$(srcdir)/cloexec.c'; fi` -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libgnu_a-cloexec.Tpo $(DEPDIR)/libgnu_a-cloexec.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='cloexec.c' object='libgnu_a-cloexec.obj' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgnu_a_CFLAGS) $(CFLAGS) -c -o libgnu_a-cloexec.obj `if test -f 'cloexec.c'; then $(CYGPATH_W) 'cloexec.c'; else $(CYGPATH_W) '$(srcdir)/cloexec.c'; fi` - -libgnu_a-close.o: close.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgnu_a_CFLAGS) $(CFLAGS) -MT libgnu_a-close.o -MD -MP -MF $(DEPDIR)/libgnu_a-close.Tpo -c -o libgnu_a-close.o `test -f 'close.c' || echo '$(srcdir)/'`close.c -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libgnu_a-close.Tpo $(DEPDIR)/libgnu_a-close.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='close.c' object='libgnu_a-close.o' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgnu_a_CFLAGS) $(CFLAGS) -c -o libgnu_a-close.o `test -f 'close.c' || echo '$(srcdir)/'`close.c - -libgnu_a-close.obj: close.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgnu_a_CFLAGS) $(CFLAGS) -MT libgnu_a-close.obj -MD -MP -MF $(DEPDIR)/libgnu_a-close.Tpo -c -o libgnu_a-close.obj `if test -f 'close.c'; then $(CYGPATH_W) 'close.c'; else $(CYGPATH_W) '$(srcdir)/close.c'; fi` -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libgnu_a-close.Tpo $(DEPDIR)/libgnu_a-close.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='close.c' object='libgnu_a-close.obj' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgnu_a_CFLAGS) $(CFLAGS) -c -o libgnu_a-close.obj `if test -f 'close.c'; then $(CYGPATH_W) 'close.c'; else $(CYGPATH_W) '$(srcdir)/close.c'; fi` - -libgnu_a-dirname-lgpl.o: dirname-lgpl.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgnu_a_CFLAGS) $(CFLAGS) -MT libgnu_a-dirname-lgpl.o -MD -MP -MF $(DEPDIR)/libgnu_a-dirname-lgpl.Tpo -c -o libgnu_a-dirname-lgpl.o `test -f 'dirname-lgpl.c' || echo '$(srcdir)/'`dirname-lgpl.c -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libgnu_a-dirname-lgpl.Tpo $(DEPDIR)/libgnu_a-dirname-lgpl.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='dirname-lgpl.c' object='libgnu_a-dirname-lgpl.o' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgnu_a_CFLAGS) $(CFLAGS) -c -o libgnu_a-dirname-lgpl.o `test -f 'dirname-lgpl.c' || echo '$(srcdir)/'`dirname-lgpl.c - -libgnu_a-dirname-lgpl.obj: dirname-lgpl.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgnu_a_CFLAGS) $(CFLAGS) -MT libgnu_a-dirname-lgpl.obj -MD -MP -MF $(DEPDIR)/libgnu_a-dirname-lgpl.Tpo -c -o libgnu_a-dirname-lgpl.obj `if test -f 'dirname-lgpl.c'; then $(CYGPATH_W) 'dirname-lgpl.c'; else $(CYGPATH_W) '$(srcdir)/dirname-lgpl.c'; fi` -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libgnu_a-dirname-lgpl.Tpo $(DEPDIR)/libgnu_a-dirname-lgpl.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='dirname-lgpl.c' object='libgnu_a-dirname-lgpl.obj' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgnu_a_CFLAGS) $(CFLAGS) -c -o libgnu_a-dirname-lgpl.obj `if test -f 'dirname-lgpl.c'; then $(CYGPATH_W) 'dirname-lgpl.c'; else $(CYGPATH_W) '$(srcdir)/dirname-lgpl.c'; fi` - -libgnu_a-stripslash.o: stripslash.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgnu_a_CFLAGS) $(CFLAGS) -MT libgnu_a-stripslash.o -MD -MP -MF $(DEPDIR)/libgnu_a-stripslash.Tpo -c -o libgnu_a-stripslash.o `test -f 'stripslash.c' || echo '$(srcdir)/'`stripslash.c -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libgnu_a-stripslash.Tpo $(DEPDIR)/libgnu_a-stripslash.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='stripslash.c' object='libgnu_a-stripslash.o' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgnu_a_CFLAGS) $(CFLAGS) -c -o libgnu_a-stripslash.o `test -f 'stripslash.c' || echo '$(srcdir)/'`stripslash.c - -libgnu_a-stripslash.obj: stripslash.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgnu_a_CFLAGS) $(CFLAGS) -MT libgnu_a-stripslash.obj -MD -MP -MF $(DEPDIR)/libgnu_a-stripslash.Tpo -c -o libgnu_a-stripslash.obj `if test -f 'stripslash.c'; then $(CYGPATH_W) 'stripslash.c'; else $(CYGPATH_W) '$(srcdir)/stripslash.c'; fi` -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libgnu_a-stripslash.Tpo $(DEPDIR)/libgnu_a-stripslash.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='stripslash.c' object='libgnu_a-stripslash.obj' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgnu_a_CFLAGS) $(CFLAGS) -c -o libgnu_a-stripslash.obj `if test -f 'stripslash.c'; then $(CYGPATH_W) 'stripslash.c'; else $(CYGPATH_W) '$(srcdir)/stripslash.c'; fi` - -libgnu_a-dup2.o: dup2.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgnu_a_CFLAGS) $(CFLAGS) -MT libgnu_a-dup2.o -MD -MP -MF $(DEPDIR)/libgnu_a-dup2.Tpo -c -o libgnu_a-dup2.o `test -f 'dup2.c' || echo '$(srcdir)/'`dup2.c -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libgnu_a-dup2.Tpo $(DEPDIR)/libgnu_a-dup2.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='dup2.c' object='libgnu_a-dup2.o' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgnu_a_CFLAGS) $(CFLAGS) -c -o libgnu_a-dup2.o `test -f 'dup2.c' || echo '$(srcdir)/'`dup2.c - -libgnu_a-dup2.obj: dup2.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgnu_a_CFLAGS) $(CFLAGS) -MT libgnu_a-dup2.obj -MD -MP -MF $(DEPDIR)/libgnu_a-dup2.Tpo -c -o libgnu_a-dup2.obj `if test -f 'dup2.c'; then $(CYGPATH_W) 'dup2.c'; else $(CYGPATH_W) '$(srcdir)/dup2.c'; fi` -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libgnu_a-dup2.Tpo $(DEPDIR)/libgnu_a-dup2.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='dup2.c' object='libgnu_a-dup2.obj' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgnu_a_CFLAGS) $(CFLAGS) -c -o libgnu_a-dup2.obj `if test -f 'dup2.c'; then $(CYGPATH_W) 'dup2.c'; else $(CYGPATH_W) '$(srcdir)/dup2.c'; fi` - -libgnu_a-error.o: error.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgnu_a_CFLAGS) $(CFLAGS) -MT libgnu_a-error.o -MD -MP -MF $(DEPDIR)/libgnu_a-error.Tpo -c -o libgnu_a-error.o `test -f 'error.c' || echo '$(srcdir)/'`error.c -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libgnu_a-error.Tpo $(DEPDIR)/libgnu_a-error.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='error.c' object='libgnu_a-error.o' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgnu_a_CFLAGS) $(CFLAGS) -c -o libgnu_a-error.o `test -f 'error.c' || echo '$(srcdir)/'`error.c - -libgnu_a-error.obj: error.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgnu_a_CFLAGS) $(CFLAGS) -MT libgnu_a-error.obj -MD -MP -MF $(DEPDIR)/libgnu_a-error.Tpo -c -o libgnu_a-error.obj `if test -f 'error.c'; then $(CYGPATH_W) 'error.c'; else $(CYGPATH_W) '$(srcdir)/error.c'; fi` -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libgnu_a-error.Tpo $(DEPDIR)/libgnu_a-error.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='error.c' object='libgnu_a-error.obj' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgnu_a_CFLAGS) $(CFLAGS) -c -o libgnu_a-error.obj `if test -f 'error.c'; then $(CYGPATH_W) 'error.c'; else $(CYGPATH_W) '$(srcdir)/error.c'; fi` - -libgnu_a-exitfail.o: exitfail.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgnu_a_CFLAGS) $(CFLAGS) -MT libgnu_a-exitfail.o -MD -MP -MF $(DEPDIR)/libgnu_a-exitfail.Tpo -c -o libgnu_a-exitfail.o `test -f 'exitfail.c' || echo '$(srcdir)/'`exitfail.c -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libgnu_a-exitfail.Tpo $(DEPDIR)/libgnu_a-exitfail.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='exitfail.c' object='libgnu_a-exitfail.o' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgnu_a_CFLAGS) $(CFLAGS) -c -o libgnu_a-exitfail.o `test -f 'exitfail.c' || echo '$(srcdir)/'`exitfail.c - -libgnu_a-exitfail.obj: exitfail.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgnu_a_CFLAGS) $(CFLAGS) -MT libgnu_a-exitfail.obj -MD -MP -MF $(DEPDIR)/libgnu_a-exitfail.Tpo -c -o libgnu_a-exitfail.obj `if test -f 'exitfail.c'; then $(CYGPATH_W) 'exitfail.c'; else $(CYGPATH_W) '$(srcdir)/exitfail.c'; fi` -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libgnu_a-exitfail.Tpo $(DEPDIR)/libgnu_a-exitfail.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='exitfail.c' object='libgnu_a-exitfail.obj' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgnu_a_CFLAGS) $(CFLAGS) -c -o libgnu_a-exitfail.obj `if test -f 'exitfail.c'; then $(CYGPATH_W) 'exitfail.c'; else $(CYGPATH_W) '$(srcdir)/exitfail.c'; fi` - -libgnu_a-fcntl.o: fcntl.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgnu_a_CFLAGS) $(CFLAGS) -MT libgnu_a-fcntl.o -MD -MP -MF $(DEPDIR)/libgnu_a-fcntl.Tpo -c -o libgnu_a-fcntl.o `test -f 'fcntl.c' || echo '$(srcdir)/'`fcntl.c -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libgnu_a-fcntl.Tpo $(DEPDIR)/libgnu_a-fcntl.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='fcntl.c' object='libgnu_a-fcntl.o' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgnu_a_CFLAGS) $(CFLAGS) -c -o libgnu_a-fcntl.o `test -f 'fcntl.c' || echo '$(srcdir)/'`fcntl.c - -libgnu_a-fcntl.obj: fcntl.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgnu_a_CFLAGS) $(CFLAGS) -MT libgnu_a-fcntl.obj -MD -MP -MF $(DEPDIR)/libgnu_a-fcntl.Tpo -c -o libgnu_a-fcntl.obj `if test -f 'fcntl.c'; then $(CYGPATH_W) 'fcntl.c'; else $(CYGPATH_W) '$(srcdir)/fcntl.c'; fi` -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libgnu_a-fcntl.Tpo $(DEPDIR)/libgnu_a-fcntl.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='fcntl.c' object='libgnu_a-fcntl.obj' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgnu_a_CFLAGS) $(CFLAGS) -c -o libgnu_a-fcntl.obj `if test -f 'fcntl.c'; then $(CYGPATH_W) 'fcntl.c'; else $(CYGPATH_W) '$(srcdir)/fcntl.c'; fi` - -libgnu_a-fd-hook.o: fd-hook.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgnu_a_CFLAGS) $(CFLAGS) -MT libgnu_a-fd-hook.o -MD -MP -MF $(DEPDIR)/libgnu_a-fd-hook.Tpo -c -o libgnu_a-fd-hook.o `test -f 'fd-hook.c' || echo '$(srcdir)/'`fd-hook.c -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libgnu_a-fd-hook.Tpo $(DEPDIR)/libgnu_a-fd-hook.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='fd-hook.c' object='libgnu_a-fd-hook.o' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgnu_a_CFLAGS) $(CFLAGS) -c -o libgnu_a-fd-hook.o `test -f 'fd-hook.c' || echo '$(srcdir)/'`fd-hook.c - -libgnu_a-fd-hook.obj: fd-hook.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgnu_a_CFLAGS) $(CFLAGS) -MT libgnu_a-fd-hook.obj -MD -MP -MF $(DEPDIR)/libgnu_a-fd-hook.Tpo -c -o libgnu_a-fd-hook.obj `if test -f 'fd-hook.c'; then $(CYGPATH_W) 'fd-hook.c'; else $(CYGPATH_W) '$(srcdir)/fd-hook.c'; fi` -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libgnu_a-fd-hook.Tpo $(DEPDIR)/libgnu_a-fd-hook.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='fd-hook.c' object='libgnu_a-fd-hook.obj' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgnu_a_CFLAGS) $(CFLAGS) -c -o libgnu_a-fd-hook.obj `if test -f 'fd-hook.c'; then $(CYGPATH_W) 'fd-hook.c'; else $(CYGPATH_W) '$(srcdir)/fd-hook.c'; fi` - -libgnu_a-float.o: float.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgnu_a_CFLAGS) $(CFLAGS) -MT libgnu_a-float.o -MD -MP -MF $(DEPDIR)/libgnu_a-float.Tpo -c -o libgnu_a-float.o `test -f 'float.c' || echo '$(srcdir)/'`float.c -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libgnu_a-float.Tpo $(DEPDIR)/libgnu_a-float.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='float.c' object='libgnu_a-float.o' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgnu_a_CFLAGS) $(CFLAGS) -c -o libgnu_a-float.o `test -f 'float.c' || echo '$(srcdir)/'`float.c - -libgnu_a-float.obj: float.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgnu_a_CFLAGS) $(CFLAGS) -MT libgnu_a-float.obj -MD -MP -MF $(DEPDIR)/libgnu_a-float.Tpo -c -o libgnu_a-float.obj `if test -f 'float.c'; then $(CYGPATH_W) 'float.c'; else $(CYGPATH_W) '$(srcdir)/float.c'; fi` -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libgnu_a-float.Tpo $(DEPDIR)/libgnu_a-float.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='float.c' object='libgnu_a-float.obj' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgnu_a_CFLAGS) $(CFLAGS) -c -o libgnu_a-float.obj `if test -f 'float.c'; then $(CYGPATH_W) 'float.c'; else $(CYGPATH_W) '$(srcdir)/float.c'; fi` - -libgnu_a-itold.o: itold.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgnu_a_CFLAGS) $(CFLAGS) -MT libgnu_a-itold.o -MD -MP -MF $(DEPDIR)/libgnu_a-itold.Tpo -c -o libgnu_a-itold.o `test -f 'itold.c' || echo '$(srcdir)/'`itold.c -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libgnu_a-itold.Tpo $(DEPDIR)/libgnu_a-itold.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='itold.c' object='libgnu_a-itold.o' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgnu_a_CFLAGS) $(CFLAGS) -c -o libgnu_a-itold.o `test -f 'itold.c' || echo '$(srcdir)/'`itold.c - -libgnu_a-itold.obj: itold.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgnu_a_CFLAGS) $(CFLAGS) -MT libgnu_a-itold.obj -MD -MP -MF $(DEPDIR)/libgnu_a-itold.Tpo -c -o libgnu_a-itold.obj `if test -f 'itold.c'; then $(CYGPATH_W) 'itold.c'; else $(CYGPATH_W) '$(srcdir)/itold.c'; fi` -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libgnu_a-itold.Tpo $(DEPDIR)/libgnu_a-itold.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='itold.c' object='libgnu_a-itold.obj' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgnu_a_CFLAGS) $(CFLAGS) -c -o libgnu_a-itold.obj `if test -f 'itold.c'; then $(CYGPATH_W) 'itold.c'; else $(CYGPATH_W) '$(srcdir)/itold.c'; fi` - -libgnu_a-free.o: free.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgnu_a_CFLAGS) $(CFLAGS) -MT libgnu_a-free.o -MD -MP -MF $(DEPDIR)/libgnu_a-free.Tpo -c -o libgnu_a-free.o `test -f 'free.c' || echo '$(srcdir)/'`free.c -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libgnu_a-free.Tpo $(DEPDIR)/libgnu_a-free.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='free.c' object='libgnu_a-free.o' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgnu_a_CFLAGS) $(CFLAGS) -c -o libgnu_a-free.o `test -f 'free.c' || echo '$(srcdir)/'`free.c - -libgnu_a-free.obj: free.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgnu_a_CFLAGS) $(CFLAGS) -MT libgnu_a-free.obj -MD -MP -MF $(DEPDIR)/libgnu_a-free.Tpo -c -o libgnu_a-free.obj `if test -f 'free.c'; then $(CYGPATH_W) 'free.c'; else $(CYGPATH_W) '$(srcdir)/free.c'; fi` -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libgnu_a-free.Tpo $(DEPDIR)/libgnu_a-free.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='free.c' object='libgnu_a-free.obj' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgnu_a_CFLAGS) $(CFLAGS) -c -o libgnu_a-free.obj `if test -f 'free.c'; then $(CYGPATH_W) 'free.c'; else $(CYGPATH_W) '$(srcdir)/free.c'; fi` - -libgnu_a-fseterr.o: fseterr.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgnu_a_CFLAGS) $(CFLAGS) -MT libgnu_a-fseterr.o -MD -MP -MF $(DEPDIR)/libgnu_a-fseterr.Tpo -c -o libgnu_a-fseterr.o `test -f 'fseterr.c' || echo '$(srcdir)/'`fseterr.c -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libgnu_a-fseterr.Tpo $(DEPDIR)/libgnu_a-fseterr.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='fseterr.c' object='libgnu_a-fseterr.o' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgnu_a_CFLAGS) $(CFLAGS) -c -o libgnu_a-fseterr.o `test -f 'fseterr.c' || echo '$(srcdir)/'`fseterr.c - -libgnu_a-fseterr.obj: fseterr.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgnu_a_CFLAGS) $(CFLAGS) -MT libgnu_a-fseterr.obj -MD -MP -MF $(DEPDIR)/libgnu_a-fseterr.Tpo -c -o libgnu_a-fseterr.obj `if test -f 'fseterr.c'; then $(CYGPATH_W) 'fseterr.c'; else $(CYGPATH_W) '$(srcdir)/fseterr.c'; fi` -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libgnu_a-fseterr.Tpo $(DEPDIR)/libgnu_a-fseterr.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='fseterr.c' object='libgnu_a-fseterr.obj' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgnu_a_CFLAGS) $(CFLAGS) -c -o libgnu_a-fseterr.obj `if test -f 'fseterr.c'; then $(CYGPATH_W) 'fseterr.c'; else $(CYGPATH_W) '$(srcdir)/fseterr.c'; fi` - -libgnu_a-fstat.o: fstat.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgnu_a_CFLAGS) $(CFLAGS) -MT libgnu_a-fstat.o -MD -MP -MF $(DEPDIR)/libgnu_a-fstat.Tpo -c -o libgnu_a-fstat.o `test -f 'fstat.c' || echo '$(srcdir)/'`fstat.c -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libgnu_a-fstat.Tpo $(DEPDIR)/libgnu_a-fstat.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='fstat.c' object='libgnu_a-fstat.o' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgnu_a_CFLAGS) $(CFLAGS) -c -o libgnu_a-fstat.o `test -f 'fstat.c' || echo '$(srcdir)/'`fstat.c - -libgnu_a-fstat.obj: fstat.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgnu_a_CFLAGS) $(CFLAGS) -MT libgnu_a-fstat.obj -MD -MP -MF $(DEPDIR)/libgnu_a-fstat.Tpo -c -o libgnu_a-fstat.obj `if test -f 'fstat.c'; then $(CYGPATH_W) 'fstat.c'; else $(CYGPATH_W) '$(srcdir)/fstat.c'; fi` -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libgnu_a-fstat.Tpo $(DEPDIR)/libgnu_a-fstat.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='fstat.c' object='libgnu_a-fstat.obj' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgnu_a_CFLAGS) $(CFLAGS) -c -o libgnu_a-fstat.obj `if test -f 'fstat.c'; then $(CYGPATH_W) 'fstat.c'; else $(CYGPATH_W) '$(srcdir)/fstat.c'; fi` - -libgnu_a-getdtablesize.o: getdtablesize.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgnu_a_CFLAGS) $(CFLAGS) -MT libgnu_a-getdtablesize.o -MD -MP -MF $(DEPDIR)/libgnu_a-getdtablesize.Tpo -c -o libgnu_a-getdtablesize.o `test -f 'getdtablesize.c' || echo '$(srcdir)/'`getdtablesize.c -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libgnu_a-getdtablesize.Tpo $(DEPDIR)/libgnu_a-getdtablesize.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='getdtablesize.c' object='libgnu_a-getdtablesize.o' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgnu_a_CFLAGS) $(CFLAGS) -c -o libgnu_a-getdtablesize.o `test -f 'getdtablesize.c' || echo '$(srcdir)/'`getdtablesize.c - -libgnu_a-getdtablesize.obj: getdtablesize.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgnu_a_CFLAGS) $(CFLAGS) -MT libgnu_a-getdtablesize.obj -MD -MP -MF $(DEPDIR)/libgnu_a-getdtablesize.Tpo -c -o libgnu_a-getdtablesize.obj `if test -f 'getdtablesize.c'; then $(CYGPATH_W) 'getdtablesize.c'; else $(CYGPATH_W) '$(srcdir)/getdtablesize.c'; fi` -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libgnu_a-getdtablesize.Tpo $(DEPDIR)/libgnu_a-getdtablesize.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='getdtablesize.c' object='libgnu_a-getdtablesize.obj' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgnu_a_CFLAGS) $(CFLAGS) -c -o libgnu_a-getdtablesize.obj `if test -f 'getdtablesize.c'; then $(CYGPATH_W) 'getdtablesize.c'; else $(CYGPATH_W) '$(srcdir)/getdtablesize.c'; fi` - -libgnu_a-getopt.o: getopt.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgnu_a_CFLAGS) $(CFLAGS) -MT libgnu_a-getopt.o -MD -MP -MF $(DEPDIR)/libgnu_a-getopt.Tpo -c -o libgnu_a-getopt.o `test -f 'getopt.c' || echo '$(srcdir)/'`getopt.c -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libgnu_a-getopt.Tpo $(DEPDIR)/libgnu_a-getopt.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='getopt.c' object='libgnu_a-getopt.o' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgnu_a_CFLAGS) $(CFLAGS) -c -o libgnu_a-getopt.o `test -f 'getopt.c' || echo '$(srcdir)/'`getopt.c - -libgnu_a-getopt.obj: getopt.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgnu_a_CFLAGS) $(CFLAGS) -MT libgnu_a-getopt.obj -MD -MP -MF $(DEPDIR)/libgnu_a-getopt.Tpo -c -o libgnu_a-getopt.obj `if test -f 'getopt.c'; then $(CYGPATH_W) 'getopt.c'; else $(CYGPATH_W) '$(srcdir)/getopt.c'; fi` -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libgnu_a-getopt.Tpo $(DEPDIR)/libgnu_a-getopt.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='getopt.c' object='libgnu_a-getopt.obj' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgnu_a_CFLAGS) $(CFLAGS) -c -o libgnu_a-getopt.obj `if test -f 'getopt.c'; then $(CYGPATH_W) 'getopt.c'; else $(CYGPATH_W) '$(srcdir)/getopt.c'; fi` - -libgnu_a-getopt1.o: getopt1.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgnu_a_CFLAGS) $(CFLAGS) -MT libgnu_a-getopt1.o -MD -MP -MF $(DEPDIR)/libgnu_a-getopt1.Tpo -c -o libgnu_a-getopt1.o `test -f 'getopt1.c' || echo '$(srcdir)/'`getopt1.c -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libgnu_a-getopt1.Tpo $(DEPDIR)/libgnu_a-getopt1.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='getopt1.c' object='libgnu_a-getopt1.o' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgnu_a_CFLAGS) $(CFLAGS) -c -o libgnu_a-getopt1.o `test -f 'getopt1.c' || echo '$(srcdir)/'`getopt1.c - -libgnu_a-getopt1.obj: getopt1.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgnu_a_CFLAGS) $(CFLAGS) -MT libgnu_a-getopt1.obj -MD -MP -MF $(DEPDIR)/libgnu_a-getopt1.Tpo -c -o libgnu_a-getopt1.obj `if test -f 'getopt1.c'; then $(CYGPATH_W) 'getopt1.c'; else $(CYGPATH_W) '$(srcdir)/getopt1.c'; fi` -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libgnu_a-getopt1.Tpo $(DEPDIR)/libgnu_a-getopt1.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='getopt1.c' object='libgnu_a-getopt1.obj' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgnu_a_CFLAGS) $(CFLAGS) -c -o libgnu_a-getopt1.obj `if test -f 'getopt1.c'; then $(CYGPATH_W) 'getopt1.c'; else $(CYGPATH_W) '$(srcdir)/getopt1.c'; fi` - -libgnu_a-getprogname.o: getprogname.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgnu_a_CFLAGS) $(CFLAGS) -MT libgnu_a-getprogname.o -MD -MP -MF $(DEPDIR)/libgnu_a-getprogname.Tpo -c -o libgnu_a-getprogname.o `test -f 'getprogname.c' || echo '$(srcdir)/'`getprogname.c -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libgnu_a-getprogname.Tpo $(DEPDIR)/libgnu_a-getprogname.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='getprogname.c' object='libgnu_a-getprogname.o' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgnu_a_CFLAGS) $(CFLAGS) -c -o libgnu_a-getprogname.o `test -f 'getprogname.c' || echo '$(srcdir)/'`getprogname.c - -libgnu_a-getprogname.obj: getprogname.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgnu_a_CFLAGS) $(CFLAGS) -MT libgnu_a-getprogname.obj -MD -MP -MF $(DEPDIR)/libgnu_a-getprogname.Tpo -c -o libgnu_a-getprogname.obj `if test -f 'getprogname.c'; then $(CYGPATH_W) 'getprogname.c'; else $(CYGPATH_W) '$(srcdir)/getprogname.c'; fi` -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libgnu_a-getprogname.Tpo $(DEPDIR)/libgnu_a-getprogname.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='getprogname.c' object='libgnu_a-getprogname.obj' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgnu_a_CFLAGS) $(CFLAGS) -c -o libgnu_a-getprogname.obj `if test -f 'getprogname.c'; then $(CYGPATH_W) 'getprogname.c'; else $(CYGPATH_W) '$(srcdir)/getprogname.c'; fi` - -malloc/libgnu_a-scratch_buffer_grow.o: malloc/scratch_buffer_grow.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgnu_a_CFLAGS) $(CFLAGS) -MT malloc/libgnu_a-scratch_buffer_grow.o -MD -MP -MF malloc/$(DEPDIR)/libgnu_a-scratch_buffer_grow.Tpo -c -o malloc/libgnu_a-scratch_buffer_grow.o `test -f 'malloc/scratch_buffer_grow.c' || echo '$(srcdir)/'`malloc/scratch_buffer_grow.c -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) malloc/$(DEPDIR)/libgnu_a-scratch_buffer_grow.Tpo malloc/$(DEPDIR)/libgnu_a-scratch_buffer_grow.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='malloc/scratch_buffer_grow.c' object='malloc/libgnu_a-scratch_buffer_grow.o' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgnu_a_CFLAGS) $(CFLAGS) -c -o malloc/libgnu_a-scratch_buffer_grow.o `test -f 'malloc/scratch_buffer_grow.c' || echo '$(srcdir)/'`malloc/scratch_buffer_grow.c - -malloc/libgnu_a-scratch_buffer_grow.obj: malloc/scratch_buffer_grow.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgnu_a_CFLAGS) $(CFLAGS) -MT malloc/libgnu_a-scratch_buffer_grow.obj -MD -MP -MF malloc/$(DEPDIR)/libgnu_a-scratch_buffer_grow.Tpo -c -o malloc/libgnu_a-scratch_buffer_grow.obj `if test -f 'malloc/scratch_buffer_grow.c'; then $(CYGPATH_W) 'malloc/scratch_buffer_grow.c'; else $(CYGPATH_W) '$(srcdir)/malloc/scratch_buffer_grow.c'; fi` -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) malloc/$(DEPDIR)/libgnu_a-scratch_buffer_grow.Tpo malloc/$(DEPDIR)/libgnu_a-scratch_buffer_grow.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='malloc/scratch_buffer_grow.c' object='malloc/libgnu_a-scratch_buffer_grow.obj' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgnu_a_CFLAGS) $(CFLAGS) -c -o malloc/libgnu_a-scratch_buffer_grow.obj `if test -f 'malloc/scratch_buffer_grow.c'; then $(CYGPATH_W) 'malloc/scratch_buffer_grow.c'; else $(CYGPATH_W) '$(srcdir)/malloc/scratch_buffer_grow.c'; fi` - -malloc/libgnu_a-scratch_buffer_grow_preserve.o: malloc/scratch_buffer_grow_preserve.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgnu_a_CFLAGS) $(CFLAGS) -MT malloc/libgnu_a-scratch_buffer_grow_preserve.o -MD -MP -MF malloc/$(DEPDIR)/libgnu_a-scratch_buffer_grow_preserve.Tpo -c -o malloc/libgnu_a-scratch_buffer_grow_preserve.o `test -f 'malloc/scratch_buffer_grow_preserve.c' || echo '$(srcdir)/'`malloc/scratch_buffer_grow_preserve.c -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) malloc/$(DEPDIR)/libgnu_a-scratch_buffer_grow_preserve.Tpo malloc/$(DEPDIR)/libgnu_a-scratch_buffer_grow_preserve.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='malloc/scratch_buffer_grow_preserve.c' object='malloc/libgnu_a-scratch_buffer_grow_preserve.o' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgnu_a_CFLAGS) $(CFLAGS) -c -o malloc/libgnu_a-scratch_buffer_grow_preserve.o `test -f 'malloc/scratch_buffer_grow_preserve.c' || echo '$(srcdir)/'`malloc/scratch_buffer_grow_preserve.c - -malloc/libgnu_a-scratch_buffer_grow_preserve.obj: malloc/scratch_buffer_grow_preserve.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgnu_a_CFLAGS) $(CFLAGS) -MT malloc/libgnu_a-scratch_buffer_grow_preserve.obj -MD -MP -MF malloc/$(DEPDIR)/libgnu_a-scratch_buffer_grow_preserve.Tpo -c -o malloc/libgnu_a-scratch_buffer_grow_preserve.obj `if test -f 'malloc/scratch_buffer_grow_preserve.c'; then $(CYGPATH_W) 'malloc/scratch_buffer_grow_preserve.c'; else $(CYGPATH_W) '$(srcdir)/malloc/scratch_buffer_grow_preserve.c'; fi` -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) malloc/$(DEPDIR)/libgnu_a-scratch_buffer_grow_preserve.Tpo malloc/$(DEPDIR)/libgnu_a-scratch_buffer_grow_preserve.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='malloc/scratch_buffer_grow_preserve.c' object='malloc/libgnu_a-scratch_buffer_grow_preserve.obj' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgnu_a_CFLAGS) $(CFLAGS) -c -o malloc/libgnu_a-scratch_buffer_grow_preserve.obj `if test -f 'malloc/scratch_buffer_grow_preserve.c'; then $(CYGPATH_W) 'malloc/scratch_buffer_grow_preserve.c'; else $(CYGPATH_W) '$(srcdir)/malloc/scratch_buffer_grow_preserve.c'; fi` - -malloc/libgnu_a-scratch_buffer_set_array_size.o: malloc/scratch_buffer_set_array_size.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgnu_a_CFLAGS) $(CFLAGS) -MT malloc/libgnu_a-scratch_buffer_set_array_size.o -MD -MP -MF malloc/$(DEPDIR)/libgnu_a-scratch_buffer_set_array_size.Tpo -c -o malloc/libgnu_a-scratch_buffer_set_array_size.o `test -f 'malloc/scratch_buffer_set_array_size.c' || echo '$(srcdir)/'`malloc/scratch_buffer_set_array_size.c -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) malloc/$(DEPDIR)/libgnu_a-scratch_buffer_set_array_size.Tpo malloc/$(DEPDIR)/libgnu_a-scratch_buffer_set_array_size.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='malloc/scratch_buffer_set_array_size.c' object='malloc/libgnu_a-scratch_buffer_set_array_size.o' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgnu_a_CFLAGS) $(CFLAGS) -c -o malloc/libgnu_a-scratch_buffer_set_array_size.o `test -f 'malloc/scratch_buffer_set_array_size.c' || echo '$(srcdir)/'`malloc/scratch_buffer_set_array_size.c - -malloc/libgnu_a-scratch_buffer_set_array_size.obj: malloc/scratch_buffer_set_array_size.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgnu_a_CFLAGS) $(CFLAGS) -MT malloc/libgnu_a-scratch_buffer_set_array_size.obj -MD -MP -MF malloc/$(DEPDIR)/libgnu_a-scratch_buffer_set_array_size.Tpo -c -o malloc/libgnu_a-scratch_buffer_set_array_size.obj `if test -f 'malloc/scratch_buffer_set_array_size.c'; then $(CYGPATH_W) 'malloc/scratch_buffer_set_array_size.c'; else $(CYGPATH_W) '$(srcdir)/malloc/scratch_buffer_set_array_size.c'; fi` -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) malloc/$(DEPDIR)/libgnu_a-scratch_buffer_set_array_size.Tpo malloc/$(DEPDIR)/libgnu_a-scratch_buffer_set_array_size.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='malloc/scratch_buffer_set_array_size.c' object='malloc/libgnu_a-scratch_buffer_set_array_size.obj' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgnu_a_CFLAGS) $(CFLAGS) -c -o malloc/libgnu_a-scratch_buffer_set_array_size.obj `if test -f 'malloc/scratch_buffer_set_array_size.c'; then $(CYGPATH_W) 'malloc/scratch_buffer_set_array_size.c'; else $(CYGPATH_W) '$(srcdir)/malloc/scratch_buffer_set_array_size.c'; fi` - -libgnu_a-ialloc.o: ialloc.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgnu_a_CFLAGS) $(CFLAGS) -MT libgnu_a-ialloc.o -MD -MP -MF $(DEPDIR)/libgnu_a-ialloc.Tpo -c -o libgnu_a-ialloc.o `test -f 'ialloc.c' || echo '$(srcdir)/'`ialloc.c -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libgnu_a-ialloc.Tpo $(DEPDIR)/libgnu_a-ialloc.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='ialloc.c' object='libgnu_a-ialloc.o' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgnu_a_CFLAGS) $(CFLAGS) -c -o libgnu_a-ialloc.o `test -f 'ialloc.c' || echo '$(srcdir)/'`ialloc.c - -libgnu_a-ialloc.obj: ialloc.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgnu_a_CFLAGS) $(CFLAGS) -MT libgnu_a-ialloc.obj -MD -MP -MF $(DEPDIR)/libgnu_a-ialloc.Tpo -c -o libgnu_a-ialloc.obj `if test -f 'ialloc.c'; then $(CYGPATH_W) 'ialloc.c'; else $(CYGPATH_W) '$(srcdir)/ialloc.c'; fi` -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libgnu_a-ialloc.Tpo $(DEPDIR)/libgnu_a-ialloc.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='ialloc.c' object='libgnu_a-ialloc.obj' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgnu_a_CFLAGS) $(CFLAGS) -c -o libgnu_a-ialloc.obj `if test -f 'ialloc.c'; then $(CYGPATH_W) 'ialloc.c'; else $(CYGPATH_W) '$(srcdir)/ialloc.c'; fi` - -libgnu_a-link.o: link.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgnu_a_CFLAGS) $(CFLAGS) -MT libgnu_a-link.o -MD -MP -MF $(DEPDIR)/libgnu_a-link.Tpo -c -o libgnu_a-link.o `test -f 'link.c' || echo '$(srcdir)/'`link.c -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libgnu_a-link.Tpo $(DEPDIR)/libgnu_a-link.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='link.c' object='libgnu_a-link.o' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgnu_a_CFLAGS) $(CFLAGS) -c -o libgnu_a-link.o `test -f 'link.c' || echo '$(srcdir)/'`link.c - -libgnu_a-link.obj: link.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgnu_a_CFLAGS) $(CFLAGS) -MT libgnu_a-link.obj -MD -MP -MF $(DEPDIR)/libgnu_a-link.Tpo -c -o libgnu_a-link.obj `if test -f 'link.c'; then $(CYGPATH_W) 'link.c'; else $(CYGPATH_W) '$(srcdir)/link.c'; fi` -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libgnu_a-link.Tpo $(DEPDIR)/libgnu_a-link.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='link.c' object='libgnu_a-link.obj' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgnu_a_CFLAGS) $(CFLAGS) -c -o libgnu_a-link.obj `if test -f 'link.c'; then $(CYGPATH_W) 'link.c'; else $(CYGPATH_W) '$(srcdir)/link.c'; fi` - -libgnu_a-lseek.o: lseek.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgnu_a_CFLAGS) $(CFLAGS) -MT libgnu_a-lseek.o -MD -MP -MF $(DEPDIR)/libgnu_a-lseek.Tpo -c -o libgnu_a-lseek.o `test -f 'lseek.c' || echo '$(srcdir)/'`lseek.c -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libgnu_a-lseek.Tpo $(DEPDIR)/libgnu_a-lseek.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='lseek.c' object='libgnu_a-lseek.o' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgnu_a_CFLAGS) $(CFLAGS) -c -o libgnu_a-lseek.o `test -f 'lseek.c' || echo '$(srcdir)/'`lseek.c - -libgnu_a-lseek.obj: lseek.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgnu_a_CFLAGS) $(CFLAGS) -MT libgnu_a-lseek.obj -MD -MP -MF $(DEPDIR)/libgnu_a-lseek.Tpo -c -o libgnu_a-lseek.obj `if test -f 'lseek.c'; then $(CYGPATH_W) 'lseek.c'; else $(CYGPATH_W) '$(srcdir)/lseek.c'; fi` -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libgnu_a-lseek.Tpo $(DEPDIR)/libgnu_a-lseek.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='lseek.c' object='libgnu_a-lseek.obj' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgnu_a_CFLAGS) $(CFLAGS) -c -o libgnu_a-lseek.obj `if test -f 'lseek.c'; then $(CYGPATH_W) 'lseek.c'; else $(CYGPATH_W) '$(srcdir)/lseek.c'; fi` - -libgnu_a-lstat.o: lstat.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgnu_a_CFLAGS) $(CFLAGS) -MT libgnu_a-lstat.o -MD -MP -MF $(DEPDIR)/libgnu_a-lstat.Tpo -c -o libgnu_a-lstat.o `test -f 'lstat.c' || echo '$(srcdir)/'`lstat.c -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libgnu_a-lstat.Tpo $(DEPDIR)/libgnu_a-lstat.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='lstat.c' object='libgnu_a-lstat.o' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgnu_a_CFLAGS) $(CFLAGS) -c -o libgnu_a-lstat.o `test -f 'lstat.c' || echo '$(srcdir)/'`lstat.c - -libgnu_a-lstat.obj: lstat.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgnu_a_CFLAGS) $(CFLAGS) -MT libgnu_a-lstat.obj -MD -MP -MF $(DEPDIR)/libgnu_a-lstat.Tpo -c -o libgnu_a-lstat.obj `if test -f 'lstat.c'; then $(CYGPATH_W) 'lstat.c'; else $(CYGPATH_W) '$(srcdir)/lstat.c'; fi` -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libgnu_a-lstat.Tpo $(DEPDIR)/libgnu_a-lstat.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='lstat.c' object='libgnu_a-lstat.obj' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgnu_a_CFLAGS) $(CFLAGS) -c -o libgnu_a-lstat.obj `if test -f 'lstat.c'; then $(CYGPATH_W) 'lstat.c'; else $(CYGPATH_W) '$(srcdir)/lstat.c'; fi` - -libgnu_a-malloca.o: malloca.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgnu_a_CFLAGS) $(CFLAGS) -MT libgnu_a-malloca.o -MD -MP -MF $(DEPDIR)/libgnu_a-malloca.Tpo -c -o libgnu_a-malloca.o `test -f 'malloca.c' || echo '$(srcdir)/'`malloca.c -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libgnu_a-malloca.Tpo $(DEPDIR)/libgnu_a-malloca.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='malloca.c' object='libgnu_a-malloca.o' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgnu_a_CFLAGS) $(CFLAGS) -c -o libgnu_a-malloca.o `test -f 'malloca.c' || echo '$(srcdir)/'`malloca.c - -libgnu_a-malloca.obj: malloca.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgnu_a_CFLAGS) $(CFLAGS) -MT libgnu_a-malloca.obj -MD -MP -MF $(DEPDIR)/libgnu_a-malloca.Tpo -c -o libgnu_a-malloca.obj `if test -f 'malloca.c'; then $(CYGPATH_W) 'malloca.c'; else $(CYGPATH_W) '$(srcdir)/malloca.c'; fi` -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libgnu_a-malloca.Tpo $(DEPDIR)/libgnu_a-malloca.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='malloca.c' object='libgnu_a-malloca.obj' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgnu_a_CFLAGS) $(CFLAGS) -c -o libgnu_a-malloca.obj `if test -f 'malloca.c'; then $(CYGPATH_W) 'malloca.c'; else $(CYGPATH_W) '$(srcdir)/malloca.c'; fi` - -libgnu_a-math.o: math.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgnu_a_CFLAGS) $(CFLAGS) -MT libgnu_a-math.o -MD -MP -MF $(DEPDIR)/libgnu_a-math.Tpo -c -o libgnu_a-math.o `test -f 'math.c' || echo '$(srcdir)/'`math.c -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libgnu_a-math.Tpo $(DEPDIR)/libgnu_a-math.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='math.c' object='libgnu_a-math.o' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgnu_a_CFLAGS) $(CFLAGS) -c -o libgnu_a-math.o `test -f 'math.c' || echo '$(srcdir)/'`math.c - -libgnu_a-math.obj: math.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgnu_a_CFLAGS) $(CFLAGS) -MT libgnu_a-math.obj -MD -MP -MF $(DEPDIR)/libgnu_a-math.Tpo -c -o libgnu_a-math.obj `if test -f 'math.c'; then $(CYGPATH_W) 'math.c'; else $(CYGPATH_W) '$(srcdir)/math.c'; fi` -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libgnu_a-math.Tpo $(DEPDIR)/libgnu_a-math.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='math.c' object='libgnu_a-math.obj' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgnu_a_CFLAGS) $(CFLAGS) -c -o libgnu_a-math.obj `if test -f 'math.c'; then $(CYGPATH_W) 'math.c'; else $(CYGPATH_W) '$(srcdir)/math.c'; fi` - -libgnu_a-memchr.o: memchr.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgnu_a_CFLAGS) $(CFLAGS) -MT libgnu_a-memchr.o -MD -MP -MF $(DEPDIR)/libgnu_a-memchr.Tpo -c -o libgnu_a-memchr.o `test -f 'memchr.c' || echo '$(srcdir)/'`memchr.c -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libgnu_a-memchr.Tpo $(DEPDIR)/libgnu_a-memchr.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='memchr.c' object='libgnu_a-memchr.o' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgnu_a_CFLAGS) $(CFLAGS) -c -o libgnu_a-memchr.o `test -f 'memchr.c' || echo '$(srcdir)/'`memchr.c - -libgnu_a-memchr.obj: memchr.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgnu_a_CFLAGS) $(CFLAGS) -MT libgnu_a-memchr.obj -MD -MP -MF $(DEPDIR)/libgnu_a-memchr.Tpo -c -o libgnu_a-memchr.obj `if test -f 'memchr.c'; then $(CYGPATH_W) 'memchr.c'; else $(CYGPATH_W) '$(srcdir)/memchr.c'; fi` -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libgnu_a-memchr.Tpo $(DEPDIR)/libgnu_a-memchr.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='memchr.c' object='libgnu_a-memchr.obj' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgnu_a_CFLAGS) $(CFLAGS) -c -o libgnu_a-memchr.obj `if test -f 'memchr.c'; then $(CYGPATH_W) 'memchr.c'; else $(CYGPATH_W) '$(srcdir)/memchr.c'; fi` - -libgnu_a-mempcpy.o: mempcpy.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgnu_a_CFLAGS) $(CFLAGS) -MT libgnu_a-mempcpy.o -MD -MP -MF $(DEPDIR)/libgnu_a-mempcpy.Tpo -c -o libgnu_a-mempcpy.o `test -f 'mempcpy.c' || echo '$(srcdir)/'`mempcpy.c -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libgnu_a-mempcpy.Tpo $(DEPDIR)/libgnu_a-mempcpy.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='mempcpy.c' object='libgnu_a-mempcpy.o' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgnu_a_CFLAGS) $(CFLAGS) -c -o libgnu_a-mempcpy.o `test -f 'mempcpy.c' || echo '$(srcdir)/'`mempcpy.c - -libgnu_a-mempcpy.obj: mempcpy.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgnu_a_CFLAGS) $(CFLAGS) -MT libgnu_a-mempcpy.obj -MD -MP -MF $(DEPDIR)/libgnu_a-mempcpy.Tpo -c -o libgnu_a-mempcpy.obj `if test -f 'mempcpy.c'; then $(CYGPATH_W) 'mempcpy.c'; else $(CYGPATH_W) '$(srcdir)/mempcpy.c'; fi` -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libgnu_a-mempcpy.Tpo $(DEPDIR)/libgnu_a-mempcpy.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='mempcpy.c' object='libgnu_a-mempcpy.obj' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgnu_a_CFLAGS) $(CFLAGS) -c -o libgnu_a-mempcpy.obj `if test -f 'mempcpy.c'; then $(CYGPATH_W) 'mempcpy.c'; else $(CYGPATH_W) '$(srcdir)/mempcpy.c'; fi` - -libgnu_a-msvc-inval.o: msvc-inval.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgnu_a_CFLAGS) $(CFLAGS) -MT libgnu_a-msvc-inval.o -MD -MP -MF $(DEPDIR)/libgnu_a-msvc-inval.Tpo -c -o libgnu_a-msvc-inval.o `test -f 'msvc-inval.c' || echo '$(srcdir)/'`msvc-inval.c -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libgnu_a-msvc-inval.Tpo $(DEPDIR)/libgnu_a-msvc-inval.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='msvc-inval.c' object='libgnu_a-msvc-inval.o' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgnu_a_CFLAGS) $(CFLAGS) -c -o libgnu_a-msvc-inval.o `test -f 'msvc-inval.c' || echo '$(srcdir)/'`msvc-inval.c - -libgnu_a-msvc-inval.obj: msvc-inval.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgnu_a_CFLAGS) $(CFLAGS) -MT libgnu_a-msvc-inval.obj -MD -MP -MF $(DEPDIR)/libgnu_a-msvc-inval.Tpo -c -o libgnu_a-msvc-inval.obj `if test -f 'msvc-inval.c'; then $(CYGPATH_W) 'msvc-inval.c'; else $(CYGPATH_W) '$(srcdir)/msvc-inval.c'; fi` -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libgnu_a-msvc-inval.Tpo $(DEPDIR)/libgnu_a-msvc-inval.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='msvc-inval.c' object='libgnu_a-msvc-inval.obj' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgnu_a_CFLAGS) $(CFLAGS) -c -o libgnu_a-msvc-inval.obj `if test -f 'msvc-inval.c'; then $(CYGPATH_W) 'msvc-inval.c'; else $(CYGPATH_W) '$(srcdir)/msvc-inval.c'; fi` - -libgnu_a-msvc-nothrow.o: msvc-nothrow.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgnu_a_CFLAGS) $(CFLAGS) -MT libgnu_a-msvc-nothrow.o -MD -MP -MF $(DEPDIR)/libgnu_a-msvc-nothrow.Tpo -c -o libgnu_a-msvc-nothrow.o `test -f 'msvc-nothrow.c' || echo '$(srcdir)/'`msvc-nothrow.c -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libgnu_a-msvc-nothrow.Tpo $(DEPDIR)/libgnu_a-msvc-nothrow.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='msvc-nothrow.c' object='libgnu_a-msvc-nothrow.o' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgnu_a_CFLAGS) $(CFLAGS) -c -o libgnu_a-msvc-nothrow.o `test -f 'msvc-nothrow.c' || echo '$(srcdir)/'`msvc-nothrow.c - -libgnu_a-msvc-nothrow.obj: msvc-nothrow.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgnu_a_CFLAGS) $(CFLAGS) -MT libgnu_a-msvc-nothrow.obj -MD -MP -MF $(DEPDIR)/libgnu_a-msvc-nothrow.Tpo -c -o libgnu_a-msvc-nothrow.obj `if test -f 'msvc-nothrow.c'; then $(CYGPATH_W) 'msvc-nothrow.c'; else $(CYGPATH_W) '$(srcdir)/msvc-nothrow.c'; fi` -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libgnu_a-msvc-nothrow.Tpo $(DEPDIR)/libgnu_a-msvc-nothrow.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='msvc-nothrow.c' object='libgnu_a-msvc-nothrow.obj' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgnu_a_CFLAGS) $(CFLAGS) -c -o libgnu_a-msvc-nothrow.obj `if test -f 'msvc-nothrow.c'; then $(CYGPATH_W) 'msvc-nothrow.c'; else $(CYGPATH_W) '$(srcdir)/msvc-nothrow.c'; fi` - -libgnu_a-open.o: open.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgnu_a_CFLAGS) $(CFLAGS) -MT libgnu_a-open.o -MD -MP -MF $(DEPDIR)/libgnu_a-open.Tpo -c -o libgnu_a-open.o `test -f 'open.c' || echo '$(srcdir)/'`open.c -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libgnu_a-open.Tpo $(DEPDIR)/libgnu_a-open.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='open.c' object='libgnu_a-open.o' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgnu_a_CFLAGS) $(CFLAGS) -c -o libgnu_a-open.o `test -f 'open.c' || echo '$(srcdir)/'`open.c - -libgnu_a-open.obj: open.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgnu_a_CFLAGS) $(CFLAGS) -MT libgnu_a-open.obj -MD -MP -MF $(DEPDIR)/libgnu_a-open.Tpo -c -o libgnu_a-open.obj `if test -f 'open.c'; then $(CYGPATH_W) 'open.c'; else $(CYGPATH_W) '$(srcdir)/open.c'; fi` -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libgnu_a-open.Tpo $(DEPDIR)/libgnu_a-open.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='open.c' object='libgnu_a-open.obj' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgnu_a_CFLAGS) $(CFLAGS) -c -o libgnu_a-open.obj `if test -f 'open.c'; then $(CYGPATH_W) 'open.c'; else $(CYGPATH_W) '$(srcdir)/open.c'; fi` - -libgnu_a-printf-frexp.o: printf-frexp.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgnu_a_CFLAGS) $(CFLAGS) -MT libgnu_a-printf-frexp.o -MD -MP -MF $(DEPDIR)/libgnu_a-printf-frexp.Tpo -c -o libgnu_a-printf-frexp.o `test -f 'printf-frexp.c' || echo '$(srcdir)/'`printf-frexp.c -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libgnu_a-printf-frexp.Tpo $(DEPDIR)/libgnu_a-printf-frexp.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='printf-frexp.c' object='libgnu_a-printf-frexp.o' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgnu_a_CFLAGS) $(CFLAGS) -c -o libgnu_a-printf-frexp.o `test -f 'printf-frexp.c' || echo '$(srcdir)/'`printf-frexp.c - -libgnu_a-printf-frexp.obj: printf-frexp.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgnu_a_CFLAGS) $(CFLAGS) -MT libgnu_a-printf-frexp.obj -MD -MP -MF $(DEPDIR)/libgnu_a-printf-frexp.Tpo -c -o libgnu_a-printf-frexp.obj `if test -f 'printf-frexp.c'; then $(CYGPATH_W) 'printf-frexp.c'; else $(CYGPATH_W) '$(srcdir)/printf-frexp.c'; fi` -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libgnu_a-printf-frexp.Tpo $(DEPDIR)/libgnu_a-printf-frexp.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='printf-frexp.c' object='libgnu_a-printf-frexp.obj' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgnu_a_CFLAGS) $(CFLAGS) -c -o libgnu_a-printf-frexp.obj `if test -f 'printf-frexp.c'; then $(CYGPATH_W) 'printf-frexp.c'; else $(CYGPATH_W) '$(srcdir)/printf-frexp.c'; fi` - -libgnu_a-printf-frexpl.o: printf-frexpl.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgnu_a_CFLAGS) $(CFLAGS) -MT libgnu_a-printf-frexpl.o -MD -MP -MF $(DEPDIR)/libgnu_a-printf-frexpl.Tpo -c -o libgnu_a-printf-frexpl.o `test -f 'printf-frexpl.c' || echo '$(srcdir)/'`printf-frexpl.c -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libgnu_a-printf-frexpl.Tpo $(DEPDIR)/libgnu_a-printf-frexpl.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='printf-frexpl.c' object='libgnu_a-printf-frexpl.o' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgnu_a_CFLAGS) $(CFLAGS) -c -o libgnu_a-printf-frexpl.o `test -f 'printf-frexpl.c' || echo '$(srcdir)/'`printf-frexpl.c - -libgnu_a-printf-frexpl.obj: printf-frexpl.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgnu_a_CFLAGS) $(CFLAGS) -MT libgnu_a-printf-frexpl.obj -MD -MP -MF $(DEPDIR)/libgnu_a-printf-frexpl.Tpo -c -o libgnu_a-printf-frexpl.obj `if test -f 'printf-frexpl.c'; then $(CYGPATH_W) 'printf-frexpl.c'; else $(CYGPATH_W) '$(srcdir)/printf-frexpl.c'; fi` -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libgnu_a-printf-frexpl.Tpo $(DEPDIR)/libgnu_a-printf-frexpl.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='printf-frexpl.c' object='libgnu_a-printf-frexpl.obj' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgnu_a_CFLAGS) $(CFLAGS) -c -o libgnu_a-printf-frexpl.obj `if test -f 'printf-frexpl.c'; then $(CYGPATH_W) 'printf-frexpl.c'; else $(CYGPATH_W) '$(srcdir)/printf-frexpl.c'; fi` - -libgnu_a-progname.o: progname.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgnu_a_CFLAGS) $(CFLAGS) -MT libgnu_a-progname.o -MD -MP -MF $(DEPDIR)/libgnu_a-progname.Tpo -c -o libgnu_a-progname.o `test -f 'progname.c' || echo '$(srcdir)/'`progname.c -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libgnu_a-progname.Tpo $(DEPDIR)/libgnu_a-progname.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='progname.c' object='libgnu_a-progname.o' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgnu_a_CFLAGS) $(CFLAGS) -c -o libgnu_a-progname.o `test -f 'progname.c' || echo '$(srcdir)/'`progname.c - -libgnu_a-progname.obj: progname.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgnu_a_CFLAGS) $(CFLAGS) -MT libgnu_a-progname.obj -MD -MP -MF $(DEPDIR)/libgnu_a-progname.Tpo -c -o libgnu_a-progname.obj `if test -f 'progname.c'; then $(CYGPATH_W) 'progname.c'; else $(CYGPATH_W) '$(srcdir)/progname.c'; fi` -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libgnu_a-progname.Tpo $(DEPDIR)/libgnu_a-progname.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='progname.c' object='libgnu_a-progname.obj' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgnu_a_CFLAGS) $(CFLAGS) -c -o libgnu_a-progname.obj `if test -f 'progname.c'; then $(CYGPATH_W) 'progname.c'; else $(CYGPATH_W) '$(srcdir)/progname.c'; fi` - -libgnu_a-raise.o: raise.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgnu_a_CFLAGS) $(CFLAGS) -MT libgnu_a-raise.o -MD -MP -MF $(DEPDIR)/libgnu_a-raise.Tpo -c -o libgnu_a-raise.o `test -f 'raise.c' || echo '$(srcdir)/'`raise.c -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libgnu_a-raise.Tpo $(DEPDIR)/libgnu_a-raise.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='raise.c' object='libgnu_a-raise.o' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgnu_a_CFLAGS) $(CFLAGS) -c -o libgnu_a-raise.o `test -f 'raise.c' || echo '$(srcdir)/'`raise.c - -libgnu_a-raise.obj: raise.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgnu_a_CFLAGS) $(CFLAGS) -MT libgnu_a-raise.obj -MD -MP -MF $(DEPDIR)/libgnu_a-raise.Tpo -c -o libgnu_a-raise.obj `if test -f 'raise.c'; then $(CYGPATH_W) 'raise.c'; else $(CYGPATH_W) '$(srcdir)/raise.c'; fi` -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libgnu_a-raise.Tpo $(DEPDIR)/libgnu_a-raise.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='raise.c' object='libgnu_a-raise.obj' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgnu_a_CFLAGS) $(CFLAGS) -c -o libgnu_a-raise.obj `if test -f 'raise.c'; then $(CYGPATH_W) 'raise.c'; else $(CYGPATH_W) '$(srcdir)/raise.c'; fi` - -libgnu_a-rawmemchr.o: rawmemchr.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgnu_a_CFLAGS) $(CFLAGS) -MT libgnu_a-rawmemchr.o -MD -MP -MF $(DEPDIR)/libgnu_a-rawmemchr.Tpo -c -o libgnu_a-rawmemchr.o `test -f 'rawmemchr.c' || echo '$(srcdir)/'`rawmemchr.c -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libgnu_a-rawmemchr.Tpo $(DEPDIR)/libgnu_a-rawmemchr.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='rawmemchr.c' object='libgnu_a-rawmemchr.o' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgnu_a_CFLAGS) $(CFLAGS) -c -o libgnu_a-rawmemchr.o `test -f 'rawmemchr.c' || echo '$(srcdir)/'`rawmemchr.c - -libgnu_a-rawmemchr.obj: rawmemchr.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgnu_a_CFLAGS) $(CFLAGS) -MT libgnu_a-rawmemchr.obj -MD -MP -MF $(DEPDIR)/libgnu_a-rawmemchr.Tpo -c -o libgnu_a-rawmemchr.obj `if test -f 'rawmemchr.c'; then $(CYGPATH_W) 'rawmemchr.c'; else $(CYGPATH_W) '$(srcdir)/rawmemchr.c'; fi` -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libgnu_a-rawmemchr.Tpo $(DEPDIR)/libgnu_a-rawmemchr.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='rawmemchr.c' object='libgnu_a-rawmemchr.obj' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgnu_a_CFLAGS) $(CFLAGS) -c -o libgnu_a-rawmemchr.obj `if test -f 'rawmemchr.c'; then $(CYGPATH_W) 'rawmemchr.c'; else $(CYGPATH_W) '$(srcdir)/rawmemchr.c'; fi` - -libgnu_a-read.o: read.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgnu_a_CFLAGS) $(CFLAGS) -MT libgnu_a-read.o -MD -MP -MF $(DEPDIR)/libgnu_a-read.Tpo -c -o libgnu_a-read.o `test -f 'read.c' || echo '$(srcdir)/'`read.c -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libgnu_a-read.Tpo $(DEPDIR)/libgnu_a-read.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='read.c' object='libgnu_a-read.o' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgnu_a_CFLAGS) $(CFLAGS) -c -o libgnu_a-read.o `test -f 'read.c' || echo '$(srcdir)/'`read.c - -libgnu_a-read.obj: read.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgnu_a_CFLAGS) $(CFLAGS) -MT libgnu_a-read.obj -MD -MP -MF $(DEPDIR)/libgnu_a-read.Tpo -c -o libgnu_a-read.obj `if test -f 'read.c'; then $(CYGPATH_W) 'read.c'; else $(CYGPATH_W) '$(srcdir)/read.c'; fi` -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libgnu_a-read.Tpo $(DEPDIR)/libgnu_a-read.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='read.c' object='libgnu_a-read.obj' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgnu_a_CFLAGS) $(CFLAGS) -c -o libgnu_a-read.obj `if test -f 'read.c'; then $(CYGPATH_W) 'read.c'; else $(CYGPATH_W) '$(srcdir)/read.c'; fi` - -libgnu_a-readlink.o: readlink.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgnu_a_CFLAGS) $(CFLAGS) -MT libgnu_a-readlink.o -MD -MP -MF $(DEPDIR)/libgnu_a-readlink.Tpo -c -o libgnu_a-readlink.o `test -f 'readlink.c' || echo '$(srcdir)/'`readlink.c -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libgnu_a-readlink.Tpo $(DEPDIR)/libgnu_a-readlink.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='readlink.c' object='libgnu_a-readlink.o' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgnu_a_CFLAGS) $(CFLAGS) -c -o libgnu_a-readlink.o `test -f 'readlink.c' || echo '$(srcdir)/'`readlink.c - -libgnu_a-readlink.obj: readlink.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgnu_a_CFLAGS) $(CFLAGS) -MT libgnu_a-readlink.obj -MD -MP -MF $(DEPDIR)/libgnu_a-readlink.Tpo -c -o libgnu_a-readlink.obj `if test -f 'readlink.c'; then $(CYGPATH_W) 'readlink.c'; else $(CYGPATH_W) '$(srcdir)/readlink.c'; fi` -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libgnu_a-readlink.Tpo $(DEPDIR)/libgnu_a-readlink.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='readlink.c' object='libgnu_a-readlink.obj' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgnu_a_CFLAGS) $(CFLAGS) -c -o libgnu_a-readlink.obj `if test -f 'readlink.c'; then $(CYGPATH_W) 'readlink.c'; else $(CYGPATH_W) '$(srcdir)/readlink.c'; fi` - -libgnu_a-reallocarray.o: reallocarray.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgnu_a_CFLAGS) $(CFLAGS) -MT libgnu_a-reallocarray.o -MD -MP -MF $(DEPDIR)/libgnu_a-reallocarray.Tpo -c -o libgnu_a-reallocarray.o `test -f 'reallocarray.c' || echo '$(srcdir)/'`reallocarray.c -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libgnu_a-reallocarray.Tpo $(DEPDIR)/libgnu_a-reallocarray.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='reallocarray.c' object='libgnu_a-reallocarray.o' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgnu_a_CFLAGS) $(CFLAGS) -c -o libgnu_a-reallocarray.o `test -f 'reallocarray.c' || echo '$(srcdir)/'`reallocarray.c - -libgnu_a-reallocarray.obj: reallocarray.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgnu_a_CFLAGS) $(CFLAGS) -MT libgnu_a-reallocarray.obj -MD -MP -MF $(DEPDIR)/libgnu_a-reallocarray.Tpo -c -o libgnu_a-reallocarray.obj `if test -f 'reallocarray.c'; then $(CYGPATH_W) 'reallocarray.c'; else $(CYGPATH_W) '$(srcdir)/reallocarray.c'; fi` -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libgnu_a-reallocarray.Tpo $(DEPDIR)/libgnu_a-reallocarray.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='reallocarray.c' object='libgnu_a-reallocarray.obj' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgnu_a_CFLAGS) $(CFLAGS) -c -o libgnu_a-reallocarray.obj `if test -f 'reallocarray.c'; then $(CYGPATH_W) 'reallocarray.c'; else $(CYGPATH_W) '$(srcdir)/reallocarray.c'; fi` - -libgnu_a-rename.o: rename.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgnu_a_CFLAGS) $(CFLAGS) -MT libgnu_a-rename.o -MD -MP -MF $(DEPDIR)/libgnu_a-rename.Tpo -c -o libgnu_a-rename.o `test -f 'rename.c' || echo '$(srcdir)/'`rename.c -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libgnu_a-rename.Tpo $(DEPDIR)/libgnu_a-rename.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='rename.c' object='libgnu_a-rename.o' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgnu_a_CFLAGS) $(CFLAGS) -c -o libgnu_a-rename.o `test -f 'rename.c' || echo '$(srcdir)/'`rename.c - -libgnu_a-rename.obj: rename.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgnu_a_CFLAGS) $(CFLAGS) -MT libgnu_a-rename.obj -MD -MP -MF $(DEPDIR)/libgnu_a-rename.Tpo -c -o libgnu_a-rename.obj `if test -f 'rename.c'; then $(CYGPATH_W) 'rename.c'; else $(CYGPATH_W) '$(srcdir)/rename.c'; fi` -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libgnu_a-rename.Tpo $(DEPDIR)/libgnu_a-rename.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='rename.c' object='libgnu_a-rename.obj' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgnu_a_CFLAGS) $(CFLAGS) -c -o libgnu_a-rename.obj `if test -f 'rename.c'; then $(CYGPATH_W) 'rename.c'; else $(CYGPATH_W) '$(srcdir)/rename.c'; fi` - -libgnu_a-rmdir.o: rmdir.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgnu_a_CFLAGS) $(CFLAGS) -MT libgnu_a-rmdir.o -MD -MP -MF $(DEPDIR)/libgnu_a-rmdir.Tpo -c -o libgnu_a-rmdir.o `test -f 'rmdir.c' || echo '$(srcdir)/'`rmdir.c -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libgnu_a-rmdir.Tpo $(DEPDIR)/libgnu_a-rmdir.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='rmdir.c' object='libgnu_a-rmdir.o' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgnu_a_CFLAGS) $(CFLAGS) -c -o libgnu_a-rmdir.o `test -f 'rmdir.c' || echo '$(srcdir)/'`rmdir.c - -libgnu_a-rmdir.obj: rmdir.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgnu_a_CFLAGS) $(CFLAGS) -MT libgnu_a-rmdir.obj -MD -MP -MF $(DEPDIR)/libgnu_a-rmdir.Tpo -c -o libgnu_a-rmdir.obj `if test -f 'rmdir.c'; then $(CYGPATH_W) 'rmdir.c'; else $(CYGPATH_W) '$(srcdir)/rmdir.c'; fi` -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libgnu_a-rmdir.Tpo $(DEPDIR)/libgnu_a-rmdir.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='rmdir.c' object='libgnu_a-rmdir.obj' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgnu_a_CFLAGS) $(CFLAGS) -c -o libgnu_a-rmdir.obj `if test -f 'rmdir.c'; then $(CYGPATH_W) 'rmdir.c'; else $(CYGPATH_W) '$(srcdir)/rmdir.c'; fi` - -libgnu_a-signbitf.o: signbitf.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgnu_a_CFLAGS) $(CFLAGS) -MT libgnu_a-signbitf.o -MD -MP -MF $(DEPDIR)/libgnu_a-signbitf.Tpo -c -o libgnu_a-signbitf.o `test -f 'signbitf.c' || echo '$(srcdir)/'`signbitf.c -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libgnu_a-signbitf.Tpo $(DEPDIR)/libgnu_a-signbitf.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='signbitf.c' object='libgnu_a-signbitf.o' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgnu_a_CFLAGS) $(CFLAGS) -c -o libgnu_a-signbitf.o `test -f 'signbitf.c' || echo '$(srcdir)/'`signbitf.c - -libgnu_a-signbitf.obj: signbitf.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgnu_a_CFLAGS) $(CFLAGS) -MT libgnu_a-signbitf.obj -MD -MP -MF $(DEPDIR)/libgnu_a-signbitf.Tpo -c -o libgnu_a-signbitf.obj `if test -f 'signbitf.c'; then $(CYGPATH_W) 'signbitf.c'; else $(CYGPATH_W) '$(srcdir)/signbitf.c'; fi` -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libgnu_a-signbitf.Tpo $(DEPDIR)/libgnu_a-signbitf.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='signbitf.c' object='libgnu_a-signbitf.obj' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgnu_a_CFLAGS) $(CFLAGS) -c -o libgnu_a-signbitf.obj `if test -f 'signbitf.c'; then $(CYGPATH_W) 'signbitf.c'; else $(CYGPATH_W) '$(srcdir)/signbitf.c'; fi` - -libgnu_a-signbitd.o: signbitd.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgnu_a_CFLAGS) $(CFLAGS) -MT libgnu_a-signbitd.o -MD -MP -MF $(DEPDIR)/libgnu_a-signbitd.Tpo -c -o libgnu_a-signbitd.o `test -f 'signbitd.c' || echo '$(srcdir)/'`signbitd.c -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libgnu_a-signbitd.Tpo $(DEPDIR)/libgnu_a-signbitd.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='signbitd.c' object='libgnu_a-signbitd.o' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgnu_a_CFLAGS) $(CFLAGS) -c -o libgnu_a-signbitd.o `test -f 'signbitd.c' || echo '$(srcdir)/'`signbitd.c - -libgnu_a-signbitd.obj: signbitd.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgnu_a_CFLAGS) $(CFLAGS) -MT libgnu_a-signbitd.obj -MD -MP -MF $(DEPDIR)/libgnu_a-signbitd.Tpo -c -o libgnu_a-signbitd.obj `if test -f 'signbitd.c'; then $(CYGPATH_W) 'signbitd.c'; else $(CYGPATH_W) '$(srcdir)/signbitd.c'; fi` -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libgnu_a-signbitd.Tpo $(DEPDIR)/libgnu_a-signbitd.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='signbitd.c' object='libgnu_a-signbitd.obj' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgnu_a_CFLAGS) $(CFLAGS) -c -o libgnu_a-signbitd.obj `if test -f 'signbitd.c'; then $(CYGPATH_W) 'signbitd.c'; else $(CYGPATH_W) '$(srcdir)/signbitd.c'; fi` - -libgnu_a-signbitl.o: signbitl.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgnu_a_CFLAGS) $(CFLAGS) -MT libgnu_a-signbitl.o -MD -MP -MF $(DEPDIR)/libgnu_a-signbitl.Tpo -c -o libgnu_a-signbitl.o `test -f 'signbitl.c' || echo '$(srcdir)/'`signbitl.c -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libgnu_a-signbitl.Tpo $(DEPDIR)/libgnu_a-signbitl.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='signbitl.c' object='libgnu_a-signbitl.o' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgnu_a_CFLAGS) $(CFLAGS) -c -o libgnu_a-signbitl.o `test -f 'signbitl.c' || echo '$(srcdir)/'`signbitl.c - -libgnu_a-signbitl.obj: signbitl.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgnu_a_CFLAGS) $(CFLAGS) -MT libgnu_a-signbitl.obj -MD -MP -MF $(DEPDIR)/libgnu_a-signbitl.Tpo -c -o libgnu_a-signbitl.obj `if test -f 'signbitl.c'; then $(CYGPATH_W) 'signbitl.c'; else $(CYGPATH_W) '$(srcdir)/signbitl.c'; fi` -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libgnu_a-signbitl.Tpo $(DEPDIR)/libgnu_a-signbitl.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='signbitl.c' object='libgnu_a-signbitl.obj' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgnu_a_CFLAGS) $(CFLAGS) -c -o libgnu_a-signbitl.obj `if test -f 'signbitl.c'; then $(CYGPATH_W) 'signbitl.c'; else $(CYGPATH_W) '$(srcdir)/signbitl.c'; fi` - -libgnu_a-stat.o: stat.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgnu_a_CFLAGS) $(CFLAGS) -MT libgnu_a-stat.o -MD -MP -MF $(DEPDIR)/libgnu_a-stat.Tpo -c -o libgnu_a-stat.o `test -f 'stat.c' || echo '$(srcdir)/'`stat.c -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libgnu_a-stat.Tpo $(DEPDIR)/libgnu_a-stat.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='stat.c' object='libgnu_a-stat.o' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgnu_a_CFLAGS) $(CFLAGS) -c -o libgnu_a-stat.o `test -f 'stat.c' || echo '$(srcdir)/'`stat.c - -libgnu_a-stat.obj: stat.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgnu_a_CFLAGS) $(CFLAGS) -MT libgnu_a-stat.obj -MD -MP -MF $(DEPDIR)/libgnu_a-stat.Tpo -c -o libgnu_a-stat.obj `if test -f 'stat.c'; then $(CYGPATH_W) 'stat.c'; else $(CYGPATH_W) '$(srcdir)/stat.c'; fi` -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libgnu_a-stat.Tpo $(DEPDIR)/libgnu_a-stat.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='stat.c' object='libgnu_a-stat.obj' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgnu_a_CFLAGS) $(CFLAGS) -c -o libgnu_a-stat.obj `if test -f 'stat.c'; then $(CYGPATH_W) 'stat.c'; else $(CYGPATH_W) '$(srcdir)/stat.c'; fi` - -libgnu_a-stat-time.o: stat-time.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgnu_a_CFLAGS) $(CFLAGS) -MT libgnu_a-stat-time.o -MD -MP -MF $(DEPDIR)/libgnu_a-stat-time.Tpo -c -o libgnu_a-stat-time.o `test -f 'stat-time.c' || echo '$(srcdir)/'`stat-time.c -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libgnu_a-stat-time.Tpo $(DEPDIR)/libgnu_a-stat-time.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='stat-time.c' object='libgnu_a-stat-time.o' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgnu_a_CFLAGS) $(CFLAGS) -c -o libgnu_a-stat-time.o `test -f 'stat-time.c' || echo '$(srcdir)/'`stat-time.c - -libgnu_a-stat-time.obj: stat-time.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgnu_a_CFLAGS) $(CFLAGS) -MT libgnu_a-stat-time.obj -MD -MP -MF $(DEPDIR)/libgnu_a-stat-time.Tpo -c -o libgnu_a-stat-time.obj `if test -f 'stat-time.c'; then $(CYGPATH_W) 'stat-time.c'; else $(CYGPATH_W) '$(srcdir)/stat-time.c'; fi` -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libgnu_a-stat-time.Tpo $(DEPDIR)/libgnu_a-stat-time.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='stat-time.c' object='libgnu_a-stat-time.obj' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgnu_a_CFLAGS) $(CFLAGS) -c -o libgnu_a-stat-time.obj `if test -f 'stat-time.c'; then $(CYGPATH_W) 'stat-time.c'; else $(CYGPATH_W) '$(srcdir)/stat-time.c'; fi` - -libgnu_a-stdio-read.o: stdio-read.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgnu_a_CFLAGS) $(CFLAGS) -MT libgnu_a-stdio-read.o -MD -MP -MF $(DEPDIR)/libgnu_a-stdio-read.Tpo -c -o libgnu_a-stdio-read.o `test -f 'stdio-read.c' || echo '$(srcdir)/'`stdio-read.c -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libgnu_a-stdio-read.Tpo $(DEPDIR)/libgnu_a-stdio-read.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='stdio-read.c' object='libgnu_a-stdio-read.o' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgnu_a_CFLAGS) $(CFLAGS) -c -o libgnu_a-stdio-read.o `test -f 'stdio-read.c' || echo '$(srcdir)/'`stdio-read.c - -libgnu_a-stdio-read.obj: stdio-read.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgnu_a_CFLAGS) $(CFLAGS) -MT libgnu_a-stdio-read.obj -MD -MP -MF $(DEPDIR)/libgnu_a-stdio-read.Tpo -c -o libgnu_a-stdio-read.obj `if test -f 'stdio-read.c'; then $(CYGPATH_W) 'stdio-read.c'; else $(CYGPATH_W) '$(srcdir)/stdio-read.c'; fi` -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libgnu_a-stdio-read.Tpo $(DEPDIR)/libgnu_a-stdio-read.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='stdio-read.c' object='libgnu_a-stdio-read.obj' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgnu_a_CFLAGS) $(CFLAGS) -c -o libgnu_a-stdio-read.obj `if test -f 'stdio-read.c'; then $(CYGPATH_W) 'stdio-read.c'; else $(CYGPATH_W) '$(srcdir)/stdio-read.c'; fi` - -libgnu_a-stdio-write.o: stdio-write.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgnu_a_CFLAGS) $(CFLAGS) -MT libgnu_a-stdio-write.o -MD -MP -MF $(DEPDIR)/libgnu_a-stdio-write.Tpo -c -o libgnu_a-stdio-write.o `test -f 'stdio-write.c' || echo '$(srcdir)/'`stdio-write.c -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libgnu_a-stdio-write.Tpo $(DEPDIR)/libgnu_a-stdio-write.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='stdio-write.c' object='libgnu_a-stdio-write.o' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgnu_a_CFLAGS) $(CFLAGS) -c -o libgnu_a-stdio-write.o `test -f 'stdio-write.c' || echo '$(srcdir)/'`stdio-write.c - -libgnu_a-stdio-write.obj: stdio-write.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgnu_a_CFLAGS) $(CFLAGS) -MT libgnu_a-stdio-write.obj -MD -MP -MF $(DEPDIR)/libgnu_a-stdio-write.Tpo -c -o libgnu_a-stdio-write.obj `if test -f 'stdio-write.c'; then $(CYGPATH_W) 'stdio-write.c'; else $(CYGPATH_W) '$(srcdir)/stdio-write.c'; fi` -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libgnu_a-stdio-write.Tpo $(DEPDIR)/libgnu_a-stdio-write.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='stdio-write.c' object='libgnu_a-stdio-write.obj' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgnu_a_CFLAGS) $(CFLAGS) -c -o libgnu_a-stdio-write.obj `if test -f 'stdio-write.c'; then $(CYGPATH_W) 'stdio-write.c'; else $(CYGPATH_W) '$(srcdir)/stdio-write.c'; fi` - -libgnu_a-strdup.o: strdup.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgnu_a_CFLAGS) $(CFLAGS) -MT libgnu_a-strdup.o -MD -MP -MF $(DEPDIR)/libgnu_a-strdup.Tpo -c -o libgnu_a-strdup.o `test -f 'strdup.c' || echo '$(srcdir)/'`strdup.c -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libgnu_a-strdup.Tpo $(DEPDIR)/libgnu_a-strdup.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='strdup.c' object='libgnu_a-strdup.o' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgnu_a_CFLAGS) $(CFLAGS) -c -o libgnu_a-strdup.o `test -f 'strdup.c' || echo '$(srcdir)/'`strdup.c - -libgnu_a-strdup.obj: strdup.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgnu_a_CFLAGS) $(CFLAGS) -MT libgnu_a-strdup.obj -MD -MP -MF $(DEPDIR)/libgnu_a-strdup.Tpo -c -o libgnu_a-strdup.obj `if test -f 'strdup.c'; then $(CYGPATH_W) 'strdup.c'; else $(CYGPATH_W) '$(srcdir)/strdup.c'; fi` -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libgnu_a-strdup.Tpo $(DEPDIR)/libgnu_a-strdup.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='strdup.c' object='libgnu_a-strdup.obj' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgnu_a_CFLAGS) $(CFLAGS) -c -o libgnu_a-strdup.obj `if test -f 'strdup.c'; then $(CYGPATH_W) 'strdup.c'; else $(CYGPATH_W) '$(srcdir)/strdup.c'; fi` - -libgnu_a-strerror.o: strerror.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgnu_a_CFLAGS) $(CFLAGS) -MT libgnu_a-strerror.o -MD -MP -MF $(DEPDIR)/libgnu_a-strerror.Tpo -c -o libgnu_a-strerror.o `test -f 'strerror.c' || echo '$(srcdir)/'`strerror.c -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libgnu_a-strerror.Tpo $(DEPDIR)/libgnu_a-strerror.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='strerror.c' object='libgnu_a-strerror.o' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgnu_a_CFLAGS) $(CFLAGS) -c -o libgnu_a-strerror.o `test -f 'strerror.c' || echo '$(srcdir)/'`strerror.c - -libgnu_a-strerror.obj: strerror.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgnu_a_CFLAGS) $(CFLAGS) -MT libgnu_a-strerror.obj -MD -MP -MF $(DEPDIR)/libgnu_a-strerror.Tpo -c -o libgnu_a-strerror.obj `if test -f 'strerror.c'; then $(CYGPATH_W) 'strerror.c'; else $(CYGPATH_W) '$(srcdir)/strerror.c'; fi` -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libgnu_a-strerror.Tpo $(DEPDIR)/libgnu_a-strerror.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='strerror.c' object='libgnu_a-strerror.obj' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgnu_a_CFLAGS) $(CFLAGS) -c -o libgnu_a-strerror.obj `if test -f 'strerror.c'; then $(CYGPATH_W) 'strerror.c'; else $(CYGPATH_W) '$(srcdir)/strerror.c'; fi` - -libgnu_a-strerror-override.o: strerror-override.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgnu_a_CFLAGS) $(CFLAGS) -MT libgnu_a-strerror-override.o -MD -MP -MF $(DEPDIR)/libgnu_a-strerror-override.Tpo -c -o libgnu_a-strerror-override.o `test -f 'strerror-override.c' || echo '$(srcdir)/'`strerror-override.c -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libgnu_a-strerror-override.Tpo $(DEPDIR)/libgnu_a-strerror-override.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='strerror-override.c' object='libgnu_a-strerror-override.o' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgnu_a_CFLAGS) $(CFLAGS) -c -o libgnu_a-strerror-override.o `test -f 'strerror-override.c' || echo '$(srcdir)/'`strerror-override.c - -libgnu_a-strerror-override.obj: strerror-override.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgnu_a_CFLAGS) $(CFLAGS) -MT libgnu_a-strerror-override.obj -MD -MP -MF $(DEPDIR)/libgnu_a-strerror-override.Tpo -c -o libgnu_a-strerror-override.obj `if test -f 'strerror-override.c'; then $(CYGPATH_W) 'strerror-override.c'; else $(CYGPATH_W) '$(srcdir)/strerror-override.c'; fi` -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libgnu_a-strerror-override.Tpo $(DEPDIR)/libgnu_a-strerror-override.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='strerror-override.c' object='libgnu_a-strerror-override.obj' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgnu_a_CFLAGS) $(CFLAGS) -c -o libgnu_a-strerror-override.obj `if test -f 'strerror-override.c'; then $(CYGPATH_W) 'strerror-override.c'; else $(CYGPATH_W) '$(srcdir)/strerror-override.c'; fi` - -libgnu_a-symlink.o: symlink.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgnu_a_CFLAGS) $(CFLAGS) -MT libgnu_a-symlink.o -MD -MP -MF $(DEPDIR)/libgnu_a-symlink.Tpo -c -o libgnu_a-symlink.o `test -f 'symlink.c' || echo '$(srcdir)/'`symlink.c -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libgnu_a-symlink.Tpo $(DEPDIR)/libgnu_a-symlink.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='symlink.c' object='libgnu_a-symlink.o' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgnu_a_CFLAGS) $(CFLAGS) -c -o libgnu_a-symlink.o `test -f 'symlink.c' || echo '$(srcdir)/'`symlink.c - -libgnu_a-symlink.obj: symlink.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgnu_a_CFLAGS) $(CFLAGS) -MT libgnu_a-symlink.obj -MD -MP -MF $(DEPDIR)/libgnu_a-symlink.Tpo -c -o libgnu_a-symlink.obj `if test -f 'symlink.c'; then $(CYGPATH_W) 'symlink.c'; else $(CYGPATH_W) '$(srcdir)/symlink.c'; fi` -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libgnu_a-symlink.Tpo $(DEPDIR)/libgnu_a-symlink.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='symlink.c' object='libgnu_a-symlink.obj' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgnu_a_CFLAGS) $(CFLAGS) -c -o libgnu_a-symlink.obj `if test -f 'symlink.c'; then $(CYGPATH_W) 'symlink.c'; else $(CYGPATH_W) '$(srcdir)/symlink.c'; fi` - -libgnu_a-unistd.o: unistd.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgnu_a_CFLAGS) $(CFLAGS) -MT libgnu_a-unistd.o -MD -MP -MF $(DEPDIR)/libgnu_a-unistd.Tpo -c -o libgnu_a-unistd.o `test -f 'unistd.c' || echo '$(srcdir)/'`unistd.c -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libgnu_a-unistd.Tpo $(DEPDIR)/libgnu_a-unistd.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='unistd.c' object='libgnu_a-unistd.o' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgnu_a_CFLAGS) $(CFLAGS) -c -o libgnu_a-unistd.o `test -f 'unistd.c' || echo '$(srcdir)/'`unistd.c - -libgnu_a-unistd.obj: unistd.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgnu_a_CFLAGS) $(CFLAGS) -MT libgnu_a-unistd.obj -MD -MP -MF $(DEPDIR)/libgnu_a-unistd.Tpo -c -o libgnu_a-unistd.obj `if test -f 'unistd.c'; then $(CYGPATH_W) 'unistd.c'; else $(CYGPATH_W) '$(srcdir)/unistd.c'; fi` -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libgnu_a-unistd.Tpo $(DEPDIR)/libgnu_a-unistd.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='unistd.c' object='libgnu_a-unistd.obj' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgnu_a_CFLAGS) $(CFLAGS) -c -o libgnu_a-unistd.obj `if test -f 'unistd.c'; then $(CYGPATH_W) 'unistd.c'; else $(CYGPATH_W) '$(srcdir)/unistd.c'; fi` - -libgnu_a-unlink.o: unlink.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgnu_a_CFLAGS) $(CFLAGS) -MT libgnu_a-unlink.o -MD -MP -MF $(DEPDIR)/libgnu_a-unlink.Tpo -c -o libgnu_a-unlink.o `test -f 'unlink.c' || echo '$(srcdir)/'`unlink.c -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libgnu_a-unlink.Tpo $(DEPDIR)/libgnu_a-unlink.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='unlink.c' object='libgnu_a-unlink.o' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgnu_a_CFLAGS) $(CFLAGS) -c -o libgnu_a-unlink.o `test -f 'unlink.c' || echo '$(srcdir)/'`unlink.c - -libgnu_a-unlink.obj: unlink.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgnu_a_CFLAGS) $(CFLAGS) -MT libgnu_a-unlink.obj -MD -MP -MF $(DEPDIR)/libgnu_a-unlink.Tpo -c -o libgnu_a-unlink.obj `if test -f 'unlink.c'; then $(CYGPATH_W) 'unlink.c'; else $(CYGPATH_W) '$(srcdir)/unlink.c'; fi` -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libgnu_a-unlink.Tpo $(DEPDIR)/libgnu_a-unlink.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='unlink.c' object='libgnu_a-unlink.obj' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgnu_a_CFLAGS) $(CFLAGS) -c -o libgnu_a-unlink.obj `if test -f 'unlink.c'; then $(CYGPATH_W) 'unlink.c'; else $(CYGPATH_W) '$(srcdir)/unlink.c'; fi` - -libgnu_a-write.o: write.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgnu_a_CFLAGS) $(CFLAGS) -MT libgnu_a-write.o -MD -MP -MF $(DEPDIR)/libgnu_a-write.Tpo -c -o libgnu_a-write.o `test -f 'write.c' || echo '$(srcdir)/'`write.c -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libgnu_a-write.Tpo $(DEPDIR)/libgnu_a-write.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='write.c' object='libgnu_a-write.o' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgnu_a_CFLAGS) $(CFLAGS) -c -o libgnu_a-write.o `test -f 'write.c' || echo '$(srcdir)/'`write.c - -libgnu_a-write.obj: write.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgnu_a_CFLAGS) $(CFLAGS) -MT libgnu_a-write.obj -MD -MP -MF $(DEPDIR)/libgnu_a-write.Tpo -c -o libgnu_a-write.obj `if test -f 'write.c'; then $(CYGPATH_W) 'write.c'; else $(CYGPATH_W) '$(srcdir)/write.c'; fi` -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libgnu_a-write.Tpo $(DEPDIR)/libgnu_a-write.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='write.c' object='libgnu_a-write.obj' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgnu_a_CFLAGS) $(CFLAGS) -c -o libgnu_a-write.obj `if test -f 'write.c'; then $(CYGPATH_W) 'write.c'; else $(CYGPATH_W) '$(srcdir)/write.c'; fi` - -libgnu_a-xmalloc.o: xmalloc.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgnu_a_CFLAGS) $(CFLAGS) -MT libgnu_a-xmalloc.o -MD -MP -MF $(DEPDIR)/libgnu_a-xmalloc.Tpo -c -o libgnu_a-xmalloc.o `test -f 'xmalloc.c' || echo '$(srcdir)/'`xmalloc.c -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libgnu_a-xmalloc.Tpo $(DEPDIR)/libgnu_a-xmalloc.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='xmalloc.c' object='libgnu_a-xmalloc.o' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgnu_a_CFLAGS) $(CFLAGS) -c -o libgnu_a-xmalloc.o `test -f 'xmalloc.c' || echo '$(srcdir)/'`xmalloc.c - -libgnu_a-xmalloc.obj: xmalloc.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgnu_a_CFLAGS) $(CFLAGS) -MT libgnu_a-xmalloc.obj -MD -MP -MF $(DEPDIR)/libgnu_a-xmalloc.Tpo -c -o libgnu_a-xmalloc.obj `if test -f 'xmalloc.c'; then $(CYGPATH_W) 'xmalloc.c'; else $(CYGPATH_W) '$(srcdir)/xmalloc.c'; fi` -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libgnu_a-xmalloc.Tpo $(DEPDIR)/libgnu_a-xmalloc.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='xmalloc.c' object='libgnu_a-xmalloc.obj' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgnu_a_CFLAGS) $(CFLAGS) -c -o libgnu_a-xmalloc.obj `if test -f 'xmalloc.c'; then $(CYGPATH_W) 'xmalloc.c'; else $(CYGPATH_W) '$(srcdir)/xmalloc.c'; fi` - -libgnu_a-xalloc-die.o: xalloc-die.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgnu_a_CFLAGS) $(CFLAGS) -MT libgnu_a-xalloc-die.o -MD -MP -MF $(DEPDIR)/libgnu_a-xalloc-die.Tpo -c -o libgnu_a-xalloc-die.o `test -f 'xalloc-die.c' || echo '$(srcdir)/'`xalloc-die.c -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libgnu_a-xalloc-die.Tpo $(DEPDIR)/libgnu_a-xalloc-die.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='xalloc-die.c' object='libgnu_a-xalloc-die.o' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgnu_a_CFLAGS) $(CFLAGS) -c -o libgnu_a-xalloc-die.o `test -f 'xalloc-die.c' || echo '$(srcdir)/'`xalloc-die.c - -libgnu_a-xalloc-die.obj: xalloc-die.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgnu_a_CFLAGS) $(CFLAGS) -MT libgnu_a-xalloc-die.obj -MD -MP -MF $(DEPDIR)/libgnu_a-xalloc-die.Tpo -c -o libgnu_a-xalloc-die.obj `if test -f 'xalloc-die.c'; then $(CYGPATH_W) 'xalloc-die.c'; else $(CYGPATH_W) '$(srcdir)/xalloc-die.c'; fi` -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libgnu_a-xalloc-die.Tpo $(DEPDIR)/libgnu_a-xalloc-die.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='xalloc-die.c' object='libgnu_a-xalloc-die.obj' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgnu_a_CFLAGS) $(CFLAGS) -c -o libgnu_a-xalloc-die.obj `if test -f 'xalloc-die.c'; then $(CYGPATH_W) 'xalloc-die.c'; else $(CYGPATH_W) '$(srcdir)/xalloc-die.c'; fi` - -libgnu_a-xsize.o: xsize.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgnu_a_CFLAGS) $(CFLAGS) -MT libgnu_a-xsize.o -MD -MP -MF $(DEPDIR)/libgnu_a-xsize.Tpo -c -o libgnu_a-xsize.o `test -f 'xsize.c' || echo '$(srcdir)/'`xsize.c -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libgnu_a-xsize.Tpo $(DEPDIR)/libgnu_a-xsize.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='xsize.c' object='libgnu_a-xsize.o' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgnu_a_CFLAGS) $(CFLAGS) -c -o libgnu_a-xsize.o `test -f 'xsize.c' || echo '$(srcdir)/'`xsize.c - -libgnu_a-xsize.obj: xsize.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgnu_a_CFLAGS) $(CFLAGS) -MT libgnu_a-xsize.obj -MD -MP -MF $(DEPDIR)/libgnu_a-xsize.Tpo -c -o libgnu_a-xsize.obj `if test -f 'xsize.c'; then $(CYGPATH_W) 'xsize.c'; else $(CYGPATH_W) '$(srcdir)/xsize.c'; fi` -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libgnu_a-xsize.Tpo $(DEPDIR)/libgnu_a-xsize.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='xsize.c' object='libgnu_a-xsize.obj' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgnu_a_CFLAGS) $(CFLAGS) -c -o libgnu_a-xsize.obj `if test -f 'xsize.c'; then $(CYGPATH_W) 'xsize.c'; else $(CYGPATH_W) '$(srcdir)/xsize.c'; fi` - -libgnu_a-calloc.o: calloc.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgnu_a_CFLAGS) $(CFLAGS) -MT libgnu_a-calloc.o -MD -MP -MF $(DEPDIR)/libgnu_a-calloc.Tpo -c -o libgnu_a-calloc.o `test -f 'calloc.c' || echo '$(srcdir)/'`calloc.c -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libgnu_a-calloc.Tpo $(DEPDIR)/libgnu_a-calloc.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='calloc.c' object='libgnu_a-calloc.o' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgnu_a_CFLAGS) $(CFLAGS) -c -o libgnu_a-calloc.o `test -f 'calloc.c' || echo '$(srcdir)/'`calloc.c - -libgnu_a-calloc.obj: calloc.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgnu_a_CFLAGS) $(CFLAGS) -MT libgnu_a-calloc.obj -MD -MP -MF $(DEPDIR)/libgnu_a-calloc.Tpo -c -o libgnu_a-calloc.obj `if test -f 'calloc.c'; then $(CYGPATH_W) 'calloc.c'; else $(CYGPATH_W) '$(srcdir)/calloc.c'; fi` -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libgnu_a-calloc.Tpo $(DEPDIR)/libgnu_a-calloc.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='calloc.c' object='libgnu_a-calloc.obj' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgnu_a_CFLAGS) $(CFLAGS) -c -o libgnu_a-calloc.obj `if test -f 'calloc.c'; then $(CYGPATH_W) 'calloc.c'; else $(CYGPATH_W) '$(srcdir)/calloc.c'; fi` - -libgnu_a-fprintf.o: fprintf.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgnu_a_CFLAGS) $(CFLAGS) -MT libgnu_a-fprintf.o -MD -MP -MF $(DEPDIR)/libgnu_a-fprintf.Tpo -c -o libgnu_a-fprintf.o `test -f 'fprintf.c' || echo '$(srcdir)/'`fprintf.c -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libgnu_a-fprintf.Tpo $(DEPDIR)/libgnu_a-fprintf.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='fprintf.c' object='libgnu_a-fprintf.o' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgnu_a_CFLAGS) $(CFLAGS) -c -o libgnu_a-fprintf.o `test -f 'fprintf.c' || echo '$(srcdir)/'`fprintf.c - -libgnu_a-fprintf.obj: fprintf.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgnu_a_CFLAGS) $(CFLAGS) -MT libgnu_a-fprintf.obj -MD -MP -MF $(DEPDIR)/libgnu_a-fprintf.Tpo -c -o libgnu_a-fprintf.obj `if test -f 'fprintf.c'; then $(CYGPATH_W) 'fprintf.c'; else $(CYGPATH_W) '$(srcdir)/fprintf.c'; fi` -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libgnu_a-fprintf.Tpo $(DEPDIR)/libgnu_a-fprintf.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='fprintf.c' object='libgnu_a-fprintf.obj' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgnu_a_CFLAGS) $(CFLAGS) -c -o libgnu_a-fprintf.obj `if test -f 'fprintf.c'; then $(CYGPATH_W) 'fprintf.c'; else $(CYGPATH_W) '$(srcdir)/fprintf.c'; fi` - -libgnu_a-frexp.o: frexp.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgnu_a_CFLAGS) $(CFLAGS) -MT libgnu_a-frexp.o -MD -MP -MF $(DEPDIR)/libgnu_a-frexp.Tpo -c -o libgnu_a-frexp.o `test -f 'frexp.c' || echo '$(srcdir)/'`frexp.c -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libgnu_a-frexp.Tpo $(DEPDIR)/libgnu_a-frexp.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='frexp.c' object='libgnu_a-frexp.o' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgnu_a_CFLAGS) $(CFLAGS) -c -o libgnu_a-frexp.o `test -f 'frexp.c' || echo '$(srcdir)/'`frexp.c - -libgnu_a-frexp.obj: frexp.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgnu_a_CFLAGS) $(CFLAGS) -MT libgnu_a-frexp.obj -MD -MP -MF $(DEPDIR)/libgnu_a-frexp.Tpo -c -o libgnu_a-frexp.obj `if test -f 'frexp.c'; then $(CYGPATH_W) 'frexp.c'; else $(CYGPATH_W) '$(srcdir)/frexp.c'; fi` -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libgnu_a-frexp.Tpo $(DEPDIR)/libgnu_a-frexp.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='frexp.c' object='libgnu_a-frexp.obj' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgnu_a_CFLAGS) $(CFLAGS) -c -o libgnu_a-frexp.obj `if test -f 'frexp.c'; then $(CYGPATH_W) 'frexp.c'; else $(CYGPATH_W) '$(srcdir)/frexp.c'; fi` - -libgnu_a-frexpl.o: frexpl.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgnu_a_CFLAGS) $(CFLAGS) -MT libgnu_a-frexpl.o -MD -MP -MF $(DEPDIR)/libgnu_a-frexpl.Tpo -c -o libgnu_a-frexpl.o `test -f 'frexpl.c' || echo '$(srcdir)/'`frexpl.c -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libgnu_a-frexpl.Tpo $(DEPDIR)/libgnu_a-frexpl.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='frexpl.c' object='libgnu_a-frexpl.o' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgnu_a_CFLAGS) $(CFLAGS) -c -o libgnu_a-frexpl.o `test -f 'frexpl.c' || echo '$(srcdir)/'`frexpl.c - -libgnu_a-frexpl.obj: frexpl.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgnu_a_CFLAGS) $(CFLAGS) -MT libgnu_a-frexpl.obj -MD -MP -MF $(DEPDIR)/libgnu_a-frexpl.Tpo -c -o libgnu_a-frexpl.obj `if test -f 'frexpl.c'; then $(CYGPATH_W) 'frexpl.c'; else $(CYGPATH_W) '$(srcdir)/frexpl.c'; fi` -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libgnu_a-frexpl.Tpo $(DEPDIR)/libgnu_a-frexpl.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='frexpl.c' object='libgnu_a-frexpl.obj' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgnu_a_CFLAGS) $(CFLAGS) -c -o libgnu_a-frexpl.obj `if test -f 'frexpl.c'; then $(CYGPATH_W) 'frexpl.c'; else $(CYGPATH_W) '$(srcdir)/frexpl.c'; fi` - -libgnu_a-stat-w32.o: stat-w32.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgnu_a_CFLAGS) $(CFLAGS) -MT libgnu_a-stat-w32.o -MD -MP -MF $(DEPDIR)/libgnu_a-stat-w32.Tpo -c -o libgnu_a-stat-w32.o `test -f 'stat-w32.c' || echo '$(srcdir)/'`stat-w32.c -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libgnu_a-stat-w32.Tpo $(DEPDIR)/libgnu_a-stat-w32.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='stat-w32.c' object='libgnu_a-stat-w32.o' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgnu_a_CFLAGS) $(CFLAGS) -c -o libgnu_a-stat-w32.o `test -f 'stat-w32.c' || echo '$(srcdir)/'`stat-w32.c - -libgnu_a-stat-w32.obj: stat-w32.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgnu_a_CFLAGS) $(CFLAGS) -MT libgnu_a-stat-w32.obj -MD -MP -MF $(DEPDIR)/libgnu_a-stat-w32.Tpo -c -o libgnu_a-stat-w32.obj `if test -f 'stat-w32.c'; then $(CYGPATH_W) 'stat-w32.c'; else $(CYGPATH_W) '$(srcdir)/stat-w32.c'; fi` -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libgnu_a-stat-w32.Tpo $(DEPDIR)/libgnu_a-stat-w32.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='stat-w32.c' object='libgnu_a-stat-w32.obj' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgnu_a_CFLAGS) $(CFLAGS) -c -o libgnu_a-stat-w32.obj `if test -f 'stat-w32.c'; then $(CYGPATH_W) 'stat-w32.c'; else $(CYGPATH_W) '$(srcdir)/stat-w32.c'; fi` - -libgnu_a-isnan.o: isnan.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgnu_a_CFLAGS) $(CFLAGS) -MT libgnu_a-isnan.o -MD -MP -MF $(DEPDIR)/libgnu_a-isnan.Tpo -c -o libgnu_a-isnan.o `test -f 'isnan.c' || echo '$(srcdir)/'`isnan.c -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libgnu_a-isnan.Tpo $(DEPDIR)/libgnu_a-isnan.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='isnan.c' object='libgnu_a-isnan.o' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgnu_a_CFLAGS) $(CFLAGS) -c -o libgnu_a-isnan.o `test -f 'isnan.c' || echo '$(srcdir)/'`isnan.c - -libgnu_a-isnan.obj: isnan.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgnu_a_CFLAGS) $(CFLAGS) -MT libgnu_a-isnan.obj -MD -MP -MF $(DEPDIR)/libgnu_a-isnan.Tpo -c -o libgnu_a-isnan.obj `if test -f 'isnan.c'; then $(CYGPATH_W) 'isnan.c'; else $(CYGPATH_W) '$(srcdir)/isnan.c'; fi` -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libgnu_a-isnan.Tpo $(DEPDIR)/libgnu_a-isnan.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='isnan.c' object='libgnu_a-isnan.obj' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgnu_a_CFLAGS) $(CFLAGS) -c -o libgnu_a-isnan.obj `if test -f 'isnan.c'; then $(CYGPATH_W) 'isnan.c'; else $(CYGPATH_W) '$(srcdir)/isnan.c'; fi` - -libgnu_a-isnand.o: isnand.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgnu_a_CFLAGS) $(CFLAGS) -MT libgnu_a-isnand.o -MD -MP -MF $(DEPDIR)/libgnu_a-isnand.Tpo -c -o libgnu_a-isnand.o `test -f 'isnand.c' || echo '$(srcdir)/'`isnand.c -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libgnu_a-isnand.Tpo $(DEPDIR)/libgnu_a-isnand.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='isnand.c' object='libgnu_a-isnand.o' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgnu_a_CFLAGS) $(CFLAGS) -c -o libgnu_a-isnand.o `test -f 'isnand.c' || echo '$(srcdir)/'`isnand.c - -libgnu_a-isnand.obj: isnand.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgnu_a_CFLAGS) $(CFLAGS) -MT libgnu_a-isnand.obj -MD -MP -MF $(DEPDIR)/libgnu_a-isnand.Tpo -c -o libgnu_a-isnand.obj `if test -f 'isnand.c'; then $(CYGPATH_W) 'isnand.c'; else $(CYGPATH_W) '$(srcdir)/isnand.c'; fi` -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libgnu_a-isnand.Tpo $(DEPDIR)/libgnu_a-isnand.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='isnand.c' object='libgnu_a-isnand.obj' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgnu_a_CFLAGS) $(CFLAGS) -c -o libgnu_a-isnand.obj `if test -f 'isnand.c'; then $(CYGPATH_W) 'isnand.c'; else $(CYGPATH_W) '$(srcdir)/isnand.c'; fi` - -libgnu_a-isnanf.o: isnanf.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgnu_a_CFLAGS) $(CFLAGS) -MT libgnu_a-isnanf.o -MD -MP -MF $(DEPDIR)/libgnu_a-isnanf.Tpo -c -o libgnu_a-isnanf.o `test -f 'isnanf.c' || echo '$(srcdir)/'`isnanf.c -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libgnu_a-isnanf.Tpo $(DEPDIR)/libgnu_a-isnanf.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='isnanf.c' object='libgnu_a-isnanf.o' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgnu_a_CFLAGS) $(CFLAGS) -c -o libgnu_a-isnanf.o `test -f 'isnanf.c' || echo '$(srcdir)/'`isnanf.c - -libgnu_a-isnanf.obj: isnanf.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgnu_a_CFLAGS) $(CFLAGS) -MT libgnu_a-isnanf.obj -MD -MP -MF $(DEPDIR)/libgnu_a-isnanf.Tpo -c -o libgnu_a-isnanf.obj `if test -f 'isnanf.c'; then $(CYGPATH_W) 'isnanf.c'; else $(CYGPATH_W) '$(srcdir)/isnanf.c'; fi` -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libgnu_a-isnanf.Tpo $(DEPDIR)/libgnu_a-isnanf.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='isnanf.c' object='libgnu_a-isnanf.obj' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgnu_a_CFLAGS) $(CFLAGS) -c -o libgnu_a-isnanf.obj `if test -f 'isnanf.c'; then $(CYGPATH_W) 'isnanf.c'; else $(CYGPATH_W) '$(srcdir)/isnanf.c'; fi` - -libgnu_a-isnanl.o: isnanl.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgnu_a_CFLAGS) $(CFLAGS) -MT libgnu_a-isnanl.o -MD -MP -MF $(DEPDIR)/libgnu_a-isnanl.Tpo -c -o libgnu_a-isnanl.o `test -f 'isnanl.c' || echo '$(srcdir)/'`isnanl.c -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libgnu_a-isnanl.Tpo $(DEPDIR)/libgnu_a-isnanl.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='isnanl.c' object='libgnu_a-isnanl.o' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgnu_a_CFLAGS) $(CFLAGS) -c -o libgnu_a-isnanl.o `test -f 'isnanl.c' || echo '$(srcdir)/'`isnanl.c - -libgnu_a-isnanl.obj: isnanl.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgnu_a_CFLAGS) $(CFLAGS) -MT libgnu_a-isnanl.obj -MD -MP -MF $(DEPDIR)/libgnu_a-isnanl.Tpo -c -o libgnu_a-isnanl.obj `if test -f 'isnanl.c'; then $(CYGPATH_W) 'isnanl.c'; else $(CYGPATH_W) '$(srcdir)/isnanl.c'; fi` -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libgnu_a-isnanl.Tpo $(DEPDIR)/libgnu_a-isnanl.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='isnanl.c' object='libgnu_a-isnanl.obj' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgnu_a_CFLAGS) $(CFLAGS) -c -o libgnu_a-isnanl.obj `if test -f 'isnanl.c'; then $(CYGPATH_W) 'isnanl.c'; else $(CYGPATH_W) '$(srcdir)/isnanl.c'; fi` - -libgnu_a-malloc.o: malloc.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgnu_a_CFLAGS) $(CFLAGS) -MT libgnu_a-malloc.o -MD -MP -MF $(DEPDIR)/libgnu_a-malloc.Tpo -c -o libgnu_a-malloc.o `test -f 'malloc.c' || echo '$(srcdir)/'`malloc.c -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libgnu_a-malloc.Tpo $(DEPDIR)/libgnu_a-malloc.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='malloc.c' object='libgnu_a-malloc.o' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgnu_a_CFLAGS) $(CFLAGS) -c -o libgnu_a-malloc.o `test -f 'malloc.c' || echo '$(srcdir)/'`malloc.c - -libgnu_a-malloc.obj: malloc.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgnu_a_CFLAGS) $(CFLAGS) -MT libgnu_a-malloc.obj -MD -MP -MF $(DEPDIR)/libgnu_a-malloc.Tpo -c -o libgnu_a-malloc.obj `if test -f 'malloc.c'; then $(CYGPATH_W) 'malloc.c'; else $(CYGPATH_W) '$(srcdir)/malloc.c'; fi` -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libgnu_a-malloc.Tpo $(DEPDIR)/libgnu_a-malloc.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='malloc.c' object='libgnu_a-malloc.obj' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgnu_a_CFLAGS) $(CFLAGS) -c -o libgnu_a-malloc.obj `if test -f 'malloc.c'; then $(CYGPATH_W) 'malloc.c'; else $(CYGPATH_W) '$(srcdir)/malloc.c'; fi` - -libgnu_a-realloc.o: realloc.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgnu_a_CFLAGS) $(CFLAGS) -MT libgnu_a-realloc.o -MD -MP -MF $(DEPDIR)/libgnu_a-realloc.Tpo -c -o libgnu_a-realloc.o `test -f 'realloc.c' || echo '$(srcdir)/'`realloc.c -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libgnu_a-realloc.Tpo $(DEPDIR)/libgnu_a-realloc.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='realloc.c' object='libgnu_a-realloc.o' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgnu_a_CFLAGS) $(CFLAGS) -c -o libgnu_a-realloc.o `test -f 'realloc.c' || echo '$(srcdir)/'`realloc.c - -libgnu_a-realloc.obj: realloc.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgnu_a_CFLAGS) $(CFLAGS) -MT libgnu_a-realloc.obj -MD -MP -MF $(DEPDIR)/libgnu_a-realloc.Tpo -c -o libgnu_a-realloc.obj `if test -f 'realloc.c'; then $(CYGPATH_W) 'realloc.c'; else $(CYGPATH_W) '$(srcdir)/realloc.c'; fi` -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libgnu_a-realloc.Tpo $(DEPDIR)/libgnu_a-realloc.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='realloc.c' object='libgnu_a-realloc.obj' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgnu_a_CFLAGS) $(CFLAGS) -c -o libgnu_a-realloc.obj `if test -f 'realloc.c'; then $(CYGPATH_W) 'realloc.c'; else $(CYGPATH_W) '$(srcdir)/realloc.c'; fi` - -libgnu_a-sprintf.o: sprintf.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgnu_a_CFLAGS) $(CFLAGS) -MT libgnu_a-sprintf.o -MD -MP -MF $(DEPDIR)/libgnu_a-sprintf.Tpo -c -o libgnu_a-sprintf.o `test -f 'sprintf.c' || echo '$(srcdir)/'`sprintf.c -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libgnu_a-sprintf.Tpo $(DEPDIR)/libgnu_a-sprintf.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='sprintf.c' object='libgnu_a-sprintf.o' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgnu_a_CFLAGS) $(CFLAGS) -c -o libgnu_a-sprintf.o `test -f 'sprintf.c' || echo '$(srcdir)/'`sprintf.c - -libgnu_a-sprintf.obj: sprintf.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgnu_a_CFLAGS) $(CFLAGS) -MT libgnu_a-sprintf.obj -MD -MP -MF $(DEPDIR)/libgnu_a-sprintf.Tpo -c -o libgnu_a-sprintf.obj `if test -f 'sprintf.c'; then $(CYGPATH_W) 'sprintf.c'; else $(CYGPATH_W) '$(srcdir)/sprintf.c'; fi` -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libgnu_a-sprintf.Tpo $(DEPDIR)/libgnu_a-sprintf.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='sprintf.c' object='libgnu_a-sprintf.obj' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgnu_a_CFLAGS) $(CFLAGS) -c -o libgnu_a-sprintf.obj `if test -f 'sprintf.c'; then $(CYGPATH_W) 'sprintf.c'; else $(CYGPATH_W) '$(srcdir)/sprintf.c'; fi` - -libgnu_a-asnprintf.o: asnprintf.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgnu_a_CFLAGS) $(CFLAGS) -MT libgnu_a-asnprintf.o -MD -MP -MF $(DEPDIR)/libgnu_a-asnprintf.Tpo -c -o libgnu_a-asnprintf.o `test -f 'asnprintf.c' || echo '$(srcdir)/'`asnprintf.c -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libgnu_a-asnprintf.Tpo $(DEPDIR)/libgnu_a-asnprintf.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='asnprintf.c' object='libgnu_a-asnprintf.o' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgnu_a_CFLAGS) $(CFLAGS) -c -o libgnu_a-asnprintf.o `test -f 'asnprintf.c' || echo '$(srcdir)/'`asnprintf.c - -libgnu_a-asnprintf.obj: asnprintf.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgnu_a_CFLAGS) $(CFLAGS) -MT libgnu_a-asnprintf.obj -MD -MP -MF $(DEPDIR)/libgnu_a-asnprintf.Tpo -c -o libgnu_a-asnprintf.obj `if test -f 'asnprintf.c'; then $(CYGPATH_W) 'asnprintf.c'; else $(CYGPATH_W) '$(srcdir)/asnprintf.c'; fi` -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libgnu_a-asnprintf.Tpo $(DEPDIR)/libgnu_a-asnprintf.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='asnprintf.c' object='libgnu_a-asnprintf.obj' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgnu_a_CFLAGS) $(CFLAGS) -c -o libgnu_a-asnprintf.obj `if test -f 'asnprintf.c'; then $(CYGPATH_W) 'asnprintf.c'; else $(CYGPATH_W) '$(srcdir)/asnprintf.c'; fi` - -libgnu_a-printf-args.o: printf-args.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgnu_a_CFLAGS) $(CFLAGS) -MT libgnu_a-printf-args.o -MD -MP -MF $(DEPDIR)/libgnu_a-printf-args.Tpo -c -o libgnu_a-printf-args.o `test -f 'printf-args.c' || echo '$(srcdir)/'`printf-args.c -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libgnu_a-printf-args.Tpo $(DEPDIR)/libgnu_a-printf-args.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='printf-args.c' object='libgnu_a-printf-args.o' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgnu_a_CFLAGS) $(CFLAGS) -c -o libgnu_a-printf-args.o `test -f 'printf-args.c' || echo '$(srcdir)/'`printf-args.c - -libgnu_a-printf-args.obj: printf-args.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgnu_a_CFLAGS) $(CFLAGS) -MT libgnu_a-printf-args.obj -MD -MP -MF $(DEPDIR)/libgnu_a-printf-args.Tpo -c -o libgnu_a-printf-args.obj `if test -f 'printf-args.c'; then $(CYGPATH_W) 'printf-args.c'; else $(CYGPATH_W) '$(srcdir)/printf-args.c'; fi` -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libgnu_a-printf-args.Tpo $(DEPDIR)/libgnu_a-printf-args.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='printf-args.c' object='libgnu_a-printf-args.obj' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgnu_a_CFLAGS) $(CFLAGS) -c -o libgnu_a-printf-args.obj `if test -f 'printf-args.c'; then $(CYGPATH_W) 'printf-args.c'; else $(CYGPATH_W) '$(srcdir)/printf-args.c'; fi` - -libgnu_a-printf-parse.o: printf-parse.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgnu_a_CFLAGS) $(CFLAGS) -MT libgnu_a-printf-parse.o -MD -MP -MF $(DEPDIR)/libgnu_a-printf-parse.Tpo -c -o libgnu_a-printf-parse.o `test -f 'printf-parse.c' || echo '$(srcdir)/'`printf-parse.c -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libgnu_a-printf-parse.Tpo $(DEPDIR)/libgnu_a-printf-parse.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='printf-parse.c' object='libgnu_a-printf-parse.o' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgnu_a_CFLAGS) $(CFLAGS) -c -o libgnu_a-printf-parse.o `test -f 'printf-parse.c' || echo '$(srcdir)/'`printf-parse.c - -libgnu_a-printf-parse.obj: printf-parse.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgnu_a_CFLAGS) $(CFLAGS) -MT libgnu_a-printf-parse.obj -MD -MP -MF $(DEPDIR)/libgnu_a-printf-parse.Tpo -c -o libgnu_a-printf-parse.obj `if test -f 'printf-parse.c'; then $(CYGPATH_W) 'printf-parse.c'; else $(CYGPATH_W) '$(srcdir)/printf-parse.c'; fi` -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libgnu_a-printf-parse.Tpo $(DEPDIR)/libgnu_a-printf-parse.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='printf-parse.c' object='libgnu_a-printf-parse.obj' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgnu_a_CFLAGS) $(CFLAGS) -c -o libgnu_a-printf-parse.obj `if test -f 'printf-parse.c'; then $(CYGPATH_W) 'printf-parse.c'; else $(CYGPATH_W) '$(srcdir)/printf-parse.c'; fi` - -libgnu_a-vasnprintf.o: vasnprintf.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgnu_a_CFLAGS) $(CFLAGS) -MT libgnu_a-vasnprintf.o -MD -MP -MF $(DEPDIR)/libgnu_a-vasnprintf.Tpo -c -o libgnu_a-vasnprintf.o `test -f 'vasnprintf.c' || echo '$(srcdir)/'`vasnprintf.c -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libgnu_a-vasnprintf.Tpo $(DEPDIR)/libgnu_a-vasnprintf.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='vasnprintf.c' object='libgnu_a-vasnprintf.o' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgnu_a_CFLAGS) $(CFLAGS) -c -o libgnu_a-vasnprintf.o `test -f 'vasnprintf.c' || echo '$(srcdir)/'`vasnprintf.c - -libgnu_a-vasnprintf.obj: vasnprintf.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgnu_a_CFLAGS) $(CFLAGS) -MT libgnu_a-vasnprintf.obj -MD -MP -MF $(DEPDIR)/libgnu_a-vasnprintf.Tpo -c -o libgnu_a-vasnprintf.obj `if test -f 'vasnprintf.c'; then $(CYGPATH_W) 'vasnprintf.c'; else $(CYGPATH_W) '$(srcdir)/vasnprintf.c'; fi` -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libgnu_a-vasnprintf.Tpo $(DEPDIR)/libgnu_a-vasnprintf.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='vasnprintf.c' object='libgnu_a-vasnprintf.obj' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgnu_a_CFLAGS) $(CFLAGS) -c -o libgnu_a-vasnprintf.obj `if test -f 'vasnprintf.c'; then $(CYGPATH_W) 'vasnprintf.c'; else $(CYGPATH_W) '$(srcdir)/vasnprintf.c'; fi` - # This directory's subdirectories are mostly independent; you can cd # into them and run 'make' without going through this Makefile. # To change the values of 'make' variables: instead of editing Makefiles, @@ -3375,87 +2041,83 @@ mostlyclean-am distclean: distclean-recursive - -rm -f ./$(DEPDIR)/libgnu_a-asnprintf.Po - -rm -f ./$(DEPDIR)/libgnu_a-basename-lgpl.Po - -rm -f ./$(DEPDIR)/libgnu_a-binary-io.Po - -rm -f ./$(DEPDIR)/libgnu_a-calloc.Po - -rm -f ./$(DEPDIR)/libgnu_a-canonicalize-lgpl.Po - -rm -f ./$(DEPDIR)/libgnu_a-cloexec.Po - -rm -f ./$(DEPDIR)/libgnu_a-close.Po - -rm -f ./$(DEPDIR)/libgnu_a-dirname-lgpl.Po - -rm -f ./$(DEPDIR)/libgnu_a-dup2.Po - -rm -f ./$(DEPDIR)/libgnu_a-error.Po - -rm -f ./$(DEPDIR)/libgnu_a-exitfail.Po - -rm -f ./$(DEPDIR)/libgnu_a-fcntl.Po - -rm -f ./$(DEPDIR)/libgnu_a-fd-hook.Po - -rm -f ./$(DEPDIR)/libgnu_a-float.Po - -rm -f ./$(DEPDIR)/libgnu_a-fprintf.Po - -rm -f ./$(DEPDIR)/libgnu_a-free.Po - -rm -f ./$(DEPDIR)/libgnu_a-frexp.Po - -rm -f ./$(DEPDIR)/libgnu_a-frexpl.Po - -rm -f ./$(DEPDIR)/libgnu_a-fseterr.Po - -rm -f ./$(DEPDIR)/libgnu_a-fstat.Po - -rm -f ./$(DEPDIR)/libgnu_a-getdtablesize.Po - -rm -f ./$(DEPDIR)/libgnu_a-getopt.Po - -rm -f ./$(DEPDIR)/libgnu_a-getopt1.Po - -rm -f ./$(DEPDIR)/libgnu_a-getprogname.Po - -rm -f ./$(DEPDIR)/libgnu_a-ialloc.Po - -rm -f ./$(DEPDIR)/libgnu_a-isnan.Po - -rm -f ./$(DEPDIR)/libgnu_a-isnand.Po - -rm -f ./$(DEPDIR)/libgnu_a-isnanf.Po - -rm -f ./$(DEPDIR)/libgnu_a-isnanl.Po - -rm -f ./$(DEPDIR)/libgnu_a-itold.Po - -rm -f ./$(DEPDIR)/libgnu_a-link.Po - -rm -f ./$(DEPDIR)/libgnu_a-lseek.Po - -rm -f ./$(DEPDIR)/libgnu_a-lstat.Po - -rm -f ./$(DEPDIR)/libgnu_a-malloc.Po - -rm -f ./$(DEPDIR)/libgnu_a-malloca.Po - -rm -f ./$(DEPDIR)/libgnu_a-math.Po - -rm -f ./$(DEPDIR)/libgnu_a-memchr.Po - -rm -f ./$(DEPDIR)/libgnu_a-mempcpy.Po - -rm -f ./$(DEPDIR)/libgnu_a-msvc-inval.Po - -rm -f ./$(DEPDIR)/libgnu_a-msvc-nothrow.Po - -rm -f ./$(DEPDIR)/libgnu_a-open.Po - -rm -f ./$(DEPDIR)/libgnu_a-printf-args.Po - -rm -f ./$(DEPDIR)/libgnu_a-printf-frexp.Po - -rm -f ./$(DEPDIR)/libgnu_a-printf-frexpl.Po - -rm -f ./$(DEPDIR)/libgnu_a-printf-parse.Po - -rm -f ./$(DEPDIR)/libgnu_a-progname.Po - -rm -f ./$(DEPDIR)/libgnu_a-raise.Po - -rm -f ./$(DEPDIR)/libgnu_a-rawmemchr.Po - -rm -f ./$(DEPDIR)/libgnu_a-read.Po - -rm -f ./$(DEPDIR)/libgnu_a-readlink.Po - -rm -f ./$(DEPDIR)/libgnu_a-realloc.Po - -rm -f ./$(DEPDIR)/libgnu_a-reallocarray.Po - -rm -f ./$(DEPDIR)/libgnu_a-rename.Po - -rm -f ./$(DEPDIR)/libgnu_a-rmdir.Po - -rm -f ./$(DEPDIR)/libgnu_a-signbitd.Po - -rm -f ./$(DEPDIR)/libgnu_a-signbitf.Po - -rm -f ./$(DEPDIR)/libgnu_a-signbitl.Po - -rm -f ./$(DEPDIR)/libgnu_a-sprintf.Po - -rm -f ./$(DEPDIR)/libgnu_a-stat-time.Po - -rm -f ./$(DEPDIR)/libgnu_a-stat-w32.Po - -rm -f ./$(DEPDIR)/libgnu_a-stat.Po - -rm -f ./$(DEPDIR)/libgnu_a-stdio-read.Po - -rm -f ./$(DEPDIR)/libgnu_a-stdio-write.Po - -rm -f ./$(DEPDIR)/libgnu_a-strdup.Po - -rm -f ./$(DEPDIR)/libgnu_a-strerror-override.Po - -rm -f ./$(DEPDIR)/libgnu_a-strerror.Po - -rm -f ./$(DEPDIR)/libgnu_a-stripslash.Po - -rm -f ./$(DEPDIR)/libgnu_a-symlink.Po - -rm -f ./$(DEPDIR)/libgnu_a-unistd.Po - -rm -f ./$(DEPDIR)/libgnu_a-unlink.Po - -rm -f ./$(DEPDIR)/libgnu_a-vasnprintf.Po - -rm -f ./$(DEPDIR)/libgnu_a-write.Po - -rm -f ./$(DEPDIR)/libgnu_a-xalloc-die.Po - -rm -f ./$(DEPDIR)/libgnu_a-xmalloc.Po - -rm -f ./$(DEPDIR)/libgnu_a-xsize.Po - -rm -f malloc/$(DEPDIR)/libgnu_a-scratch_buffer_grow.Po - -rm -f malloc/$(DEPDIR)/libgnu_a-scratch_buffer_grow_preserve.Po - -rm -f malloc/$(DEPDIR)/libgnu_a-scratch_buffer_set_array_size.Po + -rm -f ./$(DEPDIR)/asnprintf.Po + -rm -f ./$(DEPDIR)/basename-lgpl.Po + -rm -f ./$(DEPDIR)/binary-io.Po + -rm -f ./$(DEPDIR)/canonicalize-lgpl.Po + -rm -f ./$(DEPDIR)/cloexec.Po + -rm -f ./$(DEPDIR)/close.Po + -rm -f ./$(DEPDIR)/dirname-lgpl.Po + -rm -f ./$(DEPDIR)/dup2.Po + -rm -f ./$(DEPDIR)/error.Po + -rm -f ./$(DEPDIR)/exitfail.Po + -rm -f ./$(DEPDIR)/fcntl.Po + -rm -f ./$(DEPDIR)/fd-hook.Po + -rm -f ./$(DEPDIR)/float.Po + -rm -f ./$(DEPDIR)/fprintf.Po + -rm -f ./$(DEPDIR)/free.Po + -rm -f ./$(DEPDIR)/frexp.Po + -rm -f ./$(DEPDIR)/frexpl.Po + -rm -f ./$(DEPDIR)/fseterr.Po + -rm -f ./$(DEPDIR)/fstat.Po + -rm -f ./$(DEPDIR)/getdtablesize.Po + -rm -f ./$(DEPDIR)/getopt.Po + -rm -f ./$(DEPDIR)/getopt1.Po + -rm -f ./$(DEPDIR)/getprogname.Po + -rm -f ./$(DEPDIR)/isnan.Po + -rm -f ./$(DEPDIR)/isnand.Po + -rm -f ./$(DEPDIR)/isnanf.Po + -rm -f ./$(DEPDIR)/isnanl.Po + -rm -f ./$(DEPDIR)/itold.Po + -rm -f ./$(DEPDIR)/link.Po + -rm -f ./$(DEPDIR)/lseek.Po + -rm -f ./$(DEPDIR)/lstat.Po + -rm -f ./$(DEPDIR)/malloc.Po + -rm -f ./$(DEPDIR)/malloca.Po + -rm -f ./$(DEPDIR)/math.Po + -rm -f ./$(DEPDIR)/memchr.Po + -rm -f ./$(DEPDIR)/mempcpy.Po + -rm -f ./$(DEPDIR)/msvc-inval.Po + -rm -f ./$(DEPDIR)/msvc-nothrow.Po + -rm -f ./$(DEPDIR)/open.Po + -rm -f ./$(DEPDIR)/printf-args.Po + -rm -f ./$(DEPDIR)/printf-frexp.Po + -rm -f ./$(DEPDIR)/printf-frexpl.Po + -rm -f ./$(DEPDIR)/printf-parse.Po + -rm -f ./$(DEPDIR)/progname.Po + -rm -f ./$(DEPDIR)/raise.Po + -rm -f ./$(DEPDIR)/rawmemchr.Po + -rm -f ./$(DEPDIR)/read.Po + -rm -f ./$(DEPDIR)/readlink.Po + -rm -f ./$(DEPDIR)/realloc.Po + -rm -f ./$(DEPDIR)/rename.Po + -rm -f ./$(DEPDIR)/rmdir.Po + -rm -f ./$(DEPDIR)/signbitd.Po + -rm -f ./$(DEPDIR)/signbitf.Po + -rm -f ./$(DEPDIR)/signbitl.Po + -rm -f ./$(DEPDIR)/sprintf.Po + -rm -f ./$(DEPDIR)/stat-time.Po + -rm -f ./$(DEPDIR)/stat-w32.Po + -rm -f ./$(DEPDIR)/stat.Po + -rm -f ./$(DEPDIR)/strdup.Po + -rm -f ./$(DEPDIR)/strerror-override.Po + -rm -f ./$(DEPDIR)/strerror.Po + -rm -f ./$(DEPDIR)/stripslash.Po + -rm -f ./$(DEPDIR)/symlink.Po + -rm -f ./$(DEPDIR)/unistd.Po + -rm -f ./$(DEPDIR)/unlink.Po + -rm -f ./$(DEPDIR)/vasnprintf.Po + -rm -f ./$(DEPDIR)/write.Po + -rm -f ./$(DEPDIR)/xalloc-die.Po + -rm -f ./$(DEPDIR)/xmalloc.Po + -rm -f ./$(DEPDIR)/xsize.Po + -rm -f malloc/$(DEPDIR)/scratch_buffer_dupfree.Po + -rm -f malloc/$(DEPDIR)/scratch_buffer_grow.Po + -rm -f malloc/$(DEPDIR)/scratch_buffer_grow_preserve.Po + -rm -f malloc/$(DEPDIR)/scratch_buffer_set_array_size.Po -rm -f Makefile distclean-am: clean-am distclean-compile distclean-generic \ - distclean-local distclean-tags + distclean-tags dvi: dvi-recursive @@ -3498,87 +2160,82 @@ installcheck-am: maintainer-clean: maintainer-clean-recursive - -rm -f ./$(DEPDIR)/libgnu_a-asnprintf.Po - -rm -f ./$(DEPDIR)/libgnu_a-basename-lgpl.Po - -rm -f ./$(DEPDIR)/libgnu_a-binary-io.Po - -rm -f ./$(DEPDIR)/libgnu_a-calloc.Po - -rm -f ./$(DEPDIR)/libgnu_a-canonicalize-lgpl.Po - -rm -f ./$(DEPDIR)/libgnu_a-cloexec.Po - -rm -f ./$(DEPDIR)/libgnu_a-close.Po - -rm -f ./$(DEPDIR)/libgnu_a-dirname-lgpl.Po - -rm -f ./$(DEPDIR)/libgnu_a-dup2.Po - -rm -f ./$(DEPDIR)/libgnu_a-error.Po - -rm -f ./$(DEPDIR)/libgnu_a-exitfail.Po - -rm -f ./$(DEPDIR)/libgnu_a-fcntl.Po - -rm -f ./$(DEPDIR)/libgnu_a-fd-hook.Po - -rm -f ./$(DEPDIR)/libgnu_a-float.Po - -rm -f ./$(DEPDIR)/libgnu_a-fprintf.Po - -rm -f ./$(DEPDIR)/libgnu_a-free.Po - -rm -f ./$(DEPDIR)/libgnu_a-frexp.Po - -rm -f ./$(DEPDIR)/libgnu_a-frexpl.Po - -rm -f ./$(DEPDIR)/libgnu_a-fseterr.Po - -rm -f ./$(DEPDIR)/libgnu_a-fstat.Po - -rm -f ./$(DEPDIR)/libgnu_a-getdtablesize.Po - -rm -f ./$(DEPDIR)/libgnu_a-getopt.Po - -rm -f ./$(DEPDIR)/libgnu_a-getopt1.Po - -rm -f ./$(DEPDIR)/libgnu_a-getprogname.Po - -rm -f ./$(DEPDIR)/libgnu_a-ialloc.Po - -rm -f ./$(DEPDIR)/libgnu_a-isnan.Po - -rm -f ./$(DEPDIR)/libgnu_a-isnand.Po - -rm -f ./$(DEPDIR)/libgnu_a-isnanf.Po - -rm -f ./$(DEPDIR)/libgnu_a-isnanl.Po - -rm -f ./$(DEPDIR)/libgnu_a-itold.Po - -rm -f ./$(DEPDIR)/libgnu_a-link.Po - -rm -f ./$(DEPDIR)/libgnu_a-lseek.Po - -rm -f ./$(DEPDIR)/libgnu_a-lstat.Po - -rm -f ./$(DEPDIR)/libgnu_a-malloc.Po - -rm -f ./$(DEPDIR)/libgnu_a-malloca.Po - -rm -f ./$(DEPDIR)/libgnu_a-math.Po - -rm -f ./$(DEPDIR)/libgnu_a-memchr.Po - -rm -f ./$(DEPDIR)/libgnu_a-mempcpy.Po - -rm -f ./$(DEPDIR)/libgnu_a-msvc-inval.Po - -rm -f ./$(DEPDIR)/libgnu_a-msvc-nothrow.Po - -rm -f ./$(DEPDIR)/libgnu_a-open.Po - -rm -f ./$(DEPDIR)/libgnu_a-printf-args.Po - -rm -f ./$(DEPDIR)/libgnu_a-printf-frexp.Po - -rm -f ./$(DEPDIR)/libgnu_a-printf-frexpl.Po - -rm -f ./$(DEPDIR)/libgnu_a-printf-parse.Po - -rm -f ./$(DEPDIR)/libgnu_a-progname.Po - -rm -f ./$(DEPDIR)/libgnu_a-raise.Po - -rm -f ./$(DEPDIR)/libgnu_a-rawmemchr.Po - -rm -f ./$(DEPDIR)/libgnu_a-read.Po - -rm -f ./$(DEPDIR)/libgnu_a-readlink.Po - -rm -f ./$(DEPDIR)/libgnu_a-realloc.Po - -rm -f ./$(DEPDIR)/libgnu_a-reallocarray.Po - -rm -f ./$(DEPDIR)/libgnu_a-rename.Po - -rm -f ./$(DEPDIR)/libgnu_a-rmdir.Po - -rm -f ./$(DEPDIR)/libgnu_a-signbitd.Po - -rm -f ./$(DEPDIR)/libgnu_a-signbitf.Po - -rm -f ./$(DEPDIR)/libgnu_a-signbitl.Po - -rm -f ./$(DEPDIR)/libgnu_a-sprintf.Po - -rm -f ./$(DEPDIR)/libgnu_a-stat-time.Po - -rm -f ./$(DEPDIR)/libgnu_a-stat-w32.Po - -rm -f ./$(DEPDIR)/libgnu_a-stat.Po - -rm -f ./$(DEPDIR)/libgnu_a-stdio-read.Po - -rm -f ./$(DEPDIR)/libgnu_a-stdio-write.Po - -rm -f ./$(DEPDIR)/libgnu_a-strdup.Po - -rm -f ./$(DEPDIR)/libgnu_a-strerror-override.Po - -rm -f ./$(DEPDIR)/libgnu_a-strerror.Po - -rm -f ./$(DEPDIR)/libgnu_a-stripslash.Po - -rm -f ./$(DEPDIR)/libgnu_a-symlink.Po - -rm -f ./$(DEPDIR)/libgnu_a-unistd.Po - -rm -f ./$(DEPDIR)/libgnu_a-unlink.Po - -rm -f ./$(DEPDIR)/libgnu_a-vasnprintf.Po - -rm -f ./$(DEPDIR)/libgnu_a-write.Po - -rm -f ./$(DEPDIR)/libgnu_a-xalloc-die.Po - -rm -f ./$(DEPDIR)/libgnu_a-xmalloc.Po - -rm -f ./$(DEPDIR)/libgnu_a-xsize.Po - -rm -f malloc/$(DEPDIR)/libgnu_a-scratch_buffer_grow.Po - -rm -f malloc/$(DEPDIR)/libgnu_a-scratch_buffer_grow_preserve.Po - -rm -f malloc/$(DEPDIR)/libgnu_a-scratch_buffer_set_array_size.Po + -rm -f ./$(DEPDIR)/asnprintf.Po + -rm -f ./$(DEPDIR)/basename-lgpl.Po + -rm -f ./$(DEPDIR)/binary-io.Po + -rm -f ./$(DEPDIR)/canonicalize-lgpl.Po + -rm -f ./$(DEPDIR)/cloexec.Po + -rm -f ./$(DEPDIR)/close.Po + -rm -f ./$(DEPDIR)/dirname-lgpl.Po + -rm -f ./$(DEPDIR)/dup2.Po + -rm -f ./$(DEPDIR)/error.Po + -rm -f ./$(DEPDIR)/exitfail.Po + -rm -f ./$(DEPDIR)/fcntl.Po + -rm -f ./$(DEPDIR)/fd-hook.Po + -rm -f ./$(DEPDIR)/float.Po + -rm -f ./$(DEPDIR)/fprintf.Po + -rm -f ./$(DEPDIR)/free.Po + -rm -f ./$(DEPDIR)/frexp.Po + -rm -f ./$(DEPDIR)/frexpl.Po + -rm -f ./$(DEPDIR)/fseterr.Po + -rm -f ./$(DEPDIR)/fstat.Po + -rm -f ./$(DEPDIR)/getdtablesize.Po + -rm -f ./$(DEPDIR)/getopt.Po + -rm -f ./$(DEPDIR)/getopt1.Po + -rm -f ./$(DEPDIR)/getprogname.Po + -rm -f ./$(DEPDIR)/isnan.Po + -rm -f ./$(DEPDIR)/isnand.Po + -rm -f ./$(DEPDIR)/isnanf.Po + -rm -f ./$(DEPDIR)/isnanl.Po + -rm -f ./$(DEPDIR)/itold.Po + -rm -f ./$(DEPDIR)/link.Po + -rm -f ./$(DEPDIR)/lseek.Po + -rm -f ./$(DEPDIR)/lstat.Po + -rm -f ./$(DEPDIR)/malloc.Po + -rm -f ./$(DEPDIR)/malloca.Po + -rm -f ./$(DEPDIR)/math.Po + -rm -f ./$(DEPDIR)/memchr.Po + -rm -f ./$(DEPDIR)/mempcpy.Po + -rm -f ./$(DEPDIR)/msvc-inval.Po + -rm -f ./$(DEPDIR)/msvc-nothrow.Po + -rm -f ./$(DEPDIR)/open.Po + -rm -f ./$(DEPDIR)/printf-args.Po + -rm -f ./$(DEPDIR)/printf-frexp.Po + -rm -f ./$(DEPDIR)/printf-frexpl.Po + -rm -f ./$(DEPDIR)/printf-parse.Po + -rm -f ./$(DEPDIR)/progname.Po + -rm -f ./$(DEPDIR)/raise.Po + -rm -f ./$(DEPDIR)/rawmemchr.Po + -rm -f ./$(DEPDIR)/read.Po + -rm -f ./$(DEPDIR)/readlink.Po + -rm -f ./$(DEPDIR)/realloc.Po + -rm -f ./$(DEPDIR)/rename.Po + -rm -f ./$(DEPDIR)/rmdir.Po + -rm -f ./$(DEPDIR)/signbitd.Po + -rm -f ./$(DEPDIR)/signbitf.Po + -rm -f ./$(DEPDIR)/signbitl.Po + -rm -f ./$(DEPDIR)/sprintf.Po + -rm -f ./$(DEPDIR)/stat-time.Po + -rm -f ./$(DEPDIR)/stat-w32.Po + -rm -f ./$(DEPDIR)/stat.Po + -rm -f ./$(DEPDIR)/strdup.Po + -rm -f ./$(DEPDIR)/strerror-override.Po + -rm -f ./$(DEPDIR)/strerror.Po + -rm -f ./$(DEPDIR)/stripslash.Po + -rm -f ./$(DEPDIR)/symlink.Po + -rm -f ./$(DEPDIR)/unistd.Po + -rm -f ./$(DEPDIR)/unlink.Po + -rm -f ./$(DEPDIR)/vasnprintf.Po + -rm -f ./$(DEPDIR)/write.Po + -rm -f ./$(DEPDIR)/xalloc-die.Po + -rm -f ./$(DEPDIR)/xmalloc.Po + -rm -f ./$(DEPDIR)/xsize.Po + -rm -f malloc/$(DEPDIR)/scratch_buffer_dupfree.Po + -rm -f malloc/$(DEPDIR)/scratch_buffer_grow.Po + -rm -f malloc/$(DEPDIR)/scratch_buffer_grow_preserve.Po + -rm -f malloc/$(DEPDIR)/scratch_buffer_set_array_size.Po -rm -f Makefile -maintainer-clean-am: distclean-am maintainer-clean-generic \ - maintainer-clean-local +maintainer-clean-am: distclean-am maintainer-clean-generic mostlyclean: mostlyclean-recursive @@ -3602,16 +2259,16 @@ am--depfiles check check-am clean clean-generic \ clean-noinstLIBRARIES clean-noinstLTLIBRARIES cscopelist-am \ ctags ctags-am distclean distclean-compile distclean-generic \ - distclean-local distclean-tags distdir dvi dvi-am html html-am \ - info info-am install install-am install-data install-data-am \ - install-dvi install-dvi-am install-exec install-exec-am \ - install-html install-html-am install-info install-info-am \ - install-man install-pdf install-pdf-am install-ps \ - install-ps-am install-strip installcheck installcheck-am \ - installdirs installdirs-am maintainer-clean \ - maintainer-clean-generic maintainer-clean-local mostlyclean \ - mostlyclean-compile mostlyclean-generic mostlyclean-local pdf \ - pdf-am ps ps-am tags tags-am uninstall uninstall-am + distclean-tags distdir dvi dvi-am html html-am info info-am \ + install install-am install-data install-data-am install-dvi \ + install-dvi-am install-exec install-exec-am install-html \ + install-html-am install-info install-info-am install-man \ + install-pdf install-pdf-am install-ps install-ps-am \ + install-strip installcheck installcheck-am installdirs \ + installdirs-am maintainer-clean maintainer-clean-generic \ + mostlyclean mostlyclean-compile mostlyclean-generic \ + mostlyclean-local pdf pdf-am ps ps-am tags tags-am uninstall \ + uninstall-am .PRECIOUS: Makefile @@ -3619,37 +2276,20 @@ # We need the following in order to create when the system # doesn't have one that works with the given compiler. @GL_GENERATE_ALLOCA_H_TRUE@alloca.h: alloca.in.h $(top_builddir)/config.status -@GL_GENERATE_ALLOCA_H_TRUE@ $(gl_V_at)$(SED_HEADER_STDOUT) \ -@GL_GENERATE_ALLOCA_H_TRUE@ -e 's|@''HAVE_ALLOCA_H''@|$(HAVE_ALLOCA_H)|g' \ -@GL_GENERATE_ALLOCA_H_TRUE@ $(srcdir)/alloca.in.h > $@-t -@GL_GENERATE_ALLOCA_H_TRUE@ $(AM_V_at)mv $@-t $@ +@GL_GENERATE_ALLOCA_H_TRUE@ $(AM_V_GEN)rm -f $@-t $@ && \ +@GL_GENERATE_ALLOCA_H_TRUE@ { echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \ +@GL_GENERATE_ALLOCA_H_TRUE@ sed -e 's|@''HAVE_ALLOCA_H''@|$(HAVE_ALLOCA_H)|g' < $(srcdir)/alloca.in.h; \ +@GL_GENERATE_ALLOCA_H_TRUE@ } > $@-t && \ +@GL_GENERATE_ALLOCA_H_TRUE@ mv -f $@-t $@ @GL_GENERATE_ALLOCA_H_FALSE@alloca.h: $(top_builddir)/config.status @GL_GENERATE_ALLOCA_H_FALSE@ rm -f $@ -# We need the following in order to create when the system -# doesn't have one that works with the given compiler. -@GL_GENERATE_ASSERT_H_TRUE@assert.h: assert.in.h verify.h $(top_builddir)/config.status -@GL_GENERATE_ASSERT_H_TRUE@ $(gl_V_at){ $(SED_HEADER_STDOUT) \ -@GL_GENERATE_ASSERT_H_TRUE@ -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \ -@GL_GENERATE_ASSERT_H_TRUE@ -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \ -@GL_GENERATE_ASSERT_H_TRUE@ -e 's|@''PRAGMA_COLUMNS''@|@PRAGMA_COLUMNS@|g' \ -@GL_GENERATE_ASSERT_H_TRUE@ -e 's|@''NEXT_ASSERT_H''@|$(NEXT_ASSERT_H)|g' \ -@GL_GENERATE_ASSERT_H_TRUE@ < $(srcdir)/assert.in.h && \ -@GL_GENERATE_ASSERT_H_TRUE@ sed -e '/@assert.h omit start@/,/@assert.h omit end@/d' \ -@GL_GENERATE_ASSERT_H_TRUE@ -e 's|_gl_verify|_gl_static_assert|g' \ -@GL_GENERATE_ASSERT_H_TRUE@ -e 's|_GL_VERIFY|_GL_STATIC_ASSERT|g' \ -@GL_GENERATE_ASSERT_H_TRUE@ -e 's|_GL\(_STATIC_ASSERT_H\)|_GL\1|g' \ -@GL_GENERATE_ASSERT_H_TRUE@ < $(srcdir)/verify.h; \ -@GL_GENERATE_ASSERT_H_TRUE@ } > $@-t -@GL_GENERATE_ASSERT_H_TRUE@ $(AM_V_at)mv $@-t $@ -@GL_GENERATE_ASSERT_H_FALSE@assert.h: $(top_builddir)/config.status -@GL_GENERATE_ASSERT_H_FALSE@ rm -f $@ - # We need the following in order to create when the system # doesn't have one that is POSIX compliant. @GL_GENERATE_ERRNO_H_TRUE@errno.h: errno.in.h $(top_builddir)/config.status -@GL_GENERATE_ERRNO_H_TRUE@ $(gl_V_at)$(SED_HEADER_STDOUT) \ -@GL_GENERATE_ERRNO_H_TRUE@ -e 's|@''GUARD_PREFIX''@|GL|g' \ +@GL_GENERATE_ERRNO_H_TRUE@ $(AM_V_GEN)rm -f $@-t $@ && \ +@GL_GENERATE_ERRNO_H_TRUE@ { echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */' && \ +@GL_GENERATE_ERRNO_H_TRUE@ sed -e 's|@''GUARD_PREFIX''@|GL|g' \ @GL_GENERATE_ERRNO_H_TRUE@ -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \ @GL_GENERATE_ERRNO_H_TRUE@ -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \ @GL_GENERATE_ERRNO_H_TRUE@ -e 's|@''PRAGMA_COLUMNS''@|@PRAGMA_COLUMNS@|g' \ @@ -3660,46 +2300,29 @@ @GL_GENERATE_ERRNO_H_TRUE@ -e 's|@''ENOLINK_VALUE''@|$(ENOLINK_VALUE)|g' \ @GL_GENERATE_ERRNO_H_TRUE@ -e 's|@''EOVERFLOW_HIDDEN''@|$(EOVERFLOW_HIDDEN)|g' \ @GL_GENERATE_ERRNO_H_TRUE@ -e 's|@''EOVERFLOW_VALUE''@|$(EOVERFLOW_VALUE)|g' \ -@GL_GENERATE_ERRNO_H_TRUE@ $(srcdir)/errno.in.h > $@-t -@GL_GENERATE_ERRNO_H_TRUE@ $(AM_V_at)mv $@-t $@ +@GL_GENERATE_ERRNO_H_TRUE@ < $(srcdir)/errno.in.h; \ +@GL_GENERATE_ERRNO_H_TRUE@ } > $@-t && \ +@GL_GENERATE_ERRNO_H_TRUE@ mv $@-t $@ @GL_GENERATE_ERRNO_H_FALSE@errno.h: $(top_builddir)/config.status @GL_GENERATE_ERRNO_H_FALSE@ rm -f $@ -# We need the following in order to create when the system -# doesn't have one that works. -@GL_GENERATE_ERROR_H_TRUE@error.h: error.in.h $(top_builddir)/config.status $(CXXDEFS_H) -@GL_GENERATE_ERROR_H_TRUE@ $(gl_V_at)$(SED_HEADER_STDOUT) \ -@GL_GENERATE_ERROR_H_TRUE@ -e 's|@''GUARD_PREFIX''@|GL|g' \ -@GL_GENERATE_ERROR_H_TRUE@ -e 's|@''HAVE_ERROR_H''@|$(HAVE_ERROR_H)|g' \ -@GL_GENERATE_ERROR_H_TRUE@ -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \ -@GL_GENERATE_ERROR_H_TRUE@ -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \ -@GL_GENERATE_ERROR_H_TRUE@ -e 's|@''NEXT_ERROR_H''@|$(NEXT_ERROR_H)|g' \ -@GL_GENERATE_ERROR_H_TRUE@ -e 's|@''HAVE_ERROR''@|$(HAVE_ERROR)|g' \ -@GL_GENERATE_ERROR_H_TRUE@ -e 's|@''HAVE_ERROR_AT_LINE''@|$(HAVE_ERROR_AT_LINE)|g' \ -@GL_GENERATE_ERROR_H_TRUE@ -e 's|@''REPLACE_ERROR''@|$(REPLACE_ERROR)|g' \ -@GL_GENERATE_ERROR_H_TRUE@ -e 's|@''REPLACE_ERROR_AT_LINE''@|$(REPLACE_ERROR_AT_LINE)|g' \ -@GL_GENERATE_ERROR_H_TRUE@ -e '/definitions of _GL_FUNCDECL_RPL/r $(CXXDEFS_H)' \ -@GL_GENERATE_ERROR_H_TRUE@ $(srcdir)/error.in.h > $@-t -@GL_GENERATE_ERROR_H_TRUE@ $(AM_V_at)mv $@-t $@ -@GL_GENERATE_ERROR_H_FALSE@error.h: $(top_builddir)/config.status -@GL_GENERATE_ERROR_H_FALSE@ rm -f $@ - # We need the following in order to create when the system # doesn't have one that works with the given compiler. fcntl.h: fcntl.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_NONNULL_H) $(WARN_ON_USE_H) - $(gl_V_at)$(SED_HEADER_STDOUT) \ - -e 's|@''GUARD_PREFIX''@|GL|g' \ + $(AM_V_GEN)rm -f $@-t $@ && \ + { echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \ + sed -e 's|@''GUARD_PREFIX''@|GL|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_FCNTL_H''@|$(NEXT_FCNTL_H)|g' \ - -e 's/@''GNULIB_CREAT''@/$(GL_GNULIB_CREAT)/g' \ - -e 's/@''GNULIB_FCNTL''@/$(GL_GNULIB_FCNTL)/g' \ - -e 's/@''GNULIB_NONBLOCKING''@/$(GL_GNULIB_NONBLOCKING)/g' \ - -e 's/@''GNULIB_OPEN''@/$(GL_GNULIB_OPEN)/g' \ - -e 's/@''GNULIB_OPENAT''@/$(GL_GNULIB_OPENAT)/g' \ - -e 's/@''GNULIB_MDA_CREAT''@/$(GL_GNULIB_MDA_CREAT)/g' \ - -e 's/@''GNULIB_MDA_OPEN''@/$(GL_GNULIB_MDA_OPEN)/g' \ + -e 's/@''GNULIB_CREAT''@/$(GNULIB_CREAT)/g' \ + -e 's/@''GNULIB_FCNTL''@/$(GNULIB_FCNTL)/g' \ + -e 's/@''GNULIB_NONBLOCKING''@/$(GNULIB_NONBLOCKING)/g' \ + -e 's/@''GNULIB_OPEN''@/$(GNULIB_OPEN)/g' \ + -e 's/@''GNULIB_OPENAT''@/$(GNULIB_OPENAT)/g' \ + -e 's/@''GNULIB_MDA_CREAT''@/$(GNULIB_MDA_CREAT)/g' \ + -e 's/@''GNULIB_MDA_OPEN''@/$(GNULIB_MDA_OPEN)/g' \ -e 's|@''HAVE_FCNTL''@|$(HAVE_FCNTL)|g' \ -e 's|@''HAVE_OPENAT''@|$(HAVE_OPENAT)|g' \ -e 's|@''REPLACE_CREAT''@|$(REPLACE_CREAT)|g' \ @@ -3709,80 +2332,72 @@ -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)' \ - $(srcdir)/fcntl.in.h > $@-t - $(AM_V_at)mv $@-t $@ + < $(srcdir)/fcntl.in.h; \ + } > $@-t && \ + mv $@-t $@ # We need the following in order to create when the system # doesn't have one that works with the given compiler. @GL_GENERATE_FLOAT_H_TRUE@float.h: float.in.h $(top_builddir)/config.status -@GL_GENERATE_FLOAT_H_TRUE@ $(gl_V_at)$(SED_HEADER_STDOUT) \ -@GL_GENERATE_FLOAT_H_TRUE@ -e 's|@''GUARD_PREFIX''@|GL|g' \ +@GL_GENERATE_FLOAT_H_TRUE@ $(AM_V_GEN)rm -f $@-t $@ && \ +@GL_GENERATE_FLOAT_H_TRUE@ { echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */' && \ +@GL_GENERATE_FLOAT_H_TRUE@ sed -e 's|@''GUARD_PREFIX''@|GL|g' \ @GL_GENERATE_FLOAT_H_TRUE@ -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \ @GL_GENERATE_FLOAT_H_TRUE@ -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \ @GL_GENERATE_FLOAT_H_TRUE@ -e 's|@''PRAGMA_COLUMNS''@|@PRAGMA_COLUMNS@|g' \ @GL_GENERATE_FLOAT_H_TRUE@ -e 's|@''NEXT_FLOAT_H''@|$(NEXT_FLOAT_H)|g' \ @GL_GENERATE_FLOAT_H_TRUE@ -e 's|@''REPLACE_ITOLD''@|$(REPLACE_ITOLD)|g' \ -@GL_GENERATE_FLOAT_H_TRUE@ $(srcdir)/float.in.h > $@-t -@GL_GENERATE_FLOAT_H_TRUE@ $(AM_V_at)mv $@-t $@ +@GL_GENERATE_FLOAT_H_TRUE@ < $(srcdir)/float.in.h; \ +@GL_GENERATE_FLOAT_H_TRUE@ } > $@-t && \ +@GL_GENERATE_FLOAT_H_TRUE@ mv $@-t $@ @GL_GENERATE_FLOAT_H_FALSE@float.h: $(top_builddir)/config.status @GL_GENERATE_FLOAT_H_FALSE@ rm -f $@ # We need the following in order to create when the system # doesn't have one that works with the given compiler. -@GL_GENERATE_GETOPT_H_TRUE@getopt.h: getopt.in.h $(top_builddir)/config.status $(ARG_NONNULL_H) -@GL_GENERATE_GETOPT_H_TRUE@ $(gl_V_at)$(SED_HEADER_STDOUT) \ -@GL_GENERATE_GETOPT_H_TRUE@ -e 's|@''GUARD_PREFIX''@|GL|g' \ -@GL_GENERATE_GETOPT_H_TRUE@ -e 's|@''HAVE_GETOPT_H''@|$(HAVE_GETOPT_H)|g' \ -@GL_GENERATE_GETOPT_H_TRUE@ -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \ -@GL_GENERATE_GETOPT_H_TRUE@ -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \ -@GL_GENERATE_GETOPT_H_TRUE@ -e 's|@''PRAGMA_COLUMNS''@|@PRAGMA_COLUMNS@|g' \ -@GL_GENERATE_GETOPT_H_TRUE@ -e 's|@''NEXT_GETOPT_H''@|$(NEXT_GETOPT_H)|g' \ -@GL_GENERATE_GETOPT_H_TRUE@ -e '/definition of _GL_ARG_NONNULL/r $(ARG_NONNULL_H)' \ -@GL_GENERATE_GETOPT_H_TRUE@ $(srcdir)/getopt.in.h > $@-t -@GL_GENERATE_GETOPT_H_TRUE@ $(AM_V_at)mv $@-t $@ -@GL_GENERATE_GETOPT_H_FALSE@getopt.h: $(top_builddir)/config.status -@GL_GENERATE_GETOPT_H_FALSE@ rm -f $@ - -@GL_GENERATE_GETOPT_CDEFS_H_TRUE@getopt-cdefs.h: getopt-cdefs.in.h $(top_builddir)/config.status -@GL_GENERATE_GETOPT_CDEFS_H_TRUE@ $(AM_V_GEN)$(SED_HEADER_STDOUT) \ -@GL_GENERATE_GETOPT_CDEFS_H_TRUE@ -e 's|@''HAVE_SYS_CDEFS_H''@|$(HAVE_SYS_CDEFS_H)|g' \ -@GL_GENERATE_GETOPT_CDEFS_H_TRUE@ $(srcdir)/getopt-cdefs.in.h > $@-t -@GL_GENERATE_GETOPT_CDEFS_H_TRUE@ $(AM_V_at)mv $@-t $@ -@GL_GENERATE_GETOPT_CDEFS_H_FALSE@getopt-cdefs.h: $(top_builddir)/config.status -@GL_GENERATE_GETOPT_CDEFS_H_FALSE@ rm -f $@ - -malloc/scratch_buffer.gl.h: malloc/scratch_buffer.h - $(AM_V_GEN)$(MKDIR_P) 'malloc' - $(AM_V_at)$(SED_HEADER_STDOUT) \ - -e 's|__always_inline|inline _GL_ATTRIBUTE_ALWAYS_INLINE|g' \ - -e 's|__glibc_likely|_GL_LIKELY|g' \ - -e 's|__glibc_unlikely|_GL_UNLIKELY|g' \ - -e '/libc_hidden_proto/d' \ - $(srcdir)/malloc/scratch_buffer.h > $@-t - $(AM_V_at)mv $@-t $@ +getopt.h: getopt.in.h $(top_builddir)/config.status $(ARG_NONNULL_H) + $(AM_V_GEN)rm -f $@-t $@ && \ + { echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \ + sed -e 's|@''GUARD_PREFIX''@|GL|g' \ + -e 's|@''HAVE_GETOPT_H''@|$(HAVE_GETOPT_H)|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_GETOPT_H''@|$(NEXT_GETOPT_H)|g' \ + -e '/definition of _GL_ARG_NONNULL/r $(ARG_NONNULL_H)' \ + < $(srcdir)/getopt.in.h; \ + } > $@-t && \ + mv -f $@-t $@ + +getopt-cdefs.h: getopt-cdefs.in.h $(top_builddir)/config.status + $(AM_V_GEN)rm -f $@-t $@ && \ + { echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \ + sed -e 's|@''HAVE_SYS_CDEFS_H''@|$(HAVE_SYS_CDEFS_H)|g' \ + < $(srcdir)/getopt-cdefs.in.h; \ + } > $@-t && \ + mv -f $@-t $@ # We need the following in order to create when the system # doesn't have one that works with the given compiler. inttypes.h: inttypes.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(WARN_ON_USE_H) $(ARG_NONNULL_H) - $(gl_V_at)$(SED_HEADER_STDOUT) \ - -e 's/@''HAVE_INTTYPES_H''@/$(HAVE_INTTYPES_H)/g' \ + $(AM_V_GEN)rm -f $@-t $@ && \ + { echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \ + sed -e 's/@''HAVE_INTTYPES_H''@/$(HAVE_INTTYPES_H)/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_INTTYPES_H''@|$(NEXT_INTTYPES_H)|g' \ -e 's/@''APPLE_UNIVERSAL_BUILD''@/$(APPLE_UNIVERSAL_BUILD)/g' \ -e 's/@''PRIPTR_PREFIX''@/$(PRIPTR_PREFIX)/g' \ - -e 's/@''GNULIB_IMAXABS''@/$(GL_GNULIB_IMAXABS)/g' \ - -e 's/@''GNULIB_IMAXDIV''@/$(GL_GNULIB_IMAXDIV)/g' \ - -e 's/@''GNULIB_STRTOIMAX''@/$(GL_GNULIB_STRTOIMAX)/g' \ - -e 's/@''GNULIB_STRTOUMAX''@/$(GL_GNULIB_STRTOUMAX)/g' \ + -e 's/@''GNULIB_IMAXABS''@/$(GNULIB_IMAXABS)/g' \ + -e 's/@''GNULIB_IMAXDIV''@/$(GNULIB_IMAXDIV)/g' \ + -e 's/@''GNULIB_STRTOIMAX''@/$(GNULIB_STRTOIMAX)/g' \ + -e 's/@''GNULIB_STRTOUMAX''@/$(GNULIB_STRTOUMAX)/g' \ -e 's/@''HAVE_DECL_IMAXABS''@/$(HAVE_DECL_IMAXABS)/g' \ -e 's/@''HAVE_DECL_IMAXDIV''@/$(HAVE_DECL_IMAXDIV)/g' \ -e 's/@''HAVE_DECL_STRTOIMAX''@/$(HAVE_DECL_STRTOIMAX)/g' \ -e 's/@''HAVE_DECL_STRTOUMAX''@/$(HAVE_DECL_STRTOUMAX)/g' \ -e 's/@''HAVE_IMAXDIV_T''@/$(HAVE_IMAXDIV_T)/g' \ - -e 's/@''REPLACE_IMAXABS''@/$(REPLACE_IMAXABS)/g' \ - -e 's/@''REPLACE_IMAXDIV''@/$(REPLACE_IMAXDIV)/g' \ -e 's/@''REPLACE_STRTOIMAX''@/$(REPLACE_STRTOIMAX)/g' \ -e 's/@''REPLACE_STRTOUMAX''@/$(REPLACE_STRTOUMAX)/g' \ -e 's/@''INT32_MAX_LT_INTMAX_MAX''@/$(INT32_MAX_LT_INTMAX_MAX)/g' \ @@ -3792,134 +2407,138 @@ -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)' \ - $(srcdir)/inttypes.in.h > $@-t - $(AM_V_at)mv $@-t $@ + < $(srcdir)/inttypes.in.h; \ + } > $@-t && \ + mv $@-t $@ # We need the following in order to create when the system # doesn't have one that is compatible with GNU. @GL_GENERATE_LIMITS_H_TRUE@limits.h: limits.in.h $(top_builddir)/config.status -@GL_GENERATE_LIMITS_H_TRUE@ $(gl_V_at)$(SED_HEADER_STDOUT) \ -@GL_GENERATE_LIMITS_H_TRUE@ -e 's|@''GUARD_PREFIX''@|GL|g' \ +@GL_GENERATE_LIMITS_H_TRUE@ $(AM_V_GEN)rm -f $@-t $@ && \ +@GL_GENERATE_LIMITS_H_TRUE@ { echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */' && \ +@GL_GENERATE_LIMITS_H_TRUE@ sed -e 's|@''GUARD_PREFIX''@|GL|g' \ @GL_GENERATE_LIMITS_H_TRUE@ -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \ @GL_GENERATE_LIMITS_H_TRUE@ -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \ @GL_GENERATE_LIMITS_H_TRUE@ -e 's|@''PRAGMA_COLUMNS''@|@PRAGMA_COLUMNS@|g' \ @GL_GENERATE_LIMITS_H_TRUE@ -e 's|@''NEXT_LIMITS_H''@|$(NEXT_LIMITS_H)|g' \ -@GL_GENERATE_LIMITS_H_TRUE@ $(srcdir)/limits.in.h > $@-t -@GL_GENERATE_LIMITS_H_TRUE@ $(AM_V_at)mv $@-t $@ +@GL_GENERATE_LIMITS_H_TRUE@ < $(srcdir)/limits.in.h; \ +@GL_GENERATE_LIMITS_H_TRUE@ } > $@-t && \ +@GL_GENERATE_LIMITS_H_TRUE@ mv $@-t $@ @GL_GENERATE_LIMITS_H_FALSE@limits.h: $(top_builddir)/config.status @GL_GENERATE_LIMITS_H_FALSE@ rm -f $@ # We need the following in order to create when the system # doesn't have one that works with the given compiler. math.h: math.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_NONNULL_H) $(WARN_ON_USE_H) - $(gl_V_at)$(SED_HEADER_STDOUT) \ - -e 's|@''GUARD_PREFIX''@|GL|g' \ + $(AM_V_GEN)rm -f $@-t $@ && \ + { echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */' && \ + sed -e 's|@''GUARD_PREFIX''@|GL|g' \ -e 's|@''INCLUDE_NEXT_AS_FIRST_DIRECTIVE''@|$(INCLUDE_NEXT_AS_FIRST_DIRECTIVE)|g' \ -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \ -e 's|@''PRAGMA_COLUMNS''@|@PRAGMA_COLUMNS@|g' \ -e 's|@''NEXT_AS_FIRST_DIRECTIVE_MATH_H''@|$(NEXT_AS_FIRST_DIRECTIVE_MATH_H)|g' \ - -e 's/@''GNULIB_ACOSF''@/$(GL_GNULIB_ACOSF)/g' \ - -e 's/@''GNULIB_ACOSL''@/$(GL_GNULIB_ACOSL)/g' \ - -e 's/@''GNULIB_ASINF''@/$(GL_GNULIB_ASINF)/g' \ - -e 's/@''GNULIB_ASINL''@/$(GL_GNULIB_ASINL)/g' \ - -e 's/@''GNULIB_ATANF''@/$(GL_GNULIB_ATANF)/g' \ - -e 's/@''GNULIB_ATANL''@/$(GL_GNULIB_ATANL)/g' \ - -e 's/@''GNULIB_ATAN2F''@/$(GL_GNULIB_ATAN2F)/g' \ - -e 's/@''GNULIB_CBRT''@/$(GL_GNULIB_CBRT)/g' \ - -e 's/@''GNULIB_CBRTF''@/$(GL_GNULIB_CBRTF)/g' \ - -e 's/@''GNULIB_CBRTL''@/$(GL_GNULIB_CBRTL)/g' \ - -e 's/@''GNULIB_CEIL''@/$(GL_GNULIB_CEIL)/g' \ - -e 's/@''GNULIB_CEILF''@/$(GL_GNULIB_CEILF)/g' \ - -e 's/@''GNULIB_CEILL''@/$(GL_GNULIB_CEILL)/g' \ - -e 's/@''GNULIB_COPYSIGN''@/$(GL_GNULIB_COPYSIGN)/g' \ - -e 's/@''GNULIB_COPYSIGNF''@/$(GL_GNULIB_COPYSIGNF)/g' \ - -e 's/@''GNULIB_COPYSIGNL''@/$(GL_GNULIB_COPYSIGNL)/g' \ - -e 's/@''GNULIB_COSF''@/$(GL_GNULIB_COSF)/g' \ - -e 's/@''GNULIB_COSL''@/$(GL_GNULIB_COSL)/g' \ - -e 's/@''GNULIB_COSHF''@/$(GL_GNULIB_COSHF)/g' \ - -e 's/@''GNULIB_EXPF''@/$(GL_GNULIB_EXPF)/g' \ - -e 's/@''GNULIB_EXPL''@/$(GL_GNULIB_EXPL)/g' \ - -e 's/@''GNULIB_EXP2''@/$(GL_GNULIB_EXP2)/g' \ - -e 's/@''GNULIB_EXP2F''@/$(GL_GNULIB_EXP2F)/g' \ - -e 's/@''GNULIB_EXP2L''@/$(GL_GNULIB_EXP2L)/g' \ - -e 's/@''GNULIB_EXPM1''@/$(GL_GNULIB_EXPM1)/g' \ - -e 's/@''GNULIB_EXPM1F''@/$(GL_GNULIB_EXPM1F)/g' \ - -e 's/@''GNULIB_EXPM1L''@/$(GL_GNULIB_EXPM1L)/g' \ - -e 's/@''GNULIB_FABSF''@/$(GL_GNULIB_FABSF)/g' \ - -e 's/@''GNULIB_FABSL''@/$(GL_GNULIB_FABSL)/g' \ - -e 's/@''GNULIB_FLOOR''@/$(GL_GNULIB_FLOOR)/g' \ - -e 's/@''GNULIB_FLOORF''@/$(GL_GNULIB_FLOORF)/g' \ - -e 's/@''GNULIB_FLOORL''@/$(GL_GNULIB_FLOORL)/g' \ - -e 's/@''GNULIB_FMA''@/$(GL_GNULIB_FMA)/g' \ - -e 's/@''GNULIB_FMAF''@/$(GL_GNULIB_FMAF)/g' \ - -e 's/@''GNULIB_FMAL''@/$(GL_GNULIB_FMAL)/g' \ - -e 's/@''GNULIB_FMOD''@/$(GL_GNULIB_FMOD)/g' \ - -e 's/@''GNULIB_FMODF''@/$(GL_GNULIB_FMODF)/g' \ - -e 's/@''GNULIB_FMODL''@/$(GL_GNULIB_FMODL)/g' \ - -e 's/@''GNULIB_FREXPF''@/$(GL_GNULIB_FREXPF)/g' \ - -e 's/@''GNULIB_FREXP''@/$(GL_GNULIB_FREXP)/g' \ - -e 's/@''GNULIB_FREXPL''@/$(GL_GNULIB_FREXPL)/g' \ - -e 's/@''GNULIB_HYPOT''@/$(GL_GNULIB_HYPOT)/g' \ - -e 's/@''GNULIB_HYPOTF''@/$(GL_GNULIB_HYPOTF)/g' \ - -e 's/@''GNULIB_HYPOTL''@/$(GL_GNULIB_HYPOTL)/g' \ + -e 's/@''GNULIB_ACOSF''@/$(GNULIB_ACOSF)/g' \ + -e 's/@''GNULIB_ACOSL''@/$(GNULIB_ACOSL)/g' \ + -e 's/@''GNULIB_ASINF''@/$(GNULIB_ASINF)/g' \ + -e 's/@''GNULIB_ASINL''@/$(GNULIB_ASINL)/g' \ + -e 's/@''GNULIB_ATANF''@/$(GNULIB_ATANF)/g' \ + -e 's/@''GNULIB_ATANL''@/$(GNULIB_ATANL)/g' \ + -e 's/@''GNULIB_ATAN2F''@/$(GNULIB_ATAN2F)/g' \ + -e 's/@''GNULIB_CBRT''@/$(GNULIB_CBRT)/g' \ + -e 's/@''GNULIB_CBRTF''@/$(GNULIB_CBRTF)/g' \ + -e 's/@''GNULIB_CBRTL''@/$(GNULIB_CBRTL)/g' \ + -e 's/@''GNULIB_CEIL''@/$(GNULIB_CEIL)/g' \ + -e 's/@''GNULIB_CEILF''@/$(GNULIB_CEILF)/g' \ + -e 's/@''GNULIB_CEILL''@/$(GNULIB_CEILL)/g' \ + -e 's/@''GNULIB_COPYSIGN''@/$(GNULIB_COPYSIGN)/g' \ + -e 's/@''GNULIB_COPYSIGNF''@/$(GNULIB_COPYSIGNF)/g' \ + -e 's/@''GNULIB_COPYSIGNL''@/$(GNULIB_COPYSIGNL)/g' \ + -e 's/@''GNULIB_COSF''@/$(GNULIB_COSF)/g' \ + -e 's/@''GNULIB_COSL''@/$(GNULIB_COSL)/g' \ + -e 's/@''GNULIB_COSHF''@/$(GNULIB_COSHF)/g' \ + -e 's/@''GNULIB_EXPF''@/$(GNULIB_EXPF)/g' \ + -e 's/@''GNULIB_EXPL''@/$(GNULIB_EXPL)/g' \ + -e 's/@''GNULIB_EXP2''@/$(GNULIB_EXP2)/g' \ + -e 's/@''GNULIB_EXP2F''@/$(GNULIB_EXP2F)/g' \ + -e 's/@''GNULIB_EXP2L''@/$(GNULIB_EXP2L)/g' \ + -e 's/@''GNULIB_EXPM1''@/$(GNULIB_EXPM1)/g' \ + -e 's/@''GNULIB_EXPM1F''@/$(GNULIB_EXPM1F)/g' \ + -e 's/@''GNULIB_EXPM1L''@/$(GNULIB_EXPM1L)/g' \ + -e 's/@''GNULIB_FABSF''@/$(GNULIB_FABSF)/g' \ + -e 's/@''GNULIB_FABSL''@/$(GNULIB_FABSL)/g' \ + -e 's/@''GNULIB_FLOOR''@/$(GNULIB_FLOOR)/g' \ + -e 's/@''GNULIB_FLOORF''@/$(GNULIB_FLOORF)/g' \ + -e 's/@''GNULIB_FLOORL''@/$(GNULIB_FLOORL)/g' \ + -e 's/@''GNULIB_FMA''@/$(GNULIB_FMA)/g' \ + -e 's/@''GNULIB_FMAF''@/$(GNULIB_FMAF)/g' \ + -e 's/@''GNULIB_FMAL''@/$(GNULIB_FMAL)/g' \ + -e 's/@''GNULIB_FMOD''@/$(GNULIB_FMOD)/g' \ + -e 's/@''GNULIB_FMODF''@/$(GNULIB_FMODF)/g' \ + -e 's/@''GNULIB_FMODL''@/$(GNULIB_FMODL)/g' \ + -e 's/@''GNULIB_FREXPF''@/$(GNULIB_FREXPF)/g' \ + -e 's/@''GNULIB_FREXP''@/$(GNULIB_FREXP)/g' \ + -e 's/@''GNULIB_FREXPL''@/$(GNULIB_FREXPL)/g' \ + -e 's/@''GNULIB_HYPOT''@/$(GNULIB_HYPOT)/g' \ + -e 's/@''GNULIB_HYPOTF''@/$(GNULIB_HYPOTF)/g' \ + -e 's/@''GNULIB_HYPOTL''@/$(GNULIB_HYPOTL)/g' \ < $(srcdir)/math.in.h | \ - sed -e 's/@''GNULIB_ILOGB''@/$(GL_GNULIB_ILOGB)/g' \ - -e 's/@''GNULIB_ILOGBF''@/$(GL_GNULIB_ILOGBF)/g' \ - -e 's/@''GNULIB_ILOGBL''@/$(GL_GNULIB_ILOGBL)/g' \ - -e 's/@''GNULIB_ISFINITE''@/$(GL_GNULIB_ISFINITE)/g' \ - -e 's/@''GNULIB_ISINF''@/$(GL_GNULIB_ISINF)/g' \ - -e 's/@''GNULIB_ISNAN''@/$(GL_GNULIB_ISNAN)/g' \ - -e 's/@''GNULIB_ISNANF''@/$(GL_GNULIB_ISNANF)/g' \ - -e 's/@''GNULIB_ISNAND''@/$(GL_GNULIB_ISNAND)/g' \ - -e 's/@''GNULIB_ISNANL''@/$(GL_GNULIB_ISNANL)/g' \ - -e 's/@''GNULIB_LDEXPF''@/$(GL_GNULIB_LDEXPF)/g' \ - -e 's/@''GNULIB_LDEXPL''@/$(GL_GNULIB_LDEXPL)/g' \ - -e 's/@''GNULIB_LOG''@/$(GL_GNULIB_LOG)/g' \ - -e 's/@''GNULIB_LOGF''@/$(GL_GNULIB_LOGF)/g' \ - -e 's/@''GNULIB_LOGL''@/$(GL_GNULIB_LOGL)/g' \ - -e 's/@''GNULIB_LOG10''@/$(GL_GNULIB_LOG10)/g' \ - -e 's/@''GNULIB_LOG10F''@/$(GL_GNULIB_LOG10F)/g' \ - -e 's/@''GNULIB_LOG10L''@/$(GL_GNULIB_LOG10L)/g' \ - -e 's/@''GNULIB_LOG1P''@/$(GL_GNULIB_LOG1P)/g' \ - -e 's/@''GNULIB_LOG1PF''@/$(GL_GNULIB_LOG1PF)/g' \ - -e 's/@''GNULIB_LOG1PL''@/$(GL_GNULIB_LOG1PL)/g' \ - -e 's/@''GNULIB_LOG2''@/$(GL_GNULIB_LOG2)/g' \ - -e 's/@''GNULIB_LOG2F''@/$(GL_GNULIB_LOG2F)/g' \ - -e 's/@''GNULIB_LOG2L''@/$(GL_GNULIB_LOG2L)/g' \ - -e 's/@''GNULIB_LOGB''@/$(GL_GNULIB_LOGB)/g' \ - -e 's/@''GNULIB_LOGBF''@/$(GL_GNULIB_LOGBF)/g' \ - -e 's/@''GNULIB_LOGBL''@/$(GL_GNULIB_LOGBL)/g' \ - -e 's/@''GNULIB_MODF''@/$(GL_GNULIB_MODF)/g' \ - -e 's/@''GNULIB_MODFF''@/$(GL_GNULIB_MODFF)/g' \ - -e 's/@''GNULIB_MODFL''@/$(GL_GNULIB_MODFL)/g' \ - -e 's/@''GNULIB_POWF''@/$(GL_GNULIB_POWF)/g' \ - -e 's/@''GNULIB_REMAINDER''@/$(GL_GNULIB_REMAINDER)/g' \ - -e 's/@''GNULIB_REMAINDERF''@/$(GL_GNULIB_REMAINDERF)/g' \ - -e 's/@''GNULIB_REMAINDERL''@/$(GL_GNULIB_REMAINDERL)/g' \ - -e 's/@''GNULIB_RINT''@/$(GL_GNULIB_RINT)/g' \ - -e 's/@''GNULIB_RINTF''@/$(GL_GNULIB_RINTF)/g' \ - -e 's/@''GNULIB_RINTL''@/$(GL_GNULIB_RINTL)/g' \ - -e 's/@''GNULIB_ROUND''@/$(GL_GNULIB_ROUND)/g' \ - -e 's/@''GNULIB_ROUNDF''@/$(GL_GNULIB_ROUNDF)/g' \ - -e 's/@''GNULIB_ROUNDL''@/$(GL_GNULIB_ROUNDL)/g' \ - -e 's/@''GNULIB_SIGNBIT''@/$(GL_GNULIB_SIGNBIT)/g' \ - -e 's/@''GNULIB_SINF''@/$(GL_GNULIB_SINF)/g' \ - -e 's/@''GNULIB_SINL''@/$(GL_GNULIB_SINL)/g' \ - -e 's/@''GNULIB_SINHF''@/$(GL_GNULIB_SINHF)/g' \ - -e 's/@''GNULIB_SQRTF''@/$(GL_GNULIB_SQRTF)/g' \ - -e 's/@''GNULIB_SQRTL''@/$(GL_GNULIB_SQRTL)/g' \ - -e 's/@''GNULIB_TANF''@/$(GL_GNULIB_TANF)/g' \ - -e 's/@''GNULIB_TANL''@/$(GL_GNULIB_TANL)/g' \ - -e 's/@''GNULIB_TANHF''@/$(GL_GNULIB_TANHF)/g' \ - -e 's/@''GNULIB_TRUNC''@/$(GL_GNULIB_TRUNC)/g' \ - -e 's/@''GNULIB_TRUNCF''@/$(GL_GNULIB_TRUNCF)/g' \ - -e 's/@''GNULIB_TRUNCL''@/$(GL_GNULIB_TRUNCL)/g' \ - -e 's/@''GNULIB_MDA_J0''@/$(GL_GNULIB_MDA_J0)/g' \ - -e 's/@''GNULIB_MDA_J1''@/$(GL_GNULIB_MDA_J1)/g' \ - -e 's/@''GNULIB_MDA_JN''@/$(GL_GNULIB_MDA_JN)/g' \ - -e 's/@''GNULIB_MDA_Y0''@/$(GL_GNULIB_MDA_Y0)/g' \ - -e 's/@''GNULIB_MDA_Y1''@/$(GL_GNULIB_MDA_Y1)/g' \ - -e 's/@''GNULIB_MDA_YN''@/$(GL_GNULIB_MDA_YN)/g' \ + sed -e 's/@''GNULIB_ILOGB''@/$(GNULIB_ILOGB)/g' \ + -e 's/@''GNULIB_ILOGBF''@/$(GNULIB_ILOGBF)/g' \ + -e 's/@''GNULIB_ILOGBL''@/$(GNULIB_ILOGBL)/g' \ + -e 's/@''GNULIB_ISFINITE''@/$(GNULIB_ISFINITE)/g' \ + -e 's/@''GNULIB_ISINF''@/$(GNULIB_ISINF)/g' \ + -e 's/@''GNULIB_ISNAN''@/$(GNULIB_ISNAN)/g' \ + -e 's/@''GNULIB_ISNANF''@/$(GNULIB_ISNANF)/g' \ + -e 's/@''GNULIB_ISNAND''@/$(GNULIB_ISNAND)/g' \ + -e 's/@''GNULIB_ISNANL''@/$(GNULIB_ISNANL)/g' \ + -e 's/@''GNULIB_LDEXPF''@/$(GNULIB_LDEXPF)/g' \ + -e 's/@''GNULIB_LDEXPL''@/$(GNULIB_LDEXPL)/g' \ + -e 's/@''GNULIB_LOG''@/$(GNULIB_LOG)/g' \ + -e 's/@''GNULIB_LOGF''@/$(GNULIB_LOGF)/g' \ + -e 's/@''GNULIB_LOGL''@/$(GNULIB_LOGL)/g' \ + -e 's/@''GNULIB_LOG10''@/$(GNULIB_LOG10)/g' \ + -e 's/@''GNULIB_LOG10F''@/$(GNULIB_LOG10F)/g' \ + -e 's/@''GNULIB_LOG10L''@/$(GNULIB_LOG10L)/g' \ + -e 's/@''GNULIB_LOG1P''@/$(GNULIB_LOG1P)/g' \ + -e 's/@''GNULIB_LOG1PF''@/$(GNULIB_LOG1PF)/g' \ + -e 's/@''GNULIB_LOG1PL''@/$(GNULIB_LOG1PL)/g' \ + -e 's/@''GNULIB_LOG2''@/$(GNULIB_LOG2)/g' \ + -e 's/@''GNULIB_LOG2F''@/$(GNULIB_LOG2F)/g' \ + -e 's/@''GNULIB_LOG2L''@/$(GNULIB_LOG2L)/g' \ + -e 's/@''GNULIB_LOGB''@/$(GNULIB_LOGB)/g' \ + -e 's/@''GNULIB_LOGBF''@/$(GNULIB_LOGBF)/g' \ + -e 's/@''GNULIB_LOGBL''@/$(GNULIB_LOGBL)/g' \ + -e 's/@''GNULIB_MODF''@/$(GNULIB_MODF)/g' \ + -e 's/@''GNULIB_MODFF''@/$(GNULIB_MODFF)/g' \ + -e 's/@''GNULIB_MODFL''@/$(GNULIB_MODFL)/g' \ + -e 's/@''GNULIB_POWF''@/$(GNULIB_POWF)/g' \ + -e 's/@''GNULIB_REMAINDER''@/$(GNULIB_REMAINDER)/g' \ + -e 's/@''GNULIB_REMAINDERF''@/$(GNULIB_REMAINDERF)/g' \ + -e 's/@''GNULIB_REMAINDERL''@/$(GNULIB_REMAINDERL)/g' \ + -e 's/@''GNULIB_RINT''@/$(GNULIB_RINT)/g' \ + -e 's/@''GNULIB_RINTF''@/$(GNULIB_RINTF)/g' \ + -e 's/@''GNULIB_RINTL''@/$(GNULIB_RINTL)/g' \ + -e 's/@''GNULIB_ROUND''@/$(GNULIB_ROUND)/g' \ + -e 's/@''GNULIB_ROUNDF''@/$(GNULIB_ROUNDF)/g' \ + -e 's/@''GNULIB_ROUNDL''@/$(GNULIB_ROUNDL)/g' \ + -e 's/@''GNULIB_SIGNBIT''@/$(GNULIB_SIGNBIT)/g' \ + -e 's/@''GNULIB_SINF''@/$(GNULIB_SINF)/g' \ + -e 's/@''GNULIB_SINL''@/$(GNULIB_SINL)/g' \ + -e 's/@''GNULIB_SINHF''@/$(GNULIB_SINHF)/g' \ + -e 's/@''GNULIB_SQRTF''@/$(GNULIB_SQRTF)/g' \ + -e 's/@''GNULIB_SQRTL''@/$(GNULIB_SQRTL)/g' \ + -e 's/@''GNULIB_TANF''@/$(GNULIB_TANF)/g' \ + -e 's/@''GNULIB_TANL''@/$(GNULIB_TANL)/g' \ + -e 's/@''GNULIB_TANHF''@/$(GNULIB_TANHF)/g' \ + -e 's/@''GNULIB_TRUNC''@/$(GNULIB_TRUNC)/g' \ + -e 's/@''GNULIB_TRUNCF''@/$(GNULIB_TRUNCF)/g' \ + -e 's/@''GNULIB_TRUNCL''@/$(GNULIB_TRUNCL)/g' \ + -e 's/@''GNULIB_MDA_J0''@/$(GNULIB_MDA_J0)/g' \ + -e 's/@''GNULIB_MDA_J1''@/$(GNULIB_MDA_J1)/g' \ + -e 's/@''GNULIB_MDA_JN''@/$(GNULIB_MDA_JN)/g' \ + -e 's/@''GNULIB_MDA_Y0''@/$(GNULIB_MDA_Y0)/g' \ + -e 's/@''GNULIB_MDA_Y1''@/$(GNULIB_MDA_Y1)/g' \ + -e 's/@''GNULIB_MDA_YN''@/$(GNULIB_MDA_YN)/g' \ | \ sed -e 's|@''HAVE_ACOSF''@|$(HAVE_ACOSF)|g' \ -e 's|@''HAVE_ACOSL''@|$(HAVE_ACOSL)|g' \ @@ -4100,24 +2719,25 @@ -e 's|@''REPLACE_TRUNCL''@|$(REPLACE_TRUNCL)|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)' \ - > $@-t - $(AM_V_at)mv $@-t $@ + -e '/definition of _GL_WARN_ON_USE/r $(WARN_ON_USE_H)'; \ + } > $@-t && \ + mv $@-t $@ # We need the following in order to create when the system # doesn't have a complete one. signal.h: signal.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_NONNULL_H) $(WARN_ON_USE_H) - $(gl_V_at)$(SED_HEADER_STDOUT) \ - -e 's|@''GUARD_PREFIX''@|GL|g' \ + $(AM_V_GEN)rm -f $@-t $@ && \ + { echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */' && \ + sed -e 's|@''GUARD_PREFIX''@|GL|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_SIGNAL_H''@|$(NEXT_SIGNAL_H)|g' \ - -e 's/@''GNULIB_PTHREAD_SIGMASK''@/$(GL_GNULIB_PTHREAD_SIGMASK)/g' \ - -e 's/@''GNULIB_RAISE''@/$(GL_GNULIB_RAISE)/g' \ - -e 's/@''GNULIB_SIGNAL_H_SIGPIPE''@/$(GL_GNULIB_SIGNAL_H_SIGPIPE)/g' \ - -e 's/@''GNULIB_SIGPROCMASK''@/$(GL_GNULIB_SIGPROCMASK)/g' \ - -e 's/@''GNULIB_SIGACTION''@/$(GL_GNULIB_SIGACTION)/g' \ + -e 's/@''GNULIB_PTHREAD_SIGMASK''@/$(GNULIB_PTHREAD_SIGMASK)/g' \ + -e 's/@''GNULIB_RAISE''@/$(GNULIB_RAISE)/g' \ + -e 's/@''GNULIB_SIGNAL_H_SIGPIPE''@/$(GNULIB_SIGNAL_H_SIGPIPE)/g' \ + -e 's/@''GNULIB_SIGPROCMASK''@/$(GNULIB_SIGPROCMASK)/g' \ + -e 's/@''GNULIB_SIGACTION''@/$(GNULIB_SIGACTION)/g' \ -e 's|@''HAVE_POSIX_SIGNALBLOCKING''@|$(HAVE_POSIX_SIGNALBLOCKING)|g' \ -e 's|@''HAVE_PTHREAD_SIGMASK''@|$(HAVE_PTHREAD_SIGMASK)|g' \ -e 's|@''HAVE_RAISE''@|$(HAVE_RAISE)|g' \ @@ -4132,23 +2752,27 @@ -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)' \ - $(srcdir)/signal.in.h > $@-t - $(AM_V_at)mv $@-t $@ + < $(srcdir)/signal.in.h; \ + } > $@-t && \ + mv $@-t $@ -# We need the following in order to create when the system -# doesn't have one that works with the given compiler. -@GL_GENERATE_STDCKDINT_H_TRUE@stdckdint.h: stdckdint.in.h $(top_builddir)/config.status -@GL_GENERATE_STDCKDINT_H_TRUE@ $(gl_V_at)$(SED_HEADER_STDOUT) \ -@GL_GENERATE_STDCKDINT_H_TRUE@ $(srcdir)/stdckdint.in.h > $@-t -@GL_GENERATE_STDCKDINT_H_TRUE@ $(AM_V_at)mv $@-t $@ -@GL_GENERATE_STDCKDINT_H_FALSE@stdckdint.h: $(top_builddir)/config.status -@GL_GENERATE_STDCKDINT_H_FALSE@ rm -f $@ +# We need the following in order to create when the system +# doesn't have one that works. +@GL_GENERATE_STDBOOL_H_TRUE@stdbool.h: stdbool.in.h $(top_builddir)/config.status +@GL_GENERATE_STDBOOL_H_TRUE@ $(AM_V_GEN)rm -f $@-t $@ && \ +@GL_GENERATE_STDBOOL_H_TRUE@ { echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \ +@GL_GENERATE_STDBOOL_H_TRUE@ sed -e 's/@''HAVE__BOOL''@/$(HAVE__BOOL)/g' < $(srcdir)/stdbool.in.h; \ +@GL_GENERATE_STDBOOL_H_TRUE@ } > $@-t && \ +@GL_GENERATE_STDBOOL_H_TRUE@ mv $@-t $@ +@GL_GENERATE_STDBOOL_H_FALSE@stdbool.h: $(top_builddir)/config.status +@GL_GENERATE_STDBOOL_H_FALSE@ rm -f $@ # We need the following in order to create when the system # doesn't have one that works with the given compiler. @GL_GENERATE_STDDEF_H_TRUE@stddef.h: stddef.in.h $(top_builddir)/config.status -@GL_GENERATE_STDDEF_H_TRUE@ $(gl_V_at)$(SED_HEADER_STDOUT) \ -@GL_GENERATE_STDDEF_H_TRUE@ -e 's|@''GUARD_PREFIX''@|GL|g' \ +@GL_GENERATE_STDDEF_H_TRUE@ $(AM_V_GEN)rm -f $@-t $@ && \ +@GL_GENERATE_STDDEF_H_TRUE@ { echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */' && \ +@GL_GENERATE_STDDEF_H_TRUE@ sed -e 's|@''GUARD_PREFIX''@|GL|g' \ @GL_GENERATE_STDDEF_H_TRUE@ -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \ @GL_GENERATE_STDDEF_H_TRUE@ -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \ @GL_GENERATE_STDDEF_H_TRUE@ -e 's|@''PRAGMA_COLUMNS''@|@PRAGMA_COLUMNS@|g' \ @@ -4156,16 +2780,18 @@ @GL_GENERATE_STDDEF_H_TRUE@ -e 's|@''HAVE_MAX_ALIGN_T''@|$(HAVE_MAX_ALIGN_T)|g' \ @GL_GENERATE_STDDEF_H_TRUE@ -e 's|@''HAVE_WCHAR_T''@|$(HAVE_WCHAR_T)|g' \ @GL_GENERATE_STDDEF_H_TRUE@ -e 's|@''REPLACE_NULL''@|$(REPLACE_NULL)|g' \ -@GL_GENERATE_STDDEF_H_TRUE@ $(srcdir)/stddef.in.h > $@-t -@GL_GENERATE_STDDEF_H_TRUE@ $(AM_V_at)mv $@-t $@ +@GL_GENERATE_STDDEF_H_TRUE@ < $(srcdir)/stddef.in.h; \ +@GL_GENERATE_STDDEF_H_TRUE@ } > $@-t && \ +@GL_GENERATE_STDDEF_H_TRUE@ mv $@-t $@ @GL_GENERATE_STDDEF_H_FALSE@stddef.h: $(top_builddir)/config.status @GL_GENERATE_STDDEF_H_FALSE@ rm -f $@ # We need the following in order to create when the system # doesn't have one that works with the given compiler. @GL_GENERATE_STDINT_H_TRUE@stdint.h: stdint.in.h $(top_builddir)/config.status -@GL_GENERATE_STDINT_H_TRUE@ $(gl_V_at)$(SED_HEADER_STDOUT) \ -@GL_GENERATE_STDINT_H_TRUE@ -e 's|@''GUARD_PREFIX''@|GL|g' \ +@GL_GENERATE_STDINT_H_TRUE@ $(AM_V_GEN)rm -f $@-t $@ && \ +@GL_GENERATE_STDINT_H_TRUE@ { echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \ +@GL_GENERATE_STDINT_H_TRUE@ sed -e 's|@''GUARD_PREFIX''@|GL|g' \ @GL_GENERATE_STDINT_H_TRUE@ -e 's/@''HAVE_STDINT_H''@/$(HAVE_STDINT_H)/g' \ @GL_GENERATE_STDINT_H_TRUE@ -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \ @GL_GENERATE_STDINT_H_TRUE@ -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \ @@ -4191,81 +2817,82 @@ @GL_GENERATE_STDINT_H_TRUE@ -e 's/@''BITSIZEOF_WINT_T''@/$(BITSIZEOF_WINT_T)/g' \ @GL_GENERATE_STDINT_H_TRUE@ -e 's/@''HAVE_SIGNED_WINT_T''@/$(HAVE_SIGNED_WINT_T)/g' \ @GL_GENERATE_STDINT_H_TRUE@ -e 's/@''WINT_T_SUFFIX''@/$(WINT_T_SUFFIX)/g' \ -@GL_GENERATE_STDINT_H_TRUE@ -e 's/@''GNULIBHEADERS_OVERRIDE_WINT_T''@/$(GNULIBHEADERS_OVERRIDE_WINT_T)/g' \ -@GL_GENERATE_STDINT_H_TRUE@ $(srcdir)/stdint.in.h > $@-t -@GL_GENERATE_STDINT_H_TRUE@ $(AM_V_at)mv $@-t $@ +@GL_GENERATE_STDINT_H_TRUE@ -e 's/@''GNULIB_OVERRIDES_WINT_T''@/$(GNULIB_OVERRIDES_WINT_T)/g' \ +@GL_GENERATE_STDINT_H_TRUE@ < $(srcdir)/stdint.in.h; \ +@GL_GENERATE_STDINT_H_TRUE@ } > $@-t && \ +@GL_GENERATE_STDINT_H_TRUE@ mv $@-t $@ @GL_GENERATE_STDINT_H_FALSE@stdint.h: $(top_builddir)/config.status @GL_GENERATE_STDINT_H_FALSE@ rm -f $@ # We need the following in order to create 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) - $(gl_V_at)$(SED_HEADER_STDOUT) \ - -e 's|@''GUARD_PREFIX''@|GL|g' \ + $(AM_V_GEN)rm -f $@-t $@ && \ + { echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */' && \ + sed -e 's|@''GUARD_PREFIX''@|GL|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''@/$(GL_GNULIB_DPRINTF)/g' \ - -e 's/@''GNULIB_FCLOSE''@/$(GL_GNULIB_FCLOSE)/g' \ - -e 's/@''GNULIB_FDOPEN''@/$(GL_GNULIB_FDOPEN)/g' \ - -e 's/@''GNULIB_FFLUSH''@/$(GL_GNULIB_FFLUSH)/g' \ - -e 's/@''GNULIB_FGETC''@/$(GL_GNULIB_FGETC)/g' \ - -e 's/@''GNULIB_FGETS''@/$(GL_GNULIB_FGETS)/g' \ - -e 's/@''GNULIB_FOPEN''@/$(GL_GNULIB_FOPEN)/g' \ - -e 's/@''GNULIB_FOPEN_GNU''@/$(GL_GNULIB_FOPEN_GNU)/g' \ - -e 's/@''GNULIB_FPRINTF''@/$(GL_GNULIB_FPRINTF)/g' \ - -e 's/@''GNULIB_FPRINTF_POSIX''@/$(GL_GNULIB_FPRINTF_POSIX)/g' \ - -e 's/@''GNULIB_FPURGE''@/$(GL_GNULIB_FPURGE)/g' \ - -e 's/@''GNULIB_FPUTC''@/$(GL_GNULIB_FPUTC)/g' \ - -e 's/@''GNULIB_FPUTS''@/$(GL_GNULIB_FPUTS)/g' \ - -e 's/@''GNULIB_FREAD''@/$(GL_GNULIB_FREAD)/g' \ - -e 's/@''GNULIB_FREOPEN''@/$(GL_GNULIB_FREOPEN)/g' \ - -e 's/@''GNULIB_FSCANF''@/$(GL_GNULIB_FSCANF)/g' \ - -e 's/@''GNULIB_FSEEK''@/$(GL_GNULIB_FSEEK)/g' \ - -e 's/@''GNULIB_FSEEKO''@/$(GL_GNULIB_FSEEKO)/g' \ - -e 's/@''GNULIB_FTELL''@/$(GL_GNULIB_FTELL)/g' \ - -e 's/@''GNULIB_FTELLO''@/$(GL_GNULIB_FTELLO)/g' \ - -e 's/@''GNULIB_FWRITE''@/$(GL_GNULIB_FWRITE)/g' \ - -e 's/@''GNULIB_GETC''@/$(GL_GNULIB_GETC)/g' \ - -e 's/@''GNULIB_GETCHAR''@/$(GL_GNULIB_GETCHAR)/g' \ - -e 's/@''GNULIB_GETDELIM''@/$(GL_GNULIB_GETDELIM)/g' \ - -e 's/@''GNULIB_GETLINE''@/$(GL_GNULIB_GETLINE)/g' \ - -e 's/@''GNULIB_OBSTACK_PRINTF''@/$(GL_GNULIB_OBSTACK_PRINTF)/g' \ - -e 's/@''GNULIB_OBSTACK_PRINTF_POSIX''@/$(GL_GNULIB_OBSTACK_PRINTF_POSIX)/g' \ - -e 's/@''GNULIB_PCLOSE''@/$(GL_GNULIB_PCLOSE)/g' \ - -e 's/@''GNULIB_PERROR''@/$(GL_GNULIB_PERROR)/g' \ - -e 's/@''GNULIB_POPEN''@/$(GL_GNULIB_POPEN)/g' \ - -e 's/@''GNULIB_PRINTF''@/$(GL_GNULIB_PRINTF)/g' \ - -e 's/@''GNULIB_PRINTF_POSIX''@/$(GL_GNULIB_PRINTF_POSIX)/g' \ - -e 's/@''GNULIB_PUTC''@/$(GL_GNULIB_PUTC)/g' \ - -e 's/@''GNULIB_PUTCHAR''@/$(GL_GNULIB_PUTCHAR)/g' \ - -e 's/@''GNULIB_PUTS''@/$(GL_GNULIB_PUTS)/g' \ - -e 's/@''GNULIB_REMOVE''@/$(GL_GNULIB_REMOVE)/g' \ - -e 's/@''GNULIB_RENAME''@/$(GL_GNULIB_RENAME)/g' \ - -e 's/@''GNULIB_RENAMEAT''@/$(GL_GNULIB_RENAMEAT)/g' \ - -e 's/@''GNULIB_SCANF''@/$(GL_GNULIB_SCANF)/g' \ - -e 's/@''GNULIB_SNPRINTF''@/$(GL_GNULIB_SNPRINTF)/g' \ - -e 's/@''GNULIB_SPRINTF_POSIX''@/$(GL_GNULIB_SPRINTF_POSIX)/g' \ - -e 's/@''GNULIB_STDIO_H_NONBLOCKING''@/$(GL_GNULIB_STDIO_H_NONBLOCKING)/g' \ - -e 's/@''GNULIB_STDIO_H_SIGPIPE''@/$(GL_GNULIB_STDIO_H_SIGPIPE)/g' \ - -e 's/@''GNULIB_TMPFILE''@/$(GL_GNULIB_TMPFILE)/g' \ - -e 's/@''GNULIB_VASPRINTF''@/$(GL_GNULIB_VASPRINTF)/g' \ - -e 's/@''GNULIB_VDPRINTF''@/$(GL_GNULIB_VDPRINTF)/g' \ - -e 's/@''GNULIB_VFPRINTF''@/$(GL_GNULIB_VFPRINTF)/g' \ - -e 's/@''GNULIB_VFPRINTF_POSIX''@/$(GL_GNULIB_VFPRINTF_POSIX)/g' \ - -e 's/@''GNULIB_VFSCANF''@/$(GL_GNULIB_VFSCANF)/g' \ - -e 's/@''GNULIB_VSCANF''@/$(GL_GNULIB_VSCANF)/g' \ - -e 's/@''GNULIB_VPRINTF''@/$(GL_GNULIB_VPRINTF)/g' \ - -e 's/@''GNULIB_VPRINTF_POSIX''@/$(GL_GNULIB_VPRINTF_POSIX)/g' \ - -e 's/@''GNULIB_VSNPRINTF''@/$(GL_GNULIB_VSNPRINTF)/g' \ - -e 's/@''GNULIB_VSPRINTF_POSIX''@/$(GL_GNULIB_VSPRINTF_POSIX)/g' \ - -e 's/@''GNULIB_MDA_FCLOSEALL''@/$(GL_GNULIB_MDA_FCLOSEALL)/g' \ - -e 's/@''GNULIB_MDA_FDOPEN''@/$(GL_GNULIB_MDA_FDOPEN)/g' \ - -e 's/@''GNULIB_MDA_FILENO''@/$(GL_GNULIB_MDA_FILENO)/g' \ - -e 's/@''GNULIB_MDA_GETW''@/$(GL_GNULIB_MDA_GETW)/g' \ - -e 's/@''GNULIB_MDA_PUTW''@/$(GL_GNULIB_MDA_PUTW)/g' \ - -e 's/@''GNULIB_MDA_TEMPNAM''@/$(GL_GNULIB_MDA_TEMPNAM)/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' \ + -e 's/@''GNULIB_MDA_FCLOSEALL''@/$(GNULIB_MDA_FCLOSEALL)/g' \ + -e 's/@''GNULIB_MDA_FDOPEN''@/$(GNULIB_MDA_FDOPEN)/g' \ + -e 's/@''GNULIB_MDA_FILENO''@/$(GNULIB_MDA_FILENO)/g' \ + -e 's/@''GNULIB_MDA_GETW''@/$(GNULIB_MDA_GETW)/g' \ + -e 's/@''GNULIB_MDA_PUTW''@/$(GNULIB_MDA_PUTW)/g' \ + -e 's/@''GNULIB_MDA_TEMPNAM''@/$(GNULIB_MDA_TEMPNAM)/g' \ < $(srcdir)/stdio.in.h | \ sed -e 's|@''HAVE_DECL_FCLOSEALL''@|$(HAVE_DECL_FCLOSEALL)|g' \ -e 's|@''HAVE_DECL_FPURGE''@|$(HAVE_DECL_FPURGE)|g' \ @@ -4273,9 +2900,7 @@ -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_GETW''@|$(HAVE_DECL_GETW)|g' \ -e 's|@''HAVE_DECL_OBSTACK_PRINTF''@|$(HAVE_DECL_OBSTACK_PRINTF)|g' \ - -e 's|@''HAVE_DECL_PUTW''@|$(HAVE_DECL_PUTW)|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' \ @@ -4291,7 +2916,6 @@ -e 's|@''REPLACE_FDOPEN''@|$(REPLACE_FDOPEN)|g' \ -e 's|@''REPLACE_FFLUSH''@|$(REPLACE_FFLUSH)|g' \ -e 's|@''REPLACE_FOPEN''@|$(REPLACE_FOPEN)|g' \ - -e 's|@''REPLACE_FOPEN_FOR_FOPEN_GNU''@|$(REPLACE_FOPEN_FOR_FOPEN_GNU)|g' \ -e 's|@''REPLACE_FPRINTF''@|$(REPLACE_FPRINTF)|g' \ -e 's|@''REPLACE_FPURGE''@|$(REPLACE_FPURGE)|g' \ -e 's|@''REPLACE_FREOPEN''@|$(REPLACE_FREOPEN)|g' \ @@ -4322,70 +2946,64 @@ -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)' \ - > $@-t - $(AM_V_at)mv $@-t $@ + -e '/definition of _GL_WARN_ON_USE/r $(WARN_ON_USE_H)'; \ + } > $@-t && \ + mv $@-t $@ # We need the following in order to create when the system # doesn't have one that works with the given compiler. stdlib.h: stdlib.in.h $(top_builddir)/config.status $(CXXDEFS_H) \ $(_NORETURN_H) $(ARG_NONNULL_H) $(WARN_ON_USE_H) - $(gl_V_at)$(SED_HEADER_STDOUT) \ - -e 's|@''GUARD_PREFIX''@|GL|g' \ + $(AM_V_GEN)rm -f $@-t $@ && \ + { echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */' && \ + sed -e 's|@''GUARD_PREFIX''@|GL|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_STDLIB_H''@|$(NEXT_STDLIB_H)|g' \ - -e 's/@''GNULIB__EXIT''@/$(GL_GNULIB__EXIT)/g' \ - -e 's/@''GNULIB_ALIGNED_ALLOC''@/$(GL_GNULIB_ALIGNED_ALLOC)/g' \ - -e 's/@''GNULIB_ATOLL''@/$(GL_GNULIB_ATOLL)/g' \ - -e 's/@''GNULIB_CALLOC_GNU''@/$(GL_GNULIB_CALLOC_GNU)/g' \ - -e 's/@''GNULIB_CALLOC_POSIX''@/$(GL_GNULIB_CALLOC_POSIX)/g' \ - -e 's/@''GNULIB_CANONICALIZE_FILE_NAME''@/$(GL_GNULIB_CANONICALIZE_FILE_NAME)/g' \ - -e 's/@''GNULIB_FREE_POSIX''@/$(GL_GNULIB_FREE_POSIX)/g' \ - -e 's/@''GNULIB_GETLOADAVG''@/$(GL_GNULIB_GETLOADAVG)/g' \ - -e 's/@''GNULIB_GETPROGNAME''@/$(GL_GNULIB_GETPROGNAME)/g' \ - -e 's/@''GNULIB_GETSUBOPT''@/$(GL_GNULIB_GETSUBOPT)/g' \ - -e 's/@''GNULIB_GRANTPT''@/$(GL_GNULIB_GRANTPT)/g' \ - -e 's/@''GNULIB_MALLOC_GNU''@/$(GL_GNULIB_MALLOC_GNU)/g' \ - -e 's/@''GNULIB_MALLOC_POSIX''@/$(GL_GNULIB_MALLOC_POSIX)/g' \ - -e 's/@''GNULIB_MBSTOWCS''@/$(GL_GNULIB_MBSTOWCS)/g' \ - -e 's/@''GNULIB_MBTOWC''@/$(GL_GNULIB_MBTOWC)/g' \ - -e 's/@''GNULIB_MKDTEMP''@/$(GL_GNULIB_MKDTEMP)/g' \ - -e 's/@''GNULIB_MKOSTEMP''@/$(GL_GNULIB_MKOSTEMP)/g' \ - -e 's/@''GNULIB_MKOSTEMPS''@/$(GL_GNULIB_MKOSTEMPS)/g' \ - -e 's/@''GNULIB_MKSTEMP''@/$(GL_GNULIB_MKSTEMP)/g' \ - -e 's/@''GNULIB_MKSTEMPS''@/$(GL_GNULIB_MKSTEMPS)/g' \ - -e 's/@''GNULIB_POSIX_MEMALIGN''@/$(GL_GNULIB_POSIX_MEMALIGN)/g' \ - -e 's/@''GNULIB_POSIX_OPENPT''@/$(GL_GNULIB_POSIX_OPENPT)/g' \ - -e 's/@''GNULIB_PTSNAME''@/$(GL_GNULIB_PTSNAME)/g' \ - -e 's/@''GNULIB_PTSNAME_R''@/$(GL_GNULIB_PTSNAME_R)/g' \ - -e 's/@''GNULIB_PUTENV''@/$(GL_GNULIB_PUTENV)/g' \ - -e 's/@''GNULIB_QSORT_R''@/$(GL_GNULIB_QSORT_R)/g' \ - -e 's/@''GNULIB_RANDOM''@/$(GL_GNULIB_RANDOM)/g' \ - -e 's/@''GNULIB_RANDOM_R''@/$(GL_GNULIB_RANDOM_R)/g' \ - -e 's/@''GNULIB_REALLOC_GNU''@/$(GL_GNULIB_REALLOC_GNU)/g' \ - -e 's/@''GNULIB_REALLOC_POSIX''@/$(GL_GNULIB_REALLOC_POSIX)/g' \ - -e 's/@''GNULIB_REALLOCARRAY''@/$(GL_GNULIB_REALLOCARRAY)/g' \ - -e 's/@''GNULIB_REALPATH''@/$(GL_GNULIB_REALPATH)/g' \ - -e 's/@''GNULIB_RPMATCH''@/$(GL_GNULIB_RPMATCH)/g' \ - -e 's/@''GNULIB_SECURE_GETENV''@/$(GL_GNULIB_SECURE_GETENV)/g' \ - -e 's/@''GNULIB_SETENV''@/$(GL_GNULIB_SETENV)/g' \ - -e 's/@''GNULIB_STRTOD''@/$(GL_GNULIB_STRTOD)/g' \ - -e 's/@''GNULIB_STRTOL''@/$(GL_GNULIB_STRTOL)/g' \ - -e 's/@''GNULIB_STRTOLD''@/$(GL_GNULIB_STRTOLD)/g' \ - -e 's/@''GNULIB_STRTOLL''@/$(GL_GNULIB_STRTOLL)/g' \ - -e 's/@''GNULIB_STRTOUL''@/$(GL_GNULIB_STRTOUL)/g' \ - -e 's/@''GNULIB_STRTOULL''@/$(GL_GNULIB_STRTOULL)/g' \ - -e 's/@''GNULIB_SYSTEM_POSIX''@/$(GL_GNULIB_SYSTEM_POSIX)/g' \ - -e 's/@''GNULIB_UNLOCKPT''@/$(GL_GNULIB_UNLOCKPT)/g' \ - -e 's/@''GNULIB_UNSETENV''@/$(GL_GNULIB_UNSETENV)/g' \ - -e 's/@''GNULIB_WCTOMB''@/$(GL_GNULIB_WCTOMB)/g' \ - -e 's/@''GNULIB_MDA_ECVT''@/$(GL_GNULIB_MDA_ECVT)/g' \ - -e 's/@''GNULIB_MDA_FCVT''@/$(GL_GNULIB_MDA_FCVT)/g' \ - -e 's/@''GNULIB_MDA_GCVT''@/$(GL_GNULIB_MDA_GCVT)/g' \ - -e 's/@''GNULIB_MDA_MKTEMP''@/$(GL_GNULIB_MDA_MKTEMP)/g' \ - -e 's/@''GNULIB_MDA_PUTENV''@/$(GL_GNULIB_MDA_PUTENV)/g' \ + -e 's/@''GNULIB__EXIT''@/$(GNULIB__EXIT)/g' \ + -e 's/@''GNULIB_ALIGNED_ALLOC''@/$(GNULIB_ALIGNED_ALLOC)/g' \ + -e 's/@''GNULIB_ATOLL''@/$(GNULIB_ATOLL)/g' \ + -e 's/@''GNULIB_CALLOC_POSIX''@/$(GNULIB_CALLOC_POSIX)/g' \ + -e 's/@''GNULIB_CANONICALIZE_FILE_NAME''@/$(GNULIB_CANONICALIZE_FILE_NAME)/g' \ + -e 's/@''GNULIB_FREE_POSIX''@/$(GNULIB_FREE_POSIX)/g' \ + -e 's/@''GNULIB_GETLOADAVG''@/$(GNULIB_GETLOADAVG)/g' \ + -e 's/@''GNULIB_GETSUBOPT''@/$(GNULIB_GETSUBOPT)/g' \ + -e 's/@''GNULIB_GRANTPT''@/$(GNULIB_GRANTPT)/g' \ + -e 's/@''GNULIB_MALLOC_POSIX''@/$(GNULIB_MALLOC_POSIX)/g' \ + -e 's/@''GNULIB_MBTOWC''@/$(GNULIB_MBTOWC)/g' \ + -e 's/@''GNULIB_MKDTEMP''@/$(GNULIB_MKDTEMP)/g' \ + -e 's/@''GNULIB_MKOSTEMP''@/$(GNULIB_MKOSTEMP)/g' \ + -e 's/@''GNULIB_MKOSTEMPS''@/$(GNULIB_MKOSTEMPS)/g' \ + -e 's/@''GNULIB_MKSTEMP''@/$(GNULIB_MKSTEMP)/g' \ + -e 's/@''GNULIB_MKSTEMPS''@/$(GNULIB_MKSTEMPS)/g' \ + -e 's/@''GNULIB_POSIX_MEMALIGN''@/$(GNULIB_POSIX_MEMALIGN)/g' \ + -e 's/@''GNULIB_POSIX_OPENPT''@/$(GNULIB_POSIX_OPENPT)/g' \ + -e 's/@''GNULIB_PTSNAME''@/$(GNULIB_PTSNAME)/g' \ + -e 's/@''GNULIB_PTSNAME_R''@/$(GNULIB_PTSNAME_R)/g' \ + -e 's/@''GNULIB_PUTENV''@/$(GNULIB_PUTENV)/g' \ + -e 's/@''GNULIB_QSORT_R''@/$(GNULIB_QSORT_R)/g' \ + -e 's/@''GNULIB_RANDOM''@/$(GNULIB_RANDOM)/g' \ + -e 's/@''GNULIB_RANDOM_R''@/$(GNULIB_RANDOM_R)/g' \ + -e 's/@''GNULIB_REALLOC_POSIX''@/$(GNULIB_REALLOC_POSIX)/g' \ + -e 's/@''GNULIB_REALLOCARRAY''@/$(GNULIB_REALLOCARRAY)/g' \ + -e 's/@''GNULIB_REALPATH''@/$(GNULIB_REALPATH)/g' \ + -e 's/@''GNULIB_RPMATCH''@/$(GNULIB_RPMATCH)/g' \ + -e 's/@''GNULIB_SECURE_GETENV''@/$(GNULIB_SECURE_GETENV)/g' \ + -e 's/@''GNULIB_SETENV''@/$(GNULIB_SETENV)/g' \ + -e 's/@''GNULIB_STRTOD''@/$(GNULIB_STRTOD)/g' \ + -e 's/@''GNULIB_STRTOLD''@/$(GNULIB_STRTOLD)/g' \ + -e 's/@''GNULIB_STRTOLL''@/$(GNULIB_STRTOLL)/g' \ + -e 's/@''GNULIB_STRTOULL''@/$(GNULIB_STRTOULL)/g' \ + -e 's/@''GNULIB_SYSTEM_POSIX''@/$(GNULIB_SYSTEM_POSIX)/g' \ + -e 's/@''GNULIB_UNLOCKPT''@/$(GNULIB_UNLOCKPT)/g' \ + -e 's/@''GNULIB_UNSETENV''@/$(GNULIB_UNSETENV)/g' \ + -e 's/@''GNULIB_WCTOMB''@/$(GNULIB_WCTOMB)/g' \ + -e 's/@''GNULIB_MDA_ECVT''@/$(GNULIB_MDA_ECVT)/g' \ + -e 's/@''GNULIB_MDA_FCVT''@/$(GNULIB_MDA_FCVT)/g' \ + -e 's/@''GNULIB_MDA_GCVT''@/$(GNULIB_MDA_GCVT)/g' \ + -e 's/@''GNULIB_MDA_MKTEMP''@/$(GNULIB_MDA_MKTEMP)/g' \ + -e 's/@''GNULIB_MDA_PUTENV''@/$(GNULIB_MDA_PUTENV)/g' \ < $(srcdir)/stdlib.in.h | \ sed -e 's|@''HAVE__EXIT''@|$(HAVE__EXIT)|g' \ -e 's|@''HAVE_ALIGNED_ALLOC''@|$(HAVE_ALIGNED_ALLOC)|g' \ @@ -4395,8 +3013,6 @@ -e 's|@''HAVE_DECL_FCVT''@|$(HAVE_DECL_FCVT)|g' \ -e 's|@''HAVE_DECL_GCVT''@|$(HAVE_DECL_GCVT)|g' \ -e 's|@''HAVE_DECL_GETLOADAVG''@|$(HAVE_DECL_GETLOADAVG)|g' \ - -e 's|@''HAVE_DECL_PROGRAM_INVOCATION_NAME''@|$(HAVE_DECL_PROGRAM_INVOCATION_NAME)|g' \ - -e 's|@''HAVE_GETPROGNAME''@|$(HAVE_GETPROGNAME)|g' \ -e 's|@''HAVE_GETSUBOPT''@|$(HAVE_GETSUBOPT)|g' \ -e 's|@''HAVE_GRANTPT''@|$(HAVE_GRANTPT)|g' \ -e 's|@''HAVE_INITSTATE''@|$(HAVE_INITSTATE)|g' \ @@ -4423,116 +3039,96 @@ -e 's|@''HAVE_SETSTATE''@|$(HAVE_SETSTATE)|g' \ -e 's|@''HAVE_DECL_SETSTATE''@|$(HAVE_DECL_SETSTATE)|g' \ -e 's|@''HAVE_STRTOD''@|$(HAVE_STRTOD)|g' \ - -e 's|@''HAVE_STRTOL''@|$(HAVE_STRTOL)|g' \ -e 's|@''HAVE_STRTOLD''@|$(HAVE_STRTOLD)|g' \ -e 's|@''HAVE_STRTOLL''@|$(HAVE_STRTOLL)|g' \ - -e 's|@''HAVE_STRTOUL''@|$(HAVE_STRTOUL)|g' \ -e 's|@''HAVE_STRTOULL''@|$(HAVE_STRTOULL)|g' \ -e 's|@''HAVE_STRUCT_RANDOM_DATA''@|$(HAVE_STRUCT_RANDOM_DATA)|g' \ -e 's|@''HAVE_SYS_LOADAVG_H''@|$(HAVE_SYS_LOADAVG_H)|g' \ -e 's|@''HAVE_UNLOCKPT''@|$(HAVE_UNLOCKPT)|g' \ -e 's|@''HAVE_DECL_UNSETENV''@|$(HAVE_DECL_UNSETENV)|g' \ - -e 's|@''REPLACE__EXIT''@|$(REPLACE__EXIT)|g' \ -e 's|@''REPLACE_ALIGNED_ALLOC''@|$(REPLACE_ALIGNED_ALLOC)|g' \ - -e 's|@''REPLACE_CALLOC_FOR_CALLOC_GNU''@|$(REPLACE_CALLOC_FOR_CALLOC_GNU)|g' \ - -e 's|@''REPLACE_CALLOC_FOR_CALLOC_POSIX''@|$(REPLACE_CALLOC_FOR_CALLOC_POSIX)|g' \ + -e 's|@''REPLACE_CALLOC''@|$(REPLACE_CALLOC)|g' \ -e 's|@''REPLACE_CANONICALIZE_FILE_NAME''@|$(REPLACE_CANONICALIZE_FILE_NAME)|g' \ -e 's|@''REPLACE_FREE''@|$(REPLACE_FREE)|g' \ - -e 's|@''REPLACE_GETLOADAVG''@|$(REPLACE_GETLOADAVG)|g' \ - -e 's|@''REPLACE_GETPROGNAME''@|$(REPLACE_GETPROGNAME)|g' \ - -e 's|@''REPLACE_GETSUBOPT''@|$(REPLACE_GETSUBOPT)|g' \ -e 's|@''REPLACE_INITSTATE''@|$(REPLACE_INITSTATE)|g' \ - -e 's|@''REPLACE_MALLOC_FOR_MALLOC_GNU''@|$(REPLACE_MALLOC_FOR_MALLOC_GNU)|g' \ - -e 's|@''REPLACE_MALLOC_FOR_MALLOC_POSIX''@|$(REPLACE_MALLOC_FOR_MALLOC_POSIX)|g' \ - -e 's|@''REPLACE_MB_CUR_MAX''@|$(REPLACE_MB_CUR_MAX)|g' \ - -e 's|@''REPLACE_MBSTOWCS''@|$(REPLACE_MBSTOWCS)|g' \ + -e 's|@''REPLACE_MALLOC''@|$(REPLACE_MALLOC)|g' \ -e 's|@''REPLACE_MBTOWC''@|$(REPLACE_MBTOWC)|g' \ - -e 's|@''REPLACE_MKOSTEMP''@|$(REPLACE_MKOSTEMP)|g' \ - -e 's|@''REPLACE_MKOSTEMPS''@|$(REPLACE_MKOSTEMPS)|g' \ -e 's|@''REPLACE_MKSTEMP''@|$(REPLACE_MKSTEMP)|g' \ -e 's|@''REPLACE_POSIX_MEMALIGN''@|$(REPLACE_POSIX_MEMALIGN)|g' \ - -e 's|@''REPLACE_POSIX_OPENPT''@|$(REPLACE_POSIX_OPENPT)|g' \ -e 's|@''REPLACE_PTSNAME''@|$(REPLACE_PTSNAME)|g' \ -e 's|@''REPLACE_PTSNAME_R''@|$(REPLACE_PTSNAME_R)|g' \ -e 's|@''REPLACE_PUTENV''@|$(REPLACE_PUTENV)|g' \ -e 's|@''REPLACE_QSORT_R''@|$(REPLACE_QSORT_R)|g' \ -e 's|@''REPLACE_RANDOM''@|$(REPLACE_RANDOM)|g' \ -e 's|@''REPLACE_RANDOM_R''@|$(REPLACE_RANDOM_R)|g' \ - -e 's|@''REPLACE_REALLOC_FOR_REALLOC_GNU''@|$(REPLACE_REALLOC_FOR_REALLOC_GNU)|g' \ - -e 's|@''REPLACE_REALLOC_FOR_REALLOC_POSIX''@|$(REPLACE_REALLOC_FOR_REALLOC_POSIX)|g' \ - -e 's|@''REPLACE_REALLOCARRAY''@|$(REPLACE_REALLOCARRAY)|g' \ + -e 's|@''REPLACE_REALLOC''@|$(REPLACE_REALLOC)|g' \ -e 's|@''REPLACE_REALPATH''@|$(REPLACE_REALPATH)|g' \ -e 's|@''REPLACE_SETENV''@|$(REPLACE_SETENV)|g' \ -e 's|@''REPLACE_SETSTATE''@|$(REPLACE_SETSTATE)|g' \ -e 's|@''REPLACE_STRTOD''@|$(REPLACE_STRTOD)|g' \ - -e 's|@''REPLACE_STRTOL''@|$(REPLACE_STRTOL)|g' \ -e 's|@''REPLACE_STRTOLD''@|$(REPLACE_STRTOLD)|g' \ - -e 's|@''REPLACE_STRTOLL''@|$(REPLACE_STRTOLL)|g' \ - -e 's|@''REPLACE_STRTOUL''@|$(REPLACE_STRTOUL)|g' \ - -e 's|@''REPLACE_STRTOULL''@|$(REPLACE_STRTOULL)|g' \ -e 's|@''REPLACE_UNSETENV''@|$(REPLACE_UNSETENV)|g' \ -e 's|@''REPLACE_WCTOMB''@|$(REPLACE_WCTOMB)|g' \ -e '/definitions of _GL_FUNCDECL_RPL/r $(CXXDEFS_H)' \ -e '/definition of _Noreturn/r $(_NORETURN_H)' \ -e '/definition of _GL_ARG_NONNULL/r $(ARG_NONNULL_H)' \ - -e '/definition of _GL_WARN_ON_USE/r $(WARN_ON_USE_H)' \ - > $@-t - $(AM_V_at)mv $@-t $@ + -e '/definition of _GL_WARN_ON_USE/r $(WARN_ON_USE_H)'; \ + } > $@-t && \ + mv $@-t $@ # We need the following in order to create when the system # doesn't have one that works with the given compiler. string.h: string.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_NONNULL_H) $(WARN_ON_USE_H) - $(gl_V_at)$(SED_HEADER_STDOUT) \ - -e 's|@''GUARD_PREFIX''@|GL|g' \ + $(AM_V_GEN)rm -f $@-t $@ && \ + { echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */' && \ + sed -e 's|@''GUARD_PREFIX''@|GL|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_STRING_H''@|$(NEXT_STRING_H)|g' \ - -e 's/@''GNULIB_EXPLICIT_BZERO''@/$(GL_GNULIB_EXPLICIT_BZERO)/g' \ - -e 's/@''GNULIB_FFSL''@/$(GL_GNULIB_FFSL)/g' \ - -e 's/@''GNULIB_FFSLL''@/$(GL_GNULIB_FFSLL)/g' \ - -e 's/@''GNULIB_MBSLEN''@/$(GL_GNULIB_MBSLEN)/g' \ - -e 's/@''GNULIB_MBSNLEN''@/$(GL_GNULIB_MBSNLEN)/g' \ - -e 's/@''GNULIB_MBSCHR''@/$(GL_GNULIB_MBSCHR)/g' \ - -e 's/@''GNULIB_MBSRCHR''@/$(GL_GNULIB_MBSRCHR)/g' \ - -e 's/@''GNULIB_MBSSTR''@/$(GL_GNULIB_MBSSTR)/g' \ - -e 's/@''GNULIB_MBSCASECMP''@/$(GL_GNULIB_MBSCASECMP)/g' \ - -e 's/@''GNULIB_MBSNCASECMP''@/$(GL_GNULIB_MBSNCASECMP)/g' \ - -e 's/@''GNULIB_MBSPCASECMP''@/$(GL_GNULIB_MBSPCASECMP)/g' \ - -e 's/@''GNULIB_MBSCASESTR''@/$(GL_GNULIB_MBSCASESTR)/g' \ - -e 's/@''GNULIB_MBSCSPN''@/$(GL_GNULIB_MBSCSPN)/g' \ - -e 's/@''GNULIB_MBSPBRK''@/$(GL_GNULIB_MBSPBRK)/g' \ - -e 's/@''GNULIB_MBSSPN''@/$(GL_GNULIB_MBSSPN)/g' \ - -e 's/@''GNULIB_MBSSEP''@/$(GL_GNULIB_MBSSEP)/g' \ - -e 's/@''GNULIB_MBSTOK_R''@/$(GL_GNULIB_MBSTOK_R)/g' \ - -e 's/@''GNULIB_MEMCHR''@/$(GL_GNULIB_MEMCHR)/g' \ - -e 's/@''GNULIB_MEMMEM''@/$(GL_GNULIB_MEMMEM)/g' \ - -e 's/@''GNULIB_MEMPCPY''@/$(GL_GNULIB_MEMPCPY)/g' \ - -e 's/@''GNULIB_MEMRCHR''@/$(GL_GNULIB_MEMRCHR)/g' \ - -e 's/@''GNULIB_MEMSET_EXPLICIT''@/$(GL_GNULIB_MEMSET_EXPLICIT)/g' \ - -e 's/@''GNULIB_RAWMEMCHR''@/$(GL_GNULIB_RAWMEMCHR)/g' \ - -e 's/@''GNULIB_STPCPY''@/$(GL_GNULIB_STPCPY)/g' \ - -e 's/@''GNULIB_STPNCPY''@/$(GL_GNULIB_STPNCPY)/g' \ - -e 's/@''GNULIB_STRCHRNUL''@/$(GL_GNULIB_STRCHRNUL)/g' \ - -e 's/@''GNULIB_STRDUP''@/$(GL_GNULIB_STRDUP)/g' \ - -e 's/@''GNULIB_STRNCAT''@/$(GL_GNULIB_STRNCAT)/g' \ - -e 's/@''GNULIB_STRNDUP''@/$(GL_GNULIB_STRNDUP)/g' \ - -e 's/@''GNULIB_STRNLEN''@/$(GL_GNULIB_STRNLEN)/g' \ - -e 's/@''GNULIB_STRPBRK''@/$(GL_GNULIB_STRPBRK)/g' \ - -e 's/@''GNULIB_STRSEP''@/$(GL_GNULIB_STRSEP)/g' \ - -e 's/@''GNULIB_STRSTR''@/$(GL_GNULIB_STRSTR)/g' \ - -e 's/@''GNULIB_STRCASESTR''@/$(GL_GNULIB_STRCASESTR)/g' \ - -e 's/@''GNULIB_STRTOK_R''@/$(GL_GNULIB_STRTOK_R)/g' \ - -e 's/@''GNULIB_STRERROR''@/$(GL_GNULIB_STRERROR)/g' \ - -e 's/@''GNULIB_STRERROR_R''@/$(GL_GNULIB_STRERROR_R)/g' \ - -e 's/@''GNULIB_STRERRORNAME_NP''@/$(GL_GNULIB_STRERRORNAME_NP)/g' \ - -e 's/@''GNULIB_SIGABBREV_NP''@/$(GL_GNULIB_SIGABBREV_NP)/g' \ - -e 's/@''GNULIB_SIGDESCR_NP''@/$(GL_GNULIB_SIGDESCR_NP)/g' \ - -e 's/@''GNULIB_STRSIGNAL''@/$(GL_GNULIB_STRSIGNAL)/g' \ - -e 's/@''GNULIB_STRVERSCMP''@/$(GL_GNULIB_STRVERSCMP)/g' \ - -e 's/@''GNULIB_MDA_MEMCCPY''@/$(GL_GNULIB_MDA_MEMCCPY)/g' \ - -e 's/@''GNULIB_MDA_STRDUP''@/$(GL_GNULIB_MDA_STRDUP)/g' \ - -e 's/@''GNULIB_FREE_POSIX''@/$(GL_GNULIB_FREE_POSIX)/g' \ + -e 's/@''GNULIB_EXPLICIT_BZERO''@/$(GNULIB_EXPLICIT_BZERO)/g' \ + -e 's/@''GNULIB_FFSL''@/$(GNULIB_FFSL)/g' \ + -e 's/@''GNULIB_FFSLL''@/$(GNULIB_FFSLL)/g' \ + -e 's/@''GNULIB_MBSLEN''@/$(GNULIB_MBSLEN)/g' \ + -e 's/@''GNULIB_MBSNLEN''@/$(GNULIB_MBSNLEN)/g' \ + -e 's/@''GNULIB_MBSCHR''@/$(GNULIB_MBSCHR)/g' \ + -e 's/@''GNULIB_MBSRCHR''@/$(GNULIB_MBSRCHR)/g' \ + -e 's/@''GNULIB_MBSSTR''@/$(GNULIB_MBSSTR)/g' \ + -e 's/@''GNULIB_MBSCASECMP''@/$(GNULIB_MBSCASECMP)/g' \ + -e 's/@''GNULIB_MBSNCASECMP''@/$(GNULIB_MBSNCASECMP)/g' \ + -e 's/@''GNULIB_MBSPCASECMP''@/$(GNULIB_MBSPCASECMP)/g' \ + -e 's/@''GNULIB_MBSCASESTR''@/$(GNULIB_MBSCASESTR)/g' \ + -e 's/@''GNULIB_MBSCSPN''@/$(GNULIB_MBSCSPN)/g' \ + -e 's/@''GNULIB_MBSPBRK''@/$(GNULIB_MBSPBRK)/g' \ + -e 's/@''GNULIB_MBSSPN''@/$(GNULIB_MBSSPN)/g' \ + -e 's/@''GNULIB_MBSSEP''@/$(GNULIB_MBSSEP)/g' \ + -e 's/@''GNULIB_MBSTOK_R''@/$(GNULIB_MBSTOK_R)/g' \ + -e 's/@''GNULIB_MEMCHR''@/$(GNULIB_MEMCHR)/g' \ + -e 's/@''GNULIB_MEMMEM''@/$(GNULIB_MEMMEM)/g' \ + -e 's/@''GNULIB_MEMPCPY''@/$(GNULIB_MEMPCPY)/g' \ + -e 's/@''GNULIB_MEMRCHR''@/$(GNULIB_MEMRCHR)/g' \ + -e 's/@''GNULIB_RAWMEMCHR''@/$(GNULIB_RAWMEMCHR)/g' \ + -e 's/@''GNULIB_STPCPY''@/$(GNULIB_STPCPY)/g' \ + -e 's/@''GNULIB_STPNCPY''@/$(GNULIB_STPNCPY)/g' \ + -e 's/@''GNULIB_STRCHRNUL''@/$(GNULIB_STRCHRNUL)/g' \ + -e 's/@''GNULIB_STRDUP''@/$(GNULIB_STRDUP)/g' \ + -e 's/@''GNULIB_STRNCAT''@/$(GNULIB_STRNCAT)/g' \ + -e 's/@''GNULIB_STRNDUP''@/$(GNULIB_STRNDUP)/g' \ + -e 's/@''GNULIB_STRNLEN''@/$(GNULIB_STRNLEN)/g' \ + -e 's/@''GNULIB_STRPBRK''@/$(GNULIB_STRPBRK)/g' \ + -e 's/@''GNULIB_STRSEP''@/$(GNULIB_STRSEP)/g' \ + -e 's/@''GNULIB_STRSTR''@/$(GNULIB_STRSTR)/g' \ + -e 's/@''GNULIB_STRCASESTR''@/$(GNULIB_STRCASESTR)/g' \ + -e 's/@''GNULIB_STRTOK_R''@/$(GNULIB_STRTOK_R)/g' \ + -e 's/@''GNULIB_STRERROR''@/$(GNULIB_STRERROR)/g' \ + -e 's/@''GNULIB_STRERROR_R''@/$(GNULIB_STRERROR_R)/g' \ + -e 's/@''GNULIB_STRERRORNAME_NP''@/$(GNULIB_STRERRORNAME_NP)/g' \ + -e 's/@''GNULIB_SIGABBREV_NP''@/$(GNULIB_SIGABBREV_NP)/g' \ + -e 's/@''GNULIB_SIGDESCR_NP''@/$(GNULIB_SIGDESCR_NP)/g' \ + -e 's/@''GNULIB_STRSIGNAL''@/$(GNULIB_STRSIGNAL)/g' \ + -e 's/@''GNULIB_STRVERSCMP''@/$(GNULIB_STRVERSCMP)/g' \ + -e 's/@''GNULIB_MDA_MEMCCPY''@/$(GNULIB_MDA_MEMCCPY)/g' \ + -e 's/@''GNULIB_MDA_STRDUP''@/$(GNULIB_MDA_STRDUP)/g' \ < $(srcdir)/string.in.h | \ sed -e 's|@''HAVE_EXPLICIT_BZERO''@|$(HAVE_EXPLICIT_BZERO)|g' \ -e 's|@''HAVE_FFSL''@|$(HAVE_FFSL)|g' \ @@ -4541,7 +3137,6 @@ -e 's|@''HAVE_DECL_MEMMEM''@|$(HAVE_DECL_MEMMEM)|g' \ -e 's|@''HAVE_MEMPCPY''@|$(HAVE_MEMPCPY)|g' \ -e 's|@''HAVE_DECL_MEMRCHR''@|$(HAVE_DECL_MEMRCHR)|g' \ - -e 's|@''HAVE_MEMSET_EXPLICIT''@|$(HAVE_MEMSET_EXPLICIT)|g' \ -e 's|@''HAVE_RAWMEMCHR''@|$(HAVE_RAWMEMCHR)|g' \ -e 's|@''HAVE_STPCPY''@|$(HAVE_STPCPY)|g' \ -e 's|@''HAVE_STPNCPY''@|$(HAVE_STPNCPY)|g' \ @@ -4562,9 +3157,6 @@ -e 's|@''REPLACE_FFSLL''@|$(REPLACE_FFSLL)|g' \ -e 's|@''REPLACE_MEMCHR''@|$(REPLACE_MEMCHR)|g' \ -e 's|@''REPLACE_MEMMEM''@|$(REPLACE_MEMMEM)|g' \ - -e 's|@''REPLACE_MEMPCPY''@|$(REPLACE_MEMPCPY)|g' \ - -e 's|@''REPLACE_FREE''@|$(REPLACE_FREE)|g' \ - -e 's|@''REPLACE_STPCPY''@|$(REPLACE_STPCPY)|g' \ -e 's|@''REPLACE_STPNCPY''@|$(REPLACE_STPNCPY)|g' \ -e 's|@''REPLACE_STRCHRNUL''@|$(REPLACE_STRCHRNUL)|g' \ -e 's|@''REPLACE_STRDUP''@|$(REPLACE_STRDUP)|g' \ @@ -4581,42 +3173,43 @@ -e 's|@''UNDEFINE_STRTOK_R''@|$(UNDEFINE_STRTOK_R)|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)' \ - > $@-t - $(AM_V_at)mv $@-t $@ + -e '/definition of _GL_WARN_ON_USE/r $(WARN_ON_USE_H)'; \ + < $(srcdir)/string.in.h; \ + } > $@-t && \ + mv $@-t $@ # We need the following in order to create when the system # has one that is incomplete. sys/stat.h: sys_stat.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_NONNULL_H) $(WARN_ON_USE_H) - $(AM_V_GEN)$(MKDIR_P) 'sys' - $(AM_V_at)$(SED_HEADER_STDOUT) \ - -e 's|@''GUARD_PREFIX''@|GL|g' \ + $(AM_V_at)$(MKDIR_P) sys + $(AM_V_GEN)rm -f $@-t $@ && \ + { echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \ + sed -e 's|@''GUARD_PREFIX''@|GL|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_SYS_STAT_H''@|$(NEXT_SYS_STAT_H)|g' \ -e 's|@''WINDOWS_64_BIT_ST_SIZE''@|$(WINDOWS_64_BIT_ST_SIZE)|g' \ -e 's|@''WINDOWS_STAT_TIMESPEC''@|$(WINDOWS_STAT_TIMESPEC)|g' \ - -e 's/@''GNULIB_CHMOD''@/$(GL_GNULIB_CHMOD)/g' \ - -e 's/@''GNULIB_FCHMODAT''@/$(GL_GNULIB_FCHMODAT)/g' \ - -e 's/@''GNULIB_FSTAT''@/$(GL_GNULIB_FSTAT)/g' \ - -e 's/@''GNULIB_FSTATAT''@/$(GL_GNULIB_FSTATAT)/g' \ - -e 's/@''GNULIB_FUTIMENS''@/$(GL_GNULIB_FUTIMENS)/g' \ - -e 's/@''GNULIB_GETUMASK''@/$(GL_GNULIB_GETUMASK)/g' \ - -e 's/@''GNULIB_LCHMOD''@/$(GL_GNULIB_LCHMOD)/g' \ - -e 's/@''GNULIB_LSTAT''@/$(GL_GNULIB_LSTAT)/g' \ - -e 's/@''GNULIB_MKDIR''@/$(GL_GNULIB_MKDIR)/g' \ - -e 's/@''GNULIB_MKDIRAT''@/$(GL_GNULIB_MKDIRAT)/g' \ - -e 's/@''GNULIB_MKFIFO''@/$(GL_GNULIB_MKFIFO)/g' \ - -e 's/@''GNULIB_MKFIFOAT''@/$(GL_GNULIB_MKFIFOAT)/g' \ - -e 's/@''GNULIB_MKNOD''@/$(GL_GNULIB_MKNOD)/g' \ - -e 's/@''GNULIB_MKNODAT''@/$(GL_GNULIB_MKNODAT)/g' \ - -e 's/@''GNULIB_STAT''@/$(GL_GNULIB_STAT)/g' \ - -e 's/@''GNULIB_UTIMENSAT''@/$(GL_GNULIB_UTIMENSAT)/g' \ - -e 's/@''GNULIB_OVERRIDES_STRUCT_STAT''@/$(GL_GNULIB_OVERRIDES_STRUCT_STAT)/g' \ - -e 's/@''GNULIB_MDA_CHMOD''@/$(GL_GNULIB_MDA_CHMOD)/g' \ - -e 's/@''GNULIB_MDA_MKDIR''@/$(GL_GNULIB_MDA_MKDIR)/g' \ - -e 's/@''GNULIB_MDA_UMASK''@/$(GL_GNULIB_MDA_UMASK)/g' \ + -e 's/@''GNULIB_FCHMODAT''@/$(GNULIB_FCHMODAT)/g' \ + -e 's/@''GNULIB_FSTAT''@/$(GNULIB_FSTAT)/g' \ + -e 's/@''GNULIB_FSTATAT''@/$(GNULIB_FSTATAT)/g' \ + -e 's/@''GNULIB_FUTIMENS''@/$(GNULIB_FUTIMENS)/g' \ + -e 's/@''GNULIB_GETUMASK''@/$(GNULIB_GETUMASK)/g' \ + -e 's/@''GNULIB_LCHMOD''@/$(GNULIB_LCHMOD)/g' \ + -e 's/@''GNULIB_LSTAT''@/$(GNULIB_LSTAT)/g' \ + -e 's/@''GNULIB_MKDIR''@/$(GNULIB_MKDIR)/g' \ + -e 's/@''GNULIB_MKDIRAT''@/$(GNULIB_MKDIRAT)/g' \ + -e 's/@''GNULIB_MKFIFO''@/$(GNULIB_MKFIFO)/g' \ + -e 's/@''GNULIB_MKFIFOAT''@/$(GNULIB_MKFIFOAT)/g' \ + -e 's/@''GNULIB_MKNOD''@/$(GNULIB_MKNOD)/g' \ + -e 's/@''GNULIB_MKNODAT''@/$(GNULIB_MKNODAT)/g' \ + -e 's/@''GNULIB_STAT''@/$(GNULIB_STAT)/g' \ + -e 's/@''GNULIB_UTIMENSAT''@/$(GNULIB_UTIMENSAT)/g' \ + -e 's/@''GNULIB_OVERRIDES_STRUCT_STAT''@/$(GNULIB_OVERRIDES_STRUCT_STAT)/g' \ + -e 's/@''GNULIB_MDA_CHMOD''@/$(GNULIB_MDA_CHMOD)/g' \ + -e 's/@''GNULIB_MDA_MKDIR''@/$(GNULIB_MDA_MKDIR)/g' \ + -e 's/@''GNULIB_MDA_UMASK''@/$(GNULIB_MDA_UMASK)/g' \ -e 's|@''HAVE_FCHMODAT''@|$(HAVE_FCHMODAT)|g' \ -e 's|@''HAVE_FSTATAT''@|$(HAVE_FSTATAT)|g' \ -e 's|@''HAVE_FUTIMENS''@|$(HAVE_FUTIMENS)|g' \ @@ -4629,7 +3222,6 @@ -e 's|@''HAVE_MKNOD''@|$(HAVE_MKNOD)|g' \ -e 's|@''HAVE_MKNODAT''@|$(HAVE_MKNODAT)|g' \ -e 's|@''HAVE_UTIMENSAT''@|$(HAVE_UTIMENSAT)|g' \ - -e 's|@''REPLACE_CHMOD''@|$(REPLACE_CHMOD)|g' \ -e 's|@''REPLACE_FCHMODAT''@|$(REPLACE_FCHMODAT)|g' \ -e 's|@''REPLACE_FSTAT''@|$(REPLACE_FSTAT)|g' \ -e 's|@''REPLACE_FSTATAT''@|$(REPLACE_FSTATAT)|g' \ @@ -4645,53 +3237,54 @@ -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)' \ - $(srcdir)/sys_stat.in.h > $@-t - $(AM_V_at)mv $@-t $@ + < $(srcdir)/sys_stat.in.h; \ + } > $@-t && \ + mv $@-t $@ # We need the following in order to create when the system # doesn't have one that works with the given compiler. sys/types.h: sys_types.in.h $(top_builddir)/config.status - $(AM_V_GEN)$(MKDIR_P) 'sys' - $(AM_V_at)$(SED_HEADER_STDOUT) \ - -e 's|@''GUARD_PREFIX''@|GL|g' \ + $(AM_V_at)$(MKDIR_P) sys + $(AM_V_GEN)rm -f $@-t $@ && \ + { echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \ + sed -e 's|@''GUARD_PREFIX''@|GL|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_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 > $@-t - $(AM_V_at)mv $@-t $@ + < $(srcdir)/sys_types.in.h; \ + } > $@-t && \ + mv $@-t $@ # We need the following in order to create when the system # doesn't have one that works with the given compiler. time.h: time.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_NONNULL_H) $(WARN_ON_USE_H) - $(gl_V_at)$(SED_HEADER_STDOUT) \ - -e 's|@''GUARD_PREFIX''@|GL|g' \ + $(AM_V_GEN)rm -f $@-t $@ && \ + { echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */' && \ + sed -e 's|@''GUARD_PREFIX''@|GL|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_TIME_H''@|$(NEXT_TIME_H)|g' \ - -e 's/@''GNULIB_CTIME''@/$(GL_GNULIB_CTIME)/g' \ - -e 's/@''GNULIB_LOCALTIME''@/$(GL_GNULIB_LOCALTIME)/g' \ - -e 's/@''GNULIB_MKTIME''@/$(GL_GNULIB_MKTIME)/g' \ - -e 's/@''GNULIB_NANOSLEEP''@/$(GL_GNULIB_NANOSLEEP)/g' \ - -e 's/@''GNULIB_STRFTIME''@/$(GL_GNULIB_STRFTIME)/g' \ - -e 's/@''GNULIB_STRPTIME''@/$(GL_GNULIB_STRPTIME)/g' \ - -e 's/@''GNULIB_TIME''@/$(GL_GNULIB_TIME)/g' \ - -e 's/@''GNULIB_TIMEGM''@/$(GL_GNULIB_TIMEGM)/g' \ - -e 's/@''GNULIB_TIMESPEC_GET''@/$(GL_GNULIB_TIMESPEC_GET)/g' \ - -e 's/@''GNULIB_TIMESPEC_GETRES''@/$(GL_GNULIB_TIMESPEC_GETRES)/g' \ - -e 's/@''GNULIB_TIME_R''@/$(GL_GNULIB_TIME_R)/g' \ - -e 's/@''GNULIB_TIME_RZ''@/$(GL_GNULIB_TIME_RZ)/g' \ - -e 's/@''GNULIB_TZSET''@/$(GL_GNULIB_TZSET)/g' \ - -e 's/@''GNULIB_MDA_TZSET''@/$(GL_GNULIB_MDA_TZSET)/g' \ + -e 's/@''GNULIB_CTIME''@/$(GNULIB_CTIME)/g' \ + -e 's/@''GNULIB_LOCALTIME''@/$(GNULIB_LOCALTIME)/g' \ + -e 's/@''GNULIB_MKTIME''@/$(GNULIB_MKTIME)/g' \ + -e 's/@''GNULIB_NANOSLEEP''@/$(GNULIB_NANOSLEEP)/g' \ + -e 's/@''GNULIB_STRFTIME''@/$(GNULIB_STRFTIME)/g' \ + -e 's/@''GNULIB_STRPTIME''@/$(GNULIB_STRPTIME)/g' \ + -e 's/@''GNULIB_TIMEGM''@/$(GNULIB_TIMEGM)/g' \ + -e 's/@''GNULIB_TIMESPEC_GET''@/$(GNULIB_TIMESPEC_GET)/g' \ + -e 's/@''GNULIB_TIME_R''@/$(GNULIB_TIME_R)/g' \ + -e 's/@''GNULIB_TIME_RZ''@/$(GNULIB_TIME_RZ)/g' \ + -e 's/@''GNULIB_TZSET''@/$(GNULIB_TZSET)/g' \ + -e 's/@''GNULIB_MDA_TZSET''@/$(GNULIB_MDA_TZSET)/g' \ -e 's|@''HAVE_DECL_LOCALTIME_R''@|$(HAVE_DECL_LOCALTIME_R)|g' \ -e 's|@''HAVE_NANOSLEEP''@|$(HAVE_NANOSLEEP)|g' \ -e 's|@''HAVE_STRPTIME''@|$(HAVE_STRPTIME)|g' \ -e 's|@''HAVE_TIMEGM''@|$(HAVE_TIMEGM)|g' \ -e 's|@''HAVE_TIMESPEC_GET''@|$(HAVE_TIMESPEC_GET)|g' \ - -e 's|@''HAVE_TIMESPEC_GETRES''@|$(HAVE_TIMESPEC_GETRES)|g' \ -e 's|@''HAVE_TIMEZONE_T''@|$(HAVE_TIMEZONE_T)|g' \ -e 's|@''REPLACE_CTIME''@|$(REPLACE_CTIME)|g' \ -e 's|@''REPLACE_GMTIME''@|$(REPLACE_GMTIME)|g' \ @@ -4700,9 +3293,7 @@ -e 's|@''REPLACE_MKTIME''@|$(REPLACE_MKTIME)|g' \ -e 's|@''REPLACE_NANOSLEEP''@|$(REPLACE_NANOSLEEP)|g' \ -e 's|@''REPLACE_STRFTIME''@|$(REPLACE_STRFTIME)|g' \ - -e 's|@''REPLACE_TIME''@|$(REPLACE_TIME)|g' \ -e 's|@''REPLACE_TIMEGM''@|$(REPLACE_TIMEGM)|g' \ - -e 's|@''REPLACE_TIMESPEC_GET''@|$(REPLACE_TIMESPEC_GET)|g' \ -e 's|@''REPLACE_TZSET''@|$(REPLACE_TZSET)|g' \ -e 's|@''PTHREAD_H_DEFINES_STRUCT_TIMESPEC''@|$(PTHREAD_H_DEFINES_STRUCT_TIMESPEC)|g' \ -e 's|@''SYS_TIME_H_DEFINES_STRUCT_TIMESPEC''@|$(SYS_TIME_H_DEFINES_STRUCT_TIMESPEC)|g' \ @@ -4712,104 +3303,105 @@ -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)' \ - $(srcdir)/time.in.h > $@-t - $(AM_V_at)mv $@-t $@ + < $(srcdir)/time.in.h; \ + } > $@-t && \ + mv $@-t $@ # We need the following in order to create an empty placeholder for # when the system doesn't have one. unistd.h: unistd.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_NONNULL_H) $(WARN_ON_USE_H) - $(gl_V_at)$(SED_HEADER_STDOUT) \ - -e 's|@''GUARD_PREFIX''@|GL|g' \ + $(AM_V_GEN)rm -f $@-t $@ && \ + { echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \ + sed -e 's|@''GUARD_PREFIX''@|GL|g' \ -e 's|@''HAVE_UNISTD_H''@|$(HAVE_UNISTD_H)|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_UNISTD_H''@|$(NEXT_UNISTD_H)|g' \ -e 's|@''WINDOWS_64_BIT_OFF_T''@|$(WINDOWS_64_BIT_OFF_T)|g' \ - -e 's/@''GNULIB_ACCESS''@/$(GL_GNULIB_ACCESS)/g' \ - -e 's/@''GNULIB_CHDIR''@/$(GL_GNULIB_CHDIR)/g' \ - -e 's/@''GNULIB_CHOWN''@/$(GL_GNULIB_CHOWN)/g' \ - -e 's/@''GNULIB_CLOSE''@/$(GL_GNULIB_CLOSE)/g' \ - -e 's/@''GNULIB_COPY_FILE_RANGE''@/$(GL_GNULIB_COPY_FILE_RANGE)/g' \ - -e 's/@''GNULIB_DUP''@/$(GL_GNULIB_DUP)/g' \ - -e 's/@''GNULIB_DUP2''@/$(GL_GNULIB_DUP2)/g' \ - -e 's/@''GNULIB_DUP3''@/$(GL_GNULIB_DUP3)/g' \ - -e 's/@''GNULIB_ENVIRON''@/$(GL_GNULIB_ENVIRON)/g' \ - -e 's/@''GNULIB_EUIDACCESS''@/$(GL_GNULIB_EUIDACCESS)/g' \ - -e 's/@''GNULIB_EXECL''@/$(GL_GNULIB_EXECL)/g' \ - -e 's/@''GNULIB_EXECLE''@/$(GL_GNULIB_EXECLE)/g' \ - -e 's/@''GNULIB_EXECLP''@/$(GL_GNULIB_EXECLP)/g' \ - -e 's/@''GNULIB_EXECV''@/$(GL_GNULIB_EXECV)/g' \ - -e 's/@''GNULIB_EXECVE''@/$(GL_GNULIB_EXECVE)/g' \ - -e 's/@''GNULIB_EXECVP''@/$(GL_GNULIB_EXECVP)/g' \ - -e 's/@''GNULIB_EXECVPE''@/$(GL_GNULIB_EXECVPE)/g' \ - -e 's/@''GNULIB_FACCESSAT''@/$(GL_GNULIB_FACCESSAT)/g' \ - -e 's/@''GNULIB_FCHDIR''@/$(GL_GNULIB_FCHDIR)/g' \ - -e 's/@''GNULIB_FCHOWNAT''@/$(GL_GNULIB_FCHOWNAT)/g' \ - -e 's/@''GNULIB_FDATASYNC''@/$(GL_GNULIB_FDATASYNC)/g' \ - -e 's/@''GNULIB_FSYNC''@/$(GL_GNULIB_FSYNC)/g' \ - -e 's/@''GNULIB_FTRUNCATE''@/$(GL_GNULIB_FTRUNCATE)/g' \ - -e 's/@''GNULIB_GETCWD''@/$(GL_GNULIB_GETCWD)/g' \ - -e 's/@''GNULIB_GETDOMAINNAME''@/$(GL_GNULIB_GETDOMAINNAME)/g' \ - -e 's/@''GNULIB_GETDTABLESIZE''@/$(GL_GNULIB_GETDTABLESIZE)/g' \ - -e 's/@''GNULIB_GETENTROPY''@/$(GL_GNULIB_GETENTROPY)/g' \ - -e 's/@''GNULIB_GETGROUPS''@/$(GL_GNULIB_GETGROUPS)/g' \ - -e 's/@''GNULIB_GETHOSTNAME''@/$(GL_GNULIB_GETHOSTNAME)/g' \ - -e 's/@''GNULIB_GETLOGIN''@/$(GL_GNULIB_GETLOGIN)/g' \ - -e 's/@''GNULIB_GETLOGIN_R''@/$(GL_GNULIB_GETLOGIN_R)/g' \ - -e 's/@''GNULIB_GETOPT_POSIX''@/$(GL_GNULIB_GETOPT_POSIX)/g' \ - -e 's/@''GNULIB_GETPAGESIZE''@/$(GL_GNULIB_GETPAGESIZE)/g' \ - -e 's/@''GNULIB_GETPASS''@/$(GL_GNULIB_GETPASS)/g' \ - -e 's/@''GNULIB_GETPASS_GNU''@/$(GL_GNULIB_GETPASS_GNU)/g' \ - -e 's/@''GNULIB_GETUSERSHELL''@/$(GL_GNULIB_GETUSERSHELL)/g' \ - -e 's/@''GNULIB_GROUP_MEMBER''@/$(GL_GNULIB_GROUP_MEMBER)/g' \ - -e 's/@''GNULIB_ISATTY''@/$(GL_GNULIB_ISATTY)/g' \ - -e 's/@''GNULIB_LCHOWN''@/$(GL_GNULIB_LCHOWN)/g' \ - -e 's/@''GNULIB_LINK''@/$(GL_GNULIB_LINK)/g' \ - -e 's/@''GNULIB_LINKAT''@/$(GL_GNULIB_LINKAT)/g' \ - -e 's/@''GNULIB_LSEEK''@/$(GL_GNULIB_LSEEK)/g' \ - -e 's/@''GNULIB_PIPE''@/$(GL_GNULIB_PIPE)/g' \ - -e 's/@''GNULIB_PIPE2''@/$(GL_GNULIB_PIPE2)/g' \ - -e 's/@''GNULIB_PREAD''@/$(GL_GNULIB_PREAD)/g' \ - -e 's/@''GNULIB_PWRITE''@/$(GL_GNULIB_PWRITE)/g' \ - -e 's/@''GNULIB_READ''@/$(GL_GNULIB_READ)/g' \ - -e 's/@''GNULIB_READLINK''@/$(GL_GNULIB_READLINK)/g' \ - -e 's/@''GNULIB_READLINKAT''@/$(GL_GNULIB_READLINKAT)/g' \ - -e 's/@''GNULIB_RMDIR''@/$(GL_GNULIB_RMDIR)/g' \ - -e 's/@''GNULIB_SETHOSTNAME''@/$(GL_GNULIB_SETHOSTNAME)/g' \ - -e 's/@''GNULIB_SLEEP''@/$(GL_GNULIB_SLEEP)/g' \ - -e 's/@''GNULIB_SYMLINK''@/$(GL_GNULIB_SYMLINK)/g' \ - -e 's/@''GNULIB_SYMLINKAT''@/$(GL_GNULIB_SYMLINKAT)/g' \ - -e 's/@''GNULIB_TRUNCATE''@/$(GL_GNULIB_TRUNCATE)/g' \ - -e 's/@''GNULIB_TTYNAME_R''@/$(GL_GNULIB_TTYNAME_R)/g' \ - -e 's/@''GNULIB_UNISTD_H_GETOPT''@/0$(GL_GNULIB_UNISTD_H_GETOPT)/g' \ - -e 's/@''GNULIB_UNISTD_H_NONBLOCKING''@/$(GL_GNULIB_UNISTD_H_NONBLOCKING)/g' \ - -e 's/@''GNULIB_UNISTD_H_SIGPIPE''@/$(GL_GNULIB_UNISTD_H_SIGPIPE)/g' \ - -e 's/@''GNULIB_UNLINK''@/$(GL_GNULIB_UNLINK)/g' \ - -e 's/@''GNULIB_UNLINKAT''@/$(GL_GNULIB_UNLINKAT)/g' \ - -e 's/@''GNULIB_USLEEP''@/$(GL_GNULIB_USLEEP)/g' \ - -e 's/@''GNULIB_WRITE''@/$(GL_GNULIB_WRITE)/g' \ - -e 's/@''GNULIB_MDA_ACCESS''@/$(GL_GNULIB_MDA_ACCESS)/g' \ - -e 's/@''GNULIB_MDA_CHDIR''@/$(GL_GNULIB_MDA_CHDIR)/g' \ - -e 's/@''GNULIB_MDA_CLOSE''@/$(GL_GNULIB_MDA_CLOSE)/g' \ - -e 's/@''GNULIB_MDA_DUP''@/$(GL_GNULIB_MDA_DUP)/g' \ - -e 's/@''GNULIB_MDA_DUP2''@/$(GL_GNULIB_MDA_DUP2)/g' \ - -e 's/@''GNULIB_MDA_EXECL''@/$(GL_GNULIB_MDA_EXECL)/g' \ - -e 's/@''GNULIB_MDA_EXECLE''@/$(GL_GNULIB_MDA_EXECLE)/g' \ - -e 's/@''GNULIB_MDA_EXECLP''@/$(GL_GNULIB_MDA_EXECLP)/g' \ - -e 's/@''GNULIB_MDA_EXECV''@/$(GL_GNULIB_MDA_EXECV)/g' \ - -e 's/@''GNULIB_MDA_EXECVE''@/$(GL_GNULIB_MDA_EXECVE)/g' \ - -e 's/@''GNULIB_MDA_EXECVP''@/$(GL_GNULIB_MDA_EXECVP)/g' \ - -e 's/@''GNULIB_MDA_EXECVPE''@/$(GL_GNULIB_MDA_EXECVPE)/g' \ - -e 's/@''GNULIB_MDA_GETCWD''@/$(GL_GNULIB_MDA_GETCWD)/g' \ - -e 's/@''GNULIB_MDA_GETPID''@/$(GL_GNULIB_MDA_GETPID)/g' \ - -e 's/@''GNULIB_MDA_ISATTY''@/$(GL_GNULIB_MDA_ISATTY)/g' \ - -e 's/@''GNULIB_MDA_LSEEK''@/$(GL_GNULIB_MDA_LSEEK)/g' \ - -e 's/@''GNULIB_MDA_READ''@/$(GL_GNULIB_MDA_READ)/g' \ - -e 's/@''GNULIB_MDA_RMDIR''@/$(GL_GNULIB_MDA_RMDIR)/g' \ - -e 's/@''GNULIB_MDA_SWAB''@/$(GL_GNULIB_MDA_SWAB)/g' \ - -e 's/@''GNULIB_MDA_UNLINK''@/$(GL_GNULIB_MDA_UNLINK)/g' \ - -e 's/@''GNULIB_MDA_WRITE''@/$(GL_GNULIB_MDA_WRITE)/g' \ + -e 's/@''GNULIB_ACCESS''@/$(GNULIB_ACCESS)/g' \ + -e 's/@''GNULIB_CHDIR''@/$(GNULIB_CHDIR)/g' \ + -e 's/@''GNULIB_CHOWN''@/$(GNULIB_CHOWN)/g' \ + -e 's/@''GNULIB_CLOSE''@/$(GNULIB_CLOSE)/g' \ + -e 's/@''GNULIB_COPY_FILE_RANGE''@/$(GNULIB_COPY_FILE_RANGE)/g' \ + -e 's/@''GNULIB_DUP''@/$(GNULIB_DUP)/g' \ + -e 's/@''GNULIB_DUP2''@/$(GNULIB_DUP2)/g' \ + -e 's/@''GNULIB_DUP3''@/$(GNULIB_DUP3)/g' \ + -e 's/@''GNULIB_ENVIRON''@/$(GNULIB_ENVIRON)/g' \ + -e 's/@''GNULIB_EUIDACCESS''@/$(GNULIB_EUIDACCESS)/g' \ + -e 's/@''GNULIB_EXECL''@/$(GNULIB_EXECL)/g' \ + -e 's/@''GNULIB_EXECLE''@/$(GNULIB_EXECLE)/g' \ + -e 's/@''GNULIB_EXECLP''@/$(GNULIB_EXECLP)/g' \ + -e 's/@''GNULIB_EXECV''@/$(GNULIB_EXECV)/g' \ + -e 's/@''GNULIB_EXECVE''@/$(GNULIB_EXECVE)/g' \ + -e 's/@''GNULIB_EXECVP''@/$(GNULIB_EXECVP)/g' \ + -e 's/@''GNULIB_EXECVPE''@/$(GNULIB_EXECVPE)/g' \ + -e 's/@''GNULIB_FACCESSAT''@/$(GNULIB_FACCESSAT)/g' \ + -e 's/@''GNULIB_FCHDIR''@/$(GNULIB_FCHDIR)/g' \ + -e 's/@''GNULIB_FCHOWNAT''@/$(GNULIB_FCHOWNAT)/g' \ + -e 's/@''GNULIB_FDATASYNC''@/$(GNULIB_FDATASYNC)/g' \ + -e 's/@''GNULIB_FSYNC''@/$(GNULIB_FSYNC)/g' \ + -e 's/@''GNULIB_FTRUNCATE''@/$(GNULIB_FTRUNCATE)/g' \ + -e 's/@''GNULIB_GETCWD''@/$(GNULIB_GETCWD)/g' \ + -e 's/@''GNULIB_GETDOMAINNAME''@/$(GNULIB_GETDOMAINNAME)/g' \ + -e 's/@''GNULIB_GETDTABLESIZE''@/$(GNULIB_GETDTABLESIZE)/g' \ + -e 's/@''GNULIB_GETENTROPY''@/$(GNULIB_GETENTROPY)/g' \ + -e 's/@''GNULIB_GETGROUPS''@/$(GNULIB_GETGROUPS)/g' \ + -e 's/@''GNULIB_GETHOSTNAME''@/$(GNULIB_GETHOSTNAME)/g' \ + -e 's/@''GNULIB_GETLOGIN''@/$(GNULIB_GETLOGIN)/g' \ + -e 's/@''GNULIB_GETLOGIN_R''@/$(GNULIB_GETLOGIN_R)/g' \ + -e 's/@''GNULIB_GETOPT_POSIX''@/$(GNULIB_GETOPT_POSIX)/g' \ + -e 's/@''GNULIB_GETPAGESIZE''@/$(GNULIB_GETPAGESIZE)/g' \ + -e 's/@''GNULIB_GETPASS''@/$(GNULIB_GETPASS)/g' \ + -e 's/@''GNULIB_GETUSERSHELL''@/$(GNULIB_GETUSERSHELL)/g' \ + -e 's/@''GNULIB_GROUP_MEMBER''@/$(GNULIB_GROUP_MEMBER)/g' \ + -e 's/@''GNULIB_ISATTY''@/$(GNULIB_ISATTY)/g' \ + -e 's/@''GNULIB_LCHOWN''@/$(GNULIB_LCHOWN)/g' \ + -e 's/@''GNULIB_LINK''@/$(GNULIB_LINK)/g' \ + -e 's/@''GNULIB_LINKAT''@/$(GNULIB_LINKAT)/g' \ + -e 's/@''GNULIB_LSEEK''@/$(GNULIB_LSEEK)/g' \ + -e 's/@''GNULIB_PIPE''@/$(GNULIB_PIPE)/g' \ + -e 's/@''GNULIB_PIPE2''@/$(GNULIB_PIPE2)/g' \ + -e 's/@''GNULIB_PREAD''@/$(GNULIB_PREAD)/g' \ + -e 's/@''GNULIB_PWRITE''@/$(GNULIB_PWRITE)/g' \ + -e 's/@''GNULIB_READ''@/$(GNULIB_READ)/g' \ + -e 's/@''GNULIB_READLINK''@/$(GNULIB_READLINK)/g' \ + -e 's/@''GNULIB_READLINKAT''@/$(GNULIB_READLINKAT)/g' \ + -e 's/@''GNULIB_RMDIR''@/$(GNULIB_RMDIR)/g' \ + -e 's/@''GNULIB_SETHOSTNAME''@/$(GNULIB_SETHOSTNAME)/g' \ + -e 's/@''GNULIB_SLEEP''@/$(GNULIB_SLEEP)/g' \ + -e 's/@''GNULIB_SYMLINK''@/$(GNULIB_SYMLINK)/g' \ + -e 's/@''GNULIB_SYMLINKAT''@/$(GNULIB_SYMLINKAT)/g' \ + -e 's/@''GNULIB_TRUNCATE''@/$(GNULIB_TRUNCATE)/g' \ + -e 's/@''GNULIB_TTYNAME_R''@/$(GNULIB_TTYNAME_R)/g' \ + -e 's/@''GNULIB_UNISTD_H_GETOPT''@/0$(GNULIB_GL_UNISTD_H_GETOPT)/g' \ + -e 's/@''GNULIB_UNISTD_H_NONBLOCKING''@/$(GNULIB_UNISTD_H_NONBLOCKING)/g' \ + -e 's/@''GNULIB_UNISTD_H_SIGPIPE''@/$(GNULIB_UNISTD_H_SIGPIPE)/g' \ + -e 's/@''GNULIB_UNLINK''@/$(GNULIB_UNLINK)/g' \ + -e 's/@''GNULIB_UNLINKAT''@/$(GNULIB_UNLINKAT)/g' \ + -e 's/@''GNULIB_USLEEP''@/$(GNULIB_USLEEP)/g' \ + -e 's/@''GNULIB_WRITE''@/$(GNULIB_WRITE)/g' \ + -e 's/@''GNULIB_MDA_ACCESS''@/$(GNULIB_MDA_ACCESS)/g' \ + -e 's/@''GNULIB_MDA_CHDIR''@/$(GNULIB_MDA_CHDIR)/g' \ + -e 's/@''GNULIB_MDA_CLOSE''@/$(GNULIB_MDA_CLOSE)/g' \ + -e 's/@''GNULIB_MDA_DUP''@/$(GNULIB_MDA_DUP)/g' \ + -e 's/@''GNULIB_MDA_DUP2''@/$(GNULIB_MDA_DUP2)/g' \ + -e 's/@''GNULIB_MDA_EXECL''@/$(GNULIB_MDA_EXECL)/g' \ + -e 's/@''GNULIB_MDA_EXECLE''@/$(GNULIB_MDA_EXECLE)/g' \ + -e 's/@''GNULIB_MDA_EXECLP''@/$(GNULIB_MDA_EXECLP)/g' \ + -e 's/@''GNULIB_MDA_EXECV''@/$(GNULIB_MDA_EXECV)/g' \ + -e 's/@''GNULIB_MDA_EXECVE''@/$(GNULIB_MDA_EXECVE)/g' \ + -e 's/@''GNULIB_MDA_EXECVP''@/$(GNULIB_MDA_EXECVP)/g' \ + -e 's/@''GNULIB_MDA_EXECVPE''@/$(GNULIB_MDA_EXECVPE)/g' \ + -e 's/@''GNULIB_MDA_GETCWD''@/$(GNULIB_MDA_GETCWD)/g' \ + -e 's/@''GNULIB_MDA_GETPID''@/$(GNULIB_MDA_GETPID)/g' \ + -e 's/@''GNULIB_MDA_ISATTY''@/$(GNULIB_MDA_ISATTY)/g' \ + -e 's/@''GNULIB_MDA_LSEEK''@/$(GNULIB_MDA_LSEEK)/g' \ + -e 's/@''GNULIB_MDA_READ''@/$(GNULIB_MDA_READ)/g' \ + -e 's/@''GNULIB_MDA_RMDIR''@/$(GNULIB_MDA_RMDIR)/g' \ + -e 's/@''GNULIB_MDA_SWAB''@/$(GNULIB_MDA_SWAB)/g' \ + -e 's/@''GNULIB_MDA_UNLINK''@/$(GNULIB_MDA_UNLINK)/g' \ + -e 's/@''GNULIB_MDA_WRITE''@/$(GNULIB_MDA_WRITE)/g' \ < $(srcdir)/unistd.in.h | \ sed -e 's|@''HAVE_CHOWN''@|$(HAVE_CHOWN)|g' \ -e 's|@''HAVE_COPY_FILE_RANGE''@|$(HAVE_COPY_FILE_RANGE)|g' \ @@ -4862,10 +3454,8 @@ sed -e 's|@''REPLACE_ACCESS''@|$(REPLACE_ACCESS)|g' \ -e 's|@''REPLACE_CHOWN''@|$(REPLACE_CHOWN)|g' \ -e 's|@''REPLACE_CLOSE''@|$(REPLACE_CLOSE)|g' \ - -e 's|@''REPLACE_COPY_FILE_RANGE''@|$(REPLACE_COPY_FILE_RANGE)|g' \ -e 's|@''REPLACE_DUP''@|$(REPLACE_DUP)|g' \ -e 's|@''REPLACE_DUP2''@|$(REPLACE_DUP2)|g' \ - -e 's|@''REPLACE_DUP3''@|$(REPLACE_DUP3)|g' \ -e 's|@''REPLACE_EXECL''@|$(REPLACE_EXECL)|g' \ -e 's|@''REPLACE_EXECLE''@|$(REPLACE_EXECLE)|g' \ -e 's|@''REPLACE_EXECLP''@|$(REPLACE_EXECLP)|g' \ @@ -4875,30 +3465,25 @@ -e 's|@''REPLACE_EXECVPE''@|$(REPLACE_EXECVPE)|g' \ -e 's|@''REPLACE_FACCESSAT''@|$(REPLACE_FACCESSAT)|g' \ -e 's|@''REPLACE_FCHOWNAT''@|$(REPLACE_FCHOWNAT)|g' \ - -e 's|@''REPLACE_FDATASYNC''@|$(REPLACE_FDATASYNC)|g' \ -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_GETENTROPY''@|$(REPLACE_GETENTROPY)|g' \ -e 's|@''REPLACE_GETLOGIN_R''@|$(REPLACE_GETLOGIN_R)|g' \ -e 's|@''REPLACE_GETGROUPS''@|$(REPLACE_GETGROUPS)|g' \ -e 's|@''REPLACE_GETPAGESIZE''@|$(REPLACE_GETPAGESIZE)|g' \ -e 's|@''REPLACE_GETPASS''@|$(REPLACE_GETPASS)|g' \ - -e 's|@''REPLACE_GETPASS_FOR_GETPASS_GNU''@|$(REPLACE_GETPASS_FOR_GETPASS_GNU)|g' \ -e 's|@''REPLACE_ISATTY''@|$(REPLACE_ISATTY)|g' \ -e 's|@''REPLACE_LCHOWN''@|$(REPLACE_LCHOWN)|g' \ -e 's|@''REPLACE_LINK''@|$(REPLACE_LINK)|g' \ -e 's|@''REPLACE_LINKAT''@|$(REPLACE_LINKAT)|g' \ -e 's|@''REPLACE_LSEEK''@|$(REPLACE_LSEEK)|g' \ - -e 's|@''REPLACE_PIPE2''@|$(REPLACE_PIPE2)|g' \ -e 's|@''REPLACE_PREAD''@|$(REPLACE_PREAD)|g' \ -e 's|@''REPLACE_PWRITE''@|$(REPLACE_PWRITE)|g' \ -e 's|@''REPLACE_READ''@|$(REPLACE_READ)|g' \ -e 's|@''REPLACE_READLINK''@|$(REPLACE_READLINK)|g' \ -e 's|@''REPLACE_READLINKAT''@|$(REPLACE_READLINKAT)|g' \ -e 's|@''REPLACE_RMDIR''@|$(REPLACE_RMDIR)|g' \ - -e 's|@''REPLACE_SETHOSTNAME''@|$(REPLACE_SETHOSTNAME)|g' \ -e 's|@''REPLACE_SLEEP''@|$(REPLACE_SLEEP)|g' \ -e 's|@''REPLACE_SYMLINK''@|$(REPLACE_SYMLINK)|g' \ -e 's|@''REPLACE_SYMLINKAT''@|$(REPLACE_SYMLINKAT)|g' \ @@ -4913,15 +3498,16 @@ -e 's|@''UNISTD_H_HAVE_WINSOCK2_H_AND_USE_SOCKETS''@|$(UNISTD_H_HAVE_WINSOCK2_H_AND_USE_SOCKETS)|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)' \ - > $@-t - $(AM_V_at)mv $@-t $@ + -e '/definition of _GL_WARN_ON_USE/r $(WARN_ON_USE_H)'; \ + } > $@-t && \ + mv $@-t $@ # We need the following in order to create when the system # version does not work standalone. wchar.h: wchar.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_NONNULL_H) $(WARN_ON_USE_H) - $(gl_V_at)$(SED_HEADER_STDOUT) \ - -e 's|@''GUARD_PREFIX''@|GL|g' \ + $(AM_V_GEN)rm -f $@-t $@ && \ + { echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \ + sed -e 's|@''GUARD_PREFIX''@|GL|g' \ -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \ -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \ -e 's|@''PRAGMA_COLUMNS''@|@PRAGMA_COLUMNS@|g' \ @@ -4929,50 +3515,49 @@ -e 's|@''NEXT_WCHAR_H''@|$(NEXT_WCHAR_H)|g' \ -e 's|@''HAVE_WCHAR_H''@|$(HAVE_WCHAR_H)|g' \ -e 's/@''HAVE_CRTDEFS_H''@/$(HAVE_CRTDEFS_H)/g' \ - -e 's/@''GNULIBHEADERS_OVERRIDE_WINT_T''@/$(GNULIBHEADERS_OVERRIDE_WINT_T)/g' \ - -e 's/@''GNULIB_BTOWC''@/$(GL_GNULIB_BTOWC)/g' \ - -e 's/@''GNULIB_WCTOB''@/$(GL_GNULIB_WCTOB)/g' \ - -e 's/@''GNULIB_MBSINIT''@/$(GL_GNULIB_MBSINIT)/g' \ - -e 's/@''GNULIB_MBRTOWC''@/$(GL_GNULIB_MBRTOWC)/g' \ - -e 's/@''GNULIB_MBRLEN''@/$(GL_GNULIB_MBRLEN)/g' \ - -e 's/@''GNULIB_MBSRTOWCS''@/$(GL_GNULIB_MBSRTOWCS)/g' \ - -e 's/@''GNULIB_MBSNRTOWCS''@/$(GL_GNULIB_MBSNRTOWCS)/g' \ - -e 's/@''GNULIB_WCRTOMB''@/$(GL_GNULIB_WCRTOMB)/g' \ - -e 's/@''GNULIB_WCSRTOMBS''@/$(GL_GNULIB_WCSRTOMBS)/g' \ - -e 's/@''GNULIB_WCSNRTOMBS''@/$(GL_GNULIB_WCSNRTOMBS)/g' \ - -e 's/@''GNULIB_WCWIDTH''@/$(GL_GNULIB_WCWIDTH)/g' \ - -e 's/@''GNULIB_WMEMCHR''@/$(GL_GNULIB_WMEMCHR)/g' \ - -e 's/@''GNULIB_WMEMCMP''@/$(GL_GNULIB_WMEMCMP)/g' \ - -e 's/@''GNULIB_WMEMCPY''@/$(GL_GNULIB_WMEMCPY)/g' \ - -e 's/@''GNULIB_WMEMMOVE''@/$(GL_GNULIB_WMEMMOVE)/g' \ - -e 's/@''GNULIB_WMEMPCPY''@/$(GL_GNULIB_WMEMPCPY)/g' \ - -e 's/@''GNULIB_WMEMSET''@/$(GL_GNULIB_WMEMSET)/g' \ - -e 's/@''GNULIB_WCSLEN''@/$(GL_GNULIB_WCSLEN)/g' \ - -e 's/@''GNULIB_WCSNLEN''@/$(GL_GNULIB_WCSNLEN)/g' \ - -e 's/@''GNULIB_WCSCPY''@/$(GL_GNULIB_WCSCPY)/g' \ - -e 's/@''GNULIB_WCPCPY''@/$(GL_GNULIB_WCPCPY)/g' \ - -e 's/@''GNULIB_WCSNCPY''@/$(GL_GNULIB_WCSNCPY)/g' \ - -e 's/@''GNULIB_WCPNCPY''@/$(GL_GNULIB_WCPNCPY)/g' \ - -e 's/@''GNULIB_WCSCAT''@/$(GL_GNULIB_WCSCAT)/g' \ - -e 's/@''GNULIB_WCSNCAT''@/$(GL_GNULIB_WCSNCAT)/g' \ - -e 's/@''GNULIB_WCSCMP''@/$(GL_GNULIB_WCSCMP)/g' \ - -e 's/@''GNULIB_WCSNCMP''@/$(GL_GNULIB_WCSNCMP)/g' \ - -e 's/@''GNULIB_WCSCASECMP''@/$(GL_GNULIB_WCSCASECMP)/g' \ - -e 's/@''GNULIB_WCSNCASECMP''@/$(GL_GNULIB_WCSNCASECMP)/g' \ - -e 's/@''GNULIB_WCSCOLL''@/$(GL_GNULIB_WCSCOLL)/g' \ - -e 's/@''GNULIB_WCSXFRM''@/$(GL_GNULIB_WCSXFRM)/g' \ - -e 's/@''GNULIB_WCSDUP''@/$(GL_GNULIB_WCSDUP)/g' \ - -e 's/@''GNULIB_WCSCHR''@/$(GL_GNULIB_WCSCHR)/g' \ - -e 's/@''GNULIB_WCSRCHR''@/$(GL_GNULIB_WCSRCHR)/g' \ - -e 's/@''GNULIB_WCSCSPN''@/$(GL_GNULIB_WCSCSPN)/g' \ - -e 's/@''GNULIB_WCSSPN''@/$(GL_GNULIB_WCSSPN)/g' \ - -e 's/@''GNULIB_WCSPBRK''@/$(GL_GNULIB_WCSPBRK)/g' \ - -e 's/@''GNULIB_WCSSTR''@/$(GL_GNULIB_WCSSTR)/g' \ - -e 's/@''GNULIB_WCSTOK''@/$(GL_GNULIB_WCSTOK)/g' \ - -e 's/@''GNULIB_WCSWIDTH''@/$(GL_GNULIB_WCSWIDTH)/g' \ - -e 's/@''GNULIB_WCSFTIME''@/$(GL_GNULIB_WCSFTIME)/g' \ - -e 's/@''GNULIB_MDA_WCSDUP''@/$(GL_GNULIB_MDA_WCSDUP)/g' \ - -e 's/@''GNULIB_FREE_POSIX''@/$(GL_GNULIB_FREE_POSIX)/g' \ + -e 's/@''GNULIB_OVERRIDES_WINT_T''@/$(GNULIB_OVERRIDES_WINT_T)/g' \ + -e 's/@''GNULIB_BTOWC''@/$(GNULIB_BTOWC)/g' \ + -e 's/@''GNULIB_WCTOB''@/$(GNULIB_WCTOB)/g' \ + -e 's/@''GNULIB_MBSINIT''@/$(GNULIB_MBSINIT)/g' \ + -e 's/@''GNULIB_MBRTOWC''@/$(GNULIB_MBRTOWC)/g' \ + -e 's/@''GNULIB_MBRLEN''@/$(GNULIB_MBRLEN)/g' \ + -e 's/@''GNULIB_MBSRTOWCS''@/$(GNULIB_MBSRTOWCS)/g' \ + -e 's/@''GNULIB_MBSNRTOWCS''@/$(GNULIB_MBSNRTOWCS)/g' \ + -e 's/@''GNULIB_WCRTOMB''@/$(GNULIB_WCRTOMB)/g' \ + -e 's/@''GNULIB_WCSRTOMBS''@/$(GNULIB_WCSRTOMBS)/g' \ + -e 's/@''GNULIB_WCSNRTOMBS''@/$(GNULIB_WCSNRTOMBS)/g' \ + -e 's/@''GNULIB_WCWIDTH''@/$(GNULIB_WCWIDTH)/g' \ + -e 's/@''GNULIB_WMEMCHR''@/$(GNULIB_WMEMCHR)/g' \ + -e 's/@''GNULIB_WMEMCMP''@/$(GNULIB_WMEMCMP)/g' \ + -e 's/@''GNULIB_WMEMCPY''@/$(GNULIB_WMEMCPY)/g' \ + -e 's/@''GNULIB_WMEMMOVE''@/$(GNULIB_WMEMMOVE)/g' \ + -e 's/@''GNULIB_WMEMPCPY''@/$(GNULIB_WMEMPCPY)/g' \ + -e 's/@''GNULIB_WMEMSET''@/$(GNULIB_WMEMSET)/g' \ + -e 's/@''GNULIB_WCSLEN''@/$(GNULIB_WCSLEN)/g' \ + -e 's/@''GNULIB_WCSNLEN''@/$(GNULIB_WCSNLEN)/g' \ + -e 's/@''GNULIB_WCSCPY''@/$(GNULIB_WCSCPY)/g' \ + -e 's/@''GNULIB_WCPCPY''@/$(GNULIB_WCPCPY)/g' \ + -e 's/@''GNULIB_WCSNCPY''@/$(GNULIB_WCSNCPY)/g' \ + -e 's/@''GNULIB_WCPNCPY''@/$(GNULIB_WCPNCPY)/g' \ + -e 's/@''GNULIB_WCSCAT''@/$(GNULIB_WCSCAT)/g' \ + -e 's/@''GNULIB_WCSNCAT''@/$(GNULIB_WCSNCAT)/g' \ + -e 's/@''GNULIB_WCSCMP''@/$(GNULIB_WCSCMP)/g' \ + -e 's/@''GNULIB_WCSNCMP''@/$(GNULIB_WCSNCMP)/g' \ + -e 's/@''GNULIB_WCSCASECMP''@/$(GNULIB_WCSCASECMP)/g' \ + -e 's/@''GNULIB_WCSNCASECMP''@/$(GNULIB_WCSNCASECMP)/g' \ + -e 's/@''GNULIB_WCSCOLL''@/$(GNULIB_WCSCOLL)/g' \ + -e 's/@''GNULIB_WCSXFRM''@/$(GNULIB_WCSXFRM)/g' \ + -e 's/@''GNULIB_WCSDUP''@/$(GNULIB_WCSDUP)/g' \ + -e 's/@''GNULIB_WCSCHR''@/$(GNULIB_WCSCHR)/g' \ + -e 's/@''GNULIB_WCSRCHR''@/$(GNULIB_WCSRCHR)/g' \ + -e 's/@''GNULIB_WCSCSPN''@/$(GNULIB_WCSCSPN)/g' \ + -e 's/@''GNULIB_WCSSPN''@/$(GNULIB_WCSSPN)/g' \ + -e 's/@''GNULIB_WCSPBRK''@/$(GNULIB_WCSPBRK)/g' \ + -e 's/@''GNULIB_WCSSTR''@/$(GNULIB_WCSSTR)/g' \ + -e 's/@''GNULIB_WCSTOK''@/$(GNULIB_WCSTOK)/g' \ + -e 's/@''GNULIB_WCSWIDTH''@/$(GNULIB_WCSWIDTH)/g' \ + -e 's/@''GNULIB_WCSFTIME''@/$(GNULIB_WCSFTIME)/g' \ + -e 's/@''GNULIB_MDA_WCSDUP''@/$(GNULIB_MDA_WCSDUP)/g' \ < $(srcdir)/wchar.in.h | \ sed -e 's|@''HAVE_WINT_T''@|$(HAVE_WINT_T)|g' \ -e 's|@''HAVE_BTOWC''@|$(HAVE_BTOWC)|g' \ @@ -5021,7 +3606,6 @@ sed -e 's|@''REPLACE_MBSTATE_T''@|$(REPLACE_MBSTATE_T)|g' \ -e 's|@''REPLACE_BTOWC''@|$(REPLACE_BTOWC)|g' \ -e 's|@''REPLACE_WCTOB''@|$(REPLACE_WCTOB)|g' \ - -e 's|@''REPLACE_FREE''@|$(REPLACE_FREE)|g' \ -e 's|@''REPLACE_MBSINIT''@|$(REPLACE_MBSINIT)|g' \ -e 's|@''REPLACE_MBRTOWC''@|$(REPLACE_MBRTOWC)|g' \ -e 's|@''REPLACE_MBRLEN''@|$(REPLACE_MBRLEN)|g' \ @@ -5033,17 +3617,12 @@ -e 's|@''REPLACE_WCWIDTH''@|$(REPLACE_WCWIDTH)|g' \ -e 's|@''REPLACE_WCSWIDTH''@|$(REPLACE_WCSWIDTH)|g' \ -e 's|@''REPLACE_WCSFTIME''@|$(REPLACE_WCSFTIME)|g' \ - -e 's|@''REPLACE_WCSCMP''@|$(REPLACE_WCSCMP)|g' \ - -e 's|@''REPLACE_WCSNCMP''@|$(REPLACE_WCSNCMP)|g' \ - -e 's|@''REPLACE_WCSSTR''@|$(REPLACE_WCSSTR)|g' \ -e 's|@''REPLACE_WCSTOK''@|$(REPLACE_WCSTOK)|g' \ - -e 's|@''REPLACE_WMEMCMP''@|$(REPLACE_WMEMCMP)|g' \ - -e 's|@''REPLACE_WMEMPCPY''@|$(REPLACE_WMEMPCPY)|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)' \ - > $@-t - $(AM_V_at)mv $@-t $@ + -e '/definition of _GL_WARN_ON_USE/r $(WARN_ON_USE_H)'; \ + } > $@-t && \ + mv $@-t $@ mostlyclean-local: mostlyclean-generic @for dir in '' $(MOSTLYCLEANDIRS); do \ @@ -5052,10 +3631,6 @@ fi; \ done; \ : -distclean-local: distclean-gnulib-libobjs -distclean-gnulib-libobjs: - -rm -f @gl_LIBOBJDEPS@ -maintainer-clean-local: distclean-gnulib-libobjs # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. diff -Nru mmv-2.5/lib/_Noreturn.h mmv-2.5.1/lib/_Noreturn.h --- mmv-2.5/lib/_Noreturn.h 2023-07-20 19:40:23.000000000 +0000 +++ mmv-2.5.1/lib/_Noreturn.h 2023-08-08 11:02:47.000000000 +0000 @@ -1,17 +1,17 @@ /* A C macro for declaring that a function does not return. - Copyright (C) 2011-2023 Free Software Foundation, Inc. + Copyright (C) 2011-2021 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it - under the terms of the GNU Lesser General Public License as published - by the Free Software Foundation; either version 2 of the License, or + under the terms of the GNU General Public License as published + by the Free Software Foundation; either version 3 of the License, 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 - Lesser General Public License for more details. + General Public License for more details. - You should have received a copy of the GNU Lesser General Public License + You should have received a copy of the GNU General Public License along with this program. If not, see . */ #ifndef _Noreturn @@ -26,15 +26,10 @@ AIX system header files and several gnulib header files use precisely this syntax with 'extern'. */ # define _Noreturn [[noreturn]] -# elif (defined __clang__ && __clang_major__ < 16 \ - && defined _GL_WORK_AROUND_LLVM_BUG_59792) - /* Compile with -D_GL_WORK_AROUND_LLVM_BUG_59792 to work around - that rare LLVM bug, though you may get many false-alarm warnings. */ -# define _Noreturn # elif ((!defined __cplusplus || defined __clang__) \ && (201112 <= (defined __STDC_VERSION__ ? __STDC_VERSION__ : 0) \ || (!defined __STRICT_ANSI__ \ - && (4 < __GNUC__ + (7 <= __GNUC_MINOR__) \ + && (__4 < __GNUC__ + (7 <= __GNUC_MINOR__) \ || (defined __apple_build_version__ \ ? 6000000 <= __apple_build_version__ \ : 3 < __clang_major__ + (5 <= __clang_minor__)))))) diff -Nru mmv-2.5/lib/alloca.in.h mmv-2.5.1/lib/alloca.in.h --- mmv-2.5/lib/alloca.in.h 2023-07-20 19:40:23.000000000 +0000 +++ mmv-2.5.1/lib/alloca.in.h 2023-08-08 11:02:47.000000000 +0000 @@ -1,20 +1,22 @@ /* Memory allocation on the stack. - Copyright (C) 1995, 1999, 2001-2004, 2006-2023 Free Software Foundation, + Copyright (C) 1995, 1999, 2001-2004, 2006-2021 Free Software Foundation, Inc. - This file is free software: you can redistribute it and/or modify - it under the terms of the GNU Lesser General Public License as - published by the Free Software Foundation; either version 2.1 of the - License, or (at your option) any later version. + 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 file is distributed in the hope that it will be useful, + 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 Lesser General Public License for more details. + 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 Lesser General Public License - along with this program. If not, see . */ + You should have received a copy of the GNU General Public + License along with this program; if not, see + . + */ /* Avoid using the symbol _ALLOCA_H here, as Bison assumes _ALLOCA_H means there is a real alloca function. */ diff -Nru mmv-2.5/lib/arg-nonnull.h mmv-2.5.1/lib/arg-nonnull.h --- mmv-2.5/lib/arg-nonnull.h 2023-07-20 19:40:23.000000000 +0000 +++ mmv-2.5.1/lib/arg-nonnull.h 2023-08-08 11:02:47.000000000 +0000 @@ -1,17 +1,17 @@ /* A C macro for declaring that specific arguments must not be NULL. - Copyright (C) 2009-2023 Free Software Foundation, Inc. + Copyright (C) 2009-2021 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it - under the terms of the GNU Lesser General Public License as published - by the Free Software Foundation; either version 2 of the License, or + under the terms of the GNU General Public License as published + by the Free Software Foundation; either version 3 of the License, 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 - Lesser General Public License for more details. + General Public License for more details. - You should have received a copy of the GNU Lesser General Public License + You should have received a copy of the GNU General Public License along with this program. If not, see . */ /* _GL_ARG_NONNULL((n,...,m)) tells the compiler and static analyzer tools diff -Nru mmv-2.5/lib/asnprintf.c mmv-2.5.1/lib/asnprintf.c --- mmv-2.5/lib/asnprintf.c 2023-07-20 19:40:23.000000000 +0000 +++ mmv-2.5.1/lib/asnprintf.c 2023-08-08 11:02:47.000000000 +0000 @@ -1,18 +1,18 @@ /* Formatted output to strings. - Copyright (C) 1999, 2002, 2006, 2009-2023 Free Software Foundation, Inc. + Copyright (C) 1999, 2002, 2006, 2009-2021 Free Software Foundation, Inc. - This file is free software: you can redistribute it and/or modify - it under the terms of the GNU Lesser General Public License as - published by the Free Software Foundation; either version 2.1 of the - License, or (at your option) any later version. + 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 file is distributed in the hope that it will be useful, + 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 Lesser General Public License for more details. + GNU General Public License for more details. - You should have received a copy of the GNU Lesser General Public License - along with this program. If not, see . */ + You should have received a copy of the GNU General Public License along + with this program; if not, see . */ #include diff -Nru mmv-2.5/lib/assert.in.h mmv-2.5.1/lib/assert.in.h --- mmv-2.5/lib/assert.in.h 2023-07-20 19:40:23.000000000 +0000 +++ mmv-2.5.1/lib/assert.in.h 1970-01-01 00:00:00.000000000 +0000 @@ -1,27 +0,0 @@ -/* Substitute for and wrapper around - Copyright (C) 2011-2023 Free Software Foundation, Inc. - - This file is free software: you can redistribute it and/or modify - it under the terms of the GNU Lesser General Public License as - published by the Free Software Foundation; either version 2.1 of the - License, or (at your option) any later version. - - This file 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 Lesser General Public License for more details. - - You should have received a copy of the GNU Lesser General Public License - along with this program. If not, see . */ - -/* Do not guard the include, since is supposed to define - the assert macro each time it is included. */ - -#if __GNUC__ >= 3 -@PRAGMA_SYSTEM_HEADER@ -#endif -@PRAGMA_COLUMNS@ - -#@INCLUDE_NEXT@ @NEXT_ASSERT_H@ - -/* The definition of static_assert is copied here. */ diff -Nru mmv-2.5/lib/attribute.h mmv-2.5.1/lib/attribute.h --- mmv-2.5/lib/attribute.h 2023-07-20 19:40:23.000000000 +0000 +++ mmv-2.5.1/lib/attribute.h 2023-08-08 11:02:47.000000000 +0000 @@ -1,18 +1,18 @@ /* ATTRIBUTE_* macros for using attributes in GCC and similar compilers - Copyright 2020-2023 Free Software Foundation, Inc. + Copyright 2020-2021 Free Software Foundation, Inc. - This file is free software: you can redistribute it and/or modify - it under the terms of the GNU Lesser General Public License as - published by the Free Software Foundation; either version 2.1 of the - License, or (at your option) any later version. + 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 of the License, or + (at your option) any later version. - This file is distributed in the hope that it will be useful, + 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 Lesser General Public License for more details. + 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 Lesser General Public License + You should have received a copy of the GNU General Public License along with this program. If not, see . */ /* Written by Paul Eggert. */ @@ -32,7 +32,7 @@ /* This file defines two types of attributes: - * C23 standard attributes. These have macro names that do not begin with + * C2X standard attributes. These have macro names that do not begin with 'ATTRIBUTE_'. * Selected GCC attributes; see: https://gcc.gnu.org/onlinedocs/gcc/Common-Function-Attributes.html @@ -41,21 +41,6 @@ These names begin with 'ATTRIBUTE_' to avoid name clashes. */ -/* This file uses _GL_ATTRIBUTE_ALLOC_SIZE, _GL_ATTRIBUTE_ALWAYS_INLINE, - _GL_ATTRIBUTE_ARTIFICIAL, _GL_ATTRIBUTE_COLD, _GL_ATTRIBUTE_CONST, - _GL_ATTRIBUTE_DEALLOC, _GL_ATTRIBUTE_DEPRECATED, _GL_ATTRIBUTE_ERROR, - _GL_ATTRIBUTE_WARNING, _GL_ATTRIBUTE_EXTERNALLY_VISIBLE, - _GL_ATTRIBUTE_FALLTHROUGH, _GL_ATTRIBUTE_FORMAT, _GL_ATTRIBUTE_LEAF, - _GL_ATTRIBUTE_MALLOC, _GL_ATTRIBUTE_MAY_ALIAS, _GL_ATTRIBUTE_MAYBE_UNUSED, - _GL_ATTRIBUTE_NODISCARD, _GL_ATTRIBUTE_NOINLINE, _GL_ATTRIBUTE_NONNULL, - _GL_ATTRIBUTE_NONSTRING, _GL_ATTRIBUTE_NOTHROW, _GL_ATTRIBUTE_PACKED, - _GL_ATTRIBUTE_PURE, _GL_ATTRIBUTE_RETURNS_NONNULL, - _GL_ATTRIBUTE_SENTINEL. */ -#if !_GL_CONFIG_H_INCLUDED - #error "Please include config.h first." -#endif - - /* =============== Attributes for specific kinds of functions =============== */ /* Attributes for functions that should not be used. */ @@ -91,14 +76,6 @@ /* Applies to: function, pointer to function, function types. */ #define ATTRIBUTE_ALLOC_SIZE(args) _GL_ATTRIBUTE_ALLOC_SIZE (args) -/* ATTRIBUTE_DEALLOC (F, I) declares that the function returns pointers - that can be freed by passing them as the Ith argument to the - function F. - ATTRIBUTE_DEALLOC_FREE declares that the function returns pointers that - can be freed via 'free'; it can be used only after declaring 'free'. */ -/* Applies to: functions. Cannot be used on inline functions. */ -#define ATTRIBUTE_DEALLOC(f, i) _GL_ATTRIBUTE_DEALLOC(f, i) -#define ATTRIBUTE_DEALLOC_FREE _GL_ATTRIBUTE_DEALLOC_FREE /* Attributes for variadic functions. */ diff -Nru mmv-2.5/lib/basename-lgpl.c mmv-2.5.1/lib/basename-lgpl.c --- mmv-2.5/lib/basename-lgpl.c 2023-07-20 19:40:23.000000000 +0000 +++ mmv-2.5.1/lib/basename-lgpl.c 2023-08-08 11:02:40.000000000 +0000 @@ -1,19 +1,19 @@ /* basename.c -- return the last element in a file name - Copyright (C) 1990, 1998-2001, 2003-2006, 2009-2023 Free Software + Copyright (C) 1990, 1998-2001, 2003-2006, 2009-2021 Free Software Foundation, Inc. - This file is free software: you can redistribute it and/or modify - it under the terms of the GNU Lesser General Public License as - published by the Free Software Foundation; either version 2.1 of the - License, or (at your option) any later version. + 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 of the License, or + (at your option) any later version. - This file is distributed in the hope that it will be useful, + 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 Lesser General Public License for more details. + GNU General Public License for more details. - You should have received a copy of the GNU Lesser General Public License + You should have received a copy of the GNU General Public License along with this program. If not, see . */ #include @@ -21,6 +21,7 @@ /* Specification. */ #include "basename-lgpl.h" +#include #include #include "filename.h" diff -Nru mmv-2.5/lib/basename-lgpl.h mmv-2.5.1/lib/basename-lgpl.h --- mmv-2.5/lib/basename-lgpl.h 2023-07-20 19:40:23.000000000 +0000 +++ mmv-2.5.1/lib/basename-lgpl.h 2023-08-08 11:02:40.000000000 +0000 @@ -1,29 +1,24 @@ -/* Extract the last component (base name) of a file name. +/* Extract the last component (base name) of a file name. - Copyright (C) 1998, 2001, 2003-2006, 2009-2023 Free Software Foundation, - Inc. + Copyright (C) 1998, 2001, 2003-2006, 2009-2021 Free Software Foundation, + Inc. - This file is free software: you can redistribute it and/or modify - it under the terms of the GNU Lesser General Public License as - published by the Free Software Foundation; either version 2.1 of the - License, or (at your option) any later version. - - This file 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 Lesser General Public License for more details. + 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 of the License, 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 Lesser General Public License - along with this program. If not, see . */ + You should have received a copy of the GNU General Public License + along with this program. If not, see . */ #ifndef _BASENAME_LGPL_H #define _BASENAME_LGPL_H -/* This file uses _GL_ATTRIBUTE_PURE. */ -#if !_GL_CONFIG_H_INCLUDED - #error "Please include config.h first." -#endif - #include #ifndef DOUBLE_SLASH_IS_DISTINCT_ROOT diff -Nru mmv-2.5/lib/binary-io.c mmv-2.5.1/lib/binary-io.c --- mmv-2.5/lib/binary-io.c 2023-07-20 19:40:23.000000000 +0000 +++ mmv-2.5.1/lib/binary-io.c 2023-08-08 11:02:40.000000000 +0000 @@ -1,17 +1,17 @@ /* Binary mode I/O. - Copyright 2017-2023 Free Software Foundation, Inc. + Copyright 2017-2021 Free Software Foundation, Inc. - This file is free software: you can redistribute it and/or modify - it under the terms of the GNU Lesser General Public License as - published by the Free Software Foundation; either version 2.1 of the - License, or (at your option) any later version. + 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 of the License, or + (at your option) any later version. - This file is distributed in the hope that it will be useful, + 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 Lesser General Public License for more details. + GNU General Public License for more details. - You should have received a copy of the GNU Lesser General Public License + You should have received a copy of the GNU General Public License along with this program. If not, see . */ #include diff -Nru mmv-2.5/lib/binary-io.h mmv-2.5.1/lib/binary-io.h --- mmv-2.5/lib/binary-io.h 2023-07-20 19:40:23.000000000 +0000 +++ mmv-2.5.1/lib/binary-io.h 2023-08-08 11:02:40.000000000 +0000 @@ -1,27 +1,22 @@ /* Binary mode I/O. - Copyright (C) 2001, 2003, 2005, 2008-2023 Free Software Foundation, Inc. + Copyright (C) 2001, 2003, 2005, 2008-2021 Free Software Foundation, Inc. - This file is free software: you can redistribute it and/or modify - it under the terms of the GNU Lesser General Public License as - published by the Free Software Foundation; either version 2.1 of the - License, or (at your option) any later version. + 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 of the License, or + (at your option) any later version. - This file is distributed in the hope that it will be useful, + 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 Lesser General Public License for more details. + GNU General Public License for more details. - You should have received a copy of the GNU Lesser General Public License + You should have received a copy of the GNU General Public License along with this program. If not, see . */ #ifndef _BINARY_H #define _BINARY_H -/* This file uses _GL_INLINE_HEADER_BEGIN, _GL_INLINE, _GL_UNUSED. */ -#if !_GL_CONFIG_H_INCLUDED - #error "Please include config.h first." -#endif - /* For systems that distinguish between text and binary I/O. O_BINARY is guaranteed by the gnulib . */ #include @@ -30,6 +25,9 @@ so we include it here first. */ #include +#ifndef _GL_INLINE_HEADER_BEGIN + #error "Please include config.h first." +#endif _GL_INLINE_HEADER_BEGIN #ifndef BINARY_IO_INLINE # define BINARY_IO_INLINE _GL_INLINE @@ -49,7 +47,7 @@ /* Use a function rather than a macro, to avoid gcc warnings "warning: statement with no effect". */ BINARY_IO_INLINE int -__gl_setmode (_GL_UNUSED int fd, _GL_UNUSED int mode) +__gl_setmode (int fd _GL_UNUSED, int mode _GL_UNUSED) { return O_BINARY; } diff -Nru mmv-2.5/lib/c++defs.h mmv-2.5.1/lib/c++defs.h --- mmv-2.5/lib/c++defs.h 2023-07-20 19:40:23.000000000 +0000 +++ mmv-2.5.1/lib/c++defs.h 2023-08-08 11:02:47.000000000 +0000 @@ -1,17 +1,17 @@ /* C++ compatible function declaration macros. - Copyright (C) 2010-2023 Free Software Foundation, Inc. + Copyright (C) 2010-2021 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it - under the terms of the GNU Lesser General Public License as published - by the Free Software Foundation; either version 2 of the License, or + under the terms of the GNU General Public License as published + by the Free Software Foundation; either version 3 of the License, 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 - Lesser General Public License for more details. + General Public License for more details. - You should have received a copy of the GNU Lesser General Public License + You should have received a copy of the GNU General Public License along with this program. If not, see . */ #ifndef _GL_CXXDEFS_H @@ -99,12 +99,6 @@ Example: _GL_FUNCDECL_RPL (open, int, (const char *filename, int flags, ...) _GL_ARG_NONNULL ((1))); - - Note: Attributes, such as _GL_ATTRIBUTE_DEPRECATED, are supported in front - of a _GL_FUNCDECL_RPL invocation only in C mode, not in C++ mode. (That's - because - [[...]] extern "C" ; - is invalid syntax in C++.) */ #define _GL_FUNCDECL_RPL(func,rettype,parameters_and_attributes) \ _GL_FUNCDECL_RPL_1 (rpl_##func, rettype, parameters_and_attributes) diff -Nru mmv-2.5/lib/calloc.c mmv-2.5.1/lib/calloc.c --- mmv-2.5/lib/calloc.c 2023-07-20 19:40:23.000000000 +0000 +++ mmv-2.5.1/lib/calloc.c 1970-01-01 00:00:00.000000000 +0000 @@ -1,55 +0,0 @@ -/* calloc() function that is glibc compatible. - This wrapper function is required at least on Tru64 UNIX 5.1 and mingw. - Copyright (C) 2004-2007, 2009-2023 Free Software Foundation, Inc. - - This file is free software: you can redistribute it and/or modify - it under the terms of the GNU Lesser General Public License as - published by the Free Software Foundation; either version 2.1 of the - License, or (at your option) any later version. - - This file 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 Lesser General Public License for more details. - - You should have received a copy of the GNU Lesser General Public License - along with this program. If not, see . */ - -/* written by Jim Meyering and Bruno Haible */ - -#include - -/* Specification. */ -#include - -#include - -#include "xalloc-oversized.h" - -/* Call the system's calloc below. */ -#undef calloc - -/* Allocate and zero-fill an NxS-byte block of memory from the heap, - even if N or S is zero. */ - -void * -rpl_calloc (size_t n, size_t s) -{ - if (n == 0 || s == 0) - n = s = 1; - - if (xalloc_oversized (n, s)) - { - errno = ENOMEM; - return NULL; - } - - void *result = calloc (n, s); - -#if !HAVE_MALLOC_POSIX - if (result == NULL) - errno = ENOMEM; -#endif - - return result; -} diff -Nru mmv-2.5/lib/canonicalize-lgpl.c mmv-2.5.1/lib/canonicalize-lgpl.c --- mmv-2.5/lib/canonicalize-lgpl.c 2023-07-20 19:40:23.000000000 +0000 +++ mmv-2.5.1/lib/canonicalize-lgpl.c 2023-08-08 11:02:47.000000000 +0000 @@ -1,18 +1,18 @@ /* Return the canonical absolute name of a given file. - Copyright (C) 1996-2023 Free Software Foundation, Inc. + Copyright (C) 1996-2021 Free Software Foundation, Inc. This file is part of the GNU C Library. The GNU C Library is free software; you can redistribute it and/or - modify it under the terms of the GNU Lesser General Public + modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either - version 2.1 of the License, or (at your option) any later version. + version 3 of the License, or (at your option) any later version. The GNU C Library 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 - Lesser General Public License for more details. + General Public License for more details. - You should have received a copy of the GNU Lesser General Public + You should have received a copy of the GNU General Public License along with the GNU C Library; if not, see . */ @@ -30,6 +30,7 @@ #include #include #include +#include #include #include #include @@ -47,7 +48,6 @@ #else # define __canonicalize_file_name canonicalize_file_name # define __realpath realpath -# define __strdup strdup # include "pathmax.h" # define __faccessat faccessat # if defined _WIN32 && !defined __CYGWIN__ @@ -74,6 +74,7 @@ # define __pathconf pathconf # define __rawmemchr rawmemchr # define __readlink readlink +# define __stat stat # if IN_RELOCWRAPPER /* When building the relocatable program wrapper, use the system's memmove function, not the gnulib override, otherwise we would get a link error. @@ -104,7 +105,7 @@ return __faccessat (AT_FDCWD, file, F_OK, AT_EACCESS) == 0; # else struct stat st; - return stat (file, &st) == 0 || errno == EOVERFLOW; + return __stat (file, &st) == 0 || errno == EOVERFLOW; # endif } @@ -180,16 +181,27 @@ return path_max < 0 ? 1024 : path_max <= IDX_MAX ? path_max : IDX_MAX; } -/* Scratch buffers used by realpath_stk and managed by __realpath. */ -struct realpath_bufs -{ - struct scratch_buffer rname; - struct scratch_buffer extra; - struct scratch_buffer link; -}; +/* Act like __realpath (see below), with an additional argument + rname_buf that can be used as temporary storage. + If GCC_LINT is defined, do not inline this function with GCC 10.1 + and later, to avoid creating a pointer to the stack that GCC + -Wreturn-local-addr incorrectly complains about. See: + https://gcc.gnu.org/bugzilla/show_bug.cgi?id=93644 + Although the noinline attribute can hurt performance a bit, no better way + to pacify GCC is known; even an explicit #pragma does not pacify GCC. + When the GCC bug is fixed this workaround should be limited to the + broken GCC versions. */ +# if __GNUC_PREREQ (10, 1) +# if defined GCC_LINT || defined lint +__attribute__ ((__noinline__)) +# elif __OPTIMIZE__ && !__NO_INLINE__ +# define GCC_BOGUS_WRETURN_LOCAL_ADDR +# endif +# endif static char * -realpath_stk (const char *name, char *resolved, struct realpath_bufs *bufs) +realpath_stk (const char *name, char *resolved, + struct scratch_buffer *rname_buf) { char *dest; char const *start; @@ -214,7 +226,12 @@ return NULL; } - char *rname = bufs->rname.data; + struct scratch_buffer extra_buffer, link_buffer; + scratch_buffer_init (&extra_buffer); + scratch_buffer_init (&link_buffer); + scratch_buffer_init (rname_buf); + char *rname_on_stack = rname_buf->data; + char *rname = rname_on_stack; bool end_in_extra_buffer = false; bool failed = true; @@ -224,16 +241,16 @@ if (!IS_ABSOLUTE_FILE_NAME (name)) { - while (!__getcwd (bufs->rname.data, bufs->rname.length)) + while (!__getcwd (rname, rname_buf->length)) { if (errno != ERANGE) { dest = rname; goto error; } - if (!scratch_buffer_grow (&bufs->rname)) - return NULL; - rname = bufs->rname.data; + if (!scratch_buffer_grow (rname_buf)) + goto error_nomem; + rname = rname_buf->data; } dest = __rawmemchr (rname, '\0'); start = name; @@ -287,13 +304,13 @@ if (!ISSLASH (dest[-1])) *dest++ = '/'; - while (rname + bufs->rname.length - dest + while (rname + rname_buf->length - dest < startlen + sizeof dir_suffix) { idx_t dest_offset = dest - rname; - if (!scratch_buffer_grow_preserve (&bufs->rname)) - return NULL; - rname = bufs->rname.data; + if (!scratch_buffer_grow_preserve (rname_buf)) + goto error_nomem; + rname = rname_buf->data; dest = rname + dest_offset; } @@ -304,13 +321,13 @@ ssize_t n; while (true) { - buf = bufs->link.data; - idx_t bufsize = bufs->link.length; + buf = link_buffer.data; + idx_t bufsize = link_buffer.length; n = __readlink (rname, buf, bufsize - 1); if (n < bufsize - 1) break; - if (!scratch_buffer_grow (&bufs->link)) - return NULL; + if (!scratch_buffer_grow (&link_buffer)) + goto error_nomem; } if (0 <= n) { @@ -322,7 +339,7 @@ buf[n] = '\0'; - char *extra_buf = bufs->extra.data; + char *extra_buf = extra_buffer.data; idx_t end_idx IF_LINT (= 0); if (end_in_extra_buffer) end_idx = end - extra_buf; @@ -330,13 +347,13 @@ if (INT_ADD_OVERFLOW (len, n)) { __set_errno (ENOMEM); - return NULL; + goto error_nomem; } - while (bufs->extra.length <= len + n) + while (extra_buffer.length <= len + n) { - if (!scratch_buffer_grow_preserve (&bufs->extra)) - return NULL; - extra_buf = bufs->extra.data; + if (!scratch_buffer_grow_preserve (&extra_buffer)) + goto error_nomem; + extra_buf = extra_buffer.data; } if (end_in_extra_buffer) end = extra_buf + end_idx; @@ -388,30 +405,20 @@ error: *dest++ = '\0'; - if (resolved != NULL) - { - /* Copy the full result on success or partial result if failure was due - to the path not existing or not being accessible. */ - if ((!failed || errno == ENOENT || errno == EACCES) - && dest - rname <= get_path_max ()) - { - strcpy (resolved, rname); - if (failed) - return NULL; - else - return resolved; - } - if (!failed) - __set_errno (ENAMETOOLONG); - return NULL; - } - else + if (resolved != NULL && dest - rname <= get_path_max ()) + rname = strcpy (resolved, rname); + +error_nomem: + scratch_buffer_free (&extra_buffer); + scratch_buffer_free (&link_buffer); + + if (failed || rname == resolved) { - if (failed) - return NULL; - else - return __strdup (bufs->rname.data); + scratch_buffer_free (rname_buf); + return failed ? NULL : resolved; } + + return scratch_buffer_dupfree (rname_buf, dest - rname); } /* Return the canonical absolute name of file NAME. A canonical name @@ -428,15 +435,12 @@ char * __realpath (const char *name, char *resolved) { - struct realpath_bufs bufs; - scratch_buffer_init (&bufs.rname); - scratch_buffer_init (&bufs.extra); - scratch_buffer_init (&bufs.link); - char *result = realpath_stk (name, resolved, &bufs); - scratch_buffer_free (&bufs.link); - scratch_buffer_free (&bufs.extra); - scratch_buffer_free (&bufs.rname); - return result; + #ifdef GCC_BOGUS_WRETURN_LOCAL_ADDR + #warning "GCC might issue a bogus -Wreturn-local-addr warning here." + #warning "See ." + #endif + struct scratch_buffer rname_buffer; + return realpath_stk (name, resolved, &rname_buffer); } libc_hidden_def (__realpath) versioned_symbol (libc, __realpath, realpath, GLIBC_2_3); diff -Nru mmv-2.5/lib/cdefs.h mmv-2.5.1/lib/cdefs.h --- mmv-2.5/lib/cdefs.h 2023-07-20 19:40:23.000000000 +0000 +++ mmv-2.5.1/lib/cdefs.h 2023-08-08 11:02:47.000000000 +0000 @@ -1,18 +1,17 @@ -/* Copyright (C) 1992-2023 Free Software Foundation, Inc. - Copyright The GNU Toolchain Authors. +/* Copyright (C) 1992-2021 Free Software Foundation, Inc. This file is part of the GNU C Library. The GNU C Library is free software; you can redistribute it and/or - modify it under the terms of the GNU Lesser General Public + modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either - version 2.1 of the License, or (at your option) any later version. + version 3 of the License, or (at your option) any later version. The GNU C Library 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 - Lesser General Public License for more details. + General Public License for more details. - You should have received a copy of the GNU Lesser General Public + You should have received a copy of the GNU General Public License along with the GNU C Library; if not, see . */ @@ -41,9 +40,7 @@ Similarly for __has_builtin, etc. */ #if (defined __has_attribute \ && (!defined __clang_minor__ \ - || (defined __apple_build_version__ \ - ? 6000000 <= __apple_build_version__ \ - : 3 < __clang_major__ + (5 <= __clang_minor__)))) + || 3 < __clang_major__ + (5 <= __clang_minor__))) # define __glibc_has_attribute(attr) __has_attribute (attr) #else # define __glibc_has_attribute(attr) 0 @@ -140,75 +137,19 @@ #endif -/* Gnulib avoids these definitions, as they don't work on non-glibc platforms. - In particular, __bos and __bos0 are defined differently in the Android libc. - */ -#ifndef __GNULIB_CDEFS - /* Fortify support. */ -# define __bos(ptr) __builtin_object_size (ptr, __USE_FORTIFY_LEVEL > 1) -# define __bos0(ptr) __builtin_object_size (ptr, 0) +#define __bos(ptr) __builtin_object_size (ptr, __USE_FORTIFY_LEVEL > 1) +#define __bos0(ptr) __builtin_object_size (ptr, 0) /* Use __builtin_dynamic_object_size at _FORTIFY_SOURCE=3 when available. */ -# if __USE_FORTIFY_LEVEL == 3 && (__glibc_clang_prereq (9, 0) \ - || __GNUC_PREREQ (12, 0)) -# define __glibc_objsize0(__o) __builtin_dynamic_object_size (__o, 0) -# define __glibc_objsize(__o) __builtin_dynamic_object_size (__o, 1) -# else -# define __glibc_objsize0(__o) __bos0 (__o) -# define __glibc_objsize(__o) __bos (__o) -# endif - -/* Compile time conditions to choose between the regular, _chk and _chk_warn - variants. These conditions should get evaluated to constant and optimized - away. */ - -# define __glibc_safe_len_cond(__l, __s, __osz) ((__l) <= (__osz) / (__s)) -# define __glibc_unsigned_or_positive(__l) \ - ((__typeof (__l)) 0 < (__typeof (__l)) -1 \ - || (__builtin_constant_p (__l) && (__l) > 0)) - -/* Length is known to be safe at compile time if the __L * __S <= __OBJSZ - condition can be folded to a constant and if it is true, or unknown (-1) */ -# define __glibc_safe_or_unknown_len(__l, __s, __osz) \ - ((__osz) == (__SIZE_TYPE__) -1 \ - || (__glibc_unsigned_or_positive (__l) \ - && __builtin_constant_p (__glibc_safe_len_cond ((__SIZE_TYPE__) (__l), \ - (__s), (__osz))) \ - && __glibc_safe_len_cond ((__SIZE_TYPE__) (__l), (__s), (__osz)))) - -/* Conversely, we know at compile time that the length is unsafe if the - __L * __S <= __OBJSZ condition can be folded to a constant and if it is - false. */ -# define __glibc_unsafe_len(__l, __s, __osz) \ - (__glibc_unsigned_or_positive (__l) \ - && __builtin_constant_p (__glibc_safe_len_cond ((__SIZE_TYPE__) (__l), \ - __s, __osz)) \ - && !__glibc_safe_len_cond ((__SIZE_TYPE__) (__l), __s, __osz)) - -/* Fortify function f. __f_alias, __f_chk and __f_chk_warn must be - declared. */ - -# define __glibc_fortify(f, __l, __s, __osz, ...) \ - (__glibc_safe_or_unknown_len (__l, __s, __osz) \ - ? __ ## f ## _alias (__VA_ARGS__) \ - : (__glibc_unsafe_len (__l, __s, __osz) \ - ? __ ## f ## _chk_warn (__VA_ARGS__, __osz) \ - : __ ## f ## _chk (__VA_ARGS__, __osz))) \ - -/* Fortify function f, where object size argument passed to f is the number of - elements and not total size. */ - -# define __glibc_fortify_n(f, __l, __s, __osz, ...) \ - (__glibc_safe_or_unknown_len (__l, __s, __osz) \ - ? __ ## f ## _alias (__VA_ARGS__) \ - : (__glibc_unsafe_len (__l, __s, __osz) \ - ? __ ## f ## _chk_warn (__VA_ARGS__, (__osz) / (__s)) \ - : __ ## f ## _chk (__VA_ARGS__, (__osz) / (__s)))) \ - +#if __USE_FORTIFY_LEVEL == 3 && __glibc_clang_prereq (9, 0) +# define __glibc_objsize0(__o) __builtin_dynamic_object_size (__o, 0) +# define __glibc_objsize(__o) __builtin_dynamic_object_size (__o, 1) +#else +# define __glibc_objsize0(__o) __bos0 (__o) +# define __glibc_objsize(__o) __bos (__o) #endif - #if __GNUC_PREREQ (4,3) # define __warnattr(msg) __attribute__((__warning__ (msg))) # define __errordecl(name, msg) \ @@ -302,15 +243,6 @@ # define __attribute_alloc_size__(params) /* Ignore. */ #endif -/* Tell the compiler which argument to an allocation function - indicates the alignment of the allocation. */ -#if __GNUC_PREREQ (4, 9) || __glibc_has_attribute (__alloc_align__) -# define __attribute_alloc_align__(param) \ - __attribute__ ((__alloc_align__ param)) -#else -# define __attribute_alloc_align__(param) /* Ignore. */ -#endif - /* At some point during the gcc 2.96 development the `pure' attribute for functions was introduced. We don't want to use it unconditionally (although this would be possible) since it generates warnings. */ @@ -327,7 +259,9 @@ # define __attribute_const__ /* Ignore */ #endif -#if __GNUC_PREREQ (2,7) || __glibc_has_attribute (__unused__) +#if defined __STDC_VERSION__ && 201710L < __STDC_VERSION__ +# define __attribute_maybe_unused__ [[__maybe_unused__]] +#elif __GNUC_PREREQ (2,7) || __glibc_has_attribute (__unused__) # define __attribute_maybe_unused__ __attribute__ ((__unused__)) #else # define __attribute_maybe_unused__ /* Ignore */ @@ -386,28 +320,16 @@ #endif /* The nonnull function attribute marks pointer parameters that - must not be NULL. This has the name __nonnull in glibc, - and __attribute_nonnull__ in files shared with Gnulib to avoid - collision with a different __nonnull in DragonFlyBSD 5.9. */ -#ifndef __attribute_nonnull__ -# if __GNUC_PREREQ (3,3) || __glibc_has_attribute (__nonnull__) -# define __attribute_nonnull__(params) __attribute__ ((__nonnull__ params)) -# else -# define __attribute_nonnull__(params) -# endif -#endif + must not be NULL. */ #ifndef __nonnull -# define __nonnull(params) __attribute_nonnull__ (params) -#endif - -/* The returns_nonnull function attribute marks the return type of the function - as always being non-null. */ -#ifndef __returns_nonnull -# if __GNUC_PREREQ (4, 9) || __glibc_has_attribute (__returns_nonnull__) -# define __returns_nonnull __attribute__ ((__returns_nonnull__)) +# if __GNUC_PREREQ (3,3) || __glibc_has_attribute (__nonnull__) +# define __nonnull(params) __attribute__ ((__nonnull__ params)) # else -# define __returns_nonnull +# define __nonnull(params) # endif +#elif !defined __GLIBC__ +# undef __nonnull +# define __nonnull(params) _GL_ATTRIBUTE_NONNULL (params) #endif /* If fortification mode, we warn about unused results of certain @@ -563,9 +485,9 @@ [!!sizeof (struct { int __error_if_negative: (expr) ? 2 : -1; })] #endif -/* Gnulib avoids including these, as they don't work on non-glibc or - older glibc platforms. */ -#ifndef __GNULIB_CDEFS +/* The #ifndef lets Gnulib avoid including these on non-glibc + platforms, where the includes typically do not exist. */ +#ifndef __WORDSIZE # include # include #endif @@ -672,36 +594,9 @@ array according to access mode, or at least one element when size-index is not provided: access (access-mode, [, ]) */ -# define __attr_access(x) __attribute__ ((__access__ x)) -/* For _FORTIFY_SOURCE == 3 we use __builtin_dynamic_object_size, which may - use the access attribute to get object sizes from function definition - arguments, so we can't use them on functions we fortify. Drop the object - size hints for such functions. */ -# if __USE_FORTIFY_LEVEL == 3 -# define __fortified_attr_access(a, o, s) __attribute__ ((__access__ (a, o))) -# else -# define __fortified_attr_access(a, o, s) __attr_access ((a, o, s)) -# endif -# if __GNUC_PREREQ (11, 0) -# define __attr_access_none(argno) __attribute__ ((__access__ (__none__, argno))) -# else -# define __attr_access_none(argno) -# endif +#define __attr_access(x) __attribute__ ((__access__ x)) #else -# define __fortified_attr_access(a, o, s) # define __attr_access(x) -# define __attr_access_none(argno) -#endif - -#if __GNUC_PREREQ (11, 0) -/* Designates dealloc as a function to call to deallocate objects - allocated by the declared function. */ -# define __attr_dealloc(dealloc, argno) \ - __attribute__ ((__malloc__ (dealloc, argno))) -# define __attr_dealloc_free __attr_dealloc (__builtin_free, 1) -#else -# define __attr_dealloc(dealloc, argno) -# define __attr_dealloc_free #endif /* Specify that a function such as setjmp or vfork may return diff -Nru mmv-2.5/lib/cloexec.c mmv-2.5.1/lib/cloexec.c --- mmv-2.5/lib/cloexec.c 2023-07-20 19:40:23.000000000 +0000 +++ mmv-2.5.1/lib/cloexec.c 2023-08-08 11:02:40.000000000 +0000 @@ -1,21 +1,21 @@ /* cloexec.c - set or clear the close-on-exec descriptor flag - Copyright (C) 1991, 2004-2006, 2009-2023 Free Software Foundation, Inc. + Copyright (C) 1991, 2004-2006, 2009-2021 Free Software Foundation, Inc. - This file is free software: you can redistribute it and/or modify - it under the terms of the GNU Lesser General Public License as - published by the Free Software Foundation; either version 2.1 of the - License, or (at your option) any later version. + 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 of the License, or + (at your option) any later version. - This file is distributed in the hope that it will be useful, + 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 Lesser General Public License for more details. + GNU General Public License for more details. - You should have received a copy of the GNU Lesser General Public License - along with this program. If not, see . */ + You should have received a copy of the GNU General Public License + along with this program. If not, see . -/* The code is taken from glibc/manual/llio.texi */ + The code is taken from glibc/manual/llio.texi */ #include diff -Nru mmv-2.5/lib/cloexec.h mmv-2.5.1/lib/cloexec.h --- mmv-2.5/lib/cloexec.h 2023-07-20 19:40:23.000000000 +0000 +++ mmv-2.5.1/lib/cloexec.h 2023-08-08 11:02:40.000000000 +0000 @@ -1,19 +1,23 @@ /* cloexec.c - set or clear the close-on-exec descriptor flag - Copyright (C) 2004, 2009-2023 Free Software Foundation, Inc. + Copyright (C) 2004, 2009-2021 Free Software Foundation, Inc. - This file is free software: you can redistribute it and/or modify - it under the terms of the GNU Lesser General Public License as - published by the Free Software Foundation; either version 2.1 of the - License, or (at your option) any later version. + 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 of the License, or + (at your option) any later version. - This file is distributed in the hope that it will be useful, + 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 Lesser General Public License for more details. + GNU General Public License for more details. - You should have received a copy of the GNU Lesser General Public License - along with this program. If not, see . */ + You should have received a copy of the GNU General Public License + along with this program. If not, see . + +*/ + +#include /* Set the 'FD_CLOEXEC' flag of DESC if VALUE is true, or clear the flag if VALUE is false. diff -Nru mmv-2.5/lib/close.c mmv-2.5.1/lib/close.c --- mmv-2.5/lib/close.c 2023-07-20 19:40:23.000000000 +0000 +++ mmv-2.5.1/lib/close.c 2023-08-08 11:02:40.000000000 +0000 @@ -1,17 +1,17 @@ /* close replacement. - Copyright (C) 2008-2023 Free Software Foundation, Inc. + Copyright (C) 2008-2021 Free Software Foundation, Inc. - This file is free software: you can redistribute it and/or modify - it under the terms of the GNU Lesser General Public License as - published by the Free Software Foundation; either version 2.1 of the - License, or (at your option) any later version. + 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 of the License, or + (at your option) any later version. - This file is distributed in the hope that it will be useful, + 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 Lesser General Public License for more details. + GNU General Public License for more details. - You should have received a copy of the GNU Lesser General Public License + You should have received a copy of the GNU General Public License along with this program. If not, see . */ #include diff -Nru mmv-2.5/lib/dirname-lgpl.c mmv-2.5.1/lib/dirname-lgpl.c --- mmv-2.5/lib/dirname-lgpl.c 2023-07-20 19:40:23.000000000 +0000 +++ mmv-2.5.1/lib/dirname-lgpl.c 2023-08-08 11:02:40.000000000 +0000 @@ -1,19 +1,19 @@ /* dirname.c -- return all but the last element in a file name - Copyright (C) 1990, 1998, 2000-2001, 2003-2006, 2009-2023 Free Software + Copyright (C) 1990, 1998, 2000-2001, 2003-2006, 2009-2021 Free Software Foundation, Inc. - This file is free software: you can redistribute it and/or modify - it under the terms of the GNU Lesser General Public License as - published by the Free Software Foundation; either version 2.1 of the - License, or (at your option) any later version. + 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 of the License, or + (at your option) any later version. - This file is distributed in the hope that it will be useful, + 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 Lesser General Public License for more details. + GNU General Public License for more details. - You should have received a copy of the GNU Lesser General Public License + You should have received a copy of the GNU General Public License along with this program. If not, see . */ #include diff -Nru mmv-2.5/lib/dirname.h mmv-2.5.1/lib/dirname.h --- mmv-2.5/lib/dirname.h 2023-07-20 19:40:23.000000000 +0000 +++ mmv-2.5.1/lib/dirname.h 2023-08-08 11:02:40.000000000 +0000 @@ -1,31 +1,26 @@ -/* Take file names apart into directory and base names. +/* Take file names apart into directory and base names. - Copyright (C) 1998, 2001, 2003-2006, 2009-2023 Free Software Foundation, - Inc. + Copyright (C) 1998, 2001, 2003-2006, 2009-2021 Free Software Foundation, + Inc. - This file is free software: you can redistribute it and/or modify - it under the terms of the GNU Lesser General Public License as - published by the Free Software Foundation; either version 2.1 of the - License, or (at your option) any later version. - - This file 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 Lesser General Public License for more details. + 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 of the License, 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 Lesser General Public License - along with this program. If not, see . */ + You should have received a copy of the GNU General Public License + along with this program. If not, see . */ #ifndef DIRNAME_H_ # define DIRNAME_H_ 1 -/* This file uses _GL_ATTRIBUTE_MALLOC, _GL_ATTRIBUTE_PURE, - _GL_ATTRIBUTE_RETURNS_NONNULL. */ -#if !_GL_CONFIG_H_INCLUDED - #error "Please include config.h first." -#endif - -# include +# include +# include # include "filename.h" # include "basename-lgpl.h" @@ -38,16 +33,11 @@ #endif # if GNULIB_DIRNAME -char *base_name (char const *file) - _GL_ATTRIBUTE_MALLOC _GL_ATTRIBUTE_DEALLOC_FREE - _GL_ATTRIBUTE_RETURNS_NONNULL; -char *dir_name (char const *file) - _GL_ATTRIBUTE_MALLOC _GL_ATTRIBUTE_DEALLOC_FREE - _GL_ATTRIBUTE_RETURNS_NONNULL; +char *base_name (char const *file) _GL_ATTRIBUTE_MALLOC; +char *dir_name (char const *file); # endif -char *mdir_name (char const *file) - _GL_ATTRIBUTE_MALLOC _GL_ATTRIBUTE_DEALLOC_FREE; +char *mdir_name (char const *file); size_t dir_len (char const *file) _GL_ATTRIBUTE_PURE; bool strip_trailing_slashes (char *file); diff -Nru mmv-2.5/lib/dup2.c mmv-2.5.1/lib/dup2.c --- mmv-2.5/lib/dup2.c 2023-07-20 19:40:23.000000000 +0000 +++ mmv-2.5.1/lib/dup2.c 2023-08-08 11:02:40.000000000 +0000 @@ -1,18 +1,18 @@ /* Duplicate an open file descriptor to a specified file descriptor. - Copyright (C) 1999, 2004-2007, 2009-2023 Free Software Foundation, Inc. + Copyright (C) 1999, 2004-2007, 2009-2021 Free Software Foundation, Inc. - This file is free software: you can redistribute it and/or modify - it under the terms of the GNU Lesser General Public License as - published by the Free Software Foundation; either version 2.1 of the - License, or (at your option) any later version. + 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 of the License, or + (at your option) any later version. - This file is distributed in the hope that it will be useful, + 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 Lesser General Public License for more details. + GNU General Public License for more details. - You should have received a copy of the GNU Lesser General Public License + You should have received a copy of the GNU General Public License along with this program. If not, see . */ /* written by Paul Eggert */ diff -Nru mmv-2.5/lib/eloop-threshold.h mmv-2.5.1/lib/eloop-threshold.h --- mmv-2.5/lib/eloop-threshold.h 2023-07-20 19:40:23.000000000 +0000 +++ mmv-2.5.1/lib/eloop-threshold.h 2023-08-08 11:02:47.000000000 +0000 @@ -1,29 +1,24 @@ /* Threshold at which to diagnose ELOOP. Generic version. - Copyright (C) 2012-2023 Free Software Foundation, Inc. + Copyright (C) 2012-2021 Free Software Foundation, Inc. This file is part of the GNU C Library. The GNU C Library is free software; you can redistribute it and/or - modify it under the terms of the GNU Lesser General Public + modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either - version 2.1 of the License, or (at your option) any later version. + version 3 of the License, or (at your option) any later version. The GNU C Library 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 - Lesser General Public License for more details. + General Public License for more details. - You should have received a copy of the GNU Lesser General Public + You should have received a copy of the GNU General Public License along with the GNU C Library; if not, see . */ #ifndef _ELOOP_THRESHOLD_H #define _ELOOP_THRESHOLD_H 1 -/* This file uses _GL_ATTRIBUTE_CONST. */ -#if !_LIBC && !_GL_CONFIG_H_INCLUDED - #error "Please include config.h first." -#endif - #include #ifdef _LIBC # include diff -Nru mmv-2.5/lib/errno.in.h mmv-2.5.1/lib/errno.in.h --- mmv-2.5/lib/errno.in.h 2023-07-20 19:40:23.000000000 +0000 +++ mmv-2.5.1/lib/errno.in.h 2023-08-08 11:02:47.000000000 +0000 @@ -1,19 +1,19 @@ /* A POSIX-like . - Copyright (C) 2008-2023 Free Software Foundation, Inc. + Copyright (C) 2008-2021 Free Software Foundation, Inc. - This file is free software: you can redistribute it and/or modify - it under the terms of the GNU Lesser General Public License as - published by the Free Software Foundation; either version 2.1 of the - License, or (at your option) any later version. + 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 file is distributed in the hope that it will be useful, + 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 Lesser General Public License for more details. + GNU General Public License for more details. - You should have received a copy of the GNU Lesser General Public License - along with this program. If not, see . */ + You should have received a copy of the GNU General Public License + along with this program; if not, see . */ #ifndef _@GUARD_PREFIX@_ERRNO_H diff -Nru mmv-2.5/lib/error.c mmv-2.5.1/lib/error.c --- mmv-2.5/lib/error.c 2023-07-20 19:40:24.000000000 +0000 +++ mmv-2.5.1/lib/error.c 2023-08-08 11:02:40.000000000 +0000 @@ -1,18 +1,18 @@ /* Error handler for noninteractive utilities - Copyright (C) 1990-1998, 2000-2007, 2009-2023 Free Software Foundation, Inc. + Copyright (C) 1990-1998, 2000-2007, 2009-2021 Free Software Foundation, Inc. This file is part of the GNU C Library. - This file is free software: you can redistribute it and/or modify - it under the terms of the GNU Lesser General Public License as - published by the Free Software Foundation; either version 2.1 of the - License, or (at your option) any later version. + 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 of the License, or + (at your option) any later version. - This file is distributed in the hope that it will be useful, + 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 Lesser General Public License for more details. + GNU General Public License for more details. - You should have received a copy of the GNU Lesser General Public License + You should have received a copy of the GNU General Public License along with this program. If not, see . */ /* Written by David MacKenzie . */ @@ -42,6 +42,8 @@ # define USE_UNLOCKED_IO 0 # define _GL_ATTRIBUTE_FORMAT_PRINTF_STANDARD(a, b) # define _GL_ARG_NONNULL(a) +#else +# include "getprogname.h" #endif #if USE_UNLOCKED_IO diff -Nru mmv-2.5/lib/error.h mmv-2.5.1/lib/error.h --- mmv-2.5/lib/error.h 1970-01-01 00:00:00.000000000 +0000 +++ mmv-2.5.1/lib/error.h 2023-08-08 11:02:40.000000000 +0000 @@ -0,0 +1,66 @@ +/* Declaration for error-reporting function + Copyright (C) 1995-1997, 2003, 2006, 2008-2021 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 + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 3 of the License, 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 . */ + +#ifndef _ERROR_H +#define _ERROR_H 1 + +/* Get _GL_ATTRIBUTE_SPEC_PRINTF_STANDARD, _GL_ATTRIBUTE_SPEC_PRINTF_SYSTEM. */ +#include + +#ifdef __cplusplus +extern "C" { +#endif + +/* Print a message with 'fprintf (stderr, FORMAT, ...)'; + if ERRNUM is nonzero, follow it with ": " and strerror (ERRNUM). + If STATUS is nonzero, terminate the program with 'exit (STATUS)'. */ + +extern void error (int __status, int __errnum, const char *__format, ...) +#if GNULIB_VFPRINTF_POSIX + _GL_ATTRIBUTE_FORMAT ((_GL_ATTRIBUTE_SPEC_PRINTF_STANDARD, 3, 4)) +#else + _GL_ATTRIBUTE_FORMAT ((_GL_ATTRIBUTE_SPEC_PRINTF_SYSTEM, 3, 4)) +#endif + ; + +extern void error_at_line (int __status, int __errnum, const char *__fname, + unsigned int __lineno, const char *__format, ...) +#if GNULIB_VFPRINTF_POSIX + _GL_ATTRIBUTE_FORMAT ((_GL_ATTRIBUTE_SPEC_PRINTF_STANDARD, 5, 6)) +#else + _GL_ATTRIBUTE_FORMAT ((_GL_ATTRIBUTE_SPEC_PRINTF_SYSTEM, 5, 6)) +#endif + ; + +/* If NULL, error will flush stdout, then print on stderr the program + name, a colon and a space. Otherwise, error will call this + function without parameters instead. */ +extern void (*error_print_progname) (void); + +/* This variable is incremented each time 'error' is called. */ +extern unsigned int error_message_count; + +/* Sometimes we want to have at most one error per line. This + variable controls whether this mode is selected or not. */ +extern int error_one_per_line; + +#ifdef __cplusplus +} +#endif + +#endif /* error.h */ diff -Nru mmv-2.5/lib/error.in.h mmv-2.5.1/lib/error.in.h --- mmv-2.5/lib/error.in.h 2023-07-20 19:40:24.000000000 +0000 +++ mmv-2.5.1/lib/error.in.h 1970-01-01 00:00:00.000000000 +0000 @@ -1,123 +0,0 @@ -/* Declarations for error-reporting functions. - Copyright (C) 1995-1997, 2003, 2006, 2008-2023 Free Software Foundation, - Inc. - This file is part of the GNU C Library. - - This file is free software: you can redistribute it and/or modify - it under the terms of the GNU Lesser General Public License as - published by the Free Software Foundation; either version 2.1 of the - License, or (at your option) any later version. - - This file 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 Lesser General Public License for more details. - - You should have received a copy of the GNU Lesser General Public License - along with this program. If not, see . */ - -#ifndef _@GUARD_PREFIX@_ERROR_H - -#if __GNUC__ >= 3 -@PRAGMA_SYSTEM_HEADER@ -#endif - -/* The include_next requires a split double-inclusion guard. */ -#if @HAVE_ERROR_H@ -# @INCLUDE_NEXT@ @NEXT_ERROR_H@ -#endif - -#ifndef _@GUARD_PREFIX@_ERROR_H -#define _@GUARD_PREFIX@_ERROR_H - -/* This file uses _GL_ATTRIBUTE_FORMAT. */ -#if !_GL_CONFIG_H_INCLUDED - #error "Please include config.h first." -#endif - -/* Get _GL_ATTRIBUTE_SPEC_PRINTF_STANDARD, _GL_ATTRIBUTE_SPEC_PRINTF_SYSTEM. */ -#include - -/* The definitions of _GL_FUNCDECL_RPL etc. are copied here. */ - -#if GNULIB_VFPRINTF_POSIX -# define _GL_ATTRIBUTE_SPEC_PRINTF_ERROR _GL_ATTRIBUTE_SPEC_PRINTF_STANDARD -#else -# define _GL_ATTRIBUTE_SPEC_PRINTF_ERROR _GL_ATTRIBUTE_SPEC_PRINTF_SYSTEM -#endif - -#ifdef __cplusplus -extern "C" { -#endif - -/* Print a message with 'fprintf (stderr, FORMAT, ...)'; - if ERRNUM is nonzero, follow it with ": " and strerror (ERRNUM). - If STATUS is nonzero, terminate the program with 'exit (STATUS)'. */ -#if @REPLACE_ERROR@ -# if !(defined __cplusplus && defined GNULIB_NAMESPACE) -# undef error -# define error rpl_error -# endif -_GL_FUNCDECL_RPL (error, void, - (int __status, int __errnum, const char *__format, ...) - _GL_ATTRIBUTE_FORMAT ((_GL_ATTRIBUTE_SPEC_PRINTF_ERROR, 3, 4))); -_GL_CXXALIAS_RPL (error, void, - (int __status, int __errnum, const char *__format, ...)); -#else -# if ! @HAVE_ERROR@ -_GL_FUNCDECL_SYS (error, void, - (int __status, int __errnum, const char *__format, ...) - _GL_ATTRIBUTE_FORMAT ((_GL_ATTRIBUTE_SPEC_PRINTF_ERROR, 3, 4))); -# endif -_GL_CXXALIAS_SYS (error, void, - (int __status, int __errnum, const char *__format, ...)); -#endif -#if __GLIBC__ >= 2 -_GL_CXXALIASWARN (error); -#endif - -/* Likewise. If FILENAME is non-NULL, include FILENAME:LINENO: in the - message. */ -#if @REPLACE_ERROR_AT_LINE@ -# if !(defined __cplusplus && defined GNULIB_NAMESPACE) -# undef error_at_line -# define error_at_line rpl_error_at_line -# endif -_GL_FUNCDECL_RPL (error_at_line, void, - (int __status, int __errnum, const char *__filename, - unsigned int __lineno, const char *__format, ...) - _GL_ATTRIBUTE_FORMAT ((_GL_ATTRIBUTE_SPEC_PRINTF_ERROR, 5, 6))); -_GL_CXXALIAS_RPL (error_at_line, void, - (int __status, int __errnum, const char *__filename, - unsigned int __lineno, const char *__format, ...)); -#else -# if ! @HAVE_ERROR_AT_LINE@ -_GL_FUNCDECL_SYS (error_at_line, void, - (int __status, int __errnum, const char *__filename, - unsigned int __lineno, const char *__format, ...) - _GL_ATTRIBUTE_FORMAT ((_GL_ATTRIBUTE_SPEC_PRINTF_ERROR, 5, 6))); -# endif -_GL_CXXALIAS_SYS (error_at_line, void, - (int __status, int __errnum, const char *__filename, - unsigned int __lineno, const char *__format, ...)); -#endif -_GL_CXXALIASWARN (error_at_line); - -/* If NULL, error will flush stdout, then print on stderr the program - name, a colon and a space. Otherwise, error will call this - function without parameters instead. */ -extern void (*error_print_progname) (void); - -/* This variable is incremented each time 'error' is called. */ -extern unsigned int error_message_count; - -/* Sometimes we want to have at most one error per line. This - variable controls whether this mode is selected or not. */ -extern int error_one_per_line; - -#ifdef __cplusplus -} -#endif - -#endif /* _@GUARD_PREFIX@_ERROR_H */ -#endif /* _@GUARD_PREFIX@_ERROR_H */ diff -Nru mmv-2.5/lib/exitfail.c mmv-2.5.1/lib/exitfail.c --- mmv-2.5/lib/exitfail.c 2023-07-20 19:40:23.000000000 +0000 +++ mmv-2.5.1/lib/exitfail.c 2023-08-08 11:02:40.000000000 +0000 @@ -1,18 +1,18 @@ /* Failure exit status - Copyright (C) 2002-2003, 2005-2007, 2009-2023 Free Software Foundation, Inc. + Copyright (C) 2002-2003, 2005-2007, 2009-2021 Free Software Foundation, Inc. - This file is free software: you can redistribute it and/or modify - it under the terms of the GNU Lesser General Public License as - published by the Free Software Foundation; either version 2.1 of the - License, or (at your option) any later version. + 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 of the License, or + (at your option) any later version. - This file is distributed in the hope that it will be useful, + 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 Lesser General Public License for more details. + GNU General Public License for more details. - You should have received a copy of the GNU Lesser General Public License + You should have received a copy of the GNU General Public License along with this program. If not, see . */ #include diff -Nru mmv-2.5/lib/exitfail.h mmv-2.5.1/lib/exitfail.h --- mmv-2.5/lib/exitfail.h 2023-07-20 19:40:23.000000000 +0000 +++ mmv-2.5.1/lib/exitfail.h 2023-08-08 11:02:40.000000000 +0000 @@ -1,18 +1,18 @@ /* Failure exit status - Copyright (C) 2002, 2009-2023 Free Software Foundation, Inc. + Copyright (C) 2002, 2009-2021 Free Software Foundation, Inc. - This file is free software: you can redistribute it and/or modify - it under the terms of the GNU Lesser General Public License as - published by the Free Software Foundation; either version 2.1 of the - License, or (at your option) any later version. + 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 of the License, or + (at your option) any later version. - This file is distributed in the hope that it will be useful, + 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 Lesser General Public License for more details. + GNU General Public License for more details. - You should have received a copy of the GNU Lesser General Public License + You should have received a copy of the GNU General Public License along with this program. If not, see . */ extern int volatile exit_failure; diff -Nru mmv-2.5/lib/fcntl.c mmv-2.5.1/lib/fcntl.c --- mmv-2.5/lib/fcntl.c 2023-07-20 19:40:23.000000000 +0000 +++ mmv-2.5.1/lib/fcntl.c 2023-08-08 11:02:40.000000000 +0000 @@ -1,18 +1,18 @@ /* Provide file descriptor control. - Copyright (C) 2009-2023 Free Software Foundation, Inc. + Copyright (C) 2009-2021 Free Software Foundation, Inc. - This file is free software: you can redistribute it and/or modify - it under the terms of the GNU Lesser General Public License as - published by the Free Software Foundation; either version 2.1 of the - License, or (at your option) any later version. + 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 of the License, or + (at your option) any later version. - This file is distributed in the hope that it will be useful, + 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 Lesser General Public License for more details. + GNU General Public License for more details. - You should have received a copy of the GNU Lesser General Public License + You should have received a copy of the GNU General Public License along with this program. If not, see . */ /* Written by Eric Blake . */ diff -Nru mmv-2.5/lib/fcntl.in.h mmv-2.5.1/lib/fcntl.in.h --- mmv-2.5/lib/fcntl.in.h 2023-07-20 19:40:23.000000000 +0000 +++ mmv-2.5.1/lib/fcntl.in.h 2023-08-08 11:02:40.000000000 +0000 @@ -1,18 +1,18 @@ /* Like , but with non-working flags defined to 0. - Copyright (C) 2006-2023 Free Software Foundation, Inc. + Copyright (C) 2006-2021 Free Software Foundation, Inc. - This file is free software: you can redistribute it and/or modify - it under the terms of the GNU Lesser General Public License as - published by the Free Software Foundation; either version 2.1 of the - License, or (at your option) any later version. + 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 of the License, or + (at your option) any later version. - This file is distributed in the hope that it will be useful, + 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 Lesser General Public License for more details. + GNU General Public License for more details. - You should have received a copy of the GNU Lesser General Public License + You should have received a copy of the GNU General Public License along with this program. If not, see . */ /* written by Paul Eggert */ @@ -74,11 +74,6 @@ #ifndef _@GUARD_PREFIX@_FCNTL_H #define _@GUARD_PREFIX@_FCNTL_H -/* This file uses GNULIB_POSIXCHECK, HAVE_RAW_DECL_*. */ -#if !_GL_CONFIG_H_INCLUDED - #error "Please include config.h first." -#endif - #ifndef __GLIBC__ /* Avoid namespace pollution on glibc systems. */ # include #endif @@ -440,10 +435,6 @@ # define AT_EACCESS 4 #endif -/* Ignore this flag if not supported. */ -#ifndef AT_NO_AUTOMOUNT -# define AT_NO_AUTOMOUNT 0 -#endif #endif /* _@GUARD_PREFIX@_FCNTL_H */ #endif /* _@GUARD_PREFIX@_FCNTL_H */ diff -Nru mmv-2.5/lib/fd-hook.c mmv-2.5.1/lib/fd-hook.c --- mmv-2.5/lib/fd-hook.c 2023-07-20 19:40:23.000000000 +0000 +++ mmv-2.5.1/lib/fd-hook.c 2023-08-08 11:02:47.000000000 +0000 @@ -1,18 +1,18 @@ /* Hook for making file descriptor functions close(), ioctl() extensible. - Copyright (C) 2009-2023 Free Software Foundation, Inc. + Copyright (C) 2009-2021 Free Software Foundation, Inc. Written by Bruno Haible , 2009. - This file is free software: you can redistribute it and/or modify - it under the terms of the GNU Lesser General Public License as - published by the Free Software Foundation; either version 2.1 of the - License, or (at your option) any later version. + 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 of the License, or + (at your option) any later version. - This file is distributed in the hope that it will be useful, + 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 Lesser General Public License for more details. + 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 Lesser General Public License + You should have received a copy of the GNU General Public License along with this program. If not, see . */ #include diff -Nru mmv-2.5/lib/fd-hook.h mmv-2.5.1/lib/fd-hook.h --- mmv-2.5/lib/fd-hook.h 2023-07-20 19:40:23.000000000 +0000 +++ mmv-2.5.1/lib/fd-hook.h 2023-08-08 11:02:47.000000000 +0000 @@ -1,17 +1,17 @@ /* Hook for making file descriptor functions close(), ioctl() extensible. - Copyright (C) 2009-2023 Free Software Foundation, Inc. + Copyright (C) 2009-2021 Free Software Foundation, Inc. - This file is free software: you can redistribute it and/or modify - it under the terms of the GNU Lesser General Public License as - published by the Free Software Foundation; either version 2.1 of the - License, or (at your option) any later version. + 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 of the License, or + (at your option) any later version. - This file is distributed in the hope that it will be useful, + 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 Lesser General Public License for more details. + 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 Lesser General Public License + You should have received a copy of the GNU General Public License along with this program. If not, see . */ diff -Nru mmv-2.5/lib/filename.h mmv-2.5.1/lib/filename.h --- mmv-2.5/lib/filename.h 2023-07-20 19:40:23.000000000 +0000 +++ mmv-2.5.1/lib/filename.h 2023-08-08 11:02:47.000000000 +0000 @@ -1,18 +1,18 @@ /* Basic filename support macros. - Copyright (C) 2001-2023 Free Software Foundation, Inc. + Copyright (C) 2001-2004, 2007-2021 Free Software Foundation, Inc. This file is part of the GNU C Library. The GNU C Library is free software; you can redistribute it and/or - modify it under the terms of the GNU Lesser General Public + modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either - version 2.1 of the License, or (at your option) any later version. + version 3 of the License, or (at your option) any later version. The GNU C Library 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 - Lesser General Public License for more details. + General Public License for more details. - You should have received a copy of the GNU Lesser General Public + You should have received a copy of the GNU General Public License along with the GNU C Library; if not, see . */ diff -Nru mmv-2.5/lib/float+.h mmv-2.5.1/lib/float+.h --- mmv-2.5/lib/float+.h 2023-07-20 19:40:23.000000000 +0000 +++ mmv-2.5.1/lib/float+.h 2023-08-08 11:02:47.000000000 +0000 @@ -1,19 +1,19 @@ /* Supplemental information about the floating-point formats. - Copyright (C) 2007, 2009-2023 Free Software Foundation, Inc. + Copyright (C) 2007, 2009-2021 Free Software Foundation, Inc. Written by Bruno Haible , 2007. - This file is free software: you can redistribute it and/or modify - it under the terms of the GNU Lesser General Public License as - published by the Free Software Foundation; either version 2.1 of the - License, or (at your option) any later version. + 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 file is distributed in the hope that it will be useful, + 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 Lesser General Public License for more details. + GNU General Public License for more details. - You should have received a copy of the GNU Lesser General Public License - along with this program. If not, see . */ + You should have received a copy of the GNU General Public License + along with this program; if not, see . */ #ifndef _FLOATPLUS_H #define _FLOATPLUS_H diff -Nru mmv-2.5/lib/float.c mmv-2.5.1/lib/float.c --- mmv-2.5/lib/float.c 2023-07-20 19:40:23.000000000 +0000 +++ mmv-2.5.1/lib/float.c 2023-08-08 11:02:40.000000000 +0000 @@ -1,18 +1,18 @@ /* Auxiliary definitions for . - Copyright (C) 2011-2023 Free Software Foundation, Inc. + Copyright (C) 2011-2021 Free Software Foundation, Inc. Written by Bruno Haible , 2011. - This file is free software: you can redistribute it and/or modify - it under the terms of the GNU Lesser General Public License as - published by the Free Software Foundation; either version 2.1 of the - License, or (at your option) any later version. + 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 of the License, or + (at your option) any later version. - This file is distributed in the hope that it will be useful, + 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 Lesser General Public License for more details. + GNU General Public License for more details. - You should have received a copy of the GNU Lesser General Public License + You should have received a copy of the GNU General Public License along with this program. If not, see . */ #include diff -Nru mmv-2.5/lib/float.in.h mmv-2.5.1/lib/float.in.h --- mmv-2.5/lib/float.in.h 2023-07-20 19:40:23.000000000 +0000 +++ mmv-2.5.1/lib/float.in.h 2023-08-08 11:02:40.000000000 +0000 @@ -1,18 +1,18 @@ /* A correct . - Copyright (C) 2007-2023 Free Software Foundation, Inc. + Copyright (C) 2007-2021 Free Software Foundation, Inc. - This file is free software: you can redistribute it and/or modify - it under the terms of the GNU Lesser General Public License as - published by the Free Software Foundation; either version 2.1 of the - License, or (at your option) any later version. + 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 of the License, or + (at your option) any later version. - This file is distributed in the hope that it will be useful, + 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 Lesser General Public License for more details. + GNU General Public License for more details. - You should have received a copy of the GNU Lesser General Public License + You should have received a copy of the GNU General Public License along with this program. If not, see . */ #ifndef _@GUARD_PREFIX@_FLOAT_H diff -Nru mmv-2.5/lib/fprintf.c mmv-2.5.1/lib/fprintf.c --- mmv-2.5/lib/fprintf.c 2023-07-20 19:40:23.000000000 +0000 +++ mmv-2.5.1/lib/fprintf.c 2023-08-08 11:02:40.000000000 +0000 @@ -1,17 +1,17 @@ /* Formatted output to a stream. - Copyright (C) 2004, 2006-2023 Free Software Foundation, Inc. + Copyright (C) 2004, 2006-2021 Free Software Foundation, Inc. - This file is free software: you can redistribute it and/or modify - it under the terms of the GNU Lesser General Public License as - published by the Free Software Foundation, either version 3 of the - License, or (at your option) any later version. + 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 of the License, or + (at your option) any later version. - This file is distributed in the hope that it will be useful, + 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 Lesser General Public License for more details. + GNU General Public License for more details. - You should have received a copy of the GNU Lesser General Public License + You should have received a copy of the GNU General Public License along with this program. If not, see . */ #ifdef HAVE_CONFIG_H @@ -55,7 +55,11 @@ if (fwrite (output, 1, len, fp) < len) { if (output != buf) - free (output); + { + int saved_errno = errno; + free (output); + errno = saved_errno; + } return -1; } diff -Nru mmv-2.5/lib/fpucw.h mmv-2.5.1/lib/fpucw.h --- mmv-2.5/lib/fpucw.h 2023-07-20 19:40:23.000000000 +0000 +++ mmv-2.5.1/lib/fpucw.h 2023-08-08 11:02:40.000000000 +0000 @@ -1,18 +1,18 @@ /* Manipulating the FPU control word. -*- coding: utf-8 -*- - Copyright (C) 2007-2023 Free Software Foundation, Inc. + Copyright (C) 2007-2021 Free Software Foundation, Inc. Written by Bruno Haible , 2007. - This file is free software: you can redistribute it and/or modify - it under the terms of the GNU Lesser General Public License as - published by the Free Software Foundation; either version 2.1 of the - License, or (at your option) any later version. + 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 of the License, or + (at your option) any later version. - This file is distributed in the hope that it will be useful, + 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 Lesser General Public License for more details. + GNU General Public License for more details. - You should have received a copy of the GNU Lesser General Public License + You should have received a copy of the GNU General Public License along with this program. If not, see . */ #ifndef _FPUCW_H diff -Nru mmv-2.5/lib/free.c mmv-2.5.1/lib/free.c --- mmv-2.5/lib/free.c 2023-07-20 19:40:23.000000000 +0000 +++ mmv-2.5.1/lib/free.c 2023-08-08 11:02:40.000000000 +0000 @@ -1,18 +1,18 @@ /* Make free() preserve errno. - Copyright (C) 2003, 2006, 2009-2023 Free Software Foundation, Inc. + Copyright (C) 2003, 2006, 2009-2021 Free Software Foundation, Inc. - This file is free software: you can redistribute it and/or modify - it under the terms of the GNU Lesser General Public License as - published by the Free Software Foundation; either version 2.1 of the - License, or (at your option) any later version. + 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 of the License, or + (at your option) any later version. - This file is distributed in the hope that it will be useful, + 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 Lesser General Public License for more details. + GNU General Public License for more details. - You should have received a copy of the GNU Lesser General Public License + You should have received a copy of the GNU General Public License along with this program. If not, see . */ /* written by Paul Eggert */ diff -Nru mmv-2.5/lib/frexp.c mmv-2.5.1/lib/frexp.c --- mmv-2.5/lib/frexp.c 2023-07-20 19:40:23.000000000 +0000 +++ mmv-2.5.1/lib/frexp.c 2023-08-08 11:02:40.000000000 +0000 @@ -1,17 +1,17 @@ /* Split a double into fraction and mantissa. - Copyright (C) 2007-2023 Free Software Foundation, Inc. + Copyright (C) 2007-2021 Free Software Foundation, Inc. - This file is free software: you can redistribute it and/or modify - it under the terms of the GNU Lesser General Public License as - published by the Free Software Foundation; either version 2.1 of the - License, or (at your option) any later version. + 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 of the License, or + (at your option) any later version. - This file is distributed in the hope that it will be useful, + 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 Lesser General Public License for more details. + GNU General Public License for more details. - You should have received a copy of the GNU Lesser General Public License + You should have received a copy of the GNU General Public License along with this program. If not, see . */ /* Written by Paolo Bonzini , 2003, and diff -Nru mmv-2.5/lib/frexpl.c mmv-2.5.1/lib/frexpl.c --- mmv-2.5/lib/frexpl.c 2023-07-20 19:40:23.000000000 +0000 +++ mmv-2.5.1/lib/frexpl.c 2023-08-08 11:02:40.000000000 +0000 @@ -1,17 +1,17 @@ /* Split a 'long double' into fraction and mantissa. - Copyright (C) 2007, 2009-2023 Free Software Foundation, Inc. + Copyright (C) 2007, 2009-2021 Free Software Foundation, Inc. - This file is free software: you can redistribute it and/or modify - it under the terms of the GNU Lesser General Public License as - published by the Free Software Foundation; either version 2.1 of the - License, or (at your option) any later version. + 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 of the License, or + (at your option) any later version. - This file is distributed in the hope that it will be useful, + 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 Lesser General Public License for more details. + GNU General Public License for more details. - You should have received a copy of the GNU Lesser General Public License + You should have received a copy of the GNU General Public License along with this program. If not, see . */ #include diff -Nru mmv-2.5/lib/fseterr.c mmv-2.5.1/lib/fseterr.c --- mmv-2.5/lib/fseterr.c 2023-07-20 19:40:23.000000000 +0000 +++ mmv-2.5.1/lib/fseterr.c 2023-08-08 11:02:40.000000000 +0000 @@ -1,17 +1,17 @@ /* Set the error indicator of a stream. - Copyright (C) 2007-2023 Free Software Foundation, Inc. + Copyright (C) 2007-2021 Free Software Foundation, Inc. - This file is free software: you can redistribute it and/or modify - it under the terms of the GNU Lesser General Public License as - published by the Free Software Foundation; either version 2.1 of the - License, or (at your option) any later version. + 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 of the License, or + (at your option) any later version. - This file is distributed in the hope that it will be useful, + 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 Lesser General Public License for more details. + GNU General Public License for more details. - You should have received a copy of the GNU Lesser General Public License + You should have received a copy of the GNU General Public License along with this program. If not, see . */ #include diff -Nru mmv-2.5/lib/fseterr.h mmv-2.5.1/lib/fseterr.h --- mmv-2.5/lib/fseterr.h 2023-07-20 19:40:23.000000000 +0000 +++ mmv-2.5.1/lib/fseterr.h 2023-08-08 11:02:40.000000000 +0000 @@ -1,27 +1,22 @@ /* Set the error indicator of a stream. - Copyright (C) 2007, 2009-2023 Free Software Foundation, Inc. + Copyright (C) 2007, 2009-2021 Free Software Foundation, Inc. - This file is free software: you can redistribute it and/or modify - it under the terms of the GNU Lesser General Public License as - published by the Free Software Foundation; either version 2.1 of the - License, or (at your option) any later version. + 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 of the License, or + (at your option) any later version. - This file is distributed in the hope that it will be useful, + 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 Lesser General Public License for more details. + GNU General Public License for more details. - You should have received a copy of the GNU Lesser General Public License + You should have received a copy of the GNU General Public License along with this program. If not, see . */ #ifndef _FSETERR_H #define _FSETERR_H -/* This file uses HAVE___FSETERR. */ -#if !_GL_CONFIG_H_INCLUDED - #error "Please include config.h first." -#endif - #include /* Set the error indicator of the stream FP. diff -Nru mmv-2.5/lib/fstat.c mmv-2.5.1/lib/fstat.c --- mmv-2.5/lib/fstat.c 2023-07-20 19:40:23.000000000 +0000 +++ mmv-2.5.1/lib/fstat.c 2023-08-08 11:02:40.000000000 +0000 @@ -1,17 +1,17 @@ /* fstat() replacement. - Copyright (C) 2011-2023 Free Software Foundation, Inc. + Copyright (C) 2011-2021 Free Software Foundation, Inc. - This file is free software: you can redistribute it and/or modify - it under the terms of the GNU Lesser General Public License as - published by the Free Software Foundation; either version 2.1 of the - License, or (at your option) any later version. + 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 of the License, or + (at your option) any later version. - This file is distributed in the hope that it will be useful, + 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 Lesser General Public License for more details. + GNU General Public License for more details. - You should have received a copy of the GNU Lesser General Public License + You should have received a copy of the GNU General Public License along with this program. If not, see . */ /* If the user's config.h happens to include , let it include only diff -Nru mmv-2.5/lib/getdtablesize.c mmv-2.5.1/lib/getdtablesize.c --- mmv-2.5/lib/getdtablesize.c 2023-07-20 19:40:23.000000000 +0000 +++ mmv-2.5.1/lib/getdtablesize.c 2023-08-08 11:02:40.000000000 +0000 @@ -1,18 +1,18 @@ /* getdtablesize() function: Return maximum possible file descriptor value + 1. - Copyright (C) 2008-2023 Free Software Foundation, Inc. + Copyright (C) 2008-2021 Free Software Foundation, Inc. Written by Bruno Haible , 2008. - This file is free software: you can redistribute it and/or modify - it under the terms of the GNU Lesser General Public License as - published by the Free Software Foundation; either version 2.1 of the - License, or (at your option) any later version. + 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 of the License, or + (at your option) any later version. - This file is distributed in the hope that it will be useful, + 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 Lesser General Public License for more details. + GNU General Public License for more details. - You should have received a copy of the GNU Lesser General Public License + You should have received a copy of the GNU General Public License along with this program. If not, see . */ #include diff -Nru mmv-2.5/lib/getopt-cdefs.in.h mmv-2.5.1/lib/getopt-cdefs.in.h --- mmv-2.5/lib/getopt-cdefs.in.h 2023-07-20 19:40:23.000000000 +0000 +++ mmv-2.5.1/lib/getopt-cdefs.in.h 2023-08-08 11:02:47.000000000 +0000 @@ -1,21 +1,22 @@ /* getopt-on-non-glibc compatibility macros. - Copyright (C) 1989-2023 Free Software Foundation, Inc. + Copyright (C) 1989-2021 Free Software Foundation, Inc. This file is part of gnulib. Unlike most of the getopt implementation, it is NOT shared with the GNU C Library. - This file is free software: you can redistribute it and/or modify - it under the terms of the GNU Lesser General Public License as - published by the Free Software Foundation; either version 2.1 of the - License, or (at your option) any later version. + 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 the Free Software Foundation; either version 3 of + the License, or (at your option) any later version. - This file 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 Lesser General Public License for more details. + This file 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 Lesser General Public License - along with this program. If not, see . */ + You should have received a copy of the GNU General Public + License along with gnulib; if not, see + . */ #ifndef _GETOPT_CDEFS_H #define _GETOPT_CDEFS_H 1 diff -Nru mmv-2.5/lib/getopt-core.h mmv-2.5.1/lib/getopt-core.h --- mmv-2.5/lib/getopt-core.h 2023-07-20 19:40:23.000000000 +0000 +++ mmv-2.5.1/lib/getopt-core.h 2023-08-08 11:02:47.000000000 +0000 @@ -1,19 +1,19 @@ /* Declarations for getopt (basic, portable features only). - Copyright (C) 1989-2023 Free Software Foundation, Inc. + Copyright (C) 1989-2021 Free Software Foundation, Inc. This file is part of the GNU C Library and is also part of gnulib. Patches to this file should be submitted to both projects. The GNU C Library is free software; you can redistribute it and/or - modify it under the terms of the GNU Lesser General Public + modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either - version 2.1 of the License, or (at your option) any later version. + version 3 of the License, or (at your option) any later version. The GNU C Library 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 - Lesser General Public License for more details. + General Public License for more details. - You should have received a copy of the GNU Lesser General Public + You should have received a copy of the GNU General Public License along with the GNU C Library; if not, see . */ diff -Nru mmv-2.5/lib/getopt-ext.h mmv-2.5.1/lib/getopt-ext.h --- mmv-2.5/lib/getopt-ext.h 2023-07-20 19:40:23.000000000 +0000 +++ mmv-2.5.1/lib/getopt-ext.h 2023-08-08 11:02:47.000000000 +0000 @@ -1,19 +1,19 @@ /* Declarations for getopt (GNU extensions). - Copyright (C) 1989-2023 Free Software Foundation, Inc. + Copyright (C) 1989-2021 Free Software Foundation, Inc. This file is part of the GNU C Library and is also part of gnulib. Patches to this file should be submitted to both projects. The GNU C Library is free software; you can redistribute it and/or - modify it under the terms of the GNU Lesser General Public + modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either - version 2.1 of the License, or (at your option) any later version. + version 3 of the License, or (at your option) any later version. The GNU C Library 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 - Lesser General Public License for more details. + General Public License for more details. - You should have received a copy of the GNU Lesser General Public + You should have received a copy of the GNU General Public License along with the GNU C Library; if not, see . */ diff -Nru mmv-2.5/lib/getopt-pfx-core.h mmv-2.5.1/lib/getopt-pfx-core.h --- mmv-2.5/lib/getopt-pfx-core.h 2023-07-20 19:40:23.000000000 +0000 +++ mmv-2.5.1/lib/getopt-pfx-core.h 2023-08-08 11:02:47.000000000 +0000 @@ -1,21 +1,22 @@ /* getopt (basic, portable features) gnulib wrapper header. - Copyright (C) 1989-2023 Free Software Foundation, Inc. + Copyright (C) 1989-2021 Free Software Foundation, Inc. This file is part of gnulib. Unlike most of the getopt implementation, it is NOT shared with the GNU C Library. - This file is free software: you can redistribute it and/or modify - it under the terms of the GNU Lesser General Public License as - published by the Free Software Foundation; either version 2.1 of the - License, or (at your option) any later version. - - This file 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 Lesser General Public License for more details. - - You should have received a copy of the GNU Lesser General Public License - along with this program. If not, see . */ + 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 the Free Software Foundation; either version 3 of + the License, or (at your option) any later version. + + This file 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 gnulib; if not, see + . */ #ifndef _GETOPT_PFX_CORE_H #define _GETOPT_PFX_CORE_H 1 @@ -47,7 +48,7 @@ # define optind __GETOPT_ID (optind) # define optopt __GETOPT_ID (optopt) -/* Work around a problem on macOS, which declares getopt with a +/* Work around a a problem on macOS, which declares getopt with a trailing __DARWIN_ALIAS(getopt) that would expand to something like __asm("_" "rpl_getopt" "$UNIX2003") were it not for the following hack to suppress the macOS declaration . */ diff -Nru mmv-2.5/lib/getopt-pfx-ext.h mmv-2.5.1/lib/getopt-pfx-ext.h --- mmv-2.5/lib/getopt-pfx-ext.h 2023-07-20 19:40:23.000000000 +0000 +++ mmv-2.5.1/lib/getopt-pfx-ext.h 2023-08-08 11:02:47.000000000 +0000 @@ -1,21 +1,22 @@ /* getopt (GNU extensions) gnulib wrapper header. - Copyright (C) 1989-2023 Free Software Foundation, Inc. + Copyright (C) 1989-2021 Free Software Foundation, Inc. This file is part of gnulib. Unlike most of the getopt implementation, it is NOT shared with the GNU C Library. - This file is free software: you can redistribute it and/or modify - it under the terms of the GNU Lesser General Public License as - published by the Free Software Foundation; either version 2.1 of the - License, or (at your option) any later version. + 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 the Free Software Foundation; either version 3 of + the License, or (at your option) any later version. - This file 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 Lesser General Public License for more details. + This file 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 Lesser General Public License - along with this program. If not, see . */ + You should have received a copy of the GNU General Public + License along with gnulib; if not, see + . */ #ifndef _GETOPT_PFX_EXT_H #define _GETOPT_PFX_EXT_H 1 diff -Nru mmv-2.5/lib/getopt.c mmv-2.5.1/lib/getopt.c --- mmv-2.5/lib/getopt.c 2023-07-20 19:40:23.000000000 +0000 +++ mmv-2.5.1/lib/getopt.c 2023-08-08 11:02:47.000000000 +0000 @@ -1,19 +1,19 @@ /* Getopt for GNU. - Copyright (C) 1987-2023 Free Software Foundation, Inc. + Copyright (C) 1987-2021 Free Software Foundation, Inc. This file is part of the GNU C Library and is also part of gnulib. Patches to this file should be submitted to both projects. The GNU C Library is free software; you can redistribute it and/or - modify it under the terms of the GNU Lesser General Public + modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either - version 2.1 of the License, or (at your option) any later version. + version 3 of the License, or (at your option) any later version. The GNU C Library 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 - Lesser General Public License for more details. + General Public License for more details. - You should have received a copy of the GNU Lesser General Public + You should have received a copy of the GNU General Public License along with the GNU C Library; if not, see . */ @@ -378,8 +378,8 @@ /* Initialize internal data upon the first call to getopt. */ static const char * -_getopt_initialize (_GL_UNUSED int argc, - _GL_UNUSED char **argv, const char *optstring, +_getopt_initialize (int argc _GL_UNUSED, + char **argv _GL_UNUSED, const char *optstring, struct _getopt_data *d, int posixly_correct) { /* Start processing options with ARGV-element 1 (since ARGV-element 0 diff -Nru mmv-2.5/lib/getopt.in.h mmv-2.5.1/lib/getopt.in.h --- mmv-2.5/lib/getopt.in.h 2023-07-20 19:40:23.000000000 +0000 +++ mmv-2.5.1/lib/getopt.in.h 2023-08-08 11:02:47.000000000 +0000 @@ -1,22 +1,22 @@ /* Declarations for getopt. - Copyright (C) 1989-2023 Free Software Foundation, Inc. + Copyright (C) 1989-2021 Free Software Foundation, Inc. This file is part of gnulib. Unlike most of the getopt implementation, it is NOT shared with the GNU C Library, which supplies a different version of this file. - This file is free software: you can redistribute it and/or modify - it under the terms of the GNU Lesser General Public License as - published by the Free Software Foundation; either version 2.1 of the - License, or (at your option) any later version. + 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 the Free Software Foundation; either version 3 of + the License, or (at your option) any later version. - This file 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 Lesser General Public License for more details. + This file 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 Lesser General Public License - along with this program. If not, see . */ + You should have received a copy of the GNU General Public + License along with gnulib; if not, see . */ #ifndef _@GUARD_PREFIX@_GETOPT_H diff -Nru mmv-2.5/lib/getopt1.c mmv-2.5.1/lib/getopt1.c --- mmv-2.5/lib/getopt1.c 2023-07-20 19:40:23.000000000 +0000 +++ mmv-2.5.1/lib/getopt1.c 2023-08-08 11:02:47.000000000 +0000 @@ -1,19 +1,19 @@ /* getopt_long and getopt_long_only entry points for GNU getopt. - Copyright (C) 1987-2023 Free Software Foundation, Inc. + Copyright (C) 1987-2021 Free Software Foundation, Inc. This file is part of the GNU C Library and is also part of gnulib. Patches to this file should be submitted to both projects. The GNU C Library is free software; you can redistribute it and/or - modify it under the terms of the GNU Lesser General Public + modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either - version 2.1 of the License, or (at your option) any later version. + version 3 of the License, or (at your option) any later version. The GNU C Library 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 - Lesser General Public License for more details. + General Public License for more details. - You should have received a copy of the GNU Lesser General Public + You should have received a copy of the GNU General Public License along with the GNU C Library; if not, see . */ diff -Nru mmv-2.5/lib/getopt_int.h mmv-2.5.1/lib/getopt_int.h --- mmv-2.5/lib/getopt_int.h 2023-07-20 19:40:23.000000000 +0000 +++ mmv-2.5.1/lib/getopt_int.h 2023-08-08 11:02:47.000000000 +0000 @@ -1,19 +1,19 @@ /* Internal declarations for getopt. - Copyright (C) 1989-2023 Free Software Foundation, Inc. + Copyright (C) 1989-2021 Free Software Foundation, Inc. This file is part of the GNU C Library and is also part of gnulib. Patches to this file should be submitted to both projects. The GNU C Library is free software; you can redistribute it and/or - modify it under the terms of the GNU Lesser General Public + modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either - version 2.1 of the License, or (at your option) any later version. + version 3 of the License, or (at your option) any later version. The GNU C Library 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 - Lesser General Public License for more details. + General Public License for more details. - You should have received a copy of the GNU Lesser General Public + You should have received a copy of the GNU General Public License along with the GNU C Library; if not, see . */ diff -Nru mmv-2.5/lib/getprogname.c mmv-2.5.1/lib/getprogname.c --- mmv-2.5/lib/getprogname.c 2023-07-20 19:40:24.000000000 +0000 +++ mmv-2.5.1/lib/getprogname.c 2023-08-08 11:02:47.000000000 +0000 @@ -1,25 +1,26 @@ /* Program name management. - Copyright (C) 2016-2023 Free Software Foundation, Inc. + Copyright (C) 2016-2021 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify - it under the terms of the GNU Lesser General Public License as published by - the Free Software Foundation; either version 2.1 of the License, or + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 3 of the License, 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 Lesser General Public License for more details. + GNU General Public License for more details. - You should have received a copy of the GNU Lesser General Public License + You should have received a copy of the GNU General Public License along with this program. If not, see . */ #include -/* Specification. Also get __argv declaration. */ -#include +/* Specification. */ +#include "getprogname.h" #include /* get program_invocation_name declaration */ +#include /* get __argv declaration */ #ifdef _AIX # include @@ -42,7 +43,7 @@ # include #endif -#if defined __sgi || defined __osf__ +#ifdef __sgi # include # include # include @@ -52,12 +53,13 @@ #if defined __SCO_VERSION__ || defined __sysv5__ # include +# include # include #endif #include "basename-lgpl.h" -#ifndef HAVE_GETPROGNAME /* not Mac OS X, FreeBSD, NetBSD, OpenBSD >= 5.4, Solaris >= 11, Cygwin, Android API level >= 21 */ +#ifndef HAVE_GETPROGNAME /* not Mac OS X, FreeBSD, NetBSD, OpenBSD >= 5.4, Cygwin */ char const * getprogname (void) { @@ -222,15 +224,11 @@ free (buf.ps_pathptr); } return p; -# elif defined __sgi || defined __osf__ /* IRIX or Tru64 */ +# elif defined __sgi /* IRIX */ char filename[50]; int fd; - # if defined __sgi - sprintf (filename, "/proc/pinfo/%d", (int) getpid ()); - # else - sprintf (filename, "/proc/%d", (int) getpid ()); - # endif + sprintf (filename, "/proc/pinfo/%d", (int) getpid ()); fd = open (filename, O_RDONLY | O_CLOEXEC); if (0 <= fd) { diff -Nru mmv-2.5/lib/getprogname.h mmv-2.5.1/lib/getprogname.h --- mmv-2.5/lib/getprogname.h 2023-07-20 19:40:23.000000000 +0000 +++ mmv-2.5.1/lib/getprogname.h 2023-08-08 11:02:47.000000000 +0000 @@ -1,17 +1,17 @@ /* Program name management. - Copyright (C) 2016-2023 Free Software Foundation, Inc. + Copyright (C) 2016-2021 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify - it under the terms of the GNU Lesser General Public License as published by - the Free Software Foundation; either version 2.1 of the License, or + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 3 of the License, 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 Lesser General Public License for more details. + GNU General Public License for more details. - You should have received a copy of the GNU Lesser General Public License + You should have received a copy of the GNU General Public License along with this program. If not, see . */ #ifndef _GL_GETPROGNAME_H @@ -19,8 +19,22 @@ #include -#if __GNUC__ || (__clang_major__ >= 4) -# warning "The include file getprogname.h is deprecated. Use instead." +#ifdef __cplusplus +extern "C" { +#endif + +/* Return the base name of the executing program. + On native Windows this will usually end in ".exe" or ".EXE". */ +#ifndef HAVE_GETPROGNAME +extern char const *getprogname (void) +# ifdef HAVE_DECL_PROGRAM_INVOCATION_NAME + _GL_ATTRIBUTE_PURE +# endif + ; +#endif + +#ifdef __cplusplus +} #endif #endif diff -Nru mmv-2.5/lib/gettext.h mmv-2.5.1/lib/gettext.h --- mmv-2.5/lib/gettext.h 2023-07-20 19:40:23.000000000 +0000 +++ mmv-2.5.1/lib/gettext.h 2023-08-08 11:02:47.000000000 +0000 @@ -1,19 +1,19 @@ /* Convenience header for conditional use of GNU . - Copyright (C) 1995-1998, 2000-2002, 2004-2006, 2009-2023 Free Software + Copyright (C) 1995-1998, 2000-2002, 2004-2006, 2009-2021 Free Software Foundation, Inc. - This file is free software: you can redistribute it and/or modify - it under the terms of the GNU Lesser General Public License as - published by the Free Software Foundation; either version 2.1 of the - License, or (at your option) any later version. + 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 file is distributed in the hope that it will be useful, + 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 Lesser General Public License for more details. + GNU General Public License for more details. - You should have received a copy of the GNU Lesser General Public License - along with this program. If not, see . */ + You should have received a copy of the GNU General Public License along + with this program; if not, see . */ #ifndef _LIBGETTEXT_H #define _LIBGETTEXT_H 1 @@ -138,7 +138,7 @@ #define dcnpgettext(Domainname, Msgctxt, Msgid, MsgidPlural, N, Category) \ npgettext_aux (Domainname, Msgctxt GETTEXT_CONTEXT_GLUE Msgid, Msgid, MsgidPlural, N, Category) -#if defined __GNUC__ || defined __clang__ +#ifdef __GNUC__ __inline #else #ifdef __cplusplus @@ -157,7 +157,7 @@ return translation; } -#if defined __GNUC__ || defined __clang__ +#ifdef __GNUC__ __inline #else #ifdef __cplusplus @@ -191,8 +191,9 @@ or may have security implications due to non-deterministic stack usage. */ #if (!defined GNULIB_NO_VLA \ - && defined __STDC_VERSION__ && 199901L <= __STDC_VERSION__ \ - && !defined __STDC_NO_VLA__) + && (((__GNUC__ >= 3 || __GNUG__ >= 2) && !defined __STRICT_ANSI__) \ + /* || (__STDC_VERSION__ == 199901L && !defined __HP_cc) + || (__STDC_VERSION__ >= 201112L && !defined __STDC_NO_VLA__) */ )) # define _LIBGETTEXT_HAVE_VARIABLE_SIZE_ARRAYS 1 #else # define _LIBGETTEXT_HAVE_VARIABLE_SIZE_ARRAYS 0 @@ -207,7 +208,7 @@ #define dpgettext_expr(Domainname, Msgctxt, Msgid) \ dcpgettext_expr (Domainname, Msgctxt, Msgid, LC_MESSAGES) -#if defined __GNUC__ || defined __clang__ +#ifdef __GNUC__ __inline #else #ifdef __cplusplus @@ -254,7 +255,7 @@ #define dnpgettext_expr(Domainname, Msgctxt, Msgid, MsgidPlural, N) \ dcnpgettext_expr (Domainname, Msgctxt, Msgid, MsgidPlural, N, LC_MESSAGES) -#if defined __GNUC__ || defined __clang__ +#ifdef __GNUC__ __inline #else #ifdef __cplusplus diff -Nru mmv-2.5/lib/ialloc.c mmv-2.5.1/lib/ialloc.c --- mmv-2.5/lib/ialloc.c 2023-07-20 19:40:23.000000000 +0000 +++ mmv-2.5.1/lib/ialloc.c 1970-01-01 00:00:00.000000000 +0000 @@ -1,21 +0,0 @@ -/* malloc with idx_t rather than size_t - - Copyright 2021-2023 Free Software Foundation, Inc. - - This file is free software: you can redistribute it and/or modify - it under the terms of the GNU Lesser General Public License as - published by the Free Software Foundation; either version 2.1 of the - License, or (at your option) any later version. - - This file 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 Lesser General Public License for more details. - - You should have received a copy of the GNU Lesser General Public License - along with this program. If not, see . */ - -#include - -#define IALLOC_INLINE _GL_EXTERN_INLINE -#include "ialloc.h" diff -Nru mmv-2.5/lib/ialloc.h mmv-2.5.1/lib/ialloc.h --- mmv-2.5/lib/ialloc.h 2023-07-20 19:40:23.000000000 +0000 +++ mmv-2.5.1/lib/ialloc.h 1970-01-01 00:00:00.000000000 +0000 @@ -1,117 +0,0 @@ -/* ialloc.h -- malloc with idx_t rather than size_t - - Copyright 2021-2023 Free Software Foundation, Inc. - - This file is free software: you can redistribute it and/or modify - it under the terms of the GNU Lesser General Public License as - published by the Free Software Foundation; either version 2.1 of the - License, or (at your option) any later version. - - This file 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 Lesser General Public License for more details. - - You should have received a copy of the GNU Lesser General Public License - along with this program. If not, see . */ - -#ifndef IALLOC_H_ -#define IALLOC_H_ - -/* This file uses _GL_INLINE_HEADER_BEGIN, _GL_INLINE, _GL_ATTRIBUTE_COLD, - _GL_ATTRIBUTE_MALLOC. */ -#if !_GL_CONFIG_H_INCLUDED - #error "Please include config.h first." -#endif - -#include "idx.h" - -#include -#include -#include - -_GL_INLINE_HEADER_BEGIN -#ifndef IALLOC_INLINE -# define IALLOC_INLINE _GL_INLINE -#endif - -#ifdef __cplusplus -extern "C" { -#endif - -IALLOC_INLINE void * _GL_ATTRIBUTE_COLD -_gl_alloc_nomem (void) -{ - errno = ENOMEM; - return NULL; -} - -/* imalloc (size) is like malloc (size). - It returns a non-NULL pointer to size bytes of memory. - Upon failure, it returns NULL with errno set. */ -IALLOC_INLINE -_GL_ATTRIBUTE_MALLOC /*_GL_ATTRIBUTE_DEALLOC_FREE*/ -void * -imalloc (idx_t s) -{ - return s <= SIZE_MAX ? malloc (s) : _gl_alloc_nomem (); -} - -/* irealloc (ptr, size) is like realloc (ptr, size). - It returns a non-NULL pointer to size bytes of memory. - Upon failure, it returns NULL with errno set. */ -IALLOC_INLINE -/*_GL_ATTRIBUTE_DEALLOC_FREE*/ -void * -irealloc (void *p, idx_t s) -{ - /* Work around GNU realloc glitch by treating a zero size as if it - were 1, so that returning NULL is equivalent to failing. */ - return s <= SIZE_MAX ? realloc (p, s | !s) : _gl_alloc_nomem (); -} - -/* icalloc (num, size) is like calloc (num, size). - It returns a non-NULL pointer to num * size bytes of memory. - Upon failure, it returns NULL with errno set. */ -IALLOC_INLINE -_GL_ATTRIBUTE_MALLOC /*_GL_ATTRIBUTE_DEALLOC_FREE*/ -void * -icalloc (idx_t n, idx_t s) -{ - if (SIZE_MAX < n) - { - if (s != 0) - return _gl_alloc_nomem (); - n = 0; - } - if (SIZE_MAX < s) - { - if (n != 0) - return _gl_alloc_nomem (); - s = 0; - } - return calloc (n, s); -} - -/* ireallocarray (ptr, num, size) is like reallocarray (ptr, num, size). - It returns a non-NULL pointer to num * size bytes of memory. - Upon failure, it returns NULL with errno set. */ -IALLOC_INLINE void * -ireallocarray (void *p, idx_t n, idx_t s) -{ - /* Work around GNU reallocarray glitch by treating a zero size as if - it were 1, so that returning NULL is equivalent to failing. */ - if (n == 0 || s == 0) - n = s = 1; - return (n <= SIZE_MAX && s <= SIZE_MAX - ? reallocarray (p, n, s) - : _gl_alloc_nomem ()); -} - -#ifdef __cplusplus -} -#endif - -_GL_INLINE_HEADER_END - -#endif diff -Nru mmv-2.5/lib/idx.h mmv-2.5.1/lib/idx.h --- mmv-2.5/lib/idx.h 2023-07-20 19:40:23.000000000 +0000 +++ mmv-2.5.1/lib/idx.h 2023-08-08 11:02:47.000000000 +0000 @@ -1,18 +1,18 @@ /* A type for indices and sizes. - Copyright (C) 2020-2023 Free Software Foundation, Inc. + Copyright (C) 2020-2021 Free Software Foundation, Inc. This file is part of the GNU C Library. The GNU C Library is free software; you can redistribute it and/or - modify it under the terms of the GNU Lesser General Public + modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either - version 2.1 of the License, or (at your option) any later version. + version 3 of the License, or (at your option) any later version. The GNU C Library 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 - Lesser General Public License for more details. + General Public License for more details. - You should have received a copy of the GNU Lesser General Public + You should have received a copy of the GNU General Public License along with the GNU C Library; if not, see . */ @@ -56,26 +56,6 @@ * Because 'size_t' is an unsigned type, and a signed type is better. See above. - Why not use 'ssize_t'? - - * 'ptrdiff_t' is more portable; it is standardized by ISO C - whereas 'ssize_t' is standardized only by POSIX. - - * 'ssize_t' is not required to be as wide as 'size_t', and some - now-obsolete POSIX platforms had 'size_t' wider than 'ssize_t'. - - * Conversely, some now-obsolete platforms had 'ptrdiff_t' wider - than 'size_t', which can be a win and conforms to POSIX. - - Won't this cause a problem with objects larger than PTRDIFF_MAX? - - * Typical modern or large platforms do not allocate such objects, - so this is not much of a problem in practice; for example, you - can safely write 'idx_t len = strlen (s);'. To port to older - small platforms where allocations larger than PTRDIFF_MAX could - in theory be a problem, you can use Gnulib's ialloc module, or - functions like ximalloc in Gnulib's xalloc module. - Why not use 'ptrdiff_t' directly? * Maintainability: When reading and modifying code, it helps to know that diff -Nru mmv-2.5/lib/ignore-value.h mmv-2.5.1/lib/ignore-value.h --- mmv-2.5/lib/ignore-value.h 2023-07-20 19:40:23.000000000 +0000 +++ mmv-2.5.1/lib/ignore-value.h 2023-08-08 11:02:40.000000000 +0000 @@ -1,18 +1,18 @@ /* ignore a function return without a compiler warning. -*- coding: utf-8 -*- - Copyright (C) 2008-2023 Free Software Foundation, Inc. + Copyright (C) 2008-2021 Free Software Foundation, Inc. - This file is free software: you can redistribute it and/or modify - it under the terms of the GNU Lesser General Public License as - published by the Free Software Foundation; either version 2.1 of the - License, or (at your option) any later version. + 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 of the License, or + (at your option) any later version. - This file is distributed in the hope that it will be useful, + 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 Lesser General Public License for more details. + GNU General Public License for more details. - You should have received a copy of the GNU Lesser General Public License + You should have received a copy of the GNU General Public License along with this program. If not, see . */ /* Written by Jim Meyering, Eric Blake and Pádraig Brady. */ diff -Nru mmv-2.5/lib/intprops-internal.h mmv-2.5.1/lib/intprops-internal.h --- mmv-2.5/lib/intprops-internal.h 2023-07-20 19:40:23.000000000 +0000 +++ mmv-2.5.1/lib/intprops-internal.h 1970-01-01 00:00:00.000000000 +0000 @@ -1,392 +0,0 @@ -/* intprops-internal.h -- properties of integer types not visible to users - - Copyright (C) 2001-2023 Free Software Foundation, Inc. - - This program is free software: you can redistribute it and/or modify it - under the terms of the GNU Lesser General Public License as published - by the Free Software Foundation; either version 2.1 of the License, 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 Lesser General Public License for more details. - - You should have received a copy of the GNU Lesser General Public License - along with this program. If not, see . */ - -#ifndef _GL_INTPROPS_INTERNAL_H -#define _GL_INTPROPS_INTERNAL_H - -#include - -/* Return a value with the common real type of E and V and the value of V. - Do not evaluate E. */ -#define _GL_INT_CONVERT(e, v) ((1 ? 0 : (e)) + (v)) - -/* Act like _GL_INT_CONVERT (E, -V) but work around a bug in IRIX 6.5 cc; see - . */ -#define _GL_INT_NEGATE_CONVERT(e, v) ((1 ? 0 : (e)) - (v)) - -/* The extra casts in the following macros work around compiler bugs, - e.g., in Cray C 5.0.3.0. */ - -/* True if the real type T is signed. */ -#define _GL_TYPE_SIGNED(t) (! ((t) 0 < (t) -1)) - -/* Return 1 if the real expression E, after promotion, has a - signed or floating type. Do not evaluate E. */ -#define _GL_EXPR_SIGNED(e) (_GL_INT_NEGATE_CONVERT (e, 1) < 0) - - -/* Minimum and maximum values for integer types and expressions. */ - -/* The width in bits of the integer type or expression T. - Do not evaluate T. T must not be a bit-field expression. - Padding bits are not supported; this is checked at compile-time below. */ -#define _GL_TYPE_WIDTH(t) (sizeof (t) * CHAR_BIT) - -/* The maximum and minimum values for the type of the expression E, - after integer promotion. E is not evaluated. */ -#define _GL_INT_MINIMUM(e) \ - (_GL_EXPR_SIGNED (e) \ - ? ~ _GL_SIGNED_INT_MAXIMUM (e) \ - : _GL_INT_CONVERT (e, 0)) -#define _GL_INT_MAXIMUM(e) \ - (_GL_EXPR_SIGNED (e) \ - ? _GL_SIGNED_INT_MAXIMUM (e) \ - : _GL_INT_NEGATE_CONVERT (e, 1)) -#define _GL_SIGNED_INT_MAXIMUM(e) \ - (((_GL_INT_CONVERT (e, 1) << (_GL_TYPE_WIDTH (+ (e)) - 2)) - 1) * 2 + 1) - -/* Work around OpenVMS incompatibility with C99. */ -#if !defined LLONG_MAX && defined __INT64_MAX -# define LLONG_MAX __INT64_MAX -# define LLONG_MIN __INT64_MIN -#endif - -/* This include file assumes that signed types are two's complement without - padding bits; the above macros have undefined behavior otherwise. - If this is a problem for you, please let us know how to fix it for your host. - This assumption is tested by the intprops-tests module. */ - -/* Does the __typeof__ keyword work? This could be done by - 'configure', but for now it's easier to do it by hand. */ -#if (2 <= __GNUC__ \ - || (4 <= __clang_major__) \ - || (1210 <= __IBMC__ && defined __IBM__TYPEOF__) \ - || (0x5110 <= __SUNPRO_C && !__STDC__)) -# define _GL_HAVE___TYPEOF__ 1 -#else -# define _GL_HAVE___TYPEOF__ 0 -#endif - -/* Return 1 if the integer type or expression T might be signed. Return 0 - if it is definitely unsigned. T must not be a bit-field expression. - This macro does not evaluate its argument, and expands to an - integer constant expression. */ -#if _GL_HAVE___TYPEOF__ -# define _GL_SIGNED_TYPE_OR_EXPR(t) _GL_TYPE_SIGNED (__typeof__ (t)) -#else -# define _GL_SIGNED_TYPE_OR_EXPR(t) 1 -#endif - -/* Return 1 if - A would overflow in [MIN,MAX] arithmetic. - A should not have side effects, and A's type should be an - integer with minimum value MIN and maximum MAX. */ -#define _GL_INT_NEGATE_RANGE_OVERFLOW(a, min, max) \ - ((min) < 0 ? (a) < - (max) : 0 < (a)) - -/* True if __builtin_add_overflow (A, B, P) and __builtin_sub_overflow - (A, B, P) work when P is non-null. */ -#ifdef __EDG__ -/* EDG-based compilers like nvc 22.1 cannot add 64-bit signed to unsigned - . */ -# define _GL_HAS_BUILTIN_ADD_OVERFLOW 0 -#elif defined __has_builtin -# define _GL_HAS_BUILTIN_ADD_OVERFLOW __has_builtin (__builtin_add_overflow) -/* __builtin_{add,sub}_overflow exists but is not reliable in GCC 5.x and 6.x, - see . */ -#elif 7 <= __GNUC__ -# define _GL_HAS_BUILTIN_ADD_OVERFLOW 1 -#else -# define _GL_HAS_BUILTIN_ADD_OVERFLOW 0 -#endif - -/* True if __builtin_mul_overflow (A, B, P) works when P is non-null. */ -#if defined __clang_major__ && __clang_major__ < 14 -/* Work around Clang bug . */ -# define _GL_HAS_BUILTIN_MUL_OVERFLOW 0 -#else -# define _GL_HAS_BUILTIN_MUL_OVERFLOW _GL_HAS_BUILTIN_ADD_OVERFLOW -#endif - -/* True if __builtin_add_overflow_p (A, B, C) works, and similarly for - __builtin_sub_overflow_p and __builtin_mul_overflow_p. */ -#ifdef __EDG__ -/* In EDG-based compilers like ICC 2021.3 and earlier, - __builtin_add_overflow_p etc. are not treated as integral constant - expressions even when all arguments are. */ -# define _GL_HAS_BUILTIN_OVERFLOW_P 0 -#elif defined __has_builtin -# define _GL_HAS_BUILTIN_OVERFLOW_P __has_builtin (__builtin_mul_overflow_p) -#else -# define _GL_HAS_BUILTIN_OVERFLOW_P (7 <= __GNUC__) -#endif - -#if (!defined _GL_STDCKDINT_H && 202311 <= __STDC_VERSION__ \ - && ! (_GL_HAS_BUILTIN_ADD_OVERFLOW && _GL_HAS_BUILTIN_MUL_OVERFLOW)) -# include -#endif - -/* Store the low-order bits of A + B, A - B, A * B, respectively, into *R. - Return 1 if the result overflows. Arguments should not have side - effects and A, B and *R can be of any integer type other than char, - bool, a bit-precise integer type, or an enumeration type. */ -#if _GL_HAS_BUILTIN_ADD_OVERFLOW -# define _GL_INT_ADD_WRAPV(a, b, r) __builtin_add_overflow (a, b, r) -# define _GL_INT_SUBTRACT_WRAPV(a, b, r) __builtin_sub_overflow (a, b, r) -#elif defined ckd_add && defined ckd_sub && !defined _GL_STDCKDINT_H -# define _GL_INT_ADD_WRAPV(a, b, r) ckd_add (r, + (a), + (b)) -# define _GL_INT_SUBTRACT_WRAPV(a, b, r) ckd_sub (r, + (a), + (b)) -#else -# define _GL_INT_ADD_WRAPV(a, b, r) \ - _GL_INT_OP_WRAPV (a, b, r, +, _GL_INT_ADD_RANGE_OVERFLOW) -# define _GL_INT_SUBTRACT_WRAPV(a, b, r) \ - _GL_INT_OP_WRAPV (a, b, r, -, _GL_INT_SUBTRACT_RANGE_OVERFLOW) -#endif -#if _GL_HAS_BUILTIN_MUL_OVERFLOW -# if ((9 < __GNUC__ + (3 <= __GNUC_MINOR__) \ - || (__GNUC__ == 8 && 4 <= __GNUC_MINOR__)) \ - && !defined __EDG__) -# define _GL_INT_MULTIPLY_WRAPV(a, b, r) __builtin_mul_overflow (a, b, r) -# else - /* Work around GCC bug 91450. */ -# define _GL_INT_MULTIPLY_WRAPV(a, b, r) \ - ((!_GL_SIGNED_TYPE_OR_EXPR (*(r)) && _GL_EXPR_SIGNED (a) && _GL_EXPR_SIGNED (b) \ - && _GL_INT_MULTIPLY_RANGE_OVERFLOW (a, b, 0, (__typeof__ (*(r))) -1)) \ - ? ((void) __builtin_mul_overflow (a, b, r), 1) \ - : __builtin_mul_overflow (a, b, r)) -# endif -#elif defined ckd_mul && !defined _GL_STDCKDINT_H -# define _GL_INT_MULTIPLY_WRAPV(a, b, r) ckd_mul (r, + (a), + (b)) -#else -# define _GL_INT_MULTIPLY_WRAPV(a, b, r) \ - _GL_INT_OP_WRAPV (a, b, r, *, _GL_INT_MULTIPLY_RANGE_OVERFLOW) -#endif - -/* Nonzero if this compiler has GCC bug 68193 or Clang bug 25390. See: - https://gcc.gnu.org/bugzilla/show_bug.cgi?id=68193 - https://llvm.org/bugs/show_bug.cgi?id=25390 - For now, assume all versions of GCC-like compilers generate bogus - warnings for _Generic. This matters only for compilers that - lack relevant builtins. */ -#if __GNUC__ || defined __clang__ -# define _GL__GENERIC_BOGUS 1 -#else -# define _GL__GENERIC_BOGUS 0 -#endif - -/* Store the low-order bits of A B into *R, where OP specifies - the operation and OVERFLOW the overflow predicate. Return 1 if the - result overflows. Arguments should not have side effects, - and A, B and *R can be of any integer type other than char, bool, a - bit-precise integer type, or an enumeration type. */ -#if 201112 <= __STDC_VERSION__ && !_GL__GENERIC_BOGUS -# define _GL_INT_OP_WRAPV(a, b, r, op, overflow) \ - (_Generic \ - (*(r), \ - signed char: \ - _GL_INT_OP_CALC (a, b, r, op, overflow, unsigned int, \ - signed char, SCHAR_MIN, SCHAR_MAX), \ - unsigned char: \ - _GL_INT_OP_CALC (a, b, r, op, overflow, unsigned int, \ - unsigned char, 0, UCHAR_MAX), \ - short int: \ - _GL_INT_OP_CALC (a, b, r, op, overflow, unsigned int, \ - short int, SHRT_MIN, SHRT_MAX), \ - unsigned short int: \ - _GL_INT_OP_CALC (a, b, r, op, overflow, unsigned int, \ - unsigned short int, 0, USHRT_MAX), \ - int: \ - _GL_INT_OP_CALC (a, b, r, op, overflow, unsigned int, \ - int, INT_MIN, INT_MAX), \ - unsigned int: \ - _GL_INT_OP_CALC (a, b, r, op, overflow, unsigned int, \ - unsigned int, 0, UINT_MAX), \ - long int: \ - _GL_INT_OP_CALC (a, b, r, op, overflow, unsigned long int, \ - long int, LONG_MIN, LONG_MAX), \ - unsigned long int: \ - _GL_INT_OP_CALC (a, b, r, op, overflow, unsigned long int, \ - unsigned long int, 0, ULONG_MAX), \ - long long int: \ - _GL_INT_OP_CALC (a, b, r, op, overflow, unsigned long long int, \ - long long int, LLONG_MIN, LLONG_MAX), \ - unsigned long long int: \ - _GL_INT_OP_CALC (a, b, r, op, overflow, unsigned long long int, \ - unsigned long long int, 0, ULLONG_MAX))) -#else -/* Store the low-order bits of A B into *R, where OP specifies - the operation and OVERFLOW the overflow predicate. If *R is - signed, its type is ST with bounds SMIN..SMAX; otherwise its type - is UT with bounds U..UMAX. ST and UT are narrower than int. - Return 1 if the result overflows. Arguments should not have side - effects, and A, B and *R can be of any integer type other than - char, bool, a bit-precise integer type, or an enumeration type. */ -# if _GL_HAVE___TYPEOF__ -# define _GL_INT_OP_WRAPV_SMALLISH(a,b,r,op,overflow,st,smin,smax,ut,umax) \ - (_GL_TYPE_SIGNED (__typeof__ (*(r))) \ - ? _GL_INT_OP_CALC (a, b, r, op, overflow, unsigned int, st, smin, smax) \ - : _GL_INT_OP_CALC (a, b, r, op, overflow, unsigned int, ut, 0, umax)) -# else -# define _GL_INT_OP_WRAPV_SMALLISH(a,b,r,op,overflow,st,smin,smax,ut,umax) \ - (overflow (a, b, smin, smax) \ - ? (overflow (a, b, 0, umax) \ - ? (*(r) = _GL_INT_OP_WRAPV_VIA_UNSIGNED (a,b,op,unsigned,st), 1) \ - : (*(r) = _GL_INT_OP_WRAPV_VIA_UNSIGNED (a,b,op,unsigned,st)) < 0) \ - : (overflow (a, b, 0, umax) \ - ? (*(r) = _GL_INT_OP_WRAPV_VIA_UNSIGNED (a,b,op,unsigned,st)) >= 0 \ - : (*(r) = _GL_INT_OP_WRAPV_VIA_UNSIGNED (a,b,op,unsigned,st), 0))) -# endif - -# define _GL_INT_OP_WRAPV(a, b, r, op, overflow) \ - (sizeof *(r) == sizeof (signed char) \ - ? _GL_INT_OP_WRAPV_SMALLISH (a, b, r, op, overflow, \ - signed char, SCHAR_MIN, SCHAR_MAX, \ - unsigned char, UCHAR_MAX) \ - : sizeof *(r) == sizeof (short int) \ - ? _GL_INT_OP_WRAPV_SMALLISH (a, b, r, op, overflow, \ - short int, SHRT_MIN, SHRT_MAX, \ - unsigned short int, USHRT_MAX) \ - : sizeof *(r) == sizeof (int) \ - ? (_GL_EXPR_SIGNED (*(r)) \ - ? _GL_INT_OP_CALC (a, b, r, op, overflow, unsigned int, \ - int, INT_MIN, INT_MAX) \ - : _GL_INT_OP_CALC (a, b, r, op, overflow, unsigned int, \ - unsigned int, 0, UINT_MAX)) \ - : _GL_INT_OP_WRAPV_LONGISH(a, b, r, op, overflow)) -# ifdef LLONG_MAX -# define _GL_INT_OP_WRAPV_LONGISH(a, b, r, op, overflow) \ - (sizeof *(r) == sizeof (long int) \ - ? (_GL_EXPR_SIGNED (*(r)) \ - ? _GL_INT_OP_CALC (a, b, r, op, overflow, unsigned long int, \ - long int, LONG_MIN, LONG_MAX) \ - : _GL_INT_OP_CALC (a, b, r, op, overflow, unsigned long int, \ - unsigned long int, 0, ULONG_MAX)) \ - : (_GL_EXPR_SIGNED (*(r)) \ - ? _GL_INT_OP_CALC (a, b, r, op, overflow, unsigned long long int, \ - long long int, LLONG_MIN, LLONG_MAX) \ - : _GL_INT_OP_CALC (a, b, r, op, overflow, unsigned long long int, \ - unsigned long long int, 0, ULLONG_MAX))) -# else -# define _GL_INT_OP_WRAPV_LONGISH(a, b, r, op, overflow) \ - (_GL_EXPR_SIGNED (*(r)) \ - ? _GL_INT_OP_CALC (a, b, r, op, overflow, unsigned long int, \ - long int, LONG_MIN, LONG_MAX) \ - : _GL_INT_OP_CALC (a, b, r, op, overflow, unsigned long int, \ - unsigned long int, 0, ULONG_MAX)) -# endif -#endif - -/* Store the low-order bits of A B into *R, where the operation - is given by OP. Use the unsigned type UT for calculation to avoid - overflow problems. *R's type is T, with extrema TMIN and TMAX. - T can be any signed integer type other than char, bool, a - bit-precise integer type, or an enumeration type. - Return 1 if the result overflows. */ -#define _GL_INT_OP_CALC(a, b, r, op, overflow, ut, t, tmin, tmax) \ - (overflow (a, b, tmin, tmax) \ - ? (*(r) = _GL_INT_OP_WRAPV_VIA_UNSIGNED (a, b, op, ut, t), 1) \ - : (*(r) = _GL_INT_OP_WRAPV_VIA_UNSIGNED (a, b, op, ut, t), 0)) - -/* Return 1 if the integer expressions A - B and -A would overflow, - respectively. Arguments should not have side effects, - and can be any signed integer type other than char, bool, a - bit-precise integer type, or an enumeration type. - These macros are tuned for their last input argument being a constant. */ - -#if _GL_HAS_BUILTIN_OVERFLOW_P -# define _GL_INT_NEGATE_OVERFLOW(a) \ - __builtin_sub_overflow_p (0, a, (__typeof__ (- (a))) 0) -#else -# define _GL_INT_NEGATE_OVERFLOW(a) \ - _GL_INT_NEGATE_RANGE_OVERFLOW (a, _GL_INT_MINIMUM (a), _GL_INT_MAXIMUM (a)) -#endif - -/* Return the low-order bits of A B, where the operation is given - by OP. Use the unsigned type UT for calculation to avoid undefined - behavior on signed integer overflow, and convert the result to type T. - UT is at least as wide as T and is no narrower than unsigned int, - T is two's complement, and there is no padding or trap representations. - Assume that converting UT to T yields the low-order bits, as is - done in all known two's-complement C compilers. E.g., see: - https://gcc.gnu.org/onlinedocs/gcc/Integers-implementation.html - - According to the C standard, converting UT to T yields an - implementation-defined result or signal for values outside T's - range. However, code that works around this theoretical problem - runs afoul of a compiler bug in Oracle Studio 12.3 x86. See: - https://lists.gnu.org/r/bug-gnulib/2017-04/msg00049.html - As the compiler bug is real, don't try to work around the - theoretical problem. */ - -#define _GL_INT_OP_WRAPV_VIA_UNSIGNED(a, b, op, ut, t) \ - ((t) ((ut) (a) op (ut) (b))) - -/* Return true if the numeric values A + B, A - B, A * B fall outside - the range TMIN..TMAX. Arguments should not have side effects - and can be any integer type other than char, bool, - a bit-precise integer type, or an enumeration type. - TMIN should be signed and nonpositive. - TMAX should be positive, and should be signed unless TMIN is zero. */ -#define _GL_INT_ADD_RANGE_OVERFLOW(a, b, tmin, tmax) \ - ((b) < 0 \ - ? (((tmin) \ - ? ((_GL_EXPR_SIGNED (_GL_INT_CONVERT (a, (tmin) - (b))) || (b) < (tmin)) \ - && (a) < (tmin) - (b)) \ - : (a) <= -1 - (b)) \ - || ((_GL_EXPR_SIGNED (a) ? 0 <= (a) : (tmax) < (a)) && (tmax) < (a) + (b))) \ - : (a) < 0 \ - ? (((tmin) \ - ? ((_GL_EXPR_SIGNED (_GL_INT_CONVERT (b, (tmin) - (a))) || (a) < (tmin)) \ - && (b) < (tmin) - (a)) \ - : (b) <= -1 - (a)) \ - || ((_GL_EXPR_SIGNED (_GL_INT_CONVERT (a, b)) || (tmax) < (b)) \ - && (tmax) < (a) + (b))) \ - : (tmax) < (b) || (tmax) - (b) < (a)) -#define _GL_INT_SUBTRACT_RANGE_OVERFLOW(a, b, tmin, tmax) \ - (((a) < 0) == ((b) < 0) \ - ? ((a) < (b) \ - ? !(tmin) || -1 - (tmin) < (b) - (a) - 1 \ - : (tmax) < (a) - (b)) \ - : (a) < 0 \ - ? ((!_GL_EXPR_SIGNED (_GL_INT_CONVERT ((a) - (tmin), b)) && (a) - (tmin) < 0) \ - || (a) - (tmin) < (b)) \ - : ((! (_GL_EXPR_SIGNED (_GL_INT_CONVERT (tmax, b)) \ - && _GL_EXPR_SIGNED (_GL_INT_CONVERT ((tmax) + (b), a))) \ - && (tmax) <= -1 - (b)) \ - || (tmax) + (b) < (a))) -#define _GL_INT_MULTIPLY_RANGE_OVERFLOW(a, b, tmin, tmax) \ - ((b) < 0 \ - ? ((a) < 0 \ - ? (_GL_EXPR_SIGNED (_GL_INT_CONVERT (tmax, b)) \ - ? (a) < (tmax) / (b) \ - : ((_GL_INT_NEGATE_OVERFLOW (b) \ - ? _GL_INT_CONVERT (b, tmax) >> (_GL_TYPE_WIDTH (+ (b)) - 1) \ - : (tmax) / -(b)) \ - <= -1 - (a))) \ - : _GL_INT_NEGATE_OVERFLOW (_GL_INT_CONVERT (b, tmin)) && (b) == -1 \ - ? (_GL_EXPR_SIGNED (a) \ - ? 0 < (a) + (tmin) \ - : 0 < (a) && -1 - (tmin) < (a) - 1) \ - : (tmin) / (b) < (a)) \ - : (b) == 0 \ - ? 0 \ - : ((a) < 0 \ - ? (_GL_INT_NEGATE_OVERFLOW (_GL_INT_CONVERT (a, tmin)) && (a) == -1 \ - ? (_GL_EXPR_SIGNED (b) ? 0 < (b) + (tmin) : -1 - (tmin) < (b) - 1) \ - : (tmin) / (a) < (b)) \ - : (tmax) / (b) < (a))) - -#endif /* _GL_INTPROPS_INTERNAL_H */ diff -Nru mmv-2.5/lib/intprops.h mmv-2.5.1/lib/intprops.h --- mmv-2.5/lib/intprops.h 2023-07-20 19:40:23.000000000 +0000 +++ mmv-2.5.1/lib/intprops.h 2023-08-08 11:02:47.000000000 +0000 @@ -1,24 +1,34 @@ /* intprops.h -- properties of integer types - Copyright (C) 2001-2023 Free Software Foundation, Inc. + Copyright (C) 2001-2021 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it - under the terms of the GNU Lesser General Public License as published - by the Free Software Foundation; either version 2.1 of the License, or + under the terms of the GNU General Public License as published + by the Free Software Foundation; either version 3 of the License, 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 Lesser General Public License for more details. + GNU General Public License for more details. - You should have received a copy of the GNU Lesser General Public License + You should have received a copy of the GNU General Public License along with this program. If not, see . */ +/* Written by Paul Eggert. */ + #ifndef _GL_INTPROPS_H #define _GL_INTPROPS_H -#include "intprops-internal.h" +#include + +/* Return a value with the common real type of E and V and the value of V. + Do not evaluate E. */ +#define _GL_INT_CONVERT(e, v) ((1 ? 0 : (e)) + (v)) + +/* Act like _GL_INT_CONVERT (E, -V) but work around a bug in IRIX 6.5 cc; see + . */ +#define _GL_INT_NEGATE_CONVERT(e, v) ((1 ? 0 : (e)) - (v)) /* The extra casts in the following macros work around compiler bugs, e.g., in Cray C 5.0.3.0. */ @@ -28,11 +38,11 @@ #define TYPE_IS_INTEGER(t) ((t) 1.5 == 1) /* True if the real type T is signed. */ -#define TYPE_SIGNED(t) _GL_TYPE_SIGNED (t) +#define TYPE_SIGNED(t) (! ((t) 0 < (t) -1)) /* Return 1 if the real expression E, after promotion, has a signed or floating type. Do not evaluate E. */ -#define EXPR_SIGNED(e) _GL_EXPR_SIGNED (e) +#define EXPR_SIGNED(e) (_GL_INT_NEGATE_CONVERT (e, 1) < 0) /* Minimum and maximum values for integer types and expressions. */ @@ -40,7 +50,7 @@ /* The width in bits of the integer type or expression T. Do not evaluate T. T must not be a bit-field expression. Padding bits are not supported; this is checked at compile-time below. */ -#define TYPE_WIDTH(t) _GL_TYPE_WIDTH (t) +#define TYPE_WIDTH(t) (sizeof (t) * CHAR_BIT) /* The maximum and minimum values for the integer type T. */ #define TYPE_MINIMUM(t) ((t) ~ TYPE_MAXIMUM (t)) @@ -49,6 +59,51 @@ ? (t) -1 \ : ((((t) 1 << (TYPE_WIDTH (t) - 2)) - 1) * 2 + 1))) +/* The maximum and minimum values for the type of the expression E, + after integer promotion. E is not evaluated. */ +#define _GL_INT_MINIMUM(e) \ + (EXPR_SIGNED (e) \ + ? ~ _GL_SIGNED_INT_MAXIMUM (e) \ + : _GL_INT_CONVERT (e, 0)) +#define _GL_INT_MAXIMUM(e) \ + (EXPR_SIGNED (e) \ + ? _GL_SIGNED_INT_MAXIMUM (e) \ + : _GL_INT_NEGATE_CONVERT (e, 1)) +#define _GL_SIGNED_INT_MAXIMUM(e) \ + (((_GL_INT_CONVERT (e, 1) << (TYPE_WIDTH (+ (e)) - 2)) - 1) * 2 + 1) + +/* Work around OpenVMS incompatibility with C99. */ +#if !defined LLONG_MAX && defined __INT64_MAX +# define LLONG_MAX __INT64_MAX +# define LLONG_MIN __INT64_MIN +#endif + +/* This include file assumes that signed types are two's complement without + padding bits; the above macros have undefined behavior otherwise. + If this is a problem for you, please let us know how to fix it for your host. + This assumption is tested by the intprops-tests module. */ + +/* Does the __typeof__ keyword work? This could be done by + 'configure', but for now it's easier to do it by hand. */ +#if (2 <= __GNUC__ \ + || (4 <= __clang_major__) \ + || (1210 <= __IBMC__ && defined __IBM__TYPEOF__) \ + || (0x5110 <= __SUNPRO_C && !__STDC__)) +# define _GL_HAVE___TYPEOF__ 1 +#else +# define _GL_HAVE___TYPEOF__ 0 +#endif + +/* Return 1 if the integer type or expression T might be signed. Return 0 + if it is definitely unsigned. T must not be a bit-field expression. + This macro does not evaluate its argument, and expands to an + integer constant expression. */ +#if _GL_HAVE___TYPEOF__ +# define _GL_SIGNED_TYPE_OR_EXPR(t) TYPE_SIGNED (__typeof__ (t)) +#else +# define _GL_SIGNED_TYPE_OR_EXPR(t) 1 +#endif + /* Bound on length of the string representing an unsigned integer value representable in B bits. log10 (2.0) < 146/485. The smallest value of B where this bound is not tight is 2621. */ @@ -75,11 +130,11 @@ /* Range overflow checks. The INT__RANGE_OVERFLOW macros return 1 if the corresponding C - operators overflow arithmetically when given the same arguments. - These macros do not rely on undefined or implementation-defined behavior. - Although their implementations are simple and straightforward, - they are harder to use and may be less efficient than the - INT__WRAPV, INT__OK, and INT__OVERFLOW macros described below. + operators might not yield numerically correct answers due to + arithmetic overflow. They do not rely on undefined or + implementation-defined behavior. Their implementations are simple + and straightforward, but they are a bit harder to use than the + INT__OVERFLOW macros described below. Example usage: @@ -103,9 +158,6 @@ must have minimum value MIN and maximum MAX. Unsigned types should use a zero MIN of the proper type. - Because all arguments are subject to integer promotions, these - macros typically do not work on types narrower than 'int'. - These macros are tuned for constant MIN and MAX. For commutative operations such as A + B, they are also tuned for constant B. */ @@ -126,7 +178,9 @@ /* Return 1 if - A would overflow in [MIN,MAX] arithmetic. See above for restrictions. */ #define INT_NEGATE_RANGE_OVERFLOW(a, min, max) \ - _GL_INT_NEGATE_RANGE_OVERFLOW (a, min, max) + ((min) < 0 \ + ? (a) < - (max) \ + : 0 < (a)) /* Return 1 if A * B would overflow in [MIN,MAX] arithmetic. See above for restrictions. Avoid && and || as they tickle @@ -170,6 +224,40 @@ ? (a) < (min) >> (b) \ : (max) >> (b) < (a)) +/* True if __builtin_add_overflow (A, B, P) and __builtin_sub_overflow + (A, B, P) work when P is non-null. */ +/* __builtin_{add,sub}_overflow exists but is not reliable in GCC 5.x and 6.x, + see . */ +#if 7 <= __GNUC__ && !defined __ICC +# define _GL_HAS_BUILTIN_ADD_OVERFLOW 1 +#elif defined __has_builtin +# define _GL_HAS_BUILTIN_ADD_OVERFLOW __has_builtin (__builtin_add_overflow) +#else +# define _GL_HAS_BUILTIN_ADD_OVERFLOW 0 +#endif + +/* True if __builtin_mul_overflow (A, B, P) works when P is non-null. */ +#ifdef __clang__ +/* Work around Clang bug . */ +# define _GL_HAS_BUILTIN_MUL_OVERFLOW 0 +#else +# define _GL_HAS_BUILTIN_MUL_OVERFLOW _GL_HAS_BUILTIN_ADD_OVERFLOW +#endif + +/* True if __builtin_add_overflow_p (A, B, C) works, and similarly for + __builtin_sub_overflow_p and __builtin_mul_overflow_p. */ +#if defined __clang__ || defined __ICC +/* Clang 11 lacks __builtin_mul_overflow_p, and even if it did it + would presumably run afoul of Clang bug 16404. ICC 2021.1's + __builtin_add_overflow_p etc. are not treated as integral constant + expressions even when all arguments are. */ +# define _GL_HAS_BUILTIN_OVERFLOW_P 0 +#elif defined __has_builtin +# define _GL_HAS_BUILTIN_OVERFLOW_P __has_builtin (__builtin_mul_overflow_p) +#else +# define _GL_HAS_BUILTIN_OVERFLOW_P (7 <= __GNUC__) +#endif + /* The _GL*_OVERFLOW macros have the same restrictions as the *_RANGE_OVERFLOW macros, except that they do not assume that operands (e.g., A and B) have the same type as MIN and MAX. Instead, they assume @@ -251,23 +339,12 @@ arguments should not have side effects. The WRAPV macros are not constant expressions. They support only - +, binary -, and *. - - Because the WRAPV macros convert the result, they report overflow - in different circumstances than the OVERFLOW macros do. For - example, in the typical case with 16-bit 'short' and 32-bit 'int', - if A, B and *R are all of type 'short' then INT_ADD_OVERFLOW (A, B) - returns false because the addition cannot overflow after A and B - are converted to 'int', whereas INT_ADD_WRAPV (A, B, R) returns - true or false depending on whether the sum fits into 'short'. + +, binary -, and *. Because the WRAPV macros convert the result, + they report overflow in different circumstances than the OVERFLOW + macros do. These macros are tuned for their last input argument being a constant. - A, B, and *R should be integers; they need not be the same type, - and they need not be all signed or all unsigned. - However, none of the integer types should be bit-precise, - and *R's type should not be char, bool, or an enumeration type. - Return 1 if the integer expressions A * B, A - B, -A, A * B, A / B, A % B, and A << B would overflow, respectively. */ @@ -275,7 +352,12 @@ _GL_BINARY_OP_OVERFLOW (a, b, _GL_ADD_OVERFLOW) #define INT_SUBTRACT_OVERFLOW(a, b) \ _GL_BINARY_OP_OVERFLOW (a, b, _GL_SUBTRACT_OVERFLOW) -#define INT_NEGATE_OVERFLOW(a) _GL_INT_NEGATE_OVERFLOW (a) +#if _GL_HAS_BUILTIN_OVERFLOW_P +# define INT_NEGATE_OVERFLOW(a) INT_SUBTRACT_OVERFLOW (0, a) +#else +# define INT_NEGATE_OVERFLOW(a) \ + INT_NEGATE_RANGE_OVERFLOW (a, _GL_INT_MINIMUM (a), _GL_INT_MAXIMUM (a)) +#endif #define INT_MULTIPLY_OVERFLOW(a, b) \ _GL_BINARY_OP_OVERFLOW (a, b, _GL_MULTIPLY_OVERFLOW) #define INT_DIVIDE_OVERFLOW(a, b) \ @@ -297,9 +379,224 @@ /* Store the low-order bits of A + B, A - B, A * B, respectively, into *R. Return 1 if the result overflows. See above for restrictions. */ -#define INT_ADD_WRAPV(a, b, r) _GL_INT_ADD_WRAPV (a, b, r) -#define INT_SUBTRACT_WRAPV(a, b, r) _GL_INT_SUBTRACT_WRAPV (a, b, r) -#define INT_MULTIPLY_WRAPV(a, b, r) _GL_INT_MULTIPLY_WRAPV (a, b, r) +#if _GL_HAS_BUILTIN_ADD_OVERFLOW +# define INT_ADD_WRAPV(a, b, r) __builtin_add_overflow (a, b, r) +# define INT_SUBTRACT_WRAPV(a, b, r) __builtin_sub_overflow (a, b, r) +#else +# define INT_ADD_WRAPV(a, b, r) \ + _GL_INT_OP_WRAPV (a, b, r, +, _GL_INT_ADD_RANGE_OVERFLOW) +# define INT_SUBTRACT_WRAPV(a, b, r) \ + _GL_INT_OP_WRAPV (a, b, r, -, _GL_INT_SUBTRACT_RANGE_OVERFLOW) +#endif +#if _GL_HAS_BUILTIN_MUL_OVERFLOW +# if ((9 < __GNUC__ + (3 <= __GNUC_MINOR__) \ + || (__GNUC__ == 8 && 4 <= __GNUC_MINOR__)) \ + && !defined __ICC) +# define INT_MULTIPLY_WRAPV(a, b, r) __builtin_mul_overflow (a, b, r) +# else + /* Work around GCC bug 91450. */ +# define INT_MULTIPLY_WRAPV(a, b, r) \ + ((!_GL_SIGNED_TYPE_OR_EXPR (*(r)) && EXPR_SIGNED (a) && EXPR_SIGNED (b) \ + && _GL_INT_MULTIPLY_RANGE_OVERFLOW (a, b, 0, (__typeof__ (*(r))) -1)) \ + ? ((void) __builtin_mul_overflow (a, b, r), 1) \ + : __builtin_mul_overflow (a, b, r)) +# endif +#else +# define INT_MULTIPLY_WRAPV(a, b, r) \ + _GL_INT_OP_WRAPV (a, b, r, *, _GL_INT_MULTIPLY_RANGE_OVERFLOW) +#endif + +/* Nonzero if this compiler has GCC bug 68193 or Clang bug 25390. See: + https://gcc.gnu.org/bugzilla/show_bug.cgi?id=68193 + https://llvm.org/bugs/show_bug.cgi?id=25390 + For now, assume all versions of GCC-like compilers generate bogus + warnings for _Generic. This matters only for compilers that + lack relevant builtins. */ +#if __GNUC__ || defined __clang__ +# define _GL__GENERIC_BOGUS 1 +#else +# define _GL__GENERIC_BOGUS 0 +#endif + +/* Store the low-order bits of A B into *R, where OP specifies + the operation and OVERFLOW the overflow predicate. Return 1 if the + result overflows. See above for restrictions. */ +#if 201112 <= __STDC_VERSION__ && !_GL__GENERIC_BOGUS +# define _GL_INT_OP_WRAPV(a, b, r, op, overflow) \ + (_Generic \ + (*(r), \ + signed char: \ + _GL_INT_OP_CALC (a, b, r, op, overflow, unsigned int, \ + signed char, SCHAR_MIN, SCHAR_MAX), \ + unsigned char: \ + _GL_INT_OP_CALC (a, b, r, op, overflow, unsigned int, \ + unsigned char, 0, UCHAR_MAX), \ + short int: \ + _GL_INT_OP_CALC (a, b, r, op, overflow, unsigned int, \ + short int, SHRT_MIN, SHRT_MAX), \ + unsigned short int: \ + _GL_INT_OP_CALC (a, b, r, op, overflow, unsigned int, \ + unsigned short int, 0, USHRT_MAX), \ + int: \ + _GL_INT_OP_CALC (a, b, r, op, overflow, unsigned int, \ + int, INT_MIN, INT_MAX), \ + unsigned int: \ + _GL_INT_OP_CALC (a, b, r, op, overflow, unsigned int, \ + unsigned int, 0, UINT_MAX), \ + long int: \ + _GL_INT_OP_CALC (a, b, r, op, overflow, unsigned long int, \ + long int, LONG_MIN, LONG_MAX), \ + unsigned long int: \ + _GL_INT_OP_CALC (a, b, r, op, overflow, unsigned long int, \ + unsigned long int, 0, ULONG_MAX), \ + long long int: \ + _GL_INT_OP_CALC (a, b, r, op, overflow, unsigned long long int, \ + long long int, LLONG_MIN, LLONG_MAX), \ + unsigned long long int: \ + _GL_INT_OP_CALC (a, b, r, op, overflow, unsigned long long int, \ + unsigned long long int, 0, ULLONG_MAX))) +#else +/* Store the low-order bits of A B into *R, where OP specifies + the operation and OVERFLOW the overflow predicate. If *R is + signed, its type is ST with bounds SMIN..SMAX; otherwise its type + is UT with bounds U..UMAX. ST and UT are narrower than int. + Return 1 if the result overflows. See above for restrictions. */ +# if _GL_HAVE___TYPEOF__ +# define _GL_INT_OP_WRAPV_SMALLISH(a,b,r,op,overflow,st,smin,smax,ut,umax) \ + (TYPE_SIGNED (__typeof__ (*(r))) \ + ? _GL_INT_OP_CALC (a, b, r, op, overflow, unsigned int, st, smin, smax) \ + : _GL_INT_OP_CALC (a, b, r, op, overflow, unsigned int, ut, 0, umax)) +# else +# define _GL_INT_OP_WRAPV_SMALLISH(a,b,r,op,overflow,st,smin,smax,ut,umax) \ + (overflow (a, b, smin, smax) \ + ? (overflow (a, b, 0, umax) \ + ? (*(r) = _GL_INT_OP_WRAPV_VIA_UNSIGNED (a,b,op,unsigned,st), 1) \ + : (*(r) = _GL_INT_OP_WRAPV_VIA_UNSIGNED (a,b,op,unsigned,st)) < 0) \ + : (overflow (a, b, 0, umax) \ + ? (*(r) = _GL_INT_OP_WRAPV_VIA_UNSIGNED (a,b,op,unsigned,st)) >= 0 \ + : (*(r) = _GL_INT_OP_WRAPV_VIA_UNSIGNED (a,b,op,unsigned,st), 0))) +# endif + +# define _GL_INT_OP_WRAPV(a, b, r, op, overflow) \ + (sizeof *(r) == sizeof (signed char) \ + ? _GL_INT_OP_WRAPV_SMALLISH (a, b, r, op, overflow, \ + signed char, SCHAR_MIN, SCHAR_MAX, \ + unsigned char, UCHAR_MAX) \ + : sizeof *(r) == sizeof (short int) \ + ? _GL_INT_OP_WRAPV_SMALLISH (a, b, r, op, overflow, \ + short int, SHRT_MIN, SHRT_MAX, \ + unsigned short int, USHRT_MAX) \ + : sizeof *(r) == sizeof (int) \ + ? (EXPR_SIGNED (*(r)) \ + ? _GL_INT_OP_CALC (a, b, r, op, overflow, unsigned int, \ + int, INT_MIN, INT_MAX) \ + : _GL_INT_OP_CALC (a, b, r, op, overflow, unsigned int, \ + unsigned int, 0, UINT_MAX)) \ + : _GL_INT_OP_WRAPV_LONGISH(a, b, r, op, overflow)) +# ifdef LLONG_MAX +# define _GL_INT_OP_WRAPV_LONGISH(a, b, r, op, overflow) \ + (sizeof *(r) == sizeof (long int) \ + ? (EXPR_SIGNED (*(r)) \ + ? _GL_INT_OP_CALC (a, b, r, op, overflow, unsigned long int, \ + long int, LONG_MIN, LONG_MAX) \ + : _GL_INT_OP_CALC (a, b, r, op, overflow, unsigned long int, \ + unsigned long int, 0, ULONG_MAX)) \ + : (EXPR_SIGNED (*(r)) \ + ? _GL_INT_OP_CALC (a, b, r, op, overflow, unsigned long long int, \ + long long int, LLONG_MIN, LLONG_MAX) \ + : _GL_INT_OP_CALC (a, b, r, op, overflow, unsigned long long int, \ + unsigned long long int, 0, ULLONG_MAX))) +# else +# define _GL_INT_OP_WRAPV_LONGISH(a, b, r, op, overflow) \ + (EXPR_SIGNED (*(r)) \ + ? _GL_INT_OP_CALC (a, b, r, op, overflow, unsigned long int, \ + long int, LONG_MIN, LONG_MAX) \ + : _GL_INT_OP_CALC (a, b, r, op, overflow, unsigned long int, \ + unsigned long int, 0, ULONG_MAX)) +# endif +#endif + +/* Store the low-order bits of A B into *R, where the operation + is given by OP. Use the unsigned type UT for calculation to avoid + overflow problems. *R's type is T, with extrema TMIN and TMAX. + T must be a signed integer type. Return 1 if the result overflows. */ +#define _GL_INT_OP_CALC(a, b, r, op, overflow, ut, t, tmin, tmax) \ + (overflow (a, b, tmin, tmax) \ + ? (*(r) = _GL_INT_OP_WRAPV_VIA_UNSIGNED (a, b, op, ut, t), 1) \ + : (*(r) = _GL_INT_OP_WRAPV_VIA_UNSIGNED (a, b, op, ut, t), 0)) + +/* Return the low-order bits of A B, where the operation is given + by OP. Use the unsigned type UT for calculation to avoid undefined + behavior on signed integer overflow, and convert the result to type T. + UT is at least as wide as T and is no narrower than unsigned int, + T is two's complement, and there is no padding or trap representations. + Assume that converting UT to T yields the low-order bits, as is + done in all known two's-complement C compilers. E.g., see: + https://gcc.gnu.org/onlinedocs/gcc/Integers-implementation.html + + According to the C standard, converting UT to T yields an + implementation-defined result or signal for values outside T's + range. However, code that works around this theoretical problem + runs afoul of a compiler bug in Oracle Studio 12.3 x86. See: + https://lists.gnu.org/r/bug-gnulib/2017-04/msg00049.html + As the compiler bug is real, don't try to work around the + theoretical problem. */ + +#define _GL_INT_OP_WRAPV_VIA_UNSIGNED(a, b, op, ut, t) \ + ((t) ((ut) (a) op (ut) (b))) + +/* Return true if the numeric values A + B, A - B, A * B fall outside + the range TMIN..TMAX. Arguments should be integer expressions + without side effects. TMIN should be signed and nonpositive. + TMAX should be positive, and should be signed unless TMIN is zero. */ +#define _GL_INT_ADD_RANGE_OVERFLOW(a, b, tmin, tmax) \ + ((b) < 0 \ + ? (((tmin) \ + ? ((EXPR_SIGNED (_GL_INT_CONVERT (a, (tmin) - (b))) || (b) < (tmin)) \ + && (a) < (tmin) - (b)) \ + : (a) <= -1 - (b)) \ + || ((EXPR_SIGNED (a) ? 0 <= (a) : (tmax) < (a)) && (tmax) < (a) + (b))) \ + : (a) < 0 \ + ? (((tmin) \ + ? ((EXPR_SIGNED (_GL_INT_CONVERT (b, (tmin) - (a))) || (a) < (tmin)) \ + && (b) < (tmin) - (a)) \ + : (b) <= -1 - (a)) \ + || ((EXPR_SIGNED (_GL_INT_CONVERT (a, b)) || (tmax) < (b)) \ + && (tmax) < (a) + (b))) \ + : (tmax) < (b) || (tmax) - (b) < (a)) +#define _GL_INT_SUBTRACT_RANGE_OVERFLOW(a, b, tmin, tmax) \ + (((a) < 0) == ((b) < 0) \ + ? ((a) < (b) \ + ? !(tmin) || -1 - (tmin) < (b) - (a) - 1 \ + : (tmax) < (a) - (b)) \ + : (a) < 0 \ + ? ((!EXPR_SIGNED (_GL_INT_CONVERT ((a) - (tmin), b)) && (a) - (tmin) < 0) \ + || (a) - (tmin) < (b)) \ + : ((! (EXPR_SIGNED (_GL_INT_CONVERT (tmax, b)) \ + && EXPR_SIGNED (_GL_INT_CONVERT ((tmax) + (b), a))) \ + && (tmax) <= -1 - (b)) \ + || (tmax) + (b) < (a))) +#define _GL_INT_MULTIPLY_RANGE_OVERFLOW(a, b, tmin, tmax) \ + ((b) < 0 \ + ? ((a) < 0 \ + ? (EXPR_SIGNED (_GL_INT_CONVERT (tmax, b)) \ + ? (a) < (tmax) / (b) \ + : ((INT_NEGATE_OVERFLOW (b) \ + ? _GL_INT_CONVERT (b, tmax) >> (TYPE_WIDTH (+ (b)) - 1) \ + : (tmax) / -(b)) \ + <= -1 - (a))) \ + : INT_NEGATE_OVERFLOW (_GL_INT_CONVERT (b, tmin)) && (b) == -1 \ + ? (EXPR_SIGNED (a) \ + ? 0 < (a) + (tmin) \ + : 0 < (a) && -1 - (tmin) < (a) - 1) \ + : (tmin) / (b) < (a)) \ + : (b) == 0 \ + ? 0 \ + : ((a) < 0 \ + ? (INT_NEGATE_OVERFLOW (_GL_INT_CONVERT (a, tmin)) && (a) == -1 \ + ? (EXPR_SIGNED (b) ? 0 < (b) + (tmin) : -1 - (tmin) < (b) - 1) \ + : (tmin) / (a) < (b)) \ + : (tmax) / (b) < (a))) /* The following macros compute A + B, A - B, and A * B, respectively. If no overflow occurs, they set *R to the result and return 1; @@ -315,8 +612,6 @@ A, B, and *R should be integers; they need not be the same type, and they need not be all signed or all unsigned. - However, none of the integer types should be bit-precise, - and *R's type should not be char, bool, or an enumeration type. These macros work correctly on all known practical hosts, and do not rely on undefined behavior due to signed arithmetic overflow. @@ -328,8 +623,8 @@ These macros are tuned for B being a constant. */ -#define INT_ADD_OK(a, b, r) (! INT_ADD_WRAPV (a, b, r)) -#define INT_SUBTRACT_OK(a, b, r) (! INT_SUBTRACT_WRAPV (a, b, r)) -#define INT_MULTIPLY_OK(a, b, r) (! INT_MULTIPLY_WRAPV (a, b, r)) +#define INT_ADD_OK(a, b, r) ! INT_ADD_WRAPV (a, b, r) +#define INT_SUBTRACT_OK(a, b, r) ! INT_SUBTRACT_WRAPV (a, b, r) +#define INT_MULTIPLY_OK(a, b, r) ! INT_MULTIPLY_WRAPV (a, b, r) #endif /* _GL_INTPROPS_H */ diff -Nru mmv-2.5/lib/inttypes.in.h mmv-2.5.1/lib/inttypes.in.h --- mmv-2.5/lib/inttypes.in.h 2023-07-20 19:40:23.000000000 +0000 +++ mmv-2.5.1/lib/inttypes.in.h 2023-08-08 11:02:40.000000000 +0000 @@ -1,18 +1,18 @@ -/* Copyright (C) 2006-2023 Free Software Foundation, Inc. +/* Copyright (C) 2006-2021 Free Software Foundation, Inc. Written by Paul Eggert, Bruno Haible, Derek Price. This file is part of gnulib. - This file is free software: you can redistribute it and/or modify - it under the terms of the GNU Lesser General Public License as - published by the Free Software Foundation; either version 2.1 of the - License, or (at your option) any later version. + 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 of the License, or + (at your option) any later version. - This file is distributed in the hope that it will be useful, + 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 Lesser General Public License for more details. + GNU General Public License for more details. - You should have received a copy of the GNU Lesser General Public License + You should have received a copy of the GNU General Public License along with this program. If not, see . */ /* @@ -46,11 +46,6 @@ #if ! defined INTTYPES_H && ! defined _GL_JUST_INCLUDE_SYSTEM_INTTYPES_H #define INTTYPES_H -/* This file uses GNULIB_POSIXCHECK, HAVE_RAW_DECL_*. */ -#if !_GL_CONFIG_H_INCLUDED - #error "Please include config.h first." -#endif - /* Include or the gnulib replacement. But avoid namespace pollution on glibc systems. */ #ifndef __GLIBC__ @@ -908,21 +903,8 @@ #endif #if @GNULIB_IMAXABS@ -# if @REPLACE_IMAXABS@ -# if !(defined __cplusplus && defined GNULIB_NAMESPACE) -# undef imaxabs -# define imaxabs rpl_imaxabs -# endif -_GL_FUNCDECL_RPL (imaxabs, intmax_t, (intmax_t x)); -_GL_CXXALIAS_RPL (imaxabs, intmax_t, (intmax_t x)); -# else -# if !@HAVE_DECL_IMAXABS@ -_GL_FUNCDECL_SYS (imaxabs, intmax_t, (intmax_t x)); -# endif -_GL_CXXALIAS_SYS (imaxabs, intmax_t, (intmax_t x)); -# endif -# if __GLIBC__ >= 2 -_GL_CXXALIASWARN (imaxabs); +# if !@HAVE_DECL_IMAXABS@ +extern intmax_t imaxabs (intmax_t); # endif #elif defined GNULIB_POSIXCHECK # undef imaxabs @@ -939,21 +921,8 @@ # define GNULIB_defined_imaxdiv_t 1 # endif # endif -# if @REPLACE_IMAXDIV@ -# if !(defined __cplusplus && defined GNULIB_NAMESPACE) -# undef imaxdiv -# define imaxdiv rpl_imaxdiv -# endif -_GL_FUNCDECL_RPL (imaxdiv, imaxdiv_t, (intmax_t numer, intmax_t denom)); -_GL_CXXALIAS_RPL (imaxdiv, imaxdiv_t, (intmax_t numer, intmax_t denom)); -# else -# if !@HAVE_DECL_IMAXDIV@ -_GL_FUNCDECL_SYS (imaxdiv, imaxdiv_t, (intmax_t numer, intmax_t denom)); -# endif -_GL_CXXALIAS_SYS (imaxdiv, imaxdiv_t, (intmax_t numer, intmax_t denom)); -# endif -# if __GLIBC__ >= 2 -_GL_CXXALIASWARN (imaxdiv); +# if !@HAVE_DECL_IMAXDIV@ +extern imaxdiv_t imaxdiv (intmax_t, intmax_t); # endif #elif defined GNULIB_POSIXCHECK # undef imaxdiv diff -Nru mmv-2.5/lib/isnan.c mmv-2.5.1/lib/isnan.c --- mmv-2.5/lib/isnan.c 2023-07-20 19:40:23.000000000 +0000 +++ mmv-2.5.1/lib/isnan.c 2023-08-08 11:02:40.000000000 +0000 @@ -1,17 +1,17 @@ /* Test for NaN that does not need libm. - Copyright (C) 2007-2023 Free Software Foundation, Inc. + Copyright (C) 2007-2021 Free Software Foundation, Inc. - This file is free software: you can redistribute it and/or modify - it under the terms of the GNU Lesser General Public License as - published by the Free Software Foundation; either version 2.1 of the - License, or (at your option) any later version. + 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 of the License, or + (at your option) any later version. - This file is distributed in the hope that it will be useful, + 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 Lesser General Public License for more details. + GNU General Public License for more details. - You should have received a copy of the GNU Lesser General Public License + You should have received a copy of the GNU General Public License along with this program. If not, see . */ /* Written by Bruno Haible , 2007. */ @@ -82,10 +82,9 @@ /* Most hosts nowadays use IEEE floating point, so they use IEC 60559 representations, have infinities and NaNs, and do not trap on exceptions. Define IEEE_FLOATING_POINT if this host is one of the - typical ones. The C23 macro __STDC_IEC_60559_BFP__ macro (or its cousin, - the now-obsolescent C11 macro __STDC_IEC_559__) is close to what is + typical ones. The C11 macro __STDC_IEC_559__ is close to what is wanted here, but is not quite right because this file does not require - all the features of C23 Annex F (and works even with pre-C11 platforms, + all the features of C11 Annex F (and does not require C11 at all, for that matter). */ #define IEEE_FLOATING_POINT (FLT_RADIX == 2 && FLT_MANT_DIG == 24 \ diff -Nru mmv-2.5/lib/isnand-nolibm.h mmv-2.5.1/lib/isnand-nolibm.h --- mmv-2.5/lib/isnand-nolibm.h 2023-07-20 19:40:23.000000000 +0000 +++ mmv-2.5.1/lib/isnand-nolibm.h 2023-08-08 11:02:40.000000000 +0000 @@ -1,24 +1,19 @@ /* Test for NaN that does not need libm. - Copyright (C) 2007-2023 Free Software Foundation, Inc. + Copyright (C) 2007-2021 Free Software Foundation, Inc. - This file is free software: you can redistribute it and/or modify - it under the terms of the GNU Lesser General Public License as - published by the Free Software Foundation; either version 2.1 of the - License, or (at your option) any later version. + 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 of the License, or + (at your option) any later version. - This file is distributed in the hope that it will be useful, + 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 Lesser General Public License for more details. + GNU General Public License for more details. - You should have received a copy of the GNU Lesser General Public License + You should have received a copy of the GNU General Public License along with this program. If not, see . */ -/* This file uses HAVE_ISNAND_IN_LIBC. */ -#if !_GL_CONFIG_H_INCLUDED - #error "Please include config.h first." -#endif - #if HAVE_ISNAND_IN_LIBC /* Get declaration of isnan macro. */ # include diff -Nru mmv-2.5/lib/isnand.c mmv-2.5.1/lib/isnand.c --- mmv-2.5/lib/isnand.c 2023-07-20 19:40:23.000000000 +0000 +++ mmv-2.5.1/lib/isnand.c 2023-08-08 11:02:40.000000000 +0000 @@ -1,17 +1,17 @@ /* Test for NaN that does not need libm. - Copyright (C) 2008-2023 Free Software Foundation, Inc. + Copyright (C) 2008-2021 Free Software Foundation, Inc. - This file is free software: you can redistribute it and/or modify - it under the terms of the GNU Lesser General Public License as - published by the Free Software Foundation; either version 2.1 of the - License, or (at your option) any later version. + 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 of the License, or + (at your option) any later version. - This file is distributed in the hope that it will be useful, + 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 Lesser General Public License for more details. + GNU General Public License for more details. - You should have received a copy of the GNU Lesser General Public License + You should have received a copy of the GNU General Public License along with this program. If not, see . */ /* Written by Bruno Haible , 2008. */ diff -Nru mmv-2.5/lib/isnanf-nolibm.h mmv-2.5.1/lib/isnanf-nolibm.h --- mmv-2.5/lib/isnanf-nolibm.h 2023-07-20 19:40:23.000000000 +0000 +++ mmv-2.5.1/lib/isnanf-nolibm.h 2023-08-08 11:02:40.000000000 +0000 @@ -1,24 +1,19 @@ /* Test for NaN that does not need libm. - Copyright (C) 2007-2023 Free Software Foundation, Inc. + Copyright (C) 2007-2021 Free Software Foundation, Inc. - This file is free software: you can redistribute it and/or modify - it under the terms of the GNU Lesser General Public License as - published by the Free Software Foundation; either version 2.1 of the - License, or (at your option) any later version. + 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 of the License, or + (at your option) any later version. - This file is distributed in the hope that it will be useful, + 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 Lesser General Public License for more details. + GNU General Public License for more details. - You should have received a copy of the GNU Lesser General Public License + You should have received a copy of the GNU General Public License along with this program. If not, see . */ -/* This file uses HAVE_ISNANF_IN_LIBC. */ -#if !_GL_CONFIG_H_INCLUDED - #error "Please include config.h first." -#endif - #if HAVE_ISNANF_IN_LIBC /* Get declaration of isnan macro or (older) isnanf function. */ # include diff -Nru mmv-2.5/lib/isnanf.c mmv-2.5.1/lib/isnanf.c --- mmv-2.5/lib/isnanf.c 2023-07-20 19:40:23.000000000 +0000 +++ mmv-2.5.1/lib/isnanf.c 2023-08-08 11:02:40.000000000 +0000 @@ -1,17 +1,17 @@ /* Test for NaN that does not need libm. - Copyright (C) 2007, 2009-2023 Free Software Foundation, Inc. + Copyright (C) 2007, 2009-2021 Free Software Foundation, Inc. - This file is free software: you can redistribute it and/or modify - it under the terms of the GNU Lesser General Public License as - published by the Free Software Foundation; either version 2.1 of the - License, or (at your option) any later version. + 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 of the License, or + (at your option) any later version. - This file is distributed in the hope that it will be useful, + 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 Lesser General Public License for more details. + GNU General Public License for more details. - You should have received a copy of the GNU Lesser General Public License + You should have received a copy of the GNU General Public License along with this program. If not, see . */ /* Written by Bruno Haible , 2007. */ diff -Nru mmv-2.5/lib/isnanl-nolibm.h mmv-2.5.1/lib/isnanl-nolibm.h --- mmv-2.5/lib/isnanl-nolibm.h 2023-07-20 19:40:23.000000000 +0000 +++ mmv-2.5.1/lib/isnanl-nolibm.h 2023-08-08 11:02:40.000000000 +0000 @@ -1,24 +1,19 @@ /* Test for NaN that does not need libm. - Copyright (C) 2007-2023 Free Software Foundation, Inc. + Copyright (C) 2007-2021 Free Software Foundation, Inc. - This file is free software: you can redistribute it and/or modify - it under the terms of the GNU Lesser General Public License as - published by the Free Software Foundation; either version 2.1 of the - License, or (at your option) any later version. + 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 of the License, or + (at your option) any later version. - This file is distributed in the hope that it will be useful, + 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 Lesser General Public License for more details. + GNU General Public License for more details. - You should have received a copy of the GNU Lesser General Public License + You should have received a copy of the GNU General Public License along with this program. If not, see . */ -/* This file uses HAVE_ISNANL_IN_LIBC. */ -#if !_GL_CONFIG_H_INCLUDED - #error "Please include config.h first." -#endif - #if HAVE_ISNANL_IN_LIBC /* Get declaration of isnan macro or (older) isnanl function. */ # include diff -Nru mmv-2.5/lib/isnanl.c mmv-2.5.1/lib/isnanl.c --- mmv-2.5/lib/isnanl.c 2023-07-20 19:40:23.000000000 +0000 +++ mmv-2.5.1/lib/isnanl.c 2023-08-08 11:02:40.000000000 +0000 @@ -1,17 +1,17 @@ /* Test for NaN that does not need libm. - Copyright (C) 2007, 2009-2023 Free Software Foundation, Inc. + Copyright (C) 2007, 2009-2021 Free Software Foundation, Inc. - This file is free software: you can redistribute it and/or modify - it under the terms of the GNU Lesser General Public License as - published by the Free Software Foundation; either version 2.1 of the - License, or (at your option) any later version. + 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 of the License, or + (at your option) any later version. - This file is distributed in the hope that it will be useful, + 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 Lesser General Public License for more details. + GNU General Public License for more details. - You should have received a copy of the GNU Lesser General Public License + You should have received a copy of the GNU General Public License along with this program. If not, see . */ /* Written by Bruno Haible , 2007. */ diff -Nru mmv-2.5/lib/itold.c mmv-2.5.1/lib/itold.c --- mmv-2.5/lib/itold.c 2023-07-20 19:40:23.000000000 +0000 +++ mmv-2.5.1/lib/itold.c 2023-08-08 11:02:40.000000000 +0000 @@ -1,18 +1,18 @@ /* Replacement for 'int' to 'long double' conversion routine. - Copyright (C) 2011-2023 Free Software Foundation, Inc. + Copyright (C) 2011-2021 Free Software Foundation, Inc. Written by Bruno Haible , 2011. - This file is free software: you can redistribute it and/or modify - it under the terms of the GNU Lesser General Public License as - published by the Free Software Foundation; either version 2.1 of the - License, or (at your option) any later version. + 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 of the License, or + (at your option) any later version. - This file is distributed in the hope that it will be useful, + 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 Lesser General Public License for more details. + GNU General Public License for more details. - You should have received a copy of the GNU Lesser General Public License + You should have received a copy of the GNU General Public License along with this program. If not, see . */ #include diff -Nru mmv-2.5/lib/libc-config.h mmv-2.5.1/lib/libc-config.h --- mmv-2.5/lib/libc-config.h 2023-07-20 19:40:23.000000000 +0000 +++ mmv-2.5.1/lib/libc-config.h 2023-08-08 11:02:47.000000000 +0000 @@ -1,18 +1,18 @@ /* System definitions for code taken from the GNU C Library - Copyright 2017-2023 Free Software Foundation, Inc. + Copyright 2017-2021 Free Software Foundation, Inc. This program is free software; you can redistribute it and/or - modify it under the terms of the GNU Lesser General Public + modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either - version 2.1 of the License, or (at your option) any later version. + version 3 of the License, 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 - Lesser General Public License for more details. + General Public License for more details. - You should have received a copy of the GNU Lesser General Public + You should have received a copy of the GNU General Public License along with this program; if not, see . */ @@ -28,17 +28,14 @@ When compiled as part of glibc this is a no-op; when compiled as part of Gnulib this includes Gnulib's and defines macros - that glibc library code would normally assume. - - Note: This header file MUST NOT be included by public header files - of Gnulib. */ + that glibc library code would normally assume. */ #include /* On glibc this includes and and #defines - _FEATURES_H, __WORDSIZE, and __set_errno. On FreeBSD 11 and - DragonFlyBSD 5.9 it includes which defines __nonnull. - Elsewhere it is harmless. */ + _FEATURES_H, __WORDSIZE, and __set_errno. On FreeBSD 11 it + includes which defines __nonnull. Elsewhere it + is harmless. */ #include /* From glibc . */ @@ -74,7 +71,7 @@ # endif #endif -#ifndef __attribute_nonnull__ +#ifndef __attribute_maybe_unused__ /* either does not exist, or is too old for Gnulib. Prepare to include , which is Gnulib's version of a more-recent glibc . */ @@ -83,9 +80,13 @@ # ifndef _FEATURES_H # define _FEATURES_H 1 # endif -/* Define __GNULIB_CDEFS so that does not attempt to include - nonexistent files. */ -# define __GNULIB_CDEFS +/* Define __WORDSIZE so that does not attempt to include + nonexistent files. Make it a syntax error, since Gnulib does not + use __WORDSIZE now, and if Gnulib uses it later the syntax error + will let us know that __WORDSIZE needs configuring. */ +# ifndef __WORDSIZE +# define __WORDSIZE %%% +# endif /* Undef the macros unconditionally defined by our copy of glibc , so that they do not clash with any system-defined versions. */ @@ -117,11 +118,7 @@ # undef __THROW # undef __THROWNL # undef __attr_access -# undef __attr_access_none -# undef __attr_dealloc -# undef __attr_dealloc_free # undef __attribute__ -# undef __attribute_alloc_align__ # undef __attribute_alloc_size__ # undef __attribute_artificial__ # undef __attribute_const__ @@ -130,27 +127,28 @@ # undef __attribute_format_arg__ # undef __attribute_format_strfmon__ # undef __attribute_malloc__ -# undef __attribute_maybe_unused__ # undef __attribute_noinline__ # undef __attribute_nonstring__ # undef __attribute_pure__ # undef __attribute_returns_twice__ # undef __attribute_used__ # undef __attribute_warn_unused_result__ +# undef __bos +# undef __bos0 # undef __errordecl # undef __extension__ # undef __extern_always_inline # undef __extern_inline # undef __flexarr -# undef __fortified_attr_access # undef __fortify_function # undef __glibc_c99_flexarr_available # undef __glibc_has_attribute # undef __glibc_has_builtin # undef __glibc_has_extension -# undef __glibc_likely # undef __glibc_macro_warning # undef __glibc_macro_warning1 +# undef __glibc_objsize +# undef __glibc_objsize0 # undef __glibc_unlikely # undef __inline # undef __ptr_t @@ -159,19 +157,6 @@ # undef __va_arg_pack # undef __va_arg_pack_len # undef __warnattr -# undef __wur -# ifndef __GNULIB_CDEFS -# undef __bos -# undef __bos0 -# undef __glibc_fortify -# undef __glibc_fortify_n -# undef __glibc_objsize -# undef __glibc_objsize0 -# undef __glibc_safe_len_cond -# undef __glibc_safe_or_unknown_len -# undef __glibc_unsafe_len -# undef __glibc_unsigned_or_positive -# endif /* Include our copy of glibc . */ # include diff -Nru mmv-2.5/lib/limits.in.h mmv-2.5.1/lib/limits.in.h --- mmv-2.5/lib/limits.in.h 2023-07-20 19:40:24.000000000 +0000 +++ mmv-2.5.1/lib/limits.in.h 2023-08-08 11:02:47.000000000 +0000 @@ -1,19 +1,19 @@ /* A GNU-like . - Copyright 2016-2023 Free Software Foundation, Inc. + Copyright 2016-2021 Free Software Foundation, Inc. - This file is free software: you can redistribute it and/or modify - it under the terms of the GNU Lesser General Public License as - published by the Free Software Foundation; either version 2.1 of the - License, or (at your option) any later version. + 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 file is distributed in the hope that it will be useful, + 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 Lesser General Public License for more details. + GNU General Public License for more details. - You should have received a copy of the GNU Lesser General Public License - along with this program. If not, see . */ + You should have received a copy of the GNU General Public License + along with this program; if not, see . */ #if __GNUC__ >= 3 @PRAGMA_SYSTEM_HEADER@ @@ -99,16 +99,10 @@ # endif #endif -/* Assume no multibyte character is longer than 16 bytes. */ -#ifndef MB_LEN_MAX -# define MB_LEN_MAX 16 -#endif - -/* Macros specified by C23 and by ISO/IEC TS 18661-1:2014. */ +/* Macros specified by ISO/IEC TS 18661-1:2014. */ #if (! defined ULLONG_WIDTH \ - && (defined _GNU_SOURCE || defined __STDC_WANT_IEC_60559_BFP_EXT__ \ - || (defined __STDC_VERSION__ && 201710 < __STDC_VERSION__))) + && (defined _GNU_SOURCE || defined __STDC_WANT_IEC_60559_BFP_EXT__)) # define CHAR_WIDTH _GL_INTEGER_WIDTH (CHAR_MIN, CHAR_MAX) # define SCHAR_WIDTH _GL_INTEGER_WIDTH (SCHAR_MIN, SCHAR_MAX) # define UCHAR_WIDTH _GL_INTEGER_WIDTH (0, UCHAR_MAX) @@ -120,31 +114,7 @@ # define ULONG_WIDTH _GL_INTEGER_WIDTH (0, ULONG_MAX) # define LLONG_WIDTH _GL_INTEGER_WIDTH (LLONG_MIN, LLONG_MAX) # define ULLONG_WIDTH _GL_INTEGER_WIDTH (0, ULLONG_MAX) -#endif - -/* Macros specified by C23. */ - -#if (defined _GNU_SOURCE \ - || (defined __STDC_VERSION__ && 201710 < __STDC_VERSION__)) -# if ! defined BOOL_WIDTH -# define BOOL_WIDTH 1 -# define BOOL_MAX 1 -# elif ! defined BOOL_MAX -# define BOOL_MAX ((((1U << (BOOL_WIDTH - 1)) - 1) << 1) + 1) -# endif -#endif - -/* Macro specified by POSIX. */ - -/* The maximal size_t value. Although it might not be of ssize_t type - as it should be, it's too much trouble to fix this minor detail. */ -#ifndef SSIZE_MAX -# ifdef _WIN64 -# define SSIZE_MAX LLONG_MAX -# else -# define SSIZE_MAX LONG_MAX -# endif -#endif +#endif /* !ULLONG_WIDTH && (_GNU_SOURCE || __STDC_WANT_IEC_60559_BFP_EXT__) */ #endif /* _@GUARD_PREFIX@_LIMITS_H */ #endif /* _@GUARD_PREFIX@_LIMITS_H */ diff -Nru mmv-2.5/lib/link.c mmv-2.5.1/lib/link.c --- mmv-2.5/lib/link.c 2023-07-20 19:40:23.000000000 +0000 +++ mmv-2.5.1/lib/link.c 2023-08-08 11:02:47.000000000 +0000 @@ -1,19 +1,19 @@ /* Emulate link on platforms that lack it, namely native Windows platforms. - Copyright (C) 2009-2023 Free Software Foundation, Inc. + Copyright (C) 2009-2021 Free Software Foundation, Inc. - This file is free software: you can redistribute it and/or modify - it under the terms of the GNU Lesser General Public License as - published by the Free Software Foundation; either version 2.1 of the - License, or (at your option) any later version. + 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 file is distributed in the hope that it will be useful, + 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 Lesser General Public License for more details. + GNU General Public License for more details. - You should have received a copy of the GNU Lesser General Public License - along with this program. If not, see . */ + You should have received a copy of the GNU General Public License + along with this program; if not, see . */ #include @@ -117,7 +117,9 @@ *p = '\0'; if (p != dir && stat (dir, &st) != 0 && errno != EOVERFLOW) { + int saved_errno = errno; free (dir); + errno = saved_errno; return -1; } free (dir); @@ -226,7 +228,9 @@ *p = '\0'; if (stat (dir, &st) != 0 && errno != EOVERFLOW) { + int saved_errno = errno; free (dir); + errno = saved_errno; return -1; } } diff -Nru mmv-2.5/lib/lseek.c mmv-2.5.1/lib/lseek.c --- mmv-2.5/lib/lseek.c 2023-07-20 19:40:23.000000000 +0000 +++ mmv-2.5.1/lib/lseek.c 2023-08-08 11:02:47.000000000 +0000 @@ -1,18 +1,18 @@ /* An lseek() function that detects pipes. - Copyright (C) 2007, 2009-2023 Free Software Foundation, Inc. + Copyright (C) 2007, 2009-2021 Free Software Foundation, Inc. - This file is free software: you can redistribute it and/or modify - it under the terms of the GNU Lesser General Public License as - published by the Free Software Foundation; either version 2.1 of the - License, or (at your option) any later version. + 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 file is distributed in the hope that it will be useful, + 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 Lesser General Public License for more details. + GNU General Public License for more details. - You should have received a copy of the GNU Lesser General Public License - along with this program. If not, see . */ + You should have received a copy of the GNU General Public License along + with this program; if not, see . */ #include @@ -52,24 +52,6 @@ errno = ESPIPE; return -1; } -#elif defined __APPLE__ && defined __MACH__ && defined SEEK_DATA - if (whence == SEEK_DATA) - { - /* If OFFSET points to data, macOS lseek+SEEK_DATA returns the - start S of the first data region that begins *after* OFFSET, - where the region from OFFSET to S consists of possibly-empty - data followed by a possibly-empty hole. To work around this - portability glitch, check whether OFFSET is within data by - using lseek+SEEK_HOLE, and if so return to OFFSET by using - lseek+SEEK_SET. Also, contrary to the macOS documentation, - lseek+SEEK_HOLE can fail with ENXIO if there are no holes on - or after OFFSET. What a mess! */ - off_t next_hole = lseek (fd, offset, SEEK_HOLE); - if (next_hole < 0) - return errno == ENXIO ? offset : next_hole; - if (next_hole != offset) - whence = SEEK_SET; - } #else /* BeOS lseek mistakenly succeeds on pipes... */ struct stat statbuf; diff -Nru mmv-2.5/lib/lstat.c mmv-2.5.1/lib/lstat.c --- mmv-2.5/lib/lstat.c 2023-07-20 19:40:23.000000000 +0000 +++ mmv-2.5.1/lib/lstat.c 2023-08-08 11:02:40.000000000 +0000 @@ -1,18 +1,18 @@ /* Work around a bug of lstat on some systems - Copyright (C) 1997-2006, 2008-2023 Free Software Foundation, Inc. + Copyright (C) 1997-2006, 2008-2021 Free Software Foundation, Inc. - This file is free software: you can redistribute it and/or modify - it under the terms of the GNU Lesser General Public License as - published by the Free Software Foundation; either version 2.1 of the - License, or (at your option) any later version. + 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 of the License, or + (at your option) any later version. - This file is distributed in the hope that it will be useful, + 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 Lesser General Public License for more details. + GNU General Public License for more details. - You should have received a copy of the GNU Lesser General Public License + You should have received a copy of the GNU General Public License along with this program. If not, see . */ /* written by Jim Meyering */ diff -Nru mmv-2.5/lib/malloc/scratch_buffer.h mmv-2.5.1/lib/malloc/scratch_buffer.h --- mmv-2.5/lib/malloc/scratch_buffer.h 2023-07-20 19:40:23.000000000 +0000 +++ mmv-2.5.1/lib/malloc/scratch_buffer.h 2023-08-08 11:02:47.000000000 +0000 @@ -1,18 +1,18 @@ /* Variable-sized buffer with on-stack default allocation. - Copyright (C) 2015-2023 Free Software Foundation, Inc. + Copyright (C) 2015-2021 Free Software Foundation, Inc. This file is part of the GNU C Library. The GNU C Library is free software; you can redistribute it and/or - modify it under the terms of the GNU Lesser General Public + modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either - version 2.1 of the License, or (at your option) any later version. + version 3 of the License, or (at your option) any later version. The GNU C Library 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 - Lesser General Public License for more details. + General Public License for more details. - You should have received a copy of the GNU Lesser General Public + You should have received a copy of the GNU General Public License along with the GNU C Library; if not, see . */ @@ -132,4 +132,20 @@ (buffer, nelem, size)); } +/* Return a copy of *BUFFER's first SIZE bytes as a heap-allocated block, + deallocating *BUFFER if it was heap-allocated. SIZE must be at + most *BUFFER's size. Return NULL (setting errno) on memory + exhaustion. */ +void *__libc_scratch_buffer_dupfree (struct scratch_buffer *buffer, + size_t size); +libc_hidden_proto (__libc_scratch_buffer_dupfree) + +/* Alias for __libc_scratch_dupfree. */ +static __always_inline void * +scratch_buffer_dupfree (struct scratch_buffer *buffer, size_t size) +{ + void *r = __libc_scratch_buffer_dupfree (buffer, size); + return __glibc_likely (r != NULL) ? r : NULL; +} + #endif /* _SCRATCH_BUFFER_H */ diff -Nru mmv-2.5/lib/malloc/scratch_buffer_dupfree.c mmv-2.5.1/lib/malloc/scratch_buffer_dupfree.c --- mmv-2.5/lib/malloc/scratch_buffer_dupfree.c 1970-01-01 00:00:00.000000000 +0000 +++ mmv-2.5.1/lib/malloc/scratch_buffer_dupfree.c 2023-08-08 10:47:41.000000000 +0000 @@ -0,0 +1,41 @@ +/* Variable-sized buffer with on-stack default allocation. + Copyright (C) 2020-2021 Free Software Foundation, Inc. + This file is part of the GNU C Library. + + The GNU C Library 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 of the License, or (at your option) any later version. + + The GNU C Library 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 the GNU C Library; if not, see + . */ + +#ifndef _LIBC +# include +#endif + +#include +#include + +void * +__libc_scratch_buffer_dupfree (struct scratch_buffer *buffer, size_t size) +{ + void *data = buffer->data; + if (data == buffer->__space.__c) + { + void *copy = malloc (size); + return copy != NULL ? memcpy (copy, data, size) : NULL; + } + else + { + void *copy = realloc (data, size); + return copy != NULL ? copy : data; + } +} +libc_hidden_def (__libc_scratch_buffer_dupfree) diff -Nru mmv-2.5/lib/malloc/scratch_buffer_grow.c mmv-2.5.1/lib/malloc/scratch_buffer_grow.c --- mmv-2.5/lib/malloc/scratch_buffer_grow.c 2023-07-20 19:40:23.000000000 +0000 +++ mmv-2.5.1/lib/malloc/scratch_buffer_grow.c 2023-08-08 11:02:47.000000000 +0000 @@ -1,18 +1,18 @@ /* Variable-sized buffer with on-stack default allocation. - Copyright (C) 2015-2023 Free Software Foundation, Inc. + Copyright (C) 2015-2021 Free Software Foundation, Inc. This file is part of the GNU C Library. The GNU C Library is free software; you can redistribute it and/or - modify it under the terms of the GNU Lesser General Public + modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either - version 2.1 of the License, or (at your option) any later version. + version 3 of the License, or (at your option) any later version. The GNU C Library 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 - Lesser General Public License for more details. + General Public License for more details. - You should have received a copy of the GNU Lesser General Public + You should have received a copy of the GNU General Public License along with the GNU C Library; if not, see . */ diff -Nru mmv-2.5/lib/malloc/scratch_buffer_grow_preserve.c mmv-2.5.1/lib/malloc/scratch_buffer_grow_preserve.c --- mmv-2.5/lib/malloc/scratch_buffer_grow_preserve.c 2023-07-20 19:40:23.000000000 +0000 +++ mmv-2.5.1/lib/malloc/scratch_buffer_grow_preserve.c 2023-08-08 11:02:47.000000000 +0000 @@ -1,18 +1,18 @@ /* Variable-sized buffer with on-stack default allocation. - Copyright (C) 2015-2023 Free Software Foundation, Inc. + Copyright (C) 2015-2021 Free Software Foundation, Inc. This file is part of the GNU C Library. The GNU C Library is free software; you can redistribute it and/or - modify it under the terms of the GNU Lesser General Public + modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either - version 2.1 of the License, or (at your option) any later version. + version 3 of the License, or (at your option) any later version. The GNU C Library 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 - Lesser General Public License for more details. + General Public License for more details. - You should have received a copy of the GNU Lesser General Public + You should have received a copy of the GNU General Public License along with the GNU C Library; if not, see . */ diff -Nru mmv-2.5/lib/malloc/scratch_buffer_set_array_size.c mmv-2.5.1/lib/malloc/scratch_buffer_set_array_size.c --- mmv-2.5/lib/malloc/scratch_buffer_set_array_size.c 2023-07-20 19:40:23.000000000 +0000 +++ mmv-2.5.1/lib/malloc/scratch_buffer_set_array_size.c 2023-08-08 11:02:47.000000000 +0000 @@ -1,18 +1,18 @@ /* Variable-sized buffer with on-stack default allocation. - Copyright (C) 2015-2023 Free Software Foundation, Inc. + Copyright (C) 2015-2021 Free Software Foundation, Inc. This file is part of the GNU C Library. The GNU C Library is free software; you can redistribute it and/or - modify it under the terms of the GNU Lesser General Public + modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either - version 2.1 of the License, or (at your option) any later version. + version 3 of the License, or (at your option) any later version. The GNU C Library 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 - Lesser General Public License for more details. + General Public License for more details. - You should have received a copy of the GNU Lesser General Public + You should have received a copy of the GNU General Public License along with the GNU C Library; if not, see . */ diff -Nru mmv-2.5/lib/malloc.c mmv-2.5.1/lib/malloc.c --- mmv-2.5/lib/malloc.c 2023-07-20 19:40:23.000000000 +0000 +++ mmv-2.5.1/lib/malloc.c 2023-08-08 11:02:47.000000000 +0000 @@ -1,51 +1,62 @@ /* malloc() function that is glibc compatible. - Copyright (C) 1997-1998, 2006-2007, 2009-2023 Free Software Foundation, Inc. + Copyright (C) 1997-1998, 2006-2007, 2009-2021 Free Software Foundation, Inc. - This file is free software: you can redistribute it and/or modify - it under the terms of the GNU Lesser General Public License as - published by the Free Software Foundation; either version 2.1 of the - License, or (at your option) any later version. + 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 file is distributed in the hope that it will be useful, + 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 Lesser General Public License for more details. + GNU General Public License for more details. - You should have received a copy of the GNU Lesser General Public License - along with this program. If not, see . */ + You should have received a copy of the GNU General Public License + along with this program; if not, see . */ /* written by Jim Meyering and Bruno Haible */ #define _GL_USE_STDLIB_ALLOC 1 #include +/* Only the AC_FUNC_MALLOC macro defines 'malloc' already in config.h. */ +#ifdef malloc +# define NEED_MALLOC_GNU 1 +# undef malloc +/* Whereas the gnulib module 'malloc-gnu' defines HAVE_MALLOC_GNU. */ +#elif GNULIB_MALLOC_GNU && !HAVE_MALLOC_GNU +# define NEED_MALLOC_GNU 1 +#endif #include -#include +/* A function definition is only needed if NEED_MALLOC_GNU is defined above + or if the module 'malloc-posix' requests it. */ +#if NEED_MALLOC_GNU || (GNULIB_MALLOC_POSIX && !HAVE_MALLOC_POSIX) -#include "xalloc-oversized.h" +# include -/* Allocate an N-byte block of memory from the heap, even if N is 0. */ +/* Allocate an N-byte block of memory from the heap. + If N is zero, allocate a 1-byte block. */ void * rpl_malloc (size_t n) { + void *result; + +# if NEED_MALLOC_GNU if (n == 0) n = 1; +# endif - if (xalloc_oversized (n, 1)) - { - errno = ENOMEM; - return NULL; - } - - void *result = malloc (n); + result = malloc (n); -#if !HAVE_MALLOC_POSIX +# if !HAVE_MALLOC_POSIX if (result == NULL) errno = ENOMEM; -#endif +# endif return result; } + +#endif diff -Nru mmv-2.5/lib/malloca.c mmv-2.5.1/lib/malloca.c --- mmv-2.5/lib/malloca.c 2023-07-20 19:40:23.000000000 +0000 +++ mmv-2.5.1/lib/malloca.c 2023-08-08 11:02:47.000000000 +0000 @@ -1,19 +1,19 @@ /* Safe automatic memory allocation. - Copyright (C) 2003, 2006-2007, 2009-2023 Free Software Foundation, Inc. + Copyright (C) 2003, 2006-2007, 2009-2021 Free Software Foundation, Inc. Written by Bruno Haible , 2003, 2018. - This file is free software: you can redistribute it and/or modify - it under the terms of the GNU Lesser General Public License as - published by the Free Software Foundation; either version 2.1 of the - License, or (at your option) any later version. + 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 file is distributed in the hope that it will be useful, + 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 Lesser General Public License for more details. + GNU General Public License for more details. - You should have received a copy of the GNU Lesser General Public License - along with this program. If not, see . */ + You should have received a copy of the GNU General Public License + along with this program; if not, see . */ #define _GL_USE_STDLIB_ALLOC 1 #include @@ -21,9 +21,7 @@ /* Specification. */ #include "malloca.h" -#include - -#include "idx.h" +#include "verify.h" /* The speed critical point in this file is freea() applied to an alloca() result: it must be fast, to match the speed of alloca(). The speed of @@ -39,7 +37,7 @@ /* Type for holding very small pointer differences. */ typedef unsigned char small_t; /* Verify that it is wide enough. */ -static_assert (2 * sa_alignment_max - 1 <= (small_t) -1); +verify (2 * sa_alignment_max - 1 <= (small_t) -1); void * mmalloca (size_t n) @@ -47,29 +45,24 @@ #if HAVE_ALLOCA /* Allocate one more word, used to determine the address to pass to freea(), and room for the alignment ≡ sa_alignment_max mod 2*sa_alignment_max. */ - uintptr_t alignment2_mask = 2 * sa_alignment_max - 1; - int plus = sizeof (small_t) + alignment2_mask; - idx_t nplus; - if (!ckd_add (&nplus, n, plus) && !xalloc_oversized (nplus, 1)) + size_t nplus = n + sizeof (small_t) + 2 * sa_alignment_max - 1; + + if (nplus >= n) { char *mem = (char *) malloc (nplus); if (mem != NULL) { - uintptr_t umem = (uintptr_t)mem, umemplus; - /* The ckd_add avoids signed integer overflow on - theoretical platforms where UINTPTR_MAX <= INT_MAX. */ - ckd_add (&umemplus, umem, sizeof (small_t) + sa_alignment_max - 1); - idx_t offset = ((umemplus & ~alignment2_mask) - + sa_alignment_max - umem); - void *vp = mem + offset; - small_t *p = vp; + char *p = + (char *)((((uintptr_t)mem + sizeof (small_t) + sa_alignment_max - 1) + & ~(uintptr_t)(2 * sa_alignment_max - 1)) + + sa_alignment_max); /* Here p >= mem + sizeof (small_t), and p <= mem + sizeof (small_t) + 2 * sa_alignment_max - 1 hence p + n <= mem + nplus. So, the memory range [p, p+n) lies in the allocated memory range [mem, mem + nplus). */ - p[-1] = offset; + ((small_t *) p)[-1] = p - mem; /* p ≡ sa_alignment_max mod 2*sa_alignment_max. */ return p; } diff -Nru mmv-2.5/lib/malloca.h mmv-2.5.1/lib/malloca.h --- mmv-2.5/lib/malloca.h 2023-07-20 19:40:23.000000000 +0000 +++ mmv-2.5.1/lib/malloca.h 2023-08-08 11:02:47.000000000 +0000 @@ -1,29 +1,23 @@ /* Safe automatic memory allocation. - Copyright (C) 2003-2007, 2009-2023 Free Software Foundation, Inc. + Copyright (C) 2003-2007, 2009-2021 Free Software Foundation, Inc. Written by Bruno Haible , 2003. - This file is free software: you can redistribute it and/or modify - it under the terms of the GNU Lesser General Public License as - published by the Free Software Foundation; either version 2.1 of the - License, or (at your option) any later version. + 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 file is distributed in the hope that it will be useful, + 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 Lesser General Public License for more details. + GNU General Public License for more details. - You should have received a copy of the GNU Lesser General Public License - along with this program. If not, see . */ + You should have received a copy of the GNU General Public License + along with this program; if not, see . */ #ifndef _MALLOCA_H #define _MALLOCA_H -/* This file uses _GL_ATTRIBUTE_ALLOC_SIZE, _GL_ATTRIBUTE_DEALLOC, - _GL_ATTRIBUTE_MALLOC, HAVE_ALLOCA. */ -#if !_GL_CONFIG_H_INCLUDED - #error "Please include config.h first." -#endif - #include #include #include @@ -57,13 +51,6 @@ # define safe_alloca(N) ((void) (N), NULL) #endif -/* Free a block of memory allocated through malloca(). */ -#if HAVE_ALLOCA -extern void freea (void *p); -#else -# define freea free -#endif - /* malloca(N) is a safe variant of alloca(N). It allocates N bytes of memory allocated on the stack, that must be freed using freea() before the function returns. Upon failure, it returns NULL. */ @@ -78,16 +65,20 @@ # define malloca(N) \ mmalloca (N) #endif -extern void *mmalloca (size_t n) - _GL_ATTRIBUTE_MALLOC _GL_ATTRIBUTE_DEALLOC (freea, 1) - _GL_ATTRIBUTE_ALLOC_SIZE ((1)); +extern void * mmalloca (size_t n); + +/* Free a block of memory allocated through malloca(). */ +#if HAVE_ALLOCA +extern void freea (void *p); +#else +# define freea free +#endif /* nmalloca(N,S) is an overflow-safe variant of malloca (N * S). It allocates an array of N objects, each with S bytes of memory, - on the stack. N and S should be nonnegative and free of side effects. + on the stack. S must be positive and N must be nonnegative. The array must be freed using freea() before the function returns. */ -#define nmalloca(n, s) \ - (xalloc_oversized (n, s) ? NULL : malloca ((n) * (size_t) (s))) +#define nmalloca(n, s) (xalloc_oversized (n, s) ? NULL : malloca ((n) * (s))) #ifdef __cplusplus diff -Nru mmv-2.5/lib/math.c mmv-2.5.1/lib/math.c --- mmv-2.5/lib/math.c 2023-07-20 19:40:23.000000000 +0000 +++ mmv-2.5.1/lib/math.c 2023-08-08 11:02:40.000000000 +0000 @@ -1,22 +1,4 @@ -/* Inline functions for . - - Copyright (C) 2012-2023 Free Software Foundation, Inc. - - This file is free software: you can redistribute it and/or modify - it under the terms of the GNU Lesser General Public License as - published by the Free Software Foundation; either version 2.1 of the - License, or (at your option) any later version. - - This file 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 Lesser General Public License for more details. - - You should have received a copy of the GNU Lesser General Public License - along with this program. If not, see . */ - #include - #define _GL_MATH_INLINE _GL_EXTERN_INLINE #include "math.h" typedef int dummy; diff -Nru mmv-2.5/lib/math.in.h mmv-2.5.1/lib/math.in.h --- mmv-2.5/lib/math.in.h 2023-07-20 19:40:23.000000000 +0000 +++ mmv-2.5.1/lib/math.in.h 2023-08-08 11:02:40.000000000 +0000 @@ -1,25 +1,20 @@ /* A GNU-like . - Copyright (C) 2002-2003, 2007-2023 Free Software Foundation, Inc. + Copyright (C) 2002-2003, 2007-2021 Free Software Foundation, Inc. - This file is free software: you can redistribute it and/or modify - it under the terms of the GNU Lesser General Public License as - published by the Free Software Foundation; either version 2.1 of the - License, or (at your option) any later version. + 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 of the License, or + (at your option) any later version. - This file is distributed in the hope that it will be useful, + 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 Lesser General Public License for more details. + GNU General Public License for more details. - You should have received a copy of the GNU Lesser General Public License + You should have received a copy of the GNU General Public License along with this program. If not, see . */ -/* On Android, in C++ mode, when /usr/include/c++/v1/math.h is being included - and /usr/include/math.h has not yet been included, skip this file, since it - would lead to many syntax errors. */ -#if !(defined __ANDROID__ && defined _LIBCPP_MATH_H && !defined INFINITY) - #ifndef _@GUARD_PREFIX@_MATH_H #if __GNUC__ >= 3 @@ -48,32 +43,19 @@ #ifndef _@GUARD_PREFIX@_MATH_H #define _@GUARD_PREFIX@_MATH_H -/* This file uses _GL_INLINE_HEADER_BEGIN, _GL_INLINE, _GL_ATTRIBUTE_CONST, - GNULIB_POSIXCHECK, HAVE_RAW_DECL_*. */ -#if !_GL_CONFIG_H_INCLUDED - #error "Please include config.h first." -#endif - /* On OpenVMS, NAN, INFINITY, and HUGEVAL macros are defined in . */ #if defined __VMS && ! defined NAN # include #endif +#ifndef _GL_INLINE_HEADER_BEGIN + #error "Please include config.h first." +#endif _GL_INLINE_HEADER_BEGIN #ifndef _GL_MATH_INLINE # define _GL_MATH_INLINE _GL_INLINE #endif -/* The __attribute__ feature is available in gcc versions 2.5 and later. - The attribute __const__ was added in gcc 2.95. */ -#ifndef _GL_ATTRIBUTE_CONST -# if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 95) || defined __clang__ -# define _GL_ATTRIBUTE_CONST __attribute__ ((__const__)) -# else -# define _GL_ATTRIBUTE_CONST /* empty */ -# endif -#endif - /* The definitions of _GL_FUNCDECL_RPL etc. are copied here. */ /* The definition of _GL_ARG_NONNULL is copied here. */ @@ -462,9 +444,7 @@ # endif _GL_CXXALIAS_SYS (cbrtl, long double, (long double x)); # endif -# if __GLIBC__ >= 2 _GL_CXXALIASWARN (cbrtl); -# endif #elif defined GNULIB_POSIXCHECK # undef cbrtl # if HAVE_RAW_DECL_CBRTL @@ -577,9 +557,7 @@ _GL_FUNCDECL_SYS (copysignl, long double, (long double x, long double y)); # endif _GL_CXXALIAS_SYS (copysignl, long double, (long double x, long double y)); -# if __GLIBC__ >= 2 _GL_CXXALIASWARN (copysignl); -# endif #elif defined GNULIB_POSIXCHECK # undef copysignl # if HAVE_RAW_DECL_COPYSIGNL @@ -761,9 +739,7 @@ # endif _GL_CXXALIAS_SYS (exp2l, long double, (long double x)); # endif -# if __GLIBC__ >= 2 _GL_CXXALIASWARN (exp2l); -# endif #elif defined GNULIB_POSIXCHECK # undef exp2l # if HAVE_RAW_DECL_EXP2L @@ -838,9 +814,7 @@ # endif _GL_CXXALIAS_SYS (expm1l, long double, (long double x)); # endif -# if __GLIBC__ >= 2 _GL_CXXALIASWARN (expm1l); -# endif #elif defined GNULIB_POSIXCHECK # undef expm1l # if HAVE_RAW_DECL_EXPM1L @@ -1032,9 +1006,7 @@ _GL_CXXALIAS_SYS (fmal, long double, (long double x, long double y, long double z)); # endif -# if __GLIBC__ >= 2 _GL_CXXALIASWARN (fmal); -# endif #elif defined GNULIB_POSIXCHECK # undef fmal # if HAVE_RAW_DECL_FMAL @@ -1355,9 +1327,7 @@ # endif _GL_CXXALIAS_SYS (ilogbl, int, (long double x)); # endif -# if __GLIBC__ >= 2 _GL_CXXALIASWARN (ilogbl); -# endif #elif defined GNULIB_POSIXCHECK # undef ilogbl # if HAVE_RAW_DECL_ILOGBL @@ -1672,9 +1642,7 @@ # endif _GL_CXXALIAS_SYS (log1pl, long double, (long double x)); # endif -# if __GLIBC__ >= 2 _GL_CXXALIASWARN (log1pl); -# endif #elif defined GNULIB_POSIXCHECK # undef log1pl # if HAVE_RAW_DECL_LOG1PL @@ -1699,9 +1667,7 @@ # endif _GL_CXXALIAS_SYS (log2f, float, (float x)); # endif -# if __GLIBC__ >= 2 _GL_CXXALIASWARN (log2f); -# endif #elif defined GNULIB_POSIXCHECK # undef log2f # if HAVE_RAW_DECL_LOG2F @@ -1750,9 +1716,7 @@ # endif _GL_CXXALIAS_SYS (log2l, long double, (long double x)); # endif -# if __GLIBC__ >= 2 _GL_CXXALIASWARN (log2l); -# endif #elif defined GNULIB_POSIXCHECK # undef log2l # if HAVE_RAW_DECL_LOG2L @@ -1824,9 +1788,7 @@ # endif _GL_CXXALIAS_SYS (logbl, long double, (long double x)); # endif -# if __GLIBC__ >= 2 _GL_CXXALIASWARN (logbl); -# endif #elif defined GNULIB_POSIXCHECK # undef logbl # if HAVE_RAW_DECL_LOGBL @@ -1992,9 +1954,7 @@ # endif _GL_CXXALIAS_SYS (remainderl, long double, (long double x, long double y)); # endif -# if __GLIBC__ >= 2 _GL_CXXALIASWARN (remainderl); -# endif #elif defined GNULIB_POSIXCHECK # undef remainderl # if HAVE_RAW_DECL_REMAINDERL @@ -2048,9 +2008,7 @@ # endif _GL_CXXALIAS_SYS (rintl, long double, (long double x)); # endif -# if __GLIBC__ >= 2 _GL_CXXALIASWARN (rintl); -# endif #elif defined GNULIB_POSIXCHECK # undef rintl # if HAVE_RAW_DECL_RINTL @@ -2125,9 +2083,7 @@ # endif _GL_CXXALIAS_SYS (roundl, long double, (long double x)); # endif -# if __GLIBC__ >= 2 _GL_CXXALIASWARN (roundl); -# endif #elif defined GNULIB_POSIXCHECK # undef roundl # if HAVE_RAW_DECL_ROUNDL @@ -2384,9 +2340,7 @@ # endif _GL_CXXALIAS_SYS (truncl, long double, (long double x)); # endif -# if __GLIBC__ >= 2 _GL_CXXALIASWARN (truncl); -# endif #elif defined GNULIB_POSIXCHECK # undef truncl # if HAVE_RAW_DECL_TRUNCL @@ -2469,7 +2423,6 @@ functions. */ _GL_MATH_CXX_REAL_FLOATING_DECL_2 (isfinite, rpl_isfinite, bool) # define isfinite rpl_isfinite -# define GNULIB_NAMESPACE_LACKS_ISFINITE 1 # else _GL_MATH_CXX_REAL_FLOATING_DECL_2 (isfinite, isfinite, bool) # endif @@ -2504,7 +2457,6 @@ functions. */ _GL_MATH_CXX_REAL_FLOATING_DECL_2 (isinf, rpl_isinf, bool) # define isinf rpl_isinf -# define GNULIB_NAMESPACE_LACKS_ISINF 1 # else _GL_MATH_CXX_REAL_FLOATING_DECL_2 (isinf, isinf, bool) # endif @@ -2627,17 +2579,11 @@ # if defined isnan || defined GNULIB_NAMESPACE _GL_MATH_CXX_REAL_FLOATING_DECL_1 (isnan) # undef isnan -# if __GNUC__ >= 6 || (defined __clang__ && !((defined __APPLE__ && defined __MACH__ && __clang_major__ != 12) || (defined __FreeBSD__ && (__clang_major__ < 7 || __clang_major__ >= 11)) || defined __OpenBSD__ || (defined _WIN32 && !defined __CYGWIN__))) +# if __GNUC__ >= 6 || (defined __clang__ && !((defined __APPLE__ && defined __MACH__) || (defined __FreeBSD__ && __clang_major__ < 7) || defined __OpenBSD__ || (defined _WIN32 && !defined __CYGWIN__))) /* This platform's possibly defines isnan through a set of inline functions. */ _GL_MATH_CXX_REAL_FLOATING_DECL_2 (isnan, rpl_isnan, bool) # define isnan rpl_isnan -# define GNULIB_NAMESPACE_LACKS_ISNAN 1 -# elif (defined __FreeBSD__ && __clang_major__ >= 14) - /* Neither of the two possible _GL_MATH_CXX_REAL_FLOATING_DECL_2 invocations - works. Inline functions are already present in /usr/include/c++/v1/math.h, - which comes from LLVM. */ -# define GNULIB_NAMESPACE_LACKS_ISNAN 1 # else _GL_MATH_CXX_REAL_FLOATING_DECL_2 (isnan, isnan, bool) # endif @@ -2721,7 +2667,6 @@ functions. */ _GL_MATH_CXX_REAL_FLOATING_DECL_2 (signbit, rpl_signbit, bool) # define signbit rpl_signbit -# define GNULIB_NAMESPACE_LACKS_SIGNBIT 1 # else _GL_MATH_CXX_REAL_FLOATING_DECL_2 (signbit, signbit, bool) # endif @@ -2740,4 +2685,3 @@ #endif /* _@GUARD_PREFIX@_MATH_H */ #endif /* _GL_INCLUDING_MATH_H */ #endif /* _@GUARD_PREFIX@_MATH_H */ -#endif diff -Nru mmv-2.5/lib/memchr.c mmv-2.5.1/lib/memchr.c --- mmv-2.5/lib/memchr.c 2023-07-20 19:40:23.000000000 +0000 +++ mmv-2.5.1/lib/memchr.c 2023-08-08 11:02:40.000000000 +0000 @@ -1,4 +1,4 @@ -/* Copyright (C) 1991, 1993, 1996-1997, 1999-2000, 2003-2004, 2006, 2008-2023 +/* Copyright (C) 1991, 1993, 1996-1997, 1999-2000, 2003-2004, 2006, 2008-2021 Free Software Foundation, Inc. Based on strlen implementation by Torbjorn Granlund (tege@sics.se), @@ -7,21 +7,21 @@ adaptation to memchr suggested by Dick Karpinski (dick@cca.ucsf.edu), and implemented by Roland McGrath (roland@ai.mit.edu). - NOTE: The canonical source of this file is maintained with the GNU C Library. - Bugs can be reported to bug-glibc@prep.ai.mit.edu. +NOTE: The canonical source of this file is maintained with the GNU C Library. +Bugs can be reported to bug-glibc@prep.ai.mit.edu. - This file is free software: you can redistribute it and/or modify - it under the terms of the GNU Lesser General Public License as - published by the Free Software Foundation; either version 2.1 of the - License, or (at your option) any later version. - - This file 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 Lesser General Public License for more details. +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 of the License, or 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 Lesser General Public License - along with this program. If not, see . */ +You should have received a copy of the GNU General Public License +along with this program. If not, see . */ #ifndef _LIBC # include diff -Nru mmv-2.5/lib/memchr.valgrind mmv-2.5.1/lib/memchr.valgrind --- mmv-2.5/lib/memchr.valgrind 2023-07-20 19:40:23.000000000 +0000 +++ mmv-2.5.1/lib/memchr.valgrind 2023-08-08 11:02:40.000000000 +0000 @@ -1,18 +1,18 @@ # Suppress a valgrind message about use of uninitialized memory in memchr(). -# Copyright (C) 2009-2023 Free Software Foundation, Inc. +# Copyright (C) 2009-2021 Free Software Foundation, Inc. # -# This file is free software: you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License as -# published by the Free Software Foundation; either version 2.1 of the -# License, or (at your option) any later version. +# 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 of the License, or +# (at your option) any later version. # -# This file is distributed in the hope that it will be useful, +# 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 Lesser General Public License for more details. +# GNU General Public License for more details. # -# You should have received a copy of the GNU Lesser General Public License +# You should have received a copy of the GNU General Public License # along with this program. If not, see . # POSIX states that when the character is found, memchr must not read extra diff -Nru mmv-2.5/lib/mempcpy.c mmv-2.5.1/lib/mempcpy.c --- mmv-2.5/lib/mempcpy.c 2023-07-20 19:40:23.000000000 +0000 +++ mmv-2.5.1/lib/mempcpy.c 2023-08-08 11:02:47.000000000 +0000 @@ -1,18 +1,18 @@ /* Copy memory area and return pointer after last written byte. - Copyright (C) 2003, 2007, 2009-2023 Free Software Foundation, Inc. + Copyright (C) 2003, 2007, 2009-2021 Free Software Foundation, Inc. - This file is free software: you can redistribute it and/or modify - it under the terms of the GNU Lesser General Public License as - published by the Free Software Foundation; either version 2.1 of the - License, or (at your option) any later version. + 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 file is distributed in the hope that it will be useful, + 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 Lesser General Public License for more details. + GNU General Public License for more details. - You should have received a copy of the GNU Lesser General Public License - along with this program. If not, see . */ + You should have received a copy of the GNU General Public License + along with this program; if not, see . */ #include diff -Nru mmv-2.5/lib/minmax.h mmv-2.5.1/lib/minmax.h --- mmv-2.5/lib/minmax.h 2023-07-20 19:40:23.000000000 +0000 +++ mmv-2.5.1/lib/minmax.h 2023-08-08 11:02:47.000000000 +0000 @@ -1,19 +1,19 @@ /* MIN, MAX macros. - Copyright (C) 1995, 1998, 2001, 2003, 2005, 2009-2023 Free Software + Copyright (C) 1995, 1998, 2001, 2003, 2005, 2009-2021 Free Software Foundation, Inc. - This file is free software: you can redistribute it and/or modify - it under the terms of the GNU Lesser General Public License as - published by the Free Software Foundation; either version 2.1 of the - License, or (at your option) any later version. + 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 file is distributed in the hope that it will be useful, + 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 Lesser General Public License for more details. + GNU General Public License for more details. - You should have received a copy of the GNU Lesser General Public License - along with this program. If not, see . */ + You should have received a copy of the GNU General Public License + along with this program; if not, see . */ #ifndef _MINMAX_H #define _MINMAX_H @@ -23,11 +23,6 @@ MIN, MAX macro redefinitions on some systems; the workaround is to #include this file as the last one among the #include list. */ -/* This file uses HAVE_MINMAX_IN_LIMITS_H, HAVE_MINMAX_IN_SYS_PARAM_H. */ -#if !_GL_CONFIG_H_INCLUDED - #error "Please include config.h first." -#endif - /* Before we define the following symbols we get the file since otherwise we get redefinitions on some systems if is included after this file. Likewise for . diff -Nru mmv-2.5/lib/msvc-inval.c mmv-2.5.1/lib/msvc-inval.c --- mmv-2.5/lib/msvc-inval.c 2023-07-20 19:40:23.000000000 +0000 +++ mmv-2.5.1/lib/msvc-inval.c 2023-08-08 11:02:47.000000000 +0000 @@ -1,18 +1,18 @@ /* Invalid parameter handler for MSVC runtime libraries. - Copyright (C) 2011-2023 Free Software Foundation, Inc. + Copyright (C) 2011-2021 Free Software Foundation, Inc. - This file is free software: you can redistribute it and/or modify - it under the terms of the GNU Lesser General Public License as - published by the Free Software Foundation; either version 2.1 of the - License, or (at your option) any later version. + 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 file is distributed in the hope that it will be useful, + 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 Lesser General Public License for more details. + GNU General Public License for more details. - You should have received a copy of the GNU Lesser General Public License - along with this program. If not, see . */ + You should have received a copy of the GNU General Public License along + with this program; if not, see . */ #include diff -Nru mmv-2.5/lib/msvc-inval.h mmv-2.5.1/lib/msvc-inval.h --- mmv-2.5/lib/msvc-inval.h 2023-07-20 19:40:23.000000000 +0000 +++ mmv-2.5.1/lib/msvc-inval.h 2023-08-08 11:02:47.000000000 +0000 @@ -1,18 +1,18 @@ /* Invalid parameter handler for MSVC runtime libraries. - Copyright (C) 2011-2023 Free Software Foundation, Inc. + Copyright (C) 2011-2021 Free Software Foundation, Inc. - This file is free software: you can redistribute it and/or modify - it under the terms of the GNU Lesser General Public License as - published by the Free Software Foundation; either version 2.1 of the - License, or (at your option) any later version. + 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 file is distributed in the hope that it will be useful, + 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 Lesser General Public License for more details. + GNU General Public License for more details. - You should have received a copy of the GNU Lesser General Public License - along with this program. If not, see . */ + You should have received a copy of the GNU General Public License along + with this program; if not, see . */ #ifndef _MSVC_INVAL_H #define _MSVC_INVAL_H @@ -52,11 +52,6 @@ AC_DEFINE([MSVC_INVALID_PARAMETER_HANDLING], [SANE_LIBRARY_HANDLING]) */ -/* This file uses HAVE_MSVC_INVALID_PARAMETER_HANDLER. */ -#if !_GL_CONFIG_H_INCLUDED - #error "Please include config.h first." -#endif - #define DEFAULT_HANDLING 0 #define HAIRY_LIBRARY_HANDLING 1 #define SANE_LIBRARY_HANDLING 2 diff -Nru mmv-2.5/lib/msvc-nothrow.c mmv-2.5.1/lib/msvc-nothrow.c --- mmv-2.5/lib/msvc-nothrow.c 2023-07-20 19:40:23.000000000 +0000 +++ mmv-2.5.1/lib/msvc-nothrow.c 2023-08-08 11:02:47.000000000 +0000 @@ -1,19 +1,19 @@ /* Wrappers that don't throw invalid parameter notifications with MSVC runtime libraries. - Copyright (C) 2011-2023 Free Software Foundation, Inc. + Copyright (C) 2011-2021 Free Software Foundation, Inc. - This file is free software: you can redistribute it and/or modify - it under the terms of the GNU Lesser General Public License as - published by the Free Software Foundation; either version 2.1 of the - License, or (at your option) any later version. + 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 file is distributed in the hope that it will be useful, + 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 Lesser General Public License for more details. + GNU General Public License for more details. - You should have received a copy of the GNU Lesser General Public License - along with this program. If not, see . */ + You should have received a copy of the GNU General Public License along + with this program; if not, see . */ #include diff -Nru mmv-2.5/lib/msvc-nothrow.h mmv-2.5.1/lib/msvc-nothrow.h --- mmv-2.5/lib/msvc-nothrow.h 2023-07-20 19:40:23.000000000 +0000 +++ mmv-2.5.1/lib/msvc-nothrow.h 2023-08-08 11:02:47.000000000 +0000 @@ -1,19 +1,19 @@ /* Wrappers that don't throw invalid parameter notifications with MSVC runtime libraries. - Copyright (C) 2011-2023 Free Software Foundation, Inc. + Copyright (C) 2011-2021 Free Software Foundation, Inc. - This file is free software: you can redistribute it and/or modify - it under the terms of the GNU Lesser General Public License as - published by the Free Software Foundation; either version 2.1 of the - License, or (at your option) any later version. + 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 file is distributed in the hope that it will be useful, + 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 Lesser General Public License for more details. + GNU General Public License for more details. - You should have received a copy of the GNU Lesser General Public License - along with this program. If not, see . */ + You should have received a copy of the GNU General Public License along + with this program; if not, see . */ #ifndef _MSVC_NOTHROW_H #define _MSVC_NOTHROW_H @@ -25,11 +25,6 @@ This file defines wrappers that turn such an invalid parameter notification into an error code. */ -/* This file uses HAVE_MSVC_INVALID_PARAMETER_HANDLER. */ -#if !_GL_CONFIG_H_INCLUDED - #error "Please include config.h first." -#endif - #if defined _WIN32 && ! defined __CYGWIN__ /* Get original declaration of _get_osfhandle. */ diff -Nru mmv-2.5/lib/open.c mmv-2.5.1/lib/open.c --- mmv-2.5/lib/open.c 2023-07-20 19:40:23.000000000 +0000 +++ mmv-2.5.1/lib/open.c 2023-08-08 11:02:40.000000000 +0000 @@ -1,17 +1,17 @@ /* Open a descriptor to a file. - Copyright (C) 2007-2023 Free Software Foundation, Inc. + Copyright (C) 2007-2021 Free Software Foundation, Inc. - This file is free software: you can redistribute it and/or modify - it under the terms of the GNU Lesser General Public License as - published by the Free Software Foundation; either version 2.1 of the - License, or (at your option) any later version. + 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 of the License, or + (at your option) any later version. - This file is distributed in the hope that it will be useful, + 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 Lesser General Public License for more details. + GNU General Public License for more details. - You should have received a copy of the GNU Lesser General Public License + You should have received a copy of the GNU General Public License along with this program. If not, see . */ /* Written by Bruno Haible , 2007. */ diff -Nru mmv-2.5/lib/pathmax.h mmv-2.5.1/lib/pathmax.h --- mmv-2.5/lib/pathmax.h 2023-07-20 19:40:23.000000000 +0000 +++ mmv-2.5.1/lib/pathmax.h 2023-08-08 11:02:47.000000000 +0000 @@ -1,19 +1,19 @@ /* Define PATH_MAX somehow. Requires sys/types.h. - Copyright (C) 1992, 1999, 2001, 2003, 2005, 2009-2023 Free Software + Copyright (C) 1992, 1999, 2001, 2003, 2005, 2009-2021 Free Software Foundation, Inc. - This file is free software: you can redistribute it and/or modify - it under the terms of the GNU Lesser General Public License as - published by the Free Software Foundation; either version 2.1 of the - License, or (at your option) any later version. + 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 file is distributed in the hope that it will be useful, + 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 Lesser General Public License for more details. + GNU General Public License for more details. - You should have received a copy of the GNU Lesser General Public License - along with this program. If not, see . */ + You should have received a copy of the GNU General Public License + along with this program; if not, see . */ #ifndef _PATHMAX_H # define _PATHMAX_H @@ -39,11 +39,6 @@ #endif */ -/* This file uses HAVE_SYS_PARAM_H. */ -# if !_GL_CONFIG_H_INCLUDED -# error "Please include config.h first." -# endif - # include # include diff -Nru mmv-2.5/lib/printf-args.c mmv-2.5.1/lib/printf-args.c --- mmv-2.5/lib/printf-args.c 2023-07-20 19:40:23.000000000 +0000 +++ mmv-2.5.1/lib/printf-args.c 2023-08-08 11:02:47.000000000 +0000 @@ -1,19 +1,19 @@ /* Decomposed printf argument list. - Copyright (C) 1999, 2002-2003, 2005-2007, 2009-2023 Free Software + Copyright (C) 1999, 2002-2003, 2005-2007, 2009-2021 Free Software Foundation, Inc. - This file is free software: you can redistribute it and/or modify - it under the terms of the GNU Lesser General Public License as - published by the Free Software Foundation; either version 2.1 of the - License, or (at your option) any later version. + 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 file is distributed in the hope that it will be useful, + 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 Lesser General Public License for more details. + GNU General Public License for more details. - You should have received a copy of the GNU Lesser General Public License - along with this program. If not, see . */ + You should have received a copy of the GNU General Public License along + with this program; if not, see . */ /* This file can be parametrized with the following macros: ENABLE_UNISTDIO Set to 1 to enable the unistdio extensions. @@ -29,9 +29,6 @@ # include "printf-args.h" #endif -/* Get INT_WIDTH. */ -#include - #ifdef STATIC STATIC #endif @@ -74,102 +71,6 @@ case TYPE_ULONGLONGINT: ap->a.a_ulonglongint = va_arg (args, unsigned long long int); break; - case TYPE_INT8_T: - #if INT8_WIDTH < INT_WIDTH - ap->a.a_int8_t = va_arg (args, /* int8_t */ int); - #else - ap->a.a_int8_t = va_arg (args, int8_t); - #endif - break; - case TYPE_UINT8_T: - #if UINT8_WIDTH < INT_WIDTH - ap->a.a_uint8_t = va_arg (args, /* uint8_t */ int); - #else - ap->a.a_uint8_t = va_arg (args, uint8_t); - #endif - break; - case TYPE_INT16_T: - #if INT16_WIDTH < INT_WIDTH - ap->a.a_int16_t = va_arg (args, /* int16_t */ int); - #else - ap->a.a_int16_t = va_arg (args, int16_t); - #endif - break; - case TYPE_UINT16_T: - #if UINT16_WIDTH < INT_WIDTH - ap->a.a_uint16_t = va_arg (args, /* uint16_t */ int); - #else - ap->a.a_uint16_t = va_arg (args, uint16_t); - #endif - break; - case TYPE_INT32_T: - #if INT32_WIDTH < INT_WIDTH - ap->a.a_int32_t = va_arg (args, /* int32_t */ int); - #else - ap->a.a_int32_t = va_arg (args, int32_t); - #endif - break; - case TYPE_UINT32_T: - #if UINT32_WIDTH < INT_WIDTH - ap->a.a_uint32_t = va_arg (args, /* uint32_t */ int); - #else - ap->a.a_uint32_t = va_arg (args, uint32_t); - #endif - break; - case TYPE_INT64_T: - ap->a.a_int64_t = va_arg (args, int64_t); - break; - case TYPE_UINT64_T: - ap->a.a_uint64_t = va_arg (args, uint64_t); - break; - case TYPE_INT_FAST8_T: - #if INT_FAST8_WIDTH < INT_WIDTH - ap->a.a_int_fast8_t = va_arg (args, /* int_fast8_t */ int); - #else - ap->a.a_int_fast8_t = va_arg (args, int_fast8_t); - #endif - break; - case TYPE_UINT_FAST8_T: - #if UINT_FAST8_WIDTH < INT_WIDTH - ap->a.a_uint_fast8_t = va_arg (args, /* uint_fast8_t */ int); - #else - ap->a.a_uint_fast8_t = va_arg (args, uint_fast8_t); - #endif - break; - case TYPE_INT_FAST16_T: - #if INT_FAST16_WIDTH < INT_WIDTH - ap->a.a_int_fast16_t = va_arg (args, /* int_fast16_t */ int); - #else - ap->a.a_int_fast16_t = va_arg (args, int_fast16_t); - #endif - break; - case TYPE_UINT_FAST16_T: - #if UINT_FAST16_WIDTH < INT_WIDTH - ap->a.a_uint_fast16_t = va_arg (args, /* uint_fast16_t */ int); - #else - ap->a.a_uint_fast16_t = va_arg (args, uint_fast16_t); - #endif - break; - case TYPE_INT_FAST32_T: - #if INT_FAST32_WIDTH < INT_WIDTH - ap->a.a_int_fast32_t = va_arg (args, /* int_fast32_t */ int); - #else - ap->a.a_int_fast32_t = va_arg (args, int_fast32_t); - #endif - break; - case TYPE_UINT_FAST32_T: - #if UINT_FAST32_WIDTH < INT_WIDTH - ap->a.a_uint_fast32_t = va_arg (args, /* uint_fast32_t */ int); - #else - ap->a.a_uint_fast32_t = va_arg (args, uint_fast32_t); - #endif - break; - case TYPE_INT_FAST64_T: - ap->a.a_int_fast64_t = va_arg (args, int_fast64_t); - break; - case TYPE_UINT_FAST64_T: - ap->a.a_uint_fast64_t = va_arg (args, uint_fast64_t); - break; case TYPE_DOUBLE: ap->a.a_double = va_arg (args, double); break; @@ -235,30 +136,6 @@ case TYPE_COUNT_LONGLONGINT_POINTER: ap->a.a_count_longlongint_pointer = va_arg (args, long long int *); break; - case TYPE_COUNT_INT8_T_POINTER: - ap->a.a_count_int8_t_pointer = va_arg (args, int8_t *); - break; - case TYPE_COUNT_INT16_T_POINTER: - ap->a.a_count_int16_t_pointer = va_arg (args, int16_t *); - break; - case TYPE_COUNT_INT32_T_POINTER: - ap->a.a_count_int32_t_pointer = va_arg (args, int32_t *); - break; - case TYPE_COUNT_INT64_T_POINTER: - ap->a.a_count_int64_t_pointer = va_arg (args, int64_t *); - break; - case TYPE_COUNT_INT_FAST8_T_POINTER: - ap->a.a_count_int_fast8_t_pointer = va_arg (args, int_fast8_t *); - break; - case TYPE_COUNT_INT_FAST16_T_POINTER: - ap->a.a_count_int_fast16_t_pointer = va_arg (args, int_fast16_t *); - break; - case TYPE_COUNT_INT_FAST32_T_POINTER: - ap->a.a_count_int_fast32_t_pointer = va_arg (args, int_fast32_t *); - break; - case TYPE_COUNT_INT_FAST64_T_POINTER: - ap->a.a_count_int_fast64_t_pointer = va_arg (args, int_fast64_t *); - break; #if ENABLE_UNISTDIO /* The unistdio extensions. */ case TYPE_U8_STRING: diff -Nru mmv-2.5/lib/printf-args.h mmv-2.5.1/lib/printf-args.h --- mmv-2.5/lib/printf-args.h 2023-07-20 19:40:23.000000000 +0000 +++ mmv-2.5.1/lib/printf-args.h 2023-08-08 11:02:47.000000000 +0000 @@ -1,19 +1,19 @@ /* Decomposed printf argument list. - Copyright (C) 1999, 2002-2003, 2006-2007, 2011-2023 Free Software + Copyright (C) 1999, 2002-2003, 2006-2007, 2011-2021 Free Software Foundation, Inc. - This file is free software: you can redistribute it and/or modify - it under the terms of the GNU Lesser General Public License as - published by the Free Software Foundation; either version 2.1 of the - License, or (at your option) any later version. + 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 file is distributed in the hope that it will be useful, + 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 Lesser General Public License for more details. + GNU General Public License for more details. - You should have received a copy of the GNU Lesser General Public License - along with this program. If not, see . */ + You should have received a copy of the GNU General Public License along + with this program; if not, see . */ #ifndef _PRINTF_ARGS_H #define _PRINTF_ARGS_H @@ -41,9 +41,6 @@ # include #endif -/* Get intN_t, uintN_t, intN_fast_t, uintN_fast_t. */ -#include - /* Get va_list. */ #include @@ -62,26 +59,6 @@ TYPE_ULONGINT, TYPE_LONGLONGINT, TYPE_ULONGLONGINT, - /* According to ISO C 23 § 7.23.6.1, "all exact-width integer types", - "all minimum-width integer types", and "all fastest minimum-width integer - types" defined in should be supported. But for portability - between platforms, we support only those with N = 8, 16, 32, 64. */ - TYPE_INT8_T, - TYPE_UINT8_T, - TYPE_INT16_T, - TYPE_UINT16_T, - TYPE_INT32_T, - TYPE_UINT32_T, - TYPE_INT64_T, - TYPE_UINT64_T, - TYPE_INT_FAST8_T, - TYPE_UINT_FAST8_T, - TYPE_INT_FAST16_T, - TYPE_UINT_FAST16_T, - TYPE_INT_FAST32_T, - TYPE_UINT_FAST32_T, - TYPE_INT_FAST64_T, - TYPE_UINT_FAST64_T, TYPE_DOUBLE, TYPE_LONGDOUBLE, TYPE_CHAR, @@ -97,15 +74,7 @@ TYPE_COUNT_SHORT_POINTER, TYPE_COUNT_INT_POINTER, TYPE_COUNT_LONGINT_POINTER, - TYPE_COUNT_LONGLONGINT_POINTER, - TYPE_COUNT_INT8_T_POINTER, - TYPE_COUNT_INT16_T_POINTER, - TYPE_COUNT_INT32_T_POINTER, - TYPE_COUNT_INT64_T_POINTER, - TYPE_COUNT_INT_FAST8_T_POINTER, - TYPE_COUNT_INT_FAST16_T_POINTER, - TYPE_COUNT_INT_FAST32_T_POINTER, - TYPE_COUNT_INT_FAST64_T_POINTER + TYPE_COUNT_LONGLONGINT_POINTER #if ENABLE_UNISTDIO /* The unistdio extensions. */ , TYPE_U8_STRING @@ -130,23 +99,7 @@ unsigned long int a_ulongint; long long int a_longlongint; unsigned long long int a_ulonglongint; - int8_t a_int8_t; - uint8_t a_uint8_t; - int16_t a_int16_t; - uint16_t a_uint16_t; - int32_t a_int32_t; - uint32_t a_uint32_t; - int64_t a_int64_t; - uint64_t a_uint64_t; - int_fast8_t a_int_fast8_t; - uint_fast8_t a_uint_fast8_t; - int_fast16_t a_int_fast16_t; - uint_fast16_t a_uint_fast16_t; - int_fast32_t a_int_fast32_t; - uint_fast32_t a_uint_fast32_t; - int_fast64_t a_int_fast64_t; - uint_fast64_t a_uint_fast64_t; - float a_float; /* unused */ + float a_float; double a_double; long double a_longdouble; int a_char; @@ -163,14 +116,6 @@ int * a_count_int_pointer; long int * a_count_longint_pointer; long long int * a_count_longlongint_pointer; - int8_t * a_count_int8_t_pointer; - int16_t * a_count_int16_t_pointer; - int32_t * a_count_int32_t_pointer; - int64_t * a_count_int64_t_pointer; - int_fast8_t * a_count_int_fast8_t_pointer; - int_fast16_t * a_count_int_fast16_t_pointer; - int_fast32_t * a_count_int_fast32_t_pointer; - int_fast64_t * a_count_int_fast64_t_pointer; #if ENABLE_UNISTDIO /* The unistdio extensions. */ const uint8_t * a_u8_string; diff -Nru mmv-2.5/lib/printf-frexp.c mmv-2.5.1/lib/printf-frexp.c --- mmv-2.5/lib/printf-frexp.c 2023-07-20 19:40:23.000000000 +0000 +++ mmv-2.5.1/lib/printf-frexp.c 2023-08-08 11:02:40.000000000 +0000 @@ -1,17 +1,17 @@ /* Split a double into fraction and mantissa, for hexadecimal printf. - Copyright (C) 2007, 2009-2023 Free Software Foundation, Inc. + Copyright (C) 2007, 2009-2021 Free Software Foundation, Inc. - This file is free software: you can redistribute it and/or modify - it under the terms of the GNU Lesser General Public License as - published by the Free Software Foundation; either version 2.1 of the - License, or (at your option) any later version. + 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 of the License, or + (at your option) any later version. - This file is distributed in the hope that it will be useful, + 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 Lesser General Public License for more details. + GNU General Public License for more details. - You should have received a copy of the GNU Lesser General Public License + You should have received a copy of the GNU General Public License along with this program. If not, see . */ #if ! defined USE_LONG_DOUBLE diff -Nru mmv-2.5/lib/printf-frexp.h mmv-2.5.1/lib/printf-frexp.h --- mmv-2.5/lib/printf-frexp.h 2023-07-20 19:40:23.000000000 +0000 +++ mmv-2.5.1/lib/printf-frexp.h 2023-08-08 11:02:40.000000000 +0000 @@ -1,17 +1,17 @@ /* Split a double into fraction and mantissa, for hexadecimal printf. - Copyright (C) 2007, 2009-2023 Free Software Foundation, Inc. + Copyright (C) 2007, 2009-2021 Free Software Foundation, Inc. - This file is free software: you can redistribute it and/or modify - it under the terms of the GNU Lesser General Public License as - published by the Free Software Foundation; either version 2.1 of the - License, or (at your option) any later version. + 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 of the License, or + (at your option) any later version. - This file is distributed in the hope that it will be useful, + 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 Lesser General Public License for more details. + GNU General Public License for more details. - You should have received a copy of the GNU Lesser General Public License + You should have received a copy of the GNU General Public License along with this program. If not, see . */ /* Write a finite, positive number x as diff -Nru mmv-2.5/lib/printf-frexpl.c mmv-2.5.1/lib/printf-frexpl.c --- mmv-2.5/lib/printf-frexpl.c 2023-07-20 19:40:23.000000000 +0000 +++ mmv-2.5.1/lib/printf-frexpl.c 2023-08-08 11:02:40.000000000 +0000 @@ -1,17 +1,17 @@ /* Split a 'long double' into fraction and mantissa, for hexadecimal printf. - Copyright (C) 2007, 2009-2023 Free Software Foundation, Inc. + Copyright (C) 2007, 2009-2021 Free Software Foundation, Inc. - This file is free software: you can redistribute it and/or modify - it under the terms of the GNU Lesser General Public License as - published by the Free Software Foundation; either version 2.1 of the - License, or (at your option) any later version. + 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 of the License, or + (at your option) any later version. - This file is distributed in the hope that it will be useful, + 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 Lesser General Public License for more details. + GNU General Public License for more details. - You should have received a copy of the GNU Lesser General Public License + You should have received a copy of the GNU General Public License along with this program. If not, see . */ #include diff -Nru mmv-2.5/lib/printf-frexpl.h mmv-2.5.1/lib/printf-frexpl.h --- mmv-2.5/lib/printf-frexpl.h 2023-07-20 19:40:23.000000000 +0000 +++ mmv-2.5.1/lib/printf-frexpl.h 2023-08-08 11:02:40.000000000 +0000 @@ -1,17 +1,17 @@ /* Split a 'long double' into fraction and mantissa, for hexadecimal printf. - Copyright (C) 2007, 2009-2023 Free Software Foundation, Inc. + Copyright (C) 2007, 2009-2021 Free Software Foundation, Inc. - This file is free software: you can redistribute it and/or modify - it under the terms of the GNU Lesser General Public License as - published by the Free Software Foundation; either version 2.1 of the - License, or (at your option) any later version. + 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 of the License, or + (at your option) any later version. - This file is distributed in the hope that it will be useful, + 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 Lesser General Public License for more details. + GNU General Public License for more details. - You should have received a copy of the GNU Lesser General Public License + You should have received a copy of the GNU General Public License along with this program. If not, see . */ /* Write a finite, positive number x as diff -Nru mmv-2.5/lib/printf-parse.c mmv-2.5.1/lib/printf-parse.c --- mmv-2.5/lib/printf-parse.c 2023-07-20 19:40:23.000000000 +0000 +++ mmv-2.5.1/lib/printf-parse.c 2023-08-08 11:02:47.000000000 +0000 @@ -1,18 +1,18 @@ /* Formatted output to strings. - Copyright (C) 1999-2000, 2002-2003, 2006-2023 Free Software Foundation, Inc. + Copyright (C) 1999-2000, 2002-2003, 2006-2021 Free Software Foundation, Inc. - This file is free software: you can redistribute it and/or modify - it under the terms of the GNU Lesser General Public License as - published by the Free Software Foundation; either version 2.1 of the - License, or (at your option) any later version. + 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 file is distributed in the hope that it will be useful, + 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 Lesser General Public License for more details. + GNU General Public License for more details. - You should have received a copy of the GNU Lesser General Public License - along with this program. If not, see . */ + You should have received a copy of the GNU General Public License along + with this program; if not, see . */ /* This file can be parametrized with the following macros: CHAR_T The element type of the format string. @@ -48,7 +48,16 @@ #include /* Get intmax_t. */ -#include +#if defined IN_LIBINTL || defined IN_LIBASPRINTF +# if HAVE_STDINT_H_WITH_UINTMAX +# include +# endif +# if HAVE_INTTYPES_H_WITH_UINTMAX +# include +# endif +#else +# include +#endif /* malloc(), realloc(), free(). */ #include @@ -326,317 +335,226 @@ arg_type type; /* Parse argument type/size specifiers. */ - /* Relevant for the conversion characters d, i. */ - arg_type signed_type = TYPE_INT; - /* Relevant for the conversion characters b, o, u, x, X. */ - arg_type unsigned_type = TYPE_UINT; - /* Relevant for the conversion characters n. */ - arg_type pointer_type = TYPE_COUNT_INT_POINTER; - /* Relevant for the conversion characters a, A, e, E, f, F, g, G. */ - arg_type floatingpoint_type = TYPE_DOUBLE; + { + int flags = 0; - if (*cp == 'h') - { - if (cp[1] == 'h') - { - signed_type = TYPE_SCHAR; - unsigned_type = TYPE_UCHAR; - pointer_type = TYPE_COUNT_SCHAR_POINTER; - cp += 2; - } - else - { - signed_type = TYPE_SHORT; - unsigned_type = TYPE_USHORT; - pointer_type = TYPE_COUNT_SHORT_POINTER; - cp++; - } - } - else if (*cp == 'l') - { - if (cp[1] == 'l') - { - signed_type = TYPE_LONGLONGINT; - unsigned_type = TYPE_ULONGLONGINT; - pointer_type = TYPE_COUNT_LONGLONGINT_POINTER; - /* For backward compatibility only. */ - floatingpoint_type = TYPE_LONGDOUBLE; - cp += 2; - } - else - { - signed_type = TYPE_LONGINT; - unsigned_type = TYPE_ULONGINT; - pointer_type = TYPE_COUNT_LONGINT_POINTER; - cp++; - } - } - else if (*cp == 'j') - { - if (sizeof (intmax_t) > sizeof (long)) - { - /* intmax_t = long long */ - signed_type = TYPE_LONGLONGINT; - unsigned_type = TYPE_ULONGLONGINT; - pointer_type = TYPE_COUNT_LONGLONGINT_POINTER; - /* For backward compatibility only. */ - floatingpoint_type = TYPE_LONGDOUBLE; - } - else if (sizeof (intmax_t) > sizeof (int)) - { - /* intmax_t = long */ - signed_type = TYPE_LONGINT; - unsigned_type = TYPE_ULONGINT; - pointer_type = TYPE_COUNT_LONGINT_POINTER; - } - cp++; - } - else if (*cp == 'z' || *cp == 'Z') - { - /* 'z' is standardized in ISO C 99, but glibc uses 'Z' - because the warning facility in gcc-2.95.2 understands - only 'Z' (see gcc-2.95.2/gcc/c-common.c:1784). */ - if (sizeof (size_t) > sizeof (long)) - { - /* size_t = unsigned long long */ - signed_type = TYPE_LONGLONGINT; - unsigned_type = TYPE_ULONGLONGINT; - pointer_type = TYPE_COUNT_LONGLONGINT_POINTER; - /* For backward compatibility only. */ - floatingpoint_type = TYPE_LONGDOUBLE; - } - else if (sizeof (size_t) > sizeof (int)) - { - /* size_t = unsigned long */ - signed_type = TYPE_LONGINT; - unsigned_type = TYPE_ULONGINT; - pointer_type = TYPE_COUNT_LONGINT_POINTER; - } - cp++; - } - else if (*cp == 't') - { - if (sizeof (ptrdiff_t) > sizeof (long)) - { - /* ptrdiff_t = long long */ - signed_type = TYPE_LONGLONGINT; - unsigned_type = TYPE_ULONGLONGINT; - pointer_type = TYPE_COUNT_LONGLONGINT_POINTER; - /* For backward compatibility only. */ - floatingpoint_type = TYPE_LONGDOUBLE; - } - else if (sizeof (ptrdiff_t) > sizeof (int)) - { - /* ptrdiff_t = long */ - signed_type = TYPE_LONGINT; - unsigned_type = TYPE_ULONGINT; - pointer_type = TYPE_COUNT_LONGINT_POINTER; - } - cp++; - } - else if (*cp == 'w') - { - /* wN and wfN are standardized in ISO C 23. */ - if (cp[1] == 'f') - { - if (cp[2] == '8') - { - signed_type = TYPE_INT_FAST8_T; - unsigned_type = TYPE_UINT_FAST8_T; - pointer_type = TYPE_COUNT_INT_FAST8_T_POINTER; - cp += 3; - } - else if (cp[2] == '1' && cp[3] == '6') - { - signed_type = TYPE_INT_FAST16_T; - unsigned_type = TYPE_UINT_FAST16_T; - pointer_type = TYPE_COUNT_INT_FAST16_T_POINTER; - cp += 4; - } - else if (cp[2] == '3' && cp[3] == '2') - { - signed_type = TYPE_INT_FAST32_T; - unsigned_type = TYPE_UINT_FAST32_T; - pointer_type = TYPE_COUNT_INT_FAST32_T_POINTER; - cp += 4; - } - else if (cp[2] == '6' && cp[3] == '4') - { - signed_type = TYPE_INT_FAST64_T; - unsigned_type = TYPE_UINT_FAST64_T; - pointer_type = TYPE_COUNT_INT_FAST64_T_POINTER; - cp += 4; - } - } - else - { - if (cp[1] == '8') - { - signed_type = TYPE_INT8_T; - unsigned_type = TYPE_UINT8_T; - pointer_type = TYPE_COUNT_INT8_T_POINTER; - cp += 2; - } - else if (cp[1] == '1' && cp[2] == '6') - { - signed_type = TYPE_INT16_T; - unsigned_type = TYPE_UINT16_T; - pointer_type = TYPE_COUNT_INT16_T_POINTER; - cp += 3; - } - else if (cp[1] == '3' && cp[2] == '2') - { - signed_type = TYPE_INT32_T; - unsigned_type = TYPE_UINT32_T; - pointer_type = TYPE_COUNT_INT32_T_POINTER; - cp += 3; - } - else if (cp[1] == '6' && cp[2] == '4') - { - signed_type = TYPE_INT64_T; - unsigned_type = TYPE_UINT64_T; - pointer_type = TYPE_COUNT_INT64_T_POINTER; - cp += 3; - } - } - } - else if (*cp == 'L') - { - signed_type = TYPE_LONGLONGINT; - unsigned_type = TYPE_ULONGLONGINT; - pointer_type = TYPE_COUNT_LONGLONGINT_POINTER; - floatingpoint_type = TYPE_LONGDOUBLE; - cp++; - } + for (;;) + { + if (*cp == 'h') + { + flags |= (1 << (flags & 1)); + cp++; + } + else if (*cp == 'L') + { + flags |= 4; + cp++; + } + else if (*cp == 'l') + { + flags += 8; + cp++; + } + else if (*cp == 'j') + { + if (sizeof (intmax_t) > sizeof (long)) + { + /* intmax_t = long long */ + flags += 16; + } + else if (sizeof (intmax_t) > sizeof (int)) + { + /* intmax_t = long */ + flags += 8; + } + cp++; + } + else if (*cp == 'z' || *cp == 'Z') + { + /* 'z' is standardized in ISO C 99, but glibc uses 'Z' + because the warning facility in gcc-2.95.2 understands + only 'Z' (see gcc-2.95.2/gcc/c-common.c:1784). */ + if (sizeof (size_t) > sizeof (long)) + { + /* size_t = long long */ + flags += 16; + } + else if (sizeof (size_t) > sizeof (int)) + { + /* size_t = long */ + flags += 8; + } + cp++; + } + else if (*cp == 't') + { + if (sizeof (ptrdiff_t) > sizeof (long)) + { + /* ptrdiff_t = long long */ + flags += 16; + } + else if (sizeof (ptrdiff_t) > sizeof (int)) + { + /* ptrdiff_t = long */ + flags += 8; + } + cp++; + } #if defined __APPLE__ && defined __MACH__ - /* On Mac OS X 10.3, PRIdMAX is defined as "qd". - We cannot change it to "lld" because PRIdMAX must also - be understood by the system's printf routines. */ - else if (*cp == 'q') - { - if (64 / 8 > sizeof (long)) - { - /* int64_t = long long */ - signed_type = TYPE_LONGLONGINT; - unsigned_type = TYPE_ULONGLONGINT; - pointer_type = TYPE_COUNT_LONGLONGINT_POINTER; - /* For backward compatibility only. */ - floatingpoint_type = TYPE_LONGDOUBLE; - } - else - { - /* int64_t = long */ - signed_type = TYPE_LONGINT; - unsigned_type = TYPE_ULONGINT; - pointer_type = TYPE_COUNT_LONGINT_POINTER; - } - cp++; - } + /* On Mac OS X 10.3, PRIdMAX is defined as "qd". + We cannot change it to "lld" because PRIdMAX must also + be understood by the system's printf routines. */ + else if (*cp == 'q') + { + if (64 / 8 > sizeof (long)) + { + /* int64_t = long long */ + flags += 16; + } + else + { + /* int64_t = long */ + flags += 8; + } + cp++; + } #endif #if defined _WIN32 && ! defined __CYGWIN__ - /* On native Windows, PRIdMAX is defined as "I64d". - We cannot change it to "lld" because PRIdMAX must also - be understood by the system's printf routines. */ - else if (*cp == 'I' && cp[1] == '6' && cp[2] == '4') - { - if (64 / 8 > sizeof (long)) - { - /* __int64_t = long long */ - signed_type = TYPE_LONGLONGINT; - unsigned_type = TYPE_ULONGLONGINT; - pointer_type = TYPE_COUNT_LONGLONGINT_POINTER; - /* For backward compatibility only. */ - floatingpoint_type = TYPE_LONGDOUBLE; - } - else - { - /* __int64_t = long */ - signed_type = TYPE_LONGINT; - unsigned_type = TYPE_ULONGINT; - pointer_type = TYPE_COUNT_LONGINT_POINTER; - } - cp++; - } -#endif - - /* Read the conversion character. */ - c = *cp++; - switch (c) - { - case 'd': case 'i': - type = signed_type; - break; - case 'b': case 'o': case 'u': case 'x': case 'X': - #if SUPPORT_GNU_PRINTF_DIRECTIVES \ - || (__GLIBC__ + (__GLIBC_MINOR__ >= 35) > 2) - case 'B': - #endif - type = unsigned_type; - break; - case 'f': case 'F': case 'e': case 'E': case 'g': case 'G': - case 'a': case 'A': - type = floatingpoint_type; - break; - case 'c': - if (signed_type == TYPE_LONGINT - /* For backward compatibility only. */ - || signed_type == TYPE_LONGLONGINT) + /* On native Windows, PRIdMAX is defined as "I64d". + We cannot change it to "lld" because PRIdMAX must also + be understood by the system's printf routines. */ + else if (*cp == 'I' && cp[1] == '6' && cp[2] == '4') + { + if (64 / 8 > sizeof (long)) + { + /* __int64 = long long */ + flags += 16; + } + else + { + /* __int64 = long */ + flags += 8; + } + cp += 3; + } +#endif + else + break; + } + + /* Read the conversion character. */ + c = *cp++; + switch (c) + { + case 'd': case 'i': + /* If 'long long' is larger than 'long': */ + if (flags >= 16 || (flags & 4)) + type = TYPE_LONGLONGINT; + else + /* If 'long long' is the same as 'long', we parse "lld" into + TYPE_LONGINT. */ + if (flags >= 8) + type = TYPE_LONGINT; + else if (flags & 2) + type = TYPE_SCHAR; + else if (flags & 1) + type = TYPE_SHORT; + else + type = TYPE_INT; + break; + case 'o': case 'u': case 'x': case 'X': + /* If 'unsigned long long' is larger than 'unsigned long': */ + if (flags >= 16 || (flags & 4)) + type = TYPE_ULONGLONGINT; + else + /* If 'unsigned long long' is the same as 'unsigned long', we + parse "llu" into TYPE_ULONGINT. */ + if (flags >= 8) + type = TYPE_ULONGINT; + else if (flags & 2) + type = TYPE_UCHAR; + else if (flags & 1) + type = TYPE_USHORT; + else + type = TYPE_UINT; + break; + case 'f': case 'F': case 'e': case 'E': case 'g': case 'G': + case 'a': case 'A': + if (flags >= 16 || (flags & 4)) + type = TYPE_LONGDOUBLE; + else + type = TYPE_DOUBLE; + break; + case 'c': + if (flags >= 8) #if HAVE_WINT_T - type = TYPE_WIDE_CHAR; + type = TYPE_WIDE_CHAR; #else - goto error; + goto error; #endif - else - type = TYPE_CHAR; - break; + else + type = TYPE_CHAR; + break; #if HAVE_WINT_T - case 'C': - type = TYPE_WIDE_CHAR; - c = 'c'; - break; + case 'C': + type = TYPE_WIDE_CHAR; + c = 'c'; + break; #endif - case 's': - if (signed_type == TYPE_LONGINT - /* For backward compatibility only. */ - || signed_type == TYPE_LONGLONGINT) + case 's': + if (flags >= 8) #if HAVE_WCHAR_T - type = TYPE_WIDE_STRING; + type = TYPE_WIDE_STRING; #else - goto error; + goto error; #endif - else - type = TYPE_STRING; - break; + else + type = TYPE_STRING; + break; #if HAVE_WCHAR_T - case 'S': - type = TYPE_WIDE_STRING; - c = 's'; - break; + case 'S': + type = TYPE_WIDE_STRING; + c = 's'; + break; #endif - case 'p': - type = TYPE_POINTER; - break; - case 'n': - type = pointer_type; - break; + case 'p': + type = TYPE_POINTER; + break; + case 'n': + /* If 'long long' is larger than 'long': */ + if (flags >= 16 || (flags & 4)) + type = TYPE_COUNT_LONGLONGINT_POINTER; + else + /* If 'long long' is the same as 'long', we parse "lln" into + TYPE_COUNT_LONGINT_POINTER. */ + if (flags >= 8) + type = TYPE_COUNT_LONGINT_POINTER; + else if (flags & 2) + type = TYPE_COUNT_SCHAR_POINTER; + else if (flags & 1) + type = TYPE_COUNT_SHORT_POINTER; + else + type = TYPE_COUNT_INT_POINTER; + break; #if ENABLE_UNISTDIO - /* The unistdio extensions. */ - case 'U': - if (signed_type == TYPE_LONGLONGINT) - type = TYPE_U32_STRING; - else if (signed_type == TYPE_LONGINT) - type = TYPE_U16_STRING; - else - type = TYPE_U8_STRING; - break; -#endif - case '%': - type = TYPE_NONE; - break; - default: - /* Unknown conversion character. */ - goto error; - } + /* The unistdio extensions. */ + case 'U': + if (flags >= 16) + type = TYPE_U32_STRING; + else if (flags >= 8) + type = TYPE_U16_STRING; + else + type = TYPE_U8_STRING; + break; +#endif + case '%': + type = TYPE_NONE; + break; + default: + /* Unknown conversion character. */ + goto error; + } + } if (type != TYPE_NONE) { diff -Nru mmv-2.5/lib/printf-parse.h mmv-2.5.1/lib/printf-parse.h --- mmv-2.5/lib/printf-parse.h 2023-07-20 19:40:23.000000000 +0000 +++ mmv-2.5.1/lib/printf-parse.h 2023-08-08 11:02:47.000000000 +0000 @@ -1,19 +1,19 @@ /* Parse printf format string. - Copyright (C) 1999, 2002-2003, 2005, 2007, 2010-2023 Free Software + Copyright (C) 1999, 2002-2003, 2005, 2007, 2010-2021 Free Software Foundation, Inc. - This file is free software: you can redistribute it and/or modify - it under the terms of the GNU Lesser General Public License as - published by the Free Software Foundation; either version 2.1 of the - License, or (at your option) any later version. + 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 file is distributed in the hope that it will be useful, + 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 Lesser General Public License for more details. + GNU General Public License for more details. - You should have received a copy of the GNU Lesser General Public License - along with this program. If not, see . */ + You should have received a copy of the GNU General Public License along + with this program; if not, see . */ #ifndef _PRINTF_PARSE_H #define _PRINTF_PARSE_H @@ -61,7 +61,7 @@ const char* precision_start; const char* precision_end; size_t precision_arg_index; - char conversion; /* d i b B o u x X f F e E g G a A c s p n U % but not C S */ + char conversion; /* d i o u x X f F e E g G a A c s p n U % but not C S */ size_t arg_index; } char_directive; @@ -91,7 +91,7 @@ const uint8_t* precision_start; const uint8_t* precision_end; size_t precision_arg_index; - uint8_t conversion; /* d i b B o u x X f F e E g G a A c s p n U % but not C S */ + uint8_t conversion; /* d i o u x X f F e E g G a A c s p n U % but not C S */ size_t arg_index; } u8_directive; @@ -119,7 +119,7 @@ const uint16_t* precision_start; const uint16_t* precision_end; size_t precision_arg_index; - uint16_t conversion; /* d i b B o u x X f F e E g G a A c s p n U % but not C S */ + uint16_t conversion; /* d i o u x X f F e E g G a A c s p n U % but not C S */ size_t arg_index; } u16_directive; @@ -147,7 +147,7 @@ const uint32_t* precision_start; const uint32_t* precision_end; size_t precision_arg_index; - uint32_t conversion; /* d i b B o u x X f F e E g G a A c s p n U % but not C S */ + uint32_t conversion; /* d i o u x X f F e E g G a A c s p n U % but not C S */ size_t arg_index; } u32_directive; diff -Nru mmv-2.5/lib/progname.c mmv-2.5.1/lib/progname.c --- mmv-2.5/lib/progname.c 2023-07-20 19:40:23.000000000 +0000 +++ mmv-2.5.1/lib/progname.c 2023-08-08 11:02:40.000000000 +0000 @@ -1,10 +1,10 @@ /* Program name management. - Copyright (C) 2001-2003, 2005-2023 Free Software Foundation, Inc. + Copyright (C) 2001-2003, 2005-2021 Free Software Foundation, Inc. Written by Bruno Haible , 2001. 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 of the License, or + the Free Software Foundation; either version 3 of the License, or (at your option) any later version. This program is distributed in the hope that it will be useful, diff -Nru mmv-2.5/lib/progname.h mmv-2.5.1/lib/progname.h --- mmv-2.5/lib/progname.h 2023-07-20 19:40:23.000000000 +0000 +++ mmv-2.5.1/lib/progname.h 2023-08-08 11:02:40.000000000 +0000 @@ -1,10 +1,10 @@ /* Program name management. - Copyright (C) 2001-2004, 2006, 2009-2023 Free Software Foundation, Inc. + Copyright (C) 2001-2004, 2006, 2009-2021 Free Software Foundation, Inc. Written by Bruno Haible , 2001. 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 of the License, or + the Free Software Foundation; either version 3 of the License, or (at your option) any later version. This program is distributed in the hope that it will be useful, diff -Nru mmv-2.5/lib/raise.c mmv-2.5.1/lib/raise.c --- mmv-2.5/lib/raise.c 2023-07-20 19:40:23.000000000 +0000 +++ mmv-2.5.1/lib/raise.c 2023-08-08 11:02:40.000000000 +0000 @@ -1,18 +1,18 @@ /* Provide a non-threads replacement for the POSIX raise function. - Copyright (C) 2002-2003, 2005-2006, 2009-2023 Free Software Foundation, Inc. + Copyright (C) 2002-2003, 2005-2006, 2009-2021 Free Software Foundation, Inc. - This file is free software: you can redistribute it and/or modify - it under the terms of the GNU Lesser General Public License as - published by the Free Software Foundation; either version 2.1 of the - License, or (at your option) any later version. + 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 of the License, or + (at your option) any later version. - This file is distributed in the hope that it will be useful, + 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 Lesser General Public License for more details. + GNU General Public License for more details. - You should have received a copy of the GNU Lesser General Public License + You should have received a copy of the GNU General Public License along with this program. If not, see . */ /* written by Jim Meyering and Bruno Haible */ diff -Nru mmv-2.5/lib/rawmemchr.c mmv-2.5.1/lib/rawmemchr.c --- mmv-2.5/lib/rawmemchr.c 2023-07-20 19:40:23.000000000 +0000 +++ mmv-2.5.1/lib/rawmemchr.c 2023-08-08 11:02:40.000000000 +0000 @@ -1,17 +1,17 @@ /* Searching in a string. - Copyright (C) 2008-2023 Free Software Foundation, Inc. + Copyright (C) 2008-2021 Free Software Foundation, Inc. - This file is free software: you can redistribute it and/or modify - it under the terms of the GNU Lesser General Public License as - published by the Free Software Foundation; either version 2.1 of the - License, or (at your option) any later version. + 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 of the License, or + (at your option) any later version. - This file is distributed in the hope that it will be useful, + 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 Lesser General Public License for more details. + GNU General Public License for more details. - You should have received a copy of the GNU Lesser General Public License + You should have received a copy of the GNU General Public License along with this program. If not, see . */ #include @@ -22,52 +22,68 @@ /* A function definition is only needed if HAVE_RAWMEMCHR is not defined. */ #if !HAVE_RAWMEMCHR -# include -# include - - /* Find the first occurrence of C in S. */ void * rawmemchr (const void *s, int c_in) { - /* Change this typedef to experiment with performance. */ - typedef uintptr_t longword; - /* If you change the "uintptr_t", you should change UINTPTR_WIDTH to match. - This verifies that the type does not have padding bits. */ - static_assert (UINTPTR_WIDTH == UCHAR_WIDTH * sizeof (longword)); + /* On 32-bit hardware, choosing longword to be a 32-bit unsigned + long instead of a 64-bit uintmax_t tends to give better + performance. On 64-bit hardware, unsigned long is generally 64 + bits already. Change this typedef to experiment with + performance. */ + typedef unsigned long int longword; const unsigned char *char_ptr; - unsigned char c = c_in; + const longword *longword_ptr; + longword repeated_one; + longword repeated_c; + unsigned char c; + + c = (unsigned char) c_in; /* Handle the first few bytes by reading one byte at a time. Do this until CHAR_PTR is aligned on a longword boundary. */ for (char_ptr = (const unsigned char *) s; - (uintptr_t) char_ptr % alignof (longword) != 0; + (size_t) char_ptr % sizeof (longword) != 0; ++char_ptr) if (*char_ptr == c) return (void *) char_ptr; - longword const *longword_ptr = s = char_ptr; + longword_ptr = (const longword *) char_ptr; + + /* All these elucidatory comments refer to 4-byte longwords, + but the theory applies equally well to any size longwords. */ /* Compute auxiliary longword values: repeated_one is a value which has a 1 in every byte. repeated_c has c in every byte. */ - longword repeated_one = (longword) -1 / UCHAR_MAX; - longword repeated_c = repeated_one * c; - longword repeated_hibit = repeated_one * (UCHAR_MAX / 2 + 1); + repeated_one = 0x01010101; + repeated_c = c | (c << 8); + repeated_c |= repeated_c << 16; + if (0xffffffffU < (longword) -1) + { + repeated_one |= repeated_one << 31 << 1; + repeated_c |= repeated_c << 31 << 1; + if (8 < sizeof (longword)) + { + size_t i; + + for (i = 64; i < sizeof (longword) * 8; i *= 2) + { + repeated_one |= repeated_one << i; + repeated_c |= repeated_c << i; + } + } + } /* Instead of the traditional loop which tests each byte, we will - test a longword at a time. The tricky part is testing if any of - the bytes in the longword in question are equal to + test a longword at a time. The tricky part is testing if *any of + the four* bytes in the longword in question are equal to NUL or c. We first use an xor with repeated_c. This reduces the task - to testing whether any of the bytes in longword1 is zero. - - (The following comments assume 8-bit bytes, as POSIX requires; - the code's use of UCHAR_MAX should work even if bytes have more - than 8 bits.) + to testing whether *any of the four* bytes in longword1 is zero. We compute tmp = - ((longword1 - repeated_one) & ~longword1) & (repeated_one * 0x80). + ((longword1 - repeated_one) & ~longword1) & (repeated_one << 7). That is, we perform the following operations: 1. Subtract repeated_one. 2. & ~longword1. @@ -101,20 +117,22 @@ { longword longword1 = *longword_ptr ^ repeated_c; - if ((((longword1 - repeated_one) & ~longword1) & repeated_hibit) != 0) + if ((((longword1 - repeated_one) & ~longword1) + & (repeated_one << 7)) != 0) break; longword_ptr++; } - char_ptr = s = longword_ptr; + char_ptr = (const unsigned char *) longword_ptr; /* At this point, we know that one of the sizeof (longword) bytes - starting at char_ptr is == c. If we knew endianness, we + starting at char_ptr is == c. On little-endian machines, we could determine the first such byte without any further memory accesses, just by looking at the tmp result from the last loop - iteration. However, the following simple and portable code does - not attempt this potential optimization. */ + iteration. But this does not work on big-endian machines. + Choose code that works in both cases. */ + char_ptr = (unsigned char *) longword_ptr; while (*char_ptr != c) char_ptr++; return (void *) char_ptr; diff -Nru mmv-2.5/lib/rawmemchr.valgrind mmv-2.5.1/lib/rawmemchr.valgrind --- mmv-2.5/lib/rawmemchr.valgrind 2023-07-20 19:40:23.000000000 +0000 +++ mmv-2.5.1/lib/rawmemchr.valgrind 2023-08-08 11:02:40.000000000 +0000 @@ -1,18 +1,18 @@ # Suppress a valgrind message about use of uninitialized memory in rawmemchr(). -# Copyright (C) 2008-2023 Free Software Foundation, Inc. +# Copyright (C) 2008-2021 Free Software Foundation, Inc. # -# This file is free software: you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License as -# published by the Free Software Foundation; either version 2.1 of the -# License, or (at your option) any later version. +# 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 of the License, or +# (at your option) any later version. # -# This file is distributed in the hope that it will be useful, +# 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 Lesser General Public License for more details. +# GNU General Public License for more details. # -# You should have received a copy of the GNU Lesser General Public License +# You should have received a copy of the GNU General Public License # along with this program. If not, see . # This use is OK because it provides only a speedup. diff -Nru mmv-2.5/lib/read.c mmv-2.5.1/lib/read.c --- mmv-2.5/lib/read.c 2023-07-20 19:40:23.000000000 +0000 +++ mmv-2.5.1/lib/read.c 2023-08-08 11:02:40.000000000 +0000 @@ -1,18 +1,18 @@ /* POSIX compatible read() function. - Copyright (C) 2008-2023 Free Software Foundation, Inc. + Copyright (C) 2008-2021 Free Software Foundation, Inc. Written by Bruno Haible , 2011. - This file is free software: you can redistribute it and/or modify - it under the terms of the GNU Lesser General Public License as - published by the Free Software Foundation; either version 2.1 of the - License, or (at your option) any later version. + 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 of the License, or + (at your option) any later version. - This file is distributed in the hope that it will be useful, + 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 Lesser General Public License for more details. + GNU General Public License for more details. - You should have received a copy of the GNU Lesser General Public License + You should have received a copy of the GNU General Public License along with this program. If not, see . */ #include diff -Nru mmv-2.5/lib/readlink.c mmv-2.5.1/lib/readlink.c --- mmv-2.5/lib/readlink.c 2023-07-20 19:40:23.000000000 +0000 +++ mmv-2.5.1/lib/readlink.c 2023-08-08 11:02:40.000000000 +0000 @@ -1,17 +1,17 @@ /* Read the contents of a symbolic link. - Copyright (C) 2003-2007, 2009-2023 Free Software Foundation, Inc. + Copyright (C) 2003-2007, 2009-2021 Free Software Foundation, Inc. - This file is free software: you can redistribute it and/or modify - it under the terms of the GNU Lesser General Public License as - published by the Free Software Foundation; either version 2.1 of the - License, or (at your option) any later version. + 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 of the License, or + (at your option) any later version. - This file is distributed in the hope that it will be useful, + 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 Lesser General Public License for more details. + GNU General Public License for more details. - You should have received a copy of the GNU Lesser General Public License + You should have received a copy of the GNU General Public License along with this program. If not, see . */ #include @@ -29,8 +29,8 @@ such as DJGPP 2.03 and mingw32. */ ssize_t -readlink (char const *file, _GL_UNUSED char *buf, - _GL_UNUSED size_t bufsize) +readlink (char const *file, char *buf _GL_UNUSED, + size_t bufsize _GL_UNUSED) { struct stat statbuf; diff -Nru mmv-2.5/lib/realloc.c mmv-2.5.1/lib/realloc.c --- mmv-2.5/lib/realloc.c 2023-07-20 19:40:23.000000000 +0000 +++ mmv-2.5.1/lib/realloc.c 2023-08-08 11:02:40.000000000 +0000 @@ -1,63 +1,85 @@ /* realloc() function that is glibc compatible. - Copyright (C) 1997, 2003-2004, 2006-2007, 2009-2023 Free Software + Copyright (C) 1997, 2003-2004, 2006-2007, 2009-2021 Free Software Foundation, Inc. - This file is free software: you can redistribute it and/or modify - it under the terms of the GNU Lesser General Public License as - published by the Free Software Foundation; either version 2.1 of the - License, or (at your option) any later version. + 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 of the License, or + (at your option) any later version. - This file is distributed in the hope that it will be useful, + 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 Lesser General Public License for more details. + GNU General Public License for more details. - You should have received a copy of the GNU Lesser General Public License + You should have received a copy of the GNU General Public License along with this program. If not, see . */ /* written by Jim Meyering and Bruno Haible */ +#define _GL_USE_STDLIB_ALLOC 1 #include -#include +/* Only the AC_FUNC_REALLOC macro defines 'realloc' already in config.h. */ +#ifdef realloc +# define NEED_REALLOC_GNU 1 +/* Whereas the gnulib module 'realloc-gnu' defines HAVE_REALLOC_GNU. */ +#elif GNULIB_REALLOC_GNU && !HAVE_REALLOC_GNU +# define NEED_REALLOC_GNU 1 +#endif + +/* Infer the properties of the system's malloc function. + The gnulib module 'malloc-gnu' defines HAVE_MALLOC_GNU. */ +#if GNULIB_MALLOC_GNU && HAVE_MALLOC_GNU +# define SYSTEM_MALLOC_GLIBC_COMPATIBLE 1 +#endif -#include +#include -#include "xalloc-oversized.h" +/* A function definition is only needed if NEED_REALLOC_GNU is defined above + or if the module 'realloc-posix' requests it. */ +#if NEED_REALLOC_GNU || (GNULIB_REALLOC_POSIX && !HAVE_REALLOC_POSIX) -/* Call the system's realloc below. This file does not define - _GL_USE_STDLIB_ALLOC because it needs Gnulib's malloc if present. */ -#undef realloc +# include /* Change the size of an allocated block of memory P to N bytes, - with error checking. If P is NULL, use malloc. Otherwise if N is zero, - free P and return NULL. */ + with error checking. If N is zero, change it to 1. If P is NULL, + use malloc. */ void * rpl_realloc (void *p, size_t n) { - if (p == NULL) - return malloc (n); + void *result; +# if NEED_REALLOC_GNU if (n == 0) { + n = 1; + + /* In theory realloc might fail, so don't rely on it to free. */ free (p); - return NULL; + p = NULL; } +# endif - if (xalloc_oversized (n, 1)) + if (p == NULL) { - errno = ENOMEM; - return NULL; +# if GNULIB_REALLOC_GNU && !NEED_REALLOC_GNU && !SYSTEM_MALLOC_GLIBC_COMPATIBLE + if (n == 0) + n = 1; +# endif + result = malloc (n); } + else + result = realloc (p, n); - void *result = realloc (p, n); - -#if !HAVE_MALLOC_POSIX +# if !HAVE_REALLOC_POSIX if (result == NULL) errno = ENOMEM; -#endif +# endif return result; } + +#endif diff -Nru mmv-2.5/lib/reallocarray.c mmv-2.5.1/lib/reallocarray.c --- mmv-2.5/lib/reallocarray.c 2023-07-20 19:40:23.000000000 +0000 +++ mmv-2.5.1/lib/reallocarray.c 1970-01-01 00:00:00.000000000 +0000 @@ -1,38 +0,0 @@ -/* reallocarray function that is glibc compatible. - - Copyright (C) 2017-2023 Free Software Foundation, Inc. - - This file is free software: you can redistribute it and/or modify - it under the terms of the GNU Lesser General Public License as - published by the Free Software Foundation; either version 2.1 of the - License, or (at your option) any later version. - - This file 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 Lesser General Public License for more details. - - You should have received a copy of the GNU Lesser General Public License - along with this program. If not, see . */ - -/* written by Darshit Shah */ - -#include - -#include -#include -#include - -void * -reallocarray (void *ptr, size_t nmemb, size_t size) -{ - size_t nbytes; - if (ckd_mul (&nbytes, nmemb, size)) - { - errno = ENOMEM; - return NULL; - } - - /* Rely on the semantics of GNU realloc. */ - return realloc (ptr, nbytes); -} diff -Nru mmv-2.5/lib/rename.c mmv-2.5.1/lib/rename.c --- mmv-2.5/lib/rename.c 2023-07-20 19:40:24.000000000 +0000 +++ mmv-2.5.1/lib/rename.c 2023-08-08 11:02:40.000000000 +0000 @@ -1,18 +1,18 @@ /* Work around rename bugs in some systems. - Copyright (C) 2001-2003, 2005-2006, 2009-2023 Free Software Foundation, Inc. + Copyright (C) 2001-2003, 2005-2006, 2009-2021 Free Software Foundation, Inc. - This file is free software: you can redistribute it and/or modify - it under the terms of the GNU Lesser General Public License as - published by the Free Software Foundation; either version 2.1 of the - License, or (at your option) any later version. + 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 of the License, or + (at your option) any later version. - This file is distributed in the hope that it will be useful, + 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 Lesser General Public License for more details. + GNU General Public License for more details. - You should have received a copy of the GNU Lesser General Public License + You should have received a copy of the GNU General Public License along with this program. If not, see . */ /* Written by Volker Borchert, Eric Blake. */ @@ -29,6 +29,7 @@ existing files. */ # include +# include # include # include # include @@ -164,8 +165,10 @@ } if (rmdir (dst)) { + error = errno; free (src_temp); free (dst_temp); + errno = error; return -1; } free (src_temp); @@ -286,7 +289,7 @@ char *dst_temp = (char *) dst; bool src_slash; bool dst_slash; - _GL_UNUSED bool dst_exists; + bool dst_exists _GL_UNUSED; int ret_val = -1; int rename_errno = ENOTDIR; struct stat src_st; diff -Nru mmv-2.5/lib/rmdir.c mmv-2.5.1/lib/rmdir.c --- mmv-2.5/lib/rmdir.c 2023-07-20 19:40:23.000000000 +0000 +++ mmv-2.5.1/lib/rmdir.c 2023-08-08 11:02:40.000000000 +0000 @@ -1,19 +1,19 @@ /* Work around rmdir bugs. - Copyright (C) 1988, 1990, 1999, 2003-2006, 2009-2023 Free Software + Copyright (C) 1988, 1990, 1999, 2003-2006, 2009-2021 Free Software Foundation, Inc. - This file is free software: you can redistribute it and/or modify - it under the terms of the GNU Lesser General Public License as - published by the Free Software Foundation; either version 2.1 of the - License, or (at your option) any later version. + 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 of the License, or + (at your option) any later version. - This file is distributed in the hope that it will be useful, + 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 Lesser General Public License for more details. + GNU General Public License for more details. - You should have received a copy of the GNU Lesser General Public License + You should have received a copy of the GNU General Public License along with this program. If not, see . */ #include diff -Nru mmv-2.5/lib/same-inode.h mmv-2.5.1/lib/same-inode.h --- mmv-2.5/lib/same-inode.h 2023-07-20 19:40:23.000000000 +0000 +++ mmv-2.5.1/lib/same-inode.h 2023-08-08 11:02:40.000000000 +0000 @@ -1,18 +1,18 @@ /* Determine whether two stat buffers are known to refer to the same file. - Copyright (C) 2006, 2009-2023 Free Software Foundation, Inc. + Copyright (C) 2006, 2009-2021 Free Software Foundation, Inc. - This file is free software: you can redistribute it and/or modify - it under the terms of the GNU Lesser General Public License as - published by the Free Software Foundation; either version 2.1 of the - License, or (at your option) any later version. + 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 of the License, or + (at your option) any later version. - This file is distributed in the hope that it will be useful, + 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 Lesser General Public License for more details. + GNU General Public License for more details. - You should have received a copy of the GNU Lesser General Public License + You should have received a copy of the GNU General Public License along with this program. If not, see . */ #ifndef SAME_INODE_H diff -Nru mmv-2.5/lib/scratch_buffer.h mmv-2.5.1/lib/scratch_buffer.h --- mmv-2.5/lib/scratch_buffer.h 2023-07-20 19:40:23.000000000 +0000 +++ mmv-2.5.1/lib/scratch_buffer.h 2023-08-08 11:02:40.000000000 +0000 @@ -1,17 +1,17 @@ /* Variable-sized buffer with on-stack default allocation. - Copyright (C) 2017-2023 Free Software Foundation, Inc. + Copyright (C) 2017-2021 Free Software Foundation, Inc. - This file is free software: you can redistribute it and/or modify - it under the terms of the GNU Lesser General Public License as - published by the Free Software Foundation; either version 2.1 of the - License, or (at your option) any later version. + 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 of the License, or + (at your option) any later version. - This file is distributed in the hope that it will be useful, + 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 Lesser General Public License for more details. + GNU General Public License for more details. - You should have received a copy of the GNU Lesser General Public License + You should have received a copy of the GNU General Public License along with this program. If not, see . */ /* Written by Paul Eggert, 2017. */ @@ -98,20 +98,26 @@ size_t nelem, size_t size); #endif +/* Return a copy of *BUFFER's first SIZE bytes as a heap-allocated block, + deallocating *BUFFER if it was heap-allocated. SIZE must be at + most *BUFFER's size. Return NULL (setting errno) on memory + exhaustion. */ +#if 0 +extern void *scratch_buffer_dupfree (struct scratch_buffer *buffer, + size_t size); +#endif + /* The implementation is imported from glibc. */ +#include + /* Avoid possible conflicts with symbols exported by the GNU libc. */ +#define __libc_scratch_buffer_dupfree gl_scratch_buffer_dupfree #define __libc_scratch_buffer_grow gl_scratch_buffer_grow #define __libc_scratch_buffer_grow_preserve gl_scratch_buffer_grow_preserve #define __libc_scratch_buffer_set_array_size gl_scratch_buffer_set_array_size -#ifndef _GL_LIKELY -/* Rely on __builtin_expect, as provided by the module 'builtin-expect'. */ -# define _GL_LIKELY(cond) __builtin_expect ((cond), 1) -# define _GL_UNLIKELY(cond) __builtin_expect ((cond), 0) -#endif - -#include +#include #endif /* _GL_SCRATCH_BUFFER_H */ diff -Nru mmv-2.5/lib/signal.in.h mmv-2.5.1/lib/signal.in.h --- mmv-2.5/lib/signal.in.h 2023-07-20 19:40:23.000000000 +0000 +++ mmv-2.5.1/lib/signal.in.h 2023-08-08 11:02:40.000000000 +0000 @@ -1,18 +1,18 @@ /* A GNU-like . - Copyright (C) 2006-2023 Free Software Foundation, Inc. + Copyright (C) 2006-2021 Free Software Foundation, Inc. - This file is free software: you can redistribute it and/or modify - it under the terms of the GNU Lesser General Public License as - published by the Free Software Foundation; either version 2.1 of the - License, or (at your option) any later version. + 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 of the License, or + (at your option) any later version. - This file is distributed in the hope that it will be useful, + 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 Lesser General Public License for more details. + GNU General Public License for more details. - You should have received a copy of the GNU Lesser General Public License + You should have received a copy of the GNU General Public License along with this program. If not, see . */ #if __GNUC__ >= 3 @@ -55,26 +55,13 @@ #ifndef _@GUARD_PREFIX@_SIGNAL_H #define _@GUARD_PREFIX@_SIGNAL_H -/* This file uses GNULIB_POSIXCHECK, HAVE_RAW_DECL_*. */ -#if !_GL_CONFIG_H_INCLUDED - #error "Please include config.h first." -#endif - -/* For testing the OpenBSD version. */ -#if (@GNULIB_PTHREAD_SIGMASK@ || defined GNULIB_POSIXCHECK) \ - && defined __OpenBSD__ -# include -#endif - -/* Mac OS X 10.3, FreeBSD < 8.0, OpenBSD < 5.1, OSF/1 4.0, Solaris 2.6, Android, +/* Mac OS X 10.3, FreeBSD 6.4, OpenBSD 3.8, OSF/1 4.0, Solaris 2.6, Android, OS/2 kLIBC declare pthread_sigmask in , not in . But avoid namespace pollution on glibc systems.*/ #if (@GNULIB_PTHREAD_SIGMASK@ || defined GNULIB_POSIXCHECK) \ && ((defined __APPLE__ && defined __MACH__) \ - || (defined __FreeBSD__ && __FreeBSD__ < 8) \ - || (defined __OpenBSD__ && OpenBSD < 201205) \ - || defined __osf__ || defined __sun || defined __ANDROID__ \ - || defined __KLIBC__) \ + || defined __FreeBSD__ || defined __OpenBSD__ || defined __osf__ \ + || defined __sun || defined __ANDROID__ || defined __KLIBC__) \ && ! defined __GLIBC__ # include #endif diff -Nru mmv-2.5/lib/signbitd.c mmv-2.5.1/lib/signbitd.c --- mmv-2.5/lib/signbitd.c 2023-07-20 19:40:23.000000000 +0000 +++ mmv-2.5.1/lib/signbitd.c 2023-08-08 11:02:40.000000000 +0000 @@ -1,17 +1,17 @@ /* signbit() macro: Determine the sign bit of a floating-point number. - Copyright (C) 2007-2023 Free Software Foundation, Inc. + Copyright (C) 2007-2021 Free Software Foundation, Inc. - This file is free software: you can redistribute it and/or modify - it under the terms of the GNU Lesser General Public License as - published by the Free Software Foundation; either version 2.1 of the - License, or (at your option) any later version. + 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 of the License, or + (at your option) any later version. - This file is distributed in the hope that it will be useful, + 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 Lesser General Public License for more details. + GNU General Public License for more details. - You should have received a copy of the GNU Lesser General Public License + You should have received a copy of the GNU General Public License along with this program. If not, see . */ #include diff -Nru mmv-2.5/lib/signbitf.c mmv-2.5.1/lib/signbitf.c --- mmv-2.5/lib/signbitf.c 2023-07-20 19:40:23.000000000 +0000 +++ mmv-2.5.1/lib/signbitf.c 2023-08-08 11:02:40.000000000 +0000 @@ -1,17 +1,17 @@ /* signbit() macro: Determine the sign bit of a floating-point number. - Copyright (C) 2007, 2009-2023 Free Software Foundation, Inc. + Copyright (C) 2007, 2009-2021 Free Software Foundation, Inc. - This file is free software: you can redistribute it and/or modify - it under the terms of the GNU Lesser General Public License as - published by the Free Software Foundation; either version 2.1 of the - License, or (at your option) any later version. + 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 of the License, or + (at your option) any later version. - This file is distributed in the hope that it will be useful, + 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 Lesser General Public License for more details. + GNU General Public License for more details. - You should have received a copy of the GNU Lesser General Public License + You should have received a copy of the GNU General Public License along with this program. If not, see . */ #include diff -Nru mmv-2.5/lib/signbitl.c mmv-2.5.1/lib/signbitl.c --- mmv-2.5/lib/signbitl.c 2023-07-20 19:40:23.000000000 +0000 +++ mmv-2.5.1/lib/signbitl.c 2023-08-08 11:02:40.000000000 +0000 @@ -1,17 +1,17 @@ /* signbit() macro: Determine the sign bit of a floating-point number. - Copyright (C) 2007, 2009-2023 Free Software Foundation, Inc. + Copyright (C) 2007, 2009-2021 Free Software Foundation, Inc. - This file is free software: you can redistribute it and/or modify - it under the terms of the GNU Lesser General Public License as - published by the Free Software Foundation; either version 2.1 of the - License, or (at your option) any later version. + 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 of the License, or + (at your option) any later version. - This file is distributed in the hope that it will be useful, + 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 Lesser General Public License for more details. + GNU General Public License for more details. - You should have received a copy of the GNU Lesser General Public License + You should have received a copy of the GNU General Public License along with this program. If not, see . */ #include diff -Nru mmv-2.5/lib/size_max.h mmv-2.5.1/lib/size_max.h --- mmv-2.5/lib/size_max.h 2023-07-20 19:40:23.000000000 +0000 +++ mmv-2.5.1/lib/size_max.h 2023-08-08 11:02:47.000000000 +0000 @@ -1,28 +1,23 @@ /* size_max.h -- declare SIZE_MAX through system headers - Copyright (C) 2005-2006, 2009-2023 Free Software Foundation, Inc. + Copyright (C) 2005-2006, 2009-2021 Free Software Foundation, Inc. Written by Simon Josefsson. - This file is free software: you can redistribute it and/or modify - it under the terms of the GNU Lesser General Public License as - published by the Free Software Foundation; either version 2.1 of the - License, or (at your option) any later version. + 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 file is distributed in the hope that it will be useful, + 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 Lesser General Public License for more details. + GNU General Public License for more details. - You should have received a copy of the GNU Lesser General Public License - along with this program. If not, see . */ + You should have received a copy of the GNU General Public License + along with this program; if not, see . */ #ifndef GNULIB_SIZE_MAX_H #define GNULIB_SIZE_MAX_H -/* This file uses HAVE_STDINT_H. */ -#if !_GL_CONFIG_H_INCLUDED - #error "Please include config.h first." -#endif - /* Get SIZE_MAX declaration on systems like Solaris 7/8/9. */ # include /* Get SIZE_MAX declaration on systems like glibc 2. */ diff -Nru mmv-2.5/lib/sprintf.c mmv-2.5.1/lib/sprintf.c --- mmv-2.5/lib/sprintf.c 2023-07-20 19:40:23.000000000 +0000 +++ mmv-2.5.1/lib/sprintf.c 2023-08-08 11:02:40.000000000 +0000 @@ -1,17 +1,17 @@ /* Formatted output to strings. - Copyright (C) 2004, 2006-2023 Free Software Foundation, Inc. + Copyright (C) 2004, 2006-2021 Free Software Foundation, Inc. - This file is free software: you can redistribute it and/or modify - it under the terms of the GNU Lesser General Public License as - published by the Free Software Foundation, either version 3 of the - License, or (at your option) any later version. + 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 of the License, or + (at your option) any later version. - This file is distributed in the hope that it will be useful, + 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 Lesser General Public License for more details. + GNU General Public License for more details. - You should have received a copy of the GNU Lesser General Public License + You should have received a copy of the GNU General Public License along with this program. If not, see . */ #ifdef HAVE_CONFIG_H diff -Nru mmv-2.5/lib/stat-time.c mmv-2.5.1/lib/stat-time.c --- mmv-2.5/lib/stat-time.c 2023-07-20 19:40:23.000000000 +0000 +++ mmv-2.5.1/lib/stat-time.c 2023-08-08 11:02:40.000000000 +0000 @@ -1,21 +1,3 @@ -/* stat-related time functions. - - Copyright (C) 2012-2023 Free Software Foundation, Inc. - - This file is free software: you can redistribute it and/or modify - it under the terms of the GNU Lesser General Public License as - published by the Free Software Foundation; either version 2.1 of the - License, or (at your option) any later version. - - This file 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 Lesser General Public License for more details. - - You should have received a copy of the GNU Lesser General Public License - along with this program. If not, see . */ - #include - #define _GL_STAT_TIME_INLINE _GL_EXTERN_INLINE #include "stat-time.h" diff -Nru mmv-2.5/lib/stat-time.h mmv-2.5.1/lib/stat-time.h --- mmv-2.5/lib/stat-time.h 2023-07-20 19:40:23.000000000 +0000 +++ mmv-2.5.1/lib/stat-time.h 2023-08-08 11:02:40.000000000 +0000 @@ -1,18 +1,18 @@ /* stat-related time functions. - Copyright (C) 2005, 2007, 2009-2023 Free Software Foundation, Inc. + Copyright (C) 2005, 2007, 2009-2021 Free Software Foundation, Inc. - This file is free software: you can redistribute it and/or modify - it under the terms of the GNU Lesser General Public License as - published by the Free Software Foundation; either version 2.1 of the - License, or (at your option) any later version. + 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 of the License, or + (at your option) any later version. - This file is distributed in the hope that it will be useful, + 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 Lesser General Public License for more details. + GNU General Public License for more details. - You should have received a copy of the GNU Lesser General Public License + You should have received a copy of the GNU General Public License along with this program. If not, see . */ /* Written by Paul Eggert. */ @@ -20,18 +20,16 @@ #ifndef STAT_TIME_H #define STAT_TIME_H 1 -/* This file uses _GL_INLINE_HEADER_BEGIN, _GL_INLINE, _GL_UNUSED, - _GL_ATTRIBUTE_PURE, HAVE_STRUCT_STAT_*. */ -#if !_GL_CONFIG_H_INCLUDED - #error "Please include config.h first." -#endif +#include "intprops.h" #include -#include #include #include #include +#ifndef _GL_INLINE_HEADER_BEGIN + #error "Please include config.h first." +#endif _GL_INLINE_HEADER_BEGIN #ifndef _GL_STAT_TIME_INLINE # define _GL_STAT_TIME_INLINE _GL_INLINE @@ -104,7 +102,7 @@ /* Return the nanosecond component of *ST's birth time. */ _GL_STAT_TIME_INLINE long int _GL_ATTRIBUTE_PURE -get_stat_birthtime_ns (_GL_UNUSED struct stat const *st) +get_stat_birthtime_ns (struct stat const *st _GL_UNUSED) { # if defined HAVE_STRUCT_STAT_ST_BIRTHTIMESPEC_TV_NSEC return STAT_TIMESPEC (st, st_birthtim).tv_nsec; @@ -122,8 +120,10 @@ #ifdef STAT_TIMESPEC return STAT_TIMESPEC (st, st_atim); #else - return (struct timespec) { .tv_sec = st->st_atime, - .tv_nsec = get_stat_atime_ns (st) }; + struct timespec t; + t.tv_sec = st->st_atime; + t.tv_nsec = get_stat_atime_ns (st); + return t; #endif } @@ -134,8 +134,10 @@ #ifdef STAT_TIMESPEC return STAT_TIMESPEC (st, st_ctim); #else - return (struct timespec) { .tv_sec = st->st_ctime, - .tv_nsec = get_stat_ctime_ns (st) }; + struct timespec t; + t.tv_sec = st->st_ctime; + t.tv_nsec = get_stat_ctime_ns (st); + return t; #endif } @@ -146,15 +148,17 @@ #ifdef STAT_TIMESPEC return STAT_TIMESPEC (st, st_mtim); #else - return (struct timespec) { .tv_sec = st->st_mtime, - .tv_nsec = get_stat_mtime_ns (st) }; + struct timespec t; + t.tv_sec = st->st_mtime; + t.tv_nsec = get_stat_mtime_ns (st); + return t; #endif } /* Return *ST's birth time, if available; otherwise return a value with tv_sec and tv_nsec both equal to -1. */ _GL_STAT_TIME_INLINE struct timespec _GL_ATTRIBUTE_PURE -get_stat_birthtime (_GL_UNUSED struct stat const *st) +get_stat_birthtime (struct stat const *st _GL_UNUSED) { struct timespec t; @@ -162,8 +166,8 @@ || defined HAVE_STRUCT_STAT_ST_BIRTHTIM_TV_NSEC) t = STAT_TIMESPEC (st, st_birthtim); #elif defined HAVE_STRUCT_STAT_ST_BIRTHTIMENSEC - t = (struct timespec) { .tv_sec = st->st_birthtime, - .tv_nsec = st->st_birthtimensec }; + t.tv_sec = st->st_birthtime; + t.tv_nsec = st->st_birthtimensec; #elif defined _WIN32 && ! defined __CYGWIN__ /* Native Windows platforms (but not Cygwin) put the "file creation time" in st_ctime (!). See @@ -171,11 +175,13 @@ # if _GL_WINDOWS_STAT_TIMESPEC t = st->st_ctim; # else - t = (struct timespec) { .tv_sec = st->st_ctime }; + t.tv_sec = st->st_ctime; + t.tv_nsec = 0; # endif #else /* Birth time is not supported. */ - t = (struct timespec) { .tv_sec = -1, .tv_nsec = -1 }; + t.tv_sec = -1; + t.tv_nsec = -1; #endif #if (defined HAVE_STRUCT_STAT_ST_BIRTHTIMESPEC_TV_NSEC \ @@ -187,7 +193,10 @@ sometimes returns junk in the birth time fields; work around this bug if it is detected. */ if (! (t.tv_sec && 0 <= t.tv_nsec && t.tv_nsec < 1000000000)) - t = (struct timespec) { .tv_sec = -1, .tv_nsec = -1 }; + { + t.tv_sec = -1; + t.tv_nsec = -1; + } #endif return t; @@ -199,7 +208,7 @@ errno to EOVERFLOW if normalization overflowed. This function is intended to be private to this .h file. */ _GL_STAT_TIME_INLINE int -stat_time_normalize (int result, _GL_UNUSED struct stat *st) +stat_time_normalize (int result, struct stat *st _GL_UNUSED) { #if defined __sun && defined STAT_TIMESPEC if (result == 0) @@ -221,8 +230,9 @@ } ts->tv_nsec = r; /* Overflow is possible, as Solaris 11 stat can yield - tv_sec == TYPE_MINIMUM (time_t) && tv_nsec == -1000000000. */ - if (ckd_add (&ts->tv_sec, q, ts->tv_sec)) + tv_sec == TYPE_MINIMUM (time_t) && tv_nsec == -1000000000. + INT_ADD_WRAPV is OK, since time_t is signed on Solaris. */ + if (INT_ADD_WRAPV (q, ts->tv_sec, &ts->tv_sec)) { errno = EOVERFLOW; return -1; diff -Nru mmv-2.5/lib/stat-w32.c mmv-2.5.1/lib/stat-w32.c --- mmv-2.5/lib/stat-w32.c 2023-07-20 19:40:23.000000000 +0000 +++ mmv-2.5.1/lib/stat-w32.c 2023-08-08 11:02:40.000000000 +0000 @@ -1,17 +1,17 @@ /* Core of implementation of fstat and stat for native Windows. - Copyright (C) 2017-2023 Free Software Foundation, Inc. + Copyright (C) 2017-2021 Free Software Foundation, Inc. - This file is free software: you can redistribute it and/or modify - it under the terms of the GNU Lesser General Public License as - published by the Free Software Foundation; either version 2.1 of the - License, or (at your option) any later version. + 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 of the License, or + (at your option) any later version. - This file is distributed in the hope that it will be useful, + 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 Lesser General Public License for more details. + GNU General Public License for more details. - You should have received a copy of the GNU Lesser General Public License + You should have received a copy of the GNU General Public License along with this program. If not, see . */ /* Written by Bruno Haible. */ @@ -50,6 +50,7 @@ #include "stat-w32.h" #include "pathmax.h" +#include "verify.h" /* Don't assume that UNICODE is not defined. */ #undef LoadLibrary @@ -227,7 +228,7 @@ if (GetFileInformationByHandleExFunc (h, FileIdInfo, &id, sizeof (id))) { buf->st_dev = id.VolumeSerialNumber; - static_assert (sizeof (ino_t) == sizeof (id.FileId)); + verify (sizeof (ino_t) == sizeof (id.FileId)); memcpy (&buf->st_ino, &id.FileId, sizeof (ino_t)); goto ino_done; } diff -Nru mmv-2.5/lib/stat-w32.h mmv-2.5.1/lib/stat-w32.h --- mmv-2.5/lib/stat-w32.h 2023-07-20 19:40:23.000000000 +0000 +++ mmv-2.5.1/lib/stat-w32.h 2023-08-08 11:02:40.000000000 +0000 @@ -1,17 +1,17 @@ /* Core of implementation of fstat and stat for native Windows. - Copyright (C) 2017-2023 Free Software Foundation, Inc. + Copyright (C) 2017-2021 Free Software Foundation, Inc. - This file is free software: you can redistribute it and/or modify - it under the terms of the GNU Lesser General Public License as - published by the Free Software Foundation; either version 2.1 of the - License, or (at your option) any later version. + 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 of the License, or + (at your option) any later version. - This file is distributed in the hope that it will be useful, + 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 Lesser General Public License for more details. + GNU General Public License for more details. - You should have received a copy of the GNU Lesser General Public License + You should have received a copy of the GNU General Public License along with this program. If not, see . */ #ifndef _STAT_W32_H diff -Nru mmv-2.5/lib/stat.c mmv-2.5.1/lib/stat.c --- mmv-2.5/lib/stat.c 2023-07-20 19:40:23.000000000 +0000 +++ mmv-2.5.1/lib/stat.c 2023-08-08 11:02:40.000000000 +0000 @@ -1,17 +1,17 @@ /* Work around platform bugs in stat. - Copyright (C) 2009-2023 Free Software Foundation, Inc. + Copyright (C) 2009-2021 Free Software Foundation, Inc. - This file is free software: you can redistribute it and/or modify - it under the terms of the GNU Lesser General Public License as - published by the Free Software Foundation; either version 2.1 of the - License, or (at your option) any later version. + 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 of the License, or + (at your option) any later version. - This file is distributed in the hope that it will be useful, + 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 Lesser General Public License for more details. + GNU General Public License for more details. - You should have received a copy of the GNU Lesser General Public License + You should have received a copy of the GNU General Public License along with this program. If not, see . */ /* Written by Eric Blake and Bruno Haible. */ @@ -55,9 +55,11 @@ #include #include +#include #include #include "filename.h" #include "malloca.h" +#include "verify.h" #ifdef WINDOWS_NATIVE # define WIN32_LEAN_AND_MEAN diff -Nru mmv-2.5/lib/stdbool.in.h mmv-2.5.1/lib/stdbool.in.h --- mmv-2.5/lib/stdbool.in.h 1970-01-01 00:00:00.000000000 +0000 +++ mmv-2.5.1/lib/stdbool.in.h 2023-08-08 10:47:41.000000000 +0000 @@ -0,0 +1,132 @@ +/* Copyright (C) 2001-2003, 2006-2021 Free Software Foundation, Inc. + Written by Bruno Haible , 2001. + + 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 . */ + +#ifndef _GL_STDBOOL_H +#define _GL_STDBOOL_H + +/* ISO C 99 for platforms that lack it. */ + +/* Usage suggestions: + + Programs that use should be aware of some limitations + and standards compliance issues. + + Standards compliance: + + - must be #included before 'bool', 'false', 'true' + can be used. + + - You cannot assume that sizeof (bool) == 1. + + - Programs should not undefine the macros bool, true, and false, + as C99 lists that as an "obsolescent feature". + + Limitations of this substitute, when used in a C89 environment: + + - must be #included before the '_Bool' type can be used. + + - You cannot assume that _Bool is a typedef; it might be a macro. + + - Bit-fields of type 'bool' are not supported. Portable code + should use 'unsigned int foo : 1;' rather than 'bool foo : 1;'. + + - In C99, casts and automatic conversions to '_Bool' or 'bool' are + performed in such a way that every nonzero value gets converted + to 'true', and zero gets converted to 'false'. This doesn't work + with this substitute. With this substitute, only the values 0 and 1 + give the expected result when converted to _Bool' or 'bool'. + + - C99 allows the use of (_Bool)0.0 in constant expressions, but + this substitute cannot always provide this property. + + Also, it is suggested that programs use 'bool' rather than '_Bool'; + this isn't required, but 'bool' is more common. */ + + +/* 7.16. Boolean type and values */ + +/* BeOS already #defines false 0, true 1. We use the same + definitions below, but temporarily we have to #undef them. */ +#if defined __BEOS__ && !defined __HAIKU__ +# include /* defines bool but not _Bool */ +# undef false +# undef true +#endif + +#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 !@HAVE__BOOL@ +typedef bool _Bool; +# 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 + https://gcc.gnu.org/ml/gcc-patches/2003-12/msg02303.html + https://lists.gnu.org/r/bug-coreutils/2005-11/msg00161.html + https://lists.gnu.org/r/bug-coreutils/2005-10/msg00086.html + Similar bugs are likely with other compilers as well; this file + wouldn't be used if was working. + So we override the _Bool type. + If !@HAVE__BOOL@: + Need to define _Bool ourselves. As 'signed char' or as an enum type? + Use of a typedef, with SunPRO C, leads to a stupid + "warning: _Bool is a keyword in ISO C99". + Use of an enum type, with IRIX cc, leads to a stupid + "warning(1185): enumerated type mixed with another type". + Even the existence of an enum type, without a typedef, + "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 + /* With this compiler, trust the _Bool type if the compiler has it. */ +# if !@HAVE__BOOL@ + /* 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 + +/* The other macros must be usable in preprocessor directives. */ +#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 -Nru mmv-2.5/lib/stdckdint.in.h mmv-2.5.1/lib/stdckdint.in.h --- mmv-2.5/lib/stdckdint.in.h 2023-07-20 19:40:23.000000000 +0000 +++ mmv-2.5.1/lib/stdckdint.in.h 1970-01-01 00:00:00.000000000 +0000 @@ -1,35 +0,0 @@ -/* stdckdint.h -- checked integer arithmetic - - Copyright 2022-2023 Free Software Foundation, Inc. - - This program is free software: you can redistribute it and/or modify it - under the terms of the GNU Lesser General Public License as published - by the Free Software Foundation; either version 2.1 of the License, 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 Lesser General Public License for more details. - - You should have received a copy of the GNU Lesser General Public License - along with this program. If not, see . */ - -#ifndef _GL_STDCKDINT_H -#define _GL_STDCKDINT_H - -#include "intprops-internal.h" - -/* Store into *R the low-order bits of A + B, A - B, A * B, respectively. - Return 1 if the result overflows, 0 otherwise. - A, B, and *R can have any integer type other than char, bool, a - bit-precise integer type, or an enumeration type. - - These are like the standard macros introduced in C23, except that - arguments should not have side effects. */ - -#define ckd_add(r, a, b) ((bool) _GL_INT_ADD_WRAPV (a, b, r)) -#define ckd_sub(r, a, b) ((bool) _GL_INT_SUBTRACT_WRAPV (a, b, r)) -#define ckd_mul(r, a, b) ((bool) _GL_INT_MULTIPLY_WRAPV (a, b, r)) - -#endif /* _GL_STDCKDINT_H */ diff -Nru mmv-2.5/lib/stddef.in.h mmv-2.5.1/lib/stddef.in.h --- mmv-2.5/lib/stddef.in.h 2023-07-20 19:40:23.000000000 +0000 +++ mmv-2.5.1/lib/stddef.in.h 2023-08-08 11:02:47.000000000 +0000 @@ -1,24 +1,24 @@ /* A substitute for POSIX 2008 , for platforms that have issues. - Copyright (C) 2009-2023 Free Software Foundation, Inc. + Copyright (C) 2009-2021 Free Software Foundation, Inc. - This file is free software: you can redistribute it and/or modify - it under the terms of the GNU Lesser General Public License as - published by the Free Software Foundation; either version 2.1 of the - License, or (at your option) any later version. + 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 file is distributed in the hope that it will be useful, + 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 Lesser General Public License for more details. + GNU General Public License for more details. - You should have received a copy of the GNU Lesser General Public License - along with this program. If not, see . */ + You should have received a copy of the GNU General Public License + along with this program; if not, see . */ /* Written by Eric Blake. */ /* - * POSIX 2008 and ISO C 23 for platforms that have issues. + * POSIX 2008 for platforms that have issues. * */ @@ -37,9 +37,9 @@ remember if special invocation has ever been used to obtain wint_t, in which case we need to clean up NULL yet again. */ -# if !(defined _@GUARD_PREFIX@_STDDEF_H && defined _@GUARD_PREFIX@_STDDEF_WINT_T) +# if !(defined _@GUARD_PREFIX@_STDDEF_H && defined _GL_STDDEF_WINT_T) # ifdef __need_wint_t -# define _@GUARD_PREFIX@_STDDEF_WINT_T +# define _GL_STDDEF_WINT_T # endif # @INCLUDE_NEXT@ @NEXT_STDDEF_H@ /* On TinyCC, make sure that the macros that indicate the special invocation @@ -69,7 +69,6 @@ typedef long max_align_t; # define _MAX_ALIGN_T # endif -# define __CLANG_MAX_ALIGN_T_DEFINED # define GNULIB_defined_max_align_t 1 # endif # endif @@ -80,7 +79,7 @@ /* On NetBSD 5.0, the definition of NULL lacks proper parentheses. */ # if (@REPLACE_NULL@ \ - && (!defined _@GUARD_PREFIX@_STDDEF_H || defined _@GUARD_PREFIX@_STDDEF_WINT_T)) + && (!defined _@GUARD_PREFIX@_STDDEF_H || defined _GL_STDDEF_WINT_T)) # undef NULL # ifdef __cplusplus /* ISO C++ says that the macro NULL must expand to an integer constant @@ -101,11 +100,6 @@ # ifndef _@GUARD_PREFIX@_STDDEF_H # define _@GUARD_PREFIX@_STDDEF_H -/* This file uses _Noreturn. */ -#if !_GL_CONFIG_H_INCLUDED - #error "Please include config.h first." -#endif - /* Some platforms lack wchar_t. */ #if !@HAVE_WCHAR_T@ # define wchar_t int @@ -143,49 +137,11 @@ long int __i _GL_STDDEF_ALIGNAS (long int); } rpl_max_align_t; # define max_align_t rpl_max_align_t -# define __CLANG_MAX_ALIGN_T_DEFINED # define GNULIB_defined_max_align_t 1 # endif # endif #endif -/* ISO C 23 § 7.21.1 The unreachable macro */ -#ifndef unreachable - -/* Code borrowed from verify.h. */ -# ifndef _GL_HAS_BUILTIN_UNREACHABLE -# if defined __clang_major__ && __clang_major__ < 5 -# define _GL_HAS_BUILTIN_UNREACHABLE 0 -# elif 4 < __GNUC__ + (5 <= __GNUC_MINOR__) -# define _GL_HAS_BUILTIN_UNREACHABLE 1 -# elif defined __has_builtin -# define _GL_HAS_BUILTIN_UNREACHABLE __has_builtin (__builtin_unreachable) -# else -# define _GL_HAS_BUILTIN_UNREACHABLE 0 -# endif -# endif - -# if _GL_HAS_BUILTIN_UNREACHABLE -# define unreachable() __builtin_unreachable () -# elif 1200 <= _MSC_VER -# define unreachable() __assume (0) -# else -/* Declare abort(), without including . */ -extern -# if defined __cplusplus -"C" -# endif -_Noreturn -void abort (void) -# if defined __cplusplus && (__GLIBC__ >= 2) -throw () -# endif -; -# define unreachable() abort () -# endif - -#endif - # endif /* _@GUARD_PREFIX@_STDDEF_H */ # endif /* _@GUARD_PREFIX@_STDDEF_H */ #endif /* __need_XXX */ diff -Nru mmv-2.5/lib/stdint.in.h mmv-2.5.1/lib/stdint.in.h --- mmv-2.5/lib/stdint.in.h 2023-07-20 19:40:23.000000000 +0000 +++ mmv-2.5.1/lib/stdint.in.h 2023-08-08 11:02:47.000000000 +0000 @@ -1,19 +1,19 @@ -/* Copyright (C) 2001-2002, 2004-2023 Free Software Foundation, Inc. +/* Copyright (C) 2001-2002, 2004-2021 Free Software Foundation, Inc. Written by Paul Eggert, Bruno Haible, Sam Steingold, Peter Burwood. This file is part of gnulib. - This file is free software: you can redistribute it and/or modify - it under the terms of the GNU Lesser General Public License as - published by the Free Software Foundation; either version 2.1 of the - License, or (at your option) any later version. + 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 file is distributed in the hope that it will be useful, + 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 Lesser General Public License for more details. + GNU General Public License for more details. - You should have received a copy of the GNU Lesser General Public License - along with this program. If not, see . */ + You should have received a copy of the GNU General Public License + along with this program; if not, see . */ /* * ISO C 99 for platforms that lack it. @@ -85,7 +85,7 @@ /* Override WINT_MIN and WINT_MAX if gnulib's or overrides wint_t. */ -#if @GNULIBHEADERS_OVERRIDE_WINT_T@ +#if @GNULIB_OVERRIDES_WINT_T@ # undef WINT_MIN # undef WINT_MAX # define WINT_MIN 0x0U @@ -598,7 +598,7 @@ /* wint_t limits */ /* If gnulib's or overrides wint_t, @WINT_T_SUFFIX@ is not accurate, therefore use the definitions from above. */ -# if !@GNULIBHEADERS_OVERRIDE_WINT_T@ +# if !@GNULIB_OVERRIDES_WINT_T@ # undef WINT_MIN # undef WINT_MAX # if @HAVE_SIGNED_WINT_T@ diff -Nru mmv-2.5/lib/stdio-impl.h mmv-2.5.1/lib/stdio-impl.h --- mmv-2.5/lib/stdio-impl.h 2023-07-20 19:40:23.000000000 +0000 +++ mmv-2.5.1/lib/stdio-impl.h 2023-08-08 11:02:40.000000000 +0000 @@ -1,17 +1,17 @@ /* Implementation details of FILE streams. - Copyright (C) 2007-2008, 2010-2023 Free Software Foundation, Inc. + Copyright (C) 2007-2008, 2010-2021 Free Software Foundation, Inc. - This file is free software: you can redistribute it and/or modify - it under the terms of the GNU Lesser General Public License as - published by the Free Software Foundation; either version 2.1 of the - License, or (at your option) any later version. + 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 of the License, or + (at your option) any later version. - This file is distributed in the hope that it will be useful, + 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 Lesser General Public License for more details. + GNU General Public License for more details. - You should have received a copy of the GNU Lesser General Public License + You should have received a copy of the GNU General Public License along with this program. If not, see . */ /* Many stdio implementations have the same logic and therefore can share @@ -71,12 +71,6 @@ # else # define _gl_flags_file_t short # endif -# ifdef __LP64__ -# define _gl_file_offset_t int64_t -# else - /* see https://android.googlesource.com/platform/bionic/+/master/docs/32-bit-abi.md */ -# define _gl_file_offset_t __kernel_off_t -# endif /* Up to this commit from 2015-10-12 the innards of FILE were public, and fp_ub could be defined like for OpenBSD, @@ -102,7 +96,7 @@ unsigned char _nbuf[1]; \ struct { unsigned char *_base; size_t _size; } _lb; \ int _blksize; \ - _gl_file_offset_t _offset; \ + fpos_t _offset; \ /* More fields, not relevant here. */ \ } *) fp) # else diff -Nru mmv-2.5/lib/stdio-read.c mmv-2.5.1/lib/stdio-read.c --- mmv-2.5/lib/stdio-read.c 2023-07-20 19:40:23.000000000 +0000 +++ mmv-2.5.1/lib/stdio-read.c 1970-01-01 00:00:00.000000000 +0000 @@ -1,168 +0,0 @@ -/* POSIX compatible FILE stream read function. - Copyright (C) 2008-2023 Free Software Foundation, Inc. - Written by Bruno Haible , 2011. - - This file is free software: you can redistribute it and/or modify - it under the terms of the GNU Lesser General Public License as - published by the Free Software Foundation; either version 2.1 of the - License, or (at your option) any later version. - - This file 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 Lesser General Public License for more details. - - You should have received a copy of the GNU Lesser General Public License - along with this program. If not, see . */ - -#include - -/* Specification. */ -#include - -/* Replace these functions only if module 'nonblocking' is requested. */ -#if GNULIB_NONBLOCKING - -/* On native Windows platforms, when read() is called on a non-blocking pipe - with an empty buffer, ReadFile() fails with error GetLastError() = - ERROR_NO_DATA, and read() in consequence fails with error EINVAL. This - read() function is at the basis of the function which fills the buffer of - a FILE stream. */ - -# if defined _WIN32 && ! defined __CYGWIN__ - -# include -# include - -# define WIN32_LEAN_AND_MEAN /* avoid including junk */ -# include - -# if GNULIB_MSVC_NOTHROW -# include "msvc-nothrow.h" -# else -# include -# endif - -/* Don't assume that UNICODE is not defined. */ -# undef GetNamedPipeHandleState -# define GetNamedPipeHandleState GetNamedPipeHandleStateA - -# define CALL_WITH_ERRNO_FIX(RETTYPE, EXPRESSION, FAILED) \ - if (ferror (stream)) \ - return (EXPRESSION); \ - else \ - { \ - RETTYPE ret; \ - SetLastError (0); \ - ret = (EXPRESSION); \ - if (FAILED) \ - { \ - if (GetLastError () == ERROR_NO_DATA && ferror (stream)) \ - { \ - int fd = fileno (stream); \ - if (fd >= 0) \ - { \ - HANDLE h = (HANDLE) _get_osfhandle (fd); \ - if (GetFileType (h) == FILE_TYPE_PIPE) \ - { \ - /* h is a pipe or socket. */ \ - DWORD state; \ - if (GetNamedPipeHandleState (h, &state, NULL, NULL, \ - NULL, NULL, 0) \ - && (state & PIPE_NOWAIT) != 0) \ - /* h is a pipe in non-blocking mode. \ - Change errno from EINVAL to EAGAIN. */ \ - errno = EAGAIN; \ - } \ - } \ - } \ - } \ - return ret; \ - } - -/* Enable this function definition only if gnulib's has prepared it. - Otherwise we get a function definition conflict with mingw64's . */ -# if GNULIB_SCANF -int -scanf (const char *format, ...) -{ - int retval; - va_list args; - - va_start (args, format); - retval = vfscanf (stdin, format, args); - va_end (args); - - return retval; -} -# endif - -/* Enable this function definition only if gnulib's has prepared it. - Otherwise we get a function definition conflict with mingw64's . */ -# if GNULIB_FSCANF -int -fscanf (FILE *stream, const char *format, ...) -{ - int retval; - va_list args; - - va_start (args, format); - retval = vfscanf (stream, format, args); - va_end (args); - - return retval; -} -# endif - -/* Enable this function definition only if gnulib's has prepared it. - Otherwise we get a function definition conflict with mingw64's . */ -# if GNULIB_VSCANF -int -vscanf (const char *format, va_list args) -{ - return vfscanf (stdin, format, args); -} -# endif - -/* Enable this function definition only if gnulib's has prepared it. - Otherwise we get a function definition conflict with mingw64's . */ -# if GNULIB_VFSCANF -int -vfscanf (FILE *stream, const char *format, va_list args) -#undef vfscanf -{ - CALL_WITH_ERRNO_FIX (int, vfscanf (stream, format, args), ret == EOF) -} -# endif - -int -getchar (void) -{ - return fgetc (stdin); -} - -int -fgetc (FILE *stream) -#undef fgetc -{ - CALL_WITH_ERRNO_FIX (int, fgetc (stream), ret == EOF) -} - -char * -fgets (char *s, int n, FILE *stream) -#undef fgets -{ - CALL_WITH_ERRNO_FIX (char *, fgets (s, n, stream), ret == NULL) -} - -/* We intentionally don't bother to fix gets. */ - -size_t -fread (void *ptr, size_t s, size_t n, FILE *stream) -#undef fread -{ - CALL_WITH_ERRNO_FIX (size_t, fread (ptr, s, n, stream), ret < n) -} - -# endif -#endif diff -Nru mmv-2.5/lib/stdio-write.c mmv-2.5.1/lib/stdio-write.c --- mmv-2.5/lib/stdio-write.c 2023-07-20 19:40:23.000000000 +0000 +++ mmv-2.5.1/lib/stdio-write.c 1970-01-01 00:00:00.000000000 +0000 @@ -1,206 +0,0 @@ -/* POSIX compatible FILE stream write function. - Copyright (C) 2008-2023 Free Software Foundation, Inc. - Written by Bruno Haible , 2008. - - This file is free software: you can redistribute it and/or modify - it under the terms of the GNU Lesser General Public License as - published by the Free Software Foundation; either version 2.1 of the - License, or (at your option) any later version. - - This file 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 Lesser General Public License for more details. - - You should have received a copy of the GNU Lesser General Public License - along with this program. If not, see . */ - -#include - -/* Specification. */ -#include - -/* Replace these functions only if module 'nonblocking' or module 'sigpipe' is - requested. */ -#if GNULIB_NONBLOCKING || GNULIB_SIGPIPE - -/* On native Windows platforms, SIGPIPE does not exist. When write() is - called on a pipe with no readers, WriteFile() fails with error - GetLastError() = ERROR_NO_DATA, and write() in consequence fails with - error EINVAL. This write() function is at the basis of the function - which flushes the buffer of a FILE stream. */ - -# if defined _WIN32 && ! defined __CYGWIN__ - -# include -# include -# include - -# define WIN32_LEAN_AND_MEAN /* avoid including junk */ -# include - -# if GNULIB_MSVC_NOTHROW -# include "msvc-nothrow.h" -# else -# include -# endif - -/* Don't assume that UNICODE is not defined. */ -# undef GetNamedPipeHandleState -# define GetNamedPipeHandleState GetNamedPipeHandleStateA - -# if GNULIB_NONBLOCKING -# define CLEAR_ERRNO \ - errno = 0; -# define HANDLE_ENOSPC \ - if (errno == ENOSPC && ferror (stream)) \ - { \ - int fd = fileno (stream); \ - if (fd >= 0) \ - { \ - HANDLE h = (HANDLE) _get_osfhandle (fd); \ - if (GetFileType (h) == FILE_TYPE_PIPE) \ - { \ - /* h is a pipe or socket. */ \ - DWORD state; \ - if (GetNamedPipeHandleState (h, &state, NULL, NULL, \ - NULL, NULL, 0) \ - && (state & PIPE_NOWAIT) != 0) \ - /* h is a pipe in non-blocking mode. \ - Change errno from ENOSPC to EAGAIN. */ \ - errno = EAGAIN; \ - } \ - } \ - } \ - else -# else -# define CLEAR_ERRNO -# define HANDLE_ENOSPC -# endif - -# if GNULIB_SIGPIPE -# define CLEAR_LastError \ - SetLastError (0); -# define HANDLE_ERROR_NO_DATA \ - if (GetLastError () == ERROR_NO_DATA && ferror (stream)) \ - { \ - int fd = fileno (stream); \ - if (fd >= 0 \ - && GetFileType ((HANDLE) _get_osfhandle (fd)) \ - == FILE_TYPE_PIPE) \ - { \ - /* Try to raise signal SIGPIPE. */ \ - raise (SIGPIPE); \ - /* If it is currently blocked or ignored, change errno from \ - EINVAL to EPIPE. */ \ - errno = EPIPE; \ - } \ - } \ - else -# else -# define CLEAR_LastError -# define HANDLE_ERROR_NO_DATA -# endif - -# define CALL_WITH_SIGPIPE_EMULATION(RETTYPE, EXPRESSION, FAILED) \ - if (ferror (stream)) \ - return (EXPRESSION); \ - else \ - { \ - RETTYPE ret; \ - CLEAR_ERRNO \ - CLEAR_LastError \ - ret = (EXPRESSION); \ - if (FAILED) \ - { \ - HANDLE_ENOSPC \ - HANDLE_ERROR_NO_DATA \ - ; \ - } \ - return ret; \ - } - -# if !REPLACE_PRINTF_POSIX /* avoid collision with printf.c */ -int -printf (const char *format, ...) -{ - int retval; - va_list args; - - va_start (args, format); - retval = vfprintf (stdout, format, args); - va_end (args); - - return retval; -} -# endif - -# if !REPLACE_FPRINTF_POSIX /* avoid collision with fprintf.c */ -int -fprintf (FILE *stream, const char *format, ...) -{ - int retval; - va_list args; - - va_start (args, format); - retval = vfprintf (stream, format, args); - va_end (args); - - return retval; -} -# endif - -# if !REPLACE_VPRINTF_POSIX /* avoid collision with vprintf.c */ -int -vprintf (const char *format, va_list args) -{ - return vfprintf (stdout, format, args); -} -# endif - -# if !REPLACE_VFPRINTF_POSIX /* avoid collision with vfprintf.c */ -int -vfprintf (FILE *stream, const char *format, va_list args) -#undef vfprintf -{ - CALL_WITH_SIGPIPE_EMULATION (int, vfprintf (stream, format, args), ret == EOF) -} -# endif - -int -putchar (int c) -{ - return fputc (c, stdout); -} - -int -fputc (int c, FILE *stream) -#undef fputc -{ - CALL_WITH_SIGPIPE_EMULATION (int, fputc (c, stream), ret == EOF) -} - -int -fputs (const char *string, FILE *stream) -#undef fputs -{ - CALL_WITH_SIGPIPE_EMULATION (int, fputs (string, stream), ret == EOF) -} - -int -puts (const char *string) -#undef puts -{ - FILE *stream = stdout; - CALL_WITH_SIGPIPE_EMULATION (int, puts (string), ret == EOF) -} - -size_t -fwrite (const void *ptr, size_t s, size_t n, FILE *stream) -#undef fwrite -{ - CALL_WITH_SIGPIPE_EMULATION (size_t, fwrite (ptr, s, n, stream), ret < n) -} - -# endif -#endif diff -Nru mmv-2.5/lib/stdio.in.h mmv-2.5.1/lib/stdio.in.h --- mmv-2.5/lib/stdio.in.h 2023-07-20 19:40:23.000000000 +0000 +++ mmv-2.5.1/lib/stdio.in.h 2023-08-08 11:02:47.000000000 +0000 @@ -1,19 +1,19 @@ /* A GNU-like . - Copyright (C) 2004, 2007-2023 Free Software Foundation, Inc. + Copyright (C) 2004, 2007-2021 Free Software Foundation, Inc. - This file is free software: you can redistribute it and/or modify - it under the terms of the GNU Lesser General Public License as - published by the Free Software Foundation; either version 2.1 of the - License, or (at your option) any later version. + 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 file is distributed in the hope that it will be useful, + 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 Lesser General Public License for more details. + GNU General Public License for more details. - You should have received a copy of the GNU Lesser General Public License - along with this program. If not, see . */ + You should have received a copy of the GNU General Public License + along with this program; if not, see . */ #if __GNUC__ >= 3 @PRAGMA_SYSTEM_HEADER@ @@ -36,12 +36,6 @@ #ifndef _@GUARD_PREFIX@_STDIO_H -/* Suppress macOS deprecation warnings for sprintf and vsprintf. */ -#if (defined __APPLE__ && defined __MACH__) && !defined _POSIX_C_SOURCE -# define _POSIX_C_SOURCE 200809L -# define _GL_DEFINED__POSIX_C_SOURCE -#endif - #define _GL_ALREADY_INCLUDING_STDIO_H /* The include_next requires a split double-inclusion guard. */ @@ -49,20 +43,9 @@ #undef _GL_ALREADY_INCLUDING_STDIO_H -#ifdef _GL_DEFINED__POSIX_C_SOURCE -# undef _GL_DEFINED__POSIX_C_SOURCE -# undef _POSIX_C_SOURCE -#endif - #ifndef _@GUARD_PREFIX@_STDIO_H #define _@GUARD_PREFIX@_STDIO_H -/* This file uses _GL_ATTRIBUTE_DEALLOC, _GL_ATTRIBUTE_FORMAT, - _GL_ATTRIBUTE_MALLOC, GNULIB_POSIXCHECK, HAVE_RAW_DECL_*. */ -#if !_GL_CONFIG_H_INCLUDED - #error "Please include config.h first." -#endif - /* Get va_list. Needed on many systems, including glibc 2.8. */ #include @@ -73,52 +56,6 @@ May also define off_t to a 64-bit type on native Windows. */ #include -/* Solaris 10 and NetBSD 7.0 declare renameat in , not in . */ -/* But in any case avoid namespace pollution on glibc systems. */ -#if (@GNULIB_RENAMEAT@ || defined GNULIB_POSIXCHECK) && (defined __sun || defined __NetBSD__) \ - && ! defined __GLIBC__ -# include -#endif - -/* Android 4.3 declares renameat in , not in . */ -/* But in any case avoid namespace pollution on glibc systems. */ -#if (@GNULIB_RENAMEAT@ || defined GNULIB_POSIXCHECK) && defined __ANDROID__ \ - && ! defined __GLIBC__ -# include -#endif - -/* MSVC declares 'perror' in , not in . We must include - it before we #define perror rpl_perror. */ -/* But in any case avoid namespace pollution on glibc systems. */ -#if (@GNULIB_PERROR@ || defined GNULIB_POSIXCHECK) \ - && (defined _WIN32 && ! defined __CYGWIN__) \ - && ! defined __GLIBC__ -# include -#endif - -/* MSVC declares 'remove' in , not in . We must include - it before we #define remove rpl_remove. */ -/* MSVC declares 'rename' in , not in . We must include - it before we #define rename rpl_rename. */ -/* But in any case avoid namespace pollution on glibc systems. */ -#if (@GNULIB_REMOVE@ || @GNULIB_RENAME@ || defined GNULIB_POSIXCHECK) \ - && (defined _WIN32 && ! defined __CYGWIN__) \ - && ! defined __GLIBC__ -# include -#endif - - -/* _GL_ATTRIBUTE_DEALLOC (F, I) declares that the function returns pointers - that can be freed by passing them as the Ith argument to the - function F. */ -#ifndef _GL_ATTRIBUTE_DEALLOC -# if __GNUC__ >= 11 -# define _GL_ATTRIBUTE_DEALLOC(f, i) __attribute__ ((__malloc__ (f, i))) -# else -# define _GL_ATTRIBUTE_DEALLOC(f, i) -# endif -#endif - /* 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. @@ -133,16 +70,6 @@ # endif #endif -/* _GL_ATTRIBUTE_MALLOC declares that the function returns a pointer to freshly - allocated memory. */ -#ifndef _GL_ATTRIBUTE_MALLOC -# if __GNUC__ >= 3 || defined __clang__ -# define _GL_ATTRIBUTE_MALLOC __attribute__ ((__malloc__)) -# else -# define _GL_ATTRIBUTE_MALLOC -# endif -#endif - /* An __attribute__ __format__ specifier for a function that takes a format string and arguments, where the format string directives are the ones standardized by ISO C99 and POSIX. @@ -200,6 +127,41 @@ #define _GL_ATTRIBUTE_FORMAT_SCANF_SYSTEM(formatstring_parameter, first_argument) \ _GL_ATTRIBUTE_FORMAT ((__scanf__, formatstring_parameter, first_argument)) +/* Solaris 10 and NetBSD 7.0 declare renameat in , not in . */ +/* But in any case avoid namespace pollution on glibc systems. */ +#if (@GNULIB_RENAMEAT@ || defined GNULIB_POSIXCHECK) && (defined __sun || defined __NetBSD__) \ + && ! defined __GLIBC__ +# include +#endif + +/* Android 4.3 declares renameat in , not in . */ +/* But in any case avoid namespace pollution on glibc systems. */ +#if (@GNULIB_RENAMEAT@ || defined GNULIB_POSIXCHECK) && defined __ANDROID__ \ + && ! defined __GLIBC__ +# include +#endif + +/* MSVC declares 'perror' in , not in . We must include + it before we #define perror rpl_perror. */ +/* But in any case avoid namespace pollution on glibc systems. */ +#if (@GNULIB_PERROR@ || defined GNULIB_POSIXCHECK) \ + && (defined _WIN32 && ! defined __CYGWIN__) \ + && ! defined __GLIBC__ +# include +#endif + +/* MSVC declares 'remove' in , not in . We must include + it before we #define remove rpl_remove. */ +/* MSVC declares 'rename' in , not in . We must include + it before we #define rename rpl_rename. */ +/* But in any case avoid namespace pollution on glibc systems. */ +#if (@GNULIB_REMOVE@ || @GNULIB_RENAME@ || defined GNULIB_POSIXCHECK) \ + && (defined _WIN32 && ! defined __CYGWIN__) \ + && ! defined __GLIBC__ +# include +#endif + + /* The definitions of _GL_FUNCDECL_RPL etc. are copied here. */ /* The definition of _GL_ARG_NONNULL is copied here. */ @@ -220,36 +182,6 @@ # undef putc_unlocked #endif - -/* Maximum number of characters produced by printing a NaN value. */ -#ifndef _PRINTF_NAN_LEN_MAX -# if defined __FreeBSD__ || defined __DragonFly__ \ - || defined __NetBSD__ \ - || (defined __APPLE__ && defined __MACH__) -/* On BSD systems, a NaN value prints as just "nan", without a sign. */ -# define _PRINTF_NAN_LEN_MAX 3 -# elif (__GLIBC__ >= 2) || MUSL_LIBC || defined __OpenBSD__ || defined __sun || defined __CYGWIN__ -/* glibc, musl libc, OpenBSD, Solaris libc, and Cygwin produce "[-]nan". */ -# define _PRINTF_NAN_LEN_MAX 4 -# elif defined _AIX -/* AIX produces "[-]NaNQ". */ -# define _PRINTF_NAN_LEN_MAX 5 -# elif defined _WIN32 && !defined __CYGWIN__ -/* On native Windows, the output can be: - - with MSVC ucrt: "[-]nan" or "[-]nan(ind)" or "[-]nan(snan)", - - with mingw: "[-]1.#IND" or "[-]1.#QNAN". */ -# define _PRINTF_NAN_LEN_MAX 10 -# elif defined __sgi -/* On IRIX, the output typically is "[-]nan0xNNNNNNNN" with 8 hexadecimal - digits. */ -# define _PRINTF_NAN_LEN_MAX 14 -# else -/* We don't know, but 32 should be a safe maximum. */ -# define _PRINTF_NAN_LEN_MAX 32 -# endif -#endif - - #if @GNULIB_DPRINTF@ # if @REPLACE_DPRINTF@ # if !(defined __cplusplus && defined GNULIB_NAMESPACE) @@ -267,9 +199,7 @@ # endif _GL_CXXALIAS_SYS (dprintf, int, (int fd, const char *restrict format, ...)); # endif -# if __GLIBC__ >= 2 _GL_CXXALIASWARN (dprintf); -# endif #elif defined GNULIB_POSIXCHECK # undef dprintf # if HAVE_RAW_DECL_DPRINTF @@ -312,7 +242,7 @@ _GL_CXXALIAS_MDA (fcloseall, int, (void)); # else # if @HAVE_DECL_FCLOSEALL@ -# if defined __FreeBSD__ || defined __DragonFly__ +# if defined __FreeBSD__ _GL_CXXALIAS_SYS (fcloseall, void, (void)); # else _GL_CXXALIAS_SYS (fcloseall, int, (void)); @@ -330,10 +260,8 @@ # undef fdopen # define fdopen rpl_fdopen # endif -_GL_FUNCDECL_RPL (fdopen, FILE *, - (int fd, const char *mode) - _GL_ARG_NONNULL ((2)) _GL_ATTRIBUTE_DEALLOC (fclose, 1) - _GL_ATTRIBUTE_MALLOC); +_GL_FUNCDECL_RPL (fdopen, FILE *, (int fd, const char *mode) + _GL_ARG_NONNULL ((2))); _GL_CXXALIAS_RPL (fdopen, FILE *, (int fd, const char *mode)); # elif defined _WIN32 && !defined __CYGWIN__ # if !(defined __cplusplus && defined GNULIB_NAMESPACE) @@ -342,44 +270,28 @@ # endif _GL_CXXALIAS_MDA (fdopen, FILE *, (int fd, const char *mode)); # else -# if __GNUC__ >= 11 -/* For -Wmismatched-dealloc: Associate fdopen with fclose or rpl_fclose. */ -_GL_FUNCDECL_SYS (fdopen, FILE *, - (int fd, const char *mode) - _GL_ARG_NONNULL ((2)) _GL_ATTRIBUTE_DEALLOC (fclose, 1) - _GL_ATTRIBUTE_MALLOC); -# endif _GL_CXXALIAS_SYS (fdopen, FILE *, (int fd, const char *mode)); # endif _GL_CXXALIASWARN (fdopen); -#else -# if @GNULIB_FCLOSE@ && __GNUC__ >= 11 && !defined fdopen -/* For -Wmismatched-dealloc: Associate fdopen with fclose or rpl_fclose. */ -_GL_FUNCDECL_SYS (fdopen, FILE *, - (int fd, const char *mode) - _GL_ARG_NONNULL ((2)) _GL_ATTRIBUTE_DEALLOC (fclose, 1) - _GL_ATTRIBUTE_MALLOC); -# endif -# if defined GNULIB_POSIXCHECK -# undef 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"); -# elif @GNULIB_MDA_FDOPEN@ +#elif @GNULIB_MDA_FDOPEN@ /* On native Windows, map 'fdopen' to '_fdopen', so that -loldnames is not required. In C++ with GNULIB_NAMESPACE, avoid differences between platforms by defining GNULIB_NAMESPACE::fdopen always. */ -# if defined _WIN32 && !defined __CYGWIN__ -# if !(defined __cplusplus && defined GNULIB_NAMESPACE) -# undef fdopen -# define fdopen _fdopen -# endif +# if defined _WIN32 && !defined __CYGWIN__ +# if !(defined __cplusplus && defined GNULIB_NAMESPACE) +# undef fdopen +# define fdopen _fdopen +# endif _GL_CXXALIAS_MDA (fdopen, FILE *, (int fd, const char *mode)); -# else +# else _GL_CXXALIAS_SYS (fdopen, FILE *, (int fd, const char *mode)); -# endif -_GL_CXXALIASWARN (fdopen); # endif +_GL_CXXALIASWARN (fdopen); #endif #if @GNULIB_FFLUSH@ @@ -461,44 +373,28 @@ #endif #if @GNULIB_FOPEN@ -# if (@GNULIB_FOPEN@ && @REPLACE_FOPEN@) \ - || (@GNULIB_FOPEN_GNU@ && @REPLACE_FOPEN_FOR_FOPEN_GNU@) +# if @REPLACE_FOPEN@ # if !(defined __cplusplus && defined GNULIB_NAMESPACE) # undef fopen # define fopen rpl_fopen # endif _GL_FUNCDECL_RPL (fopen, FILE *, (const char *restrict filename, const char *restrict mode) - _GL_ARG_NONNULL ((1, 2)) _GL_ATTRIBUTE_DEALLOC (fclose, 1) - _GL_ATTRIBUTE_MALLOC); + _GL_ARG_NONNULL ((1, 2))); _GL_CXXALIAS_RPL (fopen, FILE *, (const char *restrict filename, const char *restrict mode)); # else -# if __GNUC__ >= 11 -/* For -Wmismatched-dealloc: Associate fopen with fclose or rpl_fclose. */ -_GL_FUNCDECL_SYS (fopen, FILE *, - (const char *restrict filename, const char *restrict mode) - _GL_ARG_NONNULL ((1, 2)) _GL_ATTRIBUTE_DEALLOC (fclose, 1)); -# endif _GL_CXXALIAS_SYS (fopen, FILE *, (const char *restrict filename, const char *restrict mode)); # endif # if __GLIBC__ >= 2 _GL_CXXALIASWARN (fopen); # endif -#else -# if @GNULIB_FCLOSE@ && __GNUC__ >= 11 && !defined fopen -/* For -Wmismatched-dealloc: Associate fopen with fclose or rpl_fclose. */ -_GL_FUNCDECL_SYS (fopen, FILE *, - (const char *restrict filename, const char *restrict mode) - _GL_ARG_NONNULL ((1, 2)) _GL_ATTRIBUTE_DEALLOC (fclose, 1)); -# endif -# if defined GNULIB_POSIXCHECK -# undef 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 #endif #if @GNULIB_FPRINTF_POSIX@ || @GNULIB_FPRINTF@ @@ -945,9 +841,7 @@ int delimiter, FILE *restrict stream)); # endif -# if __GLIBC__ >= 2 _GL_CXXALIASWARN (getdelim); -# endif #elif defined GNULIB_POSIXCHECK # undef getdelim # if HAVE_RAW_DECL_GETDELIM @@ -986,7 +880,7 @@ (char **restrict lineptr, size_t *restrict linesize, FILE *restrict stream)); # endif -# if __GLIBC__ >= 2 && @HAVE_DECL_GETLINE@ +# if @HAVE_DECL_GETLINE@ _GL_CXXALIASWARN (getline); # endif #elif defined GNULIB_POSIXCHECK @@ -1016,17 +910,9 @@ # endif _GL_CXXALIAS_MDA (getw, int, (FILE *restrict stream)); # else -# if @HAVE_DECL_GETW@ -# if defined __APPLE__ && defined __MACH__ -/* The presence of the declaration depends on _POSIX_C_SOURCE. */ -_GL_FUNCDECL_SYS (getw, int, (FILE *restrict stream)); -# endif _GL_CXXALIAS_SYS (getw, int, (FILE *restrict stream)); -# endif # endif -# if __GLIBC__ >= 2 _GL_CXXALIASWARN (getw); -# endif #endif #if @GNULIB_OBSTACK_PRINTF@ || @GNULIB_OBSTACK_PRINTF_POSIX@ @@ -1123,35 +1009,22 @@ # undef popen # define popen rpl_popen # endif -_GL_FUNCDECL_RPL (popen, FILE *, - (const char *cmd, const char *mode) - _GL_ARG_NONNULL ((1, 2)) _GL_ATTRIBUTE_DEALLOC (pclose, 1) - _GL_ATTRIBUTE_MALLOC); +_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 !@HAVE_POPEN@ || __GNUC__ >= 11 -_GL_FUNCDECL_SYS (popen, FILE *, - (const char *cmd, const char *mode) - _GL_ARG_NONNULL ((1, 2)) _GL_ATTRIBUTE_DEALLOC (pclose, 1) - _GL_ATTRIBUTE_MALLOC); +# if !@HAVE_POPEN@ +_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); -#else -# if @GNULIB_PCLOSE@ && __GNUC__ >= 11 && !defined popen -/* For -Wmismatched-dealloc: Associate popen with pclose or rpl_pclose. */ -_GL_FUNCDECL_SYS (popen, FILE *, - (const char *cmd, const char *mode) - _GL_ARG_NONNULL ((1, 2)) _GL_ATTRIBUTE_DEALLOC (pclose, 1) - _GL_ATTRIBUTE_MALLOC); -# endif -# if defined GNULIB_POSIXCHECK -# undef popen -# if HAVE_RAW_DECL_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 #endif @@ -1266,17 +1139,9 @@ # endif _GL_CXXALIAS_MDA (putw, int, (int w, FILE *restrict stream)); # else -# if @HAVE_DECL_PUTW@ -# if defined __APPLE__ && defined __MACH__ -/* The presence of the declaration depends on _POSIX_C_SOURCE. */ -_GL_FUNCDECL_SYS (putw, int, (int w, FILE *restrict stream)); -# endif _GL_CXXALIAS_SYS (putw, int, (int w, FILE *restrict stream)); -# endif # endif -# if __GLIBC__ >= 2 _GL_CXXALIASWARN (putw); -# endif #endif #if @GNULIB_REMOVE@ @@ -1392,7 +1257,6 @@ # if !(defined __cplusplus && defined GNULIB_NAMESPACE) # define snprintf rpl_snprintf # endif -# define GNULIB_overrides_snprintf 1 _GL_FUNCDECL_RPL (snprintf, int, (char *restrict str, size_t size, const char *restrict format, ...) @@ -1438,7 +1302,6 @@ # if !(defined __cplusplus && defined GNULIB_NAMESPACE) # define sprintf rpl_sprintf # endif -# define GNULIB_overrides_sprintf 1 _GL_FUNCDECL_RPL (sprintf, int, (char *restrict str, const char *restrict format, ...) _GL_ATTRIBUTE_FORMAT_PRINTF_STANDARD (2, 3) @@ -1481,35 +1344,19 @@ # if !(defined __cplusplus && defined GNULIB_NAMESPACE) # define tmpfile rpl_tmpfile # endif -_GL_FUNCDECL_RPL (tmpfile, FILE *, (void) - _GL_ATTRIBUTE_DEALLOC (fclose, 1) - _GL_ATTRIBUTE_MALLOC); +_GL_FUNCDECL_RPL (tmpfile, FILE *, (void)); _GL_CXXALIAS_RPL (tmpfile, FILE *, (void)); # else -# if __GNUC__ >= 11 -/* For -Wmismatched-dealloc: Associate tmpfile with fclose or rpl_fclose. */ -_GL_FUNCDECL_SYS (tmpfile, FILE *, (void) - _GL_ATTRIBUTE_DEALLOC (fclose, 1) - _GL_ATTRIBUTE_MALLOC); -# endif _GL_CXXALIAS_SYS (tmpfile, FILE *, (void)); # endif # if __GLIBC__ >= 2 _GL_CXXALIASWARN (tmpfile); # endif -#else -# if @GNULIB_FCLOSE@ && __GNUC__ >= 11 && !defined tmpfile -/* For -Wmismatched-dealloc: Associate tmpfile with fclose or rpl_fclose. */ -_GL_FUNCDECL_SYS (tmpfile, FILE *, (void) - _GL_ATTRIBUTE_DEALLOC (fclose, 1) - _GL_ATTRIBUTE_MALLOC); -# endif -# if defined GNULIB_POSIXCHECK -# undef tmpfile -# if HAVE_RAW_DECL_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 #endif @@ -1522,7 +1369,6 @@ # if !(defined __cplusplus && defined GNULIB_NAMESPACE) # define asprintf rpl_asprintf # endif -# define GNULIB_overrides_asprintf _GL_FUNCDECL_RPL (asprintf, int, (char **result, const char *format, ...) _GL_ATTRIBUTE_FORMAT_PRINTF_STANDARD (2, 3) @@ -1544,7 +1390,6 @@ # if !(defined __cplusplus && defined GNULIB_NAMESPACE) # define vasprintf rpl_vasprintf # endif -# define GNULIB_overrides_vasprintf 1 _GL_FUNCDECL_RPL (vasprintf, int, (char **result, const char *format, va_list args) _GL_ATTRIBUTE_FORMAT_PRINTF_STANDARD (2, 0) @@ -1728,7 +1573,6 @@ # if !(defined __cplusplus && defined GNULIB_NAMESPACE) # define vsnprintf rpl_vsnprintf # endif -# define GNULIB_overrides_vsnprintf 1 _GL_FUNCDECL_RPL (vsnprintf, int, (char *restrict str, size_t size, const char *restrict format, va_list args) @@ -1765,7 +1609,6 @@ # if !(defined __cplusplus && defined GNULIB_NAMESPACE) # define vsprintf rpl_vsprintf # endif -# define GNULIB_overrides_vsprintf 1 _GL_FUNCDECL_RPL (vsprintf, int, (char *restrict str, const char *restrict format, va_list args) diff -Nru mmv-2.5/lib/stdlib.in.h mmv-2.5.1/lib/stdlib.in.h --- mmv-2.5/lib/stdlib.in.h 2023-07-20 19:40:23.000000000 +0000 +++ mmv-2.5.1/lib/stdlib.in.h 2023-08-08 11:02:40.000000000 +0000 @@ -1,18 +1,18 @@ /* A GNU-like . - Copyright (C) 1995, 2001-2004, 2006-2023 Free Software Foundation, Inc. + Copyright (C) 1995, 2001-2004, 2006-2021 Free Software Foundation, Inc. - This file is free software: you can redistribute it and/or modify - it under the terms of the GNU Lesser General Public License as - published by the Free Software Foundation; either version 2.1 of the - License, or (at your option) any later version. + 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 of the License, or + (at your option) any later version. - This file is distributed in the hope that it will be useful, + 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 Lesser General Public License for more details. + GNU General Public License for more details. - You should have received a copy of the GNU Lesser General Public License + You should have received a copy of the GNU General Public License along with this program. If not, see . */ #if __GNUC__ >= 3 @@ -37,12 +37,6 @@ #ifndef _@GUARD_PREFIX@_STDLIB_H #define _@GUARD_PREFIX@_STDLIB_H -/* This file uses _Noreturn, _GL_ATTRIBUTE_DEALLOC, _GL_ATTRIBUTE_MALLOC, - _GL_ATTRIBUTE_PURE, GNULIB_POSIXCHECK, HAVE_RAW_DECL_*. */ -#if !_GL_CONFIG_H_INCLUDED - #error "Please include config.h first." -#endif - /* NetBSD 5.0 mis-defines NULL. */ #include @@ -73,7 +67,9 @@ # include # endif -# include +# if !@HAVE_STRUCT_RANDOM_DATA@ || @REPLACE_RANDOM_R@ || !@HAVE_RANDOM_R@ +# include +# endif # if !@HAVE_STRUCT_RANDOM_DATA@ /* Define 'struct random_data'. @@ -103,35 +99,6 @@ # include #endif -/* _GL_ATTRIBUTE_DEALLOC (F, I) declares that the function returns pointers - that can be freed by passing them as the Ith argument to the - function F. */ -#ifndef _GL_ATTRIBUTE_DEALLOC -# if __GNUC__ >= 11 -# define _GL_ATTRIBUTE_DEALLOC(f, i) __attribute__ ((__malloc__ (f, i))) -# else -# define _GL_ATTRIBUTE_DEALLOC(f, i) -# endif -#endif - -/* _GL_ATTRIBUTE_DEALLOC_FREE declares that the function returns pointers that - can be freed via 'free'; it can be used only after declaring 'free'. */ -/* Applies to: functions. Cannot be used on inline functions. */ -#ifndef _GL_ATTRIBUTE_DEALLOC_FREE -# define _GL_ATTRIBUTE_DEALLOC_FREE _GL_ATTRIBUTE_DEALLOC (free, 1) -#endif - -/* _GL_ATTRIBUTE_MALLOC declares that the function returns a pointer to freshly - allocated memory. */ -/* Applies to: functions. */ -#ifndef _GL_ATTRIBUTE_MALLOC -# if __GNUC__ >= 3 || defined __clang__ -# define _GL_ATTRIBUTE_MALLOC __attribute__ ((__malloc__)) -# else -# define _GL_ATTRIBUTE_MALLOC -# endif -#endif - /* The __attribute__ feature is available in gcc versions 2.5 and later. The attribute __pure__ was added in gcc 2.96. */ #ifndef _GL_ATTRIBUTE_PURE @@ -168,22 +135,11 @@ #if @GNULIB__EXIT@ /* Terminate the current process with the given return code, without running the 'atexit' handlers. */ -# if @REPLACE__EXIT@ -# if !(defined __cplusplus && defined GNULIB_NAMESPACE) -# undef _Exit -# define _Exit rpl__Exit -# endif -_GL_FUNCDECL_RPL (_Exit, _Noreturn void, (int status)); -_GL_CXXALIAS_RPL (_Exit, void, (int status)); -# else -# if !@HAVE__EXIT@ +# if !@HAVE__EXIT@ _GL_FUNCDECL_SYS (_Exit, _Noreturn void, (int status)); -# endif -_GL_CXXALIAS_SYS (_Exit, void, (int status)); # endif -# if __GLIBC__ >= 2 +_GL_CXXALIAS_SYS (_Exit, void, (int status)); _GL_CXXALIASWARN (_Exit); -# endif #elif defined GNULIB_POSIXCHECK # undef _Exit # if HAVE_RAW_DECL__EXIT @@ -193,32 +149,6 @@ #endif -#if @GNULIB_FREE_POSIX@ -# if @REPLACE_FREE@ -# if !(defined __cplusplus && defined GNULIB_NAMESPACE) -# undef free -# define free rpl_free -# endif -# if defined __cplusplus && (__GLIBC__ + (__GLIBC_MINOR__ >= 14) > 2) -_GL_FUNCDECL_RPL (free, void, (void *ptr) throw ()); -# else -_GL_FUNCDECL_RPL (free, void, (void *ptr)); -# endif -_GL_CXXALIAS_RPL (free, void, (void *ptr)); -# else -_GL_CXXALIAS_SYS (free, void, (void *ptr)); -# endif -# if __GLIBC__ >= 2 -_GL_CXXALIASWARN (free); -# endif -#elif defined GNULIB_POSIXCHECK -# undef free -/* Assume free is always declared. */ -_GL_WARN_ON_USE (free, "free is not future POSIX compliant everywhere - " - "use gnulib module free for portability"); -#endif - - /* Allocate memory with indefinite extent and specified alignment. */ #if @GNULIB_ALIGNED_ALLOC@ # if @REPLACE_ALIGNED_ALLOC@ @@ -226,37 +156,21 @@ # undef aligned_alloc # define aligned_alloc rpl_aligned_alloc # endif -_GL_FUNCDECL_RPL (aligned_alloc, void *, - (size_t alignment, size_t size) - _GL_ATTRIBUTE_MALLOC _GL_ATTRIBUTE_DEALLOC_FREE); +_GL_FUNCDECL_RPL (aligned_alloc, void *, (size_t alignment, size_t size)); _GL_CXXALIAS_RPL (aligned_alloc, void *, (size_t alignment, size_t size)); # else # if @HAVE_ALIGNED_ALLOC@ -# if __GNUC__ >= 11 -/* For -Wmismatched-dealloc: Associate aligned_alloc with free or rpl_free. */ -_GL_FUNCDECL_SYS (aligned_alloc, void *, - (size_t alignment, size_t size) - _GL_ATTRIBUTE_MALLOC _GL_ATTRIBUTE_DEALLOC_FREE); -# endif _GL_CXXALIAS_SYS (aligned_alloc, void *, (size_t alignment, size_t size)); # endif # endif -# if (__GLIBC__ >= 2) && @HAVE_ALIGNED_ALLOC@ +# if @HAVE_ALIGNED_ALLOC@ _GL_CXXALIASWARN (aligned_alloc); # endif -#else -# if @GNULIB_FREE_POSIX@ && __GNUC__ >= 11 && !defined aligned_alloc -/* For -Wmismatched-dealloc: Associate aligned_alloc with free or rpl_free. */ -_GL_FUNCDECL_SYS (aligned_alloc, void *, - (size_t alignment, size_t size) - _GL_ATTRIBUTE_MALLOC _GL_ATTRIBUTE_DEALLOC_FREE); -# endif -# if defined GNULIB_POSIXCHECK -# undef aligned_alloc -# if HAVE_RAW_DECL_ALIGNED_ALLOC +#elif defined GNULIB_POSIXCHECK +# undef aligned_alloc +# if HAVE_RAW_DECL_ALIGNED_ALLOC _GL_WARN_ON_USE (aligned_alloc, "aligned_alloc is not portable - " "use gnulib module aligned_alloc for portability"); -# endif # endif #endif @@ -279,41 +193,24 @@ #endif #if @GNULIB_CALLOC_POSIX@ -# if (@GNULIB_CALLOC_POSIX@ && @REPLACE_CALLOC_FOR_CALLOC_POSIX@) \ - || (@GNULIB_CALLOC_GNU@ && @REPLACE_CALLOC_FOR_CALLOC_GNU@) +# if @REPLACE_CALLOC@ # if !(defined __cplusplus && defined GNULIB_NAMESPACE) # undef calloc # define calloc rpl_calloc # endif -_GL_FUNCDECL_RPL (calloc, void *, - (size_t nmemb, size_t size) - _GL_ATTRIBUTE_MALLOC _GL_ATTRIBUTE_DEALLOC_FREE); +_GL_FUNCDECL_RPL (calloc, void *, (size_t nmemb, size_t size)); _GL_CXXALIAS_RPL (calloc, void *, (size_t nmemb, size_t size)); # else -# if __GNUC__ >= 11 -/* For -Wmismatched-dealloc: Associate calloc with free or rpl_free. */ -_GL_FUNCDECL_SYS (calloc, void *, - (size_t nmemb, size_t size) - _GL_ATTRIBUTE_MALLOC _GL_ATTRIBUTE_DEALLOC_FREE); -# endif _GL_CXXALIAS_SYS (calloc, void *, (size_t nmemb, size_t size)); # endif # if __GLIBC__ >= 2 _GL_CXXALIASWARN (calloc); # endif -#else -# if @GNULIB_FREE_POSIX@ && __GNUC__ >= 11 && !defined calloc -/* For -Wmismatched-dealloc: Associate calloc with free or rpl_free. */ -_GL_FUNCDECL_SYS (calloc, void *, - (size_t nmemb, size_t size) - _GL_ATTRIBUTE_MALLOC _GL_ATTRIBUTE_DEALLOC_FREE); -# endif -# if defined GNULIB_POSIXCHECK -# undef calloc +#elif defined GNULIB_POSIXCHECK +# undef calloc /* Assume calloc is always declared. */ _GL_WARN_ON_USE (calloc, "calloc is not POSIX compliant everywhere - " "use gnulib module calloc-posix for portability"); -# endif #endif #if @GNULIB_CANONICALIZE_FILE_NAME@ @@ -321,17 +218,13 @@ # if !(defined __cplusplus && defined GNULIB_NAMESPACE) # define canonicalize_file_name rpl_canonicalize_file_name # endif -_GL_FUNCDECL_RPL (canonicalize_file_name, char *, - (const char *name) - _GL_ARG_NONNULL ((1)) - _GL_ATTRIBUTE_MALLOC _GL_ATTRIBUTE_DEALLOC_FREE); +_GL_FUNCDECL_RPL (canonicalize_file_name, char *, (const char *name) + _GL_ARG_NONNULL ((1))); _GL_CXXALIAS_RPL (canonicalize_file_name, char *, (const char *name)); # else -# if !@HAVE_CANONICALIZE_FILE_NAME@ || __GNUC__ >= 11 -_GL_FUNCDECL_SYS (canonicalize_file_name, char *, - (const char *name) - _GL_ARG_NONNULL ((1)) - _GL_ATTRIBUTE_MALLOC _GL_ATTRIBUTE_DEALLOC_FREE); +# if !@HAVE_CANONICALIZE_FILE_NAME@ +_GL_FUNCDECL_SYS (canonicalize_file_name, char *, (const char *name) + _GL_ARG_NONNULL ((1))); # endif _GL_CXXALIAS_SYS (canonicalize_file_name, char *, (const char *name)); # endif @@ -340,22 +233,12 @@ (!@HAVE_CANONICALIZE_FILE_NAME@ || @REPLACE_CANONICALIZE_FILE_NAME@) # endif _GL_CXXALIASWARN (canonicalize_file_name); -#else -# if @GNULIB_FREE_POSIX@ && __GNUC__ >= 11 && !defined canonicalize_file_name -/* For -Wmismatched-dealloc: Associate canonicalize_file_name with free or - rpl_free. */ -_GL_FUNCDECL_SYS (canonicalize_file_name, char *, - (const char *name) - _GL_ARG_NONNULL ((1)) - _GL_ATTRIBUTE_MALLOC _GL_ATTRIBUTE_DEALLOC_FREE); -# endif -# if defined GNULIB_POSIXCHECK -# undef canonicalize_file_name -# if HAVE_RAW_DECL_CANONICALIZE_FILE_NAME +#elif defined GNULIB_POSIXCHECK +# undef canonicalize_file_name +# if HAVE_RAW_DECL_CANONICALIZE_FILE_NAME _GL_WARN_ON_USE (canonicalize_file_name, "canonicalize_file_name is unportable - " "use gnulib module canonicalize-lgpl for portability"); -# endif # endif #endif @@ -405,6 +288,27 @@ # endif #endif +#if @GNULIB_FREE_POSIX@ +# if @REPLACE_FREE@ +# if !(defined __cplusplus && defined GNULIB_NAMESPACE) +# undef free +# define free rpl_free +# endif +_GL_FUNCDECL_RPL (free, void, (void *ptr)); +_GL_CXXALIAS_RPL (free, void, (void *ptr)); +# else +_GL_CXXALIAS_SYS (free, void, (void *ptr)); +# endif +# if __GLIBC__ >= 2 +_GL_CXXALIASWARN (free); +# endif +#elif defined GNULIB_POSIXCHECK +# undef free +/* Assume free is always declared. */ +_GL_WARN_ON_USE (free, "free is not future POSIX compliant everywhere - " + "use gnulib module free for portability"); +#endif + #if @GNULIB_MDA_GCVT@ /* On native Windows, map 'gcvt' to '_gcvt', so that -loldnames is not required. In C++ with GNULIB_NAMESPACE, avoid differences between @@ -431,24 +335,12 @@ The three numbers are the load average of the last 1 minute, the last 5 minutes, and the last 15 minutes, respectively. LOADAVG is an array of NELEM numbers. */ -# if @REPLACE_GETLOADAVG@ -# if !(defined __cplusplus && defined GNULIB_NAMESPACE) -# undef getloadavg -# define getloadavg rpl_getloadavg -# endif -_GL_FUNCDECL_RPL (getloadavg, int, (double loadavg[], int nelem) - _GL_ARG_NONNULL ((1))); -_GL_CXXALIAS_RPL (getloadavg, int, (double loadavg[], int nelem)); -# else -# if !@HAVE_DECL_GETLOADAVG@ +# if !@HAVE_DECL_GETLOADAVG@ _GL_FUNCDECL_SYS (getloadavg, int, (double loadavg[], int nelem) _GL_ARG_NONNULL ((1))); -# endif -_GL_CXXALIAS_SYS (getloadavg, int, (double loadavg[], int nelem)); # endif -# if __GLIBC__ >= 2 +_GL_CXXALIAS_SYS (getloadavg, int, (double loadavg[], int nelem)); _GL_CXXALIASWARN (getloadavg); -# endif #elif defined GNULIB_POSIXCHECK # undef getloadavg # if HAVE_RAW_DECL_GETLOADAVG @@ -457,41 +349,6 @@ # endif #endif -#if @GNULIB_GETPROGNAME@ -/* Return the base name of the executing program. - On native Windows this will usually end in ".exe" or ".EXE". */ -# if @REPLACE_GETPROGNAME@ -# if !(defined __cplusplus && defined GNULIB_NAMESPACE) -# undef getprogname -# define getprogname rpl_getprogname -# endif -# if @HAVE_DECL_PROGRAM_INVOCATION_NAME@ -_GL_FUNCDECL_RPL (getprogname, const char *, (void) _GL_ATTRIBUTE_PURE); -# else -_GL_FUNCDECL_RPL (getprogname, const char *, (void)); -# endif -_GL_CXXALIAS_RPL (getprogname, const char *, (void)); -# else -# if !@HAVE_GETPROGNAME@ -# if @HAVE_DECL_PROGRAM_INVOCATION_NAME@ -_GL_FUNCDECL_SYS (getprogname, const char *, (void) _GL_ATTRIBUTE_PURE); -# else -_GL_FUNCDECL_SYS (getprogname, const char *, (void)); -# endif -# endif -_GL_CXXALIAS_SYS (getprogname, const char *, (void)); -# endif -# if __GLIBC__ >= 2 -_GL_CXXALIASWARN (getprogname); -# endif -#elif defined GNULIB_POSIXCHECK -# undef getprogname -# if HAVE_RAW_DECL_GETPROGNAME -_GL_WARN_ON_USE (getprogname, "getprogname is unportable - " - "use gnulib module getprogname for portability"); -# endif -#endif - #if @GNULIB_GETSUBOPT@ /* Assuming *OPTIONP is a comma separated list of elements of the form "token" or "token=value", getsubopt parses the first of these elements. @@ -504,28 +361,14 @@ Otherwise it returns -1, and *OPTIONP and *VALUEP are undefined. For more details see the POSIX specification. https://pubs.opengroup.org/onlinepubs/9699919799/functions/getsubopt.html */ -# if @REPLACE_GETSUBOPT@ -# if !(defined __cplusplus && defined GNULIB_NAMESPACE) -# undef getsubopt -# define getsubopt rpl_getsubopt -# endif -_GL_FUNCDECL_RPL (getsubopt, int, - (char **optionp, char *const *tokens, char **valuep) - _GL_ARG_NONNULL ((1, 2, 3))); -_GL_CXXALIAS_RPL (getsubopt, int, - (char **optionp, char *const *tokens, char **valuep)); -# else -# if !@HAVE_GETSUBOPT@ +# if !@HAVE_GETSUBOPT@ _GL_FUNCDECL_SYS (getsubopt, int, (char **optionp, char *const *tokens, char **valuep) _GL_ARG_NONNULL ((1, 2, 3))); -# endif +# endif _GL_CXXALIAS_SYS (getsubopt, int, (char **optionp, char *const *tokens, char **valuep)); -# endif -# if __GLIBC__ >= 2 _GL_CXXALIASWARN (getsubopt); -# endif #elif defined GNULIB_POSIXCHECK # undef getsubopt # if HAVE_RAW_DECL_GETSUBOPT @@ -555,87 +398,25 @@ by never specifying a zero size), so it does not need malloc or realloc to be redefined. */ #if @GNULIB_MALLOC_POSIX@ -# if (@GNULIB_MALLOC_POSIX@ && @REPLACE_MALLOC_FOR_MALLOC_POSIX@) \ - || (@GNULIB_MALLOC_GNU@ && @REPLACE_MALLOC_FOR_MALLOC_GNU@) +# if @REPLACE_MALLOC@ # if !((defined __cplusplus && defined GNULIB_NAMESPACE) \ || _GL_USE_STDLIB_ALLOC) # undef malloc # define malloc rpl_malloc # endif -_GL_FUNCDECL_RPL (malloc, void *, - (size_t size) - _GL_ATTRIBUTE_MALLOC _GL_ATTRIBUTE_DEALLOC_FREE); +_GL_FUNCDECL_RPL (malloc, void *, (size_t size)); _GL_CXXALIAS_RPL (malloc, void *, (size_t size)); # else -# if __GNUC__ >= 11 -/* For -Wmismatched-dealloc: Associate malloc with free or rpl_free. */ -_GL_FUNCDECL_SYS (malloc, void *, - (size_t size) - _GL_ATTRIBUTE_MALLOC _GL_ATTRIBUTE_DEALLOC_FREE); -# endif _GL_CXXALIAS_SYS (malloc, void *, (size_t size)); # endif # if __GLIBC__ >= 2 _GL_CXXALIASWARN (malloc); # endif -#else -# if @GNULIB_FREE_POSIX@ && __GNUC__ >= 11 && !defined malloc -/* For -Wmismatched-dealloc: Associate malloc with free or rpl_free. */ -_GL_FUNCDECL_SYS (malloc, void *, - (size_t size) - _GL_ATTRIBUTE_MALLOC _GL_ATTRIBUTE_DEALLOC_FREE); -# endif -# if defined GNULIB_POSIXCHECK && !_GL_USE_STDLIB_ALLOC -# undef malloc +#elif defined GNULIB_POSIXCHECK && !_GL_USE_STDLIB_ALLOC +# undef malloc /* Assume malloc is always declared. */ _GL_WARN_ON_USE (malloc, "malloc is not POSIX compliant everywhere - " "use gnulib module malloc-posix for portability"); -# endif -#endif - -/* Return maximum number of bytes of a multibyte character. */ -#if @REPLACE_MB_CUR_MAX@ -# if !GNULIB_defined_MB_CUR_MAX -static inline -int gl_MB_CUR_MAX (void) -{ - /* Turn the value 3 to the value 4, as needed for the UTF-8 encoding. */ - return MB_CUR_MAX + (MB_CUR_MAX == 3); -} -# undef MB_CUR_MAX -# define MB_CUR_MAX gl_MB_CUR_MAX () -# define GNULIB_defined_MB_CUR_MAX 1 -# endif -#endif - -/* Convert a string to a wide string. */ -#if @GNULIB_MBSTOWCS@ -# if @REPLACE_MBSTOWCS@ -# if !(defined __cplusplus && defined GNULIB_NAMESPACE) -# undef mbstowcs -# define mbstowcs rpl_mbstowcs -# endif -_GL_FUNCDECL_RPL (mbstowcs, size_t, - (wchar_t *restrict dest, const char *restrict src, - size_t len) - _GL_ARG_NONNULL ((2))); -_GL_CXXALIAS_RPL (mbstowcs, size_t, - (wchar_t *restrict dest, const char *restrict src, - size_t len)); -# else -_GL_CXXALIAS_SYS (mbstowcs, size_t, - (wchar_t *restrict dest, const char *restrict src, - size_t len)); -# endif -# if __GLIBC__ >= 2 -_GL_CXXALIASWARN (mbstowcs); -# endif -#elif defined GNULIB_POSIXCHECK -# undef mbstowcs -# if HAVE_RAW_DECL_MBSTOWCS -_GL_WARN_ON_USE (mbstowcs, "mbstowcs is unportable - " - "use gnulib module mbstowcs for portability"); -# endif #endif /* Convert a multibyte character to a wide character. */ @@ -700,24 +481,12 @@ implementation. Returns the open file descriptor if successful, otherwise -1 and errno set. */ -# if @REPLACE_MKOSTEMP@ -# if !(defined __cplusplus && defined GNULIB_NAMESPACE) -# undef mkostemp -# define mkostemp rpl_mkostemp -# endif -_GL_FUNCDECL_RPL (mkostemp, int, (char * /*template*/, int /*flags*/) - _GL_ARG_NONNULL ((1))); -_GL_CXXALIAS_RPL (mkostemp, int, (char * /*template*/, int /*flags*/)); -# else -# if !@HAVE_MKOSTEMP@ +# if !@HAVE_MKOSTEMP@ _GL_FUNCDECL_SYS (mkostemp, int, (char * /*template*/, int /*flags*/) _GL_ARG_NONNULL ((1))); -# endif -_GL_CXXALIAS_SYS (mkostemp, int, (char * /*template*/, int /*flags*/)); # endif -# if __GLIBC__ >= 2 +_GL_CXXALIAS_SYS (mkostemp, int, (char * /*template*/, int /*flags*/)); _GL_CXXALIASWARN (mkostemp); -# endif #elif defined GNULIB_POSIXCHECK # undef mkostemp # if HAVE_RAW_DECL_MKOSTEMP @@ -740,28 +509,14 @@ implementation. Returns the open file descriptor if successful, otherwise -1 and errno set. */ -# if @REPLACE_MKOSTEMPS@ -# if !(defined __cplusplus && defined GNULIB_NAMESPACE) -# undef mkostemps -# define mkostemps rpl_mkostemps -# endif -_GL_FUNCDECL_RPL (mkostemps, int, - (char * /*template*/, int /*suffixlen*/, int /*flags*/) - _GL_ARG_NONNULL ((1))); -_GL_CXXALIAS_RPL (mkostemps, int, - (char * /*template*/, int /*suffixlen*/, int /*flags*/)); -# else -# if !@HAVE_MKOSTEMPS@ +# if !@HAVE_MKOSTEMPS@ _GL_FUNCDECL_SYS (mkostemps, int, (char * /*template*/, int /*suffixlen*/, int /*flags*/) _GL_ARG_NONNULL ((1))); -# endif +# endif _GL_CXXALIAS_SYS (mkostemps, int, (char * /*template*/, int /*suffixlen*/, int /*flags*/)); -# endif -# if __GLIBC__ >= 2 _GL_CXXALIASWARN (mkostemps); -# endif #elif defined GNULIB_POSIXCHECK # undef mkostemps # if HAVE_RAW_DECL_MKOSTEMPS @@ -860,7 +615,7 @@ (void **memptr, size_t alignment, size_t size)); # endif # endif -# if __GLIBC__ >= 2 && @HAVE_POSIX_MEMALIGN@ +# if @HAVE_POSIX_MEMALIGN@ _GL_CXXALIASWARN (posix_memalign); # endif #elif defined GNULIB_POSIXCHECK @@ -874,22 +629,11 @@ #if @GNULIB_POSIX_OPENPT@ /* Return an FD open to the master side of a pseudo-terminal. Flags should include O_RDWR, and may also include O_NOCTTY. */ -# if @REPLACE_POSIX_OPENPT@ -# if !(defined __cplusplus && defined GNULIB_NAMESPACE) -# undef posix_openpt -# define posix_openpt rpl_posix_openpt -# endif -_GL_FUNCDECL_RPL (posix_openpt, int, (int flags)); -_GL_CXXALIAS_RPL (posix_openpt, int, (int flags)); -# else -# if !@HAVE_POSIX_OPENPT@ +# if !@HAVE_POSIX_OPENPT@ _GL_FUNCDECL_SYS (posix_openpt, int, (int flags)); -# endif -_GL_CXXALIAS_SYS (posix_openpt, int, (int flags)); # endif -# if __GLIBC__ >= 2 +_GL_CXXALIAS_SYS (posix_openpt, int, (int flags)); _GL_CXXALIASWARN (posix_openpt); -# endif #elif defined GNULIB_POSIXCHECK # undef posix_openpt # if HAVE_RAW_DECL_POSIX_OPENPT @@ -992,35 +736,29 @@ /* Sort an array of NMEMB elements, starting at address BASE, each element occupying SIZE bytes, in ascending order according to the comparison function COMPARE. */ -# ifdef __cplusplus -extern "C" { -# endif -# if !GNULIB_defined_qsort_r_fn_types -typedef int (*_gl_qsort_r_compar_fn) (void const *, void const *, void *); -# define GNULIB_defined_qsort_r_fn_types 1 -# endif -# ifdef __cplusplus -} -# endif # if @REPLACE_QSORT_R@ # if !(defined __cplusplus && defined GNULIB_NAMESPACE) # undef qsort_r # define qsort_r rpl_qsort_r # endif _GL_FUNCDECL_RPL (qsort_r, void, (void *base, size_t nmemb, size_t size, - _gl_qsort_r_compar_fn compare, + int (*compare) (void const *, void const *, + void *), void *arg) _GL_ARG_NONNULL ((1, 4))); _GL_CXXALIAS_RPL (qsort_r, void, (void *base, size_t nmemb, size_t size, - _gl_qsort_r_compar_fn compare, + int (*compare) (void const *, void const *, + void *), void *arg)); # else # if !@HAVE_QSORT_R@ _GL_FUNCDECL_SYS (qsort_r, void, (void *base, size_t nmemb, size_t size, - _gl_qsort_r_compar_fn compare, + int (*compare) (void const *, void const *, + void *), void *arg) _GL_ARG_NONNULL ((1, 4))); # endif _GL_CXXALIAS_SYS (qsort_r, void, (void *base, size_t nmemb, size_t size, - _gl_qsort_r_compar_fn compare, + int (*compare) (void const *, void const *, + void *), void *arg)); # endif _GL_CXXALIASWARN (qsort_r); @@ -1058,9 +796,7 @@ int. */ _GL_CXXALIAS_SYS_CAST (random, long, (void)); # endif -# if __GLIBC__ >= 2 _GL_CXXALIASWARN (random); -# endif #elif defined GNULIB_POSIXCHECK # undef random # if HAVE_RAW_DECL_RANDOM @@ -1085,9 +821,7 @@ unsigned long seed. */ _GL_CXXALIAS_SYS_CAST (srandom, void, (unsigned int seed)); # endif -# if __GLIBC__ >= 2 _GL_CXXALIASWARN (srandom); -# endif #elif defined GNULIB_POSIXCHECK # undef srandom # if HAVE_RAW_DECL_SRANDOM @@ -1118,9 +852,7 @@ _GL_CXXALIAS_SYS_CAST (initstate, char *, (unsigned int seed, char *buf, size_t buf_size)); # endif -# if __GLIBC__ >= 2 _GL_CXXALIASWARN (initstate); -# endif #elif defined GNULIB_POSIXCHECK # undef initstate # if HAVE_RAW_DECL_INITSTATE @@ -1145,9 +877,7 @@ is const char *arg_state. */ _GL_CXXALIAS_SYS_CAST (setstate, char *, (char *arg_state)); # endif -# if __GLIBC__ >= 2 _GL_CXXALIASWARN (setstate); -# endif #elif defined GNULIB_POSIXCHECK # undef setstate # if HAVE_RAW_DECL_SETSTATE @@ -1279,63 +1009,36 @@ #if @GNULIB_REALLOC_POSIX@ -# if (@GNULIB_REALLOC_POSIX@ && @REPLACE_REALLOC_FOR_REALLOC_POSIX@) \ - || (@GNULIB_REALLOC_GNU@ && @REPLACE_REALLOC_FOR_REALLOC_GNU@) +# if @REPLACE_REALLOC@ # if !((defined __cplusplus && defined GNULIB_NAMESPACE) \ || _GL_USE_STDLIB_ALLOC) # undef realloc # define realloc rpl_realloc # endif -_GL_FUNCDECL_RPL (realloc, void *, (void *ptr, size_t size) - _GL_ATTRIBUTE_DEALLOC_FREE); +_GL_FUNCDECL_RPL (realloc, void *, (void *ptr, size_t size)); _GL_CXXALIAS_RPL (realloc, void *, (void *ptr, size_t size)); # else -# if __GNUC__ >= 11 -/* For -Wmismatched-dealloc: Associate realloc with free or rpl_free. */ -_GL_FUNCDECL_SYS (realloc, void *, (void *ptr, size_t size) - _GL_ATTRIBUTE_DEALLOC_FREE); -# endif _GL_CXXALIAS_SYS (realloc, void *, (void *ptr, size_t size)); # endif # if __GLIBC__ >= 2 _GL_CXXALIASWARN (realloc); # endif -#else -# if @GNULIB_FREE_POSIX@ && __GNUC__ >= 11 && !defined realloc -/* For -Wmismatched-dealloc: Associate realloc with free or rpl_free. */ -_GL_FUNCDECL_SYS (realloc, void *, (void *ptr, size_t size) - _GL_ATTRIBUTE_DEALLOC_FREE); -# endif -# if defined GNULIB_POSIXCHECK && !_GL_USE_STDLIB_ALLOC -# undef realloc +#elif defined GNULIB_POSIXCHECK && !_GL_USE_STDLIB_ALLOC +# undef realloc /* Assume realloc is always declared. */ _GL_WARN_ON_USE (realloc, "realloc is not POSIX compliant everywhere - " "use gnulib module realloc-posix for portability"); -# endif #endif #if @GNULIB_REALLOCARRAY@ -# if @REPLACE_REALLOCARRAY@ -# if !(defined __cplusplus && defined GNULIB_NAMESPACE) -# undef reallocarray -# define reallocarray rpl_reallocarray -# endif -_GL_FUNCDECL_RPL (reallocarray, void *, - (void *ptr, size_t nmemb, size_t size)); -_GL_CXXALIAS_RPL (reallocarray, void *, - (void *ptr, size_t nmemb, size_t size)); -# else -# if ! @HAVE_REALLOCARRAY@ +# if ! @HAVE_REALLOCARRAY@ _GL_FUNCDECL_SYS (reallocarray, void *, (void *ptr, size_t nmemb, size_t size)); -# endif +# endif _GL_CXXALIAS_SYS (reallocarray, void *, (void *ptr, size_t nmemb, size_t size)); -# endif -# if __GLIBC__ >= 2 _GL_CXXALIASWARN (reallocarray); -# endif #elif defined GNULIB_POSIXCHECK # undef reallocarray # if HAVE_RAW_DECL_REALLOCARRAY @@ -1499,49 +1202,6 @@ # endif #endif -#if @GNULIB_STRTOL@ -/* Parse a signed integer whose textual representation starts at STRING. - The integer is expected to be in base BASE (2 <= BASE <= 36); if BASE == 0, - it may be decimal or octal (with prefix "0") or hexadecimal (with prefix - "0x"). - If ENDPTR is not NULL, the address of the first byte after the integer is - stored in *ENDPTR. - Upon overflow, the return value is LONG_MAX or LONG_MIN, and errno is set - to ERANGE. */ -# if @REPLACE_STRTOL@ -# if !(defined __cplusplus && defined GNULIB_NAMESPACE) -# define strtol rpl_strtol -# endif -# define GNULIB_defined_strtol_function 1 -_GL_FUNCDECL_RPL (strtol, long, - (const char *restrict string, char **restrict endptr, - int base) - _GL_ARG_NONNULL ((1))); -_GL_CXXALIAS_RPL (strtol, long, - (const char *restrict string, char **restrict endptr, - int base)); -# else -# if !@HAVE_STRTOL@ -_GL_FUNCDECL_SYS (strtol, long, - (const char *restrict string, char **restrict endptr, - int base) - _GL_ARG_NONNULL ((1))); -# endif -_GL_CXXALIAS_SYS (strtol, long, - (const char *restrict string, char **restrict endptr, - int base)); -# endif -# if __GLIBC__ >= 2 -_GL_CXXALIASWARN (strtol); -# endif -#elif defined GNULIB_POSIXCHECK -# undef strtol -# if HAVE_RAW_DECL_STRTOL -_GL_WARN_ON_USE (strtol, "strtol is unportable - " - "use gnulib module strtol for portability"); -# endif -#endif - #if @GNULIB_STRTOLL@ /* Parse a signed integer whose textual representation starts at STRING. The integer is expected to be in base BASE (2 <= BASE <= 36); if BASE == 0, @@ -1551,29 +1211,15 @@ stored in *ENDPTR. Upon overflow, the return value is LLONG_MAX or LLONG_MIN, and errno is set to ERANGE. */ -# if @REPLACE_STRTOLL@ -# if !(defined __cplusplus && defined GNULIB_NAMESPACE) -# define strtoll rpl_strtoll -# endif -# define GNULIB_defined_strtoll_function 1 -_GL_FUNCDECL_RPL (strtoll, long long, - (const char *restrict string, char **restrict endptr, - int base) - _GL_ARG_NONNULL ((1))); -_GL_CXXALIAS_RPL (strtoll, long long, - (const char *restrict string, char **restrict endptr, - int base)); -# else -# if !@HAVE_STRTOLL@ +# if !@HAVE_STRTOLL@ _GL_FUNCDECL_SYS (strtoll, long long, (const char *restrict string, char **restrict endptr, int base) _GL_ARG_NONNULL ((1))); -# endif +# endif _GL_CXXALIAS_SYS (strtoll, long long, (const char *restrict string, char **restrict endptr, int base)); -# endif _GL_CXXALIASWARN (strtoll); #elif defined GNULIB_POSIXCHECK # undef strtoll @@ -1583,48 +1229,6 @@ # endif #endif -#if @GNULIB_STRTOUL@ -/* Parse an unsigned integer whose textual representation starts at STRING. - The integer is expected to be in base BASE (2 <= BASE <= 36); if BASE == 0, - it may be decimal or octal (with prefix "0") or hexadecimal (with prefix - "0x"). - If ENDPTR is not NULL, the address of the first byte after the integer is - stored in *ENDPTR. - Upon overflow, the return value is ULONG_MAX, and errno is set to ERANGE. */ -# if @REPLACE_STRTOUL@ -# if !(defined __cplusplus && defined GNULIB_NAMESPACE) -# define strtoul rpl_strtoul -# endif -# define GNULIB_defined_strtoul_function 1 -_GL_FUNCDECL_RPL (strtoul, unsigned long, - (const char *restrict string, char **restrict endptr, - int base) - _GL_ARG_NONNULL ((1))); -_GL_CXXALIAS_RPL (strtoul, unsigned long, - (const char *restrict string, char **restrict endptr, - int base)); -# else -# if !@HAVE_STRTOUL@ -_GL_FUNCDECL_SYS (strtoul, unsigned long, - (const char *restrict string, char **restrict endptr, - int base) - _GL_ARG_NONNULL ((1))); -# endif -_GL_CXXALIAS_SYS (strtoul, unsigned long, - (const char *restrict string, char **restrict endptr, - int base)); -# endif -# if __GLIBC__ >= 2 -_GL_CXXALIASWARN (strtoul); -# endif -#elif defined GNULIB_POSIXCHECK -# undef strtoul -# if HAVE_RAW_DECL_STRTOUL -_GL_WARN_ON_USE (strtoul, "strtoul is unportable - " - "use gnulib module strtoul for portability"); -# endif -#endif - #if @GNULIB_STRTOULL@ /* Parse an unsigned integer whose textual representation starts at STRING. The integer is expected to be in base BASE (2 <= BASE <= 36); if BASE == 0, @@ -1634,29 +1238,15 @@ stored in *ENDPTR. Upon overflow, the return value is ULLONG_MAX, and errno is set to ERANGE. */ -# if @REPLACE_STRTOULL@ -# if !(defined __cplusplus && defined GNULIB_NAMESPACE) -# define strtoull rpl_strtoull -# endif -# define GNULIB_defined_strtoull_function 1 -_GL_FUNCDECL_RPL (strtoull, unsigned long long, - (const char *restrict string, char **restrict endptr, - int base) - _GL_ARG_NONNULL ((1))); -_GL_CXXALIAS_RPL (strtoull, unsigned long long, - (const char *restrict string, char **restrict endptr, - int base)); -# else -# if !@HAVE_STRTOULL@ +# if !@HAVE_STRTOULL@ _GL_FUNCDECL_SYS (strtoull, unsigned long long, (const char *restrict string, char **restrict endptr, int base) _GL_ARG_NONNULL ((1))); -# endif +# endif _GL_CXXALIAS_SYS (strtoull, unsigned long long, (const char *restrict string, char **restrict endptr, int base)); -# endif _GL_CXXALIASWARN (strtoull); #elif defined GNULIB_POSIXCHECK # undef strtoull diff -Nru mmv-2.5/lib/strdup.c mmv-2.5.1/lib/strdup.c --- mmv-2.5/lib/strdup.c 2023-07-20 19:40:23.000000000 +0000 +++ mmv-2.5.1/lib/strdup.c 2023-08-08 11:02:48.000000000 +0000 @@ -1,20 +1,20 @@ -/* Copyright (C) 1991, 1996-1998, 2002-2004, 2006-2007, 2009-2023 Free Software +/* Copyright (C) 1991, 1996-1998, 2002-2004, 2006-2007, 2009-2021 Free Software Foundation, Inc. This file is part of the GNU C Library. - This file is free software: you can redistribute it and/or modify - it under the terms of the GNU Lesser General Public License as - published by the Free Software Foundation; either version 2.1 of the - License, or (at your option) any later version. + 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 file is distributed in the hope that it will be useful, + 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 Lesser General Public License for more details. + GNU General Public License for more details. - You should have received a copy of the GNU Lesser General Public License - along with this program. If not, see . */ + You should have received a copy of the GNU General Public License along + with this program; if not, see . */ #ifndef _LIBC # include diff -Nru mmv-2.5/lib/strerror-override.c mmv-2.5.1/lib/strerror-override.c --- mmv-2.5/lib/strerror-override.c 2023-07-20 19:40:23.000000000 +0000 +++ mmv-2.5.1/lib/strerror-override.c 2023-08-08 11:02:40.000000000 +0000 @@ -1,18 +1,18 @@ /* strerror-override.c --- POSIX compatible system error routine - Copyright (C) 2010-2023 Free Software Foundation, Inc. + Copyright (C) 2010-2021 Free Software Foundation, Inc. - This file is free software: you can redistribute it and/or modify - it under the terms of the GNU Lesser General Public License as - published by the Free Software Foundation; either version 2.1 of the - License, or (at your option) any later version. + 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 of the License, or + (at your option) any later version. - This file is distributed in the hope that it will be useful, + 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 Lesser General Public License for more details. + GNU General Public License for more details. - You should have received a copy of the GNU Lesser General Public License + You should have received a copy of the GNU General Public License along with this program. If not, see . */ /* Written by Bruno Haible , 2010. */ @@ -29,8 +29,6 @@ # endif #endif -#if !GNULIB_defined_strerror_override_macro - /* If ERRNUM maps to an errno value defined by gnulib, return a string describing the error. Otherwise return NULL. */ const char * @@ -39,12 +37,12 @@ /* These error messages are taken from glibc/sysdeps/gnu/errlist.c. */ switch (errnum) { -# if REPLACE_STRERROR_0 +#if REPLACE_STRERROR_0 case 0: return "Success"; -# endif +#endif -# if GNULIB_defined_ESOCK /* native Windows platforms with older */ +#if GNULIB_defined_ESOCK /* native Windows platforms with older */ case EINPROGRESS: return "Operation now in progress"; case EALREADY: @@ -91,8 +89,8 @@ return "No route to host"; case EWOULDBLOCK: return "Operation would block"; -# endif -# if GNULIB_defined_ESTREAMS /* native Windows platforms with older */ +#endif +#if GNULIB_defined_ESTREAMS /* native Windows platforms with older */ case ETXTBSY: return "Text file busy"; case ENODATA: @@ -105,8 +103,8 @@ return "Timer expired"; case EOTHER: return "Other error"; -# endif -# if GNULIB_defined_EWINSOCK /* native Windows platforms */ +#endif +#if GNULIB_defined_EWINSOCK /* native Windows platforms */ case ESOCKTNOSUPPORT: return "Socket type not supported"; case EPFNOSUPPORT: @@ -127,7 +125,7 @@ return "Stale NFS file handle"; case EREMOTE: return "Object is remote"; -# if HAVE_WINSOCK2_H +# if HAVE_WINSOCK2_H /* WSA_INVALID_HANDLE maps to EBADF */ /* WSA_NOT_ENOUGH_MEMORY maps to ENOMEM */ /* WSA_INVALID_PARAMETER maps to EINVAL */ @@ -215,92 +213,90 @@ case WSANO_DATA: return "Valid name, no data record of requested type"; /* WSA_QOS_* omitted */ -# endif # endif +#endif -# if GNULIB_defined_ENOMSG +#if GNULIB_defined_ENOMSG case ENOMSG: return "No message of desired type"; -# endif +#endif -# if GNULIB_defined_EIDRM +#if GNULIB_defined_EIDRM case EIDRM: return "Identifier removed"; -# endif +#endif -# if GNULIB_defined_ENOLINK +#if GNULIB_defined_ENOLINK case ENOLINK: return "Link has been severed"; -# endif +#endif -# if GNULIB_defined_EPROTO +#if GNULIB_defined_EPROTO case EPROTO: return "Protocol error"; -# endif +#endif -# if GNULIB_defined_EMULTIHOP +#if GNULIB_defined_EMULTIHOP case EMULTIHOP: return "Multihop attempted"; -# endif +#endif -# if GNULIB_defined_EBADMSG +#if GNULIB_defined_EBADMSG case EBADMSG: return "Bad message"; -# endif +#endif -# if GNULIB_defined_EOVERFLOW +#if GNULIB_defined_EOVERFLOW case EOVERFLOW: return "Value too large for defined data type"; -# endif +#endif -# if GNULIB_defined_ENOTSUP +#if GNULIB_defined_ENOTSUP case ENOTSUP: return "Not supported"; -# endif +#endif -# if GNULIB_defined_ENETRESET +#if GNULIB_defined_ENETRESET case ENETRESET: return "Network dropped connection on reset"; -# endif +#endif -# if GNULIB_defined_ECONNABORTED +#if GNULIB_defined_ECONNABORTED case ECONNABORTED: return "Software caused connection abort"; -# endif +#endif -# if GNULIB_defined_ESTALE +#if GNULIB_defined_ESTALE case ESTALE: return "Stale NFS file handle"; -# endif +#endif -# if GNULIB_defined_EDQUOT +#if GNULIB_defined_EDQUOT case EDQUOT: return "Disk quota exceeded"; -# endif +#endif -# if GNULIB_defined_ECANCELED +#if GNULIB_defined_ECANCELED case ECANCELED: return "Operation canceled"; -# endif +#endif -# if GNULIB_defined_EOWNERDEAD +#if GNULIB_defined_EOWNERDEAD case EOWNERDEAD: return "Owner died"; -# endif +#endif -# if GNULIB_defined_ENOTRECOVERABLE +#if GNULIB_defined_ENOTRECOVERABLE case ENOTRECOVERABLE: return "State not recoverable"; -# endif +#endif -# if GNULIB_defined_EILSEQ +#if GNULIB_defined_EILSEQ case EILSEQ: return "Invalid or incomplete multibyte or wide character"; -# endif +#endif default: return NULL; } } - -#endif diff -Nru mmv-2.5/lib/strerror-override.h mmv-2.5.1/lib/strerror-override.h --- mmv-2.5/lib/strerror-override.h 2023-07-20 19:40:23.000000000 +0000 +++ mmv-2.5.1/lib/strerror-override.h 2023-08-08 11:02:40.000000000 +0000 @@ -1,28 +1,23 @@ /* strerror-override.h --- POSIX compatible system error routine - Copyright (C) 2010-2023 Free Software Foundation, Inc. + Copyright (C) 2010-2021 Free Software Foundation, Inc. - This file is free software: you can redistribute it and/or modify - it under the terms of the GNU Lesser General Public License as - published by the Free Software Foundation; either version 2.1 of the - License, or (at your option) any later version. + 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 of the License, or + (at your option) any later version. - This file is distributed in the hope that it will be useful, + 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 Lesser General Public License for more details. + GNU General Public License for more details. - You should have received a copy of the GNU Lesser General Public License + You should have received a copy of the GNU General Public License along with this program. If not, see . */ #ifndef _GL_STRERROR_OVERRIDE_H # define _GL_STRERROR_OVERRIDE_H -/* This file uses _GL_ATTRIBUTE_CONST. */ -# if !_GL_CONFIG_H_INCLUDED -# error "Please include config.h first." -# endif - # include # include @@ -56,7 +51,6 @@ extern const char *strerror_override (int errnum) _GL_ATTRIBUTE_CONST; # else # define strerror_override(ignored) NULL -# define GNULIB_defined_strerror_override_macro 1 # endif #endif /* _GL_STRERROR_OVERRIDE_H */ diff -Nru mmv-2.5/lib/strerror.c mmv-2.5.1/lib/strerror.c --- mmv-2.5/lib/strerror.c 2023-07-20 19:40:23.000000000 +0000 +++ mmv-2.5.1/lib/strerror.c 2023-08-08 11:02:40.000000000 +0000 @@ -1,18 +1,18 @@ /* strerror.c --- POSIX compatible system error routine - Copyright (C) 2007-2023 Free Software Foundation, Inc. + Copyright (C) 2007-2021 Free Software Foundation, Inc. - This file is free software: you can redistribute it and/or modify - it under the terms of the GNU Lesser General Public License as - published by the Free Software Foundation; either version 2.1 of the - License, or (at your option) any later version. + 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 of the License, or + (at your option) any later version. - This file is distributed in the hope that it will be useful, + 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 Lesser General Public License for more details. + GNU General Public License for more details. - You should have received a copy of the GNU Lesser General Public License + You should have received a copy of the GNU General Public License along with this program. If not, see . */ #include @@ -27,6 +27,7 @@ #include "intprops.h" #include "strerror-override.h" +#include "verify.h" /* Use the system functions, not the gnulib overrides in this file. */ #undef sprintf @@ -54,7 +55,7 @@ if (!msg || !*msg) { static char const fmt[] = "Unknown error %d"; - static_assert (sizeof buf >= sizeof (fmt) + INT_STRLEN_BOUND (n)); + verify (sizeof buf >= sizeof (fmt) + INT_STRLEN_BOUND (n)); sprintf (buf, fmt, n); errno = EINVAL; return buf; diff -Nru mmv-2.5/lib/string.in.h mmv-2.5.1/lib/string.in.h --- mmv-2.5/lib/string.in.h 2023-07-20 19:40:23.000000000 +0000 +++ mmv-2.5.1/lib/string.in.h 2023-08-08 11:02:48.000000000 +0000 @@ -1,19 +1,19 @@ /* A GNU-like . - Copyright (C) 1995-1996, 2001-2023 Free Software Foundation, Inc. + Copyright (C) 1995-1996, 2001-2021 Free Software Foundation, Inc. - This file is free software: you can redistribute it and/or modify - it under the terms of the GNU Lesser General Public License as - published by the Free Software Foundation; either version 2.1 of the - License, or (at your option) any later version. + 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 file is distributed in the hope that it will be useful, + 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 Lesser General Public License for more details. + GNU General Public License for more details. - You should have received a copy of the GNU Lesser General Public License - along with this program. If not, see . */ + You should have received a copy of the GNU General Public License + along with this program; if not, see . */ #if __GNUC__ >= 3 @PRAGMA_SYSTEM_HEADER@ @@ -44,12 +44,6 @@ #ifndef _@GUARD_PREFIX@_STRING_H #define _@GUARD_PREFIX@_STRING_H -/* This file uses _GL_ATTRIBUTE_DEALLOC, _GL_ATTRIBUTE_MALLOC, - _GL_ATTRIBUTE_PURE, GNULIB_POSIXCHECK, HAVE_RAW_DECL_*. */ -#if !_GL_CONFIG_H_INCLUDED - #error "Please include config.h first." -#endif - /* NetBSD 5.0 mis-defines NULL. */ #include @@ -58,6 +52,16 @@ # include #endif +/* The __attribute__ feature is available in gcc versions 2.5 and later. + The attribute __pure__ was added in gcc 2.96. */ +#ifndef _GL_ATTRIBUTE_PURE +# if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 96) || defined __clang__ +# define _GL_ATTRIBUTE_PURE __attribute__ ((__pure__)) +# else +# define _GL_ATTRIBUTE_PURE /* empty */ +# endif +#endif + /* NetBSD 5.0 declares strsignal in , not in . */ /* But in any case avoid namespace pollution on glibc systems. */ #if (@GNULIB_STRSIGNAL@ || defined GNULIB_POSIXCHECK) && defined __NetBSD__ \ @@ -65,110 +69,20 @@ # include #endif -/* AIX 7.2 and Android 13 declare ffsl and ffsll in , not in - . */ +/* AIX 7.2 declares ffsl and ffsll in , not in . */ /* But in any case avoid namespace pollution on glibc systems. */ #if ((@GNULIB_FFSL@ || @GNULIB_FFSLL@ || defined GNULIB_POSIXCHECK) \ - && (defined _AIX || defined __ANDROID__)) \ + && defined _AIX) \ && ! defined __GLIBC__ # include #endif -/* _GL_ATTRIBUTE_DEALLOC (F, I) declares that the function returns pointers - that can be freed by passing them as the Ith argument to the - function F. */ -#ifndef _GL_ATTRIBUTE_DEALLOC -# if __GNUC__ >= 11 -# define _GL_ATTRIBUTE_DEALLOC(f, i) __attribute__ ((__malloc__ (f, i))) -# else -# define _GL_ATTRIBUTE_DEALLOC(f, i) -# endif -#endif - -/* _GL_ATTRIBUTE_DEALLOC_FREE declares that the function returns pointers that - can be freed via 'free'; it can be used only after declaring 'free'. */ -/* Applies to: functions. Cannot be used on inline functions. */ -#ifndef _GL_ATTRIBUTE_DEALLOC_FREE -# if defined __cplusplus && defined __GNUC__ && !defined __clang__ -/* Work around GCC bug */ -# define _GL_ATTRIBUTE_DEALLOC_FREE \ - _GL_ATTRIBUTE_DEALLOC ((void (*) (void *)) free, 1) -# else -# define _GL_ATTRIBUTE_DEALLOC_FREE \ - _GL_ATTRIBUTE_DEALLOC (free, 1) -# endif -#endif - -/* _GL_ATTRIBUTE_MALLOC declares that the function returns a pointer to freshly - allocated memory. */ -/* Applies to: functions. */ -#ifndef _GL_ATTRIBUTE_MALLOC -# if __GNUC__ >= 3 || defined __clang__ -# define _GL_ATTRIBUTE_MALLOC __attribute__ ((__malloc__)) -# else -# define _GL_ATTRIBUTE_MALLOC -# endif -#endif - -/* The __attribute__ feature is available in gcc versions 2.5 and later. - The attribute __pure__ was added in gcc 2.96. */ -#ifndef _GL_ATTRIBUTE_PURE -# if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 96) || defined __clang__ -# define _GL_ATTRIBUTE_PURE __attribute__ ((__pure__)) -# else -# define _GL_ATTRIBUTE_PURE /* empty */ -# endif -#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. */ -/* Make _GL_ATTRIBUTE_DEALLOC_FREE work, even though may not have - been included yet. */ -#if @GNULIB_FREE_POSIX@ -# if (@REPLACE_FREE@ && !defined free \ - && !(defined __cplusplus && defined GNULIB_NAMESPACE)) -/* We can't do '#define free rpl_free' here. */ -# if defined __cplusplus && (__GLIBC__ + (__GLIBC_MINOR__ >= 14) > 2) -_GL_EXTERN_C void rpl_free (void *) throw (); -# else -_GL_EXTERN_C void rpl_free (void *); -# endif -# undef _GL_ATTRIBUTE_DEALLOC_FREE -# define _GL_ATTRIBUTE_DEALLOC_FREE _GL_ATTRIBUTE_DEALLOC (rpl_free, 1) -# else -# if defined _MSC_VER && !defined free -_GL_EXTERN_C -# if defined _DLL - __declspec (dllimport) -# endif - void __cdecl free (void *); -# else -# if defined __cplusplus && (__GLIBC__ + (__GLIBC_MINOR__ >= 14) > 2) -_GL_EXTERN_C void free (void *) throw (); -# else -_GL_EXTERN_C void free (void *); -# endif -# endif -# endif -#else -# if defined _MSC_VER && !defined free -_GL_EXTERN_C -# if defined _DLL - __declspec (dllimport) -# endif - void __cdecl free (void *); -# else -# if defined __cplusplus && (__GLIBC__ + (__GLIBC_MINOR__ >= 14) > 2) -_GL_EXTERN_C void free (void *) throw (); -# else -_GL_EXTERN_C void free (void *); -# endif -# endif -#endif /* Clear a block of memory. The compiler will not delete a call to this function, even if the block is dead after the call. */ @@ -264,11 +178,10 @@ void const *, (void const *__s, int __c, size_t __n)); # endif # if ((__GLIBC__ == 2 && __GLIBC_MINOR__ >= 10) && !defined __UCLIBC__) \ - && (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 4) \ - || defined __clang__) -_GL_CXXALIASWARN1 (memchr, void *, (void *__s, int __c, size_t __n) throw ()); + && (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 4)) +_GL_CXXALIASWARN1 (memchr, void *, (void *__s, int __c, size_t __n)); _GL_CXXALIASWARN1 (memchr, void const *, - (void const *__s, int __c, size_t __n) throw ()); + (void const *__s, int __c, size_t __n)); # elif __GLIBC__ >= 2 _GL_CXXALIASWARN (memchr); # endif @@ -318,32 +231,16 @@ /* Copy N bytes of SRC to DEST, return pointer to bytes after the last written byte. */ #if @GNULIB_MEMPCPY@ -# if @REPLACE_MEMPCPY@ -# if !(defined __cplusplus && defined GNULIB_NAMESPACE) -# undef mempcpy -# define mempcpy rpl_mempcpy -# endif -_GL_FUNCDECL_RPL (mempcpy, void *, - (void *restrict __dest, void const *restrict __src, - size_t __n) - _GL_ARG_NONNULL ((1, 2))); -_GL_CXXALIAS_RPL (mempcpy, void *, - (void *restrict __dest, void const *restrict __src, - size_t __n)); -# else -# if !@HAVE_MEMPCPY@ +# if ! @HAVE_MEMPCPY@ _GL_FUNCDECL_SYS (mempcpy, void *, (void *restrict __dest, void const *restrict __src, size_t __n) _GL_ARG_NONNULL ((1, 2))); -# endif +# endif _GL_CXXALIAS_SYS (mempcpy, void *, (void *restrict __dest, void const *restrict __src, size_t __n)); -# endif -# if __GLIBC__ >= 2 _GL_CXXALIASWARN (mempcpy); -# endif #elif defined GNULIB_POSIXCHECK # undef mempcpy # if HAVE_RAW_DECL_MEMPCPY @@ -366,11 +263,10 @@ void *, (void const *, int, size_t), void const *, (void const *, int, size_t)); # if ((__GLIBC__ == 2 && __GLIBC_MINOR__ >= 10) && !defined __UCLIBC__) \ - && (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 4) \ - || defined __clang__) -_GL_CXXALIASWARN1 (memrchr, void *, (void *, int, size_t) throw ()); -_GL_CXXALIASWARN1 (memrchr, void const *, (void const *, int, size_t) throw ()); -# elif __GLIBC__ >= 2 + && (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 4)) +_GL_CXXALIASWARN1 (memrchr, void *, (void *, int, size_t)); +_GL_CXXALIASWARN1 (memrchr, void const *, (void const *, int, size_t)); +# else _GL_CXXALIASWARN (memrchr); # endif #elif defined GNULIB_POSIXCHECK @@ -381,23 +277,6 @@ # endif #endif -/* Overwrite a block of memory. The compiler will not optimize - effects away, even if the block is dead after the call. */ -#if @GNULIB_MEMSET_EXPLICIT@ -# if ! @HAVE_MEMSET_EXPLICIT@ -_GL_FUNCDECL_SYS (memset_explicit, void *, - (void *__dest, int __c, size_t __n) _GL_ARG_NONNULL ((1))); -# endif -_GL_CXXALIAS_SYS (memset_explicit, void *, (void *__dest, int __c, size_t __n)); -_GL_CXXALIASWARN (memset_explicit); -#elif defined GNULIB_POSIXCHECK -# undef memset_explicit -# if HAVE_RAW_DECL_MEMSET_EXPLICIT -_GL_WARN_ON_USE (memset_explicit, "memset_explicit is unportable - " - "use gnulib module memset_explicit for portability"); -# endif -#endif - /* Find the first occurrence of C in S. More efficient than memchr(S,C,N), at the expense of undefined behavior if C does not occur within N bytes. */ @@ -414,11 +293,9 @@ void *, (void const *__s, int __c_in), void const *, (void const *__s, int __c_in)); # if ((__GLIBC__ == 2 && __GLIBC_MINOR__ >= 10) && !defined __UCLIBC__) \ - && (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 4) \ - || defined __clang__) -_GL_CXXALIASWARN1 (rawmemchr, void *, (void *__s, int __c_in) throw ()); -_GL_CXXALIASWARN1 (rawmemchr, void const *, - (void const *__s, int __c_in) throw ()); + && (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 4)) +_GL_CXXALIASWARN1 (rawmemchr, void *, (void *__s, int __c_in)); +_GL_CXXALIASWARN1 (rawmemchr, void const *, (void const *__s, int __c_in)); # else _GL_CXXALIASWARN (rawmemchr); # endif @@ -432,28 +309,14 @@ /* Copy SRC to DST, returning the address of the terminating '\0' in DST. */ #if @GNULIB_STPCPY@ -# if @REPLACE_STPCPY@ -# if !(defined __cplusplus && defined GNULIB_NAMESPACE) -# undef stpcpy -# define stpcpy rpl_stpcpy -# endif -_GL_FUNCDECL_RPL (stpcpy, char *, - (char *restrict __dst, char const *restrict __src) - _GL_ARG_NONNULL ((1, 2))); -_GL_CXXALIAS_RPL (stpcpy, char *, - (char *restrict __dst, char const *restrict __src)); -# else -# if !@HAVE_STPCPY@ +# if ! @HAVE_STPCPY@ _GL_FUNCDECL_SYS (stpcpy, char *, (char *restrict __dst, char const *restrict __src) _GL_ARG_NONNULL ((1, 2))); -# endif +# endif _GL_CXXALIAS_SYS (stpcpy, char *, (char *restrict __dst, char const *restrict __src)); -# endif -# if __GLIBC__ >= 2 _GL_CXXALIASWARN (stpcpy); -# endif #elif defined GNULIB_POSIXCHECK # undef stpcpy # if HAVE_RAW_DECL_STPCPY @@ -488,9 +351,7 @@ (char *restrict __dst, char const *restrict __src, size_t __n)); # endif -# if __GLIBC__ >= 2 _GL_CXXALIASWARN (stpncpy); -# endif #elif defined GNULIB_POSIXCHECK # undef stpncpy # if HAVE_RAW_DECL_STPNCPY @@ -536,12 +397,10 @@ char const *, (char const *__s, int __c_in)); # endif # if ((__GLIBC__ == 2 && __GLIBC_MINOR__ >= 10) && !defined __UCLIBC__) \ - && (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 4) \ - || defined __clang__) -_GL_CXXALIASWARN1 (strchrnul, char *, (char *__s, int __c_in) throw ()); -_GL_CXXALIASWARN1 (strchrnul, char const *, - (char const *__s, int __c_in) throw ()); -# elif __GLIBC__ >= 2 + && (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 4)) +_GL_CXXALIASWARN1 (strchrnul, char *, (char *__s, int __c_in)); +_GL_CXXALIASWARN1 (strchrnul, char const *, (char const *__s, int __c_in)); +# else _GL_CXXALIASWARN (strchrnul); # endif #elif defined GNULIB_POSIXCHECK @@ -559,10 +418,7 @@ # undef strdup # define strdup rpl_strdup # endif -_GL_FUNCDECL_RPL (strdup, char *, - (char const *__s) - _GL_ARG_NONNULL ((1)) - _GL_ATTRIBUTE_MALLOC _GL_ATTRIBUTE_DEALLOC_FREE); +_GL_FUNCDECL_RPL (strdup, char *, (char const *__s) _GL_ARG_NONNULL ((1))); _GL_CXXALIAS_RPL (strdup, char *, (char const *__s)); # elif defined _WIN32 && !defined __CYGWIN__ # if !(defined __cplusplus && defined GNULIB_NAMESPACE) @@ -575,47 +431,35 @@ /* strdup exists as a function and as a macro. Get rid of the macro. */ # undef strdup # endif -# if (!@HAVE_DECL_STRDUP@ || __GNUC__ >= 11) && !defined strdup -_GL_FUNCDECL_SYS (strdup, char *, - (char const *__s) - _GL_ARG_NONNULL ((1)) - _GL_ATTRIBUTE_MALLOC _GL_ATTRIBUTE_DEALLOC_FREE); +# if !(@HAVE_DECL_STRDUP@ || defined strdup) +_GL_FUNCDECL_SYS (strdup, char *, (char const *__s) _GL_ARG_NONNULL ((1))); # endif _GL_CXXALIAS_SYS (strdup, char *, (char const *__s)); # endif _GL_CXXALIASWARN (strdup); -#else -# if __GNUC__ >= 11 && !defined strdup -/* For -Wmismatched-dealloc: Associate strdup with free or rpl_free. */ -_GL_FUNCDECL_SYS (strdup, char *, - (char const *__s) - _GL_ARG_NONNULL ((1)) - _GL_ATTRIBUTE_MALLOC _GL_ATTRIBUTE_DEALLOC_FREE); -# endif -# if defined GNULIB_POSIXCHECK -# undef strdup -# if HAVE_RAW_DECL_STRDUP +#elif defined GNULIB_POSIXCHECK +# undef strdup +# if HAVE_RAW_DECL_STRDUP _GL_WARN_ON_USE (strdup, "strdup is unportable - " "use gnulib module strdup for portability"); -# endif -# elif @GNULIB_MDA_STRDUP@ +# endif +#elif @GNULIB_MDA_STRDUP@ /* On native Windows, map 'creat' to '_creat', so that -loldnames is not required. In C++ with GNULIB_NAMESPACE, avoid differences between - platforms by defining GNULIB_NAMESPACE::strdup always. */ -# if defined _WIN32 && !defined __CYGWIN__ -# if !(defined __cplusplus && defined GNULIB_NAMESPACE) -# undef strdup -# define strdup _strdup -# endif + platforms by defining GNULIB_NAMESPACE::creat always. */ +# if defined _WIN32 && !defined __CYGWIN__ +# if !(defined __cplusplus && defined GNULIB_NAMESPACE) +# undef strdup +# define strdup _strdup +# endif _GL_CXXALIAS_MDA (strdup, char *, (char const *__s)); -# else -# if defined __cplusplus && defined GNULIB_NAMESPACE && defined strdup -# undef strdup -# endif -_GL_CXXALIAS_SYS (strdup, char *, (char const *__s)); +# else +# if defined __cplusplus && defined GNULIB_NAMESPACE && defined strdup +# undef strdup # endif -_GL_CXXALIASWARN (strdup); +_GL_CXXALIAS_SYS (strdup, char *, (char const *__s)); # endif +_GL_CXXALIASWARN (strdup); #endif /* Append no more than N characters from SRC onto DEST. */ @@ -652,35 +496,22 @@ # undef strndup # define strndup rpl_strndup # endif -_GL_FUNCDECL_RPL (strndup, char *, - (char const *__s, size_t __n) - _GL_ARG_NONNULL ((1)) - _GL_ATTRIBUTE_MALLOC _GL_ATTRIBUTE_DEALLOC_FREE); +_GL_FUNCDECL_RPL (strndup, char *, (char const *__s, size_t __n) + _GL_ARG_NONNULL ((1))); _GL_CXXALIAS_RPL (strndup, char *, (char const *__s, size_t __n)); # else -# if !@HAVE_DECL_STRNDUP@ || (__GNUC__ >= 11 && !defined strndup) -_GL_FUNCDECL_SYS (strndup, char *, - (char const *__s, size_t __n) - _GL_ARG_NONNULL ((1)) - _GL_ATTRIBUTE_MALLOC _GL_ATTRIBUTE_DEALLOC_FREE); +# if ! @HAVE_DECL_STRNDUP@ +_GL_FUNCDECL_SYS (strndup, char *, (char const *__s, size_t __n) + _GL_ARG_NONNULL ((1))); # endif _GL_CXXALIAS_SYS (strndup, char *, (char const *__s, size_t __n)); # endif _GL_CXXALIASWARN (strndup); -#else -# if __GNUC__ >= 11 && !defined strndup -/* For -Wmismatched-dealloc: Associate strndup with free or rpl_free. */ -_GL_FUNCDECL_SYS (strndup, char *, - (char const *__s, size_t __n) - _GL_ARG_NONNULL ((1)) - _GL_ATTRIBUTE_MALLOC _GL_ATTRIBUTE_DEALLOC_FREE); -# endif -# if defined GNULIB_POSIXCHECK -# undef strndup -# if HAVE_RAW_DECL_STRNDUP +#elif defined GNULIB_POSIXCHECK +# undef strndup +# if HAVE_RAW_DECL_STRNDUP _GL_WARN_ON_USE (strndup, "strndup is unportable - " "use gnulib module strndup for portability"); -# endif # endif #endif @@ -740,11 +571,10 @@ char *, (char const *__s, char const *__accept), const char *, (char const *__s, char const *__accept)); # if ((__GLIBC__ == 2 && __GLIBC_MINOR__ >= 10) && !defined __UCLIBC__) \ - && (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 4) \ - || defined __clang__) -_GL_CXXALIASWARN1 (strpbrk, char *, (char *__s, char const *__accept) throw ()); + && (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 4)) +_GL_CXXALIASWARN1 (strpbrk, char *, (char *__s, char const *__accept)); _GL_CXXALIASWARN1 (strpbrk, char const *, - (char const *__s, char const *__accept) throw ()); + (char const *__s, char const *__accept)); # elif __GLIBC__ >= 2 _GL_CXXALIASWARN (strpbrk); # endif @@ -849,12 +679,10 @@ const char *, (const char *haystack, const char *needle)); # endif # if ((__GLIBC__ == 2 && __GLIBC_MINOR__ >= 10) && !defined __UCLIBC__) \ - && (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 4) \ - || defined __clang__) -_GL_CXXALIASWARN1 (strstr, char *, - (char *haystack, const char *needle) throw ()); + && (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 4)) +_GL_CXXALIASWARN1 (strstr, char *, (char *haystack, const char *needle)); _GL_CXXALIASWARN1 (strstr, const char *, - (const char *haystack, const char *needle) throw ()); + (const char *haystack, const char *needle)); # elif __GLIBC__ >= 2 _GL_CXXALIASWARN (strstr); # endif @@ -900,13 +728,11 @@ const char *, (const char *haystack, const char *needle)); # endif # if ((__GLIBC__ == 2 && __GLIBC_MINOR__ >= 10) && !defined __UCLIBC__) \ - && (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 4) \ - || defined __clang__) -_GL_CXXALIASWARN1 (strcasestr, char *, - (char *haystack, const char *needle) throw ()); + && (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 4)) +_GL_CXXALIASWARN1 (strcasestr, char *, (char *haystack, const char *needle)); _GL_CXXALIASWARN1 (strcasestr, const char *, - (const char *haystack, const char *needle) throw ()); -# elif __GLIBC__ >= 2 + (const char *haystack, const char *needle)); +# else _GL_CXXALIASWARN (strcasestr); # endif #elif defined GNULIB_POSIXCHECK @@ -1010,9 +836,7 @@ _GL_ARG_NONNULL ((1))); _GL_CXXALIAS_SYS (mbslen, size_t, (const char *string)); # endif -# if __GLIBC__ >= 2 _GL_CXXALIASWARN (mbslen); -# endif #endif #if @GNULIB_MBSNLEN@ @@ -1254,7 +1078,7 @@ # endif _GL_CXXALIAS_SYS (strerror_r, int, (int errnum, char *buf, size_t buflen)); # endif -# if __GLIBC__ >= 2 && @HAVE_DECL_STRERROR_R@ +# if @HAVE_DECL_STRERROR_R@ _GL_CXXALIASWARN (strerror_r); # endif #elif defined GNULIB_POSIXCHECK diff -Nru mmv-2.5/lib/stripslash.c mmv-2.5.1/lib/stripslash.c --- mmv-2.5/lib/stripslash.c 2023-07-20 19:40:23.000000000 +0000 +++ mmv-2.5.1/lib/stripslash.c 2023-08-08 11:02:40.000000000 +0000 @@ -1,19 +1,19 @@ /* stripslash.c -- remove redundant trailing slashes from a file name - Copyright (C) 1990, 2001, 2003-2006, 2009-2023 Free Software Foundation, + Copyright (C) 1990, 2001, 2003-2006, 2009-2021 Free Software Foundation, Inc. - This file is free software: you can redistribute it and/or modify - it under the terms of the GNU Lesser General Public License as - published by the Free Software Foundation; either version 2.1 of the - License, or (at your option) any later version. + 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 of the License, or + (at your option) any later version. - This file is distributed in the hope that it will be useful, + 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 Lesser General Public License for more details. + GNU General Public License for more details. - You should have received a copy of the GNU Lesser General Public License + You should have received a copy of the GNU General Public License along with this program. If not, see . */ #include diff -Nru mmv-2.5/lib/symlink.c mmv-2.5.1/lib/symlink.c --- mmv-2.5/lib/symlink.c 2023-07-20 19:40:23.000000000 +0000 +++ mmv-2.5.1/lib/symlink.c 2023-08-08 11:02:40.000000000 +0000 @@ -1,17 +1,17 @@ /* Stub for symlink(). - Copyright (C) 2009-2023 Free Software Foundation, Inc. + Copyright (C) 2009-2021 Free Software Foundation, Inc. - This file is free software: you can redistribute it and/or modify - it under the terms of the GNU Lesser General Public License as - published by the Free Software Foundation, either version 3 of the - License, or (at your option) any later version. + 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 of the License, or + (at your option) any later version. - This file is distributed in the hope that it will be useful, + 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 Lesser General Public License for more details. + GNU General Public License for more details. - You should have received a copy of the GNU Lesser General Public License + You should have received a copy of the GNU General Public License along with this program. If not, see . */ #include @@ -47,8 +47,8 @@ /* The system does not support symlinks. */ int -symlink (_GL_UNUSED char const *contents, - _GL_UNUSED char const *name) +symlink (char const *contents _GL_UNUSED, + char const *name _GL_UNUSED) { errno = ENOSYS; return -1; diff -Nru mmv-2.5/lib/sys_stat.in.h mmv-2.5.1/lib/sys_stat.in.h --- mmv-2.5/lib/sys_stat.in.h 2023-07-20 19:40:23.000000000 +0000 +++ mmv-2.5.1/lib/sys_stat.in.h 2023-08-08 11:02:48.000000000 +0000 @@ -1,18 +1,18 @@ /* Provide a more complete sys/stat.h header file. - Copyright (C) 2005-2023 Free Software Foundation, Inc. + Copyright (C) 2005-2021 Free Software Foundation, Inc. - This file is free software: you can redistribute it and/or modify - it under the terms of the GNU Lesser General Public License as - published by the Free Software Foundation; either version 2.1 of the - License, or (at your option) any later version. + 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 file is distributed in the hope that it will be useful, + 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 Lesser General Public License for more details. + GNU General Public License for more details. - You should have received a copy of the GNU Lesser General Public License - along with this program. If not, see . */ + You should have received a copy of the GNU General Public License + along with this program; if not, see . */ /* Written by Eric Blake, Paul Eggert, and Jim Meyering. */ @@ -25,13 +25,6 @@ #endif @PRAGMA_COLUMNS@ -/* This file uses #include_next of a system file that defines time_t. - For the 'year2038' module to work right, needs to have been - included before. */ -#if !_GL_CONFIG_H_INCLUDED - #error "Please include config.h first." -#endif - #if defined __need_system_sys_stat_h /* Special invocation convention. */ @@ -55,11 +48,6 @@ #ifndef _@GUARD_PREFIX@_SYS_STAT_H #define _@GUARD_PREFIX@_SYS_STAT_H -/* This file uses GNULIB_POSIXCHECK, HAVE_RAW_DECL_*. */ -#if !_GL_CONFIG_H_INCLUDED - #error "Please include config.h first." -#endif - /* The definitions of _GL_FUNCDECL_RPL etc. are copied here. */ /* The definition of _GL_ARG_NONNULL is copied here. */ @@ -403,33 +391,7 @@ #endif -#if @GNULIB_CHMOD@ -# if @REPLACE_CHMOD@ -# if !(defined __cplusplus && defined GNULIB_NAMESPACE) -# undef chmod -# define chmod rpl_chmod -# endif -_GL_FUNCDECL_RPL (chmod, int, (const char *filename, mode_t mode) - _GL_ARG_NONNULL ((1))); -_GL_CXXALIAS_RPL (chmod, int, (const char *filename, mode_t mode)); -# elif defined _WIN32 && !defined __CYGWIN__ -# if !(defined __cplusplus && defined GNULIB_NAMESPACE) -# undef chmod -# define chmod _chmod -# endif -/* Need to cast, because in mingw the last argument is 'int mode'. */ -_GL_CXXALIAS_MDA_CAST (chmod, int, (const char *filename, mode_t mode)); -# else -_GL_CXXALIAS_SYS (chmod, int, (const char *filename, mode_t mode)); -# endif -_GL_CXXALIASWARN (chmod); -#elif defined GNULIB_POSIXCHECK -# undef chmod -# if HAVE_RAW_DECL_CHMOD -_GL_WARN_ON_USE (chmod, "chmod has portability problems - " - "use gnulib module chmod for portability"); -# endif -#elif @GNULIB_MDA_CHMOD@ +#if @GNULIB_MDA_CHMOD@ /* On native Windows, map 'chmod' to '_chmod', so that -loldnames is not required. In C++ with GNULIB_NAMESPACE, avoid differences between platforms by defining GNULIB_NAMESPACE::chmod always. */ @@ -561,7 +523,7 @@ # endif _GL_CXXALIAS_SYS (futimens, int, (int fd, struct timespec const times[2])); # endif -# if __GLIBC__ >= 2 && @HAVE_FUTIMENS@ +# if @HAVE_FUTIMENS@ _GL_CXXALIASWARN (futimens); # endif #elif defined GNULIB_POSIXCHECK @@ -608,6 +570,44 @@ #endif +#if @GNULIB_LSTAT@ +# if ! @HAVE_LSTAT@ +/* mingw does not support symlinks, therefore it does not have lstat. But + without links, stat does just fine. */ +# if !(defined __cplusplus && defined GNULIB_NAMESPACE) +# define lstat stat +# endif +_GL_CXXALIAS_RPL_1 (lstat, stat, int, + (const char *restrict name, struct stat *restrict buf)); +# elif @REPLACE_LSTAT@ +# if !(defined __cplusplus && defined GNULIB_NAMESPACE) +# undef lstat +# define lstat rpl_lstat +# endif +_GL_FUNCDECL_RPL (lstat, int, + (const char *restrict name, struct stat *restrict buf) + _GL_ARG_NONNULL ((1, 2))); +_GL_CXXALIAS_RPL (lstat, int, + (const char *restrict name, struct stat *restrict buf)); +# else +_GL_CXXALIAS_SYS (lstat, int, + (const char *restrict name, struct stat *restrict buf)); +# endif +# if @HAVE_LSTAT@ +_GL_CXXALIASWARN (lstat); +# endif +#elif @GNULIB_OVERRIDES_STRUCT_STAT@ +# undef lstat +# define lstat lstat_used_without_requesting_gnulib_module_lstat +#elif defined GNULIB_POSIXCHECK +# undef lstat +# if HAVE_RAW_DECL_LSTAT +_GL_WARN_ON_USE (lstat, "lstat is unportable - " + "use gnulib module lstat for portability"); +# endif +#endif + + #if @GNULIB_MKDIR@ # if @REPLACE_MKDIR@ # if !(defined __cplusplus && defined GNULIB_NAMESPACE) @@ -728,9 +728,7 @@ # endif _GL_CXXALIAS_SYS (mkfifoat, int, (int fd, char const *file, mode_t mode)); # endif -# if __GLIBC__ >= 2 _GL_CXXALIASWARN (mkfifoat); -# endif #elif defined GNULIB_POSIXCHECK # undef mkfifoat # if HAVE_RAW_DECL_MKFIFOAT @@ -787,9 +785,7 @@ _GL_CXXALIAS_SYS (mknodat, int, (int fd, char const *file, mode_t mode, dev_t dev)); # endif -# if __GLIBC__ >= 2 _GL_CXXALIASWARN (mknodat); -# endif #elif defined GNULIB_POSIXCHECK # undef mknodat # if HAVE_RAW_DECL_MKNODAT @@ -873,44 +869,6 @@ #endif -#if @GNULIB_LSTAT@ -# if ! @HAVE_LSTAT@ -/* mingw does not support symlinks, therefore it does not have lstat. But - without links, stat does just fine. */ -# if !(defined __cplusplus && defined GNULIB_NAMESPACE) -# define lstat stat -# endif -_GL_CXXALIAS_RPL_1 (lstat, stat, int, - (const char *restrict name, struct stat *restrict buf)); -# elif @REPLACE_LSTAT@ -# if !(defined __cplusplus && defined GNULIB_NAMESPACE) -# undef lstat -# define lstat rpl_lstat -# endif -_GL_FUNCDECL_RPL (lstat, int, - (const char *restrict name, struct stat *restrict buf) - _GL_ARG_NONNULL ((1, 2))); -_GL_CXXALIAS_RPL (lstat, int, - (const char *restrict name, struct stat *restrict buf)); -# else -_GL_CXXALIAS_SYS (lstat, int, - (const char *restrict name, struct stat *restrict buf)); -# endif -# if @HAVE_LSTAT@ -_GL_CXXALIASWARN (lstat); -# endif -#elif @GNULIB_OVERRIDES_STRUCT_STAT@ -# undef lstat -# define lstat lstat_used_without_requesting_gnulib_module_lstat -#elif defined GNULIB_POSIXCHECK -# undef lstat -# if HAVE_RAW_DECL_LSTAT -_GL_WARN_ON_USE (lstat, "lstat is unportable - " - "use gnulib module lstat for portability"); -# endif -#endif - - #if @GNULIB_MDA_UMASK@ /* On native Windows, map 'umask' to '_umask', so that -loldnames is not required. In C++ with GNULIB_NAMESPACE, avoid differences between @@ -953,7 +911,7 @@ _GL_CXXALIAS_SYS (utimensat, int, (int fd, char const *name, struct timespec const times[2], int flag)); # endif -# if __GLIBC__ >= 2 && @HAVE_UTIMENSAT@ +# if @HAVE_UTIMENSAT@ _GL_CXXALIASWARN (utimensat); # endif #elif defined GNULIB_POSIXCHECK diff -Nru mmv-2.5/lib/sys_types.in.h mmv-2.5.1/lib/sys_types.in.h --- mmv-2.5/lib/sys_types.in.h 2023-07-20 19:40:23.000000000 +0000 +++ mmv-2.5.1/lib/sys_types.in.h 2023-08-08 11:02:48.000000000 +0000 @@ -1,32 +1,25 @@ /* Provide a more complete sys/types.h. - Copyright (C) 2011-2023 Free Software Foundation, Inc. + Copyright (C) 2011-2021 Free Software Foundation, Inc. - This file is free software: you can redistribute it and/or modify - it under the terms of the GNU Lesser General Public License as - published by the Free Software Foundation; either version 2.1 of the - License, or (at your option) any later version. + 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 file is distributed in the hope that it will be useful, + 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 Lesser General Public License for more details. + GNU General Public License for more details. - You should have received a copy of the GNU Lesser General Public License - along with this program. If not, see . */ + You should have received a copy of the GNU General Public License + along with this program; if not, see . */ #if __GNUC__ >= 3 @PRAGMA_SYSTEM_HEADER@ #endif @PRAGMA_COLUMNS@ -/* This file uses #include_next of a system file that defines time_t. - For the 'year2038' module to work right, needs to have been - included before. */ -#if !_GL_CONFIG_H_INCLUDED - #error "Please include config.h first." -#endif - #if defined _WIN32 && !defined __CYGWIN__ \ && (defined __need_off_t || defined __need___off64_t \ || defined __need_ssize_t || defined __need_time_t) diff -Nru mmv-2.5/lib/time.in.h mmv-2.5.1/lib/time.in.h --- mmv-2.5/lib/time.in.h 2023-07-20 19:40:23.000000000 +0000 +++ mmv-2.5.1/lib/time.in.h 2023-08-08 11:02:48.000000000 +0000 @@ -1,32 +1,25 @@ /* A more-standard . - Copyright (C) 2007-2023 Free Software Foundation, Inc. + Copyright (C) 2007-2021 Free Software Foundation, Inc. - This file is free software: you can redistribute it and/or modify - it under the terms of the GNU Lesser General Public License as - published by the Free Software Foundation; either version 2.1 of the - License, or (at your option) any later version. + 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 file is distributed in the hope that it will be useful, + 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 Lesser General Public License for more details. + GNU General Public License for more details. - You should have received a copy of the GNU Lesser General Public License - along with this program. If not, see . */ + You should have received a copy of the GNU General Public License + along with this program; if not, see . */ #if __GNUC__ >= 3 @PRAGMA_SYSTEM_HEADER@ #endif @PRAGMA_COLUMNS@ -/* This file uses #include_next of a system file that defines time_t. - For the 'year2038' module to work right, needs to have been - included before. */ -#if !_GL_CONFIG_H_INCLUDED - #error "Please include config.h first." -#endif - /* Don't get in the way of glibc when it includes time.h merely to declare a few standard symbols, rather than to declare all the symbols. (However, skip this for MinGW as it treats __need_time_t @@ -52,12 +45,6 @@ # @INCLUDE_NEXT@ @NEXT_TIME_H@ -/* This file uses _GL_ATTRIBUTE_DEPRECATED, GNULIB_POSIXCHECK, - HAVE_RAW_DECL_*. */ -# if !_GL_CONFIG_H_INCLUDED -# error "Please include config.h first." -# endif - /* NetBSD 5.0 mis-defines NULL. */ # include @@ -125,51 +112,12 @@ /* Set *TS to the current time, and return BASE. Upon failure, return 0. */ # if @GNULIB_TIMESPEC_GET@ -# if @REPLACE_TIMESPEC_GET@ -# if !(defined __cplusplus && defined GNULIB_NAMESPACE) -# undef timespec_get -# define timespec_get rpl_timespec_get -# endif -_GL_FUNCDECL_RPL (timespec_get, int, (struct timespec *ts, int base) - _GL_ARG_NONNULL ((1))); -_GL_CXXALIAS_RPL (timespec_get, int, (struct timespec *ts, int base)); -# else -# if !@HAVE_TIMESPEC_GET@ +# if ! @HAVE_TIMESPEC_GET@ _GL_FUNCDECL_SYS (timespec_get, int, (struct timespec *ts, int base) _GL_ARG_NONNULL ((1))); -# endif -_GL_CXXALIAS_SYS (timespec_get, int, (struct timespec *ts, int base)); # endif -# if __GLIBC__ >= 2 +_GL_CXXALIAS_SYS (timespec_get, int, (struct timespec *ts, int base)); _GL_CXXALIASWARN (timespec_get); -# endif -# endif - -/* Set *TS to the current time resolution, and return BASE. - Upon failure, return 0. */ -# if @GNULIB_TIMESPEC_GETRES@ -# if ! @HAVE_TIMESPEC_GETRES@ -_GL_FUNCDECL_SYS (timespec_getres, int, (struct timespec *ts, int base) - _GL_ARG_NONNULL ((1))); -# endif -_GL_CXXALIAS_SYS (timespec_getres, int, (struct timespec *ts, int base)); -_GL_CXXALIASWARN (timespec_getres); -# endif - -/* Return the number of seconds that have elapsed since the Epoch. */ -# if @GNULIB_TIME@ -# if @REPLACE_TIME@ -# if !(defined __cplusplus && defined GNULIB_NAMESPACE) -# define time rpl_time -# endif -_GL_FUNCDECL_RPL (time, time_t, (time_t *__tp)); -_GL_CXXALIAS_RPL (time, time_t, (time_t *__tp)); -# else -_GL_CXXALIAS_SYS (time, time_t, (time_t *__tp)); -# endif -# if __GLIBC__ >= 2 -_GL_CXXALIASWARN (time); -# endif # endif /* Sleep for at least RQTP seconds unless interrupted, If interrupted, @@ -356,9 +304,6 @@ # if !(defined __cplusplus && defined GNULIB_NAMESPACE) # define ctime rpl_ctime # endif -# ifndef __cplusplus -_GL_ATTRIBUTE_DEPRECATED -# endif _GL_FUNCDECL_RPL (ctime, char *, (time_t const *__tp) _GL_ARG_NONNULL ((1))); _GL_CXXALIAS_RPL (ctime, char *, (time_t const *__tp)); @@ -395,60 +340,22 @@ # endif # if defined _GNU_SOURCE && @GNULIB_TIME_RZ@ && ! @HAVE_TIMEZONE_T@ -/* Functions that use a first-class time zone data type, instead of - relying on an implicit global time zone. - Inspired by NetBSD. */ - -/* Represents a time zone. - (timezone_t) NULL stands for UTC. */ typedef struct tm_zone *timezone_t; - -/* tzalloc (name) - Returns a time zone object for the given time zone NAME. This object - represents the time zone that other functions would use it the TZ - environment variable was set to NAME. - If NAME is NULL, the result represents the time zone that other functions - would use it the TZ environment variable was unset. - May return NULL if NAME is invalid (this is platform dependent) or - upon memory allocation failure. */ _GL_FUNCDECL_SYS (tzalloc, timezone_t, (char const *__name)); _GL_CXXALIAS_SYS (tzalloc, timezone_t, (char const *__name)); - -/* tzfree (tz) - Frees a time zone object. - The argument must have been returned by tzalloc(). */ _GL_FUNCDECL_SYS (tzfree, void, (timezone_t __tz)); _GL_CXXALIAS_SYS (tzfree, void, (timezone_t __tz)); - -/* localtime_rz (tz, &t, &result) - Converts an absolute time T to a broken-down time RESULT, assuming the - time zone TZ. - This function is like 'localtime_r', but relies on the argument TZ instead - of an implicit global time zone. */ _GL_FUNCDECL_SYS (localtime_rz, struct tm *, (timezone_t __tz, time_t const *restrict __timer, struct tm *restrict __result) _GL_ARG_NONNULL ((2, 3))); _GL_CXXALIAS_SYS (localtime_rz, struct tm *, (timezone_t __tz, time_t const *restrict __timer, struct tm *restrict __result)); - -/* mktime_z (tz, &tm) - Normalizes the broken-down time TM and converts it to an absolute time, - assuming the time zone TZ. Returns the absolute time. - This function is like 'mktime', but relies on the argument TZ instead - of an implicit global time zone. */ _GL_FUNCDECL_SYS (mktime_z, time_t, - (timezone_t __tz, struct tm *restrict __tm) + (timezone_t __tz, struct tm *restrict __result) _GL_ARG_NONNULL ((2))); _GL_CXXALIAS_SYS (mktime_z, time_t, - (timezone_t __tz, struct tm *restrict __tm)); - -/* Time zone abbreviation strings (returned by 'localtime_rz' or 'mktime_z' - in the 'tm_zone' member of 'struct tm') are valid as long as - - the 'struct tm' argument is not destroyed or overwritten, - and - - the 'timezone_t' argument is not freed through tzfree(). */ - + (timezone_t __tz, struct tm *restrict __result)); # endif /* Convert TM to a time_t value, assuming UTC. */ @@ -466,9 +373,7 @@ # endif _GL_CXXALIAS_SYS (timegm, time_t, (struct tm *__tm)); # endif -# if __GLIBC__ >= 2 _GL_CXXALIASWARN (timegm); -# endif # endif /* Encourage applications to avoid unsafe functions that can overrun @@ -481,10 +386,8 @@ # endif # if defined GNULIB_POSIXCHECK # undef asctime_r -# if HAVE_RAW_DECL_ASCTIME_R _GL_WARN_ON_USE (asctime_r, "asctime_r can overrun buffers in some cases - " "better use strftime (or even sprintf) instead"); -# endif # endif # if defined GNULIB_POSIXCHECK # undef ctime @@ -493,10 +396,8 @@ # endif # if defined GNULIB_POSIXCHECK # undef ctime_r -# if HAVE_RAW_DECL_CTIME_R _GL_WARN_ON_USE (ctime_r, "ctime_r can overrun buffers in some cases - " "better use strftime (or even sprintf) instead"); -# endif # endif #endif diff -Nru mmv-2.5/lib/unistd.c mmv-2.5.1/lib/unistd.c --- mmv-2.5/lib/unistd.c 2023-07-20 19:40:23.000000000 +0000 +++ mmv-2.5.1/lib/unistd.c 2023-08-08 11:02:40.000000000 +0000 @@ -1,22 +1,4 @@ -/* Inline functions for . - - Copyright (C) 2012-2023 Free Software Foundation, Inc. - - This file is free software: you can redistribute it and/or modify - it under the terms of the GNU Lesser General Public License as - published by the Free Software Foundation; either version 2.1 of the - License, or (at your option) any later version. - - This file 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 Lesser General Public License for more details. - - You should have received a copy of the GNU Lesser General Public License - along with this program. If not, see . */ - #include - #define _GL_UNISTD_INLINE _GL_EXTERN_INLINE #include "unistd.h" typedef int dummy; diff -Nru mmv-2.5/lib/unistd.in.h mmv-2.5.1/lib/unistd.in.h --- mmv-2.5/lib/unistd.in.h 2023-07-20 19:40:23.000000000 +0000 +++ mmv-2.5.1/lib/unistd.in.h 2023-08-08 11:02:48.000000000 +0000 @@ -1,18 +1,18 @@ /* Substitute for and wrapper around . - Copyright (C) 2003-2023 Free Software Foundation, Inc. + Copyright (C) 2003-2021 Free Software Foundation, Inc. - This file is free software: you can redistribute it and/or modify - it under the terms of the GNU Lesser General Public License as - published by the Free Software Foundation; either version 2.1 of the - License, or (at your option) any later version. + 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 file is distributed in the hope that it will be useful, + 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 Lesser General Public License for more details. + GNU General Public License for more details. - You should have received a copy of the GNU Lesser General Public License - along with this program. If not, see . */ + You should have received a copy of the GNU General Public License + along with this program; if not, see . */ #ifndef _@GUARD_PREFIX@_UNISTD_H @@ -40,24 +40,6 @@ # undef _GL_INCLUDING_UNISTD_H #endif -/* Avoid lseek bugs in FreeBSD, macOS . - This bug is fixed after FreeBSD 13; see . - Use macOS "9999" to stand for a future fixed macOS version. */ -#if defined __FreeBSD__ && __FreeBSD__ < 14 -# undef SEEK_DATA -# undef SEEK_HOLE -#elif defined __APPLE__ && defined __MACH__ && defined SEEK_DATA -# ifdef __ENVIRONMENT_MAC_OS_X_VERSION_MIN_REQUIRED__ -# include -# endif -# if (!defined MAC_OS_X_VERSION_MIN_REQUIRED \ - || MAC_OS_X_VERSION_MIN_REQUIRED < 99990000) -# include /* It also defines the two macros. */ -# undef SEEK_DATA -# undef SEEK_HOLE -# endif -#endif - /* Get all possible declarations of gethostname(). */ #if @GNULIB_GETHOSTNAME@ && @UNISTD_H_HAVE_WINSOCK2_H@ \ && !defined _GL_INCLUDING_WINSOCK2_H @@ -69,12 +51,6 @@ #if !defined _@GUARD_PREFIX@_UNISTD_H && !defined _GL_INCLUDING_WINSOCK2_H #define _@GUARD_PREFIX@_UNISTD_H -/* This file uses _GL_INLINE_HEADER_BEGIN, _GL_INLINE, GNULIB_POSIXCHECK, - HAVE_RAW_DECL_*. */ -#if !_GL_CONFIG_H_INCLUDED - #error "Please include config.h first." -#endif - /* NetBSD 5.0 mis-defines NULL. Also get size_t. */ /* But avoid namespace pollution on glibc systems. */ #ifndef __GLIBC__ @@ -176,6 +152,9 @@ # include #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 @@ -436,30 +415,16 @@ #if @GNULIB_COPY_FILE_RANGE@ -# if @REPLACE_COPY_FILE_RANGE@ -# if !(defined __cplusplus && defined GNULIB_NAMESPACE) -# undef copy_file_range -# define copy_file_range rpl_copy_file_range -# endif -_GL_FUNCDECL_RPL (copy_file_range, ssize_t, (int ifd, off_t *ipos, - int ofd, off_t *opos, - size_t len, unsigned flags)); -_GL_CXXALIAS_RPL (copy_file_range, ssize_t, (int ifd, off_t *ipos, - int ofd, off_t *opos, - size_t len, unsigned flags)); -# else -# if !@HAVE_COPY_FILE_RANGE@ +# if !@HAVE_COPY_FILE_RANGE@ _GL_FUNCDECL_SYS (copy_file_range, ssize_t, (int ifd, off_t *ipos, int ofd, off_t *opos, size_t len, unsigned flags)); -# endif _GL_CXXALIAS_SYS (copy_file_range, ssize_t, (int ifd, off_t *ipos, int ofd, off_t *opos, size_t len, unsigned flags)); # endif _GL_CXXALIASWARN (copy_file_range); #elif defined GNULIB_POSIXCHECK -# undef copy_file_range # if HAVE_RAW_DECL_COPY_FILE_RANGE _GL_WARN_ON_USE (copy_file_range, "copy_file_range is unportable - " @@ -562,22 +527,17 @@ Return newfd if successful, otherwise -1 and errno set. See the Linux man page at . */ -# if @REPLACE_DUP3@ +# if @HAVE_DUP3@ # if !(defined __cplusplus && defined GNULIB_NAMESPACE) -# undef dup3 # define dup3 rpl_dup3 # endif _GL_FUNCDECL_RPL (dup3, int, (int oldfd, int newfd, int flags)); _GL_CXXALIAS_RPL (dup3, int, (int oldfd, int newfd, int flags)); # else -# if !@HAVE_DUP3@ _GL_FUNCDECL_SYS (dup3, int, (int oldfd, int newfd, int flags)); -# endif _GL_CXXALIAS_SYS (dup3, int, (int oldfd, int newfd, int flags)); # endif -# if __GLIBC__ >= 2 _GL_CXXALIASWARN (dup3); -# endif #elif defined GNULIB_POSIXCHECK # undef dup3 # if HAVE_RAW_DECL_DUP3 @@ -896,9 +856,7 @@ _GL_CXXALIAS_SYS (execvpe, int, (const char *program, char * const *argv, char * const *env)); # endif -# if __GLIBC__ >= 2 _GL_CXXALIASWARN (execvpe); -# endif #elif defined GNULIB_POSIXCHECK # undef execvpe # if HAVE_RAW_DECL_EXECVPE @@ -953,9 +911,7 @@ _GL_CXXALIAS_SYS (faccessat, int, (int fd, char const *file, int mode, int flag)); # endif -# if __GLIBC__ >= 2 _GL_CXXALIASWARN (faccessat); -# endif #elif defined GNULIB_POSIXCHECK # undef faccessat # if HAVE_RAW_DECL_FACCESSAT @@ -1032,22 +988,11 @@ Return 0 if successful, otherwise -1 and errno set. See POSIX:2008 specification . */ -# if @REPLACE_FDATASYNC@ -# if !(defined __cplusplus && defined GNULIB_NAMESPACE) -# undef fdatasync -# define fdatasync rpl_fdatasync -# endif -_GL_FUNCDECL_RPL (fdatasync, int, (int fd)); -_GL_CXXALIAS_RPL (fdatasync, int, (int fd)); -# else -# if !@HAVE_FDATASYNC@|| !@HAVE_DECL_FDATASYNC@ +# if !@HAVE_FDATASYNC@ || !@HAVE_DECL_FDATASYNC@ _GL_FUNCDECL_SYS (fdatasync, int, (int fd)); -# endif -_GL_CXXALIAS_SYS (fdatasync, int, (int fd)); # endif -# if __GLIBC__ >= 2 +_GL_CXXALIAS_SYS (fdatasync, int, (int fd)); _GL_CXXALIASWARN (fdatasync); -# endif #elif defined GNULIB_POSIXCHECK # undef fdatasync # if HAVE_RAW_DECL_FDATASYNC @@ -1094,9 +1039,7 @@ # endif _GL_CXXALIAS_SYS (ftruncate, int, (int fd, off_t length)); # endif -# if __GLIBC__ >= 2 _GL_CXXALIASWARN (ftruncate); -# endif #elif defined GNULIB_POSIXCHECK # undef ftruncate # if HAVE_RAW_DECL_FTRUNCATE @@ -1186,9 +1129,7 @@ # endif _GL_CXXALIAS_SYS (getdomainname, int, (char *name, size_t len)); # endif -# if __GLIBC__ >= 2 _GL_CXXALIASWARN (getdomainname); -# endif #elif defined GNULIB_POSIXCHECK # undef getdomainname # if HAVE_RAW_DECL_GETDOMAINNAME @@ -1228,22 +1169,11 @@ #if @GNULIB_GETENTROPY@ /* Fill a buffer with random bytes. */ -# if @REPLACE_GETENTROPY@ -# if !(defined __cplusplus && defined GNULIB_NAMESPACE) -# undef getentropy -# define getentropy rpl_getentropy -# endif -_GL_FUNCDECL_RPL (getentropy, int, (void *buffer, size_t length)); -_GL_CXXALIAS_RPL (getentropy, int, (void *buffer, size_t length)); -# else -# if !@HAVE_GETENTROPY@ +# if !@HAVE_GETENTROPY@ _GL_FUNCDECL_SYS (getentropy, int, (void *buffer, size_t length)); -# endif -_GL_CXXALIAS_SYS (getentropy, int, (void *buffer, size_t length)); # endif -# if __GLIBC__ >= 2 +_GL_CXXALIAS_SYS (getentropy, int, (void *buffer, size_t length)); _GL_CXXALIASWARN (getentropy); -# endif #elif defined GNULIB_POSIXCHECK # undef getentropy # if HAVE_RAW_DECL_GETENTROPY @@ -1377,9 +1307,7 @@ int size. */ _GL_CXXALIAS_SYS_CAST (getlogin_r, int, (char *name, size_t size)); # endif -# if __GLIBC__ >= 2 _GL_CXXALIASWARN (getlogin_r); -# endif #elif defined GNULIB_POSIXCHECK # undef getlogin_r # if HAVE_RAW_DECL_GETLOGIN_R @@ -1481,8 +1409,7 @@ Read a password from /dev/tty or stdin. Function getpass() from module 'getpass-gnu': Read a password of arbitrary length from /dev/tty or stdin. */ -# if (@GNULIB_GETPASS@ && @REPLACE_GETPASS@) \ - || (@GNULIB_GETPASS_GNU@ && @REPLACE_GETPASS_FOR_GETPASS_GNU@) +# if @REPLACE_GETPASS@ # if !(defined __cplusplus && defined GNULIB_NAMESPACE) # undef getpass # define getpass rpl_getpass @@ -1594,7 +1521,6 @@ # undef isatty # define isatty rpl_isatty # endif -# define GNULIB_defined_isatty 1 _GL_FUNCDECL_RPL (isatty, int, (int fd)); _GL_CXXALIAS_RPL (isatty, int, (int fd)); # elif defined _WIN32 && !defined __CYGWIN__ @@ -1717,9 +1643,7 @@ (int fd1, const char *path1, int fd2, const char *path2, int flag)); # endif -# if __GLIBC__ >= 2 _GL_CXXALIASWARN (linkat); -# endif #elif defined GNULIB_POSIXCHECK # undef linkat # if HAVE_RAW_DECL_LINKAT @@ -1800,9 +1724,8 @@ Return 0 upon success, or -1 with errno set upon failure. See also the Linux man page at . */ -# if @REPLACE_PIPE2@ +# if @HAVE_PIPE2@ # if !(defined __cplusplus && defined GNULIB_NAMESPACE) -# undef pipe2 # define pipe2 rpl_pipe2 # endif _GL_FUNCDECL_RPL (pipe2, int, (int fd[2], int flags) _GL_ARG_NONNULL ((1))); @@ -1811,9 +1734,7 @@ _GL_FUNCDECL_SYS (pipe2, int, (int fd[2], int flags) _GL_ARG_NONNULL ((1))); _GL_CXXALIAS_SYS (pipe2, int, (int fd[2], int flags)); # endif -# if __GLIBC__ >= 2 _GL_CXXALIASWARN (pipe2); -# endif #elif defined GNULIB_POSIXCHECK # undef pipe2 # if HAVE_RAW_DECL_PIPE2 @@ -1848,9 +1769,7 @@ _GL_CXXALIAS_SYS (pread, ssize_t, (int fd, void *buf, size_t bufsize, off_t offset)); # endif -# if __GLIBC__ >= 2 _GL_CXXALIASWARN (pread); -# endif #elif defined GNULIB_POSIXCHECK # undef pread # if HAVE_RAW_DECL_PREAD @@ -1885,9 +1804,7 @@ _GL_CXXALIAS_SYS (pwrite, ssize_t, (int fd, const void *buf, size_t bufsize, off_t offset)); # endif -# if __GLIBC__ >= 2 _GL_CXXALIASWARN (pwrite); -# endif #elif defined GNULIB_POSIXCHECK # undef pwrite # if HAVE_RAW_DECL_PWRITE @@ -2001,9 +1918,7 @@ (int fd, char const *restrict file, char *restrict buf, size_t len)); # endif -# if __GLIBC__ >= 2 _GL_CXXALIASWARN (readlinkat); -# endif #elif defined GNULIB_POSIXCHECK # undef readlinkat # if HAVE_RAW_DECL_READLINKAT @@ -2063,27 +1978,15 @@ Platforms with no ability to set the hostname return -1 and set errno = ENOSYS. */ -# if @REPLACE_SETHOSTNAME@ -# if !(defined __cplusplus && defined GNULIB_NAMESPACE) -# undef sethostname -# define sethostname rpl_sethostname -# endif -_GL_FUNCDECL_RPL (sethostname, int, (const char *name, size_t len) - _GL_ARG_NONNULL ((1))); -_GL_CXXALIAS_RPL (sethostname, int, (const char *name, size_t len)); -# else -# if !@HAVE_SETHOSTNAME@ || !@HAVE_DECL_SETHOSTNAME@ +# if !@HAVE_SETHOSTNAME@ || !@HAVE_DECL_SETHOSTNAME@ _GL_FUNCDECL_SYS (sethostname, int, (const char *name, size_t len) _GL_ARG_NONNULL ((1))); -# endif +# endif /* Need to cast, because on Solaris 11 2011-10, Mac OS X 10.5, IRIX 6.5 and FreeBSD 6.4 the second parameter is int. On Solaris 11 2011-10, the first parameter is not const. */ _GL_CXXALIAS_SYS_CAST (sethostname, int, (const char *name, size_t len)); -# endif -# if __GLIBC__ >= 2 _GL_CXXALIASWARN (sethostname); -# endif #elif defined GNULIB_POSIXCHECK # undef sethostname # if HAVE_RAW_DECL_SETHOSTNAME @@ -2124,23 +2027,15 @@ #if @GNULIB_MDA_SWAB@ /* On native Windows, map 'swab' to '_swab', so that -loldnames is not required. In C++ with GNULIB_NAMESPACE, avoid differences between - platforms by defining GNULIB_NAMESPACE::swab always. */ + platforms by defining GNULIB_NAMESPACE::creat always. */ # if defined _WIN32 && !defined __CYGWIN__ # if !(defined __cplusplus && defined GNULIB_NAMESPACE) # undef swab # define swab _swab # endif -/* Need to cast, because in old mingw the arguments are - (const char *from, char *to, size_t n). */ -_GL_CXXALIAS_MDA_CAST (swab, void, (char *from, char *to, int n)); -# else -# if defined __hpux /* HP-UX */ -_GL_CXXALIAS_SYS (swab, void, (const char *from, char *to, int n)); -# elif defined __sun && (defined __SunOS_5_10 || defined __XOPEN_OR_POSIX) && !defined _XPG4 /* Solaris */ -_GL_CXXALIAS_SYS (swab, void, (const char *from, char *to, ssize_t n)); -# else +_GL_CXXALIAS_MDA (swab, void, (char *from, char *to, int n)); +# else _GL_CXXALIAS_SYS (swab, void, (const void *from, void *to, ssize_t n)); -# endif # endif _GL_CXXALIASWARN (swab); #endif @@ -2192,9 +2087,7 @@ _GL_CXXALIAS_SYS (symlinkat, int, (char const *contents, int fd, char const *file)); # endif -# if __GLIBC__ >= 2 _GL_CXXALIASWARN (symlinkat); -# endif #elif defined GNULIB_POSIXCHECK # undef symlinkat # if HAVE_RAW_DECL_SYMLINKAT @@ -2224,9 +2117,7 @@ # endif _GL_CXXALIAS_SYS (truncate, int, (const char *filename, off_t length)); # endif -# if __GLIBC__ >= 2 _GL_CXXALIASWARN (truncate); -# endif #elif defined GNULIB_POSIXCHECK # undef truncate # if HAVE_RAW_DECL_TRUNCATE @@ -2256,9 +2147,7 @@ _GL_CXXALIAS_SYS (ttyname_r, int, (int fd, char *buf, size_t buflen)); # endif -# if __GLIBC__ >= 2 _GL_CXXALIASWARN (ttyname_r); -# endif #elif defined GNULIB_POSIXCHECK # undef ttyname_r # if HAVE_RAW_DECL_TTYNAME_R diff -Nru mmv-2.5/lib/unlink.c mmv-2.5.1/lib/unlink.c --- mmv-2.5/lib/unlink.c 2023-07-20 19:40:23.000000000 +0000 +++ mmv-2.5.1/lib/unlink.c 2023-08-08 11:02:40.000000000 +0000 @@ -1,18 +1,18 @@ /* Work around unlink bugs. - Copyright (C) 2009-2023 Free Software Foundation, Inc. + Copyright (C) 2009-2021 Free Software Foundation, Inc. - This file is free software: you can redistribute it and/or modify - it under the terms of the GNU Lesser General Public License as - published by the Free Software Foundation; either version 2.1 of the - License, or (at your option) any later version. + 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 of the License, or + (at your option) any later version. - This file is distributed in the hope that it will be useful, + 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 Lesser General Public License for more details. + GNU General Public License for more details. - You should have received a copy of the GNU Lesser General Public License + You should have received a copy of the GNU General Public License along with this program. If not, see . */ #include diff -Nru mmv-2.5/lib/vasnprintf.c mmv-2.5.1/lib/vasnprintf.c --- mmv-2.5/lib/vasnprintf.c 2023-07-20 19:40:24.000000000 +0000 +++ mmv-2.5.1/lib/vasnprintf.c 2023-08-08 11:02:48.000000000 +0000 @@ -1,18 +1,18 @@ /* vsprintf with automatic memory allocation. - Copyright (C) 1999, 2002-2023 Free Software Foundation, Inc. + Copyright (C) 1999, 2002-2021 Free Software Foundation, Inc. - This file is free software: you can redistribute it and/or modify - it under the terms of the GNU Lesser General Public License as - published by the Free Software Foundation; either version 2.1 of the - License, or (at your option) any later version. + 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 file is distributed in the hope that it will be useful, + 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 Lesser General Public License for more details. + GNU General Public License for more details. - You should have received a copy of the GNU Lesser General Public License - along with this program. If not, see . */ + You should have received a copy of the GNU General Public License along + with this program; if not, see . */ /* This file can be parametrized with the following macros: VASNPRINTF The name of the function being defined. @@ -60,16 +60,10 @@ #ifndef VASNPRINTF # include #endif - -/* As of GCC 11.2.1, gcc -Wanalyzer-too-complex reports that main's - use of CHECK macros expands to code that is too complicated for gcc - -fanalyzer. Suppress the resulting bogus warnings. */ -#if 10 <= __GNUC__ -# pragma GCC diagnostic ignored "-Wanalyzer-null-argument" +#ifndef IN_LIBINTL +# include #endif -#include - /* Specification. */ #ifndef VASNPRINTF # if WIDE_CHAR_VERSION @@ -83,9 +77,8 @@ #include /* snprintf(), sprintf() */ #include /* abort(), malloc(), realloc(), free() */ #include /* memcpy(), strlen() */ -#include /* mbstate_t, mbrtowc(), mbrlen(), wcrtomb() */ #include /* errno */ -#include /* CHAR_BIT, INT_WIDTH, LONG_WIDTH */ +#include /* CHAR_BIT */ #include /* DBL_MAX_EXP, LDBL_MAX_EXP */ #if HAVE_NL_LANGINFO # include @@ -102,30 +95,31 @@ #include "xsize.h" #include "attribute.h" +#include "verify.h" -#if NEED_PRINTF_DOUBLE || NEED_PRINTF_LONG_DOUBLE || (NEED_WPRINTF_DIRECTIVE_LA && WIDE_CHAR_VERSION) +#if (NEED_PRINTF_DOUBLE || NEED_PRINTF_LONG_DOUBLE) && !defined IN_LIBINTL # include # include "float+.h" #endif -#if NEED_PRINTF_DOUBLE || NEED_PRINTF_INFINITE_DOUBLE +#if (NEED_PRINTF_DOUBLE || NEED_PRINTF_INFINITE_DOUBLE) && !defined IN_LIBINTL # include # include "isnand-nolibm.h" #endif -#if NEED_PRINTF_LONG_DOUBLE || NEED_PRINTF_INFINITE_LONG_DOUBLE || (NEED_WPRINTF_DIRECTIVE_LA && WIDE_CHAR_VERSION) +#if (NEED_PRINTF_LONG_DOUBLE || NEED_PRINTF_INFINITE_LONG_DOUBLE) && !defined IN_LIBINTL # include # include "isnanl-nolibm.h" # include "fpucw.h" #endif -#if NEED_PRINTF_DIRECTIVE_A || NEED_PRINTF_DOUBLE +#if (NEED_PRINTF_DIRECTIVE_A || NEED_PRINTF_DOUBLE) && !defined IN_LIBINTL # include # include "isnand-nolibm.h" # include "printf-frexp.h" #endif -#if NEED_PRINTF_DIRECTIVE_A || NEED_PRINTF_LONG_DOUBLE || (NEED_WPRINTF_DIRECTIVE_LA && WIDE_CHAR_VERSION) +#if (NEED_PRINTF_DIRECTIVE_A || NEED_PRINTF_LONG_DOUBLE) && !defined IN_LIBINTL # include # include "isnanl-nolibm.h" # include "printf-frexpl.h" @@ -138,6 +132,8 @@ # define VASNPRINTF vasnwprintf # define FCHAR_T wchar_t # define DCHAR_T wchar_t +# define TCHAR_T wchar_t +# define DCHAR_IS_TCHAR 1 # define DIRECTIVE wchar_t_directive # define DIRECTIVES wchar_t_directives # define PRINTF_PARSE wprintf_parse @@ -157,32 +153,24 @@ # endif #endif #if WIDE_CHAR_VERSION - /* DCHAR_T is wchar_t. */ -# if HAVE_DECL__SNWPRINTF || (HAVE_SWPRINTF && HAVE_WORKING_SWPRINTF) -# define TCHAR_T wchar_t -# define DCHAR_IS_TCHAR 1 -# define USE_SNPRINTF 1 -# if HAVE_DECL__SNWPRINTF - /* On Windows, the function swprintf() has a different signature than - on Unix; we use the function _snwprintf() or - on mingw - snwprintf() - instead. The mingw function snwprintf() has fewer bugs than the - MSVCRT function _snwprintf(), so prefer that. */ -# if defined __MINGW32__ -# define SNPRINTF snwprintf -# else -# define SNPRINTF _snwprintf -# define USE_MSVC__SNPRINTF 1 -# endif + /* TCHAR_T is wchar_t. */ +# define USE_SNPRINTF 1 +# if HAVE_DECL__SNWPRINTF + /* On Windows, the function swprintf() has a different signature than + on Unix; we use the function _snwprintf() or - on mingw - snwprintf() + instead. The mingw function snwprintf() has fewer bugs than the + MSVCRT function _snwprintf(), so prefer that. */ +# if defined __MINGW32__ +# define SNPRINTF snwprintf # else - /* Unix. */ -# define SNPRINTF swprintf +# define SNPRINTF _snwprintf +# define USE_MSVC__SNPRINTF 1 # endif # else - /* Old platforms such as NetBSD 3.0, OpenBSD 3.8, HP-UX 11.00, IRIX 6.5. */ -# define TCHAR_T char + /* Unix. */ +# define SNPRINTF swprintf # endif -#endif -#if !WIDE_CHAR_VERSION || !DCHAR_IS_TCHAR +#else /* TCHAR_T is char. */ /* Use snprintf if it exists under the name 'snprintf' or '_snprintf'. But don't use it on BeOS, since BeOS snprintf produces no output if the @@ -247,7 +235,7 @@ # endif #endif -#if (((!USE_SNPRINTF || WIDE_CHAR_VERSION || !HAVE_SNPRINTF_RETVAL_C99 || USE_MSVC__SNPRINTF) && WIDE_CHAR_VERSION) || ((!USE_SNPRINTF || !HAVE_SNPRINTF_RETVAL_C99 || USE_MSVC__SNPRINTF || NEED_PRINTF_DIRECTIVE_LS) && !WIDE_CHAR_VERSION && DCHAR_IS_TCHAR)) && HAVE_WCHAR_T +#if (((!USE_SNPRINTF || !HAVE_SNPRINTF_RETVAL_C99 || USE_MSVC__SNPRINTF) && WIDE_CHAR_VERSION) || ((!USE_SNPRINTF || !HAVE_SNPRINTF_RETVAL_C99 || USE_MSVC__SNPRINTF || (NEED_PRINTF_DIRECTIVE_LS && !defined IN_LIBINTL)) && !WIDE_CHAR_VERSION && DCHAR_IS_TCHAR)) && HAVE_WCHAR_T # if HAVE_WCSLEN # define local_wcslen wcslen # else @@ -270,8 +258,8 @@ # endif #endif -#if (!USE_SNPRINTF || (WIDE_CHAR_VERSION && DCHAR_IS_TCHAR) || !HAVE_SNPRINTF_RETVAL_C99 || USE_MSVC__SNPRINTF) && HAVE_WCHAR_T && WIDE_CHAR_VERSION -# if HAVE_WCSNLEN && HAVE_DECL_WCSNLEN +#if (!USE_SNPRINTF || !HAVE_SNPRINTF_RETVAL_C99 || USE_MSVC__SNPRINTF) && HAVE_WCHAR_T && WIDE_CHAR_VERSION +# if HAVE_WCSNLEN # define local_wcsnlen wcsnlen # else # ifndef local_wcsnlen_defined @@ -289,7 +277,7 @@ # endif #endif -#if (((!USE_SNPRINTF || !HAVE_SNPRINTF_RETVAL_C99 || USE_MSVC__SNPRINTF || NEED_PRINTF_DIRECTIVE_LS || ENABLE_WCHAR_FALLBACK) && HAVE_WCHAR_T) || ((NEED_PRINTF_DIRECTIVE_LC || ENABLE_WCHAR_FALLBACK) && HAVE_WINT_T)) && !WIDE_CHAR_VERSION +#if (((!USE_SNPRINTF || !HAVE_SNPRINTF_RETVAL_C99 || USE_MSVC__SNPRINTF || (NEED_PRINTF_DIRECTIVE_LS && !defined IN_LIBINTL) || ENABLE_WCHAR_FALLBACK) && HAVE_WCHAR_T) || (ENABLE_WCHAR_FALLBACK && HAVE_WINT_T)) && !WIDE_CHAR_VERSION # if ENABLE_WCHAR_FALLBACK static size_t wctomb_fallback (char *s, wchar_t wc) @@ -357,7 +345,7 @@ # endif #endif -#if NEED_PRINTF_DIRECTIVE_A || NEED_PRINTF_LONG_DOUBLE || NEED_PRINTF_INFINITE_LONG_DOUBLE || NEED_PRINTF_DOUBLE || NEED_PRINTF_INFINITE_DOUBLE || (NEED_WPRINTF_DIRECTIVE_LA && WIDE_CHAR_VERSION) +#if (NEED_PRINTF_DIRECTIVE_A || NEED_PRINTF_LONG_DOUBLE || NEED_PRINTF_INFINITE_LONG_DOUBLE || NEED_PRINTF_DOUBLE || NEED_PRINTF_INFINITE_DOUBLE) && !defined IN_LIBINTL /* Determine the decimal-point character according to the current locale. */ # ifndef decimal_point_char_defined # define decimal_point_char_defined 1 @@ -384,7 +372,7 @@ # endif #endif -#if NEED_PRINTF_INFINITE_DOUBLE && !NEED_PRINTF_DOUBLE +#if NEED_PRINTF_INFINITE_DOUBLE && !NEED_PRINTF_DOUBLE && !defined IN_LIBINTL /* Equivalent to !isfinite(x) || x == 0, but does not require libm. */ static int @@ -395,7 +383,7 @@ #endif -#if NEED_PRINTF_INFINITE_LONG_DOUBLE && !NEED_PRINTF_LONG_DOUBLE +#if NEED_PRINTF_INFINITE_LONG_DOUBLE && !NEED_PRINTF_LONG_DOUBLE && !defined IN_LIBINTL /* Equivalent to !isfinite(x) || x == 0, but does not require libm. */ static int @@ -406,7 +394,7 @@ #endif -#if NEED_PRINTF_LONG_DOUBLE || NEED_PRINTF_DOUBLE +#if (NEED_PRINTF_LONG_DOUBLE || NEED_PRINTF_DOUBLE) && !defined IN_LIBINTL /* Converting 'long double' to decimal without rare rounding bugs requires real bignums. We use the naming conventions of GNU gmp, but vastly simpler @@ -414,11 +402,11 @@ typedef unsigned int mp_limb_t; # define GMP_LIMB_BITS 32 -static_assert (sizeof (mp_limb_t) * CHAR_BIT == GMP_LIMB_BITS); +verify (sizeof (mp_limb_t) * CHAR_BIT == GMP_LIMB_BITS); typedef unsigned long long mp_twolimb_t; # define GMP_TWOLIMB_BITS 64 -static_assert (sizeof (mp_twolimb_t) * CHAR_BIT == GMP_TWOLIMB_BITS); +verify (sizeof (mp_twolimb_t) * CHAR_BIT == GMP_TWOLIMB_BITS); /* Representation of a bignum >= 0. */ typedef struct @@ -921,20 +909,13 @@ q_ptr[q_len++] = 1; } keep_q: - free (tmp_roomptr); + if (tmp_roomptr != NULL) + free (tmp_roomptr); q->limbs = q_ptr; q->nlimbs = q_len; return roomptr; } -/* Avoid pointless GCC warning "argument 1 value '18446744073709551615' exceeds - maximum object size 9223372036854775807", triggered by the use of xsum as - argument of malloc. */ -# if __GNUC__ >= 7 -# pragma GCC diagnostic push -# pragma GCC diagnostic ignored "-Walloc-size-larger-than=" -# endif - /* Convert a bignum a >= 0, multiplied with 10^extra_zeroes, to decimal representation. Destroys the contents of a. @@ -991,10 +972,6 @@ return c_ptr; } -# if __GNUC__ >= 7 -# pragma GCC diagnostic pop -# endif - # if NEED_PRINTF_LONG_DOUBLE /* Assuming x is finite and >= 0: @@ -1189,6 +1166,8 @@ void *z_memory; char *digits; + if (memory == NULL) + return NULL; /* x = 2^e * m, hence y = round (2^e * 10^n * m) = round (2^(e+n) * 5^n * m) = round (2^s * 5^n * m). */ @@ -1396,13 +1375,10 @@ static char * scale10_round_decimal_long_double (long double x, int n) { - int e; + int e IF_LINT(= 0); mpn_t m; void *memory = decode_long_double (x, &e, &m); - if (memory != NULL) - return scale10_round_decimal_decoded (e, m, memory, n); - else - return NULL; + return scale10_round_decimal_decoded (e, m, memory, n); } # endif @@ -1417,13 +1393,10 @@ static char * scale10_round_decimal_double (double x, int n) { - int e; + int e IF_LINT(= 0); mpn_t m; void *memory = decode_double (x, &e, &m); - if (memory != NULL) - return scale10_round_decimal_decoded (e, m, memory, n); - else - return NULL; + return scale10_round_decimal_decoded (e, m, memory, n); } # endif @@ -1626,7 +1599,7 @@ #endif -#if !USE_SNPRINTF || (WIDE_CHAR_VERSION && DCHAR_IS_TCHAR) || !HAVE_SNPRINTF_RETVAL_C99 || USE_MSVC__SNPRINTF +#if !USE_SNPRINTF || !HAVE_SNPRINTF_RETVAL_C99 || USE_MSVC__SNPRINTF /* Use a different function name, to make it possible that the 'wchar_t' parametrization and the 'char' parametrization get compiled in the same @@ -1649,156 +1622,24 @@ switch (conversion) { case 'd': case 'i': case 'u': - switch (type) - { - default: - tmp_length = - (unsigned int) (sizeof (unsigned int) * CHAR_BIT - * 0.30103 /* binary -> decimal */ - ) - + 1; /* turn floor into ceil */ - break; - case TYPE_LONGINT: - tmp_length = - (unsigned int) (sizeof (long int) * CHAR_BIT - * 0.30103 /* binary -> decimal */ - ) - + 1; /* turn floor into ceil */ - break; - case TYPE_ULONGINT: - tmp_length = - (unsigned int) (sizeof (unsigned long int) * CHAR_BIT - * 0.30103 /* binary -> decimal */ - ) - + 1; /* turn floor into ceil */ - break; - case TYPE_LONGLONGINT: - tmp_length = - (unsigned int) (sizeof (long long int) * CHAR_BIT - * 0.30103 /* binary -> decimal */ - ) - + 1; /* turn floor into ceil */ - break; - case TYPE_ULONGLONGINT: - tmp_length = - (unsigned int) (sizeof (unsigned long long int) * CHAR_BIT - * 0.30103 /* binary -> decimal */ - ) - + 1; /* turn floor into ceil */ - break; - case TYPE_INT8_T: - tmp_length = - (unsigned int) (sizeof (int8_t) * CHAR_BIT - * 0.30103 /* binary -> decimal */ - ) - + 1; /* turn floor into ceil */ - break; - case TYPE_UINT8_T: - tmp_length = - (unsigned int) (sizeof (uint8_t) * CHAR_BIT - * 0.30103 /* binary -> decimal */ - ) - + 1; /* turn floor into ceil */ - break; - case TYPE_INT16_T: - tmp_length = - (unsigned int) (sizeof (int16_t) * CHAR_BIT - * 0.30103 /* binary -> decimal */ - ) - + 1; /* turn floor into ceil */ - break; - case TYPE_UINT16_T: - tmp_length = - (unsigned int) (sizeof (uint16_t) * CHAR_BIT - * 0.30103 /* binary -> decimal */ - ) - + 1; /* turn floor into ceil */ - break; - case TYPE_INT32_T: - tmp_length = - (unsigned int) (sizeof (int32_t) * CHAR_BIT - * 0.30103 /* binary -> decimal */ - ) - + 1; /* turn floor into ceil */ - break; - case TYPE_UINT32_T: - tmp_length = - (unsigned int) (sizeof (uint32_t) * CHAR_BIT - * 0.30103 /* binary -> decimal */ - ) - + 1; /* turn floor into ceil */ - break; - case TYPE_INT64_T: - tmp_length = - (unsigned int) (sizeof (int64_t) * CHAR_BIT - * 0.30103 /* binary -> decimal */ - ) - + 1; /* turn floor into ceil */ - break; - case TYPE_UINT64_T: - tmp_length = - (unsigned int) (sizeof (uint64_t) * CHAR_BIT - * 0.30103 /* binary -> decimal */ - ) - + 1; /* turn floor into ceil */ - break; - case TYPE_INT_FAST8_T: - tmp_length = - (unsigned int) (sizeof (int_fast8_t) * CHAR_BIT - * 0.30103 /* binary -> decimal */ - ) - + 1; /* turn floor into ceil */ - break; - case TYPE_UINT_FAST8_T: - tmp_length = - (unsigned int) (sizeof (uint_fast8_t) * CHAR_BIT - * 0.30103 /* binary -> decimal */ - ) - + 1; /* turn floor into ceil */ - break; - case TYPE_INT_FAST16_T: - tmp_length = - (unsigned int) (sizeof (int_fast16_t) * CHAR_BIT - * 0.30103 /* binary -> decimal */ - ) - + 1; /* turn floor into ceil */ - break; - case TYPE_UINT_FAST16_T: - tmp_length = - (unsigned int) (sizeof (uint_fast16_t) * CHAR_BIT - * 0.30103 /* binary -> decimal */ - ) - + 1; /* turn floor into ceil */ - break; - case TYPE_INT_FAST32_T: - tmp_length = - (unsigned int) (sizeof (int_fast32_t) * CHAR_BIT - * 0.30103 /* binary -> decimal */ - ) - + 1; /* turn floor into ceil */ - break; - case TYPE_UINT_FAST32_T: - tmp_length = - (unsigned int) (sizeof (uint_fast32_t) * CHAR_BIT - * 0.30103 /* binary -> decimal */ - ) - + 1; /* turn floor into ceil */ - break; - case TYPE_INT_FAST64_T: - tmp_length = - (unsigned int) (sizeof (int_fast64_t) * CHAR_BIT - * 0.30103 /* binary -> decimal */ - ) - + 1; /* turn floor into ceil */ - break; - case TYPE_UINT_FAST64_T: - tmp_length = - (unsigned int) (sizeof (uint_fast64_t) * CHAR_BIT - * 0.30103 /* binary -> decimal */ - ) - + 1; /* turn floor into ceil */ - break; - } + if (type == TYPE_LONGLONGINT || type == TYPE_ULONGLONGINT) + tmp_length = + (unsigned int) (sizeof (unsigned long long) * CHAR_BIT + * 0.30103 /* binary -> decimal */ + ) + + 1; /* turn floor into ceil */ + else if (type == TYPE_LONGINT || type == TYPE_ULONGINT) + tmp_length = + (unsigned int) (sizeof (unsigned long) * CHAR_BIT + * 0.30103 /* binary -> decimal */ + ) + + 1; /* turn floor into ceil */ + else + tmp_length = + (unsigned int) (sizeof (unsigned int) * CHAR_BIT + * 0.30103 /* binary -> decimal */ + ) + + 1; /* turn floor into ceil */ if (tmp_length < precision) tmp_length = precision; /* Multiply by 2, as an estimate for FLAG_GROUP. */ @@ -1807,156 +1648,25 @@ tmp_length = xsum (tmp_length, 1); break; - case 'b': - #if SUPPORT_GNU_PRINTF_DIRECTIVES \ - || (__GLIBC__ + (__GLIBC_MINOR__ >= 35) > 2) - case 'B': - #endif - switch (type) - { - default: - tmp_length = - (unsigned int) (sizeof (unsigned int) * CHAR_BIT) - + 1; /* turn floor into ceil */ - break; - case TYPE_ULONGINT: - tmp_length = - (unsigned int) (sizeof (unsigned long int) * CHAR_BIT) - + 1; /* turn floor into ceil */ - break; - case TYPE_ULONGLONGINT: - tmp_length = - (unsigned int) (sizeof (unsigned long long int) * CHAR_BIT) - + 1; /* turn floor into ceil */ - break; - case TYPE_UINT8_T: - tmp_length = - (unsigned int) (sizeof (uint8_t) * CHAR_BIT) - + 1; /* turn floor into ceil */ - break; - case TYPE_UINT16_T: - tmp_length = - (unsigned int) (sizeof (uint16_t) * CHAR_BIT) - + 1; /* turn floor into ceil */ - break; - case TYPE_UINT32_T: - tmp_length = - (unsigned int) (sizeof (uint32_t) * CHAR_BIT) - + 1; /* turn floor into ceil */ - break; - case TYPE_UINT64_T: - tmp_length = - (unsigned int) (sizeof (uint64_t) * CHAR_BIT) - + 1; /* turn floor into ceil */ - break; - case TYPE_UINT_FAST8_T: - tmp_length = - (unsigned int) (sizeof (uint_fast8_t) * CHAR_BIT) - + 1; /* turn floor into ceil */ - break; - case TYPE_UINT_FAST16_T: - tmp_length = - (unsigned int) (sizeof (uint_fast16_t) * CHAR_BIT) - + 1; /* turn floor into ceil */ - break; - case TYPE_UINT_FAST32_T: - tmp_length = - (unsigned int) (sizeof (uint_fast32_t) * CHAR_BIT) - + 1; /* turn floor into ceil */ - break; - case TYPE_UINT_FAST64_T: - tmp_length = - (unsigned int) (sizeof (uint_fast64_t) * CHAR_BIT) - + 1; /* turn floor into ceil */ - break; - } - if (tmp_length < precision) - tmp_length = precision; - /* Add 2, to account for a prefix from the alternate form. */ - tmp_length = xsum (tmp_length, 2); - break; - case 'o': - switch (type) - { - default: - tmp_length = - (unsigned int) (sizeof (unsigned int) * CHAR_BIT - * 0.333334 /* binary -> octal */ - ) - + 1; /* turn floor into ceil */ - break; - case TYPE_ULONGINT: - tmp_length = - (unsigned int) (sizeof (unsigned long int) * CHAR_BIT - * 0.333334 /* binary -> octal */ - ) - + 1; /* turn floor into ceil */ - break; - case TYPE_ULONGLONGINT: - tmp_length = - (unsigned int) (sizeof (unsigned long long int) * CHAR_BIT - * 0.333334 /* binary -> octal */ - ) - + 1; /* turn floor into ceil */ - break; - case TYPE_UINT8_T: - tmp_length = - (unsigned int) (sizeof (uint8_t) * CHAR_BIT - * 0.333334 /* binary -> octal */ - ) - + 1; /* turn floor into ceil */ - break; - case TYPE_UINT16_T: - tmp_length = - (unsigned int) (sizeof (uint16_t) * CHAR_BIT - * 0.333334 /* binary -> octal */ - ) - + 1; /* turn floor into ceil */ - break; - case TYPE_UINT32_T: - tmp_length = - (unsigned int) (sizeof (uint32_t) * CHAR_BIT - * 0.333334 /* binary -> octal */ - ) - + 1; /* turn floor into ceil */ - break; - case TYPE_UINT64_T: - tmp_length = - (unsigned int) (sizeof (uint64_t) * CHAR_BIT - * 0.333334 /* binary -> octal */ - ) - + 1; /* turn floor into ceil */ - break; - case TYPE_UINT_FAST8_T: - tmp_length = - (unsigned int) (sizeof (uint_fast8_t) * CHAR_BIT - * 0.333334 /* binary -> octal */ - ) - + 1; /* turn floor into ceil */ - break; - case TYPE_UINT_FAST16_T: - tmp_length = - (unsigned int) (sizeof (uint_fast16_t) * CHAR_BIT - * 0.333334 /* binary -> octal */ - ) - + 1; /* turn floor into ceil */ - break; - case TYPE_UINT_FAST32_T: - tmp_length = - (unsigned int) (sizeof (uint_fast32_t) * CHAR_BIT - * 0.333334 /* binary -> octal */ - ) - + 1; /* turn floor into ceil */ - break; - case TYPE_UINT_FAST64_T: - tmp_length = - (unsigned int) (sizeof (uint_fast64_t) * CHAR_BIT - * 0.333334 /* binary -> octal */ - ) - + 1; /* turn floor into ceil */ - break; - } + if (type == TYPE_LONGLONGINT || type == TYPE_ULONGLONGINT) + tmp_length = + (unsigned int) (sizeof (unsigned long long) * CHAR_BIT + * 0.333334 /* binary -> octal */ + ) + + 1; /* turn floor into ceil */ + else if (type == TYPE_LONGINT || type == TYPE_ULONGINT) + tmp_length = + (unsigned int) (sizeof (unsigned long) * CHAR_BIT + * 0.333334 /* binary -> octal */ + ) + + 1; /* turn floor into ceil */ + else + tmp_length = + (unsigned int) (sizeof (unsigned int) * CHAR_BIT + * 0.333334 /* binary -> octal */ + ) + + 1; /* turn floor into ceil */ if (tmp_length < precision) tmp_length = precision; /* Add 1, to account for a leading sign. */ @@ -1964,89 +1674,27 @@ break; case 'x': case 'X': - switch (type) - { - default: - tmp_length = - (unsigned int) (sizeof (unsigned int) * CHAR_BIT - * 0.25 /* binary -> hexadecimal */ - ) - + 1; /* turn floor into ceil */ - break; - case TYPE_ULONGINT: - tmp_length = - (unsigned int) (sizeof (unsigned long int) * CHAR_BIT - * 0.25 /* binary -> hexadecimal */ - ) - + 1; /* turn floor into ceil */ - break; - case TYPE_ULONGLONGINT: - tmp_length = - (unsigned int) (sizeof (unsigned long long int) * CHAR_BIT - * 0.25 /* binary -> hexadecimal */ - ) - + 1; /* turn floor into ceil */ - break; - case TYPE_UINT8_T: - tmp_length = - (unsigned int) (sizeof (uint8_t) * CHAR_BIT - * 0.25 /* binary -> hexadecimal */ - ) - + 1; /* turn floor into ceil */ - break; - case TYPE_UINT16_T: - tmp_length = - (unsigned int) (sizeof (uint16_t) * CHAR_BIT - * 0.25 /* binary -> hexadecimal */ - ) - + 1; /* turn floor into ceil */ - break; - case TYPE_UINT32_T: - tmp_length = - (unsigned int) (sizeof (uint32_t) * CHAR_BIT - * 0.25 /* binary -> hexadecimal */ - ) - + 1; /* turn floor into ceil */ - break; - case TYPE_UINT64_T: - tmp_length = - (unsigned int) (sizeof (uint64_t) * CHAR_BIT - * 0.25 /* binary -> hexadecimal */ - ) - + 1; /* turn floor into ceil */ - break; - case TYPE_UINT_FAST8_T: - tmp_length = - (unsigned int) (sizeof (uint_fast8_t) * CHAR_BIT - * 0.25 /* binary -> hexadecimal */ - ) - + 1; /* turn floor into ceil */ - break; - case TYPE_UINT_FAST16_T: - tmp_length = - (unsigned int) (sizeof (uint_fast16_t) * CHAR_BIT - * 0.25 /* binary -> hexadecimal */ - ) - + 1; /* turn floor into ceil */ - break; - case TYPE_UINT_FAST32_T: - tmp_length = - (unsigned int) (sizeof (uint_fast32_t) * CHAR_BIT - * 0.25 /* binary -> hexadecimal */ - ) - + 1; /* turn floor into ceil */ - break; - case TYPE_UINT_FAST64_T: - tmp_length = - (unsigned int) (sizeof (uint_fast64_t) * CHAR_BIT - * 0.25 /* binary -> hexadecimal */ - ) - + 1; /* turn floor into ceil */ - break; - } + if (type == TYPE_LONGLONGINT || type == TYPE_ULONGLONGINT) + tmp_length = + (unsigned int) (sizeof (unsigned long long) * CHAR_BIT + * 0.25 /* binary -> hexadecimal */ + ) + + 1; /* turn floor into ceil */ + else if (type == TYPE_LONGINT || type == TYPE_ULONGINT) + tmp_length = + (unsigned int) (sizeof (unsigned long) * CHAR_BIT + * 0.25 /* binary -> hexadecimal */ + ) + + 1; /* turn floor into ceil */ + else + tmp_length = + (unsigned int) (sizeof (unsigned int) * CHAR_BIT + * 0.25 /* binary -> hexadecimal */ + ) + + 1; /* turn floor into ceil */ if (tmp_length < precision) tmp_length = precision; - /* Add 2, to account for a prefix from the alternate form. */ + /* Add 2, to account for a leading sign or alternate form. */ tmp_length = xsum (tmp_length, 2); break; @@ -2211,7 +1859,6 @@ /* errno is already set. */ return NULL; - /* Frees the memory allocated by this function. Preserves errno. */ #define CLEANUP() \ if (d.dir != d.direct_alloc_dir) \ free (d.dir); \ @@ -2219,7 +1866,11 @@ free (a.arg); if (PRINTF_FETCHARGS (args, &a) < 0) - goto fail_1_with_EINVAL; + { + CLEANUP (); + errno = EINVAL; + return NULL; + } { size_t buf_neededlength; @@ -2255,17 +1906,24 @@ buf_malloced = buf; } - result = resultbuf; - allocated = (resultbuf != NULL ? *lengthp : 0); + if (resultbuf != NULL) + { + result = resultbuf; + allocated = *lengthp; + } + else + { + result = NULL; + allocated = 0; + } length = 0; /* Invariants: - result is either == resultbuf or malloc-allocated. - If result == NULL, resultbuf is == NULL as well. + result is either == resultbuf or == NULL or malloc-allocated. If length > 0, then result != NULL. */ /* Ensures that allocated >= needed. Aborts through a jump to out_of_memory if needed is SIZE_MAX or otherwise too big. */ -#define ENSURE_ALLOCATION_ELSE(needed, oom_statement) \ +#define ENSURE_ALLOCATION(needed) \ if ((needed) > allocated) \ { \ size_t memory_size; \ @@ -2276,19 +1934,17 @@ allocated = (needed); \ memory_size = xtimes (allocated, sizeof (DCHAR_T)); \ if (size_overflow_p (memory_size)) \ - oom_statement \ - if (result == resultbuf) \ + goto out_of_memory; \ + if (result == resultbuf || result == NULL) \ memory = (DCHAR_T *) malloc (memory_size); \ else \ memory = (DCHAR_T *) realloc (result, memory_size); \ if (memory == NULL) \ - oom_statement \ + goto out_of_memory; \ if (result == resultbuf && length > 0) \ DCHAR_CPY (memory, result, length); \ result = memory; \ } -#define ENSURE_ALLOCATION(needed) \ - ENSURE_ALLOCATION_ELSE((needed), goto out_of_memory; ) for (cp = format, i = 0, dp = &d.dir[0]; ; cp = dp->dir_end, i++, dp++) { @@ -2352,30 +2008,6 @@ case TYPE_COUNT_LONGLONGINT_POINTER: *a.arg[dp->arg_index].a.a_count_longlongint_pointer = length; break; - case TYPE_COUNT_INT8_T_POINTER: - *a.arg[dp->arg_index].a.a_count_int8_t_pointer = length; - break; - case TYPE_COUNT_INT16_T_POINTER: - *a.arg[dp->arg_index].a.a_count_int16_t_pointer = length; - break; - case TYPE_COUNT_INT32_T_POINTER: - *a.arg[dp->arg_index].a.a_count_int32_t_pointer = length; - break; - case TYPE_COUNT_INT64_T_POINTER: - *a.arg[dp->arg_index].a.a_count_int64_t_pointer = length; - break; - case TYPE_COUNT_INT_FAST8_T_POINTER: - *a.arg[dp->arg_index].a.a_count_int_fast8_t_pointer = length; - break; - case TYPE_COUNT_INT_FAST16_T_POINTER: - *a.arg[dp->arg_index].a.a_count_int_fast16_t_pointer = length; - break; - case TYPE_COUNT_INT_FAST32_T_POINTER: - *a.arg[dp->arg_index].a.a_count_int_fast32_t_pointer = length; - break; - case TYPE_COUNT_INT_FAST64_T_POINTER: - *a.arg[dp->arg_index].a.a_count_int_fast64_t_pointer = length; - break; default: abort (); } @@ -2471,7 +2103,15 @@ if (count == 0) break; if (count < 0) - goto fail_with_EILSEQ; + { + if (!(result == resultbuf || result == NULL)) + free (result); + if (buf_malloced != NULL) + free (buf_malloced); + CLEANUP (); + errno = EILSEQ; + return NULL; + } arg_end += count; characters++; } @@ -2488,7 +2128,15 @@ if (count == 0) break; if (count < 0) - goto fail_with_EILSEQ; + { + if (!(result == resultbuf || result == NULL)) + free (result); + if (buf_malloced != NULL) + free (buf_malloced); + CLEANUP (); + errno = EILSEQ; + return NULL; + } arg_end += count; characters++; } @@ -2501,7 +2149,7 @@ characters = 0; } - if (characters < width && !(flags & FLAG_LEFT)) + if (characters < width && !(dp->flags & FLAG_LEFT)) { size_t n = width - characters; ENSURE_ALLOCATION (xsum (length, n)); @@ -2534,11 +2182,19 @@ converted, &converted_len); # endif if (converted == NULL) - goto fail_with_errno; + { + int saved_errno = errno; + if (!(result == resultbuf || result == NULL)) + free (result); + if (buf_malloced != NULL) + free (buf_malloced); + CLEANUP (); + errno = saved_errno; + return NULL; + } if (converted != result + length) { - ENSURE_ALLOCATION_ELSE (xsum (length, converted_len), - { free (converted); goto out_of_memory; }); + ENSURE_ALLOCATION (xsum (length, converted_len)); DCHAR_CPY (result + length, converted, converted_len); free (converted); } @@ -2546,7 +2202,7 @@ } # endif - if (characters < width && (flags & FLAG_LEFT)) + if (characters < width && (dp->flags & FLAG_LEFT)) { size_t n = width - characters; ENSURE_ALLOCATION (xsum (length, n)); @@ -2573,7 +2229,15 @@ if (count == 0) break; if (count < 0) - goto fail_with_EILSEQ; + { + if (!(result == resultbuf || result == NULL)) + free (result); + if (buf_malloced != NULL) + free (buf_malloced); + CLEANUP (); + errno = EILSEQ; + return NULL; + } arg_end += count; characters++; } @@ -2590,7 +2254,15 @@ if (count == 0) break; if (count < 0) - goto fail_with_EILSEQ; + { + if (!(result == resultbuf || result == NULL)) + free (result); + if (buf_malloced != NULL) + free (buf_malloced); + CLEANUP (); + errno = EILSEQ; + return NULL; + } arg_end += count; characters++; } @@ -2603,7 +2275,7 @@ characters = 0; } - if (characters < width && !(flags & FLAG_LEFT)) + if (characters < width && !(dp->flags & FLAG_LEFT)) { size_t n = width - characters; ENSURE_ALLOCATION (xsum (length, n)); @@ -2636,11 +2308,19 @@ converted, &converted_len); # endif if (converted == NULL) - goto fail_with_errno; + { + int saved_errno = errno; + if (!(result == resultbuf || result == NULL)) + free (result); + if (buf_malloced != NULL) + free (buf_malloced); + CLEANUP (); + errno = saved_errno; + return NULL; + } if (converted != result + length) { - ENSURE_ALLOCATION_ELSE (xsum (length, converted_len), - { free (converted); goto out_of_memory; }); + ENSURE_ALLOCATION (xsum (length, converted_len)); DCHAR_CPY (result + length, converted, converted_len); free (converted); } @@ -2648,7 +2328,7 @@ } # endif - if (characters < width && (flags & FLAG_LEFT)) + if (characters < width && (dp->flags & FLAG_LEFT)) { size_t n = width - characters; ENSURE_ALLOCATION (xsum (length, n)); @@ -2675,7 +2355,15 @@ if (count == 0) break; if (count < 0) - goto fail_with_EILSEQ; + { + if (!(result == resultbuf || result == NULL)) + free (result); + if (buf_malloced != NULL) + free (buf_malloced); + CLEANUP (); + errno = EILSEQ; + return NULL; + } arg_end += count; characters++; } @@ -2692,7 +2380,15 @@ if (count == 0) break; if (count < 0) - goto fail_with_EILSEQ; + { + if (!(result == resultbuf || result == NULL)) + free (result); + if (buf_malloced != NULL) + free (buf_malloced); + CLEANUP (); + errno = EILSEQ; + return NULL; + } arg_end += count; characters++; } @@ -2705,7 +2401,7 @@ characters = 0; } - if (characters < width && !(flags & FLAG_LEFT)) + if (characters < width && !(dp->flags & FLAG_LEFT)) { size_t n = width - characters; ENSURE_ALLOCATION (xsum (length, n)); @@ -2738,11 +2434,19 @@ converted, &converted_len); # endif if (converted == NULL) - goto fail_with_errno; + { + int saved_errno = errno; + if (!(result == resultbuf || result == NULL)) + free (result); + if (buf_malloced != NULL) + free (buf_malloced); + CLEANUP (); + errno = saved_errno; + return NULL; + } if (converted != result + length) { - ENSURE_ALLOCATION_ELSE (xsum (length, converted_len), - { free (converted); goto out_of_memory; }); + ENSURE_ALLOCATION (xsum (length, converted_len)); DCHAR_CPY (result + length, converted, converted_len); free (converted); } @@ -2750,7 +2454,7 @@ } # endif - if (characters < width && (flags & FLAG_LEFT)) + if (characters < width && (dp->flags & FLAG_LEFT)) { size_t n = width - characters; ENSURE_ALLOCATION (xsum (length, n)); @@ -2765,150 +2469,7 @@ } } #endif -#if WIDE_CHAR_VERSION && !DCHAR_IS_TCHAR - else if ((dp->conversion == 's' - && a.arg[dp->arg_index].type == TYPE_WIDE_STRING) - || (dp->conversion == 'c' - && a.arg[dp->arg_index].type == TYPE_WIDE_CHAR)) - { - /* %ls or %lc in vasnwprintf. See the specification of - fwprintf. */ - /* It would be silly to use snprintf ("%ls", ...) and then - convert back the result from a char[] to a wchar_t[]. - Instead, just copy the argument wchar_t[] to the result. */ - int flags = dp->flags; - size_t width; - - width = 0; - if (dp->width_start != dp->width_end) - { - if (dp->width_arg_index != ARG_NONE) - { - int arg; - - if (!(a.arg[dp->width_arg_index].type == TYPE_INT)) - abort (); - arg = a.arg[dp->width_arg_index].a.a_int; - width = arg; - if (arg < 0) - { - /* "A negative field width is taken as a '-' flag - followed by a positive field width." */ - flags |= FLAG_LEFT; - width = -width; - } - } - else - { - const FCHAR_T *digitp = dp->width_start; - - do - width = xsum (xtimes (width, 10), *digitp++ - '0'); - while (digitp != dp->width_end); - } - } - - { - const wchar_t *ls_arg; - wchar_t lc_arg[1]; - size_t characters; - - if (dp->conversion == 's') - { - int has_precision; - size_t precision; - - has_precision = 0; - precision = 6; - if (dp->precision_start != dp->precision_end) - { - if (dp->precision_arg_index != ARG_NONE) - { - int arg; - - if (!(a.arg[dp->precision_arg_index].type == TYPE_INT)) - abort (); - arg = a.arg[dp->precision_arg_index].a.a_int; - /* "A negative precision is taken as if the precision - were omitted." */ - if (arg >= 0) - { - precision = arg; - has_precision = 1; - } - } - else - { - const FCHAR_T *digitp = dp->precision_start + 1; - - precision = 0; - while (digitp != dp->precision_end) - precision = xsum (xtimes (precision, 10), *digitp++ - '0'); - has_precision = 1; - } - } - - ls_arg = a.arg[dp->arg_index].a.a_wide_string; - - if (has_precision) - { - /* Use only at most PRECISION wide characters, from - the left. */ - const wchar_t *ls_arg_end; - - ls_arg_end = ls_arg; - characters = 0; - for (; precision > 0; precision--) - { - if (*ls_arg_end == 0) - /* Found the terminating null wide character. */ - break; - ls_arg_end++; - characters++; - } - } - else - { - /* Use the entire string, and count the number of wide - characters. */ - characters = local_wcslen (ls_arg); - } - } - else /* dp->conversion == 'c' */ - { - lc_arg[0] = (wchar_t) a.arg[dp->arg_index].a.a_wide_char; - ls_arg = lc_arg; - characters = 1; - } - - { - size_t total = (characters < width ? width : characters); - ENSURE_ALLOCATION (xsum (length, total)); - - if (characters < width && !(flags & FLAG_LEFT)) - { - size_t n = width - characters; - DCHAR_SET (result + length, ' ', n); - length += n; - } - - if (characters > 0) - { - DCHAR_CPY (result + length, ls_arg, characters); - length += characters; - } - - if (characters < width && (flags & FLAG_LEFT)) - { - size_t n = width - characters; - DCHAR_SET (result + length, ' ', n); - length += n; - } - } - } - } -#endif -#if (!USE_SNPRINTF || WIDE_CHAR_VERSION || !HAVE_SNPRINTF_RETVAL_C99 || USE_MSVC__SNPRINTF || NEED_PRINTF_DIRECTIVE_LS || ENABLE_WCHAR_FALLBACK) && HAVE_WCHAR_T +#if (!USE_SNPRINTF || !HAVE_SNPRINTF_RETVAL_C99 || USE_MSVC__SNPRINTF || (NEED_PRINTF_DIRECTIVE_LS && !defined IN_LIBINTL) || ENABLE_WCHAR_FALLBACK) && HAVE_WCHAR_T else if (dp->conversion == 's' # if WIDE_CHAR_VERSION && a.arg[dp->arg_index].type != TYPE_WIDE_STRING @@ -3023,8 +2584,16 @@ /* Found the terminating NUL. */ break; if (count < 0) - /* Invalid or incomplete multibyte character. */ - goto fail_with_EILSEQ; + { + /* Invalid or incomplete multibyte character. */ + if (!(result == resultbuf || result == NULL)) + free (result); + if (buf_malloced != NULL) + free (buf_malloced); + CLEANUP (); + errno = EILSEQ; + return NULL; + } arg_end += count; characters++; } @@ -3051,8 +2620,16 @@ /* Found the terminating NUL. */ break; if (count < 0) - /* Invalid or incomplete multibyte character. */ - goto fail_with_EILSEQ; + { + /* Invalid or incomplete multibyte character. */ + if (!(result == resultbuf || result == NULL)) + free (result); + if (buf_malloced != NULL) + free (buf_malloced); + CLEANUP (); + errno = EILSEQ; + return NULL; + } arg_end += count; characters++; } @@ -3065,7 +2642,7 @@ characters = 0; } - if (characters < width && !(flags & FLAG_LEFT)) + if (characters < width && !(dp->flags & FLAG_LEFT)) { size_t n = width - characters; ENSURE_ALLOCATION (xsum (length, n)); @@ -3116,19 +2693,17 @@ # else count = mbtowc (&wc, arg, arg_end - arg); # endif - if (count == 0) - /* mbrtowc not consistent with strlen. */ + if (count <= 0) + /* mbrtowc not consistent with mbrlen, or mbtowc + not consistent with mblen. */ abort (); - if (count < 0) - /* Invalid or incomplete multibyte character. */ - goto fail_with_EILSEQ; ENSURE_ALLOCATION (xsum (length, 1)); result[length++] = wc; arg += count; } } - if (characters < width && (flags & FLAG_LEFT)) + if (characters < width && (dp->flags & FLAG_LEFT)) { size_t n = width - characters; ENSURE_ALLOCATION (xsum (length, n)); @@ -3144,7 +2719,7 @@ size_t characters; # if !DCHAR_IS_TCHAR /* This code assumes that TCHAR_T is 'char'. */ - static_assert (sizeof (TCHAR_T) == 1); + verify (sizeof (TCHAR_T) == 1); TCHAR_T *tmpsrc; DCHAR_T *tmpdst; size_t tmpdst_len; @@ -3171,8 +2746,16 @@ break; count = local_wcrtomb (cbuf, *arg_end, &state); if (count < 0) - /* Cannot convert. */ - goto fail_with_EILSEQ; + { + /* Cannot convert. */ + if (!(result == resultbuf || result == NULL)) + free (result); + if (buf_malloced != NULL) + free (buf_malloced); + CLEANUP (); + errno = EILSEQ; + return NULL; + } if (precision < (unsigned int) count) break; arg_end++; @@ -3204,8 +2787,16 @@ break; count = local_wcrtomb (cbuf, *arg_end, &state); if (count < 0) - /* Cannot convert. */ - goto fail_with_EILSEQ; + { + /* Cannot convert. */ + if (!(result == resultbuf || result == NULL)) + free (result); + if (buf_malloced != NULL) + free (buf_malloced); + CLEANUP (); + errno = EILSEQ; + return NULL; + } arg_end++; characters += count; } @@ -3261,8 +2852,15 @@ NULL, &tmpdst_len); if (tmpdst == NULL) { + int saved_errno = errno; free (tmpsrc); - goto fail_with_errno; + if (!(result == resultbuf || result == NULL)) + free (result); + if (buf_malloced != NULL) + free (buf_malloced); + CLEANUP (); + errno = saved_errno; + return NULL; } free (tmpsrc); # endif @@ -3284,7 +2882,7 @@ /* w doesn't matter. */ w = 0; - if (w < width && !(flags & FLAG_LEFT)) + if (w < width && !(dp->flags & FLAG_LEFT)) { size_t n = width - w; ENSURE_ALLOCATION (xsum (length, n)); @@ -3336,8 +2934,16 @@ abort (); count = local_wcrtomb (cbuf, *arg, &state); if (count <= 0) - /* Cannot convert. */ - goto fail_with_EILSEQ; + { + /* Cannot convert. */ + if (!(result == resultbuf || result == NULL)) + free (result); + if (buf_malloced != NULL) + free (buf_malloced); + CLEANUP (); + errno = EILSEQ; + return NULL; + } ENSURE_ALLOCATION (xsum (length, count)); memcpy (result + length, cbuf, count); length += count; @@ -3345,14 +2951,13 @@ } } # else - ENSURE_ALLOCATION_ELSE (xsum (length, tmpdst_len), - { free (tmpdst); goto out_of_memory; }); + ENSURE_ALLOCATION (xsum (length, tmpdst_len)); DCHAR_CPY (result + length, tmpdst, tmpdst_len); free (tmpdst); length += tmpdst_len; # endif - if (w < width && (flags & FLAG_LEFT)) + if (w < width && (dp->flags & FLAG_LEFT)) { size_t n = width - w; ENSURE_ALLOCATION (xsum (length, n)); @@ -3363,13 +2968,12 @@ # endif } #endif -#if (NEED_PRINTF_DIRECTIVE_LC || ENABLE_WCHAR_FALLBACK) && HAVE_WINT_T && !WIDE_CHAR_VERSION +#if ENABLE_WCHAR_FALLBACK && HAVE_WINT_T && !WIDE_CHAR_VERSION else if (dp->conversion == 'c' && a.arg[dp->arg_index].type == TYPE_WIDE_CHAR) { /* Implement the 'lc' directive ourselves, in order to provide - a correct behaviour for the null wint_t argument and/or the - fallback that avoids EILSEQ. */ + the fallback that avoids EILSEQ. */ int flags = dp->flags; int has_width; size_t width; @@ -3411,7 +3015,7 @@ size_t characters; # if !DCHAR_IS_TCHAR /* This code assumes that TCHAR_T is 'char'. */ - static_assert (sizeof (TCHAR_T) == 1); + verify (sizeof (TCHAR_T) == 1); TCHAR_T tmpsrc[64]; /* Assume MB_CUR_MAX <= 64. */ DCHAR_T *tmpdst; size_t tmpdst_len; @@ -3435,8 +3039,8 @@ count = local_wcrtomb (cbuf, arg, &state); if (count < 0) - /* Cannot convert. */ - goto fail_with_EILSEQ; + /* Inconsistency. */ + abort (); characters = count; } } @@ -3474,7 +3078,16 @@ NULL, NULL, &tmpdst_len); if (tmpdst == NULL) - goto fail_with_errno; + { + int saved_errno = errno; + if (!(result == resultbuf || result == NULL)) + free (result); + if (buf_malloced != NULL) + free (buf_malloced); + CLEANUP (); + errno = saved_errno; + return NULL; + } # endif if (has_width) @@ -3494,7 +3107,7 @@ /* w doesn't matter. */ w = 0; - if (w < width && !(flags & FLAG_LEFT)) + if (w < width && !(dp->flags & FLAG_LEFT)) { size_t n = width - w; ENSURE_ALLOCATION (xsum (length, n)); @@ -3534,23 +3147,22 @@ # endif count = local_wcrtomb (cbuf, arg, &state); - if (count < 0) - /* Cannot convert. */ - goto fail_with_EILSEQ; + if (count <= 0) + /* Inconsistency. */ + abort (); ENSURE_ALLOCATION (xsum (length, count)); memcpy (result + length, cbuf, count); length += count; } } # else - ENSURE_ALLOCATION_ELSE (xsum (length, tmpdst_len), - { free (tmpdst); goto out_of_memory; }); + ENSURE_ALLOCATION (xsum (length, tmpdst_len)); DCHAR_CPY (result + length, tmpdst, tmpdst_len); free (tmpdst); length += tmpdst_len; # endif - if (w < width && (flags & FLAG_LEFT)) + if (w < width && (dp->flags & FLAG_LEFT)) { size_t n = width - w; ENSURE_ALLOCATION (xsum (length, n)); @@ -3560,399 +3172,14 @@ } } #endif -#if NEED_WPRINTF_DIRECTIVE_C && WIDE_CHAR_VERSION - else if (dp->conversion == 'c' - && a.arg[dp->arg_index].type != TYPE_WIDE_CHAR) - { - /* Implement the 'c' directive ourselves, in order to avoid - EILSEQ in the "C" locale. */ - int flags = dp->flags; - size_t width; - - width = 0; - if (dp->width_start != dp->width_end) - { - if (dp->width_arg_index != ARG_NONE) - { - int arg; - - if (!(a.arg[dp->width_arg_index].type == TYPE_INT)) - abort (); - arg = a.arg[dp->width_arg_index].a.a_int; - width = arg; - if (arg < 0) - { - /* "A negative field width is taken as a '-' flag - followed by a positive field width." */ - flags |= FLAG_LEFT; - width = -width; - } - } - else - { - const FCHAR_T *digitp = dp->width_start; - - do - width = xsum (xtimes (width, 10), *digitp++ - '0'); - while (digitp != dp->width_end); - } - } - - /* %c in vasnwprintf. See the specification of fwprintf. */ - { - char arg = (char) a.arg[dp->arg_index].a.a_char; - mbstate_t state; - wchar_t wc; - - memset (&state, '\0', sizeof (mbstate_t)); - int count = mbrtowc (&wc, &arg, 1, &state); - if (count < 0) - /* Invalid or incomplete multibyte character. */ - goto fail_with_EILSEQ; - - if (1 < width && !(flags & FLAG_LEFT)) - { - size_t n = width - 1; - ENSURE_ALLOCATION (xsum (length, n)); - DCHAR_SET (result + length, ' ', n); - length += n; - } - - ENSURE_ALLOCATION (xsum (length, 1)); - result[length++] = wc; - - if (1 < width && (flags & FLAG_LEFT)) - { - size_t n = width - 1; - ENSURE_ALLOCATION (xsum (length, n)); - DCHAR_SET (result + length, ' ', n); - length += n; - } - } - } -#endif -#if NEED_PRINTF_DIRECTIVE_B || NEED_PRINTF_DIRECTIVE_UPPERCASE_B - else if (0 -# if NEED_PRINTF_DIRECTIVE_B - || (dp->conversion == 'b') -# endif -# if NEED_PRINTF_DIRECTIVE_UPPERCASE_B - || (dp->conversion == 'B') -# endif - ) - { - arg_type type = a.arg[dp->arg_index].type; - int flags = dp->flags; - int has_width; - size_t width; - int has_precision; - size_t precision; - size_t tmp_length; - size_t count; - DCHAR_T tmpbuf[700]; - DCHAR_T *tmp; - DCHAR_T *tmp_end; - DCHAR_T *tmp_start; - DCHAR_T *pad_ptr; - DCHAR_T *p; - - has_width = 0; - width = 0; - if (dp->width_start != dp->width_end) - { - if (dp->width_arg_index != ARG_NONE) - { - int arg; - - if (!(a.arg[dp->width_arg_index].type == TYPE_INT)) - abort (); - arg = a.arg[dp->width_arg_index].a.a_int; - width = arg; - if (arg < 0) - { - /* "A negative field width is taken as a '-' flag - followed by a positive field width." */ - flags |= FLAG_LEFT; - width = -width; - } - } - else - { - const FCHAR_T *digitp = dp->width_start; - - do - width = xsum (xtimes (width, 10), *digitp++ - '0'); - while (digitp != dp->width_end); - } - has_width = 1; - } - - has_precision = 0; - precision = 1; - if (dp->precision_start != dp->precision_end) - { - if (dp->precision_arg_index != ARG_NONE) - { - int arg; - - if (!(a.arg[dp->precision_arg_index].type == TYPE_INT)) - abort (); - arg = a.arg[dp->precision_arg_index].a.a_int; - /* "A negative precision is taken as if the precision - were omitted." */ - if (arg >= 0) - { - precision = arg; - has_precision = 1; - } - } - else - { - const FCHAR_T *digitp = dp->precision_start + 1; - - precision = 0; - while (digitp != dp->precision_end) - precision = xsum (xtimes (precision, 10), *digitp++ - '0'); - has_precision = 1; - } - } - - /* Allocate a temporary buffer of sufficient size. */ - switch (type) - { - default: - tmp_length = - (unsigned int) (sizeof (unsigned int) * CHAR_BIT) - + 1; /* turn floor into ceil */ - break; - case TYPE_ULONGINT: - tmp_length = - (unsigned int) (sizeof (unsigned long int) * CHAR_BIT) - + 1; /* turn floor into ceil */ - break; - case TYPE_ULONGLONGINT: - tmp_length = - (unsigned int) (sizeof (unsigned long long int) * CHAR_BIT) - + 1; /* turn floor into ceil */ - break; - case TYPE_UINT8_T: - tmp_length = - (unsigned int) (sizeof (uint8_t) * CHAR_BIT) - + 1; /* turn floor into ceil */ - break; - case TYPE_UINT16_T: - tmp_length = - (unsigned int) (sizeof (uint16_t) * CHAR_BIT) - + 1; /* turn floor into ceil */ - break; - case TYPE_UINT32_T: - tmp_length = - (unsigned int) (sizeof (uint32_t) * CHAR_BIT) - + 1; /* turn floor into ceil */ - break; - case TYPE_UINT64_T: - tmp_length = - (unsigned int) (sizeof (uint64_t) * CHAR_BIT) - + 1; /* turn floor into ceil */ - break; - case TYPE_UINT_FAST8_T: - tmp_length = - (unsigned int) (sizeof (uint_fast8_t) * CHAR_BIT) - + 1; /* turn floor into ceil */ - break; - case TYPE_UINT_FAST16_T: - tmp_length = - (unsigned int) (sizeof (uint_fast16_t) * CHAR_BIT) - + 1; /* turn floor into ceil */ - break; - case TYPE_UINT_FAST32_T: - tmp_length = - (unsigned int) (sizeof (uint_fast32_t) * CHAR_BIT) - + 1; /* turn floor into ceil */ - break; - case TYPE_UINT_FAST64_T: - tmp_length = - (unsigned int) (sizeof (uint_fast64_t) * CHAR_BIT) - + 1; /* turn floor into ceil */ - break; - } - if (tmp_length < precision) - tmp_length = precision; - /* Add 2, to account for a prefix from the alternate form. */ - tmp_length = xsum (tmp_length, 2); - - if (tmp_length < width) - tmp_length = width; - - if (tmp_length <= sizeof (tmpbuf) / sizeof (DCHAR_T)) - tmp = tmpbuf; - else - { - size_t tmp_memsize = xtimes (tmp_length, sizeof (DCHAR_T)); - - if (size_overflow_p (tmp_memsize)) - /* Overflow, would lead to out of memory. */ - goto out_of_memory; - tmp = (DCHAR_T *) malloc (tmp_memsize); - if (tmp == NULL) - /* Out of memory. */ - goto out_of_memory; - } - - tmp_end = tmp + tmp_length; - - unsigned long long arg; - switch (type) - { - case TYPE_UCHAR: - arg = a.arg[dp->arg_index].a.a_uchar; - break; - case TYPE_USHORT: - arg = a.arg[dp->arg_index].a.a_ushort; - break; - case TYPE_UINT: - arg = a.arg[dp->arg_index].a.a_uint; - break; - case TYPE_ULONGINT: - arg = a.arg[dp->arg_index].a.a_ulongint; - break; - case TYPE_ULONGLONGINT: - arg = a.arg[dp->arg_index].a.a_ulonglongint; - break; - case TYPE_UINT8_T: - arg = a.arg[dp->arg_index].a.a_uint8_t; - break; - case TYPE_UINT16_T: - arg = a.arg[dp->arg_index].a.a_uint16_t; - break; - case TYPE_UINT32_T: - arg = a.arg[dp->arg_index].a.a_uint32_t; - break; - case TYPE_UINT64_T: - arg = a.arg[dp->arg_index].a.a_uint64_t; - break; - case TYPE_UINT_FAST8_T: - arg = a.arg[dp->arg_index].a.a_uint_fast8_t; - break; - case TYPE_UINT_FAST16_T: - arg = a.arg[dp->arg_index].a.a_uint_fast16_t; - break; - case TYPE_UINT_FAST32_T: - arg = a.arg[dp->arg_index].a.a_uint_fast32_t; - break; - case TYPE_UINT_FAST64_T: - arg = a.arg[dp->arg_index].a.a_uint_fast64_t; - break; - default: - abort (); - } - int need_prefix = ((flags & FLAG_ALT) && arg != 0); - - p = tmp_end; - /* "The result of converting a zero value with a precision - of zero is no characters." */ - if (!(has_precision && precision == 0 && arg == 0)) - { - do - { - *--p = '0' + (arg & 1); - arg = arg >> 1; - } - while (arg != 0); - } - - if (has_precision) - { - DCHAR_T *digits_start = tmp_end - precision; - while (p > digits_start) - *--p = '0'; - } - - pad_ptr = p; - - if (need_prefix) - { -# if NEED_PRINTF_DIRECTIVE_B && !NEED_PRINTF_DIRECTIVE_UPPERCASE_B - *--p = 'b'; -# elif NEED_PRINTF_DIRECTIVE_UPPERCASE_B && !NEED_PRINTF_DIRECTIVE_B - *--p = 'B'; -# else - *--p = dp->conversion; -# endif - *--p = '0'; - } - tmp_start = p; - - /* The generated string now extends from tmp_start to tmp_end, - with the zero padding insertion point being at pad_ptr, - tmp_start <= pad_ptr <= tmp_end. */ - count = tmp_end - tmp_start; - - if (count < width) - { - size_t pad = width - count; - - if (flags & FLAG_LEFT) - { - /* Pad with spaces on the right. */ - for (p = tmp_start; p < tmp_end; p++) - *(p - pad) = *p; - for (p = tmp_end - pad; p < tmp_end; p++) - *p = ' '; - } - else if ((flags & FLAG_ZERO) - /* Neither ISO C nor POSIX specify that the '0' - flag is ignored when a width and a precision - are both present. But most implementations - do so. */ - && !(has_width && has_precision)) - { - /* Pad with zeroes. */ - for (p = tmp_start; p < pad_ptr; p++) - *(p - pad) = *p; - for (p = pad_ptr - pad; p < pad_ptr; p++) - *p = '0'; - } - else - { - /* Pad with spaces on the left. */ - for (p = tmp_start - pad; p < tmp_start; p++) - *p = ' '; - } - - tmp_start = tmp_start - pad; - } - - count = tmp_end - tmp_start; - - if (count > tmp_length) - /* tmp_length was incorrectly calculated - fix the - code above! */ - abort (); - - /* Make room for the result. */ - if (count >= allocated - length) - { - size_t n = xsum (length, count); - - ENSURE_ALLOCATION (n); - } - - /* Append the result. */ - memcpy (result + length, tmp_start, count * sizeof (DCHAR_T)); - if (tmp != tmpbuf) - free (tmp); - length += count; - } -#endif -#if NEED_PRINTF_DIRECTIVE_A || NEED_PRINTF_LONG_DOUBLE || NEED_PRINTF_DOUBLE || (NEED_WPRINTF_DIRECTIVE_LA && WIDE_CHAR_VERSION) +#if (NEED_PRINTF_DIRECTIVE_A || NEED_PRINTF_LONG_DOUBLE || NEED_PRINTF_DOUBLE) && !defined IN_LIBINTL else if ((dp->conversion == 'a' || dp->conversion == 'A') # if !(NEED_PRINTF_DIRECTIVE_A || (NEED_PRINTF_LONG_DOUBLE && NEED_PRINTF_DOUBLE)) && (0 # if NEED_PRINTF_DOUBLE || a.arg[dp->arg_index].type == TYPE_DOUBLE # endif -# if NEED_PRINTF_LONG_DOUBLE || (NEED_WPRINTF_DIRECTIVE_LA && WIDE_CHAR_VERSION) +# if NEED_PRINTF_LONG_DOUBLE || a.arg[dp->arg_index].type == TYPE_LONGDOUBLE # endif ) @@ -4072,7 +3299,7 @@ p = tmp; if (type == TYPE_LONGDOUBLE) { -# if NEED_PRINTF_DIRECTIVE_A || NEED_PRINTF_LONG_DOUBLE || (NEED_WPRINTF_DIRECTIVE_LA && WIDE_CHAR_VERSION) +# if NEED_PRINTF_DIRECTIVE_A || NEED_PRINTF_LONG_DOUBLE long double arg = a.arg[dp->arg_index].a.a_longdouble; if (isnanl (arg)) @@ -4192,7 +3419,7 @@ } } *p++ = dp->conversion - 'A' + 'P'; -# if WIDE_CHAR_VERSION && DCHAR_IS_TCHAR +# if WIDE_CHAR_VERSION { static const wchar_t decimal_format[] = { '%', '+', 'd', '\0' }; @@ -4343,7 +3570,7 @@ } } *p++ = dp->conversion - 'A' + 'P'; -# if WIDE_CHAR_VERSION && DCHAR_IS_TCHAR +# if WIDE_CHAR_VERSION { static const wchar_t decimal_format[] = { '%', '+', 'd', '\0' }; @@ -4435,7 +3662,7 @@ length += count; } #endif -#if NEED_PRINTF_INFINITE_DOUBLE || NEED_PRINTF_DOUBLE || NEED_PRINTF_INFINITE_LONG_DOUBLE || NEED_PRINTF_LONG_DOUBLE +#if (NEED_PRINTF_INFINITE_DOUBLE || NEED_PRINTF_DOUBLE || NEED_PRINTF_INFINITE_LONG_DOUBLE || NEED_PRINTF_LONG_DOUBLE) && !defined IN_LIBINTL else if ((dp->conversion == 'f' || dp->conversion == 'F' || dp->conversion == 'e' || dp->conversion == 'E' || dp->conversion == 'g' || dp->conversion == 'G' @@ -4803,7 +4030,7 @@ } *p++ = dp->conversion; /* 'e' or 'E' */ -# if WIDE_CHAR_VERSION && DCHAR_IS_TCHAR +# if WIDE_CHAR_VERSION { static const wchar_t decimal_format[] = { '%', '+', '.', '2', 'd', '\0' }; @@ -4984,7 +4211,7 @@ } } *p++ = dp->conversion - 'G' + 'E'; /* 'e' or 'E' */ -# if WIDE_CHAR_VERSION && DCHAR_IS_TCHAR +# if WIDE_CHAR_VERSION { static const wchar_t decimal_format[] = { '%', '+', '.', '2', 'd', '\0' }; @@ -5261,7 +4488,7 @@ } *p++ = dp->conversion; /* 'e' or 'E' */ -# if WIDE_CHAR_VERSION && DCHAR_IS_TCHAR +# if WIDE_CHAR_VERSION { static const wchar_t decimal_format[] = /* Produce the same number of exponent digits @@ -5454,7 +4681,7 @@ } } *p++ = dp->conversion - 'G' + 'E'; /* 'e' or 'E' */ -# if WIDE_CHAR_VERSION && DCHAR_IS_TCHAR +# if WIDE_CHAR_VERSION { static const wchar_t decimal_format[] = /* Produce the same number of exponent digits @@ -5622,13 +4849,13 @@ { arg_type type = a.arg[dp->arg_index].type; int flags = dp->flags; -#if (WIDE_CHAR_VERSION && MUSL_LIBC) || !DCHAR_IS_TCHAR || ENABLE_UNISTDIO || NEED_PRINTF_FLAG_LEFTADJUST || NEED_PRINTF_FLAG_ZERO || NEED_PRINTF_UNBOUNDED_PRECISION +#if !DCHAR_IS_TCHAR || ENABLE_UNISTDIO || NEED_PRINTF_FLAG_LEFTADJUST || NEED_PRINTF_FLAG_ZERO || NEED_PRINTF_UNBOUNDED_PRECISION int has_width; #endif -#if !USE_SNPRINTF || WIDE_CHAR_VERSION || !HAVE_SNPRINTF_RETVAL_C99 || USE_MSVC__SNPRINTF || !DCHAR_IS_TCHAR || ENABLE_UNISTDIO || NEED_PRINTF_FLAG_LEFTADJUST || NEED_PRINTF_FLAG_ZERO || NEED_PRINTF_UNBOUNDED_PRECISION +#if !USE_SNPRINTF || !HAVE_SNPRINTF_RETVAL_C99 || USE_MSVC__SNPRINTF || !DCHAR_IS_TCHAR || ENABLE_UNISTDIO || NEED_PRINTF_FLAG_LEFTADJUST || NEED_PRINTF_FLAG_ZERO || NEED_PRINTF_UNBOUNDED_PRECISION size_t width; #endif -#if !USE_SNPRINTF || (WIDE_CHAR_VERSION && DCHAR_IS_TCHAR) || !HAVE_SNPRINTF_RETVAL_C99 || USE_MSVC__SNPRINTF || (WIDE_CHAR_VERSION && MUSL_LIBC) || !DCHAR_IS_TCHAR || ENABLE_UNISTDIO || NEED_PRINTF_FLAG_LEFTADJUST || NEED_PRINTF_FLAG_ZERO || NEED_PRINTF_UNBOUNDED_PRECISION +#if !USE_SNPRINTF || !HAVE_SNPRINTF_RETVAL_C99 || USE_MSVC__SNPRINTF || NEED_PRINTF_UNBOUNDED_PRECISION int has_precision; size_t precision; #endif @@ -5637,7 +4864,7 @@ #else # define prec_ourselves 0 #endif -#if (WIDE_CHAR_VERSION && MUSL_LIBC) || NEED_PRINTF_FLAG_LEFTADJUST +#if NEED_PRINTF_FLAG_LEFTADJUST # define pad_ourselves 1 #elif !DCHAR_IS_TCHAR || ENABLE_UNISTDIO || NEED_PRINTF_FLAG_ZERO || NEED_PRINTF_UNBOUNDED_PRECISION int pad_ourselves; @@ -5654,10 +4881,10 @@ TCHAR_T *tmp; #endif -#if (WIDE_CHAR_VERSION && MUSL_LIBC) || !DCHAR_IS_TCHAR || ENABLE_UNISTDIO || NEED_PRINTF_FLAG_LEFTADJUST || NEED_PRINTF_FLAG_ZERO || NEED_PRINTF_UNBOUNDED_PRECISION +#if !DCHAR_IS_TCHAR || ENABLE_UNISTDIO || NEED_PRINTF_FLAG_LEFTADJUST || NEED_PRINTF_FLAG_ZERO || NEED_PRINTF_UNBOUNDED_PRECISION has_width = 0; #endif -#if !USE_SNPRINTF || WIDE_CHAR_VERSION || !HAVE_SNPRINTF_RETVAL_C99 || USE_MSVC__SNPRINTF || !DCHAR_IS_TCHAR || ENABLE_UNISTDIO || NEED_PRINTF_FLAG_LEFTADJUST || NEED_PRINTF_FLAG_ZERO || NEED_PRINTF_UNBOUNDED_PRECISION +#if !USE_SNPRINTF || !HAVE_SNPRINTF_RETVAL_C99 || USE_MSVC__SNPRINTF || !DCHAR_IS_TCHAR || ENABLE_UNISTDIO || NEED_PRINTF_FLAG_LEFTADJUST || NEED_PRINTF_FLAG_ZERO || NEED_PRINTF_UNBOUNDED_PRECISION width = 0; if (dp->width_start != dp->width_end) { @@ -5685,13 +4912,13 @@ width = xsum (xtimes (width, 10), *digitp++ - '0'); while (digitp != dp->width_end); } -# if (WIDE_CHAR_VERSION && MUSL_LIBC) || !DCHAR_IS_TCHAR || ENABLE_UNISTDIO || NEED_PRINTF_FLAG_LEFTADJUST || NEED_PRINTF_FLAG_ZERO || NEED_PRINTF_UNBOUNDED_PRECISION +#if !DCHAR_IS_TCHAR || ENABLE_UNISTDIO || NEED_PRINTF_FLAG_LEFTADJUST || NEED_PRINTF_FLAG_ZERO || NEED_PRINTF_UNBOUNDED_PRECISION has_width = 1; -# endif +#endif } #endif -#if !USE_SNPRINTF || (WIDE_CHAR_VERSION && DCHAR_IS_TCHAR) || !HAVE_SNPRINTF_RETVAL_C99 || USE_MSVC__SNPRINTF || (WIDE_CHAR_VERSION && MUSL_LIBC) || !DCHAR_IS_TCHAR || ENABLE_UNISTDIO || NEED_PRINTF_FLAG_LEFTADJUST || NEED_PRINTF_FLAG_ZERO || NEED_PRINTF_UNBOUNDED_PRECISION +#if !USE_SNPRINTF || !HAVE_SNPRINTF_RETVAL_C99 || USE_MSVC__SNPRINTF || NEED_PRINTF_UNBOUNDED_PRECISION has_precision = 0; precision = 6; if (dp->precision_start != dp->precision_end) @@ -5728,11 +4955,6 @@ switch (dp->conversion) { case 'd': case 'i': case 'u': - case 'b': - #if SUPPORT_GNU_PRINTF_DIRECTIVES \ - || (__GLIBC__ + (__GLIBC_MINOR__ >= 35) > 2) - case 'B': - #endif case 'o': case 'x': case 'X': case 'p': prec_ourselves = has_precision && (precision > 0); @@ -5744,7 +4966,7 @@ #endif /* Decide whether to perform the padding ourselves. */ -#if !((WIDE_CHAR_VERSION && MUSL_LIBC) || NEED_PRINTF_FLAG_LEFTADJUST) && (!DCHAR_IS_TCHAR || ENABLE_UNISTDIO || NEED_PRINTF_FLAG_ZERO || NEED_PRINTF_UNBOUNDED_PRECISION) +#if !NEED_PRINTF_FLAG_LEFTADJUST && (!DCHAR_IS_TCHAR || ENABLE_UNISTDIO || NEED_PRINTF_FLAG_ZERO || NEED_PRINTF_UNBOUNDED_PRECISION) switch (dp->conversion) { # if !DCHAR_IS_TCHAR || ENABLE_UNISTDIO @@ -5863,54 +5085,6 @@ { case TYPE_LONGLONGINT: case TYPE_ULONGLONGINT: - #if INT8_WIDTH > LONG_WIDTH - case TYPE_INT8_T: - #endif - #if UINT8_WIDTH > LONG_WIDTH - case TYPE_UINT8_T: - #endif - #if INT16_WIDTH > LONG_WIDTH - case TYPE_INT16_T: - #endif - #if UINT16_WIDTH > LONG_WIDTH - case TYPE_UINT16_T: - #endif - #if INT32_WIDTH > LONG_WIDTH - case TYPE_INT32_T: - #endif - #if UINT32_WIDTH > LONG_WIDTH - case TYPE_UINT32_T: - #endif - #if INT64_WIDTH > LONG_WIDTH - case TYPE_INT64_T: - #endif - #if UINT64_WIDTH > LONG_WIDTH - case TYPE_UINT64_T: - #endif - #if INT_FAST8_WIDTH > LONG_WIDTH - case TYPE_INT_FAST8_T: - #endif - #if UINT_FAST8_WIDTH > LONG_WIDTH - case TYPE_UINT_FAST8_T: - #endif - #if INT_FAST16_WIDTH > LONG_WIDTH - case TYPE_INT_FAST16_T: - #endif - #if UINT_FAST16_WIDTH > LONG_WIDTH - case TYPE_UINT_FAST16_T: - #endif - #if INT_FAST32_WIDTH > LONG_WIDTH - case TYPE_INT3_FAST2_T: - #endif - #if UINT_FAST32_WIDTH > LONG_WIDTH - case TYPE_UINT_FAST32_T: - #endif - #if INT_FAST64_WIDTH > LONG_WIDTH - case TYPE_INT_FAST64_T: - #endif - #if UINT_FAST64_WIDTH > LONG_WIDTH - case TYPE_UINT_FAST64_T: - #endif #if defined _WIN32 && ! defined __CYGWIN__ *fbp++ = 'I'; *fbp++ = '6'; @@ -5922,60 +5096,12 @@ FALLTHROUGH; case TYPE_LONGINT: case TYPE_ULONGINT: - #if INT8_WIDTH > INT_WIDTH && INT8_WIDTH <= LONG_WIDTH - case TYPE_INT8_T: - #endif - #if UINT8_WIDTH > INT_WIDTH && UINT8_WIDTH <= LONG_WIDTH - case TYPE_UINT8_T: - #endif - #if INT16_WIDTH > INT_WIDTH && INT16_WIDTH <= LONG_WIDTH - case TYPE_INT16_T: - #endif - #if UINT16_WIDTH > INT_WIDTH && UINT16_WIDTH <= LONG_WIDTH - case TYPE_UINT16_T: - #endif - #if INT32_WIDTH > INT_WIDTH && INT32_WIDTH <= LONG_WIDTH - case TYPE_INT32_T: - #endif - #if UINT32_WIDTH > INT_WIDTH && UINT32_WIDTH <= LONG_WIDTH - case TYPE_UINT32_T: - #endif - #if INT64_WIDTH > INT_WIDTH && INT64_WIDTH <= LONG_WIDTH - case TYPE_INT64_T: - #endif - #if UINT64_WIDTH > INT_WIDTH && UINT64_WIDTH <= LONG_WIDTH - case TYPE_UINT64_T: - #endif - #if INT_FAST8_WIDTH > INT_WIDTH && INT_FAST8_WIDTH <= LONG_WIDTH - case TYPE_INT_FAST8_T: - #endif - #if UINT_FAST8_WIDTH > INT_WIDTH && UINT_FAST8_WIDTH <= LONG_WIDTH - case TYPE_UINT_FAST8_T: - #endif - #if INT_FAST16_WIDTH > INT_WIDTH && INT_FAST16_WIDTH <= LONG_WIDTH - case TYPE_INT_FAST16_T: - #endif - #if UINT_FAST16_WIDTH > INT_WIDTH && UINT_FAST16_WIDTH <= LONG_WIDTH - case TYPE_UINT_FAST16_T: - #endif - #if INT_FAST32_WIDTH > INT_WIDTH && INT_FAST32_WIDTH <= LONG_WIDTH - case TYPE_INT_FAST32_T: - #endif - #if UINT_FAST32_WIDTH > INT_WIDTH && UINT_FAST32_WIDTH <= LONG_WIDTH - case TYPE_UINT_FAST32_T: - #endif - #if INT_FAST64_WIDTH > INT_WIDTH && INT_FAST64_WIDTH <= LONG_WIDTH - case TYPE_INT_FAST64_T: - #endif - #if UINT_FAST64_WIDTH > INT_WIDTH && UINT_FAST64_WIDTH <= LONG_WIDTH - case TYPE_UINT_FAST64_T: - #endif - #if HAVE_WINT_T +#if HAVE_WINT_T case TYPE_WIDE_CHAR: - #endif - #if HAVE_WCHAR_T +#endif +#if HAVE_WCHAR_T case TYPE_WIDE_STRING: - #endif +#endif *fbp++ = 'l'; break; case TYPE_LONGDOUBLE: @@ -5991,74 +5117,47 @@ #endif *fbp = dp->conversion; #if USE_SNPRINTF - /* Decide whether to pass %n in the format string - to SNPRINTF. */ -# if (((!WIDE_CHAR_VERSION || !DCHAR_IS_TCHAR) \ - && (HAVE_SNPRINTF_RETVAL_C99 && HAVE_SNPRINTF_TRUNCATION_C99)) \ +# if ((HAVE_SNPRINTF_RETVAL_C99 && HAVE_SNPRINTF_TRUNCATION_C99) \ || ((__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 3)) \ && !defined __UCLIBC__) \ || (defined __APPLE__ && defined __MACH__) \ - || defined __OpenBSD__ \ || defined __ANDROID__ \ - || (defined _WIN32 && ! defined __CYGWIN__)) \ - || (WIDE_CHAR_VERSION && MUSL_LIBC) - /* We can avoid passing %n and instead rely on SNPRINTF's - return value if - - !WIDE_CHAR_VERSION || !DCHAR_IS_TCHAR, because otherwise, - when WIDE_CHAR_VERSION && DCHAR_IS_TCHAR, - snwprintf()/_snwprintf() (Windows) and swprintf() (Unix) - don't return the needed buffer size, - and - - we're compiling for a system where we know - - that snprintf's return value conforms to ISO C 99 - (HAVE_SNPRINTF_RETVAL_C99) and - - that snprintf always produces NUL-terminated strings - (HAVE_SNPRINTF_TRUNCATION_C99). - And it is desirable to do so, because more and more platforms - no longer support %n, for "security reasons". */ - /* On specific platforms, listed below, we *must* avoid %n. - In the case - !WIDE_CHAR_VERSION && HAVE_SNPRINTF_RETVAL_C99 && !USE_MSVC__SNPRINTF - we can rely on the return value of snprintf instead. Whereas - in the opposite case - WIDE_CHAR_VERSION || !HAVE_SNPRINTF_RETVAL_C99 || USE_MSVC__SNPRINTF - we need to make room based on an estimation, computed by - MAX_ROOM_NEEDED. */ - /* The following platforms forbid %n: + || (defined _WIN32 && ! defined __CYGWIN__)) + /* On systems where we know that snprintf's return value + conforms to ISO C 99 (HAVE_SNPRINTF_RETVAL_C99) and that + snprintf always produces NUL-terminated strings + (HAVE_SNPRINTF_TRUNCATION_C99), it is possible to avoid + using %n. And it is desirable to do so, because more and + more platforms no longer support %n, for "security reasons". + In particular, the following platforms: - On glibc2 systems from 2004-10-18 or newer, the use of %n in format strings in writable memory may crash the program (if compiled with _FORTIFY_SOURCE=2). - - On macOS 10.13 or newer, the use of %n in format + - On Mac OS X 10.13 or newer, the use of %n in format strings in writable memory by default crashes the program. - - On OpenBSD, since 2021-08-30, the use of %n in format - strings produces an abort (see - , - ). - On Android, starting on 2018-03-07, the use of %n in format strings produces a fatal error (see ). - - On native Windows systems (such as mingw) where the OS is - Windows Vista, the use of %n in format strings by default - crashes the program. See - and - - On the first four of these platforms, if !WIDE_CHAR_VERSION, - it is not a big deal to avoid %n, because on these platforms, - HAVE_SNPRINTF_RETVAL_C99 and HAVE_SNPRINTF_TRUNCATION_C99 are - 1. - On native Windows, if !WIDE_CHAR_VERSION, it's not a big deal - either because: + On these platforms, HAVE_SNPRINTF_RETVAL_C99 and + HAVE_SNPRINTF_TRUNCATION_C99 are 1. We have listed them + explicitly in the condition above, in case of cross- + compilation (just to be sure). */ + /* On native Windows systems (such as mingw), we can avoid using + %n because: - Although the gl_SNPRINTF_TRUNCATION_C99 test fails, snprintf does not write more than the specified number of bytes. (snprintf (buf, 3, "%d %d", 4567, 89) writes '4', '5', '6' into buf, not '4', '5', '\0'.) - Although the gl_SNPRINTF_RETVAL_C99 test fails, snprintf allows us to recognize the case of an insufficient - buffer size: it returns -1 in this case. */ - /* Additionally, in the WIDE_CHAR_VERSION case, we cannot use %n - on musl libc because we would run into an swprintf() bug. - See . */ + buffer size: it returns -1 in this case. + On native Windows systems (such as mingw) where the OS is + Windows Vista, the use of %n in format strings by default + crashes the program. See + and + + So we should avoid %n in this situation. */ fbp[1] = '\0'; # else /* AIX <= 5.1, HP-UX, IRIX, OSF/1, Solaris <= 9, BeOS */ fbp[1] = '%'; @@ -6219,102 +5318,6 @@ SNPRINTF_BUF (arg); } break; - case TYPE_INT8_T: - { - int8_t arg = a.arg[dp->arg_index].a.a_int8_t; - SNPRINTF_BUF (arg); - } - break; - case TYPE_UINT8_T: - { - uint8_t arg = a.arg[dp->arg_index].a.a_uint8_t; - SNPRINTF_BUF (arg); - } - break; - case TYPE_INT16_T: - { - int16_t arg = a.arg[dp->arg_index].a.a_int16_t; - SNPRINTF_BUF (arg); - } - break; - case TYPE_UINT16_T: - { - uint16_t arg = a.arg[dp->arg_index].a.a_uint16_t; - SNPRINTF_BUF (arg); - } - break; - case TYPE_INT32_T: - { - int32_t arg = a.arg[dp->arg_index].a.a_int32_t; - SNPRINTF_BUF (arg); - } - break; - case TYPE_UINT32_T: - { - uint32_t arg = a.arg[dp->arg_index].a.a_uint32_t; - SNPRINTF_BUF (arg); - } - break; - case TYPE_INT64_T: - { - int64_t arg = a.arg[dp->arg_index].a.a_int64_t; - SNPRINTF_BUF (arg); - } - break; - case TYPE_UINT64_T: - { - uint64_t arg = a.arg[dp->arg_index].a.a_uint64_t; - SNPRINTF_BUF (arg); - } - break; - case TYPE_INT_FAST8_T: - { - int_fast8_t arg = a.arg[dp->arg_index].a.a_int_fast8_t; - SNPRINTF_BUF (arg); - } - break; - case TYPE_UINT_FAST8_T: - { - uint_fast8_t arg = a.arg[dp->arg_index].a.a_uint_fast8_t; - SNPRINTF_BUF (arg); - } - break; - case TYPE_INT_FAST16_T: - { - int_fast16_t arg = a.arg[dp->arg_index].a.a_int_fast16_t; - SNPRINTF_BUF (arg); - } - break; - case TYPE_UINT_FAST16_T: - { - uint_fast16_t arg = a.arg[dp->arg_index].a.a_uint_fast16_t; - SNPRINTF_BUF (arg); - } - break; - case TYPE_INT_FAST32_T: - { - int_fast32_t arg = a.arg[dp->arg_index].a.a_int_fast32_t; - SNPRINTF_BUF (arg); - } - break; - case TYPE_UINT_FAST32_T: - { - uint_fast32_t arg = a.arg[dp->arg_index].a.a_uint_fast32_t; - SNPRINTF_BUF (arg); - } - break; - case TYPE_INT_FAST64_T: - { - int_fast64_t arg = a.arg[dp->arg_index].a.a_int_fast64_t; - SNPRINTF_BUF (arg); - } - break; - case TYPE_UINT_FAST64_T: - { - uint_fast64_t arg = a.arg[dp->arg_index].a.a_uint_fast64_t; - SNPRINTF_BUF (arg); - } - break; case TYPE_DOUBLE: { double arg = a.arg[dp->arg_index].a.a_double; @@ -6397,16 +5400,12 @@ /* Look at the snprintf() return value. */ if (retcount < 0) { -# if (WIDE_CHAR_VERSION && DCHAR_IS_TCHAR) || !HAVE_SNPRINTF_RETVAL_C99 || USE_MSVC__SNPRINTF +# if !HAVE_SNPRINTF_RETVAL_C99 || USE_MSVC__SNPRINTF /* HP-UX 10.20 snprintf() is doubly deficient: It doesn't understand the '%n' directive, *and* it returns -1 (rather than the length that would have been required) when the buffer is too small. - Likewise, in case of - WIDE_CHAR_VERSION && DCHAR_IS_TCHAR, the - functions snwprintf()/_snwprintf() (Windows) - or swprintf() (Unix). But a failure at this point can also come from other reasons than a too small buffer, such as an invalid wide string argument to @@ -6442,15 +5441,7 @@ # endif } else - { - count = retcount; -# if WIDE_CHAR_VERSION && defined __MINGW32__ - if (count == 0 && dp->conversion == 'c') - /* snwprintf returned 0 instead of 1. But it - wrote a null wide character. */ - count = 1; -# endif - } + count = retcount; } } #endif @@ -6458,17 +5449,25 @@ /* Attempt to handle failure. */ if (count < 0) { - /* SNPRINTF or sprintf failed. Use the errno that it - has set, if any. */ - if (errno == 0) + /* SNPRINTF or sprintf failed. Save and use the errno + that it has set, if any. */ + int saved_errno = errno; + if (saved_errno == 0) { if (dp->conversion == 'c' || dp->conversion == 's') - errno = EILSEQ; + saved_errno = EILSEQ; else - errno = EINVAL; + saved_errno = EINVAL; } - goto fail_with_errno; + if (!(result == resultbuf || result == NULL)) + free (result); + if (buf_malloced != NULL) + free (buf_malloced); + CLEANUP (); + + errno = saved_errno; + return NULL; } #if USE_SNPRINTF @@ -6580,73 +5579,21 @@ #if !DCHAR_IS_TCHAR /* Convert from TCHAR_T[] to DCHAR_T[]. */ - if (dp->conversion == 'c' || dp->conversion == 's' -# if __GLIBC__ >= 2 && !defined __UCLIBC__ - || (flags & FLAG_LOCALIZED) -# endif - ) + if (dp->conversion == 'c' || dp->conversion == 's') { - /* The result string is not guaranteed to be ASCII. */ + /* type = TYPE_CHAR or TYPE_WIDE_CHAR or TYPE_STRING + TYPE_WIDE_STRING. + The result string is not certainly ASCII. */ const TCHAR_T *tmpsrc; DCHAR_T *tmpdst; size_t tmpdst_len; /* This code assumes that TCHAR_T is 'char'. */ - static_assert (sizeof (TCHAR_T) == 1); + verify (sizeof (TCHAR_T) == 1); # if USE_SNPRINTF tmpsrc = (TCHAR_T *) (result + length); # else tmpsrc = tmp; # endif -# if WIDE_CHAR_VERSION - /* Convert tmpsrc[0..count-1] to a freshly allocated - wide character array. */ - mbstate_t state; - - memset (&state, '\0', sizeof (mbstate_t)); - tmpdst_len = 0; - { - const TCHAR_T *src = tmpsrc; - size_t srclen = count; - - for (; srclen > 0; tmpdst_len++) - { - /* Parse the next multibyte character. */ - size_t ret = mbrtowc (NULL, src, srclen, &state); - if (ret == (size_t)(-2) || ret == (size_t)(-1)) - goto fail_with_EILSEQ; - if (ret == 0) - ret = 1; - src += ret; - srclen -= ret; - } - } - - tmpdst = - (wchar_t *) malloc ((tmpdst_len + 1) * sizeof (wchar_t)); - if (tmpdst == NULL) - goto out_of_memory; - - memset (&state, '\0', sizeof (mbstate_t)); - { - DCHAR_T *destptr = tmpdst; - const TCHAR_T *src = tmpsrc; - size_t srclen = count; - - for (; srclen > 0; destptr++) - { - /* Parse the next multibyte character. */ - size_t ret = mbrtowc (destptr, src, srclen, &state); - if (ret == (size_t)(-2) || ret == (size_t)(-1)) - /* Should already have been caught in the first - loop, above. */ - abort (); - if (ret == 0) - ret = 1; - src += ret; - srclen -= ret; - } - } -# else tmpdst = DCHAR_CONV_FROM_ENCODING (locale_charset (), iconveh_question_mark, @@ -6654,10 +5601,17 @@ NULL, NULL, &tmpdst_len); if (tmpdst == NULL) - goto fail_with_errno; -# endif - ENSURE_ALLOCATION_ELSE (xsum (length, tmpdst_len), - { free (tmpdst); goto out_of_memory; }); + { + int saved_errno = errno; + if (!(result == resultbuf || result == NULL)) + free (result); + if (buf_malloced != NULL) + free (buf_malloced); + CLEANUP (); + errno = saved_errno; + return NULL; + } + ENSURE_ALLOCATION (xsum (length, tmpdst_len)); DCHAR_CPY (result + length, tmpdst, tmpdst_len); free (tmpdst); count = tmpdst_len; @@ -6722,7 +5676,7 @@ /* Here count <= allocated - length. */ /* Perform padding. */ -#if (WIDE_CHAR_VERSION && MUSL_LIBC) || !DCHAR_IS_TCHAR || ENABLE_UNISTDIO || NEED_PRINTF_FLAG_LEFTADJUST || NEED_PRINTF_FLAG_ZERO || NEED_PRINTF_UNBOUNDED_PRECISION +#if !DCHAR_IS_TCHAR || ENABLE_UNISTDIO || NEED_PRINTF_FLAG_LEFTADJUST || NEED_PRINTF_FLAG_ZERO || NEED_PRINTF_UNBOUNDED_PRECISION if (pad_ourselves && has_width) { size_t w; @@ -6781,22 +5735,6 @@ if ((*pad_ptr >= 'A' && *pad_ptr <= 'Z') || (*pad_ptr >= 'a' && *pad_ptr <= 'z')) pad_ptr = NULL; - else - /* Do the zero-padding after the "0x" or - "0b" prefix, not before. */ - if (p - rp >= 2 - && *rp == '0' - && (((dp->conversion == 'a' - || dp->conversion == 'x') - && rp[1] == 'x') - || ((dp->conversion == 'A' - || dp->conversion == 'X') - && rp[1] == 'X') - || (dp->conversion == 'b' - && rp[1] == 'b') - || (dp->conversion == 'B' - && rp[1] == 'B'))) - pad_ptr += 2; } /* The generated string now extends from rp to p, with the zero padding insertion point being at @@ -6810,22 +5748,7 @@ for (; pad > 0; pad--) *p++ = ' '; } - else if ((flags & FLAG_ZERO) && pad_ptr != NULL - /* ISO C says: "For d, i, o, u, x, and X - conversions, if a precision is - specified, the 0 flag is ignored. */ - && !(has_precision - && (dp->conversion == 'd' - || dp->conversion == 'i' - || dp->conversion == 'o' - || dp->conversion == 'u' - || dp->conversion == 'x' - || dp->conversion == 'X' - /* Although ISO C does not - require it, treat 'b' and 'B' - like 'x' and 'X'. */ - || dp->conversion == 'b' - || dp->conversion == 'B'))) + else if ((flags & FLAG_ZERO) && pad_ptr != NULL) { /* Pad with zeroes. */ DCHAR_T *q = end; @@ -6911,40 +5834,25 @@ #if USE_SNPRINTF overflow: + if (!(result == resultbuf || result == NULL)) + free (result); + if (buf_malloced != NULL) + free (buf_malloced); + CLEANUP (); errno = EOVERFLOW; - goto fail_with_errno; + return NULL; #endif out_of_memory: - errno = ENOMEM; - goto fail_with_errno; - -#if ENABLE_UNISTDIO || ((!USE_SNPRINTF || WIDE_CHAR_VERSION || !HAVE_SNPRINTF_RETVAL_C99 || USE_MSVC__SNPRINTF || NEED_PRINTF_DIRECTIVE_LS || ENABLE_WCHAR_FALLBACK) && HAVE_WCHAR_T) || ((NEED_PRINTF_DIRECTIVE_LC || ENABLE_WCHAR_FALLBACK) && HAVE_WINT_T && !WIDE_CHAR_VERSION) || (NEED_WPRINTF_DIRECTIVE_C && WIDE_CHAR_VERSION) - fail_with_EILSEQ: - errno = EILSEQ; - goto fail_with_errno; -#endif - - fail_with_errno: - if (result != resultbuf) + if (!(result == resultbuf || result == NULL)) free (result); if (buf_malloced != NULL) free (buf_malloced); + out_of_memory_1: CLEANUP (); + errno = ENOMEM; return NULL; } - - out_of_memory_1: - errno = ENOMEM; - goto fail_1_with_errno; - - fail_1_with_EINVAL: - errno = EINVAL; - goto fail_1_with_errno; - - fail_1_with_errno: - CLEANUP (); - return NULL; } #undef MAX_ROOM_NEEDED diff -Nru mmv-2.5/lib/vasnprintf.h mmv-2.5.1/lib/vasnprintf.h --- mmv-2.5/lib/vasnprintf.h 2023-07-20 19:40:23.000000000 +0000 +++ mmv-2.5.1/lib/vasnprintf.h 2023-08-08 11:02:48.000000000 +0000 @@ -1,27 +1,22 @@ /* vsprintf with automatic memory allocation. - Copyright (C) 2002-2004, 2007-2023 Free Software Foundation, Inc. + Copyright (C) 2002-2004, 2007-2021 Free Software Foundation, Inc. - This file is free software: you can redistribute it and/or modify - it under the terms of the GNU Lesser General Public License as - published by the Free Software Foundation; either version 2.1 of the - License, or (at your option) any later version. + 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 file is distributed in the hope that it will be useful, + 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 Lesser General Public License for more details. + GNU General Public License for more details. - You should have received a copy of the GNU Lesser General Public License - along with this program. If not, see . */ + You should have received a copy of the GNU General Public License along + with this program; if not, see . */ #ifndef _VASNPRINTF_H #define _VASNPRINTF_H -/* This file uses _GL_ATTRIBUTE_FORMAT. */ -#if !_GL_CONFIG_H_INCLUDED - #error "Please include config.h first." -#endif - /* Get va_list. */ #include diff -Nru mmv-2.5/lib/verify.h mmv-2.5.1/lib/verify.h --- mmv-2.5/lib/verify.h 2023-07-20 19:40:23.000000000 +0000 +++ mmv-2.5.1/lib/verify.h 2023-08-08 11:02:40.000000000 +0000 @@ -1,18 +1,18 @@ /* Compile-time assert-like macros. - Copyright (C) 2005-2006, 2009-2023 Free Software Foundation, Inc. + Copyright (C) 2005-2006, 2009-2021 Free Software Foundation, Inc. - This file is free software: you can redistribute it and/or modify - it under the terms of the GNU Lesser General Public License as - published by the Free Software Foundation; either version 2.1 of the - License, or (at your option) any later version. + 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 of the License, or + (at your option) any later version. - This file is distributed in the hope that it will be useful, + 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 Lesser General Public License for more details. + GNU General Public License for more details. - You should have received a copy of the GNU Lesser General Public License + You should have received a copy of the GNU General Public License along with this program. If not, see . */ /* Written by Paul Eggert, Bruno Haible, and Jim Meyering. */ @@ -25,19 +25,19 @@ works as per C11. This is supported by GCC 4.6.0+ and by clang 4+. Define _GL_HAVE__STATIC_ASSERT1 to 1 if _Static_assert (R) works as - per C23. This is supported by GCC 9.1+. + per C2X. This is supported by GCC 9.1+. Support compilers claiming conformance to the relevant standard, and also support GCC when not pedantic. 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? */ #ifndef __cplusplus -# if (201112 <= __STDC_VERSION__ \ +# if (201112L <= __STDC_VERSION__ \ || (!defined __STRICT_ANSI__ \ - && (4 < __GNUC__ + (6 <= __GNUC_MINOR__) || 5 <= __clang_major__))) + && (4 < __GNUC__ + (6 <= __GNUC_MINOR__) || 4 <= __clang_major__))) # define _GL_HAVE__STATIC_ASSERT 1 # endif -# if (202311 <= __STDC_VERSION__ \ +# if (202000L <= __STDC_VERSION__ \ || (!defined __STRICT_ANSI__ && 9 <= __GNUC__)) # define _GL_HAVE__STATIC_ASSERT1 1 # endif @@ -202,12 +202,12 @@ This macro requires three or more arguments but uses at most the first two, so that the _Static_assert macro optionally defined below supports - both the C11 two-argument syntax and the C23 one-argument syntax. + both the C11 two-argument syntax and the C2X one-argument syntax. Unfortunately, unlike C11, this implementation must appear as an ordinary declaration, and cannot appear inside struct { ... }. */ -#if 202311 <= __STDC_VERSION__ || 200410 <= __cpp_static_assert +#if 200410 <= __cpp_static_assert # define _GL_VERIFY(R, DIAGNOSTIC, ...) static_assert (R, DIAGNOSTIC) #elif defined _GL_HAVE__STATIC_ASSERT # define _GL_VERIFY(R, DIAGNOSTIC, ...) _Static_assert (R, DIAGNOSTIC) @@ -215,75 +215,22 @@ # define _GL_VERIFY(R, DIAGNOSTIC, ...) \ extern int (*_GL_GENSYM (_gl_verify_function) (void)) \ [_GL_VERIFY_TRUE (R, DIAGNOSTIC)] -# if 4 < __GNUC__ + (6 <= __GNUC_MINOR__) -# pragma GCC diagnostic ignored "-Wnested-externs" -# endif #endif /* _GL_STATIC_ASSERT_H is defined if this code is copied into assert.h. */ #ifdef _GL_STATIC_ASSERT_H -/* Define _Static_assert if needed. */ -/* With clang ≥ 3.8.0 in C++ mode, _Static_assert already works and accepts - 1 or 2 arguments. We better don't override it, because clang's standard - C++ library uses static_assert inside classes in several places, and our - replacement via _GL_VERIFY does not work in these contexts. */ -# if (defined __cplusplus && defined __clang__ \ - && (4 <= __clang_major__ + (8 <= __clang_minor__))) -# if 5 <= __clang_major__ -/* Avoid "warning: 'static_assert' with no message is a C++17 extension". */ -# pragma clang diagnostic ignored "-Wc++17-extensions" -# else -/* Avoid "warning: static_assert with no message is a C++1z extension". */ -# pragma clang diagnostic ignored "-Wc++1z-extensions" -# endif -# elif !defined _GL_HAVE__STATIC_ASSERT1 && !defined _Static_assert -# if !defined _MSC_VER || defined __clang__ -# define _Static_assert(...) \ - _GL_VERIFY (__VA_ARGS__, "static assertion failed", -) -# else -# if defined __cplusplus && _MSC_VER >= 1910 - /* In MSVC 14.1 or newer, static_assert accepts one or two arguments, - but _Static_assert is not defined. */ -# define _Static_assert static_assert -# else - /* Work around MSVC preprocessor incompatibility with ISO C; see - . */ -# define _Static_assert(R, ...) \ - _GL_VERIFY ((R), "static assertion failed", -) -# endif -# endif +# if !defined _GL_HAVE__STATIC_ASSERT1 && !defined _Static_assert +# define _Static_assert(...) \ + _GL_VERIFY (__VA_ARGS__, "static assertion failed", -) # endif -/* Define static_assert if needed. */ -# if (!defined static_assert \ - && __STDC_VERSION__ < 202311 \ - && (!defined __cplusplus \ - || (__cpp_static_assert < 201411 \ - && __GNUG__ < 6 && __clang_major__ < 6 && _MSC_VER < 1910))) -# if defined __cplusplus && _MSC_VER >= 1900 && !defined __clang__ -/* MSVC 14 in C++ mode supports the two-arguments static_assert but not - the one-argument static_assert, and it does not support _Static_assert. - We have to play preprocessor tricks to distinguish the two cases. - Since the MSVC preprocessor is not ISO C compliant (see above),. - the solution is specific to MSVC. */ -# define _GL_EXPAND(x) x -# define _GL_SA1(a1) static_assert ((a1), "static assertion failed") -# define _GL_SA2 static_assert -# define _GL_SA3 static_assert -# define _GL_SA_PICK(x1,x2,x3,x4,...) x4 -# define static_assert(...) _GL_EXPAND(_GL_SA_PICK(__VA_ARGS__,_GL_SA3,_GL_SA2,_GL_SA1)) (__VA_ARGS__) -/* Avoid "fatal error C1189: #error: The C++ Standard Library forbids macroizing keywords." */ -# define _ALLOW_KEYWORD_MACROS 1 -# else -# define static_assert _Static_assert /* C11 requires this #define. */ -# endif +# if __cpp_static_assert < 201411 && !defined static_assert +# define static_assert _Static_assert /* C11 requires this #define. */ # endif #endif /* @assert.h omit start@ */ -#if defined __clang_major__ && __clang_major__ < 5 -# define _GL_HAS_BUILTIN_TRAP 0 -#elif 3 < __GNUC__ + (3 < __GNUC_MINOR__ + (4 <= __GNUC_PATCHLEVEL__)) +#if 3 < __GNUC__ + (3 < __GNUC_MINOR__ + (4 <= __GNUC_PATCHLEVEL__)) # define _GL_HAS_BUILTIN_TRAP 1 #elif defined __has_builtin # define _GL_HAS_BUILTIN_TRAP __has_builtin (__builtin_trap) @@ -291,16 +238,12 @@ # define _GL_HAS_BUILTIN_TRAP 0 #endif -#ifndef _GL_HAS_BUILTIN_UNREACHABLE -# if defined __clang_major__ && __clang_major__ < 5 -# define _GL_HAS_BUILTIN_UNREACHABLE 0 -# elif 4 < __GNUC__ + (5 <= __GNUC_MINOR__) -# define _GL_HAS_BUILTIN_UNREACHABLE 1 -# elif defined __has_builtin -# define _GL_HAS_BUILTIN_UNREACHABLE __has_builtin (__builtin_unreachable) -# else -# define _GL_HAS_BUILTIN_UNREACHABLE 0 -# endif +#if 4 < __GNUC__ + (5 <= __GNUC_MINOR__) +# define _GL_HAS_BUILTIN_UNREACHABLE 1 +#elif defined __has_builtin +# define _GL_HAS_BUILTIN_UNREACHABLE __has_builtin (__builtin_unreachable) +#else +# define _GL_HAS_BUILTIN_UNREACHABLE 0 #endif /* Each of these macros verifies that its argument R is nonzero. To @@ -357,16 +300,13 @@ # define assume(R) ((R) ? (void) 0 : __builtin_unreachable ()) #elif 1200 <= _MSC_VER # define assume(R) __assume (R) -#elif 202311 <= __STDC_VERSION__ -# include -# define assume(R) ((R) ? (void) 0 : unreachable ()) #elif (defined GCC_LINT || defined lint) && _GL_HAS_BUILTIN_TRAP /* Doing it this way helps various packages when configured with --enable-gcc-warnings, which compiles with -Dlint. It's nicer - if 'assume' silences warnings with GCC 3.4 through GCC 4.4.7 (2012). */ + when 'assume' silences warnings even with older GCCs. */ # define assume(R) ((R) ? (void) 0 : __builtin_trap ()) #else - /* Some older tools grok NOTREACHED, e.g., Oracle Studio 12.6 (2017). */ + /* Some tools grok NOTREACHED, e.g., Oracle Studio 12.6. */ # define assume(R) ((R) ? (void) 0 : /*NOTREACHED*/ (void) 0) #endif diff -Nru mmv-2.5/lib/warn-on-use.h mmv-2.5.1/lib/warn-on-use.h --- mmv-2.5/lib/warn-on-use.h 2023-07-20 19:40:23.000000000 +0000 +++ mmv-2.5.1/lib/warn-on-use.h 2023-08-08 11:02:48.000000000 +0000 @@ -1,17 +1,17 @@ /* A C macro for emitting warnings if a function is used. - Copyright (C) 2010-2023 Free Software Foundation, Inc. + Copyright (C) 2010-2021 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it - under the terms of the GNU Lesser General Public License as published - by the Free Software Foundation; either version 2 of the License, or + under the terms of the GNU General Public License as published + by the Free Software Foundation; either version 3 of the License, 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 - Lesser General Public License for more details. + General Public License for more details. - You should have received a copy of the GNU Lesser General Public License + You should have received a copy of the GNU General Public License along with this program. If not, see . */ /* _GL_WARN_ON_USE (function, "literal string") issues a declaration @@ -84,20 +84,20 @@ # if 4 < __GNUC__ || (__GNUC__ == 4 && 3 <= __GNUC_MINOR__) /* A compiler attribute is available in gcc versions 4.3.0 and later. */ # define _GL_WARN_ON_USE(function, message) \ -_GL_WARN_EXTERN_C __typeof__ (function) function __attribute__ ((__warning__ (message))) +extern __typeof__ (function) function __attribute__ ((__warning__ (message))) # define _GL_WARN_ON_USE_ATTRIBUTE(message) \ __attribute__ ((__warning__ (message))) # elif __clang_major__ >= 4 /* Another compiler attribute is available in clang. */ # define _GL_WARN_ON_USE(function, message) \ -_GL_WARN_EXTERN_C __typeof__ (function) function \ +extern __typeof__ (function) function \ __attribute__ ((__diagnose_if__ (1, message, "warning"))) # define _GL_WARN_ON_USE_ATTRIBUTE(message) \ __attribute__ ((__diagnose_if__ (1, message, "warning"))) # elif __GNUC__ >= 3 && GNULIB_STRICT_CHECKING /* Verify the existence of the function. */ # define _GL_WARN_ON_USE(function, message) \ -_GL_WARN_EXTERN_C __typeof__ (function) function +extern __typeof__ (function) function # define _GL_WARN_ON_USE_ATTRIBUTE(message) # else /* Unsupported. */ # define _GL_WARN_ON_USE(function, message) \ diff -Nru mmv-2.5/lib/wchar.in.h mmv-2.5.1/lib/wchar.in.h --- mmv-2.5/lib/wchar.in.h 2023-07-20 19:40:24.000000000 +0000 +++ mmv-2.5.1/lib/wchar.in.h 2023-08-08 11:02:48.000000000 +0000 @@ -1,19 +1,19 @@ /* A substitute for ISO C99 , for platforms that have issues. - Copyright (C) 2007-2023 Free Software Foundation, Inc. + Copyright (C) 2007-2021 Free Software Foundation, Inc. - This file is free software: you can redistribute it and/or modify - it under the terms of the GNU Lesser General Public License as - published by the Free Software Foundation; either version 2.1 of the - License, or (at your option) any later version. + 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 file is distributed in the hope that it will be useful, + 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 Lesser General Public License for more details. + GNU General Public License for more details. - You should have received a copy of the GNU Lesser General Public License - along with this program. If not, see . */ + You should have received a copy of the GNU General Public License + along with this program; if not, see . */ /* Written by Eric Blake. */ @@ -84,48 +84,6 @@ #ifndef _@GUARD_PREFIX@_WCHAR_H #define _@GUARD_PREFIX@_WCHAR_H -/* This file uses _GL_ATTRIBUTE_DEALLOC, _GL_ATTRIBUTE_MALLOC, - _GL_ATTRIBUTE_PURE, GNULIB_POSIXCHECK, HAVE_RAW_DECL_*. */ -#if !_GL_CONFIG_H_INCLUDED - #error "Please include config.h first." -#endif - -/* _GL_ATTRIBUTE_DEALLOC (F, I) declares that the function returns pointers - that can be freed by passing them as the Ith argument to the - function F. */ -#ifndef _GL_ATTRIBUTE_DEALLOC -# if __GNUC__ >= 11 -# define _GL_ATTRIBUTE_DEALLOC(f, i) __attribute__ ((__malloc__ (f, i))) -# else -# define _GL_ATTRIBUTE_DEALLOC(f, i) -# endif -#endif - -/* _GL_ATTRIBUTE_DEALLOC_FREE declares that the function returns pointers that - can be freed via 'free'; it can be used only after declaring 'free'. */ -/* Applies to: functions. Cannot be used on inline functions. */ -#ifndef _GL_ATTRIBUTE_DEALLOC_FREE -# if defined __cplusplus && defined __GNUC__ && !defined __clang__ -/* Work around GCC bug */ -# define _GL_ATTRIBUTE_DEALLOC_FREE \ - _GL_ATTRIBUTE_DEALLOC ((void (*) (void *)) free, 1) -# else -# define _GL_ATTRIBUTE_DEALLOC_FREE \ - _GL_ATTRIBUTE_DEALLOC (free, 1) -# endif -#endif - -/* _GL_ATTRIBUTE_MALLOC declares that the function returns a pointer to freshly - allocated memory. */ -/* Applies to: functions. */ -#ifndef _GL_ATTRIBUTE_MALLOC -# if __GNUC__ >= 3 || defined __clang__ -# define _GL_ATTRIBUTE_MALLOC __attribute__ ((__malloc__)) -# else -# define _GL_ATTRIBUTE_MALLOC -# endif -#endif - /* The __attribute__ feature is available in gcc versions 2.5 and later. The attribute __pure__ was added in gcc 2.96. */ #ifndef _GL_ATTRIBUTE_PURE @@ -153,7 +111,7 @@ /* mingw and MSVC define wint_t as 'unsigned short' in or . This is too small: ISO C 99 section 7.24.1.(2) says that wint_t must be "unchanged by default argument promotions". Override it. */ -# if @GNULIBHEADERS_OVERRIDE_WINT_T@ +# if @GNULIB_OVERRIDES_WINT_T@ # if !GNULIB_defined_wint_t # if @HAVE_CRTDEFS_H@ # include @@ -188,49 +146,6 @@ # endif #endif -/* Make _GL_ATTRIBUTE_DEALLOC_FREE work, even though may not have - been included yet. */ -#if @GNULIB_FREE_POSIX@ -# if (@REPLACE_FREE@ && !defined free \ - && !(defined __cplusplus && defined GNULIB_NAMESPACE)) -/* We can't do '#define free rpl_free' here. */ -# if defined __cplusplus && (__GLIBC__ + (__GLIBC_MINOR__ >= 14) > 2) -_GL_EXTERN_C void rpl_free (void *) throw (); -# else -_GL_EXTERN_C void rpl_free (void *); -# endif -# undef _GL_ATTRIBUTE_DEALLOC_FREE -# define _GL_ATTRIBUTE_DEALLOC_FREE _GL_ATTRIBUTE_DEALLOC (rpl_free, 1) -# else -# if defined _MSC_VER && !defined free -_GL_EXTERN_C -# if defined _DLL - __declspec (dllimport) -# endif - void __cdecl free (void *); -# else -# if defined __cplusplus && (__GLIBC__ + (__GLIBC_MINOR__ >= 14) > 2) -_GL_EXTERN_C void free (void *) throw (); -# else -_GL_EXTERN_C void free (void *); -# endif -# endif -# endif -#else -# if defined _MSC_VER && !defined free -_GL_EXTERN_C -# if defined _DLL - __declspec (dllimport) -# endif - void __cdecl free (void *); -# else -# if defined __cplusplus && (__GLIBC__ + (__GLIBC_MINOR__ >= 14) > 2) -_GL_EXTERN_C void free (void *) throw (); -# else -_GL_EXTERN_C void free (void *); -# endif -# endif -#endif /* Convert a single-byte character to a wide character. */ #if @GNULIB_BTOWC@ @@ -451,9 +366,7 @@ const char **restrict srcp, size_t srclen, size_t len, mbstate_t *restrict ps)); # endif -# if __GLIBC__ >= 2 _GL_CXXALIASWARN (mbsnrtowcs); -# endif #elif defined GNULIB_POSIXCHECK # undef mbsnrtowcs # if HAVE_RAW_DECL_MBSNRTOWCS @@ -641,25 +554,13 @@ /* Compare N wide characters of S1 and S2. */ #if @GNULIB_WMEMCMP@ -# if @REPLACE_WMEMCMP@ -# if !(defined __cplusplus && defined GNULIB_NAMESPACE) -# undef wmemcmp -# define wmemcmp rpl_wmemcmp -# endif -_GL_FUNCDECL_RPL (wmemcmp, int, - (const wchar_t *s1, const wchar_t *s2, size_t n) - _GL_ATTRIBUTE_PURE); -_GL_CXXALIAS_RPL (wmemcmp, int, - (const wchar_t *s1, const wchar_t *s2, size_t n)); -# else -# if !@HAVE_WMEMCMP@ +# if !@HAVE_WMEMCMP@ _GL_FUNCDECL_SYS (wmemcmp, int, (const wchar_t *s1, const wchar_t *s2, size_t n) _GL_ATTRIBUTE_PURE); -# endif +# endif _GL_CXXALIAS_SYS (wmemcmp, int, (const wchar_t *s1, const wchar_t *s2, size_t n)); -# endif # if __GLIBC__ >= 2 _GL_CXXALIASWARN (wmemcmp); # endif @@ -718,27 +619,14 @@ /* Copy N wide characters of SRC to DEST. Return pointer to wide characters after the last written wide character. */ #if @GNULIB_WMEMPCPY@ -# if @REPLACE_WMEMPCPY@ -# if !(defined __cplusplus && defined GNULIB_NAMESPACE) -# undef wmempcpy -# define wmempcpy rpl_wmempcpy -# endif -_GL_FUNCDECL_RPL (wmempcpy, wchar_t *, - (wchar_t *restrict dest, - const wchar_t *restrict src, size_t n)); -_GL_CXXALIAS_RPL (wmempcpy, wchar_t *, - (wchar_t *restrict dest, - const wchar_t *restrict src, size_t n)); -# else -# if !@HAVE_WMEMPCPY@ +# if !@HAVE_WMEMPCPY@ _GL_FUNCDECL_SYS (wmempcpy, wchar_t *, (wchar_t *restrict dest, const wchar_t *restrict src, size_t n)); -# endif +# endif _GL_CXXALIAS_SYS (wmempcpy, wchar_t *, (wchar_t *restrict dest, const wchar_t *restrict src, size_t n)); -# endif # if __GLIBC__ >= 2 _GL_CXXALIASWARN (wmempcpy); # endif @@ -789,10 +677,7 @@ /* Return the number of wide characters in S, but at most MAXLEN. */ #if @GNULIB_WCSNLEN@ -/* On Solaris 11.3, the header files declare the function in the std:: - namespace, not in the global namespace. So, force a declaration in - the global namespace. */ -# if !@HAVE_WCSNLEN@ || (defined __sun && defined __cplusplus) +# if !@HAVE_WCSNLEN@ _GL_FUNCDECL_SYS (wcsnlen, size_t, (const wchar_t *s, size_t maxlen) _GL_ATTRIBUTE_PURE); # endif @@ -829,10 +714,7 @@ /* Copy SRC to DEST, returning the address of the terminating L'\0' in DEST. */ #if @GNULIB_WCPCPY@ -/* On Solaris 11.3, the header files declare the function in the std:: - namespace, not in the global namespace. So, force a declaration in - the global namespace. */ -# if !@HAVE_WCPCPY@ || (defined __sun && defined __cplusplus) +# if !@HAVE_WCPCPY@ _GL_FUNCDECL_SYS (wcpcpy, wchar_t *, (wchar_t *restrict dest, const wchar_t *restrict src)); # endif @@ -873,10 +755,7 @@ /* Copy no more than N characters of SRC to DEST, returning the address of the last character written into DEST. */ #if @GNULIB_WCPNCPY@ -/* On Solaris 11.3, the header files declare the function in the std:: - namespace, not in the global namespace. So, force a declaration in - the global namespace. */ -# if !@HAVE_WCPNCPY@ || (defined __sun && defined __cplusplus) +# if !@HAVE_WCPNCPY@ _GL_FUNCDECL_SYS (wcpncpy, wchar_t *, (wchar_t *restrict dest, const wchar_t *restrict src, size_t n)); @@ -938,21 +817,11 @@ /* Compare S1 and S2. */ #if @GNULIB_WCSCMP@ -# if @REPLACE_WCSCMP@ -# if !(defined __cplusplus && defined GNULIB_NAMESPACE) -# undef wcscmp -# define wcscmp rpl_wcscmp -# endif -_GL_FUNCDECL_RPL (wcscmp, int, (const wchar_t *s1, const wchar_t *s2) - _GL_ATTRIBUTE_PURE); -_GL_CXXALIAS_RPL (wcscmp, int, (const wchar_t *s1, const wchar_t *s2)); -# else -# if !@HAVE_WCSCMP@ +# if !@HAVE_WCSCMP@ _GL_FUNCDECL_SYS (wcscmp, int, (const wchar_t *s1, const wchar_t *s2) _GL_ATTRIBUTE_PURE); -# endif -_GL_CXXALIAS_SYS (wcscmp, int, (const wchar_t *s1, const wchar_t *s2)); # endif +_GL_CXXALIAS_SYS (wcscmp, int, (const wchar_t *s1, const wchar_t *s2)); # if __GLIBC__ >= 2 _GL_CXXALIASWARN (wcscmp); # endif @@ -967,25 +836,13 @@ /* Compare no more than N wide characters of S1 and S2. */ #if @GNULIB_WCSNCMP@ -# if @REPLACE_WCSNCMP@ -# if !(defined __cplusplus && defined GNULIB_NAMESPACE) -# undef wcsncmp -# define wcsncmp rpl_wcsncmp -# endif -_GL_FUNCDECL_RPL (wcsncmp, int, - (const wchar_t *s1, const wchar_t *s2, size_t n) - _GL_ATTRIBUTE_PURE); -_GL_CXXALIAS_RPL (wcsncmp, int, - (const wchar_t *s1, const wchar_t *s2, size_t n)); -# else -# if !@HAVE_WCSNCMP@ +# if !@HAVE_WCSNCMP@ _GL_FUNCDECL_SYS (wcsncmp, int, (const wchar_t *s1, const wchar_t *s2, size_t n) _GL_ATTRIBUTE_PURE); -# endif +# endif _GL_CXXALIAS_SYS (wcsncmp, int, (const wchar_t *s1, const wchar_t *s2, size_t n)); -# endif # if __GLIBC__ >= 2 _GL_CXXALIASWARN (wcsncmp); # endif @@ -1000,10 +857,7 @@ /* Compare S1 and S2, ignoring case. */ #if @GNULIB_WCSCASECMP@ -/* On Solaris 11.3, the header files declare the function in the std:: - namespace, not in the global namespace. So, force a declaration in - the global namespace. */ -# if !@HAVE_WCSCASECMP@ || (defined __sun && defined __cplusplus) +# if !@HAVE_WCSCASECMP@ _GL_FUNCDECL_SYS (wcscasecmp, int, (const wchar_t *s1, const wchar_t *s2) _GL_ATTRIBUTE_PURE); # endif @@ -1020,10 +874,7 @@ /* Compare no more than N chars of S1 and S2, ignoring case. */ #if @GNULIB_WCSNCASECMP@ -/* On Solaris 11.3, the header files declare the function in the std:: - namespace, not in the global namespace. So, force a declaration in - the global namespace. */ -# if !@HAVE_WCSNCASECMP@ || (defined __sun && defined __cplusplus) +# if !@HAVE_WCSNCASECMP@ _GL_FUNCDECL_SYS (wcsncasecmp, int, (const wchar_t *s1, const wchar_t *s2, size_t n) _GL_ATTRIBUTE_PURE); @@ -1090,51 +941,36 @@ # endif _GL_CXXALIAS_MDA (wcsdup, wchar_t *, (const wchar_t *s)); # else -/* On Solaris 11.3, the header files declare the function in the std:: - namespace, not in the global namespace. So, force a declaration in - the global namespace. */ -# if !@HAVE_WCSDUP@ || (defined __sun && defined __cplusplus) || __GNUC__ >= 11 -_GL_FUNCDECL_SYS (wcsdup, wchar_t *, - (const wchar_t *s) - _GL_ATTRIBUTE_MALLOC _GL_ATTRIBUTE_DEALLOC_FREE); +# if !@HAVE_WCSDUP@ +_GL_FUNCDECL_SYS (wcsdup, wchar_t *, (const wchar_t *s)); # endif _GL_CXXALIAS_SYS (wcsdup, wchar_t *, (const wchar_t *s)); # endif _GL_CXXALIASWARN (wcsdup); -#else -# if __GNUC__ >= 11 && !defined wcsdup -/* For -Wmismatched-dealloc: Associate wcsdup with free or rpl_free. */ -_GL_FUNCDECL_SYS (wcsdup, wchar_t *, - (const wchar_t *s) - _GL_ATTRIBUTE_MALLOC _GL_ATTRIBUTE_DEALLOC_FREE); -# endif -# if defined GNULIB_POSIXCHECK -# undef wcsdup -# if HAVE_RAW_DECL_WCSDUP +#elif defined GNULIB_POSIXCHECK +# undef wcsdup +# if HAVE_RAW_DECL_WCSDUP _GL_WARN_ON_USE (wcsdup, "wcsdup is unportable - " "use gnulib module wcsdup for portability"); -# endif -# elif @GNULIB_MDA_WCSDUP@ +# endif +#elif @GNULIB_MDA_WCSDUP@ /* On native Windows, map 'wcsdup' to '_wcsdup', so that -loldnames is not required. In C++ with GNULIB_NAMESPACE, avoid differences between platforms by defining GNULIB_NAMESPACE::wcsdup always. */ -# if defined _WIN32 && !defined __CYGWIN__ -# if !(defined __cplusplus && defined GNULIB_NAMESPACE) -# undef wcsdup -# define wcsdup _wcsdup -# endif +# if defined _WIN32 && !defined __CYGWIN__ +# if !(defined __cplusplus && defined GNULIB_NAMESPACE) +# undef wcsdup +# define wcsdup _wcsdup +# endif _GL_CXXALIAS_MDA (wcsdup, wchar_t *, (const wchar_t *s)); -# else -_GL_FUNCDECL_SYS (wcsdup, wchar_t *, - (const wchar_t *s) - _GL_ATTRIBUTE_MALLOC _GL_ATTRIBUTE_DEALLOC_FREE); -# if @HAVE_DECL_WCSDUP@ +# else +_GL_FUNCDECL_SYS (wcsdup, wchar_t *, (const wchar_t *s)); +# if @HAVE_DECL_WCSDUP@ _GL_CXXALIAS_SYS (wcsdup, wchar_t *, (const wchar_t *s)); -# endif # endif -# if (defined _WIN32 && !defined __CYGWIN__) || @HAVE_DECL_WCSDUP@ +# endif +# if (defined _WIN32 && !defined __CYGWIN__) || @HAVE_DECL_WCSDUP@ _GL_CXXALIASWARN (wcsdup); -# endif # endif #endif @@ -1274,25 +1110,12 @@ /* Find the first occurrence of NEEDLE in HAYSTACK. */ #if @GNULIB_WCSSTR@ -# if @REPLACE_WCSSTR@ -# if !(defined __cplusplus && defined GNULIB_NAMESPACE) -# undef wcsstr -# define wcsstr rpl_wcsstr -# endif -_GL_FUNCDECL_RPL (wcsstr, wchar_t *, - (const wchar_t *restrict haystack, - const wchar_t *restrict needle) - _GL_ATTRIBUTE_PURE); -_GL_CXXALIAS_RPL (wcsstr, wchar_t *, - (const wchar_t *restrict haystack, - const wchar_t *restrict needle)); -# else -# if !@HAVE_WCSSTR@ +# if !@HAVE_WCSSTR@ _GL_FUNCDECL_SYS (wcsstr, wchar_t *, (const wchar_t *restrict haystack, const wchar_t *restrict needle) _GL_ATTRIBUTE_PURE); -# endif +# endif /* On some systems, this function is defined as an overloaded function: extern "C++" { const wchar_t * std::wcsstr (const wchar_t *, const wchar_t *); @@ -1303,7 +1126,6 @@ (const wchar_t *restrict, const wchar_t *restrict), const wchar_t *, (const wchar_t *restrict, const wchar_t *restrict)); -# endif # if ((__GLIBC__ == 2 && __GLIBC_MINOR__ >= 10) && !defined __UCLIBC__) \ && (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 4)) _GL_CXXALIASWARN1 (wcsstr, wchar_t *, diff -Nru mmv-2.5/lib/write.c mmv-2.5.1/lib/write.c --- mmv-2.5/lib/write.c 2023-07-20 19:40:23.000000000 +0000 +++ mmv-2.5.1/lib/write.c 2023-08-08 11:02:40.000000000 +0000 @@ -1,18 +1,18 @@ /* POSIX compatible write() function. - Copyright (C) 2008-2023 Free Software Foundation, Inc. + Copyright (C) 2008-2021 Free Software Foundation, Inc. Written by Bruno Haible , 2008. - This file is free software: you can redistribute it and/or modify - it under the terms of the GNU Lesser General Public License as - published by the Free Software Foundation; either version 2.1 of the - License, or (at your option) any later version. + 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 of the License, or + (at your option) any later version. - This file is distributed in the hope that it will be useful, + 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 Lesser General Public License for more details. + GNU General Public License for more details. - You should have received a copy of the GNU Lesser General Public License + You should have received a copy of the GNU General Public License along with this program. If not, see . */ #include diff -Nru mmv-2.5/lib/xalloc-die.c mmv-2.5.1/lib/xalloc-die.c --- mmv-2.5/lib/xalloc-die.c 2023-07-20 19:40:23.000000000 +0000 +++ mmv-2.5.1/lib/xalloc-die.c 2023-08-08 11:02:40.000000000 +0000 @@ -1,11 +1,11 @@ /* Report a memory allocation failure and exit. - Copyright (C) 1997-2000, 2002-2004, 2006, 2009-2023 Free Software + Copyright (C) 1997-2000, 2002-2004, 2006, 2009-2021 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 of the License, or + the Free Software Foundation; either version 3 of the License, or (at your option) any later version. This program is distributed in the hope that it will be useful, diff -Nru mmv-2.5/lib/xalloc-oversized.h mmv-2.5.1/lib/xalloc-oversized.h --- mmv-2.5/lib/xalloc-oversized.h 2023-07-20 19:40:23.000000000 +0000 +++ mmv-2.5.1/lib/xalloc-oversized.h 2023-08-08 11:02:40.000000000 +0000 @@ -1,18 +1,18 @@ /* xalloc-oversized.h -- memory allocation size checking - Copyright (C) 1990-2000, 2003-2004, 2006-2023 Free Software Foundation, Inc. + Copyright (C) 1990-2000, 2003-2004, 2006-2021 Free Software Foundation, Inc. - This file is free software: you can redistribute it and/or modify - it under the terms of the GNU Lesser General Public License as - published by the Free Software Foundation; either version 2.1 of the - License, or (at your option) any later version. + 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 of the License, or + (at your option) any later version. - This file is distributed in the hope that it will be useful, + 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 Lesser General Public License for more details. + GNU General Public License for more details. - You should have received a copy of the GNU Lesser General Public License + You should have received a copy of the GNU General Public License along with this program. If not, see . */ #ifndef XALLOC_OVERSIZED_H_ @@ -21,39 +21,34 @@ #include #include -/* True if N * S does not fit into both ptrdiff_t and size_t. - N and S should be nonnegative and free of side effects. +/* True if N * S would overflow in a size_t calculation, + or would generate a value larger than PTRDIFF_MAX. This expands to a constant expression if N and S are both constants. - By gnulib convention, SIZE_MAX represents overflow in size_t + By gnulib convention, SIZE_MAX represents overflow in size calculations, so the conservative size_t-based dividend to use here is SIZE_MAX - 1. */ #define __xalloc_oversized(n, s) \ - ((s) != 0 \ - && ((size_t) (PTRDIFF_MAX < SIZE_MAX ? PTRDIFF_MAX : SIZE_MAX - 1) / (s) \ - < (n))) - -/* Return 1 if and only if an array of N objects, each of size S, - cannot exist reliably because its total size in bytes would exceed - MIN (PTRDIFF_MAX, SIZE_MAX - 1). - - N and S should be nonnegative and free of side effects. - - Warning: (xalloc_oversized (N, S) ? NULL : malloc (N * S)) can - misbehave if N and S are both narrower than ptrdiff_t and size_t, - and can be rewritten as (xalloc_oversized (N, S) ? NULL - : malloc (N * (size_t) S)). - - This is a macro, not a function, so that it works even if an - argument exceeds MAX (PTRDIFF_MAX, SIZE_MAX). */ -#if 7 <= __GNUC__ && !defined __clang__ && PTRDIFF_MAX < SIZE_MAX + ((size_t) (PTRDIFF_MAX < SIZE_MAX ? PTRDIFF_MAX : SIZE_MAX - 1) / (s) < (n)) + +#if PTRDIFF_MAX < SIZE_MAX +typedef ptrdiff_t __xalloc_count_type; +#else +typedef size_t __xalloc_count_type; +#endif + +/* Return 1 if an array of N objects, each of size S, cannot exist + reliably due to size or ptrdiff_t arithmetic overflow. S must be + positive and N must be nonnegative. This is a macro, not a + function, so that it works correctly even when SIZE_MAX < N. */ + +#if 7 <= __GNUC__ && !defined __clang__ # define xalloc_oversized(n, s) \ - __builtin_mul_overflow_p (n, s, (ptrdiff_t) 1) -#elif (5 <= __GNUC__ && !defined __ICC && !__STRICT_ANSI__ \ - && PTRDIFF_MAX < SIZE_MAX) + __builtin_mul_overflow_p (n, s, (__xalloc_count_type) 1) +#elif 5 <= __GNUC__ && !defined __ICC && !__STRICT_ANSI__ # define xalloc_oversized(n, s) \ (__builtin_constant_p (n) && __builtin_constant_p (s) \ ? __xalloc_oversized (n, s) \ - : ({ ptrdiff_t __xalloc_count; \ + : ({ __xalloc_count_type __xalloc_count; \ __builtin_mul_overflow (n, s, &__xalloc_count); })) /* Other compilers use integer division; this may be slower but is diff -Nru mmv-2.5/lib/xalloc.h mmv-2.5.1/lib/xalloc.h --- mmv-2.5/lib/xalloc.h 2023-07-20 19:40:24.000000000 +0000 +++ mmv-2.5.1/lib/xalloc.h 2023-08-08 11:02:40.000000000 +0000 @@ -1,10 +1,10 @@ /* xalloc.h -- malloc with out-of-memory checking - Copyright (C) 1990-2000, 2003-2004, 2006-2023 Free Software Foundation, Inc. + Copyright (C) 1990-2000, 2003-2004, 2006-2021 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 of the License, or + the Free Software Foundation; either version 3 of the License, or (at your option) any later version. This program is distributed in the hope that it will be useful, @@ -18,20 +18,14 @@ #ifndef XALLOC_H_ #define XALLOC_H_ -/* This file uses _GL_INLINE_HEADER_BEGIN, _GL_INLINE, _Noreturn, - _GL_ATTRIBUTE_ALLOC_SIZE, _GL_ATTRIBUTE_MALLOC, - _GL_ATTRIBUTE_RETURNS_NONNULL. */ -#if !_GL_CONFIG_H_INCLUDED - #error "Please include config.h first." -#endif - #include -#include +#include -#if GNULIB_XALLOC -# include "idx.h" -#endif +#include "xalloc-oversized.h" +#ifndef _GL_INLINE_HEADER_BEGIN + #error "Please include config.h first." +#endif _GL_INLINE_HEADER_BEGIN #ifndef XALLOC_INLINE # define XALLOC_INLINE _GL_INLINE @@ -57,52 +51,18 @@ #if GNULIB_XALLOC void *xmalloc (size_t s) - _GL_ATTRIBUTE_MALLOC _GL_ATTRIBUTE_DEALLOC_FREE - _GL_ATTRIBUTE_ALLOC_SIZE ((1)) _GL_ATTRIBUTE_RETURNS_NONNULL; -void *ximalloc (idx_t s) - _GL_ATTRIBUTE_MALLOC _GL_ATTRIBUTE_DEALLOC_FREE - _GL_ATTRIBUTE_ALLOC_SIZE ((1)) _GL_ATTRIBUTE_RETURNS_NONNULL; -void *xinmalloc (idx_t n, idx_t s) - _GL_ATTRIBUTE_MALLOC _GL_ATTRIBUTE_DEALLOC_FREE - _GL_ATTRIBUTE_ALLOC_SIZE ((1, 2)) _GL_ATTRIBUTE_RETURNS_NONNULL; + _GL_ATTRIBUTE_MALLOC _GL_ATTRIBUTE_ALLOC_SIZE ((1)); void *xzalloc (size_t s) - _GL_ATTRIBUTE_MALLOC _GL_ATTRIBUTE_DEALLOC_FREE - _GL_ATTRIBUTE_ALLOC_SIZE ((1)) _GL_ATTRIBUTE_RETURNS_NONNULL; -void *xizalloc (idx_t s) - _GL_ATTRIBUTE_MALLOC _GL_ATTRIBUTE_DEALLOC_FREE - _GL_ATTRIBUTE_ALLOC_SIZE ((1)) _GL_ATTRIBUTE_RETURNS_NONNULL; + _GL_ATTRIBUTE_MALLOC _GL_ATTRIBUTE_ALLOC_SIZE ((1)); void *xcalloc (size_t n, size_t s) - _GL_ATTRIBUTE_MALLOC _GL_ATTRIBUTE_DEALLOC_FREE - _GL_ATTRIBUTE_ALLOC_SIZE ((1, 2)) _GL_ATTRIBUTE_RETURNS_NONNULL; -void *xicalloc (idx_t n, idx_t s) - _GL_ATTRIBUTE_MALLOC _GL_ATTRIBUTE_DEALLOC_FREE - _GL_ATTRIBUTE_ALLOC_SIZE ((1, 2)) _GL_ATTRIBUTE_RETURNS_NONNULL; + _GL_ATTRIBUTE_MALLOC _GL_ATTRIBUTE_ALLOC_SIZE ((1, 2)); void *xrealloc (void *p, size_t s) - _GL_ATTRIBUTE_ALLOC_SIZE ((2)); -void *xirealloc (void *p, idx_t s) - _GL_ATTRIBUTE_ALLOC_SIZE ((2)) _GL_ATTRIBUTE_RETURNS_NONNULL; -void *xreallocarray (void *p, size_t n, size_t s) - _GL_ATTRIBUTE_ALLOC_SIZE ((2, 3)); -void *xireallocarray (void *p, idx_t n, idx_t s) - _GL_ATTRIBUTE_ALLOC_SIZE ((2, 3)) _GL_ATTRIBUTE_RETURNS_NONNULL; -void *x2realloc (void *p, size_t *ps) /* superseded by xpalloc */ - _GL_ATTRIBUTE_RETURNS_NONNULL; -void *x2nrealloc (void *p, size_t *pn, size_t s) /* superseded by xpalloc */ - _GL_ATTRIBUTE_RETURNS_NONNULL; -void *xpalloc (void *pa, idx_t *pn, idx_t n_incr_min, ptrdiff_t n_max, idx_t s) - _GL_ATTRIBUTE_RETURNS_NONNULL; + _GL_ATTRIBUTE_ALLOC_SIZE ((2)); +void *x2realloc (void *p, size_t *pn); void *xmemdup (void const *p, size_t s) - _GL_ATTRIBUTE_MALLOC _GL_ATTRIBUTE_DEALLOC_FREE - _GL_ATTRIBUTE_ALLOC_SIZE ((2)) _GL_ATTRIBUTE_RETURNS_NONNULL; -void *ximemdup (void const *p, idx_t s) - _GL_ATTRIBUTE_MALLOC _GL_ATTRIBUTE_DEALLOC_FREE - _GL_ATTRIBUTE_ALLOC_SIZE ((2)) _GL_ATTRIBUTE_RETURNS_NONNULL; -char *ximemdup0 (void const *p, idx_t s) - _GL_ATTRIBUTE_MALLOC _GL_ATTRIBUTE_DEALLOC_FREE - _GL_ATTRIBUTE_RETURNS_NONNULL; + _GL_ATTRIBUTE_ALLOC_SIZE ((2)); char *xstrdup (char const *str) - _GL_ATTRIBUTE_MALLOC _GL_ATTRIBUTE_DEALLOC_FREE - _GL_ATTRIBUTE_RETURNS_NONNULL; + _GL_ATTRIBUTE_MALLOC; /* In the following macros, T must be an elementary or structure/union or typedef'ed type, or a pointer to such a type. To apply one of the @@ -133,28 +93,130 @@ /* Allocate an array of N objects, each with S bytes of memory, dynamically, with error checking. S must be nonzero. */ -void *xnmalloc (size_t n, size_t s) - _GL_ATTRIBUTE_MALLOC _GL_ATTRIBUTE_DEALLOC_FREE - _GL_ATTRIBUTE_ALLOC_SIZE ((1, 2)) _GL_ATTRIBUTE_RETURNS_NONNULL; +XALLOC_INLINE void *xnmalloc (size_t n, size_t s) + _GL_ATTRIBUTE_MALLOC _GL_ATTRIBUTE_ALLOC_SIZE ((1, 2)); +XALLOC_INLINE void * +xnmalloc (size_t n, size_t s) +{ + if (xalloc_oversized (n, s)) + xalloc_die (); + return xmalloc (n * s); +} -/* FIXME: Deprecate this in favor of xreallocarray? */ /* Change the size of an allocated block of memory P to an array of N objects each of S bytes, with error checking. S must be nonzero. */ XALLOC_INLINE void *xnrealloc (void *p, size_t n, size_t s) - _GL_ATTRIBUTE_ALLOC_SIZE ((2, 3)); + _GL_ATTRIBUTE_ALLOC_SIZE ((2, 3)); XALLOC_INLINE void * xnrealloc (void *p, size_t n, size_t s) { - return xreallocarray (p, n, s); + if (xalloc_oversized (n, s)) + xalloc_die (); + return xrealloc (p, n * s); +} + +/* If P is null, allocate a block of at least *PN such objects; + otherwise, reallocate P so that it contains more than *PN objects + each of S bytes. S must be nonzero. Set *PN to the new number of + objects, and return the pointer to the new block. *PN is never set + to zero, and the returned pointer is never null. + + Repeated reallocations are guaranteed to make progress, either by + allocating an initial block with a nonzero size, or by allocating a + larger block. + + In the following implementation, nonzero sizes are increased by a + factor of approximately 1.5 so that repeated reallocations have + O(N) overall cost rather than O(N**2) cost, but the + specification for this function does not guarantee that rate. + + Here is an example of use: + + int *p = NULL; + size_t used = 0; + size_t allocated = 0; + + void + append_int (int value) + { + if (used == allocated) + p = x2nrealloc (p, &allocated, sizeof *p); + p[used++] = value; + } + + This causes x2nrealloc to allocate a block of some nonzero size the + first time it is called. + + To have finer-grained control over the initial size, set *PN to a + nonzero value before calling this function with P == NULL. For + example: + + int *p = NULL; + size_t used = 0; + size_t allocated = 0; + size_t allocated1 = 1000; + + void + append_int (int value) + { + if (used == allocated) + { + p = x2nrealloc (p, &allocated1, sizeof *p); + allocated = allocated1; + } + p[used++] = value; + } + + */ + +XALLOC_INLINE void * +x2nrealloc (void *p, size_t *pn, size_t s) +{ + size_t n = *pn; + + if (! p) + { + if (! n) + { + /* The approximate size to use for initial small allocation + requests, when the invoking code specifies an old size of + zero. This is the largest "small" request for the GNU C + library malloc. */ + enum { DEFAULT_MXFAST = 64 * sizeof (size_t) / 4 }; + + n = DEFAULT_MXFAST / s; + n += !n; + } + if (xalloc_oversized (n, s)) + xalloc_die (); + } + else + { + /* Set N = floor (1.5 * N) + 1 so that progress is made even if N == 0. + Check for overflow, so that N * S stays in both ptrdiff_t and + size_t range. The check may be slightly conservative, but an + exact check isn't worth the trouble. */ + if ((PTRDIFF_MAX < SIZE_MAX ? PTRDIFF_MAX : SIZE_MAX) / 3 * 2 / s + <= n) + xalloc_die (); + n += n / 2 + 1; + } + + *pn = n; + return xrealloc (p, n * s); } /* Return a pointer to a new buffer of N bytes. This is like xmalloc, except it returns char *. */ -char *xcharalloc (size_t n) - _GL_ATTRIBUTE_MALLOC _GL_ATTRIBUTE_DEALLOC_FREE - _GL_ATTRIBUTE_ALLOC_SIZE ((1)) _GL_ATTRIBUTE_RETURNS_NONNULL; +XALLOC_INLINE char *xcharalloc (size_t n) + _GL_ATTRIBUTE_MALLOC _GL_ATTRIBUTE_ALLOC_SIZE ((1)); +XALLOC_INLINE char * +xcharalloc (size_t n) +{ + return XNMALLOC (n, char); +} #endif /* GNULIB_XALLOC */ @@ -177,16 +239,9 @@ } template inline T * -xreallocarray (T *p, size_t n, size_t s) -{ - return (T *) xreallocarray ((void *) p, n, s); -} - -/* FIXME: Deprecate this in favor of xreallocarray? */ -template inline T * xnrealloc (T *p, size_t n, size_t s) { - return xreallocarray (p, n, s); + return (T *) xnrealloc ((void *) p, n, s); } template inline T * diff -Nru mmv-2.5/lib/xmalloc.c mmv-2.5.1/lib/xmalloc.c --- mmv-2.5/lib/xmalloc.c 2023-07-20 19:40:23.000000000 +0000 +++ mmv-2.5.1/lib/xmalloc.c 2023-08-08 11:02:40.000000000 +0000 @@ -1,10 +1,10 @@ /* xmalloc.c -- malloc with out of memory checking - Copyright (C) 1990-2000, 2002-2006, 2008-2023 Free Software Foundation, Inc. + Copyright (C) 1990-2000, 2002-2006, 2008-2021 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 of the License, or + the Free Software Foundation; either version 3 of the License, or (at your option) any later version. This program is distributed in the hope that it will be useful, @@ -21,272 +21,80 @@ #include "xalloc.h" -#include "ialloc.h" -#include "minmax.h" - -#include #include -#include #include -static void * _GL_ATTRIBUTE_PURE -nonnull (void *p) -{ - if (!p) - xalloc_die (); - return p; -} +/* 1 if calloc, malloc and realloc are known to be compatible with GNU. + This matters if we are not also using the calloc-gnu, malloc-gnu + and realloc-gnu modules, which define HAVE_CALLOC_GNU, + HAVE_MALLOC_GNU and HAVE_REALLOC_GNU and support the GNU API even + on non-GNU platforms. */ +#if defined HAVE_CALLOC_GNU || (defined __GLIBC__ && !defined __UCLIBC__) +enum { HAVE_GNU_CALLOC = 1 }; +#else +enum { HAVE_GNU_CALLOC = 0 }; +#endif +#if defined HAVE_MALLOC_GNU || (defined __GLIBC__ && !defined __UCLIBC__) +enum { HAVE_GNU_MALLOC = 1 }; +#else +enum { HAVE_GNU_MALLOC = 0 }; +#endif +#if defined HAVE_REALLOC_GNU || (defined __GLIBC__ && !defined __UCLIBC__) +enum { HAVE_GNU_REALLOC = 1 }; +#else +enum { HAVE_GNU_REALLOC = 0 }; +#endif -/* Allocate S bytes of memory dynamically, with error checking. */ +/* Allocate N bytes of memory dynamically, with error checking. */ void * -xmalloc (size_t s) +xmalloc (size_t n) { - return nonnull (malloc (s)); -} - -void * -ximalloc (idx_t s) -{ - return nonnull (imalloc (s)); -} - -char * -xcharalloc (size_t n) -{ - return XNMALLOC (n, char); + void *p = malloc (n); + if (!p && (HAVE_GNU_MALLOC || n)) + xalloc_die (); + return p; } -/* Change the size of an allocated block of memory P to S bytes, +/* Change the size of an allocated block of memory P to N bytes, with error checking. */ void * -xrealloc (void *p, size_t s) +xrealloc (void *p, size_t n) { - void *r = realloc (p, s); - if (!r && (!p || s)) - xalloc_die (); - return r; -} - -void * -xirealloc (void *p, idx_t s) -{ - return nonnull (irealloc (p, s)); -} - -/* Change the size of an allocated block of memory P to an array of N - objects each of S bytes, with error checking. */ + if (!HAVE_GNU_REALLOC && !n && p) + { + /* The GNU and C99 realloc behaviors disagree here. Act like GNU. */ + free (p); + return NULL; + } -void * -xreallocarray (void *p, size_t n, size_t s) -{ - void *r = reallocarray (p, n, s); - if (!r && (!p || (n && s))) + void *r = realloc (p, n); + if (!r && (n || (HAVE_GNU_REALLOC && !p))) xalloc_die (); return r; } -void * -xireallocarray (void *p, idx_t n, idx_t s) -{ - return nonnull (ireallocarray (p, n, s)); -} - -/* Allocate an array of N objects, each with S bytes of memory, - dynamically, with error checking. S must be nonzero. */ - -void * -xnmalloc (size_t n, size_t s) -{ - return xreallocarray (NULL, n, s); -} - -void * -xinmalloc (idx_t n, idx_t s) -{ - return xireallocarray (NULL, n, s); -} - -/* If P is null, allocate a block of at least *PS bytes; otherwise, - reallocate P so that it contains more than *PS bytes. *PS must be - nonzero unless P is null. Set *PS to the new block's size, and - return the pointer to the new block. *PS is never set to zero, and +/* If P is null, allocate a block of at least *PN bytes; otherwise, + reallocate P so that it contains more than *PN bytes. *PN must be + nonzero unless P is null. Set *PN to the new block's size, and + return the pointer to the new block. *PN is never set to zero, and the returned pointer is never null. */ void * -x2realloc (void *p, size_t *ps) +x2realloc (void *p, size_t *pn) { - return x2nrealloc (p, ps, 1); + return x2nrealloc (p, pn, 1); } -/* If P is null, allocate a block of at least *PN such objects; - otherwise, reallocate P so that it contains more than *PN objects - each of S bytes. S must be nonzero. Set *PN to the new number of - objects, and return the pointer to the new block. *PN is never set - to zero, and the returned pointer is never null. - - Repeated reallocations are guaranteed to make progress, either by - allocating an initial block with a nonzero size, or by allocating a - larger block. - - In the following implementation, nonzero sizes are increased by a - factor of approximately 1.5 so that repeated reallocations have - O(N) overall cost rather than O(N**2) cost, but the - specification for this function does not guarantee that rate. - - Here is an example of use: - - int *p = NULL; - size_t used = 0; - size_t allocated = 0; - - void - append_int (int value) - { - if (used == allocated) - p = x2nrealloc (p, &allocated, sizeof *p); - p[used++] = value; - } - - This causes x2nrealloc to allocate a block of some nonzero size the - first time it is called. - - To have finer-grained control over the initial size, set *PN to a - nonzero value before calling this function with P == NULL. For - example: - - int *p = NULL; - size_t used = 0; - size_t allocated = 0; - size_t allocated1 = 1000; - - void - append_int (int value) - { - if (used == allocated) - { - p = x2nrealloc (p, &allocated1, sizeof *p); - allocated = allocated1; - } - p[used++] = value; - } - - */ - -void * -x2nrealloc (void *p, size_t *pn, size_t s) -{ - size_t n = *pn; - - if (! p) - { - if (! n) - { - /* The approximate size to use for initial small allocation - requests, when the invoking code specifies an old size of - zero. This is the largest "small" request for the GNU C - library malloc. */ - enum { DEFAULT_MXFAST = 64 * sizeof (size_t) / 4 }; - - n = DEFAULT_MXFAST / s; - n += !n; - } - } - else - { - /* Set N = floor (1.5 * N) + 1 to make progress even if N == 0. */ - if (ckd_add (&n, n, (n >> 1) + 1)) - xalloc_die (); - } - - p = xreallocarray (p, n, s); - *pn = n; - return p; -} - -/* Grow PA, which points to an array of *PN items, and return the - location of the reallocated array, updating *PN to reflect its - new size. The new array will contain at least N_INCR_MIN more - items, but will not contain more than N_MAX items total. - S is the size of each item, in bytes. - - S and N_INCR_MIN must be positive. *PN must be - nonnegative. If N_MAX is -1, it is treated as if it were - infinity. - - If PA is null, then allocate a new array instead of reallocating - the old one. - - Thus, to grow an array A without saving its old contents, do - { free (A); A = xpalloc (NULL, &AITEMS, ...); }. */ - -void * -xpalloc (void *pa, idx_t *pn, idx_t n_incr_min, ptrdiff_t n_max, idx_t s) -{ - idx_t n0 = *pn; - - /* The approximate size to use for initial small allocation - requests. This is the largest "small" request for the GNU C - library malloc. */ - enum { DEFAULT_MXFAST = 64 * sizeof (size_t) / 4 }; - - /* If the array is tiny, grow it to about (but no greater than) - DEFAULT_MXFAST bytes. Otherwise, grow it by about 50%. - Adjust the growth according to three constraints: N_INCR_MIN, - N_MAX, and what the C language can represent safely. */ - - idx_t n; - if (ckd_add (&n, n0, n0 >> 1)) - n = IDX_MAX; - if (0 <= n_max && n_max < n) - n = n_max; - - /* NBYTES is of a type suitable for holding the count of bytes in an object. - This is typically idx_t, but it should be size_t on (theoretical?) - platforms where SIZE_MAX < IDX_MAX so xpalloc does not pass - values greater than SIZE_MAX to xrealloc. */ -#if IDX_MAX <= SIZE_MAX - idx_t nbytes; -#else - size_t nbytes; -#endif - idx_t adjusted_nbytes - = (ckd_mul (&nbytes, n, s) - ? MIN (IDX_MAX, SIZE_MAX) - : nbytes < DEFAULT_MXFAST ? DEFAULT_MXFAST : 0); - if (adjusted_nbytes) - { - n = adjusted_nbytes / s; - nbytes = adjusted_nbytes - adjusted_nbytes % s; - } - - if (! pa) - *pn = 0; - if (n - n0 < n_incr_min - && (ckd_add (&n, n0, n_incr_min) - || (0 <= n_max && n_max < n) - || ckd_mul (&nbytes, n, s))) - xalloc_die (); - pa = xrealloc (pa, nbytes); - *pn = n; - return pa; -} - -/* Allocate S bytes of zeroed memory dynamically, with error checking. +/* Allocate N bytes of zeroed memory dynamically, with error checking. There's no need for xnzalloc (N, S), since it would be equivalent to xcalloc (N, S). */ void * -xzalloc (size_t s) +xzalloc (size_t n) { - return xcalloc (s, 1); -} - -void * -xizalloc (idx_t s) -{ - return xicalloc (s, 1); + return xcalloc (n, 1); } /* Allocate zeroed memory for N elements of S bytes, with error @@ -295,13 +103,15 @@ void * xcalloc (size_t n, size_t s) { - return nonnull (calloc (n, s)); -} - -void * -xicalloc (idx_t n, idx_t s) -{ - return nonnull (icalloc (n, s)); + void *p; + /* Test for overflow, since objects with size greater than + PTRDIFF_MAX cause pointer subtraction to go awry. Omit size-zero + tests if HAVE_GNU_CALLOC, since GNU calloc never returns NULL if + successful. */ + if (xalloc_oversized (n, s) + || (! (p = calloc (n, s)) && (HAVE_GNU_CALLOC || n != 0))) + xalloc_die (); + return p; } /* Clone an object P of size S, with error checking. There's no need @@ -314,23 +124,6 @@ return memcpy (xmalloc (s), p, s); } -void * -ximemdup (void const *p, idx_t s) -{ - return memcpy (ximalloc (s), p, s); -} - -/* Clone an object P of size S, with error checking. Append - a terminating NUL byte. */ - -char * -ximemdup0 (void const *p, idx_t s) -{ - char *result = ximalloc (s + 1); - result[s] = 0; - return memcpy (result, p, s); -} - /* Clone STRING. */ char * diff -Nru mmv-2.5/lib/xsize.c mmv-2.5.1/lib/xsize.c --- mmv-2.5/lib/xsize.c 2023-07-20 19:40:23.000000000 +0000 +++ mmv-2.5.1/lib/xsize.c 2023-08-08 11:02:40.000000000 +0000 @@ -1,21 +1,3 @@ -/* Checked size_t computations. - - Copyright (C) 2012-2023 Free Software Foundation, Inc. - - This file is free software: you can redistribute it and/or modify - it under the terms of the GNU Lesser General Public License as - published by the Free Software Foundation; either version 2.1 of the - License, or (at your option) any later version. - - This file 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 Lesser General Public License for more details. - - You should have received a copy of the GNU Lesser General Public License - along with this program. If not, see . */ - #include - #define XSIZE_INLINE _GL_EXTERN_INLINE #include "xsize.h" diff -Nru mmv-2.5/lib/xsize.h mmv-2.5.1/lib/xsize.h --- mmv-2.5/lib/xsize.h 2023-07-20 19:40:23.000000000 +0000 +++ mmv-2.5.1/lib/xsize.h 2023-08-08 11:02:48.000000000 +0000 @@ -1,28 +1,23 @@ /* xsize.h -- Checked size_t computations. - Copyright (C) 2003, 2008-2023 Free Software Foundation, Inc. + Copyright (C) 2003, 2008-2021 Free Software Foundation, Inc. - This file is free software: you can redistribute it and/or modify - it under the terms of the GNU Lesser General Public License as - published by the Free Software Foundation; either version 2.1 of the - License, or (at your option) any later version. + 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 file is distributed in the hope that it will be useful, + 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 Lesser General Public License for more details. + GNU General Public License for more details. - You should have received a copy of the GNU Lesser General Public License - along with this program. If not, see . */ + You should have received a copy of the GNU General Public License + along with this program; if not, see . */ #ifndef _XSIZE_H #define _XSIZE_H -/* This file uses _GL_INLINE_HEADER_BEGIN, _GL_INLINE, HAVE_STDINT_H. */ -#if !_GL_CONFIG_H_INCLUDED - #error "Please include config.h first." -#endif - /* Get size_t. */ #include @@ -35,6 +30,9 @@ /* Get ATTRIBUTE_PURE. */ #include "attribute.h" +#ifndef _GL_INLINE_HEADER_BEGIN + #error "Please include config.h first." +#endif _GL_INLINE_HEADER_BEGIN #ifndef XSIZE_INLINE # define XSIZE_INLINE _GL_INLINE diff -Nru mmv-2.5/m4/00gnulib.m4 mmv-2.5.1/m4/00gnulib.m4 --- mmv-2.5/m4/00gnulib.m4 2023-07-20 19:40:23.000000000 +0000 +++ mmv-2.5.1/m4/00gnulib.m4 2023-08-08 11:02:40.000000000 +0000 @@ -1,5 +1,5 @@ # 00gnulib.m4 serial 8 -dnl Copyright (C) 2009-2023 Free Software Foundation, Inc. +dnl Copyright (C) 2009-2021 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 -Nru mmv-2.5/m4/__inline.m4 mmv-2.5.1/m4/__inline.m4 --- mmv-2.5/m4/__inline.m4 2023-07-20 19:40:23.000000000 +0000 +++ mmv-2.5.1/m4/__inline.m4 2023-08-08 11:02:40.000000000 +0000 @@ -1,5 +1,5 @@ # Test for __inline keyword -dnl Copyright 2017-2023 Free Software Foundation, Inc. +dnl Copyright 2017-2021 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 -Nru mmv-2.5/m4/absolute-header.m4 mmv-2.5.1/m4/absolute-header.m4 --- mmv-2.5/m4/absolute-header.m4 2023-07-20 19:40:23.000000000 +0000 +++ mmv-2.5.1/m4/absolute-header.m4 2023-08-08 11:02:40.000000000 +0000 @@ -1,5 +1,5 @@ # absolute-header.m4 serial 17 -dnl Copyright (C) 2006-2023 Free Software Foundation, Inc. +dnl Copyright (C) 2006-2021 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 -Nru mmv-2.5/m4/alloca.m4 mmv-2.5.1/m4/alloca.m4 --- mmv-2.5/m4/alloca.m4 2023-07-20 19:40:23.000000000 +0000 +++ mmv-2.5.1/m4/alloca.m4 2023-08-08 11:02:40.000000000 +0000 @@ -1,5 +1,5 @@ -# alloca.m4 serial 21 -dnl Copyright (C) 2002-2004, 2006-2007, 2009-2023 Free Software Foundation, +# alloca.m4 serial 20 +dnl Copyright (C) 2002-2004, 2006-2007, 2009-2021 Free Software Foundation, dnl Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, @@ -26,15 +26,17 @@ AC_DEFINE([HAVE_ALLOCA], [1], [Define to 1 if you have 'alloca' after including , a header that may be supplied by this distribution.]) - GL_GENERATE_ALLOCA_H=true + ALLOCA_H=alloca.h else dnl alloca exists as a library function, i.e. it is slow and probably dnl a memory leak. Don't define HAVE_ALLOCA in this case. - GL_GENERATE_ALLOCA_H=false + ALLOCA_H= fi else - GL_GENERATE_ALLOCA_H=true + ALLOCA_H=alloca.h fi + AC_SUBST([ALLOCA_H]) + AM_CONDITIONAL([GL_GENERATE_ALLOCA_H], [test -n "$ALLOCA_H"]) if test $ac_cv_working_alloca_h = yes; then HAVE_ALLOCA_H=1 diff -Nru mmv-2.5/m4/assert_h.m4 mmv-2.5.1/m4/assert_h.m4 --- mmv-2.5/m4/assert_h.m4 2023-07-20 19:40:23.000000000 +0000 +++ mmv-2.5.1/m4/assert_h.m4 1970-01-01 00:00:00.000000000 +0000 @@ -1,73 +0,0 @@ -# assert-h.m4 -dnl Copyright (C) 2011-2023 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 Paul Eggert. - -AC_DEFUN([gl_ASSERT_H], -[ - AC_CACHE_CHECK([for static_assert], [gl_cv_static_assert], - [gl_save_CFLAGS=$CFLAGS - for gl_working in "yes, a keyword" "yes, an macro"; do - AS_CASE([$gl_working], - [*assert.h*], [CFLAGS="$gl_save_CFLAGS -DINCLUDE_ASSERT_H"]) - - AC_COMPILE_IFELSE( - [AC_LANG_PROGRAM( - [[#if defined __clang__ && __STDC_VERSION__ < 202311 - #pragma clang diagnostic error "-Wc2x-extensions" - #pragma clang diagnostic error "-Wc++1z-extensions" - #endif - #ifdef INCLUDE_ASSERT_H - #include - #endif - static_assert (2 + 2 == 4, "arithmetic does not work"); - static_assert (2 + 2 == 4); - ]], - [[ - static_assert (sizeof (char) == 1, "sizeof does not work"); - static_assert (sizeof (char) == 1); - ]])], - [gl_cv_static_assert=$gl_working], - [gl_cv_static_assert=no]) - CFLAGS=$gl_save_CFLAGS - test "$gl_cv_static_assert" != no && break - done]) - - GL_GENERATE_ASSERT_H=false - AS_CASE([$gl_cv_static_assert], - [yes*keyword*], - [AC_DEFINE([HAVE_C_STATIC_ASSERT], [1], - [Define to 1 if the static_assert keyword works.])], - [no], - [GL_GENERATE_ASSERT_H=true - gl_NEXT_HEADERS([assert.h])]) - - dnl The "zz" puts this toward config.h's end, to avoid potential - dnl collisions with other definitions. - dnl #undef assert so that programs are not tempted to use it without - dnl specifically including assert.h. - dnl #undef __ASSERT_H__ so that on IRIX, when programs later include - dnl , this include actually defines assert. - dnl Break the #undef_s apart with a comment so that 'configure' does - dnl not comment them out. - AH_VERBATIM([zzstatic_assert], -[#if (!defined HAVE_C_STATIC_ASSERT && !defined assert \ - && (!defined __cplusplus \ - || (__cpp_static_assert < 201411 \ - && __GNUG__ < 6 && __clang_major__ < 6))) - #include - #undef/**/assert - #ifdef __sgi - #undef/**/__ASSERT_H__ - #endif - /* Solaris 11.4 defines static_assert as a macro with 2 arguments. - We need it also to be invocable with a single argument. */ - #if defined __sun && (__STDC_VERSION__ - 0 >= 201112L) && !defined __cplusplus - #undef/**/static_assert - #define static_assert _Static_assert - #endif -#endif]) -]) diff -Nru mmv-2.5/m4/builtin-expect.m4 mmv-2.5.1/m4/builtin-expect.m4 --- mmv-2.5/m4/builtin-expect.m4 2023-07-20 19:40:23.000000000 +0000 +++ mmv-2.5.1/m4/builtin-expect.m4 1970-01-01 00:00:00.000000000 +0000 @@ -1,49 +0,0 @@ -dnl Check for __builtin_expect. - -dnl Copyright 2016-2023 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 Written by Paul Eggert. - -AC_DEFUN([gl___BUILTIN_EXPECT], -[ - AC_CACHE_CHECK([for __builtin_expect], - [gl_cv___builtin_expect], - [AC_LINK_IFELSE( - [AC_LANG_SOURCE([[ - int - main (int argc, char **argv) - { - argc = __builtin_expect (argc, 100); - return argv[argc != 100][0]; - }]])], - [gl_cv___builtin_expect=yes], - [AC_LINK_IFELSE( - [AC_LANG_SOURCE([[ - #include - int - main (int argc, char **argv) - { - argc = __builtin_expect (argc, 100); - return argv[argc != 100][0]; - }]])], - [gl_cv___builtin_expect="in "], - [gl_cv___builtin_expect=no])])]) - if test "$gl_cv___builtin_expect" = yes; then - AC_DEFINE([HAVE___BUILTIN_EXPECT], [1]) - elif test "$gl_cv___builtin_expect" = "in "; then - AC_DEFINE([HAVE___BUILTIN_EXPECT], [2]) - fi - AH_VERBATIM([HAVE___BUILTIN_EXPECT], - [/* Define to 1 if the compiler supports __builtin_expect, - and to 2 if does. */ -#undef HAVE___BUILTIN_EXPECT -#ifndef HAVE___BUILTIN_EXPECT -# define __builtin_expect(e, c) (e) -#elif HAVE___BUILTIN_EXPECT == 2 -# include -#endif - ]) -]) diff -Nru mmv-2.5/m4/c-bool.m4 mmv-2.5.1/m4/c-bool.m4 --- mmv-2.5/m4/c-bool.m4 2023-07-20 19:40:23.000000000 +0000 +++ mmv-2.5.1/m4/c-bool.m4 1970-01-01 00:00:00.000000000 +0000 @@ -1,51 +0,0 @@ -# Check for bool that conforms to C2023. - -dnl Copyright 2022-2023 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_C_BOOL], -[ - AC_CACHE_CHECK([for bool, true, false], [gl_cv_c_bool], - [AC_COMPILE_IFELSE( - [AC_LANG_SOURCE([[ - #if true == false - #error "true == false" - #endif - extern bool b; - bool b = true == false;]])], - [gl_cv_c_bool=yes], - [gl_cv_c_bool=no])]) - if test "$gl_cv_c_bool" = yes; then - AC_DEFINE([HAVE_C_BOOL], [1], - [Define to 1 if bool, true and false work as per C2023.]) - fi - - AC_CHECK_HEADERS_ONCE([stdbool.h]) - - dnl The "zz" puts this toward config.h's end, to avoid potential - dnl collisions with other definitions. - dnl If 'bool', 'true' and 'false' do not work, arrange for them to work. - dnl In C, this means including if it is not already included. - dnl However, if the preprocessor mistakenly treats 'true' as 0, - dnl define it to a bool expression equal to 1; this is needed in - dnl Sun C++ 5.11 (Oracle Solaris Studio 12.2, 2010) and older. - AH_VERBATIM([zzbool], -[#ifndef HAVE_C_BOOL -# if !defined __cplusplus && !defined __bool_true_false_are_defined -# if HAVE_STDBOOL_H -# include -# else -# if defined __SUNPRO_C -# error " is not usable with this configuration. To make it usable, add -D_STDC_C99= to $CC." -# else -# error " does not exist on this platform. Use gnulib module 'stdbool-c99' instead of gnulib module 'stdbool'." -# endif -# endif -# endif -# if !true -# define true (!false) -# endif -#endif]) -]) diff -Nru mmv-2.5/m4/calloc.m4 mmv-2.5.1/m4/calloc.m4 --- mmv-2.5/m4/calloc.m4 2023-07-20 19:40:23.000000000 +0000 +++ mmv-2.5.1/m4/calloc.m4 1970-01-01 00:00:00.000000000 +0000 @@ -1,83 +0,0 @@ -# calloc.m4 serial 30 - -# Copyright (C) 2004-2023 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. - -# Written by Jim Meyering. - -# Determine whether calloc (N, S) returns non-NULL when N*S is zero, -# and returns NULL when N*S overflows. -# If so, define HAVE_CALLOC. Otherwise, define calloc to rpl_calloc -# and arrange to use a calloc wrapper function that does work in that case. - -# _AC_FUNC_CALLOC_IF([IF-WORKS], [IF-NOT]) -# ------------------------------------- -# If calloc is compatible with GNU calloc, run IF-WORKS, otherwise, IF-NOT. -AC_DEFUN([_AC_FUNC_CALLOC_IF], -[ - AC_REQUIRE([AC_CANONICAL_HOST]) dnl for cross-compiles - AC_CACHE_CHECK([whether calloc (0, n) and calloc (n, 0) return nonnull], - [ac_cv_func_calloc_0_nonnull], - [if test $cross_compiling != yes; then - ac_cv_func_calloc_0_nonnull=yes - AC_RUN_IFELSE( - [AC_LANG_PROGRAM( - [AC_INCLUDES_DEFAULT], - [[int result = 0; - char * volatile p = calloc (0, 0); - if (!p) - result |= 1; - free (p); - return result; - ]])], - [], - [ac_cv_func_calloc_0_nonnull=no]) - else - case "$host_os" in - # Guess yes on glibc systems. - *-gnu* | gnu*) ac_cv_func_calloc_0_nonnull="guessing yes" ;; - # Guess yes on musl systems. - *-musl* | midipix*) ac_cv_func_calloc_0_nonnull="guessing yes" ;; - # Guess yes on native Windows. - mingw*) ac_cv_func_calloc_0_nonnull="guessing yes" ;; - # If we don't know, obey --enable-cross-guesses. - *) ac_cv_func_calloc_0_nonnull="$gl_cross_guess_normal" ;; - esac - fi - ]) - AS_CASE([$ac_cv_func_calloc_0_nonnull], [*yes], [$1], [$2]) -]) - - -# gl_FUNC_CALLOC_GNU -# ------------------ -# Replace calloc if it is not compatible with GNU libc. -AC_DEFUN([gl_FUNC_CALLOC_GNU], -[ - AC_REQUIRE([gl_STDLIB_H_DEFAULTS]) - AC_REQUIRE([gl_FUNC_CALLOC_POSIX]) - REPLACE_CALLOC_FOR_CALLOC_GNU="$REPLACE_CALLOC_FOR_CALLOC_POSIX" - if test $REPLACE_CALLOC_FOR_CALLOC_GNU = 0; then - _AC_FUNC_CALLOC_IF([], [REPLACE_CALLOC_FOR_CALLOC_GNU=1]) - fi -])# gl_FUNC_CALLOC_GNU - -# gl_FUNC_CALLOC_POSIX -# -------------------- -# Test whether 'calloc' is POSIX compliant (sets errno to ENOMEM when it -# fails, and doesn't mess up with ptrdiff_t or size_t overflow), -# and replace calloc if it is not. -AC_DEFUN([gl_FUNC_CALLOC_POSIX], -[ - AC_REQUIRE([gl_STDLIB_H_DEFAULTS]) - AC_REQUIRE([gl_FUNC_MALLOC_POSIX]) - if test $REPLACE_MALLOC_FOR_MALLOC_POSIX = 1; then - REPLACE_CALLOC_FOR_CALLOC_POSIX=1 - fi - dnl Although in theory we should also test for size_t overflow, - dnl in practice testing for ptrdiff_t overflow suffices - dnl since PTRDIFF_MAX <= SIZE_MAX on all known Gnulib porting targets. - dnl A separate size_t test would slow down 'configure'. -]) diff -Nru mmv-2.5/m4/canonicalize.m4 mmv-2.5.1/m4/canonicalize.m4 --- mmv-2.5/m4/canonicalize.m4 2023-07-20 19:40:23.000000000 +0000 +++ mmv-2.5.1/m4/canonicalize.m4 2023-08-08 11:02:40.000000000 +0000 @@ -1,6 +1,6 @@ -# canonicalize.m4 serial 38 +# canonicalize.m4 serial 37 -dnl Copyright (C) 2003-2007, 2009-2023 Free Software Foundation, Inc. +dnl Copyright (C) 2003-2007, 2009-2021 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, @@ -12,8 +12,7 @@ [ AC_REQUIRE([gl_USE_SYSTEM_EXTENSIONS]) AC_REQUIRE([gl_FUNC_LSTAT_FOLLOWS_SLASHED_SYMLINK]) - AC_CHECK_FUNCS_ONCE([canonicalize_file_name]) - gl_CHECK_FUNCS_ANDROID([faccessat], [[#include ]]) + AC_CHECK_FUNCS_ONCE([canonicalize_file_name faccessat]) AC_REQUIRE([gl_DOUBLE_SLASH_ROOT]) AC_REQUIRE([gl_FUNC_REALPATH_WORKS]) if test $ac_cv_func_canonicalize_file_name = no; then @@ -59,8 +58,7 @@ [ AC_REQUIRE([gl_USE_SYSTEM_EXTENSIONS]) AC_REQUIRE([gl_FUNC_LSTAT_FOLLOWS_SLASHED_SYMLINK]) - AC_CHECK_FUNCS_ONCE([canonicalize_file_name]) - gl_CHECK_FUNCS_ANDROID([faccessat], [[#include ]]) + AC_CHECK_FUNCS_ONCE([canonicalize_file_name faccessat]) dnl On native Windows, we use _getcwd(), regardless whether getcwd() is dnl available through the linker option '-loldnames'. diff -Nru mmv-2.5/m4/close.m4 mmv-2.5.1/m4/close.m4 --- mmv-2.5/m4/close.m4 2023-07-20 19:40:23.000000000 +0000 +++ mmv-2.5.1/m4/close.m4 2023-08-08 11:02:40.000000000 +0000 @@ -1,10 +1,10 @@ -# close.m4 serial 10 -dnl Copyright (C) 2008-2023 Free Software Foundation, Inc. +# close.m4 serial 9 +dnl Copyright (C) 2008-2021 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_ONCE([gl_FUNC_CLOSE], +AC_DEFUN([gl_FUNC_CLOSE], [ AC_REQUIRE([gl_UNISTD_H_DEFAULTS]) m4_ifdef([gl_MSVC_INVAL], [ diff -Nru mmv-2.5/m4/codeset.m4 mmv-2.5.1/m4/codeset.m4 --- mmv-2.5/m4/codeset.m4 2023-07-20 19:40:23.000000000 +0000 +++ mmv-2.5.1/m4/codeset.m4 1970-01-01 00:00:00.000000000 +0000 @@ -1,24 +0,0 @@ -# codeset.m4 serial 5 (gettext-0.18.2) -dnl Copyright (C) 2000-2002, 2006, 2008-2014, 2016, 2019-2023 Free Software -dnl 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 Bruno Haible. - -AC_DEFUN([AM_LANGINFO_CODESET], -[ - AC_CACHE_CHECK([for nl_langinfo and CODESET], [am_cv_langinfo_codeset], - [AC_LINK_IFELSE( - [AC_LANG_PROGRAM( - [[#include ]], - [[char* cs = nl_langinfo(CODESET); return !cs;]])], - [am_cv_langinfo_codeset=yes], - [am_cv_langinfo_codeset=no]) - ]) - if test $am_cv_langinfo_codeset = yes; then - AC_DEFINE([HAVE_LANGINFO_CODESET], [1], - [Define if you have and nl_langinfo(CODESET).]) - fi -]) diff -Nru mmv-2.5/m4/double-slash-root.m4 mmv-2.5.1/m4/double-slash-root.m4 --- mmv-2.5/m4/double-slash-root.m4 2023-07-20 19:40:23.000000000 +0000 +++ mmv-2.5.1/m4/double-slash-root.m4 2023-08-08 11:02:40.000000000 +0000 @@ -1,5 +1,5 @@ # double-slash-root.m4 serial 4 -*- Autoconf -*- -dnl Copyright (C) 2006, 2008-2023 Free Software Foundation, Inc. +dnl Copyright (C) 2006, 2008-2021 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 -Nru mmv-2.5/m4/dup2.m4 mmv-2.5.1/m4/dup2.m4 --- mmv-2.5/m4/dup2.m4 2023-07-20 19:40:23.000000000 +0000 +++ mmv-2.5.1/m4/dup2.m4 2023-08-08 11:02:40.000000000 +0000 @@ -1,5 +1,5 @@ #serial 27 -dnl Copyright (C) 2002, 2005, 2007, 2009-2023 Free Software Foundation, Inc. +dnl Copyright (C) 2002, 2005, 2007, 2009-2021 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 -Nru mmv-2.5/m4/eealloc.m4 mmv-2.5.1/m4/eealloc.m4 --- mmv-2.5/m4/eealloc.m4 2023-07-20 19:40:23.000000000 +0000 +++ mmv-2.5.1/m4/eealloc.m4 2023-08-08 11:02:40.000000000 +0000 @@ -1,5 +1,5 @@ # eealloc.m4 serial 3 -dnl Copyright (C) 2003, 2009-2023 Free Software Foundation, Inc. +dnl Copyright (C) 2003, 2009-2021 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 -Nru mmv-2.5/m4/errno_h.m4 mmv-2.5.1/m4/errno_h.m4 --- mmv-2.5/m4/errno_h.m4 2023-07-20 19:40:23.000000000 +0000 +++ mmv-2.5.1/m4/errno_h.m4 2023-08-08 11:02:40.000000000 +0000 @@ -1,5 +1,5 @@ -# errno_h.m4 serial 14 -dnl Copyright (C) 2004, 2006, 2008-2023 Free Software Foundation, Inc. +# errno_h.m4 serial 13 +dnl Copyright (C) 2004, 2006, 2008-2021 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. @@ -68,11 +68,13 @@ [gl_cv_header_errno_h_complete=yes]) ]) if test $gl_cv_header_errno_h_complete = yes; then - GL_GENERATE_ERRNO_H=false + ERRNO_H='' else gl_NEXT_HEADERS([errno.h]) - GL_GENERATE_ERRNO_H=true + ERRNO_H='errno.h' fi + AC_SUBST([ERRNO_H]) + AM_CONDITIONAL([GL_GENERATE_ERRNO_H], [test -n "$ERRNO_H"]) gl_REPLACE_ERRNO_VALUE([EMULTIHOP]) gl_REPLACE_ERRNO_VALUE([ENOLINK]) gl_REPLACE_ERRNO_VALUE([EOVERFLOW]) @@ -86,7 +88,7 @@ # Set the variables EOVERFLOW_HIDDEN and EOVERFLOW_VALUE. AC_DEFUN([gl_REPLACE_ERRNO_VALUE], [ - if $GL_GENERATE_ERRNO_H; then + if test -n "$ERRNO_H"; then AC_CACHE_CHECK([for ]$1[ value], [gl_cv_header_errno_h_]$1, [ AC_EGREP_CPP([yes],[ #include diff -Nru mmv-2.5/m4/error.m4 mmv-2.5.1/m4/error.m4 --- mmv-2.5/m4/error.m4 2023-07-20 19:40:23.000000000 +0000 +++ mmv-2.5.1/m4/error.m4 2023-08-08 11:02:40.000000000 +0000 @@ -1,6 +1,6 @@ -#serial 16 +#serial 14 -# Copyright (C) 1996-1998, 2001-2004, 2009-2023 Free Software Foundation, Inc. +# Copyright (C) 1996-1998, 2001-2004, 2009-2021 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -8,15 +8,20 @@ AC_DEFUN([gl_ERROR], [ + dnl We don't use AC_FUNC_ERROR_AT_LINE any more, because it is no longer + dnl maintained in Autoconf and because it invokes AC_LIBOBJ. + AC_CACHE_CHECK([for error_at_line], [ac_cv_lib_error_at_line], + [AC_LINK_IFELSE( + [AC_LANG_PROGRAM( + [[#include ]], + [[error_at_line (0, 0, "", 0, "an error occurred");]])], + [ac_cv_lib_error_at_line=yes], + [ac_cv_lib_error_at_line=no])]) ]) # Prerequisites of lib/error.c. AC_DEFUN([gl_PREREQ_ERROR], [ - dnl Use system extensions on Android, so that AC_FUNC_STRERROR_R - dnl discovers the GNU API for strerror_r on Android API level 23 and later. - AC_REQUIRE([gl_USE_SYSTEM_EXTENSIONS]) - AC_REQUIRE([AC_FUNC_STRERROR_R]) : ]) diff -Nru mmv-2.5/m4/error_h.m4 mmv-2.5.1/m4/error_h.m4 --- mmv-2.5/m4/error_h.m4 2023-07-20 19:40:24.000000000 +0000 +++ mmv-2.5.1/m4/error_h.m4 1970-01-01 00:00:00.000000000 +0000 @@ -1,125 +0,0 @@ -# error_h.m4 serial 3 -dnl Copyright (C) 1996-2023 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 Bruno Haible. -dnl Provide a working "error.h". - -AC_DEFUN_ONCE([gl_ERROR_H], -[ - AC_REQUIRE([AC_CANONICAL_HOST]) dnl for cross-compiles - - gl_CHECK_NEXT_HEADERS([error.h]) - if test $ac_cv_header_error_h = yes; then - HAVE_ERROR_H=1 - else - HAVE_ERROR_H=0 - fi - AC_SUBST([HAVE_ERROR_H]) - - REPLACE_ERROR=0 - - gl_CHECK_FUNCS_ANDROID([error], [[#include ]]) - if test $ac_cv_func_error = yes; then - HAVE_ERROR=1 - else - HAVE_ERROR=0 - case "$gl_cv_onwards_func_error" in - future*) REPLACE_ERROR=1 ;; - esac - fi - - dnl We don't use AC_FUNC_ERROR_AT_LINE any more, because it is no longer - dnl maintained in Autoconf and because it invokes AC_LIBOBJ. - dnl We need to notice a missing declaration, like gl_CHECK_FUNCS_ANDROID does. - AC_CHECK_DECL([error_at_line], , , [[#include ]]) - if test $ac_cv_have_decl_error_at_line = yes; then - AC_CACHE_CHECK([for error_at_line], [ac_cv_lib_error_at_line], - [AC_LINK_IFELSE( - [AC_LANG_PROGRAM( - [[#include ]], - [[error_at_line (0, 0, "", 0, "an error occurred");]])], - [ac_cv_lib_error_at_line=yes], - [ac_cv_lib_error_at_line=no])]) - else - ac_cv_lib_error_at_line=no - fi - if test $ac_cv_lib_error_at_line = yes; then - HAVE_ERROR_AT_LINE=1 - else - HAVE_ERROR_AT_LINE=0 - fi - REPLACE_ERROR_AT_LINE=0 - - if test $ac_cv_func_error = yes && test $ac_cv_lib_error_at_line = yes; then - dnl On Android 11, when error_print_progname is set, the output of the - dnl error() function contains an extra space. - AC_CACHE_CHECK([for working error function], - [gl_cv_func_working_error], - [if test $cross_compiling != yes; then - AC_LINK_IFELSE( - [AC_LANG_PROGRAM([[ - #include - static void print_no_progname (void) {} - ]], [[ - error_print_progname = print_no_progname; - error (0, 0, "foo"); - ]]) - ], - [rm -f conftest.out - if test -s conftest$ac_exeext \ - && ./conftest$ac_exeext 2> conftest.out; then - if grep ' ' conftest.out >/dev/null; then - gl_cv_func_working_error=no - else - gl_cv_func_working_error=yes - fi - else - gl_cv_func_working_error=no - fi - rm -f conftest.out - ], - [gl_cv_func_working_error=no]) - else - AC_COMPILE_IFELSE( - [AC_LANG_PROGRAM([[ - #include - ]], [[ - error (0, 0, "foo"); - ]]) - ], - [case "$host_os" in - # Guess yes on glibc systems. - *-gnu* | gnu*) gl_cv_func_working_error="guessing yes" ;; - # Guess no on Android. - linux*-android*) gl_cv_func_working_error="guessing no" ;; - # If we don't know, obey --enable-cross-guesses. - *) gl_cv_func_working_error="$gl_cross_guess_normal" ;; - esac - ], - [gl_cv_func_working_error=no]) - fi - ]) - case "$gl_cv_func_working_error" in - *no) - REPLACE_ERROR=1 - REPLACE_ERROR_AT_LINE=1 - ;; - esac - fi - - if test $HAVE_ERROR = 0 || test $REPLACE_ERROR = 1 \ - || test $HAVE_ERROR_AT_LINE = 0 || test $REPLACE_ERROR_AT_LINE = 1; then - dnl Provide a substitute file. - GL_GENERATE_ERROR_H=true - else - GL_GENERATE_ERROR_H=false - fi - - AC_SUBST([HAVE_ERROR]) - AC_SUBST([HAVE_ERROR_AT_LINE]) - AC_SUBST([REPLACE_ERROR]) - AC_SUBST([REPLACE_ERROR_AT_LINE]) -]) diff -Nru mmv-2.5/m4/exponentd.m4 mmv-2.5.1/m4/exponentd.m4 --- mmv-2.5/m4/exponentd.m4 2023-07-20 19:40:23.000000000 +0000 +++ mmv-2.5.1/m4/exponentd.m4 2023-08-08 11:02:40.000000000 +0000 @@ -1,9 +1,9 @@ -# exponentd.m4 serial 4 -dnl Copyright (C) 2007-2008, 2010-2023 Free Software Foundation, Inc. +# exponentd.m4 serial 3 +dnl Copyright (C) 2007-2008, 2010-2021 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_ONCE([gl_DOUBLE_EXPONENT_LOCATION], +AC_DEFUN([gl_DOUBLE_EXPONENT_LOCATION], [ AC_CACHE_CHECK([where to find the exponent in a 'double'], [gl_cv_cc_double_expbit0], diff -Nru mmv-2.5/m4/exponentf.m4 mmv-2.5.1/m4/exponentf.m4 --- mmv-2.5/m4/exponentf.m4 2023-07-20 19:40:23.000000000 +0000 +++ mmv-2.5.1/m4/exponentf.m4 2023-08-08 11:02:40.000000000 +0000 @@ -1,9 +1,9 @@ -# exponentf.m4 serial 3 -dnl Copyright (C) 2007-2008, 2010-2023 Free Software Foundation, Inc. +# exponentf.m4 serial 2 +dnl Copyright (C) 2007-2008, 2010-2021 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_ONCE([gl_FLOAT_EXPONENT_LOCATION], +AC_DEFUN([gl_FLOAT_EXPONENT_LOCATION], [ AC_CACHE_CHECK([where to find the exponent in a 'float'], [gl_cv_cc_float_expbit0], diff -Nru mmv-2.5/m4/exponentl.m4 mmv-2.5.1/m4/exponentl.m4 --- mmv-2.5/m4/exponentl.m4 2023-07-20 19:40:23.000000000 +0000 +++ mmv-2.5.1/m4/exponentl.m4 2023-08-08 11:02:40.000000000 +0000 @@ -1,9 +1,9 @@ -# exponentl.m4 serial 6 -dnl Copyright (C) 2007-2023 Free Software Foundation, Inc. +# exponentl.m4 serial 5 +dnl Copyright (C) 2007-2021 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_ONCE([gl_LONG_DOUBLE_EXPONENT_LOCATION], +AC_DEFUN([gl_LONG_DOUBLE_EXPONENT_LOCATION], [ AC_REQUIRE([gl_BIGENDIAN]) AC_REQUIRE([AC_CANONICAL_HOST]) dnl for cross-compiles diff -Nru mmv-2.5/m4/extensions.m4 mmv-2.5.1/m4/extensions.m4 --- mmv-2.5/m4/extensions.m4 2023-07-20 19:40:23.000000000 +0000 +++ mmv-2.5.1/m4/extensions.m4 2023-08-08 11:02:40.000000000 +0000 @@ -1,7 +1,7 @@ -# serial 23 -*- Autoconf -*- +# serial 22 -*- Autoconf -*- # Enable extensions on systems that normally disable them. -# Copyright (C) 2003, 2006-2023 Free Software Foundation, Inc. +# Copyright (C) 2003, 2006-2021 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. @@ -31,7 +31,7 @@ # its dependencies. This will ensure that the gl_USE_SYSTEM_EXTENSIONS # invocation occurs in gl_EARLY, not in gl_INIT. -m4_version_prereq([2.72], [], [ +m4_version_prereq([2.70.1], [], [ # AC_USE_SYSTEM_EXTENSIONS # ------------------------ @@ -113,15 +113,11 @@ #ifndef __STDC_WANT_IEC_60559_DFP_EXT__ # undef __STDC_WANT_IEC_60559_DFP_EXT__ #endif -/* Enable extensions specified by C23 Annex F. */ -#ifndef __STDC_WANT_IEC_60559_EXT__ -# undef __STDC_WANT_IEC_60559_EXT__ -#endif /* Enable extensions specified by ISO/IEC TS 18661-4:2015. */ #ifndef __STDC_WANT_IEC_60559_FUNCS_EXT__ # undef __STDC_WANT_IEC_60559_FUNCS_EXT__ #endif -/* Enable extensions specified by C23 Annex H and ISO/IEC TS 18661-3:2015. */ +/* Enable extensions specified by ISO/IEC TS 18661-3:2015. */ #ifndef __STDC_WANT_IEC_60559_TYPES_EXT__ # undef __STDC_WANT_IEC_60559_TYPES_EXT__ #endif @@ -191,7 +187,6 @@ AC_DEFINE([__STDC_WANT_IEC_60559_ATTRIBS_EXT__]) AC_DEFINE([__STDC_WANT_IEC_60559_BFP_EXT__]) AC_DEFINE([__STDC_WANT_IEC_60559_DFP_EXT__]) - AC_DEFINE([__STDC_WANT_IEC_60559_EXT__]) AC_DEFINE([__STDC_WANT_IEC_60559_FUNCS_EXT__]) AC_DEFINE([__STDC_WANT_IEC_60559_TYPES_EXT__]) AC_DEFINE([__STDC_WANT_LIB_EXT2__]) diff -Nru mmv-2.5/m4/extern-inline.m4 mmv-2.5.1/m4/extern-inline.m4 --- mmv-2.5/m4/extern-inline.m4 2023-07-20 19:40:23.000000000 +0000 +++ mmv-2.5.1/m4/extern-inline.m4 2023-08-08 11:02:40.000000000 +0000 @@ -1,28 +1,13 @@ dnl 'extern inline' a la ISO C99. -dnl Copyright 2012-2023 Free Software Foundation, Inc. +dnl Copyright 2012-2021 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], [ - AC_CACHE_CHECK([whether ctype.h defines __header_inline], - [gl_cv_have___header_inline], - [AC_PREPROC_IFELSE( - [AC_LANG_SOURCE([[#include - #ifndef __header_inline - #error " does not define __header_inline" - #endif - ]])], - [gl_cv_have___header_inline=yes], - [gl_cv_have___header_inline=no])]) - if test "$gl_cv_have___header_inline" = yes; then - AC_DEFINE([HAVE___HEADER_INLINE], [1], - [Define to 1 if ctype.h defines __header_inline.]) - fi - - AH_VERBATIM([HAVE___HEADER_INLINE_1], + 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 @@ -32,8 +17,7 @@ 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 Oracle Developer Studio 12.6 - (Sun C 5.15 SunOS_sparc 2017/05/30). + 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 @@ -69,7 +53,7 @@ */ #if (((defined __APPLE__ && defined __MACH__) \ || defined __DragonFly__ || defined __FreeBSD__) \ - && (defined HAVE___HEADER_INLINE \ + && (defined __header_inline \ ? (defined __cplusplus && defined __GNUC_STDC_INLINE__ \ && ! defined __clang__) \ : ((! defined _DONT_USE_CTYPE_INLINE_ \ @@ -79,8 +63,7 @@ # define _GL_EXTERN_INLINE_STDHEADER_BUG #endif #if ((__GNUC__ \ - ? (defined __GNUC_STDC_INLINE__ && __GNUC_STDC_INLINE__ \ - && !defined __PCC__) \ + ? defined __GNUC_STDC_INLINE__ && __GNUC_STDC_INLINE__ \ : (199901L <= __STDC_VERSION__ \ && !defined __HP_cc \ && !defined __PGI \ @@ -90,7 +73,6 @@ # define _GL_EXTERN_INLINE extern inline # define _GL_EXTERN_INLINE_IN_USE #elif (2 < __GNUC__ + (7 <= __GNUC_MINOR__) && !defined __STRICT_ANSI__ \ - && !defined __PCC__ \ && !defined _GL_EXTERN_INLINE_STDHEADER_BUG) # if defined __GNUC_GNU_INLINE__ && __GNUC_GNU_INLINE__ /* __gnu_inline__ suppresses a GCC 4.2 diagnostic. */ @@ -101,8 +83,8 @@ # define _GL_EXTERN_INLINE extern # define _GL_EXTERN_INLINE_IN_USE #else -# define _GL_INLINE _GL_UNUSED static -# define _GL_EXTERN_INLINE _GL_UNUSED static +# define _GL_INLINE static _GL_UNUSED +# define _GL_EXTERN_INLINE static _GL_UNUSED #endif /* In GCC 4.6 (inclusive) to 5.1 (exclusive), diff -Nru mmv-2.5/m4/fcntl-o.m4 mmv-2.5.1/m4/fcntl-o.m4 --- mmv-2.5/m4/fcntl-o.m4 2023-07-20 19:40:23.000000000 +0000 +++ mmv-2.5.1/m4/fcntl-o.m4 2023-08-08 11:02:40.000000000 +0000 @@ -1,5 +1,5 @@ # fcntl-o.m4 serial 7 -dnl Copyright (C) 2006, 2009-2023 Free Software Foundation, Inc. +dnl Copyright (C) 2006, 2009-2021 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 -Nru mmv-2.5/m4/fcntl.m4 mmv-2.5.1/m4/fcntl.m4 --- mmv-2.5/m4/fcntl.m4 2023-07-20 19:40:23.000000000 +0000 +++ mmv-2.5.1/m4/fcntl.m4 2023-08-08 11:02:40.000000000 +0000 @@ -1,5 +1,5 @@ # fcntl.m4 serial 11 -dnl Copyright (C) 2009-2023 Free Software Foundation, Inc. +dnl Copyright (C) 2009-2021 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 -Nru mmv-2.5/m4/fcntl_h.m4 mmv-2.5.1/m4/fcntl_h.m4 --- mmv-2.5/m4/fcntl_h.m4 2023-07-20 19:40:23.000000000 +0000 +++ mmv-2.5.1/m4/fcntl_h.m4 2023-08-08 11:02:40.000000000 +0000 @@ -1,13 +1,13 @@ -# serial 20 +# serial 17 # Configure fcntl.h. -dnl Copyright (C) 2006-2007, 2009-2023 Free Software Foundation, Inc. +dnl Copyright (C) 2006-2007, 2009-2021 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 Written by Paul Eggert. -AC_DEFUN_ONCE([gl_FCNTL_H], +AC_DEFUN([gl_FCNTL_H], [ AC_REQUIRE([gl_FCNTL_H_DEFAULTS]) AC_REQUIRE([gl_FCNTL_O_FLAGS]) @@ -26,40 +26,25 @@ ]], [fcntl openat]) ]) -# gl_FCNTL_MODULE_INDICATOR([modulename]) -# sets the shell variable that indicates the presence of the given module -# to a C preprocessor expression that will evaluate to 1. -# This macro invocation must not occur in macros that are AC_REQUIREd. AC_DEFUN([gl_FCNTL_MODULE_INDICATOR], [ - dnl Ensure to expand the default settings once only. - gl_FCNTL_H_REQUIRE_DEFAULTS + dnl Use AC_REQUIRE here, so that the default settings are expanded once only. + AC_REQUIRE([gl_FCNTL_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]) ]) -# Initializes the default values for AC_SUBSTed shell variables. -# This macro must not be AC_REQUIREd. It must only be invoked, and only -# outside of macros or in macros that are not AC_REQUIREd. -AC_DEFUN([gl_FCNTL_H_REQUIRE_DEFAULTS], -[ - m4_defun(GL_MODULE_INDICATOR_PREFIX[_FCNTL_H_MODULE_INDICATOR_DEFAULTS], [ - gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_CREAT]) - gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_FCNTL]) - gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_NONBLOCKING]) - gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_OPEN]) - gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_OPENAT]) - dnl Support Microsoft deprecated alias function names by default. - gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MDA_CREAT], [1]) - gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MDA_OPEN], [1]) - ]) - m4_require(GL_MODULE_INDICATOR_PREFIX[_FCNTL_H_MODULE_INDICATOR_DEFAULTS]) - AC_REQUIRE([gl_FCNTL_H_DEFAULTS]) -]) - AC_DEFUN([gl_FCNTL_H_DEFAULTS], [ + GNULIB_CREAT=0; AC_SUBST([GNULIB_CREAT]) + GNULIB_FCNTL=0; AC_SUBST([GNULIB_FCNTL]) + GNULIB_NONBLOCKING=0; AC_SUBST([GNULIB_NONBLOCKING]) + GNULIB_OPEN=0; AC_SUBST([GNULIB_OPEN]) + GNULIB_OPENAT=0; AC_SUBST([GNULIB_OPENAT]) + dnl Support Microsoft deprecated alias function names by default. + GNULIB_MDA_CREAT=1; AC_SUBST([GNULIB_MDA_CREAT]) + GNULIB_MDA_OPEN=1; AC_SUBST([GNULIB_MDA_OPEN]) dnl Assume proper GNU behavior unless another module says otherwise. HAVE_FCNTL=1; AC_SUBST([HAVE_FCNTL]) HAVE_OPENAT=1; AC_SUBST([HAVE_OPENAT]) diff -Nru mmv-2.5/m4/float_h.m4 mmv-2.5.1/m4/float_h.m4 --- mmv-2.5/m4/float_h.m4 2023-07-20 19:40:23.000000000 +0000 +++ mmv-2.5.1/m4/float_h.m4 2023-08-08 11:02:40.000000000 +0000 @@ -1,5 +1,5 @@ -# float_h.m4 serial 13 -dnl Copyright (C) 2007, 2009-2023 Free Software Foundation, Inc. +# float_h.m4 serial 12 +dnl Copyright (C) 2007, 2009-2021 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. @@ -8,18 +8,18 @@ [ AC_REQUIRE([AC_PROG_CC]) AC_REQUIRE([AC_CANONICAL_HOST]) - GL_GENERATE_FLOAT_H=false + FLOAT_H= REPLACE_FLOAT_LDBL=0 case "$host_os" in aix* | beos* | openbsd* | mirbsd* | irix*) - GL_GENERATE_FLOAT_H=true + FLOAT_H=float.h ;; freebsd* | dragonfly*) case "$host_cpu" in changequote(,)dnl i[34567]86 ) changequote([,])dnl - GL_GENERATE_FLOAT_H=true + FLOAT_H=float.h ;; x86_64 ) # On x86_64 systems, the C compiler may still be generating @@ -33,21 +33,21 @@ #endif ]])], [], - [GL_GENERATE_FLOAT_H=true]) + [FLOAT_H=float.h]) ;; esac ;; linux*) case "$host_cpu" in powerpc*) - GL_GENERATE_FLOAT_H=true + FLOAT_H=float.h ;; esac ;; esac case "$host_os" in aix* | freebsd* | dragonfly* | linux*) - if $GL_GENERATE_FLOAT_H; then + if test -n "$FLOAT_H"; then REPLACE_FLOAT_LDBL=1 fi ;; @@ -95,12 +95,14 @@ REPLACE_ITOLD=1 dnl We add the workaround to but also to , dnl to increase the chances that the fix function gets pulled in. - GL_GENERATE_FLOAT_H=true + FLOAT_H=float.h ;; esac - if $GL_GENERATE_FLOAT_H; then + if test -n "$FLOAT_H"; then gl_NEXT_HEADERS([float.h]) fi + AC_SUBST([FLOAT_H]) + AM_CONDITIONAL([GL_GENERATE_FLOAT_H], [test -n "$FLOAT_H"]) AC_SUBST([REPLACE_ITOLD]) ]) diff -Nru mmv-2.5/m4/fpieee.m4 mmv-2.5.1/m4/fpieee.m4 --- mmv-2.5/m4/fpieee.m4 2023-07-20 19:40:23.000000000 +0000 +++ mmv-2.5.1/m4/fpieee.m4 2023-08-08 11:02:40.000000000 +0000 @@ -1,5 +1,5 @@ # fpieee.m4 serial 2 -*- coding: utf-8 -*- -dnl Copyright (C) 2007, 2009-2023 Free Software Foundation, Inc. +dnl Copyright (C) 2007, 2009-2021 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 -Nru mmv-2.5/m4/fprintf-posix.m4 mmv-2.5.1/m4/fprintf-posix.m4 --- mmv-2.5/m4/fprintf-posix.m4 2023-07-20 19:40:23.000000000 +0000 +++ mmv-2.5.1/m4/fprintf-posix.m4 2023-08-08 11:02:40.000000000 +0000 @@ -1,34 +1,19 @@ -# fprintf-posix.m4 serial 18 -dnl Copyright (C) 2007-2023 Free Software Foundation, Inc. +# fprintf-posix.m4 serial 14 +dnl Copyright (C) 2007-2021 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_FUNC_FPRINTF_POSIX], [ - AC_REQUIRE([gl_FUNC_FPRINTF_IS_POSIX]) - if test $gl_cv_func_fprintf_posix = no; then - gl_PREREQ_VASNPRINTF_WITH_POSIX_EXTRAS - gl_REPLACE_VASNPRINTF - gl_REPLACE_FPRINTF - fi -]) - -dnl Test whether fprintf is POSIX compliant. -dnl Result is gl_cv_func_fprintf_posix. -AC_DEFUN([gl_FUNC_FPRINTF_IS_POSIX], -[ AC_REQUIRE([gl_PRINTF_SIZES_C99]) - AC_REQUIRE([gl_PRINTF_SIZES_C23]) AC_REQUIRE([gl_PRINTF_LONG_DOUBLE]) AC_REQUIRE([gl_PRINTF_INFINITE]) AC_REQUIRE([gl_PRINTF_INFINITE_LONG_DOUBLE]) AC_REQUIRE([gl_PRINTF_DIRECTIVE_A]) - AC_REQUIRE([gl_PRINTF_DIRECTIVE_B]) AC_REQUIRE([gl_PRINTF_DIRECTIVE_F]) AC_REQUIRE([gl_PRINTF_DIRECTIVE_N]) AC_REQUIRE([gl_PRINTF_DIRECTIVE_LS]) - AC_REQUIRE([gl_PRINTF_DIRECTIVE_LC]) AC_REQUIRE([gl_PRINTF_POSITIONS]) AC_REQUIRE([gl_PRINTF_FLAG_GROUPING]) AC_REQUIRE([gl_PRINTF_FLAG_LEFTADJUST]) @@ -38,47 +23,35 @@ gl_cv_func_fprintf_posix=no case "$gl_cv_func_printf_sizes_c99" in *yes) - case "$gl_cv_func_printf_sizes_c23" in + case "$gl_cv_func_printf_long_double" in *yes) - case "$gl_cv_func_printf_long_double" in + case "$gl_cv_func_printf_infinite" in *yes) - case "$gl_cv_func_printf_infinite" in + case "$gl_cv_func_printf_infinite_long_double" in *yes) - case "$gl_cv_func_printf_infinite_long_double" in + case "$gl_cv_func_printf_directive_a" in *yes) - case "$gl_cv_func_printf_directive_a" in + case "$gl_cv_func_printf_directive_f" in *yes) - case "$gl_cv_func_printf_directive_b" in + case "$gl_cv_func_printf_directive_n" in *yes) - case "$gl_cv_func_printf_directive_f" in + case "$gl_cv_func_printf_directive_ls" in *yes) - case "$gl_cv_func_printf_directive_n" in + case "$gl_cv_func_printf_positions" in *yes) - case "$gl_cv_func_printf_directive_ls" in + case "$gl_cv_func_printf_flag_grouping" in *yes) - case "$gl_cv_func_printf_directive_lc" in + case "$gl_cv_func_printf_flag_leftadjust" in *yes) - case "$gl_cv_func_printf_positions" in + case "$gl_cv_func_printf_flag_zero" in *yes) - case "$gl_cv_func_printf_flag_grouping" in + case "$gl_cv_func_printf_precision" in *yes) - case "$gl_cv_func_printf_flag_leftadjust" in + case "$gl_cv_func_printf_enomem" in *yes) - case "$gl_cv_func_printf_flag_zero" in - *yes) - case "$gl_cv_func_printf_precision" in - *yes) - case "$gl_cv_func_printf_enomem" in - *yes) - # fprintf exists and is - # already POSIX compliant. - gl_cv_func_fprintf_posix=yes - ;; - esac - ;; - esac - ;; - esac + # fprintf exists and is + # already POSIX compliant. + gl_cv_func_fprintf_posix=yes ;; esac ;; @@ -107,6 +80,21 @@ esac ;; esac + if test $gl_cv_func_fprintf_posix = no; then + gl_PREREQ_VASNPRINTF_LONG_DOUBLE + gl_PREREQ_VASNPRINTF_INFINITE_DOUBLE + gl_PREREQ_VASNPRINTF_INFINITE_LONG_DOUBLE + gl_PREREQ_VASNPRINTF_DIRECTIVE_A + gl_PREREQ_VASNPRINTF_DIRECTIVE_F + gl_PREREQ_VASNPRINTF_DIRECTIVE_LS + gl_PREREQ_VASNPRINTF_FLAG_GROUPING + gl_PREREQ_VASNPRINTF_FLAG_LEFTADJUST + gl_PREREQ_VASNPRINTF_FLAG_ZERO + gl_PREREQ_VASNPRINTF_PRECISION + gl_PREREQ_VASNPRINTF_ENOMEM + gl_REPLACE_VASNPRINTF + gl_REPLACE_FPRINTF + fi ]) AC_DEFUN([gl_REPLACE_FPRINTF], diff -Nru mmv-2.5/m4/free.m4 mmv-2.5.1/m4/free.m4 --- mmv-2.5/m4/free.m4 2023-07-20 19:40:23.000000000 +0000 +++ mmv-2.5.1/m4/free.m4 2023-08-08 11:02:40.000000000 +0000 @@ -1,5 +1,5 @@ # free.m4 serial 6 -# Copyright (C) 2003-2005, 2009-2023 Free Software Foundation, Inc. +# Copyright (C) 2003-2005, 2009-2021 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 -Nru mmv-2.5/m4/frexp.m4 mmv-2.5.1/m4/frexp.m4 --- mmv-2.5/m4/frexp.m4 2023-07-20 19:40:23.000000000 +0000 +++ mmv-2.5.1/m4/frexp.m4 2023-08-08 11:02:40.000000000 +0000 @@ -1,5 +1,5 @@ # frexp.m4 serial 16 -dnl Copyright (C) 2007-2023 Free Software Foundation, Inc. +dnl Copyright (C) 2007-2021 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 -Nru mmv-2.5/m4/frexpl.m4 mmv-2.5.1/m4/frexpl.m4 --- mmv-2.5/m4/frexpl.m4 2023-07-20 19:40:23.000000000 +0000 +++ mmv-2.5.1/m4/frexpl.m4 2023-08-08 11:02:40.000000000 +0000 @@ -1,5 +1,5 @@ # frexpl.m4 serial 22 -dnl Copyright (C) 2007-2023 Free Software Foundation, Inc. +dnl Copyright (C) 2007-2021 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 -Nru mmv-2.5/m4/fseterr.m4 mmv-2.5.1/m4/fseterr.m4 --- mmv-2.5/m4/fseterr.m4 2023-07-20 19:40:23.000000000 +0000 +++ mmv-2.5.1/m4/fseterr.m4 2023-08-08 11:02:40.000000000 +0000 @@ -1,13 +1,10 @@ -# fseterr.m4 serial 2 -dnl Copyright (C) 2012-2023 Free Software Foundation, Inc. +# fseterr.m4 serial 1 +dnl Copyright (C) 2012-2021 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_FUNC_FSETERR], [ - gl_CHECK_FUNCS_ANDROID([__fseterr], - [[#include - #include - ]]) + AC_CHECK_FUNCS_ONCE([__fseterr]) ]) diff -Nru mmv-2.5/m4/fstat.m4 mmv-2.5.1/m4/fstat.m4 --- mmv-2.5/m4/fstat.m4 2023-07-20 19:40:23.000000000 +0000 +++ mmv-2.5.1/m4/fstat.m4 2023-08-08 11:02:40.000000000 +0000 @@ -1,5 +1,5 @@ -# fstat.m4 serial 8 -dnl Copyright (C) 2011-2023 Free Software Foundation, Inc. +# fstat.m4 serial 7 +dnl Copyright (C) 2011-2021 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. @@ -34,7 +34,7 @@ # Prerequisites of lib/fstat.c and lib/stat-w32.c. AC_DEFUN([gl_PREREQ_FSTAT], [ - AC_REQUIRE([gl_SYS_STAT_H]) + AC_REQUIRE([gl_HEADER_SYS_STAT_H]) AC_REQUIRE([gl_PREREQ_STAT_W32]) : ]) diff -Nru mmv-2.5/m4/getdtablesize.m4 mmv-2.5.1/m4/getdtablesize.m4 --- mmv-2.5/m4/getdtablesize.m4 2023-07-20 19:40:23.000000000 +0000 +++ mmv-2.5.1/m4/getdtablesize.m4 2023-08-08 11:02:40.000000000 +0000 @@ -1,5 +1,5 @@ # getdtablesize.m4 serial 8 -dnl Copyright (C) 2008-2023 Free Software Foundation, Inc. +dnl Copyright (C) 2008-2021 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 -Nru mmv-2.5/m4/getopt.m4 mmv-2.5.1/m4/getopt.m4 --- mmv-2.5/m4/getopt.m4 2023-07-20 19:40:23.000000000 +0000 +++ mmv-2.5.1/m4/getopt.m4 2023-08-08 11:02:40.000000000 +0000 @@ -1,5 +1,5 @@ -# getopt.m4 serial 48 -dnl Copyright (C) 2002-2006, 2008-2023 Free Software Foundation, Inc. +# getopt.m4 serial 47 +dnl Copyright (C) 2002-2006, 2008-2021 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. @@ -21,8 +21,6 @@ REPLACE_GETOPT=1 fi ]) - GL_GENERATE_GETOPT_H=false - GL_GENERATE_GETOPT_CDEFS_H=false if test $REPLACE_GETOPT = 1; then dnl Arrange for getopt.h to be created. gl_GETOPT_SUBSTITUTE_HEADER @@ -376,6 +374,8 @@ AC_DEFINE([__GETOPT_PREFIX], [[rpl_]], [Define to rpl_ if the getopt replacement functions and variables should be used.]) - GL_GENERATE_GETOPT_H=true - GL_GENERATE_GETOPT_CDEFS_H=true + GETOPT_H=getopt.h + GETOPT_CDEFS_H=getopt-cdefs.h + AC_SUBST([GETOPT_H]) + AC_SUBST([GETOPT_CDEFS_H]) ]) diff -Nru mmv-2.5/m4/getprogname.m4 mmv-2.5.1/m4/getprogname.m4 --- mmv-2.5/m4/getprogname.m4 2023-07-20 19:40:23.000000000 +0000 +++ mmv-2.5.1/m4/getprogname.m4 2023-08-08 11:02:40.000000000 +0000 @@ -1,33 +1,16 @@ # getprogname.m4 - check for getprogname or replacements for it -# Copyright (C) 2016-2023 Free Software Foundation, Inc. +# Copyright (C) 2016-2021 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. -# serial 8 +# serial 4 AC_DEFUN([gl_FUNC_GETPROGNAME], [ - AC_REQUIRE([gl_STDLIB_H_DEFAULTS]) + AC_CHECK_FUNCS_ONCE([getprogname getexecname]) AC_REQUIRE([gl_USE_SYSTEM_EXTENSIONS]) - gl_CHECK_FUNCS_ANDROID([getprogname], [[#include ]]) - if test $ac_cv_func_getprogname = no; then - HAVE_GETPROGNAME=0 - case "$gl_cv_onwards_func_getprogname" in - future*) REPLACE_GETPROGNAME=1 ;; - esac - fi - AC_CHECK_DECLS([program_invocation_name], - [], - [HAVE_DECL_PROGRAM_INVOCATION_NAME=0], - [[#include ]]) -]) - -AC_DEFUN([gl_PREREQ_GETPROGNAME], -[ - AC_REQUIRE([gl_USE_SYSTEM_EXTENSIONS]) - AC_CHECK_FUNCS_ONCE([getexecname]) ac_found=0 AC_CHECK_DECLS([program_invocation_name], [ac_found=1], [], [#include ]) diff -Nru mmv-2.5/m4/gnulib-cache.m4 mmv-2.5.1/m4/gnulib-cache.m4 --- mmv-2.5/m4/gnulib-cache.m4 2023-07-20 19:40:35.000000000 +0000 +++ mmv-2.5.1/m4/gnulib-cache.m4 2023-08-08 11:03:25.000000000 +0000 @@ -1,8 +1,8 @@ -# Copyright (C) 2002-2023 Free Software Foundation, Inc. +# Copyright (C) 2002-2021 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 -# the Free Software Foundation, either version 3 of the License, or +# the Free Software Foundation; either version 3 of the License, or # (at your option) any later version. # # This file is distributed in the hope that it will be useful, diff -Nru mmv-2.5/m4/gnulib-common.m4 mmv-2.5.1/m4/gnulib-common.m4 --- mmv-2.5/m4/gnulib-common.m4 2023-07-20 19:40:24.000000000 +0000 +++ mmv-2.5.1/m4/gnulib-common.m4 2023-08-08 11:02:40.000000000 +0000 @@ -1,5 +1,5 @@ -# gnulib-common.m4 serial 87 -dnl Copyright (C) 2007-2023 Free Software Foundation, Inc. +# gnulib-common.m4 serial 63 +dnl Copyright (C) 2007-2021 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. @@ -15,10 +15,6 @@ AC_REQUIRE([gl_ZZGNULIB]) ]) AC_DEFUN([gl_COMMON_BODY], [ - AH_VERBATIM([0witness], -[/* Witness that has been included. */ -#define _GL_CONFIG_H_INCLUDED 1 -]) AH_VERBATIM([_GL_GNUC_PREREQ], [/* True if the compiler says it groks GNU C version MAJOR.MINOR. */ #if defined __GNUC__ && defined __GNUC_MINOR__ @@ -42,11 +38,6 @@ AIX system header files and several gnulib header files use precisely this syntax with 'extern'. */ # define _Noreturn [[noreturn]] -# elif (defined __clang__ && __clang_major__ < 16 \ - && defined _GL_WORK_AROUND_LLVM_BUG_59792) - /* Compile with -D_GL_WORK_AROUND_LLVM_BUG_59792 to work around - that rare LLVM bug, though you may get many false-alarm warnings. */ -# define _Noreturn # elif ((!defined __cplusplus || defined __clang__) \ && (201112 <= (defined __STDC_VERSION__ ? __STDC_VERSION__ : 0) \ || (!defined __STRICT_ANSI__ \ @@ -78,9 +69,7 @@ [/* Attributes. */ #if (defined __has_attribute \ && (!defined __clang_minor__ \ - || (defined __apple_build_version__ \ - ? 6000000 <= __apple_build_version__ \ - : 5 <= __clang_major__))) + || 3 < __clang_major__ + (5 <= __clang_minor__))) # define _GL_HAS_ATTRIBUTE(attr) __has_attribute (__##attr##__) #else # define _GL_HAS_ATTRIBUTE(attr) _GL_ATTR_##attr @@ -96,12 +85,12 @@ # define _GL_ATTR_fallthrough _GL_GNUC_PREREQ (7, 0) # define _GL_ATTR_format _GL_GNUC_PREREQ (2, 7) # define _GL_ATTR_leaf _GL_GNUC_PREREQ (4, 6) -# define _GL_ATTR_malloc _GL_GNUC_PREREQ (3, 0) # ifdef _ICC # define _GL_ATTR_may_alias 0 # else # define _GL_ATTR_may_alias _GL_GNUC_PREREQ (3, 3) # endif +# define _GL_ATTR_malloc _GL_GNUC_PREREQ (3, 0) # define _GL_ATTR_noinline _GL_GNUC_PREREQ (3, 1) # define _GL_ATTR_nonnull _GL_GNUC_PREREQ (3, 3) # define _GL_ATTR_nonstring _GL_GNUC_PREREQ (8, 0) @@ -114,454 +103,180 @@ # define _GL_ATTR_warn_unused_result _GL_GNUC_PREREQ (3, 4) #endif -/* Disable GCC -Wpedantic if using __has_c_attribute and this is not C23+. */ -#if (defined __has_c_attribute && _GL_GNUC_PREREQ (4, 6) \ - && (defined __STDC_VERSION__ ? __STDC_VERSION__ : 0) <= 201710) -# pragma GCC diagnostic ignored "-Wpedantic" -#endif - -/* Define if, in a function declaration, the attributes in bracket syntax - [[...]] must come before the attributes in __attribute__((...)) syntax. - If this is defined, it is best to avoid the bracket syntax, so that the - various _GL_ATTRIBUTE_* can be cumulated on the same declaration in any - order. */ -#ifdef __cplusplus -# if defined __clang__ -# define _GL_BRACKET_BEFORE_ATTRIBUTE 1 -# endif -#else -# if defined __GNUC__ && !defined __clang__ -# define _GL_BRACKET_BEFORE_ATTRIBUTE 1 -# endif -#endif -]dnl There is no _GL_ATTRIBUTE_ALIGNED; use stdalign's alignas instead. +]dnl There is no _GL_ATTRIBUTE_ALIGNED; use stdalign's _Alignas instead. [ -/* _GL_ATTRIBUTE_ALLOC_SIZE ((N)) declares that the Nth argument of the function - is the size of the returned memory block. - _GL_ATTRIBUTE_ALLOC_SIZE ((M, N)) declares that the Mth argument multiplied - by the Nth argument of the function is the size of the returned memory block. - */ -/* Applies to: function, pointer to function, function types. */ -#ifndef _GL_ATTRIBUTE_ALLOC_SIZE -# if _GL_HAS_ATTRIBUTE (alloc_size) -# define _GL_ATTRIBUTE_ALLOC_SIZE(args) __attribute__ ((__alloc_size__ args)) -# else -# define _GL_ATTRIBUTE_ALLOC_SIZE(args) -# endif +#if _GL_HAS_ATTRIBUTE (alloc_size) +# define _GL_ATTRIBUTE_ALLOC_SIZE(args) __attribute__ ((__alloc_size__ args)) +#else +# define _GL_ATTRIBUTE_ALLOC_SIZE(args) #endif -/* _GL_ATTRIBUTE_ALWAYS_INLINE tells that the compiler should always inline the - function and report an error if it cannot do so. */ -/* Applies to: function. */ -#ifndef _GL_ATTRIBUTE_ALWAYS_INLINE -# if _GL_HAS_ATTRIBUTE (always_inline) -# define _GL_ATTRIBUTE_ALWAYS_INLINE __attribute__ ((__always_inline__)) -# else -# define _GL_ATTRIBUTE_ALWAYS_INLINE -# endif +#if _GL_HAS_ATTRIBUTE (always_inline) +# define _GL_ATTRIBUTE_ALWAYS_INLINE __attribute__ ((__always_inline__)) +#else +# define _GL_ATTRIBUTE_ALWAYS_INLINE #endif -/* _GL_ATTRIBUTE_ARTIFICIAL declares that the function is not important to show - in stack traces when debugging. The compiler should omit the function from - stack traces. */ -/* Applies to: function. */ -#ifndef _GL_ATTRIBUTE_ARTIFICIAL -# if _GL_HAS_ATTRIBUTE (artificial) -# define _GL_ATTRIBUTE_ARTIFICIAL __attribute__ ((__artificial__)) -# else -# define _GL_ATTRIBUTE_ARTIFICIAL -# endif +#if _GL_HAS_ATTRIBUTE (artificial) +# define _GL_ATTRIBUTE_ARTIFICIAL __attribute__ ((__artificial__)) +#else +# define _GL_ATTRIBUTE_ARTIFICIAL #endif -/* _GL_ATTRIBUTE_COLD declares that the function is rarely executed. */ -/* Applies to: functions. */ /* Avoid __attribute__ ((cold)) on MinGW; see thread starting at . Also, Oracle Studio 12.6 requires 'cold' not '__cold__'. */ -#ifndef _GL_ATTRIBUTE_COLD -# if _GL_HAS_ATTRIBUTE (cold) && !defined __MINGW32__ -# ifndef __SUNPRO_C -# define _GL_ATTRIBUTE_COLD __attribute__ ((__cold__)) -# else -# define _GL_ATTRIBUTE_COLD __attribute__ ((cold)) -# endif -# else -# define _GL_ATTRIBUTE_COLD -# endif -#endif - -/* _GL_ATTRIBUTE_CONST declares that it is OK for a compiler to omit duplicate - calls to the function with the same arguments. - This attribute is safe for a function that neither depends on nor affects - observable state, and always returns exactly once - e.g., does not loop - forever, and does not call longjmp. - (This attribute is stricter than _GL_ATTRIBUTE_PURE.) */ -/* Applies to: functions. */ -#ifndef _GL_ATTRIBUTE_CONST -# if _GL_HAS_ATTRIBUTE (const) -# define _GL_ATTRIBUTE_CONST __attribute__ ((__const__)) -# else -# define _GL_ATTRIBUTE_CONST -# endif -#endif - -/* _GL_ATTRIBUTE_DEALLOC (F, I) declares that the function returns pointers - that can be freed by passing them as the Ith argument to the - function F. - _GL_ATTRIBUTE_DEALLOC_FREE declares that the function returns pointers that - can be freed via 'free'; it can be used only after declaring 'free'. */ -/* Applies to: functions. Cannot be used on inline functions. */ -#ifndef _GL_ATTRIBUTE_DEALLOC -# if _GL_GNUC_PREREQ (11, 0) -# define _GL_ATTRIBUTE_DEALLOC(f, i) __attribute__ ((__malloc__ (f, i))) -# else -# define _GL_ATTRIBUTE_DEALLOC(f, i) -# endif -#endif -/* If gnulib's or has already defined this macro, continue - to use this earlier definition, since may not have been included - yet. */ -#ifndef _GL_ATTRIBUTE_DEALLOC_FREE -# if defined __cplusplus && defined __GNUC__ && !defined __clang__ -/* Work around GCC bug */ -# define _GL_ATTRIBUTE_DEALLOC_FREE \ - _GL_ATTRIBUTE_DEALLOC ((void (*) (void *)) free, 1) +#if _GL_HAS_ATTRIBUTE (cold) && !defined __MINGW32__ +# ifndef __SUNPRO_C +# define _GL_ATTRIBUTE_COLD __attribute__ ((__cold__)) # else -# define _GL_ATTRIBUTE_DEALLOC_FREE \ - _GL_ATTRIBUTE_DEALLOC (free, 1) +# define _GL_ATTRIBUTE_COLD __attribute__ ((cold)) # endif +#else +# define _GL_ATTRIBUTE_COLD #endif -/* _GL_ATTRIBUTE_DEPRECATED: Declares that an entity is deprecated. - The compiler may warn if the entity is used. */ -/* Applies to: - - function, variable, - - struct, union, struct/union member, - - enumeration, enumeration item, - - typedef, - in C++ also: namespace, class, template specialization. */ -#ifndef _GL_ATTRIBUTE_DEPRECATED -# ifndef _GL_BRACKET_BEFORE_ATTRIBUTE -# ifdef __has_c_attribute -# if __has_c_attribute (__deprecated__) -# define _GL_ATTRIBUTE_DEPRECATED [[__deprecated__]] -# endif -# endif -# endif -# if !defined _GL_ATTRIBUTE_DEPRECATED && _GL_HAS_ATTRIBUTE (deprecated) -# define _GL_ATTRIBUTE_DEPRECATED __attribute__ ((__deprecated__)) -# endif -# ifndef _GL_ATTRIBUTE_DEPRECATED -# define _GL_ATTRIBUTE_DEPRECATED -# endif +#if _GL_HAS_ATTRIBUTE (const) +# define _GL_ATTRIBUTE_CONST __attribute__ ((__const__)) +#else +# define _GL_ATTRIBUTE_CONST #endif -/* _GL_ATTRIBUTE_ERROR(msg) requests an error if a function is called and - the function call is not optimized away. - _GL_ATTRIBUTE_WARNING(msg) requests a warning if a function is called and - the function call is not optimized away. */ -/* Applies to: functions. */ -#if !(defined _GL_ATTRIBUTE_ERROR && defined _GL_ATTRIBUTE_WARNING) -# if _GL_HAS_ATTRIBUTE (error) -# define _GL_ATTRIBUTE_ERROR(msg) __attribute__ ((__error__ (msg))) -# define _GL_ATTRIBUTE_WARNING(msg) __attribute__ ((__warning__ (msg))) -# elif _GL_HAS_ATTRIBUTE (diagnose_if) -# define _GL_ATTRIBUTE_ERROR(msg) __attribute__ ((__diagnose_if__ (1, msg, "error"))) -# define _GL_ATTRIBUTE_WARNING(msg) __attribute__ ((__diagnose_if__ (1, msg, "warning"))) -# else -# define _GL_ATTRIBUTE_ERROR(msg) -# define _GL_ATTRIBUTE_WARNING(msg) -# endif +#if 201710L < __STDC_VERSION__ +# define _GL_ATTRIBUTE_DEPRECATED [[__deprecated__]] +#elif _GL_HAS_ATTRIBUTE (deprecated) +# define _GL_ATTRIBUTE_DEPRECATED __attribute__ ((__deprecated__)) +#else +# define _GL_ATTRIBUTE_DEPRECATED #endif -/* _GL_ATTRIBUTE_EXTERNALLY_VISIBLE declares that the entity should remain - visible to debuggers etc., even with '-fwhole-program'. */ -/* Applies to: functions, variables. */ -#ifndef _GL_ATTRIBUTE_EXTERNALLY_VISIBLE -# if _GL_HAS_ATTRIBUTE (externally_visible) -# define _GL_ATTRIBUTE_EXTERNALLY_VISIBLE __attribute__ ((externally_visible)) -# else -# define _GL_ATTRIBUTE_EXTERNALLY_VISIBLE -# endif +#if _GL_HAS_ATTRIBUTE (error) +# define _GL_ATTRIBUTE_ERROR(msg) __attribute__ ((__error__ (msg))) +# define _GL_ATTRIBUTE_WARNING(msg) __attribute__ ((__warning__ (msg))) +#elif _GL_HAS_ATTRIBUTE (diagnose_if) +# define _GL_ATTRIBUTE_ERROR(msg) __attribute__ ((__diagnose_if__ (1, msg, "error"))) +# define _GL_ATTRIBUTE_WARNING(msg) __attribute__ ((__diagnose_if__ (1, msg, "warning"))) +#else +# define _GL_ATTRIBUTE_ERROR(msg) +# define _GL_ATTRIBUTE_WARNING(msg) #endif -/* _GL_ATTRIBUTE_FALLTHROUGH declares that it is not a programming mistake if - the control flow falls through to the immediately following 'case' or - 'default' label. The compiler should not warn in this case. */ -/* Applies to: Empty statement (;), inside a 'switch' statement. */ -/* Always expands to something. */ -#ifndef _GL_ATTRIBUTE_FALLTHROUGH -# ifdef __has_c_attribute -# if __has_c_attribute (__fallthrough__) -# define _GL_ATTRIBUTE_FALLTHROUGH [[__fallthrough__]] -# endif -# endif -# if !defined _GL_ATTRIBUTE_FALLTHROUGH && _GL_HAS_ATTRIBUTE (fallthrough) -# define _GL_ATTRIBUTE_FALLTHROUGH __attribute__ ((__fallthrough__)) -# endif -# ifndef _GL_ATTRIBUTE_FALLTHROUGH -# define _GL_ATTRIBUTE_FALLTHROUGH ((void) 0) -# endif +#if _GL_HAS_ATTRIBUTE (externally_visible) +# define _GL_ATTRIBUTE_EXTERNALLY_VISIBLE __attribute__ ((externally_visible)) +#else +# define _GL_ATTRIBUTE_EXTERNALLY_VISIBLE #endif -/* _GL_ATTRIBUTE_FORMAT ((ARCHETYPE, STRING-INDEX, FIRST-TO-CHECK)) - declares that the STRING-INDEXth function argument is a format string of - style ARCHETYPE, which is one of: - printf, gnu_printf - scanf, gnu_scanf, - strftime, gnu_strftime, - strfmon, - or the same thing prefixed and suffixed with '__'. - If FIRST-TO-CHECK is not 0, arguments starting at FIRST-TO_CHECK - are suitable for the format string. */ -/* Applies to: functions. */ -#ifndef _GL_ATTRIBUTE_FORMAT -# if _GL_HAS_ATTRIBUTE (format) -# define _GL_ATTRIBUTE_FORMAT(spec) __attribute__ ((__format__ spec)) -# else -# define _GL_ATTRIBUTE_FORMAT(spec) -# endif +/* FALLTHROUGH is special, because it always expands to something. */ +#if 201710L < __STDC_VERSION__ +# define _GL_ATTRIBUTE_FALLTHROUGH [[__fallthrough__]] +#elif _GL_HAS_ATTRIBUTE (fallthrough) +# define _GL_ATTRIBUTE_FALLTHROUGH __attribute__ ((__fallthrough__)) +#else +# define _GL_ATTRIBUTE_FALLTHROUGH ((void) 0) #endif -/* _GL_ATTRIBUTE_LEAF declares that if the function is called from some other - compilation unit, it executes code from that unit only by return or by - exception handling. This declaration lets the compiler optimize that unit - more aggressively. */ -/* Applies to: functions. */ -#ifndef _GL_ATTRIBUTE_LEAF -# if _GL_HAS_ATTRIBUTE (leaf) -# define _GL_ATTRIBUTE_LEAF __attribute__ ((__leaf__)) -# else -# define _GL_ATTRIBUTE_LEAF -# endif +#if _GL_HAS_ATTRIBUTE (format) +# define _GL_ATTRIBUTE_FORMAT(spec) __attribute__ ((__format__ spec)) +#else +# define _GL_ATTRIBUTE_FORMAT(spec) #endif -/* _GL_ATTRIBUTE_MALLOC declares that the function returns a pointer to freshly - allocated memory. */ -/* Applies to: functions. */ -#ifndef _GL_ATTRIBUTE_MALLOC -# if _GL_HAS_ATTRIBUTE (malloc) -# define _GL_ATTRIBUTE_MALLOC __attribute__ ((__malloc__)) -# else -# define _GL_ATTRIBUTE_MALLOC -# endif +#if _GL_HAS_ATTRIBUTE (leaf) +# define _GL_ATTRIBUTE_LEAF __attribute__ ((__leaf__)) +#else +# define _GL_ATTRIBUTE_LEAF #endif -/* _GL_ATTRIBUTE_MAY_ALIAS declares that pointers to the type may point to the - same storage as pointers to other types. Thus this declaration disables - strict aliasing optimization. */ -/* Applies to: types. */ /* Oracle Studio 12.6 mishandles may_alias despite __has_attribute OK. */ -#ifndef _GL_ATTRIBUTE_MAY_ALIAS -# if _GL_HAS_ATTRIBUTE (may_alias) && !defined __SUNPRO_C -# define _GL_ATTRIBUTE_MAY_ALIAS __attribute__ ((__may_alias__)) -# else -# define _GL_ATTRIBUTE_MAY_ALIAS -# endif +#if _GL_HAS_ATTRIBUTE (may_alias) && !defined __SUNPRO_C +# define _GL_ATTRIBUTE_MAY_ALIAS __attribute__ ((__may_alias__)) +#else +# define _GL_ATTRIBUTE_MAY_ALIAS #endif -/* _GL_ATTRIBUTE_MAYBE_UNUSED declares that it is not a programming mistake if - the entity is not used. The compiler should not warn if the entity is not - used. */ -/* Applies to: - - function, variable, - - struct, union, struct/union member, - - enumeration, enumeration item, - - typedef, - in C++ also: class. */ -/* In C++ and C23, this is spelled [[__maybe_unused__]]. - GCC's syntax is __attribute__ ((__unused__)). - clang supports both syntaxes. Except that with clang ≥ 6, < 10, in C++ mode, - __has_c_attribute (__maybe_unused__) yields true but the use of - [[__maybe_unused__]] nevertheless produces a warning. */ -#ifndef _GL_ATTRIBUTE_MAYBE_UNUSED -# ifndef _GL_BRACKET_BEFORE_ATTRIBUTE -# if defined __clang__ && defined __cplusplus -# if !defined __apple_build_version__ && __clang_major__ >= 10 -# define _GL_ATTRIBUTE_MAYBE_UNUSED [[__maybe_unused__]] -# endif -# elif defined __has_c_attribute -# if __has_c_attribute (__maybe_unused__) -# define _GL_ATTRIBUTE_MAYBE_UNUSED [[__maybe_unused__]] -# endif -# endif -# endif -# ifndef _GL_ATTRIBUTE_MAYBE_UNUSED -# define _GL_ATTRIBUTE_MAYBE_UNUSED _GL_ATTRIBUTE_UNUSED -# endif +#if 201710L < __STDC_VERSION__ +# define _GL_ATTRIBUTE_MAYBE_UNUSED [[__maybe_unused__]] +#elif _GL_HAS_ATTRIBUTE (unused) +# define _GL_ATTRIBUTE_MAYBE_UNUSED __attribute__ ((__unused__)) +#else +# define _GL_ATTRIBUTE_MAYBE_UNUSED #endif -/* Alternative spelling of this macro, for convenience and for - compatibility with glibc/include/libc-symbols.h. */ -#define _GL_UNUSED _GL_ATTRIBUTE_MAYBE_UNUSED /* Earlier spellings of this macro. */ +#define _GL_UNUSED _GL_ATTRIBUTE_MAYBE_UNUSED #define _UNUSED_PARAMETER_ _GL_ATTRIBUTE_MAYBE_UNUSED -/* _GL_ATTRIBUTE_NODISCARD declares that the caller of the function should not - discard the return value. The compiler may warn if the caller does not use - the return value, unless the caller uses something like ignore_value. */ -/* Applies to: function, enumeration, class. */ -#ifndef _GL_ATTRIBUTE_NODISCARD -# ifndef _GL_BRACKET_BEFORE_ATTRIBUTE -# if defined __clang__ && defined __cplusplus - /* With clang up to 15.0.6 (at least), in C++ mode, [[__nodiscard__]] produces - a warning. - The 1000 below means a yet unknown threshold. When clang++ version X - starts supporting [[__nodiscard__]] without warning about it, you can - replace the 1000 with X. */ -# if __clang_major__ >= 1000 -# define _GL_ATTRIBUTE_NODISCARD [[__nodiscard__]] -# endif -# elif defined __has_c_attribute -# if __has_c_attribute (__nodiscard__) -# define _GL_ATTRIBUTE_NODISCARD [[__nodiscard__]] -# endif -# endif -# endif -# if !defined _GL_ATTRIBUTE_NODISCARD && _GL_HAS_ATTRIBUTE (warn_unused_result) -# define _GL_ATTRIBUTE_NODISCARD __attribute__ ((__warn_unused_result__)) -# endif -# ifndef _GL_ATTRIBUTE_NODISCARD -# define _GL_ATTRIBUTE_NODISCARD -# endif +#if _GL_HAS_ATTRIBUTE (malloc) +# define _GL_ATTRIBUTE_MALLOC __attribute__ ((__malloc__)) +#else +# define _GL_ATTRIBUTE_MALLOC #endif -/* _GL_ATTRIBUTE_NOINLINE tells that the compiler should not inline the - function. */ -/* Applies to: functions. */ -#ifndef _GL_ATTRIBUTE_NOINLINE -# if _GL_HAS_ATTRIBUTE (noinline) -# define _GL_ATTRIBUTE_NOINLINE __attribute__ ((__noinline__)) -# else -# define _GL_ATTRIBUTE_NOINLINE -# endif +#if 201710L < __STDC_VERSION__ +# define _GL_ATTRIBUTE_NODISCARD [[__nodiscard__]] +#elif _GL_HAS_ATTRIBUTE (warn_unused_result) +# define _GL_ATTRIBUTE_NODISCARD __attribute__ ((__warn_unused_result__)) +#else +# define _GL_ATTRIBUTE_NODISCARD #endif -/* _GL_ATTRIBUTE_NONNULL ((N1, N2,...)) declares that the arguments N1, N2,... - must not be NULL. - _GL_ATTRIBUTE_NONNULL () declares that all pointer arguments must not be - null. */ -/* Applies to: functions. */ -#ifndef _GL_ATTRIBUTE_NONNULL -# if _GL_HAS_ATTRIBUTE (nonnull) -# define _GL_ATTRIBUTE_NONNULL(args) __attribute__ ((__nonnull__ args)) -# else -# define _GL_ATTRIBUTE_NONNULL(args) -# endif +#if _GL_HAS_ATTRIBUTE (noinline) +# define _GL_ATTRIBUTE_NOINLINE __attribute__ ((__noinline__)) +#else +# define _GL_ATTRIBUTE_NOINLINE #endif -/* _GL_ATTRIBUTE_NONSTRING declares that the contents of a character array is - not meant to be NUL-terminated. */ -/* Applies to: struct/union members and variables that are arrays of element - type '[[un]signed] char'. */ -#ifndef _GL_ATTRIBUTE_NONSTRING -# if _GL_HAS_ATTRIBUTE (nonstring) -# define _GL_ATTRIBUTE_NONSTRING __attribute__ ((__nonstring__)) -# else -# define _GL_ATTRIBUTE_NONSTRING -# endif +#if _GL_HAS_ATTRIBUTE (nonnull) +# define _GL_ATTRIBUTE_NONNULL(args) __attribute__ ((__nonnull__ args)) +#else +# define _GL_ATTRIBUTE_NONNULL(args) #endif -/* There is no _GL_ATTRIBUTE_NORETURN; use _Noreturn instead. */ - -/* _GL_ATTRIBUTE_NOTHROW declares that the function does not throw exceptions. - */ -/* Applies to: functions. */ -#ifndef _GL_ATTRIBUTE_NOTHROW -# if _GL_HAS_ATTRIBUTE (nothrow) && !defined __cplusplus -# define _GL_ATTRIBUTE_NOTHROW __attribute__ ((__nothrow__)) -# else -# define _GL_ATTRIBUTE_NOTHROW -# endif +#if _GL_HAS_ATTRIBUTE (nonstring) +# define _GL_ATTRIBUTE_NONSTRING __attribute__ ((__nonstring__)) +#else +# define _GL_ATTRIBUTE_NONSTRING #endif -/* _GL_ATTRIBUTE_PACKED declares: - For struct members: The member has the smallest possible alignment. - For struct, union, class: All members have the smallest possible alignment, - minimizing the memory required. */ -/* Applies to: struct members, struct, union, - in C++ also: class. */ -#ifndef _GL_ATTRIBUTE_PACKED -# if _GL_HAS_ATTRIBUTE (packed) -# define _GL_ATTRIBUTE_PACKED __attribute__ ((__packed__)) -# else -# define _GL_ATTRIBUTE_PACKED -# endif +/* There is no _GL_ATTRIBUTE_NORETURN; use _Noreturn instead. */ + +#if _GL_HAS_ATTRIBUTE (nothrow) && !defined __cplusplus +# define _GL_ATTRIBUTE_NOTHROW __attribute__ ((__nothrow__)) +#else +# define _GL_ATTRIBUTE_NOTHROW #endif -/* _GL_ATTRIBUTE_PURE declares that It is OK for a compiler to omit duplicate - calls to the function with the same arguments if observable state is not - changed between calls. - This attribute is safe for a function that does not affect - observable state, and always returns exactly once. - (This attribute is looser than _GL_ATTRIBUTE_CONST.) */ -/* Applies to: functions. */ -#ifndef _GL_ATTRIBUTE_PURE -# if _GL_HAS_ATTRIBUTE (pure) -# define _GL_ATTRIBUTE_PURE __attribute__ ((__pure__)) -# else -# define _GL_ATTRIBUTE_PURE -# endif +#if _GL_HAS_ATTRIBUTE (packed) +# define _GL_ATTRIBUTE_PACKED __attribute__ ((__packed__)) +#else +# define _GL_ATTRIBUTE_PACKED #endif -/* _GL_ATTRIBUTE_RETURNS_NONNULL declares that the function's return value is - a non-NULL pointer. */ -/* Applies to: functions. */ -#ifndef _GL_ATTRIBUTE_RETURNS_NONNULL -# if _GL_HAS_ATTRIBUTE (returns_nonnull) -# define _GL_ATTRIBUTE_RETURNS_NONNULL __attribute__ ((__returns_nonnull__)) -# else -# define _GL_ATTRIBUTE_RETURNS_NONNULL -# endif +#if _GL_HAS_ATTRIBUTE (pure) +# define _GL_ATTRIBUTE_PURE __attribute__ ((__pure__)) +#else +# define _GL_ATTRIBUTE_PURE #endif -/* _GL_ATTRIBUTE_SENTINEL(pos) declares that the variadic function expects a - trailing NULL argument. - _GL_ATTRIBUTE_SENTINEL () - The last argument is NULL (requires C99). - _GL_ATTRIBUTE_SENTINEL ((N)) - The (N+1)st argument from the end is NULL. */ -/* Applies to: functions. */ -#ifndef _GL_ATTRIBUTE_SENTINEL -# if _GL_HAS_ATTRIBUTE (sentinel) -# define _GL_ATTRIBUTE_SENTINEL(pos) __attribute__ ((__sentinel__ pos)) -# else -# define _GL_ATTRIBUTE_SENTINEL(pos) -# endif +#if _GL_HAS_ATTRIBUTE (returns_nonnull) +# define _GL_ATTRIBUTE_RETURNS_NONNULL __attribute__ ((__returns_nonnull__)) +#else +# define _GL_ATTRIBUTE_RETURNS_NONNULL #endif -/* A helper macro. Don't use it directly. */ -#ifndef _GL_ATTRIBUTE_UNUSED -# if _GL_HAS_ATTRIBUTE (unused) -# define _GL_ATTRIBUTE_UNUSED __attribute__ ((__unused__)) -# else -# define _GL_ATTRIBUTE_UNUSED -# endif +#if _GL_HAS_ATTRIBUTE (sentinel) +# define _GL_ATTRIBUTE_SENTINEL(pos) __attribute__ ((__sentinel__ pos)) +#else +# define _GL_ATTRIBUTE_SENTINEL(pos) #endif ]dnl There is no _GL_ATTRIBUTE_VISIBILITY; see m4/visibility.m4 instead. [ -/* _GL_UNUSED_LABEL; declares that it is not a programming mistake if the - immediately preceding label is not used. The compiler should not warn - if the label is not used. */ -/* Applies to: label (both in C and C++). */ -/* Note that g++ < 4.5 does not support the '__attribute__ ((__unused__)) ;' - syntax. But clang does. */ -#ifndef _GL_UNUSED_LABEL -# if !(defined __cplusplus && !_GL_GNUC_PREREQ (4, 5)) || defined __clang__ -# define _GL_UNUSED_LABEL _GL_ATTRIBUTE_UNUSED -# else -# define _GL_UNUSED_LABEL -# endif -#endif -]) - AH_VERBATIM([c_linkage], -[/* In C++, there is the concept of "language linkage", that encompasses - name mangling and function calling conventions. - The following macros start and end a block of "C" linkage. */ -#ifdef __cplusplus -# define _GL_BEGIN_C_LINKAGE extern "C" { -# define _GL_END_C_LINKAGE } +/* To support C++ as well as C, use _GL_UNUSED_LABEL with trailing ';'. */ +#if !defined __cplusplus || _GL_GNUC_PREREQ (4, 5) +# define _GL_UNUSED_LABEL _GL_ATTRIBUTE_MAYBE_UNUSED #else -# define _GL_BEGIN_C_LINKAGE -# define _GL_END_C_LINKAGE +# define _GL_UNUSED_LABEL #endif ]) AH_VERBATIM([async_safe], @@ -619,7 +334,7 @@ dnl gl_cross_guess_normal (to be used when 'yes' is good and 'no' is bad), dnl gl_cross_guess_inverted (to be used when 'no' is good and 'yes' is bad). AC_ARG_ENABLE([cross-guesses], - [AS_HELP_STRING([[--enable-cross-guesses={conservative|risky}]], + [AS_HELP_STRING([--enable-cross-guesses={conservative|risky}], [specify policy for cross-compilation guesses])], [if test "x$enableval" != xconservative && test "x$enableval" != xrisky; then AC_MSG_WARN([invalid argument supplied to --enable-cross-guesses]) @@ -642,16 +357,6 @@ export LIBC_FATAL_STDERR_ ]) -# gl_MODULE_INDICATOR_INIT_VARIABLE([variablename]) -# gl_MODULE_INDICATOR_INIT_VARIABLE([variablename], [initialvalue]) -# initializes the shell variable that indicates the presence of the given module -# as a C preprocessor expression. -AC_DEFUN([gl_MODULE_INDICATOR_INIT_VARIABLE], -[ - GL_MODULE_INDICATOR_PREFIX[]_[$1]=m4_if([$2], , [0], [$2]) - AC_SUBST(GL_MODULE_INDICATOR_PREFIX[]_[$1]) -]) - # gl_MODULE_INDICATOR_CONDITION # expands to a C preprocessor expression that evaluates to 1 or 0, depending # whether a gnulib module that has been requested shall be considered present @@ -664,9 +369,9 @@ AC_DEFUN([gl_MODULE_INDICATOR_SET_VARIABLE], [ gl_MODULE_INDICATOR_SET_VARIABLE_AUX( - [GL_MODULE_INDICATOR_PREFIX[]_GNULIB_[]m4_translit([[$1]], - [abcdefghijklmnopqrstuvwxyz./-], - [ABCDEFGHIJKLMNOPQRSTUVWXYZ___])], + [GNULIB_[]m4_translit([[$1]], + [abcdefghijklmnopqrstuvwxyz./-], + [ABCDEFGHIJKLMNOPQRSTUVWXYZ___])], [gl_MODULE_INDICATOR_CONDITION]) ]) @@ -951,422 +656,6 @@ ]) ]) -# gl_CONDITIONAL(conditional, condition) -# is like AM_CONDITIONAL(conditional, condition), except that it does not -# produce an error -# configure: error: conditional "..." was never defined. -# Usually this means the macro was only invoked conditionally. -# when only invoked conditionally. Instead, in that case, both the _TRUE -# and the _FALSE case are disabled. -AC_DEFUN([gl_CONDITIONAL], -[ - pushdef([AC_CONFIG_COMMANDS_PRE], [:])dnl - AM_CONDITIONAL([$1], [$2]) - popdef([AC_CONFIG_COMMANDS_PRE])dnl - if test -z "${[$1]_TRUE}" && test -z "${[$1]_FALSE}"; then - [$1]_TRUE='#' - [$1]_FALSE='#' - fi -]) - -# gl_CC_ALLOW_WARNINGS -# sets and substitutes a variable GL_CFLAG_ALLOW_WARNINGS, to a $(CC) option -# that reverts a preceding '-Werror' option, if available. -# This is expected to be '-Wno-error' on gcc, clang (except clang/MSVC), xlclang -# and empty otherwise. -AC_DEFUN([gl_CC_ALLOW_WARNINGS], -[ - AC_REQUIRE([AC_PROG_CC]) - AC_CACHE_CHECK([for C compiler option to allow warnings], - [gl_cv_cc_wallow], - [rm -f conftest* - echo 'int dummy;' > conftest.c - AC_TRY_COMMAND([${CC-cc} $CFLAGS $CPPFLAGS -c conftest.c 2>conftest1.err]) >/dev/null - AC_TRY_COMMAND([${CC-cc} $CFLAGS $CPPFLAGS -Wno-error -c conftest.c 2>conftest2.err]) >/dev/null - dnl Test the number of error output lines, because AIX xlc accepts the - dnl option '-Wno-error', just to produce a warning - dnl "Option -Wno-error was incorrectly specified. The option will be ignored." - dnl afterwards. - if test $? = 0 && test `wc -l < conftest1.err` = `wc -l < conftest2.err`; then - gl_cv_cc_wallow='-Wno-error' - else - gl_cv_cc_wallow=none - fi - rm -f conftest* - ]) - case "$gl_cv_cc_wallow" in - none) GL_CFLAG_ALLOW_WARNINGS='' ;; - *) GL_CFLAG_ALLOW_WARNINGS="$gl_cv_cc_wallow" ;; - esac - AC_SUBST([GL_CFLAG_ALLOW_WARNINGS]) -]) - -# gl_CXX_ALLOW_WARNINGS -# sets and substitutes a variable GL_CXXFLAG_ALLOW_WARNINGS, to a $(CC) option -# that reverts a preceding '-Werror' option, if available. -AC_DEFUN([gl_CXX_ALLOW_WARNINGS], -[ - dnl Requires AC_PROG_CXX or gl_PROG_ANSI_CXX. - if test -n "$CXX" && test "$CXX" != no; then - AC_CACHE_CHECK([for C++ compiler option to allow warnings], - [gl_cv_cxx_wallow], - [rm -f conftest* - echo 'int dummy;' > conftest.cc - AC_TRY_COMMAND([${CXX-c++} $CXXFLAGS $CPPFLAGS -c conftest.cc 2>conftest1.err]) >/dev/null - AC_TRY_COMMAND([${CXX-c++} $CXXFLAGS $CPPFLAGS -Wno-error -c conftest.cc 2>conftest2.err]) >/dev/null - dnl Test the number of error output lines, because AIX xlC accepts the - dnl option '-Wno-error', just to produce a warning - dnl "Option -Wno-error was incorrectly specified. The option will be ignored." - dnl afterwards. - if test $? = 0 && test `wc -l < conftest1.err` = `wc -l < conftest2.err`; then - gl_cv_cxx_wallow='-Wno-error' - else - gl_cv_cxx_wallow=none - fi - rm -f conftest* - ]) - case "$gl_cv_cxx_wallow" in - none) GL_CXXFLAG_ALLOW_WARNINGS='' ;; - *) GL_CXXFLAG_ALLOW_WARNINGS="$gl_cv_cxx_wallow" ;; - esac - else - GL_CXXFLAG_ALLOW_WARNINGS='' - fi - AC_SUBST([GL_CXXFLAG_ALLOW_WARNINGS]) -]) - -# gl_CC_GNULIB_WARNINGS -# sets and substitutes a variable GL_CFLAG_GNULIB_WARNINGS, to a $(CC) option -# set that enables or disables warnings as suitable for the Gnulib coding style. -AC_DEFUN([gl_CC_GNULIB_WARNINGS], -[ - AC_REQUIRE([gl_CC_ALLOW_WARNINGS]) - dnl Assume that the compiler supports -Wno-* options only if it also supports - dnl -Wno-error. - GL_CFLAG_GNULIB_WARNINGS='' - if test -n "$GL_CFLAG_ALLOW_WARNINGS"; then - dnl Enable these warning options: - dnl - dnl GCC clang - dnl -Wno-cast-qual >= 3 >= 3.9 - dnl -Wno-conversion >= 3 >= 3.9 - dnl -Wno-float-conversion >= 4.9 >= 3.9 - dnl -Wno-float-equal >= 3 >= 3.9 - dnl -Wimplicit-fallthrough >= 7 >= 3.9 - dnl -Wno-missing-field-initializers >= 4.0, < 11 - dnl -Wno-pedantic >= 4.8 >= 3.9 - dnl -Wno-sign-compare >= 3 >= 3.9 - dnl -Wno-sign-conversion >= 4.3 >= 3.9 - dnl -Wno-type-limits >= 4.3 >= 3.9 - dnl -Wno-undef >= 3 >= 3.9 - dnl -Wno-unsuffixed-float-constants >= 4.5 - dnl -Wno-unused-function >= 3 >= 3.9 - dnl -Wno-unused-parameter >= 3 >= 3.9 - dnl - cat > conftest.c <<\EOF - #if __GNUC__ >= 3 || (__clang_major__ + (__clang_minor__ >= 9) > 3) - -Wno-cast-qual - -Wno-conversion - -Wno-float-equal - -Wno-sign-compare - -Wno-undef - -Wno-unused-function - -Wno-unused-parameter - #endif - #if __GNUC__ + (__GNUC_MINOR__ >= 9) > 4 || (__clang_major__ + (__clang_minor__ >= 9) > 3) - -Wno-float-conversion - #endif - #if __GNUC__ >= 7 || (__clang_major__ + (__clang_minor__ >= 9) > 3) - -Wimplicit-fallthrough - #endif - #if __GNUC__ >= 4 && __GNUC__ < 11 && !defined __clang__ - -Wno-missing-field-initializers - #endif - #if __GNUC__ + (__GNUC_MINOR__ >= 8) > 4 || (__clang_major__ + (__clang_minor__ >= 9) > 3) - -Wno-pedantic - #endif - #if __GNUC__ + (__GNUC_MINOR__ >= 3) > 4 || (__clang_major__ + (__clang_minor__ >= 9) > 3) - -Wno-sign-conversion - -Wno-type-limits - #endif - #if __GNUC__ + (__GNUC_MINOR__ >= 5) > 4 - -Wno-unsuffixed-float-constants - #endif -EOF - gl_command="$CC $CFLAGS $CPPFLAGS -E conftest.c > conftest.out" - if AC_TRY_EVAL([gl_command]); then - gl_options=`grep -v '#' conftest.out` - for word in $gl_options; do - GL_CFLAG_GNULIB_WARNINGS="$GL_CFLAG_GNULIB_WARNINGS $word" - done - fi - rm -f conftest.c conftest.out - fi - AC_SUBST([GL_CFLAG_GNULIB_WARNINGS]) -]) - -dnl gl_CONDITIONAL_HEADER([foo.h]) -dnl takes a shell variable GL_GENERATE_FOO_H (with value true or false) as input -dnl and produces -dnl - an AC_SUBSTed variable FOO_H that is either a file name or empty, based -dnl on whether GL_GENERATE_FOO_H is true or false, -dnl - an Automake conditional GL_GENERATE_FOO_H that evaluates to the value of -dnl the shell variable GL_GENERATE_FOO_H. -AC_DEFUN([gl_CONDITIONAL_HEADER], -[ - m4_pushdef([gl_header_name], AS_TR_SH(m4_toupper($1))) - m4_pushdef([gl_generate_var], [GL_GENERATE_]AS_TR_SH(m4_toupper($1))) - m4_pushdef([gl_generate_cond], [GL_GENERATE_]AS_TR_SH(m4_toupper($1))) - case "$gl_generate_var" in - false) gl_header_name='' ;; - true) - dnl It is OK to use a .h file in lib/ from within tests/, but not vice - dnl versa. - if test -z "$gl_header_name"; then - gl_header_name="${gl_source_base_prefix}$1" - fi - ;; - *) echo "*** gl_generate_var is not set correctly" 1>&2; exit 1 ;; - esac - AC_SUBST(gl_header_name) - gl_CONDITIONAL(gl_generate_cond, [$gl_generate_var]) - m4_popdef([gl_generate_cond]) - m4_popdef([gl_generate_var]) - m4_popdef([gl_header_name]) -]) - -dnl Preparations for gl_CHECK_FUNCS_MACOS. -AC_DEFUN([gl_PREPARE_CHECK_FUNCS_MACOS], -[ - AC_REQUIRE([AC_CANONICAL_HOST]) - AC_REQUIRE([gl_COMPILER_CLANG]) - AC_CACHE_CHECK([for compiler option needed when checking for future declarations], - [gl_cv_compiler_check_future_option], - [case "$host_os" in - dnl This is only needed on macOS. - darwin*) - if test $gl_cv_compiler_clang = yes; then - dnl Test whether the compiler supports the option - dnl '-Werror=unguarded-availability-new'. - save_ac_compile="$ac_compile" - ac_compile="$ac_compile -Werror=unguarded-availability-new" - AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[]],[[]])], - [gl_cv_compiler_check_future_option='-Werror=unguarded-availability-new'], - [gl_cv_compiler_check_future_option=none]) - ac_compile="$save_ac_compile" - else - gl_cv_compiler_check_future_option=none - fi - ;; - *) gl_cv_compiler_check_future_option=none ;; - esac - ]) -]) - -dnl Pieces of the expansion of -dnl gl_CHECK_FUNCS_ANDROID -dnl gl_CHECK_FUNCS_MACOS -dnl gl_CHECK_FUNCS_ANDROID_MACOS - -AC_DEFUN([gl_CHECK_FUNCS_DEFAULT_CASE], -[ - *) - AC_CHECK_FUNC([$1]) - [gl_cv_onwards_func_][$1]=$[ac_cv_func_][$1] - ;; -]) - -AC_DEFUN([gl_CHECK_FUNCS_CASE_FOR_ANDROID], -[ - linux*-android*) - AC_CHECK_DECL([$1], , , [$2]) - if test $[ac_cv_have_decl_][$1] = yes; then - AC_CHECK_FUNC([[$1]]) - if test $[ac_cv_func_][$1] = yes; then - [gl_cv_onwards_func_][$1]=yes - else - dnl The function is declared but does not exist. This should not - dnl happen normally. But anyway, we know that a future version - dnl of Android will have the function. - [gl_cv_onwards_func_][$1]='future OS version' - fi - else - [gl_cv_onwards_func_][$1]='future OS version' - fi - ;; -]) - -AC_DEFUN([gl_CHECK_FUNCS_CASE_FOR_MACOS], -[ - darwin*) - if test "x$gl_cv_compiler_check_future_option" != "xnone"; then - dnl Use a compile test, not a link test. - save_ac_compile="$ac_compile" - ac_compile="$ac_compile $gl_cv_compiler_check_future_option" - save_ac_compile_for_check_decl="$ac_compile_for_check_decl" - ac_compile_for_check_decl="$ac_compile_for_check_decl $gl_cv_compiler_check_future_option" - unset [ac_cv_have_decl_][$1] - AC_CHECK_DECL([$1], , , [$2]) - ac_compile="$save_ac_compile" - ac_compile_for_check_decl="$save_ac_compile_for_check_decl" - [ac_cv_func_][$1]="$[ac_cv_have_decl_][$1]" - if test $[ac_cv_func_][$1] = yes; then - [gl_cv_onwards_func_][$1]=yes - else - unset [ac_cv_have_decl_][$1] - AC_CHECK_DECL([$1], , , [$2]) - if test $[ac_cv_have_decl_][$1] = yes; then - [gl_cv_onwards_func_][$1]='future OS version' - else - [gl_cv_onwards_func_][$1]=no - fi - fi - else - AC_CHECK_FUNC([$1]) - [gl_cv_onwards_func_][$1]=$[ac_cv_func_][$1] - fi - ;; -]) - -AC_DEFUN([gl_CHECK_FUNCS_SET_RESULTS], -[ - case "$[gl_cv_onwards_func_][$1]" in - future*) [ac_cv_func_][$1]=no ;; - *) [ac_cv_func_][$1]=$[gl_cv_onwards_func_][$1] ;; - esac - if test $[ac_cv_func_][$1] = yes; then - AC_DEFINE([HAVE_]m4_translit([[$1]], - [abcdefghijklmnopqrstuvwxyz], - [ABCDEFGHIJKLMNOPQRSTUVWXYZ]), - [1], [Define to 1 if you have the `$1' function.]) - fi -]) - -dnl gl_CHECK_FUNCS_ANDROID([func], [[#include ]]) -dnl is like AC_CHECK_FUNCS([func]), taking into account a portability problem -dnl on Android. -dnl -dnl When code is compiled on Android, it is in the context of a certain -dnl "Android API level", which indicates the minimum version of Android on -dnl which the app can be installed. In other words, you don't compile for a -dnl specific version of Android. You compile for all versions of Android, -dnl onwards from the given API level. -dnl Thus, the question "does the OS have the function func" has three possible -dnl answers: -dnl - yes, in all versions starting from the given API level, -dnl - no, in no version, -dnl - not in the given API level, but in a later version of Android. -dnl -dnl In detail, this works as follows: -dnl If func was added to Android API level, say, 28, then the libc.so has the -dnl symbol func always, whereas the header file declares func -dnl conditionally: -dnl #if __ANDROID_API__ >= 28 -dnl ... func (...) __INTRODUCED_IN(28); -dnl #endif -dnl Thus, when compiling with "clang -target armv7a-unknown-linux-android28", -dnl the function func is declared and exists in libc. -dnl Whereas when compiling with "clang -target armv7a-unknown-linux-android27", -dnl the function func is not declared but exists in libc. -dnl -dnl This macro sets two variables: -dnl - gl_cv_onwards_func_ to yes / no / "future OS version" -dnl - ac_cv_func_ to yes / no / no -dnl The first variable allows to distinguish all three cases. -dnl The second variable is set, so that an invocation -dnl gl_CHECK_FUNCS_ANDROID([func], [[#include ]]) -dnl can be used as a drop-in replacement for -dnl AC_CHECK_FUNCS([func]). -AC_DEFUN([gl_CHECK_FUNCS_ANDROID], -[ - AC_REQUIRE([AC_CANONICAL_HOST]) - AC_CACHE_CHECK([for [$1]], - [[gl_cv_onwards_func_][$1]], - [gl_SILENT([ - case "$host_os" in - gl_CHECK_FUNCS_CASE_FOR_ANDROID([$1], [$2]) - gl_CHECK_FUNCS_DEFAULT_CASE([$1]) - esac - ]) - ]) - gl_CHECK_FUNCS_SET_RESULTS([$1]) -]) - -dnl gl_CHECK_FUNCS_MACOS([func], [[#include ]]) -dnl is like AC_CHECK_FUNCS([func]), taking into account a portability problem -dnl on macOS. -dnl -dnl When code is compiled on macOS, it is in the context of a certain minimum -dnl macOS version, that can be set through the option '-mmacosx-version-min='. -dnl In other words, you don't compile for a specific version of macOS. You -dnl compile for all versions of macOS, onwards from the given version. -dnl Thus, the question "does the OS have the function func" has three possible -dnl answers: -dnl - yes, in all versions starting from the given version, -dnl - no, in no version, -dnl - not in the given version, but in a later version of macOS. -dnl -dnl In detail, this works as follows: -dnl If func was added to, say, macOS version 13, then the libc has the -dnl symbol func always, whereas the header file declares func -dnl conditionally with a special availability attribute: -dnl ... func (...) __attribute__((availability(macos,introduced=13.0))); -dnl Thus, when compiling with "clang mmacosx-version-min=13", there is no -dnl warning about the use of func, and the resulting binary -dnl - runs fine on macOS 13, -dnl - aborts with a dyld "Symbol not found" message on macOS 12. -dnl Whereas, when compiling with "clang mmacosx-version-min=12", there is a -dnl warning: 'func' is only available on macOS 13.0 or newer -dnl [-Wunguarded-availability-new], -dnl and the resulting binary -dnl - runs fine on macOS 13, -dnl - crashes with a SIGSEGV (signal 11) on macOS 12. -dnl -dnl This macro sets two variables: -dnl - gl_cv_onwards_func_ to yes / no / "future OS version" -dnl - ac_cv_func_ to yes / no / no -dnl The first variable allows to distinguish all three cases. -dnl The second variable is set, so that an invocation -dnl gl_CHECK_FUNCS_MACOS([func], [[#include ]]) -dnl can be used as a drop-in replacement for -dnl AC_CHECK_FUNCS([func]). -AC_DEFUN([gl_CHECK_FUNCS_MACOS], -[ - AC_REQUIRE([AC_CANONICAL_HOST]) - AC_REQUIRE([gl_PREPARE_CHECK_FUNCS_MACOS]) - AC_CACHE_CHECK([for [$1]], - [[gl_cv_onwards_func_][$1]], - [gl_SILENT([ - case "$host_os" in - gl_CHECK_FUNCS_CASE_FOR_MACOS([$1], [$2]) - gl_CHECK_FUNCS_DEFAULT_CASE([$1]) - esac - ]) - ]) - gl_CHECK_FUNCS_SET_RESULTS([$1]) -]) - -dnl gl_CHECK_FUNCS_ANDROID_MACOS([func], [[#include ]]) -dnl is like AC_CHECK_FUNCS([func]), taking into account a portability problem -dnl on Android and on macOS. -dnl It is the combination of gl_CHECK_FUNCS_ANDROID and gl_CHECK_FUNCS_MACOS. -AC_DEFUN([gl_CHECK_FUNCS_ANDROID_MACOS], -[ - AC_REQUIRE([AC_CANONICAL_HOST]) - AC_REQUIRE([gl_PREPARE_CHECK_FUNCS_MACOS]) - AC_CACHE_CHECK([for [$1]], - [[gl_cv_onwards_func_][$1]], - [gl_SILENT([ - case "$host_os" in - gl_CHECK_FUNCS_CASE_FOR_ANDROID([$1], [$2]) - gl_CHECK_FUNCS_CASE_FOR_MACOS([$1], [$2]) - gl_CHECK_FUNCS_DEFAULT_CASE([$1]) - esac - ]) - ]) - gl_CHECK_FUNCS_SET_RESULTS([$1]) -]) - dnl Expands to some code for use in .c programs that, on native Windows, defines dnl the Microsoft deprecated alias function names to the underscore-prefixed dnl actual function names. With this macro, these function names are available diff -Nru mmv-2.5/m4/gnulib-comp.m4 mmv-2.5.1/m4/gnulib-comp.m4 --- mmv-2.5/m4/gnulib-comp.m4 2023-07-17 21:20:59.000000000 +0000 +++ mmv-2.5.1/m4/gnulib-comp.m4 2023-08-08 11:02:53.000000000 +0000 @@ -1,9 +1,9 @@ # DO NOT EDIT! GENERATED AUTOMATICALLY! -# Copyright (C) 2002-2023 Free Software Foundation, Inc. +# Copyright (C) 2002-2021 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 -# the Free Software Foundation, either version 3 of the License, or +# the Free Software Foundation; either version 3 of the License, or # (at your option) any later version. # # This file is distributed in the hope that it will be useful, @@ -42,18 +42,14 @@ AC_REQUIRE([gl_USE_SYSTEM_EXTENSIONS]) AC_REQUIRE([gl_PROG_AR_RANLIB]) + AC_REQUIRE([AM_PROG_CC_C_O]) # Code from module absolute-header: - # Code from module alignasof: # Code from module alloca-opt: - # Code from module assert-h: # Code from module attribute: # Code from module basename-lgpl: # Code from module binary-io: # Code from module bootstrap: - # Code from module builtin-expect: # Code from module c99: - # Code from module calloc-gnu: - # Code from module calloc-posix: # Code from module canonicalize-lgpl: # Code from module chdir: # Code from module cloexec: @@ -64,7 +60,6 @@ # Code from module eloop-threshold: # Code from module errno: # Code from module error: - # Code from module error-h: # Code from module exitfail: # Code from module extensions: # Code from module extern-inline: @@ -84,14 +79,11 @@ # Code from module fseterr: # Code from module fstat: # Code from module funclib.sh: - # Code from module gen-header: # Code from module getdtablesize: # Code from module getopt-gnu: # Code from module getopt-posix: # Code from module getprogname: # Code from module gettext-h: - # Code from module glibc-internal/scratch_buffer: - # Code from module ialloc: # Code from module idx: # Code from module ignore-value: # Code from module include_next: @@ -108,7 +100,6 @@ # Code from module link: # Code from module lseek: # Code from module lstat: - # Code from module malloc-gnu: # Code from module malloc-posix: # Code from module malloca: # Code from module manywarnings: @@ -131,12 +122,11 @@ # Code from module rawmemchr: # Code from module read: # Code from module readlink: - # Code from module realloc-gnu: # Code from module realloc-posix: - # Code from module reallocarray: # Code from module rename: # Code from module rmdir: # Code from module same-inode: + # Code from module scratch_buffer: # Code from module signal-h: # Code from module signbit: # Code from module size_max: @@ -150,11 +140,9 @@ # Code from module stat-time: # Code from module std-gnu11: # Code from module stdbool: - # Code from module stdckdint: # Code from module stddef: # Code from module stdint: # Code from module stdio: - gl_STDIO_H_EARLY # Code from module stdlib: # Code from module strdup-posix: # Code from module strerror: @@ -163,11 +151,11 @@ # Code from module symlink: # Code from module sys_stat: # Code from module sys_types: - # Code from module time-h: + # Code from module time: # Code from module unistd: # Code from module unlink: - # Code from module vararrays: # Code from module vasnprintf: + # Code from module verify: # Code from module warnings: # Code from module wchar: # Code from module write: @@ -191,82 +179,60 @@ m4_pushdef([AC_LIBSOURCES], m4_defn([gl_LIBSOURCES])) m4_pushdef([gl_LIBSOURCES_LIST], []) m4_pushdef([gl_LIBSOURCES_DIR], []) - m4_pushdef([GL_MACRO_PREFIX], [gl]) - m4_pushdef([GL_MODULE_INDICATOR_PREFIX], [GL]) gl_COMMON gl_source_base='lib' - gl_source_base_prefix= - gl_ALIGNASOF gl_FUNC_ALLOCA - gl_CONDITIONAL_HEADER([alloca.h]) - AC_PROG_MKDIR_P - gl_ASSERT_H - gl_CONDITIONAL_HEADER([assert.h]) - AC_PROG_MKDIR_P - gl___BUILTIN_EXPECT - gl_FUNC_CALLOC_GNU - if test $REPLACE_CALLOC_FOR_CALLOC_GNU = 1; then - AC_LIBOBJ([calloc]) - fi - gl_STDLIB_MODULE_INDICATOR([calloc-gnu]) - gl_FUNC_CALLOC_POSIX - if test $REPLACE_CALLOC_FOR_CALLOC_POSIX = 1; then - AC_LIBOBJ([calloc]) - fi - gl_STDLIB_MODULE_INDICATOR([calloc-posix]) gl_CANONICALIZE_LGPL - gl_CONDITIONAL([GL_COND_OBJ_CANONICALIZE_LGPL], - [test $HAVE_CANONICALIZE_FILE_NAME = 0 || test $REPLACE_CANONICALIZE_FILE_NAME = 1]) + if test $HAVE_CANONICALIZE_FILE_NAME = 0 || test $REPLACE_CANONICALIZE_FILE_NAME = 1; then + AC_LIBOBJ([canonicalize-lgpl]) + fi gl_MODULE_INDICATOR([canonicalize-lgpl]) gl_STDLIB_MODULE_INDICATOR([canonicalize_file_name]) gl_STDLIB_MODULE_INDICATOR([realpath]) gl_UNISTD_MODULE_INDICATOR([chdir]) gl_MODULE_INDICATOR_FOR_TESTS([cloexec]) gl_FUNC_CLOSE - gl_CONDITIONAL([GL_COND_OBJ_CLOSE], [test $REPLACE_CLOSE = 1]) + if test $REPLACE_CLOSE = 1; then + AC_LIBOBJ([close]) + fi gl_UNISTD_MODULE_INDICATOR([close]) gl_DOUBLE_SLASH_ROOT gl_FUNC_DUP2 - gl_CONDITIONAL([GL_COND_OBJ_DUP2], [test $REPLACE_DUP2 = 1]) - AM_COND_IF([GL_COND_OBJ_DUP2], [ + if test $REPLACE_DUP2 = 1; then + AC_LIBOBJ([dup2]) gl_PREREQ_DUP2 - ]) + fi gl_UNISTD_MODULE_INDICATOR([dup2]) gl_HEADER_ERRNO_H - gl_CONDITIONAL_HEADER([errno.h]) - AC_PROG_MKDIR_P - AC_REQUIRE([gl_ERROR_H]) gl_ERROR - gl_CONDITIONAL([GL_COND_OBJ_ERROR], [test $GL_GENERATE_ERROR_H = true]) - AM_COND_IF([GL_COND_OBJ_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_ERROR_H - gl_CONDITIONAL_HEADER([error.h]) - AC_PROG_MKDIR_P AC_REQUIRE([gl_EXTERN_INLINE]) gl_FUNC_FCNTL - gl_CONDITIONAL([GL_COND_OBJ_FCNTL], - [test $HAVE_FCNTL = 0 || test $REPLACE_FCNTL = 1]) + if test $HAVE_FCNTL = 0 || test $REPLACE_FCNTL = 1; then + AC_LIBOBJ([fcntl]) + fi gl_FCNTL_MODULE_INDICATOR([fcntl]) gl_FCNTL_H - gl_FCNTL_H_REQUIRE_DEFAULTS - AC_PROG_MKDIR_P gl_FLOAT_H - gl_CONDITIONAL_HEADER([float.h]) - AC_PROG_MKDIR_P - gl_CONDITIONAL([GL_COND_OBJ_FLOAT], [test $REPLACE_FLOAT_LDBL = 1]) - gl_CONDITIONAL([GL_COND_OBJ_ITOLD], [test $REPLACE_ITOLD = 1]) + if test $REPLACE_FLOAT_LDBL = 1; then + AC_LIBOBJ([float]) + fi + if test $REPLACE_ITOLD = 1; then + AC_LIBOBJ([itold]) + fi gl_FUNC_FPRINTF_POSIX gl_STDIO_MODULE_INDICATOR([fprintf-posix]) gl_FUNC_FREE - gl_CONDITIONAL([GL_COND_OBJ_FREE], [test $REPLACE_FREE = 1]) - AM_COND_IF([GL_COND_OBJ_FREE], [ + if test $REPLACE_FREE = 1; then + AC_LIBOBJ([free]) gl_PREREQ_FREE - ]) + fi gl_STDLIB_MODULE_INDICATOR([free-posix]) gl_FUNC_FREXP_NO_LIBM if test $gl_func_frexp_no_libm != yes; then @@ -279,53 +245,43 @@ fi gl_MATH_MODULE_INDICATOR([frexpl]) gl_FUNC_FSETERR - gl_CONDITIONAL([GL_COND_OBJ_FSETERR], [test $ac_cv_func___fseterr = no]) + if test $ac_cv_func___fseterr = no; then + AC_LIBOBJ([fseterr]) + fi gl_FUNC_FSTAT - gl_CONDITIONAL([GL_COND_OBJ_FSTAT], [test $REPLACE_FSTAT = 1]) - AM_COND_IF([GL_COND_OBJ_FSTAT], [ + if test $REPLACE_FSTAT = 1; then + AC_LIBOBJ([fstat]) case "$host_os" in mingw*) AC_LIBOBJ([stat-w32]) ;; esac gl_PREREQ_FSTAT - ]) + fi gl_SYS_STAT_MODULE_INDICATOR([fstat]) gl_FUNC_GETDTABLESIZE - gl_CONDITIONAL([GL_COND_OBJ_GETDTABLESIZE], - [test $HAVE_GETDTABLESIZE = 0 || test $REPLACE_GETDTABLESIZE = 1]) - AM_COND_IF([GL_COND_OBJ_GETDTABLESIZE], [ + if test $HAVE_GETDTABLESIZE = 0 || test $REPLACE_GETDTABLESIZE = 1; then + AC_LIBOBJ([getdtablesize]) gl_PREREQ_GETDTABLESIZE - ]) + fi gl_UNISTD_MODULE_INDICATOR([getdtablesize]) gl_FUNC_GETOPT_GNU dnl Because of the way gl_FUNC_GETOPT_GNU is implemented (the gl_getopt_required dnl mechanism), there is no need to do any AC_LIBOBJ or AC_SUBST here; they are dnl done in the getopt-posix module. gl_FUNC_GETOPT_POSIX - gl_CONDITIONAL_HEADER([getopt.h]) - gl_CONDITIONAL_HEADER([getopt-cdefs.h]) - AC_PROG_MKDIR_P - gl_CONDITIONAL([GL_COND_OBJ_GETOPT], [test $REPLACE_GETOPT = 1]) - AM_COND_IF([GL_COND_OBJ_GETOPT], [ - dnl Define the substituted variable GNULIB_UNISTD_H_GETOPT to 1. - gl_UNISTD_H_REQUIRE_DEFAULTS - gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_UNISTD_H_GETOPT], [1]) - ]) + if test $REPLACE_GETOPT = 1; then + AC_LIBOBJ([getopt]) + AC_LIBOBJ([getopt1]) + dnl Arrange for unistd.h to include getopt.h. + GNULIB_GL_UNISTD_H_GETOPT=1 + fi + AC_SUBST([GNULIB_GL_UNISTD_H_GETOPT]) gl_UNISTD_MODULE_INDICATOR([getopt-posix]) gl_FUNC_GETPROGNAME - gl_CONDITIONAL([GL_COND_OBJ_GETPROGNAME], - [test $HAVE_GETPROGNAME = 0 || test $REPLACE_GETPROGNAME = 1]) - AM_COND_IF([GL_COND_OBJ_GETPROGNAME], [ - gl_PREREQ_GETPROGNAME - ]) - gl_STDLIB_MODULE_INDICATOR([getprogname]) AC_SUBST([LIBINTL]) AC_SUBST([LTLIBINTL]) - AC_PROG_MKDIR_P gl_INTTYPES_INCOMPLETE - gl_INTTYPES_H_REQUIRE_DEFAULTS - AC_PROG_MKDIR_P gl_FUNC_ISNAND_NO_LIBM if test $gl_func_isnand_no_libm != yes; then AC_LIBOBJ([isnand]) @@ -344,62 +300,58 @@ AC_REQUIRE([gl_LARGEFILE]) gl___INLINE gl_LIMITS_H - gl_CONDITIONAL_HEADER([limits.h]) - AC_PROG_MKDIR_P gl_FUNC_LINK - gl_CONDITIONAL([GL_COND_OBJ_LINK], - [test $HAVE_LINK = 0 || test $REPLACE_LINK = 1]) + if test $HAVE_LINK = 0 || test $REPLACE_LINK = 1; then + AC_LIBOBJ([link]) + fi gl_UNISTD_MODULE_INDICATOR([link]) gl_FUNC_LSEEK - gl_CONDITIONAL([GL_COND_OBJ_LSEEK], [test $REPLACE_LSEEK = 1]) + if test $REPLACE_LSEEK = 1; then + AC_LIBOBJ([lseek]) + fi gl_UNISTD_MODULE_INDICATOR([lseek]) gl_FUNC_LSTAT - gl_CONDITIONAL([GL_COND_OBJ_LSTAT], [test $REPLACE_LSTAT = 1]) - AM_COND_IF([GL_COND_OBJ_LSTAT], [ + if test $REPLACE_LSTAT = 1; then + AC_LIBOBJ([lstat]) gl_PREREQ_LSTAT - ]) - gl_SYS_STAT_MODULE_INDICATOR([lstat]) - gl_FUNC_MALLOC_GNU - if test $REPLACE_MALLOC_FOR_MALLOC_GNU = 1; then - AC_LIBOBJ([malloc]) fi - gl_STDLIB_MODULE_INDICATOR([malloc-gnu]) - AC_REQUIRE([gl_FUNC_MALLOC_POSIX]) - if test $REPLACE_MALLOC_FOR_MALLOC_POSIX = 1; then + gl_SYS_STAT_MODULE_INDICATOR([lstat]) + gl_FUNC_MALLOC_POSIX + if test $REPLACE_MALLOC = 1; then AC_LIBOBJ([malloc]) fi gl_STDLIB_MODULE_INDICATOR([malloc-posix]) + gl_MODULE_INDICATOR([malloc-posix]) gl_MALLOCA gl_MATH_H - gl_MATH_H_REQUIRE_DEFAULTS - AC_PROG_MKDIR_P gl_FUNC_MEMCHR - gl_CONDITIONAL([GL_COND_OBJ_MEMCHR], [test $REPLACE_MEMCHR = 1]) - AM_COND_IF([GL_COND_OBJ_MEMCHR], [ + if test $REPLACE_MEMCHR = 1; then + AC_LIBOBJ([memchr]) gl_PREREQ_MEMCHR - ]) + fi gl_STRING_MODULE_INDICATOR([memchr]) gl_FUNC_MEMPCPY - gl_CONDITIONAL([GL_COND_OBJ_MEMPCPY], - [test $HAVE_MEMPCPY = 0 || test $REPLACE_MEMPCPY = 1]) - AM_COND_IF([GL_COND_OBJ_MEMPCPY], [ + if test $HAVE_MEMPCPY = 0; then + AC_LIBOBJ([mempcpy]) gl_PREREQ_MEMPCPY - ]) + fi gl_STRING_MODULE_INDICATOR([mempcpy]) gl_MINMAX AC_REQUIRE([gl_MSVC_INVAL]) - gl_CONDITIONAL([GL_COND_OBJ_MSVC_INVAL], - [test $HAVE_MSVC_INVALID_PARAMETER_HANDLER = 1]) + if test $HAVE_MSVC_INVALID_PARAMETER_HANDLER = 1; then + AC_LIBOBJ([msvc-inval]) + fi AC_REQUIRE([gl_MSVC_NOTHROW]) - gl_CONDITIONAL([GL_COND_OBJ_MSVC_NOTHROW], - [test $HAVE_MSVC_INVALID_PARAMETER_HANDLER = 1]) + if test $HAVE_MSVC_INVALID_PARAMETER_HANDLER = 1; then + AC_LIBOBJ([msvc-nothrow]) + fi gl_MODULE_INDICATOR([msvc-nothrow]) gl_MULTIARCH gl_FUNC_OPEN - gl_CONDITIONAL([GL_COND_OBJ_OPEN], [test $REPLACE_OPEN = 1]) - AM_COND_IF([GL_COND_OBJ_OPEN], [ + if test $REPLACE_OPEN = 1; then + AC_LIBOBJ([open]) gl_PREREQ_OPEN - ]) + fi gl_FCNTL_MODULE_INDICATOR([open]) gl_PATHMAX gl_FUNC_PRINTF_FREXP @@ -408,177 +360,118 @@ AC_CHECK_DECLS([program_invocation_name], [], [], [#include ]) AC_CHECK_DECLS([program_invocation_short_name], [], [], [#include ]) gl_FUNC_RAISE - gl_CONDITIONAL([GL_COND_OBJ_RAISE], - [test $HAVE_RAISE = 0 || test $REPLACE_RAISE = 1]) - AM_COND_IF([GL_COND_OBJ_RAISE], [ + if test $HAVE_RAISE = 0 || test $REPLACE_RAISE = 1; then + AC_LIBOBJ([raise]) gl_PREREQ_RAISE - ]) + fi gl_SIGNAL_MODULE_INDICATOR([raise]) gl_FUNC_RAWMEMCHR - gl_CONDITIONAL([GL_COND_OBJ_RAWMEMCHR], [test $HAVE_RAWMEMCHR = 0]) - AM_COND_IF([GL_COND_OBJ_RAWMEMCHR], [ + if test $HAVE_RAWMEMCHR = 0; then + AC_LIBOBJ([rawmemchr]) gl_PREREQ_RAWMEMCHR - ]) + fi gl_STRING_MODULE_INDICATOR([rawmemchr]) gl_FUNC_READ - gl_CONDITIONAL([GL_COND_OBJ_READ], [test $REPLACE_READ = 1]) - AM_COND_IF([GL_COND_OBJ_READ], [ + if test $REPLACE_READ = 1; then + AC_LIBOBJ([read]) gl_PREREQ_READ - ]) + fi gl_UNISTD_MODULE_INDICATOR([read]) gl_FUNC_READLINK - gl_CONDITIONAL([GL_COND_OBJ_READLINK], - [test $HAVE_READLINK = 0 || test $REPLACE_READLINK = 1]) - AM_COND_IF([GL_COND_OBJ_READLINK], [ + if test $HAVE_READLINK = 0 || test $REPLACE_READLINK = 1; then + AC_LIBOBJ([readlink]) gl_PREREQ_READLINK - ]) - gl_UNISTD_MODULE_INDICATOR([readlink]) - gl_FUNC_REALLOC_GNU - if test $REPLACE_REALLOC_FOR_REALLOC_GNU = 1; then - AC_LIBOBJ([realloc]) fi - gl_STDLIB_MODULE_INDICATOR([realloc-gnu]) + gl_UNISTD_MODULE_INDICATOR([readlink]) gl_FUNC_REALLOC_POSIX - if test $REPLACE_REALLOC_FOR_REALLOC_POSIX = 1; then + if test $REPLACE_REALLOC = 1; then AC_LIBOBJ([realloc]) fi gl_STDLIB_MODULE_INDICATOR([realloc-posix]) - gl_FUNC_REALLOCARRAY - gl_CONDITIONAL([GL_COND_OBJ_REALLOCARRAY], - [test $HAVE_REALLOCARRAY = 0 || test $REPLACE_REALLOCARRAY = 1]) - AM_COND_IF([GL_COND_OBJ_REALLOCARRAY], [ - gl_PREREQ_REALLOCARRAY - ]) - gl_MODULE_INDICATOR([reallocarray]) - gl_STDLIB_MODULE_INDICATOR([reallocarray]) + gl_MODULE_INDICATOR([realloc-posix]) gl_FUNC_RENAME - gl_CONDITIONAL([GL_COND_OBJ_RENAME], [test $REPLACE_RENAME = 1]) + if test $REPLACE_RENAME = 1; then + AC_LIBOBJ([rename]) + fi gl_STDIO_MODULE_INDICATOR([rename]) gl_FUNC_RMDIR - gl_CONDITIONAL([GL_COND_OBJ_RMDIR], [test $REPLACE_RMDIR = 1]) + if test $REPLACE_RMDIR = 1; then + AC_LIBOBJ([rmdir]) + fi gl_UNISTD_MODULE_INDICATOR([rmdir]) gl_SIGNAL_H - gl_SIGNAL_H_REQUIRE_DEFAULTS - AC_PROG_MKDIR_P gl_SIGNBIT - gl_CONDITIONAL([GL_COND_OBJ_SIGNBIT3], [test $REPLACE_SIGNBIT = 1]) + if test $REPLACE_SIGNBIT = 1; then + AC_LIBOBJ([signbitf]) + AC_LIBOBJ([signbitd]) + AC_LIBOBJ([signbitl]) + fi gl_MATH_MODULE_INDICATOR([signbit]) gl_SIZE_MAX gl_FUNC_SPRINTF_POSIX gl_STDIO_MODULE_INDICATOR([sprintf-posix]) gt_TYPE_SSIZE_T gl_FUNC_STAT - gl_CONDITIONAL([GL_COND_OBJ_STAT], [test $REPLACE_STAT = 1]) - AM_COND_IF([GL_COND_OBJ_STAT], [ + if test $REPLACE_STAT = 1; then + AC_LIBOBJ([stat]) case "$host_os" in mingw*) AC_LIBOBJ([stat-w32]) ;; esac gl_PREREQ_STAT - ]) + fi gl_SYS_STAT_MODULE_INDICATOR([stat]) gl_STAT_TIME gl_STAT_BIRTHTIME - gl_C_BOOL - AC_CHECK_HEADERS_ONCE([stdckdint.h]) - if test $ac_cv_header_stdckdint_h = yes; then - GL_GENERATE_STDCKDINT_H=false - else - GL_GENERATE_STDCKDINT_H=true - fi - gl_CONDITIONAL_HEADER([stdckdint.h]) - AC_PROG_MKDIR_P + AM_STDBOOL_H gl_STDDEF_H - gl_STDDEF_H_REQUIRE_DEFAULTS - gl_CONDITIONAL_HEADER([stddef.h]) - AC_PROG_MKDIR_P gl_STDINT_H - gl_CONDITIONAL_HEADER([stdint.h]) - dnl Because of gl_REPLACE_LIMITS_H: - gl_CONDITIONAL_HEADER([limits.h]) - AC_PROG_MKDIR_P gl_STDIO_H - gl_STDIO_H_REQUIRE_DEFAULTS - AC_PROG_MKDIR_P - gl_CONDITIONAL([GL_COND_OBJ_STDIO_READ], [test $REPLACE_STDIO_READ_FUNCS = 1]) - gl_CONDITIONAL([GL_COND_OBJ_STDIO_WRITE], [test $REPLACE_STDIO_WRITE_FUNCS = 1]) - dnl No need to create extra modules for these functions. Everyone who uses - dnl likely needs them. - gl_STDIO_MODULE_INDICATOR([fscanf]) - gl_MODULE_INDICATOR([fscanf]) - gl_STDIO_MODULE_INDICATOR([scanf]) - gl_MODULE_INDICATOR([scanf]) - gl_STDIO_MODULE_INDICATOR([fgetc]) - gl_STDIO_MODULE_INDICATOR([getc]) - gl_STDIO_MODULE_INDICATOR([getchar]) - gl_STDIO_MODULE_INDICATOR([fgets]) - gl_STDIO_MODULE_INDICATOR([fread]) - dnl No need to create extra modules for these functions. Everyone who uses - dnl likely needs them. - gl_STDIO_MODULE_INDICATOR([fprintf]) - gl_STDIO_MODULE_INDICATOR([printf]) - gl_STDIO_MODULE_INDICATOR([vfprintf]) - gl_STDIO_MODULE_INDICATOR([vprintf]) - gl_STDIO_MODULE_INDICATOR([fputc]) - gl_STDIO_MODULE_INDICATOR([putc]) - gl_STDIO_MODULE_INDICATOR([putchar]) - gl_STDIO_MODULE_INDICATOR([fputs]) - gl_STDIO_MODULE_INDICATOR([puts]) - gl_STDIO_MODULE_INDICATOR([fwrite]) gl_STDLIB_H - gl_STDLIB_H_REQUIRE_DEFAULTS - AC_PROG_MKDIR_P gl_FUNC_STRDUP_POSIX - gl_CONDITIONAL([GL_COND_OBJ_STRDUP], [test $REPLACE_STRDUP = 1]) - AM_COND_IF([GL_COND_OBJ_STRDUP], [ + if test $REPLACE_STRDUP = 1; then + AC_LIBOBJ([strdup]) gl_PREREQ_STRDUP - ]) + fi gl_STRING_MODULE_INDICATOR([strdup]) gl_FUNC_STRERROR - gl_CONDITIONAL([GL_COND_OBJ_STRERROR], [test $REPLACE_STRERROR = 1]) + 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]) - gl_CONDITIONAL([GL_COND_OBJ_STRERROR_OVERRIDE], - [test -n "$ERRNO_H" || test $REPLACE_STRERROR_0 = 1]) - AM_COND_IF([GL_COND_OBJ_STRERROR_OVERRIDE], [ + if test -n "$ERRNO_H" || test $REPLACE_STRERROR_0 = 1; then + AC_LIBOBJ([strerror-override]) gl_PREREQ_SYS_H_WINSOCK2 - ]) - gl_STRING_H - gl_STRING_H_REQUIRE_DEFAULTS - AC_PROG_MKDIR_P + fi + gl_HEADER_STRING_H gl_FUNC_SYMLINK - gl_CONDITIONAL([GL_COND_OBJ_SYMLINK], - [test $HAVE_SYMLINK = 0 || test $REPLACE_SYMLINK = 1]) + if test $HAVE_SYMLINK = 0 || test $REPLACE_SYMLINK = 1; then + AC_LIBOBJ([symlink]) + fi gl_UNISTD_MODULE_INDICATOR([symlink]) - gl_SYS_STAT_H - gl_SYS_STAT_H_REQUIRE_DEFAULTS + gl_HEADER_SYS_STAT_H AC_PROG_MKDIR_P gl_SYS_TYPES_H - gl_SYS_TYPES_H_REQUIRE_DEFAULTS - AC_PROG_MKDIR_P - gl_TIME_H - gl_TIME_H_REQUIRE_DEFAULTS AC_PROG_MKDIR_P + gl_HEADER_TIME_H gl_UNISTD_H - gl_UNISTD_H_REQUIRE_DEFAULTS - AC_PROG_MKDIR_P gl_FUNC_UNLINK - gl_CONDITIONAL([GL_COND_OBJ_UNLINK], [test $REPLACE_UNLINK = 1]) + if test $REPLACE_UNLINK = 1; then + AC_LIBOBJ([unlink]) + fi gl_UNISTD_MODULE_INDICATOR([unlink]) - AC_C_VARARRAYS AC_REQUIRE([AC_C_RESTRICT]) gl_FUNC_VASNPRINTF gl_WCHAR_H - gl_WCHAR_H_REQUIRE_DEFAULTS - AC_PROG_MKDIR_P gl_FUNC_WRITE - gl_CONDITIONAL([GL_COND_OBJ_WRITE], [test $REPLACE_WRITE = 1]) - AM_COND_IF([GL_COND_OBJ_WRITE], [ + if test $REPLACE_WRITE = 1; then + AC_LIBOBJ([write]) gl_PREREQ_WRITE - ]) + fi gl_UNISTD_MODULE_INDICATOR([write]) gl_XALLOC gl_MODULE_INDICATOR([xalloc]) @@ -596,8 +489,6 @@ m4_if(m4_sysval, [0], [], [AC_FATAL([expected source file, required through AC_LIBSOURCES, not found])]) ]) - m4_popdef([GL_MODULE_INDICATOR_PREFIX]) - m4_popdef([GL_MACRO_PREFIX]) m4_popdef([gl_LIBSOURCES_DIR]) m4_popdef([gl_LIBSOURCES_LIST]) m4_popdef([AC_LIBSOURCES]) @@ -606,28 +497,16 @@ AC_CONFIG_COMMANDS_PRE([ gl_libobjs= gl_ltlibobjs= - gl_libobjdeps= if test -n "$gl_LIBOBJS"; then # Remove the extension. -changequote(,)dnl sed_drop_objext='s/\.o$//;s/\.obj$//' - sed_dirname1='s,//*,/,g' - sed_dirname2='s,\(.\)/$,\1,' - sed_dirname3='s,^[^/]*$,.,' - sed_dirname4='s,\(.\)/[^/]*$,\1,' - sed_basename1='s,.*/,,' -changequote([, ])dnl for i in `for i in $gl_LIBOBJS; do echo "$i"; done | sed -e "$sed_drop_objext" | sort | uniq`; do gl_libobjs="$gl_libobjs $i.$ac_objext" gl_ltlibobjs="$gl_ltlibobjs $i.lo" - i_dir=`echo "$i" | sed -e "$sed_dirname1" -e "$sed_dirname2" -e "$sed_dirname3" -e "$sed_dirname4"` - i_base=`echo "$i" | sed -e "$sed_basename1"` - gl_libobjdeps="$gl_libobjdeps $i_dir/\$(DEPDIR)/$i_base.Po" done fi AC_SUBST([gl_LIBOBJS], [$gl_libobjs]) AC_SUBST([gl_LTLIBOBJS], [$gl_ltlibobjs]) - AC_SUBST([gl_LIBOBJDEPS], [$gl_libobjdeps]) ]) gltests_libdeps= gltests_ltlibdeps= @@ -636,11 +515,8 @@ m4_pushdef([AC_LIBSOURCES], m4_defn([gltests_LIBSOURCES])) m4_pushdef([gltests_LIBSOURCES_LIST], []) m4_pushdef([gltests_LIBSOURCES_DIR], []) - m4_pushdef([GL_MACRO_PREFIX], [gltests]) - m4_pushdef([GL_MODULE_INDICATOR_PREFIX], [GL]) gl_COMMON gl_source_base='tests' - gl_source_base_prefix= changequote(,)dnl gltests_WITNESS=IN_`echo "${PACKAGE-$PACKAGE_TARNAME}" | LC_ALL=C tr abcdefghijklmnopqrstuvwxyz ABCDEFGHIJKLMNOPQRSTUVWXYZ | LC_ALL=C sed -e 's/[^A-Z0-9_]/_/g'`_GNULIB_TESTS changequote([, ])dnl @@ -659,8 +535,6 @@ m4_if(m4_sysval, [0], [], [AC_FATAL([expected source file, required through AC_LIBSOURCES, not found])]) ]) - m4_popdef([GL_MODULE_INDICATOR_PREFIX]) - m4_popdef([GL_MACRO_PREFIX]) m4_popdef([gltests_LIBSOURCES_DIR]) m4_popdef([gltests_LIBSOURCES_LIST]) m4_popdef([AC_LIBSOURCES]) @@ -669,30 +543,17 @@ AC_CONFIG_COMMANDS_PRE([ gltests_libobjs= gltests_ltlibobjs= - gltests_libobjdeps= if test -n "$gltests_LIBOBJS"; then # Remove the extension. -changequote(,)dnl sed_drop_objext='s/\.o$//;s/\.obj$//' - sed_dirname1='s,//*,/,g' - sed_dirname2='s,\(.\)/$,\1,' - sed_dirname3='s,^[^/]*$,.,' - sed_dirname4='s,\(.\)/[^/]*$,\1,' - sed_basename1='s,.*/,,' -changequote([, ])dnl for i in `for i in $gltests_LIBOBJS; do echo "$i"; done | sed -e "$sed_drop_objext" | sort | uniq`; do gltests_libobjs="$gltests_libobjs $i.$ac_objext" gltests_ltlibobjs="$gltests_ltlibobjs $i.lo" - i_dir=`echo "$i" | sed -e "$sed_dirname1" -e "$sed_dirname2" -e "$sed_dirname3" -e "$sed_dirname4"` - i_base=`echo "$i" | sed -e "$sed_basename1"` - gltests_libobjdeps="$gltests_libobjdeps $i_dir/\$(DEPDIR)/$i_base.Po" done fi AC_SUBST([gltests_LIBOBJS], [$gltests_libobjs]) AC_SUBST([gltests_LTLIBOBJS], [$gltests_ltlibobjs]) - AC_SUBST([gltests_LIBOBJDEPS], [$gltests_libobjdeps]) ]) - AC_REQUIRE([gl_CC_GNULIB_WARNINGS]) LIBGNU_LIBDEPS="$gl_libdeps" AC_SUBST([LIBGNU_LIBDEPS]) LIBGNU_LTLIBDEPS="$gl_ltlibdeps" @@ -765,14 +626,12 @@ lib/alloca.in.h lib/arg-nonnull.h lib/asnprintf.c - lib/assert.in.h lib/attribute.h lib/basename-lgpl.c lib/basename-lgpl.h lib/binary-io.c lib/binary-io.h lib/c++defs.h - lib/calloc.c lib/canonicalize-lgpl.c lib/cdefs.h lib/cloexec.c @@ -784,7 +643,7 @@ lib/eloop-threshold.h lib/errno.in.h lib/error.c - lib/error.in.h + lib/error.h lib/exitfail.c lib/exitfail.h lib/fcntl.c @@ -816,11 +675,8 @@ lib/getprogname.c lib/getprogname.h lib/gettext.h - lib/ialloc.c - lib/ialloc.h lib/idx.h lib/ignore-value.h - lib/intprops-internal.h lib/intprops.h lib/inttypes.in.h lib/isnan.c @@ -838,6 +694,7 @@ lib/lstat.c lib/malloc.c lib/malloc/scratch_buffer.h + lib/malloc/scratch_buffer_dupfree.c lib/malloc/scratch_buffer_grow.c lib/malloc/scratch_buffer_grow_preserve.c lib/malloc/scratch_buffer_set_array_size.c @@ -871,7 +728,6 @@ lib/read.c lib/readlink.c lib/realloc.c - lib/reallocarray.c lib/rename.c lib/rmdir.c lib/same-inode.h @@ -887,12 +743,10 @@ lib/stat-w32.c lib/stat-w32.h lib/stat.c - lib/stdckdint.in.h + lib/stdbool.in.h lib/stddef.in.h lib/stdint.in.h lib/stdio-impl.h - lib/stdio-read.c - lib/stdio-write.c lib/stdio.in.h lib/stdlib.in.h lib/strdup.c @@ -924,19 +778,13 @@ m4/__inline.m4 m4/absolute-header.m4 m4/alloca.m4 - m4/assert_h.m4 - m4/builtin-expect.m4 - m4/c-bool.m4 - m4/calloc.m4 m4/canonicalize.m4 m4/close.m4 - m4/codeset.m4 m4/double-slash-root.m4 m4/dup2.m4 m4/eealloc.m4 m4/errno_h.m4 m4/error.m4 - m4/error_h.m4 m4/exponentd.m4 m4/exponentf.m4 m4/exponentl.m4 @@ -968,7 +816,6 @@ m4/ldexpl.m4 m4/limits-h.m4 m4/link.m4 - m4/locale-fr.m4 m4/lseek.m4 m4/lstat.m4 m4/malloc.m4 @@ -984,7 +831,6 @@ m4/msvc-inval.m4 m4/msvc-nothrow.m4 m4/multiarch.m4 - m4/musl.m4 m4/nocrash.m4 m4/off_t.m4 m4/open-cloexec.m4 @@ -1000,7 +846,6 @@ m4/read.m4 m4/readlink.m4 m4/realloc.m4 - m4/reallocarray.m4 m4/rename.m4 m4/rmdir.m4 m4/signal_h.m4 @@ -1011,7 +856,7 @@ m4/stat-time.m4 m4/stat.m4 m4/std-gnu11.m4 - m4/stdalign.m4 + m4/stdbool.m4 m4/stddef_h.m4 m4/stdint.m4 m4/stdint_h.m4 @@ -1027,7 +872,6 @@ m4/time_h.m4 m4/unistd_h.m4 m4/unlink.m4 - m4/vararrays.m4 m4/vasnprintf.m4 m4/warn-on-use.m4 m4/warnings.m4 diff -Nru mmv-2.5/m4/include_next.m4 mmv-2.5.1/m4/include_next.m4 --- mmv-2.5/m4/include_next.m4 2023-07-20 19:40:23.000000000 +0000 +++ mmv-2.5.1/m4/include_next.m4 2023-08-08 11:02:40.000000000 +0000 @@ -1,5 +1,5 @@ # include_next.m4 serial 26 -dnl Copyright (C) 2006-2023 Free Software Foundation, Inc. +dnl Copyright (C) 2006-2021 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. @@ -193,9 +193,9 @@ if test AS_VAR_GET([gl_header_exists]) = yes; then AS_VAR_POPDEF([gl_header_exists]) ]) - 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'"']) + 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 -Nru mmv-2.5/m4/intmax_t.m4 mmv-2.5.1/m4/intmax_t.m4 --- mmv-2.5/m4/intmax_t.m4 2023-07-20 19:40:23.000000000 +0000 +++ mmv-2.5.1/m4/intmax_t.m4 2023-08-08 11:02:40.000000000 +0000 @@ -1,5 +1,5 @@ # intmax_t.m4 serial 9 -dnl Copyright (C) 1997-2004, 2006-2007, 2009-2023 Free Software Foundation, +dnl Copyright (C) 1997-2004, 2006-2007, 2009-2021 Free Software Foundation, dnl Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, diff -Nru mmv-2.5/m4/inttypes.m4 mmv-2.5.1/m4/inttypes.m4 --- mmv-2.5/m4/inttypes.m4 2023-07-20 19:40:23.000000000 +0000 +++ mmv-2.5.1/m4/inttypes.m4 2023-08-08 11:02:40.000000000 +0000 @@ -1,5 +1,5 @@ -# inttypes.m4 serial 37 -dnl Copyright (C) 2006-2023 Free Software Foundation, Inc. +# inttypes.m4 serial 32 +dnl Copyright (C) 2006-2021 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. @@ -7,7 +7,7 @@ dnl From Derek Price, Bruno Haible. dnl Test whether is supported or must be substituted. -AC_DEFUN_ONCE([gl_INTTYPES_H], +AC_DEFUN([gl_INTTYPES_H], [ AC_REQUIRE([gl_INTTYPES_INCOMPLETE]) gl_INTTYPES_PRI_SCN @@ -36,7 +36,7 @@ AC_DEFUN([gl_INTTYPES_PRI_SCN], [ PRIPTR_PREFIX= - if $GL_GENERATE_STDINT_H; then + if test -n "$STDINT_H"; then dnl Using the gnulib . It defines intptr_t to 'long' or dnl 'long long', depending on _WIN64. AC_COMPILE_IFELSE( @@ -136,44 +136,25 @@ AC_SUBST([$1]) ]) -# gl_INTTYPES_MODULE_INDICATOR([modulename]) -# sets the shell variable that indicates the presence of the given module -# to a C preprocessor expression that will evaluate to 1. -# This macro invocation must not occur in macros that are AC_REQUIREd. AC_DEFUN([gl_INTTYPES_MODULE_INDICATOR], [ - dnl Ensure to expand the default settings once only. - gl_INTTYPES_H_REQUIRE_DEFAULTS - gl_MODULE_INDICATOR_SET_VARIABLE([$1]) -]) - -# Initializes the default values for AC_SUBSTed shell variables. -# This macro must not be AC_REQUIREd. It must only be invoked, and only -# outside of macros or in macros that are not AC_REQUIREd. -AC_DEFUN([gl_INTTYPES_H_REQUIRE_DEFAULTS], -[ - m4_defun(GL_MODULE_INDICATOR_PREFIX[_INTTYPES_H_MODULE_INDICATOR_DEFAULTS], [ - gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_IMAXABS]) - gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_IMAXDIV]) - gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_STRTOIMAX]) - gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_STRTOUMAX]) - ]) - m4_require(GL_MODULE_INDICATOR_PREFIX[_INTTYPES_H_MODULE_INDICATOR_DEFAULTS]) + dnl Use AC_REQUIRE here, so that the default settings are expanded once only. AC_REQUIRE([gl_INTTYPES_H_DEFAULTS]) + gl_MODULE_INDICATOR_SET_VARIABLE([$1]) ]) AC_DEFUN([gl_INTTYPES_H_DEFAULTS], [ + GNULIB_IMAXABS=0; AC_SUBST([GNULIB_IMAXABS]) + GNULIB_IMAXDIV=0; AC_SUBST([GNULIB_IMAXDIV]) + GNULIB_STRTOIMAX=0; AC_SUBST([GNULIB_STRTOIMAX]) + GNULIB_STRTOUMAX=0; AC_SUBST([GNULIB_STRTOUMAX]) dnl Assume proper GNU behavior unless another module says otherwise. HAVE_DECL_IMAXABS=1; AC_SUBST([HAVE_DECL_IMAXABS]) HAVE_DECL_IMAXDIV=1; AC_SUBST([HAVE_DECL_IMAXDIV]) HAVE_DECL_STRTOIMAX=1; AC_SUBST([HAVE_DECL_STRTOIMAX]) HAVE_DECL_STRTOUMAX=1; AC_SUBST([HAVE_DECL_STRTOUMAX]) HAVE_IMAXDIV_T=1; AC_SUBST([HAVE_IMAXDIV_T]) - HAVE_IMAXABS=1; AC_SUBST([HAVE_IMAXABS]) - HAVE_IMAXDIV=1; AC_SUBST([HAVE_IMAXDIV]) - REPLACE_IMAXABS=0; AC_SUBST([REPLACE_IMAXABS]) - REPLACE_IMAXDIV=0; AC_SUBST([REPLACE_IMAXDIV]) REPLACE_STRTOIMAX=0; AC_SUBST([REPLACE_STRTOIMAX]) REPLACE_STRTOUMAX=0; AC_SUBST([REPLACE_STRTOUMAX]) INT32_MAX_LT_INTMAX_MAX=1; AC_SUBST([INT32_MAX_LT_INTMAX_MAX]) diff -Nru mmv-2.5/m4/inttypes_h.m4 mmv-2.5.1/m4/inttypes_h.m4 --- mmv-2.5/m4/inttypes_h.m4 2023-07-20 19:40:23.000000000 +0000 +++ mmv-2.5.1/m4/inttypes_h.m4 2023-08-08 11:02:40.000000000 +0000 @@ -1,5 +1,5 @@ # inttypes_h.m4 serial 10 -dnl Copyright (C) 1997-2004, 2006, 2008-2023 Free Software Foundation, Inc. +dnl Copyright (C) 1997-2004, 2006, 2008-2021 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 -Nru mmv-2.5/m4/isnand.m4 mmv-2.5.1/m4/isnand.m4 --- mmv-2.5/m4/isnand.m4 2023-07-20 19:40:23.000000000 +0000 +++ mmv-2.5.1/m4/isnand.m4 2023-08-08 11:02:40.000000000 +0000 @@ -1,5 +1,5 @@ # isnand.m4 serial 12 -dnl Copyright (C) 2007-2023 Free Software Foundation, Inc. +dnl Copyright (C) 2007-2021 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 -Nru mmv-2.5/m4/isnanf.m4 mmv-2.5.1/m4/isnanf.m4 --- mmv-2.5/m4/isnanf.m4 2023-07-20 19:40:23.000000000 +0000 +++ mmv-2.5.1/m4/isnanf.m4 2023-08-08 11:02:40.000000000 +0000 @@ -1,5 +1,5 @@ # isnanf.m4 serial 18 -dnl Copyright (C) 2007-2023 Free Software Foundation, Inc. +dnl Copyright (C) 2007-2021 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 -Nru mmv-2.5/m4/isnanl.m4 mmv-2.5.1/m4/isnanl.m4 --- mmv-2.5/m4/isnanl.m4 2023-07-20 19:40:23.000000000 +0000 +++ mmv-2.5.1/m4/isnanl.m4 2023-08-08 11:02:40.000000000 +0000 @@ -1,5 +1,5 @@ # isnanl.m4 serial 22 -dnl Copyright (C) 2007-2023 Free Software Foundation, Inc. +dnl Copyright (C) 2007-2021 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 -Nru mmv-2.5/m4/largefile.m4 mmv-2.5.1/m4/largefile.m4 --- mmv-2.5/m4/largefile.m4 2023-07-20 19:40:24.000000000 +0000 +++ mmv-2.5.1/m4/largefile.m4 2023-08-08 11:02:40.000000000 +0000 @@ -1,7 +1,7 @@ # Enable large files on systems where this is not the default. # Enable support for files on Linux file systems with 64-bit inode numbers. -# Copyright 1992-1996, 1998-2023 Free Software Foundation, Inc. +# Copyright 1992-1996, 1998-2021 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. @@ -10,9 +10,8 @@ # It does not set _LARGEFILE_SOURCE=1 on HP-UX/ia64 32-bit, although this # setting of _LARGEFILE_SOURCE is needed so that declares fseeko # and ftello in C++ mode as well. -# This problem occurs in Autoconf 2.71 and earlier, which lack AC_SYS_YEAR2038. AC_DEFUN([gl_SET_LARGEFILE_SOURCE], - m4_ifndef([AC_SYS_YEAR2038], [[ +[ AC_REQUIRE([AC_CANONICAL_HOST]) AC_FUNC_FSEEKO case "$host_os" in @@ -21,255 +20,53 @@ [Define to 1 to make fseeko visible on some hosts (e.g. glibc 2.2).]) ;; esac - ]]) -) - -m4_ifndef([AC_SYS_YEAR2038_RECOMMENDED], [ -# Support AC_SYS_YEAR2038_RECOMMENDED and related macros, even if -# Autoconf 2.71 or earlier. This code is taken from Autoconf master. - -# _AC_SYS_YEAR2038_TEST_CODE -# -------------------------- -# C code used to probe for time_t that can represent time points more -# than 2**31 - 1 seconds after the epoch. With the usual Unix epoch, -# these correspond to dates after 2038-01-18 22:14:07 +0000 (Gregorian), -# hence the name. -AC_DEFUN([_AC_SYS_YEAR2038_TEST_CODE], -[[ - #include - /* Check that time_t can represent 2**32 - 1 correctly. */ - #define LARGE_TIME_T \\ - ((time_t) (((time_t) 1 << 30) - 1 + 3 * ((time_t) 1 << 30))) - int verify_time_t_range[(LARGE_TIME_T / 65537 == 65535 - && LARGE_TIME_T % 65537 == 0) - ? 1 : -1]; -]]) - -# _AC_SYS_YEAR2038_OPTIONS -# ------------------------ -# List of known ways to enable support for large time_t. If you change -# this list you probably also need to change the AS_CASE at the end of -# _AC_SYS_YEAR2038_PROBE. -m4_define([_AC_SYS_YEAR2038_OPTIONS], m4_normalize( - ["none needed"] dnl 64-bit and newer 32-bit Unix - ["-D_TIME_BITS=64"] dnl glibc 2.34 with some 32-bit ABIs - ["-D__MINGW_USE_VC2005_COMPAT"] dnl 32-bit MinGW - ["-U_USE_32_BIT_TIME_T -D__MINGW_USE_VC2005_COMPAT"] - dnl 32-bit MinGW (misconfiguration) -)) - -# _AC_SYS_YEAR2038_PROBE -# ---------------------- -# Subroutine of AC_SYS_YEAR2038. Probe for time_t that can represent -# time points more than 2**31 - 1 seconds after the epoch (dates after -# 2038-01-18, see above) and set the cache variable ac_cv_sys_year2038_opts -# to one of the values in the _AC_SYS_YEAR2038_OPTIONS list, or to -# "support not detected" if none of them worked. Then, set compilation -# options and #defines as necessary to enable large time_t support. -# -# Note that we do not test whether mktime, localtime, etc. handle -# large values of time_t correctly, as that would require use of -# AC_TRY_RUN. Note also that some systems only support large time_t -# together with large off_t. -# -# If you change this macro you may also need to change -# _AC_SYS_YEAR2038_OPTIONS. -AC_DEFUN([_AC_SYS_YEAR2038_PROBE], -[AC_CACHE_CHECK([for $CC option for timestamps after 2038], - [ac_cv_sys_year2038_opts], - [ac_save_CPPFLAGS="$CPPFLAGS" - ac_opt_found=no - for ac_opt in _AC_SYS_YEAR2038_OPTIONS; do - AS_IF([test x"$ac_opt" != x"none needed"], - [CPPFLAGS="$ac_save_CPPFLAGS $ac_opt"]) - AC_COMPILE_IFELSE([AC_LANG_PROGRAM([_AC_SYS_YEAR2038_TEST_CODE])], - [ac_cv_sys_year2038_opts="$ac_opt" - ac_opt_found=yes]) - test $ac_opt_found = no || break - done - CPPFLAGS="$ac_save_CPPFLAGS" - test $ac_opt_found = yes || ac_cv_sys_year2038_opts="support not detected"]) - -ac_have_year2038=yes -AS_CASE([$ac_cv_sys_year2038_opts], - ["none needed"], [], - ["support not detected"], - [ac_have_year2038=no], - - ["-D_TIME_BITS=64"], - [AC_DEFINE([_TIME_BITS], [64], - [Number of bits in time_t, on hosts where this is settable.])], - - ["-D__MINGW_USE_VC2005_COMPAT"], - [AC_DEFINE([__MINGW_USE_VC2005_COMPAT], [1], - [Define to 1 on platforms where this makes time_t a 64-bit type.])], - - ["-U_USE_32_BIT_TIME_T"*], - [AC_MSG_FAILURE(m4_text_wrap( - [the 'time_t' type is currently forced to be 32-bit. - It will stop working after mid-January 2038. - Remove _USE_32BIT_TIME_T from the compiler flags.], - [], [], [55]))], - - [AC_MSG_ERROR( - [internal error: bad value for \$ac_cv_sys_year2038_opts])]) ]) -# _AC_SYS_YEAR2038_ENABLE -# ----------------------- -# Depending on which of the YEAR2038 macros was used, add either an -# --enable-year2038 or a --disable-year2038 to -# the configure script. This is expanded very late and -# therefore there cannot be any code in the AC_ARG_ENABLE. The -# default value for 'enable_year2038' is emitted unconditionally -# because the generated code always looks at this variable. -m4_define([_AC_SYS_YEAR2038_ENABLE], -[m4_divert_text([DEFAULTS], - m4_provide_if([AC_SYS_YEAR2038], - [enable_year2038=yes], - [enable_year2038=no]))]dnl -[AC_ARG_ENABLE([year2038], - m4_provide_if([AC_SYS_YEAR2038], - [AS_HELP_STRING([--disable-year2038], - [don't support timestamps after 2038])], - [AS_HELP_STRING([--enable-year2038], - [support timestamps after 2038])]))]) - -# AC_SYS_YEAR2038 -# --------------- -# Attempt to detect and activate support for large time_t. -# On systems where time_t is not always 64 bits, this probe can be -# skipped by passing the --disable-year2038 option to configure. -AC_DEFUN([AC_SYS_YEAR2038], -[AC_REQUIRE([AC_SYS_LARGEFILE])dnl -AS_IF([test "$enable_year2038,$ac_have_year2038,$cross_compiling" = yes,no,no], - [# If we're not cross compiling and 'touch' works with a large - # timestamp, then we can presume the system supports wider time_t - # *somehow* and we just weren't able to detect it. One common - # case that we deliberately *don't* probe for is a system that - # supports both 32- and 64-bit ABIs but only the 64-bit ABI offers - # wide time_t. (It would be inappropriate for us to override an - # intentional use of -m32.) Error out, demanding use of - # --disable-year2038 if this is intentional. - AS_IF([TZ=UTC0 touch -t 210602070628.15 conftest.time 2>/dev/null], - [AS_CASE([`TZ=UTC0 LC_ALL=C ls -l conftest.time 2>/dev/null`], - [*'Feb 7 2106'* | *'Feb 7 17:10'*], - [AC_MSG_FAILURE(m4_text_wrap( - [this system appears to support timestamps after mid-January 2038, - but no mechanism for enabling wide 'time_t' was detected. - Did you mean to build a 64-bit binary? (E.g., 'CC="${CC} -m64"'.) - To proceed with 32-bit time_t, configure with '--disable-year2038'.], - [], [], [55]))])])])]) - -# AC_SYS_YEAR2038_RECOMMENDED -# --------------------------- -# Same as AC_SYS_YEAR2038, but recommend support for large time_t. -# If we cannot find any way to make time_t capable of representing -# values larger than 2**31 - 1, error out unless --disable-year2038 is given. -AC_DEFUN([AC_SYS_YEAR2038_RECOMMENDED], -[AC_REQUIRE([AC_SYS_YEAR2038])dnl -AS_IF([test "$enable_year2038,$ac_have_year2038" = yes,no], - [AC_MSG_FAILURE(m4_text_wrap( - [could not enable timestamps after mid-January 2038. - This package recommends support for these later timestamps. - However, to proceed with signed 32-bit time_t even though it - will fail then, configure with '--disable-year2038'.], - [], [], [55]))])]) - -# _AC_SYS_LARGEFILE_TEST_CODE -# --------------------------- -# C code used to probe for large file support. -m4_define([_AC_SYS_LARGEFILE_TEST_CODE], -[@%:@include +# The following implementation works around a problem in autoconf <= 2.69; +# AC_SYS_LARGEFILE does not configure for large inodes on Mac OS X 10.5, +# or configures them incorrectly in some cases. +m4_version_prereq([2.70], [], [ + +# _AC_SYS_LARGEFILE_TEST_INCLUDES +# ------------------------------- +m4_define([_AC_SYS_LARGEFILE_TEST_INCLUDES], +[#include /* Check that off_t can represent 2**63 - 1 correctly. We can't simply define LARGE_OFF_T to be 9223372036854775807, since some C++ compilers masquerading as C compilers incorrectly reject 9223372036854775807. */ -@%:@define LARGE_OFF_T (((off_t) 1 << 31 << 31) - 1 + ((off_t) 1 << 31 << 31)) +#define LARGE_OFF_T (((off_t) 1 << 31 << 31) - 1 + ((off_t) 1 << 31 << 31)) int off_t_is_large[[(LARGE_OFF_T % 2147483629 == 721 - && LARGE_OFF_T % 2147483647 == 1) - ? 1 : -1]];[]dnl + && LARGE_OFF_T % 2147483647 == 1) + ? 1 : -1]];[]dnl ]) -# Defined by Autoconf 2.71 and circa 2022 Gnulib unwisely depended on it. -m4_define([_AC_SYS_LARGEFILE_TEST_INCLUDES], [_AC_SYS_LARGEFILE_TEST_CODE]) -# _AC_SYS_LARGEFILE_OPTIONS -# ------------------------- -# List of known ways to enable support for large files. If you change -# this list you probably also need to change the AS_CASE at the end of -# _AC_SYS_LARGEFILE_PROBE. -m4_define([_AC_SYS_LARGEFILE_OPTIONS], m4_normalize( - ["none needed"] dnl Most current systems - ["-D_FILE_OFFSET_BITS=64"] dnl X/Open LFS spec - ["-D_LARGE_FILES=1"] dnl 32-bit AIX 4.2.1+, 32-bit z/OS - ["-n32"] dnl 32-bit IRIX 6, SGI cc (obsolete) -)) - -# _AC_SYS_LARGEFILE_PROBE -# ----------------------- -# Subroutine of AC_SYS_LARGEFILE. Probe for large file support and set -# the cache variable ac_cv_sys_largefile_opts to one of the values in -# the _AC_SYS_LARGEFILE_OPTIONS list, or to "support not detected" if -# none of the options in that list worked. Then, set compilation -# options and #defines as necessary to enable large file support. -# -# If large file support is not detected, the behavior depends on which of -# the top-level AC_SYS_LARGEFILE macros was used (see below). -# -# If you change this macro you may also need to change -# _AC_SYS_LARGEFILE_OPTIONS. -AC_DEFUN([_AC_SYS_LARGEFILE_PROBE], -[AC_CACHE_CHECK([for $CC option to enable large file support], - [ac_cv_sys_largefile_opts], - [ac_save_CC="$CC" - ac_opt_found=no - for ac_opt in _AC_SYS_LARGEFILE_OPTIONS; do - AS_IF([test x"$ac_opt" != x"none needed"], - [CC="$ac_save_CC $ac_opt"]) - AC_COMPILE_IFELSE([AC_LANG_PROGRAM([_AC_SYS_LARGEFILE_TEST_CODE])], - [ac_cv_sys_largefile_opts="$ac_opt" - ac_opt_found=yes]) - test $ac_opt_found = no || break - done - CC="$ac_save_CC" - dnl Gnulib implements large file support for native Windows, based on the - dnl variables WINDOWS_64_BIT_OFF_T, WINDOWS_64_BIT_ST_SIZE. - m4_ifdef([gl_LARGEFILE], [ - AC_REQUIRE([AC_CANONICAL_HOST]) - if test $ac_opt_found != yes; then - AS_CASE([$host_os], - [mingw*], - [ac_cv_sys_largefile_opts="supported through gnulib" - ac_opt_found=yes] - ) - fi - ]) - test $ac_opt_found = yes || ac_cv_sys_largefile_opts="support not detected"]) - -ac_have_largefile=yes -AS_CASE([$ac_cv_sys_largefile_opts], - ["none needed"], [], - ["supported through gnulib"], [], - ["support not detected"], - [ac_have_largefile=no], - - ["-D_FILE_OFFSET_BITS=64"], - [AC_DEFINE([_FILE_OFFSET_BITS], [64], - [Number of bits in a file offset, on hosts where this is settable.])], - - ["-D_LARGE_FILES=1"], - [AC_DEFINE([_LARGE_FILES], [1], - [Define to 1 on platforms where this makes off_t a 64-bit type.])], - - ["-n32"], - [CC="$CC -n32"], - - [AC_MSG_ERROR( - [internal error: bad value for \$ac_cv_sys_largefile_opts])]) - -AS_IF([test "$enable_year2038" != no], - [_AC_SYS_YEAR2038_PROBE]) -AC_CONFIG_COMMANDS_PRE([_AC_SYS_YEAR2038_ENABLE])]) + +# _AC_SYS_LARGEFILE_MACRO_VALUE(C-MACRO, VALUE, +# CACHE-VAR, +# DESCRIPTION, +# PROLOGUE, [FUNCTION-BODY]) +# -------------------------------------------------------- +m4_define([_AC_SYS_LARGEFILE_MACRO_VALUE], +[AC_CACHE_CHECK([for $1 value needed for large files], [$3], +[while :; do + m4_ifval([$6], [AC_LINK_IFELSE], [AC_COMPILE_IFELSE])( + [AC_LANG_PROGRAM([$5], [$6])], + [$3=no; break]) + m4_ifval([$6], [AC_LINK_IFELSE], [AC_COMPILE_IFELSE])( + [AC_LANG_PROGRAM([#define $1 $2 +$5], [$6])], + [$3=$2; break]) + $3=unknown + break +done]) +case $$3 in #( + no | unknown) ;; + *) AC_DEFINE_UNQUOTED([$1], [$$3], [$4]);; +esac +rm -rf conftest*[]dnl +])# _AC_SYS_LARGEFILE_MACRO_VALUE + # AC_SYS_LARGEFILE # ---------------- @@ -281,12 +78,44 @@ # to have a 64-bit inode number cannot be accessed by 32-bit applications on # Linux x86/x86_64. This can occur with file systems such as XFS and NFS. AC_DEFUN([AC_SYS_LARGEFILE], -[AC_ARG_ENABLE([largefile], - [AS_HELP_STRING([--disable-largefile], - [omit support for large files])])dnl -AS_IF([test "$enable_largefile,$enable_year2038" != no,no], - [_AC_SYS_LARGEFILE_PROBE])]) -])# m4_ifndef AC_SYS_YEAR2038_RECOMMENDED +[AC_ARG_ENABLE(largefile, + [ --disable-largefile omit support for large files]) +if test "$enable_largefile" != no; then + + AC_CACHE_CHECK([for special C compiler options needed for large files], + ac_cv_sys_largefile_CC, + [ac_cv_sys_largefile_CC=no + if test "$GCC" != yes; then + ac_save_CC=$CC + while :; do + # IRIX 6.2 and later do not support large files by default, + # so use the C compiler's -n32 option if that helps. + AC_LANG_CONFTEST([AC_LANG_PROGRAM([_AC_SYS_LARGEFILE_TEST_INCLUDES])]) + AC_COMPILE_IFELSE([], [break]) + CC="$CC -n32" + AC_COMPILE_IFELSE([], [ac_cv_sys_largefile_CC=' -n32'; break]) + break + done + CC=$ac_save_CC + rm -f conftest.$ac_ext + fi]) + if test "$ac_cv_sys_largefile_CC" != no; then + CC=$CC$ac_cv_sys_largefile_CC + fi + + _AC_SYS_LARGEFILE_MACRO_VALUE(_FILE_OFFSET_BITS, 64, + ac_cv_sys_file_offset_bits, + [Number of bits in a file offset, on hosts where this is settable.], + [_AC_SYS_LARGEFILE_TEST_INCLUDES]) + if test $ac_cv_sys_file_offset_bits = unknown; then + _AC_SYS_LARGEFILE_MACRO_VALUE(_LARGE_FILES, 1, + ac_cv_sys_large_files, + [Define for large files, on AIX-style hosts.], + [_AC_SYS_LARGEFILE_TEST_INCLUDES]) + fi +fi +])# AC_SYS_LARGEFILE +])# m4_version_prereq 2.70 # Enable large files on systems where this is implemented by Gnulib, not by the # system headers. diff -Nru mmv-2.5/m4/ldexpl.m4 mmv-2.5.1/m4/ldexpl.m4 --- mmv-2.5/m4/ldexpl.m4 2023-07-20 19:40:23.000000000 +0000 +++ mmv-2.5.1/m4/ldexpl.m4 2023-08-08 11:02:40.000000000 +0000 @@ -1,5 +1,5 @@ # ldexpl.m4 serial 17 -dnl Copyright (C) 2007-2023 Free Software Foundation, Inc. +dnl Copyright (C) 2007-2021 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 -Nru mmv-2.5/m4/limits-h.m4 mmv-2.5.1/m4/limits-h.m4 --- mmv-2.5/m4/limits-h.m4 2023-07-20 19:40:23.000000000 +0000 +++ mmv-2.5.1/m4/limits-h.m4 2023-08-08 11:02:40.000000000 +0000 @@ -1,6 +1,6 @@ dnl Check whether limits.h has needed features. -dnl Copyright 2016-2023 Free Software Foundation, Inc. +dnl Copyright 2016-2021 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,7 @@ [ gl_CHECK_NEXT_HEADERS([limits.h]) - AC_CACHE_CHECK([whether limits.h has WORD_BIT, BOOL_WIDTH etc.], + AC_CACHE_CHECK([whether limits.h has LLONG_MAX, WORD_BIT, ULLONG_WIDTH etc.], [gl_cv_header_limits_width], [AC_COMPILE_IFELSE( [AC_LANG_PROGRAM( @@ -22,33 +22,22 @@ long long llm = LLONG_MAX; int wb = WORD_BIT; int ullw = ULLONG_WIDTH; - int bw = BOOL_WIDTH; - int bm = BOOL_MAX; - int mblm = MB_LEN_MAX; ]])], [gl_cv_header_limits_width=yes], [gl_cv_header_limits_width=no])]) - GL_GENERATE_LIMITS_H=true - AS_IF([test "$gl_cv_header_limits_width" = yes], - [AC_CACHE_CHECK([whether limits.h has SSIZE_MAX], - [gl_cv_header_limits_ssize_max], - [AC_COMPILE_IFELSE( - [AC_LANG_SOURCE( - [[#include - #ifndef SSIZE_MAX - #error "SSIZE_MAX is not defined" - #endif - ]])], - [gl_cv_header_limits_ssize_max=yes], - [gl_cv_header_limits_ssize_max=no])]) - if test "$gl_cv_header_limits_ssize_max" = yes; then - GL_GENERATE_LIMITS_H=false - fi]) + if test "$gl_cv_header_limits_width" = yes; then + LIMITS_H= + else + LIMITS_H=limits.h + fi + AC_SUBST([LIMITS_H]) + AM_CONDITIONAL([GL_GENERATE_LIMITS_H], [test -n "$LIMITS_H"]) ]) dnl Unconditionally enables the replacement of . AC_DEFUN([gl_REPLACE_LIMITS_H], [ AC_REQUIRE([gl_LIMITS_H]) - GL_GENERATE_LIMITS_H=true + LIMITS_H='limits.h' + AM_CONDITIONAL([GL_GENERATE_LIMITS_H], [test -n "$LIMITS_H"]) ]) diff -Nru mmv-2.5/m4/link.m4 mmv-2.5.1/m4/link.m4 --- mmv-2.5/m4/link.m4 2023-07-20 19:40:23.000000000 +0000 +++ mmv-2.5.1/m4/link.m4 2023-08-08 11:02:40.000000000 +0000 @@ -1,5 +1,5 @@ -# link.m4 serial 12 -dnl Copyright (C) 2009-2023 Free Software Foundation, Inc. +# link.m4 serial 11 +dnl Copyright (C) 2009-2021 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. @@ -41,8 +41,6 @@ [case "$host_os" in # Guess yes on Linux systems. linux-* | linux) gl_cv_func_link_works="guessing yes" ;; - # Guess yes on systems that emulate the Linux system calls. - midipix*) gl_cv_func_link_works="guessing yes" ;; # Guess yes on glibc systems. *-gnu* | gnu*) gl_cv_func_link_works="guessing yes" ;; # If we don't know, obey --enable-cross-guesses. diff -Nru mmv-2.5/m4/locale-fr.m4 mmv-2.5.1/m4/locale-fr.m4 --- mmv-2.5/m4/locale-fr.m4 2023-07-20 19:40:24.000000000 +0000 +++ mmv-2.5.1/m4/locale-fr.m4 1970-01-01 00:00:00.000000000 +0000 @@ -1,253 +0,0 @@ -# locale-fr.m4 serial 21 -dnl Copyright (C) 2003, 2005-2023 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 Bruno Haible. - -dnl Determine the name of a french locale with traditional encoding. -AC_DEFUN_ONCE([gt_LOCALE_FR], -[ - AC_REQUIRE([AC_CANONICAL_HOST]) - AC_REQUIRE([AM_LANGINFO_CODESET]) - AC_CACHE_CHECK([for a traditional french locale], [gt_cv_locale_fr], [ - AC_LANG_CONFTEST([AC_LANG_SOURCE([[ -#include -#include -#if HAVE_LANGINFO_CODESET -# include -#endif -#include -#include -struct tm t; -char buf[16]; -int main () { - /* On BeOS and Haiku, locales are not implemented in libc. Rather, libintl - imitates locale dependent behaviour by looking at the environment - variables, and all locales use the UTF-8 encoding. */ -#if defined __BEOS__ || defined __HAIKU__ - return 1; -#else - /* Check whether the given locale name is recognized by the system. */ -# if defined _WIN32 && !defined __CYGWIN__ - /* On native Windows, setlocale(category, "") looks at the system settings, - not at the environment variables. Also, when an encoding suffix such - as ".65001" or ".54936" is specified, it succeeds but sets the LC_CTYPE - category of the locale to "C". */ - if (setlocale (LC_ALL, getenv ("LC_ALL")) == NULL - || strcmp (setlocale (LC_CTYPE, NULL), "C") == 0) - return 1; -# else - if (setlocale (LC_ALL, "") == NULL) return 1; -# endif - /* Check whether nl_langinfo(CODESET) is nonempty and not "ASCII" or "646". - On Mac OS X 10.3.5 (Darwin 7.5) in the fr_FR locale, nl_langinfo(CODESET) - is empty, and the behaviour of Tcl 8.4 in this locale is not useful. - On OpenBSD 4.0, when an unsupported locale is specified, setlocale() - succeeds but then nl_langinfo(CODESET) is "646". In this situation, - some unit tests fail. - On MirBSD 10, when an unsupported locale is specified, setlocale() - succeeds but then nl_langinfo(CODESET) is "UTF-8". */ -# if HAVE_LANGINFO_CODESET - { - const char *cs = nl_langinfo (CODESET); - if (cs[0] == '\0' || strcmp (cs, "ASCII") == 0 || strcmp (cs, "646") == 0 - || strcmp (cs, "UTF-8") == 0) - return 1; - } -# endif -# ifdef __CYGWIN__ - /* On Cygwin, avoid locale names without encoding suffix, because the - locale_charset() function relies on the encoding suffix. Note that - LC_ALL is set on the command line. */ - if (strchr (getenv ("LC_ALL"), '.') == NULL) return 1; -# endif - /* Check whether in the abbreviation of the second month, the second - character (should be U+00E9: LATIN SMALL LETTER E WITH ACUTE) is only - one byte long. This excludes the UTF-8 encoding. */ - t.tm_year = 1975 - 1900; t.tm_mon = 2 - 1; t.tm_mday = 4; - if (strftime (buf, sizeof (buf), "%b", &t) < 3 || buf[2] != 'v') return 1; -# if !defined __BIONIC__ /* Bionic libc's 'struct lconv' is just a dummy. */ - /* Check whether the decimal separator is a comma. - On NetBSD 3.0 in the fr_FR.ISO8859-1 locale, localeconv()->decimal_point - are nl_langinfo(RADIXCHAR) are both ".". */ - if (localeconv () ->decimal_point[0] != ',') return 1; -# endif - return 0; -#endif -} - ]])]) - if AC_TRY_EVAL([ac_link]) && test -s conftest$ac_exeext; then - case "$host_os" in - # Handle native Windows specially, because there setlocale() interprets - # "ar" as "Arabic" or "Arabic_Saudi Arabia.1256", - # "fr" or "fra" as "French" or "French_France.1252", - # "ge"(!) or "deu"(!) as "German" or "German_Germany.1252", - # "ja" as "Japanese" or "Japanese_Japan.932", - # and similar. - mingw*) - # Test for the native Windows locale name. - if (LC_ALL=French_France.1252 LC_TIME= LC_CTYPE= ./conftest; exit) 2>/dev/null; then - gt_cv_locale_fr=French_France.1252 - else - # None found. - gt_cv_locale_fr=none - fi - ;; - *) - # Setting LC_ALL is not enough. Need to set LC_TIME to empty, because - # otherwise on Mac OS X 10.3.5 the LC_TIME=C from the beginning of the - # configure script would override the LC_ALL setting. Likewise for - # LC_CTYPE, which is also set at the beginning of the configure script. - # Test for the usual locale name. - if (LC_ALL=fr_FR LC_TIME= LC_CTYPE= ./conftest; exit) 2>/dev/null; then - gt_cv_locale_fr=fr_FR - else - # Test for the locale name with explicit encoding suffix. - if (LC_ALL=fr_FR.ISO-8859-1 LC_TIME= LC_CTYPE= ./conftest; exit) 2>/dev/null; then - gt_cv_locale_fr=fr_FR.ISO-8859-1 - else - # Test for the AIX, OSF/1, FreeBSD, NetBSD, OpenBSD locale name. - if (LC_ALL=fr_FR.ISO8859-1 LC_TIME= LC_CTYPE= ./conftest; exit) 2>/dev/null; then - gt_cv_locale_fr=fr_FR.ISO8859-1 - else - # Test for the HP-UX locale name. - if (LC_ALL=fr_FR.iso88591 LC_TIME= LC_CTYPE= ./conftest; exit) 2>/dev/null; then - gt_cv_locale_fr=fr_FR.iso88591 - else - # Test for the Solaris 7 locale name. - if (LC_ALL=fr LC_TIME= LC_CTYPE= ./conftest; exit) 2>/dev/null; then - gt_cv_locale_fr=fr - else - # None found. - gt_cv_locale_fr=none - fi - fi - fi - fi - fi - ;; - esac - fi - rm -fr conftest* - ]) - LOCALE_FR=$gt_cv_locale_fr - AC_SUBST([LOCALE_FR]) -]) - -dnl Determine the name of a french locale with UTF-8 encoding. -AC_DEFUN_ONCE([gt_LOCALE_FR_UTF8], -[ - AC_REQUIRE([AM_LANGINFO_CODESET]) - AC_CACHE_CHECK([for a french Unicode locale], [gt_cv_locale_fr_utf8], [ - AC_LANG_CONFTEST([AC_LANG_SOURCE([[ -#include -#include -#if HAVE_LANGINFO_CODESET -# include -#endif -#include -#include -struct tm t; -char buf[16]; -int main () { - /* On BeOS and Haiku, locales are not implemented in libc. Rather, libintl - imitates locale dependent behaviour by looking at the environment - variables, and all locales use the UTF-8 encoding. */ -#if !(defined __BEOS__ || defined __HAIKU__) - /* Check whether the given locale name is recognized by the system. */ -# if defined _WIN32 && !defined __CYGWIN__ - /* On native Windows, setlocale(category, "") looks at the system settings, - not at the environment variables. Also, when an encoding suffix such - as ".65001" or ".54936" is specified, it succeeds but sets the LC_CTYPE - category of the locale to "C". */ - if (setlocale (LC_ALL, getenv ("LC_ALL")) == NULL - || strcmp (setlocale (LC_CTYPE, NULL), "C") == 0) - return 1; -# else - if (setlocale (LC_ALL, "") == NULL) return 1; -# endif - /* Check whether nl_langinfo(CODESET) is nonempty and not "ASCII" or "646". - On Mac OS X 10.3.5 (Darwin 7.5) in the fr_FR locale, nl_langinfo(CODESET) - is empty, and the behaviour of Tcl 8.4 in this locale is not useful. - On OpenBSD 4.0, when an unsupported locale is specified, setlocale() - succeeds but then nl_langinfo(CODESET) is "646". In this situation, - some unit tests fail. */ -# if HAVE_LANGINFO_CODESET - { - const char *cs = nl_langinfo (CODESET); - if (cs[0] == '\0' || strcmp (cs, "ASCII") == 0 || strcmp (cs, "646") == 0) - return 1; - } -# endif -# ifdef __CYGWIN__ - /* On Cygwin, avoid locale names without encoding suffix, because the - locale_charset() function relies on the encoding suffix. Note that - LC_ALL is set on the command line. */ - if (strchr (getenv ("LC_ALL"), '.') == NULL) return 1; -# endif - /* Check whether in the abbreviation of the second month, the second - character (should be U+00E9: LATIN SMALL LETTER E WITH ACUTE) is - two bytes long, with UTF-8 encoding. */ - t.tm_year = 1975 - 1900; t.tm_mon = 2 - 1; t.tm_mday = 4; - if (strftime (buf, sizeof (buf), "%b", &t) < 4 - || buf[1] != (char) 0xc3 || buf[2] != (char) 0xa9 || buf[3] != 'v') - return 1; -#endif -#if !defined __BIONIC__ /* Bionic libc's 'struct lconv' is just a dummy. */ - /* Check whether the decimal separator is a comma. - On NetBSD 3.0 in the fr_FR.ISO8859-1 locale, localeconv()->decimal_point - are nl_langinfo(RADIXCHAR) are both ".". */ - if (localeconv () ->decimal_point[0] != ',') return 1; -#endif - return 0; -} - ]])]) - if AC_TRY_EVAL([ac_link]) && test -s conftest$ac_exeext; then - case "$host_os" in - # Handle native Windows specially, because there setlocale() interprets - # "ar" as "Arabic" or "Arabic_Saudi Arabia.1256", - # "fr" or "fra" as "French" or "French_France.1252", - # "ge"(!) or "deu"(!) as "German" or "German_Germany.1252", - # "ja" as "Japanese" or "Japanese_Japan.932", - # and similar. - mingw*) - # Test for the hypothetical native Windows locale name. - if (LC_ALL=French_France.65001 LC_TIME= LC_CTYPE= ./conftest; exit) 2>/dev/null; then - gt_cv_locale_fr_utf8=French_France.65001 - else - # None found. - gt_cv_locale_fr_utf8=none - fi - ;; - *) - # Setting LC_ALL is not enough. Need to set LC_TIME to empty, because - # otherwise on Mac OS X 10.3.5 the LC_TIME=C from the beginning of the - # configure script would override the LC_ALL setting. Likewise for - # LC_CTYPE, which is also set at the beginning of the configure script. - # Test for the usual locale name. - if (LC_ALL=fr_FR LC_TIME= LC_CTYPE= ./conftest; exit) 2>/dev/null; then - gt_cv_locale_fr_utf8=fr_FR - else - # Test for the locale name with explicit encoding suffix. - if (LC_ALL=fr_FR.UTF-8 LC_TIME= LC_CTYPE= ./conftest; exit) 2>/dev/null; then - gt_cv_locale_fr_utf8=fr_FR.UTF-8 - else - # Test for the Solaris 7 locale name. - if (LC_ALL=fr.UTF-8 LC_TIME= LC_CTYPE= ./conftest; exit) 2>/dev/null; then - gt_cv_locale_fr_utf8=fr.UTF-8 - else - # None found. - gt_cv_locale_fr_utf8=none - fi - fi - fi - ;; - esac - fi - rm -fr conftest* - ]) - LOCALE_FR_UTF8=$gt_cv_locale_fr_utf8 - AC_SUBST([LOCALE_FR_UTF8]) -]) diff -Nru mmv-2.5/m4/lseek.m4 mmv-2.5.1/m4/lseek.m4 --- mmv-2.5/m4/lseek.m4 2023-07-20 19:40:23.000000000 +0000 +++ mmv-2.5.1/m4/lseek.m4 2023-08-08 11:02:40.000000000 +0000 @@ -1,5 +1,5 @@ -# lseek.m4 serial 14 -dnl Copyright (C) 2007, 2009-2023 Free Software Foundation, Inc. +# lseek.m4 serial 11 +dnl Copyright (C) 2007, 2009-2021 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. @@ -17,11 +17,9 @@ dnl Native Windows. dnl The result of lseek (fd, (off_t)0, SEEK_CUR) or dnl SetFilePointer(handle, 0, NULL, FILE_CURRENT) - dnl for a pipe depends on the environment: - dnl In a Cygwin 1.5 environment it succeeds (wrong); - dnl in a Cygwin 1.7 environment it fails with a wrong errno value; - dnl in a Cygwin 2.9.0 environment it fails correctly; - dnl in a Cygwin 3.4.6 environment it succeeds again (wrong). + dnl for a pipe depends on the environment: In a Cygwin 1.5 + dnl environment it succeeds (wrong); in a Cygwin 1.7 environment + dnl it fails with a wrong errno value. gl_cv_func_lseek_pipe=no ;; *) @@ -61,7 +59,7 @@ ;; esac ]) - if test "$gl_cv_func_lseek_pipe" = no; then + if test $gl_cv_func_lseek_pipe = no; then REPLACE_LSEEK=1 AC_DEFINE([LSEEK_PIPE_BROKEN], [1], [Define to 1 if lseek does not detect pipes.]) @@ -71,30 +69,4 @@ if test $WINDOWS_64_BIT_OFF_T = 1; then REPLACE_LSEEK=1 fi - - AS_IF([test $REPLACE_LSEEK = 0], - [AC_CACHE_CHECK([whether SEEK_DATA works but is incompatible with GNU], - [gl_cv_func_lseek_works_but_incompatible], - [AC_PREPROC_IFELSE( - [AC_LANG_SOURCE( - dnl Use macOS "9999" to stand for a future fixed macOS version. - dnl See ../lib/unistd.in.h and . - [[#include - #if defined __APPLE__ && defined __MACH__ && defined SEEK_DATA - # ifdef __ENVIRONMENT_MAC_OS_X_VERSION_MIN_REQUIRED__ - # include - # endif - # if 99990000 <= MAC_OS_X_VERSION_MIN_REQUIRED - # define LSEEK_WORKS_BUT_IS_INCOMPATIBLE_WITH_GNU - # endif - #endif - #ifndef LSEEK_WORKS_BUT_IS_INCOMPATIBLE_WITH_GNU - #error "No need to work around the bug" - #endif - ]])], - [gl_cv_func_lseek_works_but_incompatible=yes], - [gl_cv_func_lseek_works_but_incompatible=no])]) - if test "$gl_cv_func_lseek_works_but_incompatible" = yes; then - REPLACE_LSEEK=1 - fi]) ]) diff -Nru mmv-2.5/m4/lstat.m4 mmv-2.5.1/m4/lstat.m4 --- mmv-2.5/m4/lstat.m4 2023-07-20 19:40:23.000000000 +0000 +++ mmv-2.5.1/m4/lstat.m4 2023-08-08 11:02:40.000000000 +0000 @@ -1,6 +1,6 @@ -# serial 34 +# serial 33 -# Copyright (C) 1997-2001, 2003-2023 Free Software Foundation, Inc. +# Copyright (C) 1997-2001, 2003-2021 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -56,9 +56,6 @@ linux-* | linux) # Guess yes on Linux systems. gl_cv_func_lstat_dereferences_slashed_symlink="guessing yes" ;; - midipix*) - # Guess yes on systems that emulate the Linux system calls. - gl_cv_func_lstat_dereferences_slashed_symlink="guessing yes" ;; *-gnu* | gnu*) # Guess yes on glibc systems. gl_cv_func_lstat_dereferences_slashed_symlink="guessing yes" ;; diff -Nru mmv-2.5/m4/malloc.m4 mmv-2.5.1/m4/malloc.m4 --- mmv-2.5/m4/malloc.m4 2023-07-20 19:40:23.000000000 +0000 +++ mmv-2.5.1/m4/malloc.m4 2023-08-08 11:02:40.000000000 +0000 @@ -1,21 +1,21 @@ -# malloc.m4 serial 29 -dnl Copyright (C) 2007, 2009-2023 Free Software Foundation, Inc. +# malloc.m4 serial 22 +dnl Copyright (C) 2007, 2009-2021 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. # This is adapted with modifications from upstream Autoconf here: -# https://git.savannah.gnu.org/cgit/autoconf.git/tree/lib/autoconf/functions.m4?id=v2.70#n949 +# https://git.savannah.gnu.org/cgit/autoconf.git/commit/?id=04be2b7a29d65d9a08e64e8e56e594c91749598c AC_DEFUN([_AC_FUNC_MALLOC_IF], [ AC_REQUIRE([AC_CANONICAL_HOST])dnl for cross-compiles - AC_CACHE_CHECK([whether malloc (0) returns nonnull], + AC_CACHE_CHECK([for GNU libc compatible malloc], [ac_cv_func_malloc_0_nonnull], [AC_RUN_IFELSE( [AC_LANG_PROGRAM( [[#include ]], - [[void *p = malloc (0); + [[char *p = malloc (0); int result = !p; free (p); return result;]]) @@ -24,152 +24,75 @@ [ac_cv_func_malloc_0_nonnull=no], [case "$host_os" in # Guess yes on platforms where we know the result. - *-gnu* | freebsd* | netbsd* | openbsd* | bitrig* \ - | gnu* | *-musl* | midipix* | midnightbsd* \ - | hpux* | solaris* | cygwin* | mingw* | msys* ) + *-gnu* | gnu* | *-musl* | freebsd* | midnightbsd* | netbsd* | openbsd* \ + | hpux* | solaris* | cygwin* | mingw*) ac_cv_func_malloc_0_nonnull="guessing yes" ;; # If we don't know, obey --enable-cross-guesses. *) ac_cv_func_malloc_0_nonnull="$gl_cross_guess_normal" ;; esac ]) ]) - AS_CASE([$ac_cv_func_malloc_0_nonnull], [*yes], [$1], [$2]) + case "$ac_cv_func_malloc_0_nonnull" in + *yes) + $1 + ;; + *) + $2 + ;; + esac ])# _AC_FUNC_MALLOC_IF # gl_FUNC_MALLOC_GNU # ------------------ -# Replace malloc if it is not compatible with GNU libc. +# Test whether 'malloc (0)' is handled like in GNU libc, and replace malloc if +# it is not. AC_DEFUN([gl_FUNC_MALLOC_GNU], [ AC_REQUIRE([gl_STDLIB_H_DEFAULTS]) - AC_REQUIRE([gl_FUNC_MALLOC_POSIX]) - REPLACE_MALLOC_FOR_MALLOC_GNU="$REPLACE_MALLOC_FOR_MALLOC_POSIX" - if test $REPLACE_MALLOC_FOR_MALLOC_GNU = 0; then - _AC_FUNC_MALLOC_IF([], [REPLACE_MALLOC_FOR_MALLOC_GNU=1]) - fi -]) - -# gl_FUNC_MALLOC_PTRDIFF -# ---------------------- -# Test whether malloc (N) reliably fails when N exceeds PTRDIFF_MAX, -# and replace malloc otherwise. -AC_DEFUN([gl_FUNC_MALLOC_PTRDIFF], -[ - AC_REQUIRE([gl_STDLIB_H_DEFAULTS]) - AC_REQUIRE([gl_CHECK_MALLOC_PTRDIFF]) - test "$gl_cv_malloc_ptrdiff" = yes || REPLACE_MALLOC_FOR_MALLOC_POSIX=1 -]) - -# Test whether malloc, realloc, calloc refuse to create objects -# larger than what can be expressed in ptrdiff_t. -# Set gl_cv_func_malloc_gnu to yes or no accordingly. -AC_DEFUN([gl_CHECK_MALLOC_PTRDIFF], -[ - AC_CACHE_CHECK([whether malloc is ptrdiff_t safe], - [gl_cv_malloc_ptrdiff], - [AC_COMPILE_IFELSE( - [AC_LANG_PROGRAM( - [[#include - ]], - [[/* 64-bit ptrdiff_t is so wide that no practical platform - can exceed it. */ - #define WIDE_PTRDIFF (PTRDIFF_MAX >> 31 >> 31 != 0) - - /* On rare machines where size_t fits in ptrdiff_t there - is no problem. */ - #define NARROW_SIZE (SIZE_MAX <= PTRDIFF_MAX) - - /* glibc 2.30 and later malloc refuses to exceed ptrdiff_t - bounds even on 32-bit platforms. We don't know which - non-glibc systems are safe. */ - #define KNOWN_SAFE (2 < __GLIBC__ + (30 <= __GLIBC_MINOR__)) - - #if WIDE_PTRDIFF || NARROW_SIZE || KNOWN_SAFE - return 0; - #else - #error "malloc might not be ptrdiff_t safe" - syntax error - #endif - ]])], - [gl_cv_malloc_ptrdiff=yes], - [gl_cv_malloc_ptrdiff=no]) + dnl _AC_FUNC_MALLOC_IF is defined in Autoconf. + _AC_FUNC_MALLOC_IF( + [AC_DEFINE([HAVE_MALLOC_GNU], [1], + [Define to 1 if your system has a GNU libc compatible 'malloc' + function, and to 0 otherwise.])], + [AC_DEFINE([HAVE_MALLOC_GNU], [0]) + REPLACE_MALLOC=1 ]) ]) # gl_FUNC_MALLOC_POSIX # -------------------- # Test whether 'malloc' is POSIX compliant (sets errno to ENOMEM when it -# fails, and doesn't mess up with ptrdiff_t overflow), and replace -# malloc if it is not. +# fails), and replace malloc if it is not. AC_DEFUN([gl_FUNC_MALLOC_POSIX], [ AC_REQUIRE([gl_STDLIB_H_DEFAULTS]) - AC_REQUIRE([gl_FUNC_MALLOC_PTRDIFF]) AC_REQUIRE([gl_CHECK_MALLOC_POSIX]) - if test "$gl_cv_func_malloc_posix" = yes; then + if test $gl_cv_func_malloc_posix = yes; then AC_DEFINE([HAVE_MALLOC_POSIX], [1], - [Define if malloc, realloc, and calloc set errno on allocation failure.]) + [Define if the 'malloc' function is POSIX compliant.]) else - REPLACE_MALLOC_FOR_MALLOC_POSIX=1 + REPLACE_MALLOC=1 fi ]) -# Test whether malloc, realloc, calloc set errno to ENOMEM on failure. +# Test whether malloc, realloc, calloc are POSIX compliant, # Set gl_cv_func_malloc_posix to yes or no accordingly. AC_DEFUN([gl_CHECK_MALLOC_POSIX], [ - AC_REQUIRE([AC_CANONICAL_HOST]) - AC_CACHE_CHECK([whether malloc, realloc, calloc set errno on failure], + AC_CACHE_CHECK([whether malloc, realloc, calloc are POSIX compliant], [gl_cv_func_malloc_posix], [ dnl It is too dangerous to try to allocate a large amount of memory: dnl some systems go to their knees when you do that. So assume that - dnl all Unix implementations of the function set errno on failure, - dnl except on those platforms where we have seen 'test-malloc-gnu', - dnl 'test-realloc-gnu', 'test-calloc-gnu' fail. - case "$host_os" in - mingw*) - gl_cv_func_malloc_posix=no ;; - irix* | solaris*) - dnl On IRIX 6.5, the three functions return NULL with errno unset - dnl when the argument is larger than PTRDIFF_MAX. - dnl On Solaris 11.3, the three functions return NULL with errno set - dnl to EAGAIN, not ENOMEM, when the argument is larger than - dnl PTRDIFF_MAX. - dnl Here is a test program: -m4_divert_push([KILL]) -#include -#include -#include -#define ptrdiff_t long -#ifndef PTRDIFF_MAX -# define PTRDIFF_MAX ((ptrdiff_t) ((1UL << (8 * sizeof (ptrdiff_t) - 1)) - 1)) -#endif - -int main () -{ - void *p; - - fprintf (stderr, "PTRDIFF_MAX = %lu\n", (unsigned long) PTRDIFF_MAX); - - errno = 0; - p = malloc ((unsigned long) PTRDIFF_MAX + 1); - fprintf (stderr, "p=%p errno=%d\n", p, errno); - - errno = 0; - p = calloc (PTRDIFF_MAX / 2 + 1, 2); - fprintf (stderr, "p=%p errno=%d\n", p, errno); - - errno = 0; - p = realloc (NULL, (unsigned long) PTRDIFF_MAX + 1); - fprintf (stderr, "p=%p errno=%d\n", p, errno); - - return 0; -} -m4_divert_pop([KILL]) - gl_cv_func_malloc_posix=no ;; - *) - gl_cv_func_malloc_posix=yes ;; - esac + dnl all Unix implementations of the function are POSIX compliant. + AC_COMPILE_IFELSE( + [AC_LANG_PROGRAM( + [[]], + [[#if defined _WIN32 && ! defined __CYGWIN__ + choke me + #endif + ]])], + [gl_cv_func_malloc_posix=yes], + [gl_cv_func_malloc_posix=no]) ]) ]) diff -Nru mmv-2.5/m4/malloca.m4 mmv-2.5.1/m4/malloca.m4 --- mmv-2.5/m4/malloca.m4 2023-07-20 19:40:23.000000000 +0000 +++ mmv-2.5.1/m4/malloca.m4 2023-08-08 11:02:40.000000000 +0000 @@ -1,5 +1,5 @@ # malloca.m4 serial 2 -dnl Copyright (C) 2003-2004, 2006-2007, 2009-2023 Free Software Foundation, +dnl Copyright (C) 2003-2004, 2006-2007, 2009-2021 Free Software Foundation, dnl Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, diff -Nru mmv-2.5/m4/manywarnings.m4 mmv-2.5.1/m4/manywarnings.m4 --- mmv-2.5/m4/manywarnings.m4 2023-07-20 19:40:24.000000000 +0000 +++ mmv-2.5.1/m4/manywarnings.m4 2023-08-08 11:02:40.000000000 +0000 @@ -1,5 +1,5 @@ -# manywarnings.m4 serial 23 -dnl Copyright (C) 2008-2023 Free Software Foundation, Inc. +# manywarnings.m4 serial 21 +dnl Copyright (C) 2008-2021 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. @@ -46,7 +46,8 @@ dnl First, check for some issues that only occur when combining multiple dnl gcc warning categories. AC_REQUIRE([AC_PROG_CC]) - AS_IF([test -n "$GCC"], [ + if test -n "$GCC"; then + dnl Check if -Wextra -Werror -Wno-missing-field-initializers is supported dnl with the current $CC $CFLAGS $CPPFLAGS. AC_CACHE_CHECK([whether -Wno-missing-field-initializers is supported], @@ -60,7 +61,7 @@ CFLAGS="$gl_save_CFLAGS" ]) - AS_IF([test "$gl_cv_cc_nomfi_supported" = yes], [ + if test "$gl_cv_cc_nomfi_supported" = yes; then dnl Now check whether -Wno-missing-field-initializers is needed dnl for the { 0, } construct. AC_CACHE_CHECK([whether -Wno-missing-field-initializers is needed], @@ -81,7 +82,7 @@ [gl_cv_cc_nomfi_needed=yes]) CFLAGS="$gl_save_CFLAGS" ]) - ]) + fi dnl Next, check if -Werror -Wuninitialized is useful with the dnl user's choice of $CFLAGS; some versions of gcc warn that it @@ -96,7 +97,8 @@ [gl_cv_cc_uninitialized_supported=no]) CFLAGS="$gl_save_CFLAGS" ]) - ]) + + fi # List all gcc warning categories. # To compare this list to your installed GCC's, run this Bash command: @@ -107,7 +109,7 @@ # <(LC_ALL=C gcc --help=warnings | sed -n 's/^ \(-[^ ]*\) .*/\1/p' | sort) $1= - for gl_manywarn_item in -fanalyzer -fstrict-flex-arrays \ + for gl_manywarn_item in -fanalyzer -fno-common \ -Wall \ -Warith-conversion \ -Wbad-function-cast \ @@ -135,7 +137,6 @@ -Wpointer-arith \ -Wshadow \ -Wstack-protector \ - -Wstrict-flex-arrays \ -Wstrict-overflow \ -Wstrict-prototypes \ -Wsuggest-attribute=cold \ @@ -166,30 +167,23 @@ # them here so that the above 'comm' command doesn't report a false match. gl_AS_VAR_APPEND([$1], [' -Warray-bounds=2']) gl_AS_VAR_APPEND([$1], [' -Wattribute-alias=2']) - gl_AS_VAR_APPEND([$1], [' -Wbidi-chars=any,ucn']) gl_AS_VAR_APPEND([$1], [' -Wformat-overflow=2']) gl_AS_VAR_APPEND([$1], [' -Wformat=2']) gl_AS_VAR_APPEND([$1], [' -Wformat-truncation=2']) gl_AS_VAR_APPEND([$1], [' -Wimplicit-fallthrough=5']) gl_AS_VAR_APPEND([$1], [' -Wshift-overflow=2']) - gl_AS_VAR_APPEND([$1], [' -Wuse-after-free=3']) gl_AS_VAR_APPEND([$1], [' -Wunused-const-variable=2']) gl_AS_VAR_APPEND([$1], [' -Wvla-larger-than=4031']) # These are needed for older GCC versions. - if test -n "$GCC" && gl_gcc_version=`($CC --version) 2>/dev/null`; then - case $gl_gcc_version in + if test -n "$GCC"; then + case `($CC --version) 2>/dev/null` in 'gcc (GCC) '[[0-3]].* | \ 'gcc (GCC) '4.[[0-7]].*) gl_AS_VAR_APPEND([$1], [' -fdiagnostics-show-option']) gl_AS_VAR_APPEND([$1], [' -funit-at-a-time']) ;; esac - case $gl_gcc_version in - 'gcc (GCC) '[[0-9]].*) - gl_AS_VAR_APPEND([$1], [' -fno-common']) - ;; - esac fi # Disable specific options as needed. @@ -201,9 +195,15 @@ gl_AS_VAR_APPEND([$1], [' -Wno-uninitialized']) fi - # This warning have too many false alarms in GCC 11.2.1. - # https://gcc.gnu.org/bugzilla/show_bug.cgi?id=101713 + # Some warnings have too many false alarms in GCC 10.1. + # https://gcc.gnu.org/bugzilla/show_bug.cgi?id=93695 + gl_AS_VAR_APPEND([$1], [' -Wno-analyzer-double-free']) + # https://gcc.gnu.org/bugzilla/show_bug.cgi?id=94458 gl_AS_VAR_APPEND([$1], [' -Wno-analyzer-malloc-leak']) + # https://gcc.gnu.org/bugzilla/show_bug.cgi?id=94851 + gl_AS_VAR_APPEND([$1], [' -Wno-analyzer-null-dereference']) + # https://gcc.gnu.org/bugzilla/show_bug.cgi?id=95758 + gl_AS_VAR_APPEND([$1], [' -Wno-analyzer-use-after-free']) AC_LANG_POP([C]) ]) diff -Nru mmv-2.5/m4/math_h.m4 mmv-2.5.1/m4/math_h.m4 --- mmv-2.5/m4/math_h.m4 2023-07-20 19:40:23.000000000 +0000 +++ mmv-2.5.1/m4/math_h.m4 2023-08-08 11:02:40.000000000 +0000 @@ -1,10 +1,10 @@ -# math_h.m4 serial 125 -dnl Copyright (C) 2007-2023 Free Software Foundation, Inc. +# math_h.m4 serial 122 +dnl Copyright (C) 2007-2021 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_ONCE([gl_MATH_H], +AC_DEFUN([gl_MATH_H], [ AC_REQUIRE([gl_MATH_H_DEFAULTS]) gl_CHECK_NEXT_HEADERS([math.h]) @@ -53,134 +53,119 @@ tanf tanl tanhf trunc truncf truncl]) ]) -# gl_MATH_MODULE_INDICATOR([modulename]) -# sets the shell variable that indicates the presence of the given module -# to a C preprocessor expression that will evaluate to 1. -# This macro invocation must not occur in macros that are AC_REQUIREd. AC_DEFUN([gl_MATH_MODULE_INDICATOR], [ - dnl Ensure to expand the default settings once only. - gl_MATH_H_REQUIRE_DEFAULTS + dnl Use AC_REQUIRE here, so that the default settings are expanded once only. + AC_REQUIRE([gl_MATH_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]) ]) -# Initializes the default values for AC_SUBSTed shell variables. -# This macro must not be AC_REQUIREd. It must only be invoked, and only -# outside of macros or in macros that are not AC_REQUIREd. -AC_DEFUN([gl_MATH_H_REQUIRE_DEFAULTS], -[ - m4_defun(GL_MODULE_INDICATOR_PREFIX[_MATH_H_MODULE_INDICATOR_DEFAULTS], [ - gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_ACOSF]) - gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_ACOSL]) - gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_ASINF]) - gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_ASINL]) - gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_ATANF]) - gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_ATANL]) - gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_ATAN2F]) - gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_CBRT]) - gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_CBRTF]) - gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_CBRTL]) - gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_CEIL]) - gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_CEILF]) - gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_CEILL]) - gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_COPYSIGN]) - gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_COPYSIGNF]) - gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_COPYSIGNL]) - gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_COSF]) - gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_COSL]) - gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_COSHF]) - gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_EXPF]) - gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_EXPL]) - gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_EXP2]) - gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_EXP2F]) - gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_EXP2L]) - gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_EXPM1]) - gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_EXPM1F]) - gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_EXPM1L]) - gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_FABSF]) - gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_FABSL]) - gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_FLOOR]) - gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_FLOORF]) - gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_FLOORL]) - gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_FMA]) - gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_FMAF]) - gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_FMAL]) - gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_FMOD]) - gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_FMODF]) - gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_FMODL]) - gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_FREXPF]) - gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_FREXP]) - gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_FREXPL]) - gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_HYPOT]) - gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_HYPOTF]) - gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_HYPOTL]) - gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_ILOGB]) - gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_ILOGBF]) - gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_ILOGBL]) - gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_ISFINITE]) - gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_ISINF]) - gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_ISNAN]) - gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_ISNANF]) - gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_ISNAND]) - gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_ISNANL]) - gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_LDEXPF]) - gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_LDEXPL]) - gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_LOG]) - gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_LOGF]) - gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_LOGL]) - gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_LOG10]) - gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_LOG10F]) - gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_LOG10L]) - gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_LOG1P]) - gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_LOG1PF]) - gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_LOG1PL]) - gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_LOG2]) - gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_LOG2F]) - gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_LOG2L]) - gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_LOGB]) - gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_LOGBF]) - gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_LOGBL]) - gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MODF]) - gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MODFF]) - gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MODFL]) - gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_POWF]) - gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_REMAINDER]) - gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_REMAINDERF]) - gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_REMAINDERL]) - gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_RINT]) - gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_RINTF]) - gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_RINTL]) - gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_ROUND]) - gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_ROUNDF]) - gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_ROUNDL]) - gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_SIGNBIT]) - gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_SINF]) - gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_SINL]) - gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_SINHF]) - gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_SQRTF]) - gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_SQRTL]) - gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_TANF]) - gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_TANL]) - gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_TANHF]) - gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_TRUNC]) - gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_TRUNCF]) - gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_TRUNCL]) - dnl Support Microsoft deprecated alias function names by default. - gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MDA_J0], [1]) - gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MDA_J1], [1]) - gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MDA_JN], [1]) - gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MDA_Y0], [1]) - gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MDA_Y1], [1]) - gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MDA_YN], [1]) - ]) - m4_require(GL_MODULE_INDICATOR_PREFIX[_MATH_H_MODULE_INDICATOR_DEFAULTS]) - AC_REQUIRE([gl_MATH_H_DEFAULTS]) -]) - AC_DEFUN([gl_MATH_H_DEFAULTS], [ + GNULIB_ACOSF=0; AC_SUBST([GNULIB_ACOSF]) + GNULIB_ACOSL=0; AC_SUBST([GNULIB_ACOSL]) + GNULIB_ASINF=0; AC_SUBST([GNULIB_ASINF]) + GNULIB_ASINL=0; AC_SUBST([GNULIB_ASINL]) + GNULIB_ATANF=0; AC_SUBST([GNULIB_ATANF]) + GNULIB_ATANL=0; AC_SUBST([GNULIB_ATANL]) + GNULIB_ATAN2F=0; AC_SUBST([GNULIB_ATAN2F]) + GNULIB_CBRT=0; AC_SUBST([GNULIB_CBRT]) + GNULIB_CBRTF=0; AC_SUBST([GNULIB_CBRTF]) + GNULIB_CBRTL=0; AC_SUBST([GNULIB_CBRTL]) + GNULIB_CEIL=0; AC_SUBST([GNULIB_CEIL]) + GNULIB_CEILF=0; AC_SUBST([GNULIB_CEILF]) + GNULIB_CEILL=0; AC_SUBST([GNULIB_CEILL]) + GNULIB_COPYSIGN=0; AC_SUBST([GNULIB_COPYSIGN]) + GNULIB_COPYSIGNF=0; AC_SUBST([GNULIB_COPYSIGNF]) + GNULIB_COPYSIGNL=0; AC_SUBST([GNULIB_COPYSIGNL]) + GNULIB_COSF=0; AC_SUBST([GNULIB_COSF]) + GNULIB_COSL=0; AC_SUBST([GNULIB_COSL]) + GNULIB_COSHF=0; AC_SUBST([GNULIB_COSHF]) + GNULIB_EXPF=0; AC_SUBST([GNULIB_EXPF]) + GNULIB_EXPL=0; AC_SUBST([GNULIB_EXPL]) + GNULIB_EXP2=0; AC_SUBST([GNULIB_EXP2]) + GNULIB_EXP2F=0; AC_SUBST([GNULIB_EXP2F]) + GNULIB_EXP2L=0; AC_SUBST([GNULIB_EXP2L]) + GNULIB_EXPM1=0; AC_SUBST([GNULIB_EXPM1]) + GNULIB_EXPM1F=0; AC_SUBST([GNULIB_EXPM1F]) + GNULIB_EXPM1L=0; AC_SUBST([GNULIB_EXPM1L]) + GNULIB_FABSF=0; AC_SUBST([GNULIB_FABSF]) + GNULIB_FABSL=0; AC_SUBST([GNULIB_FABSL]) + GNULIB_FLOOR=0; AC_SUBST([GNULIB_FLOOR]) + GNULIB_FLOORF=0; AC_SUBST([GNULIB_FLOORF]) + GNULIB_FLOORL=0; AC_SUBST([GNULIB_FLOORL]) + GNULIB_FMA=0; AC_SUBST([GNULIB_FMA]) + GNULIB_FMAF=0; AC_SUBST([GNULIB_FMAF]) + GNULIB_FMAL=0; AC_SUBST([GNULIB_FMAL]) + GNULIB_FMOD=0; AC_SUBST([GNULIB_FMOD]) + GNULIB_FMODF=0; AC_SUBST([GNULIB_FMODF]) + GNULIB_FMODL=0; AC_SUBST([GNULIB_FMODL]) + GNULIB_FREXPF=0; AC_SUBST([GNULIB_FREXPF]) + GNULIB_FREXP=0; AC_SUBST([GNULIB_FREXP]) + GNULIB_FREXPL=0; AC_SUBST([GNULIB_FREXPL]) + GNULIB_HYPOT=0; AC_SUBST([GNULIB_HYPOT]) + GNULIB_HYPOTF=0; AC_SUBST([GNULIB_HYPOTF]) + GNULIB_HYPOTL=0; AC_SUBST([GNULIB_HYPOTL]) + GNULIB_ILOGB=0; AC_SUBST([GNULIB_ILOGB]) + GNULIB_ILOGBF=0; AC_SUBST([GNULIB_ILOGBF]) + GNULIB_ILOGBL=0; AC_SUBST([GNULIB_ILOGBL]) + GNULIB_ISFINITE=0; AC_SUBST([GNULIB_ISFINITE]) + GNULIB_ISINF=0; AC_SUBST([GNULIB_ISINF]) + GNULIB_ISNAN=0; AC_SUBST([GNULIB_ISNAN]) + GNULIB_ISNANF=0; AC_SUBST([GNULIB_ISNANF]) + GNULIB_ISNAND=0; AC_SUBST([GNULIB_ISNAND]) + GNULIB_ISNANL=0; AC_SUBST([GNULIB_ISNANL]) + GNULIB_LDEXPF=0; AC_SUBST([GNULIB_LDEXPF]) + GNULIB_LDEXPL=0; AC_SUBST([GNULIB_LDEXPL]) + GNULIB_LOG=0; AC_SUBST([GNULIB_LOG]) + GNULIB_LOGF=0; AC_SUBST([GNULIB_LOGF]) + GNULIB_LOGL=0; AC_SUBST([GNULIB_LOGL]) + GNULIB_LOG10=0; AC_SUBST([GNULIB_LOG10]) + GNULIB_LOG10F=0; AC_SUBST([GNULIB_LOG10F]) + GNULIB_LOG10L=0; AC_SUBST([GNULIB_LOG10L]) + GNULIB_LOG1P=0; AC_SUBST([GNULIB_LOG1P]) + GNULIB_LOG1PF=0; AC_SUBST([GNULIB_LOG1PF]) + GNULIB_LOG1PL=0; AC_SUBST([GNULIB_LOG1PL]) + GNULIB_LOG2=0; AC_SUBST([GNULIB_LOG2]) + GNULIB_LOG2F=0; AC_SUBST([GNULIB_LOG2F]) + GNULIB_LOG2L=0; AC_SUBST([GNULIB_LOG2L]) + GNULIB_LOGB=0; AC_SUBST([GNULIB_LOGB]) + GNULIB_LOGBF=0; AC_SUBST([GNULIB_LOGBF]) + GNULIB_LOGBL=0; AC_SUBST([GNULIB_LOGBL]) + GNULIB_MODF=0; AC_SUBST([GNULIB_MODF]) + GNULIB_MODFF=0; AC_SUBST([GNULIB_MODFF]) + GNULIB_MODFL=0; AC_SUBST([GNULIB_MODFL]) + GNULIB_POWF=0; AC_SUBST([GNULIB_POWF]) + GNULIB_REMAINDER=0; AC_SUBST([GNULIB_REMAINDER]) + GNULIB_REMAINDERF=0; AC_SUBST([GNULIB_REMAINDERF]) + GNULIB_REMAINDERL=0; AC_SUBST([GNULIB_REMAINDERL]) + GNULIB_RINT=0; AC_SUBST([GNULIB_RINT]) + GNULIB_RINTF=0; AC_SUBST([GNULIB_RINTF]) + GNULIB_RINTL=0; AC_SUBST([GNULIB_RINTL]) + GNULIB_ROUND=0; AC_SUBST([GNULIB_ROUND]) + GNULIB_ROUNDF=0; AC_SUBST([GNULIB_ROUNDF]) + GNULIB_ROUNDL=0; AC_SUBST([GNULIB_ROUNDL]) + GNULIB_SIGNBIT=0; AC_SUBST([GNULIB_SIGNBIT]) + GNULIB_SINF=0; AC_SUBST([GNULIB_SINF]) + GNULIB_SINL=0; AC_SUBST([GNULIB_SINL]) + GNULIB_SINHF=0; AC_SUBST([GNULIB_SINHF]) + GNULIB_SQRTF=0; AC_SUBST([GNULIB_SQRTF]) + GNULIB_SQRTL=0; AC_SUBST([GNULIB_SQRTL]) + GNULIB_TANF=0; AC_SUBST([GNULIB_TANF]) + GNULIB_TANL=0; AC_SUBST([GNULIB_TANL]) + GNULIB_TANHF=0; AC_SUBST([GNULIB_TANHF]) + GNULIB_TRUNC=0; AC_SUBST([GNULIB_TRUNC]) + GNULIB_TRUNCF=0; AC_SUBST([GNULIB_TRUNCF]) + GNULIB_TRUNCL=0; AC_SUBST([GNULIB_TRUNCL]) + dnl Support Microsoft deprecated alias function names by default. + GNULIB_MDA_J0=1; AC_SUBST([GNULIB_MDA_J0]) + GNULIB_MDA_J1=1; AC_SUBST([GNULIB_MDA_J1]) + GNULIB_MDA_JN=1; AC_SUBST([GNULIB_MDA_JN]) + GNULIB_MDA_Y0=1; AC_SUBST([GNULIB_MDA_Y0]) + GNULIB_MDA_Y1=1; AC_SUBST([GNULIB_MDA_Y1]) + GNULIB_MDA_YN=1; AC_SUBST([GNULIB_MDA_YN]) dnl Assume proper GNU behavior unless another module says otherwise. HAVE_ACOSF=1; AC_SUBST([HAVE_ACOSF]) HAVE_ACOSL=1; AC_SUBST([HAVE_ACOSL]) diff -Nru mmv-2.5/m4/memchr.m4 mmv-2.5.1/m4/memchr.m4 --- mmv-2.5/m4/memchr.m4 2023-07-20 19:40:23.000000000 +0000 +++ mmv-2.5.1/m4/memchr.m4 2023-08-08 11:02:40.000000000 +0000 @@ -1,5 +1,5 @@ -# memchr.m4 serial 18 -dnl Copyright (C) 2002-2004, 2009-2023 Free Software Foundation, Inc. +# memchr.m4 serial 17 +dnl Copyright (C) 2002-2004, 2009-2021 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. @@ -13,7 +13,7 @@ AC_CHECK_HEADERS_ONCE([sys/mman.h]) AC_CHECK_FUNCS_ONCE([mprotect]) - AC_REQUIRE([gl_STRING_H_DEFAULTS]) + AC_REQUIRE([gl_HEADER_STRING_H_DEFAULTS]) # Detect platform-specific bugs in some versions of glibc: # memchr should not dereference anything with length 0 # https://bugzilla.redhat.com/show_bug.cgi?id=499689 diff -Nru mmv-2.5/m4/mempcpy.m4 mmv-2.5.1/m4/mempcpy.m4 --- mmv-2.5/m4/mempcpy.m4 2023-07-20 19:40:23.000000000 +0000 +++ mmv-2.5.1/m4/mempcpy.m4 2023-08-08 11:02:40.000000000 +0000 @@ -1,5 +1,5 @@ -# mempcpy.m4 serial 14 -dnl Copyright (C) 2003-2004, 2006-2007, 2009-2023 Free Software Foundation, +# mempcpy.m4 serial 11 +dnl Copyright (C) 2003-2004, 2006-2007, 2009-2021 Free Software Foundation, dnl Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, @@ -13,13 +13,10 @@ dnl The mempcpy() declaration in lib/string.in.h uses 'restrict'. AC_REQUIRE([AC_C_RESTRICT]) - AC_REQUIRE([gl_STRING_H_DEFAULTS]) - gl_CHECK_FUNCS_ANDROID([mempcpy], [[#include ]]) + AC_REQUIRE([gl_HEADER_STRING_H_DEFAULTS]) + AC_CHECK_FUNCS([mempcpy]) if test $ac_cv_func_mempcpy = no; then HAVE_MEMPCPY=0 - case "$gl_cv_onwards_func_mempcpy" in - future*) REPLACE_MEMPCPY=1 ;; - esac fi ]) diff -Nru mmv-2.5/m4/minmax.m4 mmv-2.5.1/m4/minmax.m4 --- mmv-2.5/m4/minmax.m4 2023-07-20 19:40:23.000000000 +0000 +++ mmv-2.5.1/m4/minmax.m4 2023-08-08 11:02:40.000000000 +0000 @@ -1,5 +1,5 @@ # minmax.m4 serial 4 -dnl Copyright (C) 2005, 2009-2023 Free Software Foundation, Inc. +dnl Copyright (C) 2005, 2009-2021 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 -Nru mmv-2.5/m4/mmap-anon.m4 mmv-2.5.1/m4/mmap-anon.m4 --- mmv-2.5/m4/mmap-anon.m4 2023-07-20 19:40:23.000000000 +0000 +++ mmv-2.5.1/m4/mmap-anon.m4 2023-08-08 11:02:40.000000000 +0000 @@ -1,5 +1,5 @@ # mmap-anon.m4 serial 12 -dnl Copyright (C) 2005, 2007, 2009-2023 Free Software Foundation, Inc. +dnl Copyright (C) 2005, 2007, 2009-2021 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 -Nru mmv-2.5/m4/mode_t.m4 mmv-2.5.1/m4/mode_t.m4 --- mmv-2.5/m4/mode_t.m4 2023-07-20 19:40:23.000000000 +0000 +++ mmv-2.5.1/m4/mode_t.m4 2023-08-08 11:02:40.000000000 +0000 @@ -1,5 +1,5 @@ # mode_t.m4 serial 2 -dnl Copyright (C) 2009-2023 Free Software Foundation, Inc. +dnl Copyright (C) 2009-2021 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 -Nru mmv-2.5/m4/msvc-inval.m4 mmv-2.5.1/m4/msvc-inval.m4 --- mmv-2.5/m4/msvc-inval.m4 2023-07-20 19:40:23.000000000 +0000 +++ mmv-2.5.1/m4/msvc-inval.m4 2023-08-08 11:02:40.000000000 +0000 @@ -1,5 +1,5 @@ # msvc-inval.m4 serial 1 -dnl Copyright (C) 2011-2023 Free Software Foundation, Inc. +dnl Copyright (C) 2011-2021 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 -Nru mmv-2.5/m4/msvc-nothrow.m4 mmv-2.5.1/m4/msvc-nothrow.m4 --- mmv-2.5/m4/msvc-nothrow.m4 2023-07-20 19:40:23.000000000 +0000 +++ mmv-2.5.1/m4/msvc-nothrow.m4 2023-08-08 11:02:40.000000000 +0000 @@ -1,5 +1,5 @@ # msvc-nothrow.m4 serial 1 -dnl Copyright (C) 2011-2023 Free Software Foundation, Inc. +dnl Copyright (C) 2011-2021 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 -Nru mmv-2.5/m4/multiarch.m4 mmv-2.5.1/m4/multiarch.m4 --- mmv-2.5/m4/multiarch.m4 2023-07-20 19:40:23.000000000 +0000 +++ mmv-2.5.1/m4/multiarch.m4 2023-08-08 11:02:40.000000000 +0000 @@ -1,5 +1,5 @@ # multiarch.m4 serial 9 -dnl Copyright (C) 2008-2023 Free Software Foundation, Inc. +dnl Copyright (C) 2008-2021 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 -Nru mmv-2.5/m4/musl.m4 mmv-2.5.1/m4/musl.m4 --- mmv-2.5/m4/musl.m4 2023-07-20 19:40:23.000000000 +0000 +++ mmv-2.5.1/m4/musl.m4 1970-01-01 00:00:00.000000000 +0000 @@ -1,20 +0,0 @@ -# musl.m4 serial 4 -dnl Copyright (C) 2019-2023 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. - -# Test for musl libc, despite the musl libc authors don't like it -# -# . -# From Bruno Haible. - -AC_DEFUN_ONCE([gl_MUSL_LIBC], -[ - AC_REQUIRE([AC_CANONICAL_HOST]) - case "$host_os" in - *-musl* | midipix*) - AC_DEFINE([MUSL_LIBC], [1], [Define to 1 on musl libc.]) - ;; - esac -]) diff -Nru mmv-2.5/m4/nocrash.m4 mmv-2.5.1/m4/nocrash.m4 --- mmv-2.5/m4/nocrash.m4 2023-07-20 19:40:23.000000000 +0000 +++ mmv-2.5.1/m4/nocrash.m4 2023-08-08 11:02:40.000000000 +0000 @@ -1,5 +1,5 @@ # nocrash.m4 serial 5 -dnl Copyright (C) 2005, 2009-2023 Free Software Foundation, Inc. +dnl Copyright (C) 2005, 2009-2021 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 -Nru mmv-2.5/m4/off_t.m4 mmv-2.5.1/m4/off_t.m4 --- mmv-2.5/m4/off_t.m4 2023-07-20 19:40:23.000000000 +0000 +++ mmv-2.5.1/m4/off_t.m4 2023-08-08 11:02:40.000000000 +0000 @@ -1,5 +1,5 @@ # off_t.m4 serial 1 -dnl Copyright (C) 2012-2023 Free Software Foundation, Inc. +dnl Copyright (C) 2012-2021 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 -Nru mmv-2.5/m4/open-cloexec.m4 mmv-2.5.1/m4/open-cloexec.m4 --- mmv-2.5/m4/open-cloexec.m4 2023-07-20 19:40:23.000000000 +0000 +++ mmv-2.5.1/m4/open-cloexec.m4 2023-08-08 11:02:40.000000000 +0000 @@ -1,6 +1,6 @@ # Test whether O_CLOEXEC is defined. -dnl Copyright 2017-2023 Free Software Foundation, Inc. +dnl Copyright 2017-2021 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 -Nru mmv-2.5/m4/open-slash.m4 mmv-2.5.1/m4/open-slash.m4 --- mmv-2.5/m4/open-slash.m4 2023-07-20 19:40:23.000000000 +0000 +++ mmv-2.5.1/m4/open-slash.m4 2023-08-08 11:02:40.000000000 +0000 @@ -1,5 +1,5 @@ # open-slash.m4 serial 2 -dnl Copyright (C) 2007-2023 Free Software Foundation, Inc. +dnl Copyright (C) 2007-2021 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 -Nru mmv-2.5/m4/open.m4 mmv-2.5.1/m4/open.m4 --- mmv-2.5/m4/open.m4 2023-07-20 19:40:23.000000000 +0000 +++ mmv-2.5.1/m4/open.m4 2023-08-08 11:02:40.000000000 +0000 @@ -1,5 +1,5 @@ # open.m4 serial 15 -dnl Copyright (C) 2007-2023 Free Software Foundation, Inc. +dnl Copyright (C) 2007-2021 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 -Nru mmv-2.5/m4/pathmax.m4 mmv-2.5.1/m4/pathmax.m4 --- mmv-2.5/m4/pathmax.m4 2023-07-20 19:40:23.000000000 +0000 +++ mmv-2.5.1/m4/pathmax.m4 2023-08-08 11:02:40.000000000 +0000 @@ -1,5 +1,5 @@ # pathmax.m4 serial 11 -dnl Copyright (C) 2002-2003, 2005-2006, 2009-2023 Free Software Foundation, +dnl Copyright (C) 2002-2003, 2005-2006, 2009-2021 Free Software Foundation, dnl Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, diff -Nru mmv-2.5/m4/printf-frexp.m4 mmv-2.5.1/m4/printf-frexp.m4 --- mmv-2.5/m4/printf-frexp.m4 2023-07-20 19:40:23.000000000 +0000 +++ mmv-2.5.1/m4/printf-frexp.m4 2023-08-08 11:02:40.000000000 +0000 @@ -1,5 +1,5 @@ # printf-frexp.m4 serial 5 -dnl Copyright (C) 2007, 2009-2023 Free Software Foundation, Inc. +dnl Copyright (C) 2007, 2009-2021 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 -Nru mmv-2.5/m4/printf-frexpl.m4 mmv-2.5.1/m4/printf-frexpl.m4 --- mmv-2.5/m4/printf-frexpl.m4 2023-07-20 19:40:23.000000000 +0000 +++ mmv-2.5.1/m4/printf-frexpl.m4 2023-08-08 11:02:40.000000000 +0000 @@ -1,5 +1,5 @@ # printf-frexpl.m4 serial 10 -dnl Copyright (C) 2007, 2009-2023 Free Software Foundation, Inc. +dnl Copyright (C) 2007, 2009-2021 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 -Nru mmv-2.5/m4/printf.m4 mmv-2.5.1/m4/printf.m4 --- mmv-2.5/m4/printf.m4 2023-07-20 19:40:24.000000000 +0000 +++ mmv-2.5.1/m4/printf.m4 2023-08-08 11:02:40.000000000 +0000 @@ -1,5 +1,5 @@ -# printf.m4 serial 82 -dnl Copyright (C) 2003, 2007-2023 Free Software Foundation, Inc. +# printf.m4 serial 72 +dnl Copyright (C) 2003, 2007-2021 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. @@ -63,7 +63,7 @@ # Guess yes on glibc systems. *-gnu* | gnu*) gl_cv_func_printf_sizes_c99="guessing yes";; # Guess yes on musl systems. - *-musl* | midipix*) gl_cv_func_printf_sizes_c99="guessing yes";; + *-musl*) gl_cv_func_printf_sizes_c99="guessing yes";; # Guess yes on FreeBSD >= 5. freebsd[1-4].*) gl_cv_func_printf_sizes_c99="guessing no";; freebsd* | kfreebsd*) gl_cv_func_printf_sizes_c99="guessing yes";; @@ -101,92 +101,6 @@ ]) ]) -dnl Test whether the *printf family of functions supports the 'w8', 'w16', -dnl 'w32', 'w64', 'wf8', 'wf16', 'wf32', 'wf64' size specifiers. (ISO C23) -dnl Result is gl_cv_func_printf_sizes_c23. - -AC_DEFUN([gl_PRINTF_SIZES_C23], -[ - AC_REQUIRE([AC_PROG_CC]) - AC_REQUIRE([gl_AC_HEADER_STDINT_H]) - AC_REQUIRE([gl_AC_HEADER_INTTYPES_H]) - AC_REQUIRE([AC_CANONICAL_HOST]) dnl for cross-compiles - AC_CACHE_CHECK([whether printf supports size specifiers as in C23], - [gl_cv_func_printf_sizes_c23], - [ - AC_RUN_IFELSE( - [AC_LANG_SOURCE([[ -#include -#include -#include -#include -#if HAVE_STDINT_H_WITH_UINTMAX -# include -#endif -#if HAVE_INTTYPES_H_WITH_UINTMAX -# include -#endif -static char buf[100]; -int main () -{ - int result = 0; - buf[0] = '\0'; - if (sprintf (buf, "%w8u %d", (uint8_t) 123, 33, 44, 55) < 0 - || strcmp (buf, "123 33") != 0) - result |= 1; - buf[0] = '\0'; - if (sprintf (buf, "%wf8u %d", (uint_fast8_t) 123, 33, 44, 55) < 0 - || strcmp (buf, "123 33") != 0) - result |= 1; - buf[0] = '\0'; - if (sprintf (buf, "%w16u %d", (uint16_t) 12345, 33, 44, 55) < 0 - || strcmp (buf, "12345 33") != 0) - result |= 2; - buf[0] = '\0'; - if (sprintf (buf, "%wf16u %d", (uint_fast16_t) 12345, 33, 44, 55) < 0 - || strcmp (buf, "12345 33") != 0) - result |= 2; - buf[0] = '\0'; - if (sprintf (buf, "%w32u %d", (uint32_t) 12345671, 33, 44, 55) < 0 - || strcmp (buf, "12345671 33") != 0) - result |= 4; - buf[0] = '\0'; - if (sprintf (buf, "%wf32u %d", (uint_fast32_t) 12345671, 33, 44, 55) < 0 - || strcmp (buf, "12345671 33") != 0) - result |= 4; -#if HAVE_STDINT_H_WITH_UINTMAX || HAVE_INTTYPES_H_WITH_UINTMAX - buf[0] = '\0'; - if (sprintf (buf, "%w64u %d", (uint64_t) 12345671, 33, 44, 55) < 0 - || strcmp (buf, "12345671 33") != 0) - result |= 8; - buf[0] = '\0'; - if (sprintf (buf, "%wf64u %d", (uint_fast64_t) 12345671, 33, 44, 55) < 0 - || strcmp (buf, "12345671 33") != 0) - result |= 8; -#else - result |= 8; -#endif - return result; -}]])], - [gl_cv_func_printf_sizes_c23=yes], - [gl_cv_func_printf_sizes_c23=no], - [ - case "$host_os" in - # Guess no on glibc systems. - *-gnu* | gnu*) gl_cv_func_printf_sizes_c23="guessing no";; - # Guess no on musl systems. - *-musl* | midipix*) gl_cv_func_printf_sizes_c23="guessing no";; - # Guess no on Android. - linux*-android*) gl_cv_func_printf_sizes_c23="guessing no";; - # Guess no on native Windows. - mingw*) gl_cv_func_printf_sizes_c23="guessing no";; - # If we don't know, obey --enable-cross-guesses. - *) gl_cv_func_printf_sizes_c23="$gl_cross_guess_normal";; - esac - ]) - ]) -]) - dnl Test whether the *printf family of functions supports 'long double' dnl arguments together with the 'L' size specifier. (ISO C99, POSIX:2001) dnl Result is gl_cv_func_printf_long_double. @@ -330,7 +244,7 @@ # Guess yes on glibc systems. *-gnu* | gnu*) gl_cv_func_printf_infinite="guessing yes";; # Guess yes on musl systems. - *-musl* | midipix*) gl_cv_func_printf_infinite="guessing yes";; + *-musl*) gl_cv_func_printf_infinite="guessing yes";; # Guess yes on FreeBSD >= 6. freebsd[1-5].*) gl_cv_func_printf_infinite="guessing no";; freebsd* | kfreebsd*) gl_cv_func_printf_infinite="guessing yes";; @@ -553,7 +467,7 @@ # Guess yes on glibc systems. *-gnu* | gnu*) gl_cv_func_printf_infinite_long_double="guessing yes";; # Guess yes on musl systems. - *-musl* | midipix*) gl_cv_func_printf_infinite_long_double="guessing yes";; + *-musl*) gl_cv_func_printf_infinite_long_double="guessing yes";; # Guess yes on FreeBSD >= 6. freebsd[1-5].*) gl_cv_func_printf_infinite_long_double="guessing no";; freebsd* | kfreebsd*) gl_cv_func_printf_infinite_long_double="guessing yes";; @@ -623,7 +537,7 @@ && strcmp (buf, "-0X6.488P-1 33") != 0 && strcmp (buf, "-0XC.91P-2 33") != 0)) result |= 2; - /* This catches a FreeBSD 13.0 bug: it doesn't round. */ + /* This catches a FreeBSD 6.1 bug: it doesn't round. */ if (sprintf (buf, "%.2a %d", 1.51, 33, 44, 55) < 0 || (strcmp (buf, "0x1.83p+0 33") != 0 && strcmp (buf, "0x3.05p-1 33") != 0 @@ -677,7 +591,7 @@ [gl_cv_func_printf_directive_a="guessing no"]) ;; # Guess yes on musl systems. - *-musl* | midipix*) gl_cv_func_printf_directive_a="guessing yes";; + *-musl*) gl_cv_func_printf_directive_a="guessing yes";; # Guess no on Android. linux*-android*) gl_cv_func_printf_directive_a="guessing no";; # Guess no on native Windows. @@ -689,116 +603,6 @@ ]) ]) -dnl Test whether the *printf family of functions supports the 'b' conversion -dnl specifier for binary output of integers. -dnl (ISO C23) -dnl Result is gl_cv_func_printf_directive_b. - -AC_DEFUN([gl_PRINTF_DIRECTIVE_B], -[ - AC_REQUIRE([AC_PROG_CC]) - AC_REQUIRE([AC_CANONICAL_HOST]) dnl for cross-compiles - AC_CACHE_CHECK([whether printf supports the 'b' directive], - [gl_cv_func_printf_directive_b], - [ - AC_RUN_IFELSE( - [AC_LANG_SOURCE([[ -#include -#include -static char buf[100]; -int main () -{ - int result = 0; - if (sprintf (buf, "%b %d", 12345, 33, 44, 55) < 0 - || strcmp (buf, "11000000111001 33") != 0) - result |= 1; - return result; -}]])], - [gl_cv_func_printf_directive_b=yes], - [gl_cv_func_printf_directive_b=no], - [ - case "$host_os" in - # Guess yes on glibc >= 2.35 systems. - *-gnu* | gnu*) - AC_EGREP_CPP([Lucky], [ - #include - #ifdef __GNU_LIBRARY__ - #if (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 35) || (__GLIBC__ > 2) - Lucky user - #endif - #endif - ], - [gl_cv_func_printf_directive_uppercase_b="guessing yes"], - [gl_cv_func_printf_directive_uppercase_b="guessing no"]) - ;; - # Guess no on musl systems. - *-musl* | midipix*) gl_cv_func_printf_directive_b="guessing no";; - # Guess no on Android. - linux*-android*) gl_cv_func_printf_directive_b="guessing no";; - # Guess no on native Windows. - mingw*) gl_cv_func_printf_directive_b="guessing no";; - # If we don't know, obey --enable-cross-guesses. - *) gl_cv_func_printf_directive_b="$gl_cross_guess_normal";; - esac - ]) - ]) -]) - -dnl Test whether the *printf family of functions supports the 'B' conversion -dnl specifier for binary output of integers. -dnl (GNU, encouraged by ISO C23 § 7.23.6.1) -dnl Result is gl_cv_func_printf_directive_uppercase_b. - -AC_DEFUN([gl_PRINTF_DIRECTIVE_UPPERCASE_B], -[ - AC_REQUIRE([AC_PROG_CC]) - AC_REQUIRE([AC_CANONICAL_HOST]) dnl for cross-compiles - AC_CACHE_CHECK([whether printf supports the 'B' directive], - [gl_cv_func_printf_directive_uppercase_b], - [ - AC_RUN_IFELSE( - [AC_LANG_SOURCE([[ -#include -#include -static char buf[100]; -int main () -{ - int result = 0; - if (sprintf (buf, "%#B %d", 12345, 33, 44, 55) < 0 - || strcmp (buf, "0B11000000111001 33") != 0) - result |= 1; - return result; -}]])], - [gl_cv_func_printf_directive_uppercase_b=yes], - [gl_cv_func_printf_directive_uppercase_b=no], - [ - case "$host_os" in - # Guess yes on glibc >= 2.35 systems. - *-gnu* | gnu*) - AC_EGREP_CPP([Lucky], [ - #include - #ifdef __GNU_LIBRARY__ - #if (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 35) || (__GLIBC__ > 2) - Lucky user - #endif - #endif - ], - [gl_cv_func_printf_directive_uppercase_b="guessing yes"], - [gl_cv_func_printf_directive_uppercase_b="guessing no"]) - ;; - # Guess no on musl systems. - *-musl* | midipix*) gl_cv_func_printf_directive_uppercase_b="guessing no";; - # Guess no on Android. - linux*-android*) gl_cv_func_printf_directive_uppercase_b="guessing no";; - # Guess no on native Windows. - mingw*) gl_cv_func_printf_directive_uppercase_b="guessing no";; - # If we don't know, obey --enable-cross-guesses. - *) gl_cv_func_printf_directive_uppercase_b="$gl_cross_guess_normal";; - esac - ]) - ]) -]) - dnl Test whether the *printf family of functions supports the %F format dnl directive. (ISO C99, POSIX:2001) dnl Result is gl_cv_func_printf_directive_f. @@ -839,7 +643,7 @@ # Guess yes on glibc systems. *-gnu* | gnu*) gl_cv_func_printf_directive_f="guessing yes";; # Guess yes on musl systems. - *-musl* | midipix*) gl_cv_func_printf_directive_f="guessing yes";; + *-musl*) gl_cv_func_printf_directive_f="guessing yes";; # Guess yes on FreeBSD >= 6. freebsd[1-5].*) gl_cv_func_printf_directive_f="guessing no";; freebsd* | kfreebsd*) gl_cv_func_printf_directive_f="guessing yes";; @@ -1025,58 +829,11 @@ ]) ]) -dnl Test whether the *printf family of functions supports the %lc format -dnl directive and in particular, when the argument is a null wide character, -dnl whether the functions don't produce a NUL byte. -dnl Result is gl_cv_func_printf_directive_lc. - -AC_DEFUN([gl_PRINTF_DIRECTIVE_LC], -[ - AC_REQUIRE([AC_PROG_CC]) - AC_REQUIRE([AC_CANONICAL_HOST]) dnl for cross-compiles - AC_CACHE_CHECK([whether printf supports the 'lc' directive correctly], - [gl_cv_func_printf_directive_lc], - [ - AC_RUN_IFELSE( - [AC_LANG_SOURCE([[ -#include -#include -#include -int main () -{ - int result = 0; - char buf[100]; - /* This test fails on glibc 2.35, FreeBSD 13.1, NetBSD 9.0, OpenBSD 7.2, - macOS 12.5, AIX 7.2, Solaris 11.4. - glibc 2.35 bug: */ - { - buf[0] = '\0'; - if (sprintf (buf, "%lc%lc%lc", (wint_t) 'a', (wint_t) 0, (wint_t) 'z') < 0 - || strcmp (buf, "az") != 0) - result |= 1; - } - return result; -}]])], - [gl_cv_func_printf_directive_lc=yes], - [gl_cv_func_printf_directive_lc=no], - [ -changequote(,)dnl - case "$host_os" in - # Guess yes on musl libc. - *-musl* | midipix*) gl_cv_func_printf_directive_lc="guessing yes";; - # Guess no otherwise. - *) gl_cv_func_printf_directive_lc="guessing no";; - esac -changequote([,])dnl - ]) - ]) -]) - dnl Test whether the *printf family of functions supports POSIX/XSI format dnl strings with positions. (POSIX:2001) dnl Result is gl_cv_func_printf_positions. -AC_DEFUN_ONCE([gl_PRINTF_POSITIONS], +AC_DEFUN([gl_PRINTF_POSITIONS], [ AC_REQUIRE([AC_PROG_CC]) AC_REQUIRE([AC_CANONICAL_HOST]) dnl for cross-compiles @@ -1233,18 +990,18 @@ [ changequote(,)dnl case "$host_os" in - # Guess yes on glibc systems. - *-gnu* | gnu*) gl_cv_func_printf_flag_zero="guessing yes";; - # Guess yes on musl systems. - *-musl* | midipix*) gl_cv_func_printf_flag_zero="guessing yes";; - # Guess yes on BeOS. - beos*) gl_cv_func_printf_flag_zero="guessing yes";; - # Guess no on Android. - linux*-android*) gl_cv_func_printf_flag_zero="guessing no";; - # Guess no on native Windows. - mingw*) gl_cv_func_printf_flag_zero="guessing no";; - # If we don't know, obey --enable-cross-guesses. - *) gl_cv_func_printf_flag_zero="$gl_cross_guess_normal";; + # Guess yes on glibc systems. + *-gnu* | gnu*) gl_cv_func_printf_flag_zero="guessing yes";; + # Guess yes on musl systems. + *-musl*) gl_cv_func_printf_flag_zero="guessing yes";; + # Guess yes on BeOS. + beos*) gl_cv_func_printf_flag_zero="guessing yes";; + # Guess no on Android. + linux*-android*) gl_cv_func_printf_flag_zero="guessing no";; + # Guess no on native Windows. + mingw*) gl_cv_func_printf_flag_zero="guessing no";; + # If we don't know, obey --enable-cross-guesses. + *) gl_cv_func_printf_flag_zero="$gl_cross_guess_normal";; esac changequote([,])dnl ]) @@ -1482,7 +1239,7 @@ # Guess yes on glibc systems. *-gnu* | gnu*) gl_cv_func_snprintf_truncation_c99="guessing yes";; # Guess yes on musl systems. - *-musl* | midipix*) gl_cv_func_snprintf_truncation_c99="guessing yes";; + *-musl*) gl_cv_func_snprintf_truncation_c99="guessing yes";; # Guess yes on FreeBSD >= 5. freebsd[1-4].*) gl_cv_func_snprintf_truncation_c99="guessing no";; freebsd* | kfreebsd*) gl_cv_func_snprintf_truncation_c99="guessing yes";; @@ -1587,7 +1344,7 @@ # Guess yes on glibc systems. *-gnu* | gnu*) gl_cv_func_snprintf_retval_c99="guessing yes";; # Guess yes on musl systems. - *-musl* | midipix*) gl_cv_func_snprintf_retval_c99="guessing yes";; + *-musl*) gl_cv_func_snprintf_retval_c99="guessing yes";; # Guess yes on FreeBSD >= 5. freebsd[1-4].*) gl_cv_func_snprintf_retval_c99="guessing no";; freebsd* | kfreebsd*) gl_cv_func_snprintf_retval_c99="guessing yes";; @@ -1690,7 +1447,7 @@ ;; changequote(,)dnl # Guess yes on musl systems. - *-musl* | midipix*) gl_cv_func_snprintf_directive_n="guessing yes";; + *-musl*) gl_cv_func_snprintf_directive_n="guessing yes";; # Guess yes on FreeBSD >= 5. freebsd[1-4].*) gl_cv_func_snprintf_directive_n="guessing no";; freebsd* | kfreebsd*) gl_cv_func_snprintf_directive_n="guessing yes";; @@ -1847,7 +1604,7 @@ # Guess yes on glibc systems. *-gnu* | gnu*) gl_cv_func_vsnprintf_zerosize_c99="guessing yes";; # Guess yes on musl systems. - *-musl* | midipix*) gl_cv_func_vsnprintf_zerosize_c99="guessing yes";; + *-musl*) gl_cv_func_vsnprintf_zerosize_c99="guessing yes";; # Guess yes on FreeBSD >= 5. freebsd[1-4].*) gl_cv_func_vsnprintf_zerosize_c99="guessing no";; freebsd* | kfreebsd*) gl_cv_func_vsnprintf_zerosize_c99="guessing yes";; @@ -1884,227 +1641,87 @@ ]) ]) -dnl Test whether the swprintf function works correctly when it produces output -dnl that contains null wide characters. -dnl Result is gl_cv_func_swprintf_works. - -AC_DEFUN([gl_SWPRINTF_WORKS], -[ - AC_REQUIRE([AC_PROG_CC]) - AC_REQUIRE([AC_CANONICAL_HOST]) dnl for cross-compiles - AC_CHECK_FUNCS_ONCE([swprintf]) - AC_CACHE_CHECK([whether swprintf works], - [gl_cv_func_swprintf_works], - [ - AC_RUN_IFELSE( - [AC_LANG_SOURCE([[ -#ifndef __USE_MINGW_ANSI_STDIO -# define __USE_MINGW_ANSI_STDIO 1 -#endif -#include -#include -int main() -{ - int result = 0; - { /* This test fails on musl, FreeBSD, NetBSD, OpenBSD, macOS, AIX. */ - wchar_t buf[5] = { 0xBEEF, 0xBEEF, 0xBEEF, 0xBEEF, 0xBEEF }; - int ret = swprintf (buf, 4, L"%cz", '\0'); - /* Expected result: - ret = 2, buf[0] = 0x0, buf[1] = 0x7a, buf[2] = 0x0, buf[3] = 0xbeef - musl libc 1.2.3: - ret = 2, buf[0] = 0x0, buf[1] = 0x0, buf[2] = 0x0, buf[3] = 0x0 - Reported at . - FreeBSD 13.1, NetBSD 9.0, OpenBSD 7.2, macOS 12.5, AIX 7.2: - ret = 2, buf[0] = 0x0, buf[1] = 0xbeef, buf[2] = 0xbeef, buf[3] = 0xbeef - */ - if (ret < 0 || buf[1] != 'z') - result |= 1; - } - { /* This test fails on mingw. */ - wchar_t buf[2]; - int ret = swprintf (buf, 2, L"%lc", (wint_t)0); - /* Expected: ret = 1 - mingw: ret = 0 - */ - if (ret != 1) - result |= 2; - } - return result; -}]])], - [gl_cv_func_swprintf_works=yes], - [gl_cv_func_swprintf_works=no], - [case "$host_os" in - # Guess yes on glibc systems. - *-gnu* | gnu*) gl_cv_func_swprintf_works="guessing yes";; - # Guess no on musl systems. - *-musl* | midipix*) gl_cv_func_swprintf_works="guessing yes";; - # Guess no on FreeBSD, NetBSD, OpenBSD, macOS, AIX. - freebsd* | midnightbsd* | netbsd* | openbsd* | darwin* | aix*) - gl_cv_func_swprintf_works="guessing no";; - # Guess no on native Windows. - mingw* | pw*) gl_cv_func_swprintf_works="guessing no";; - # If we don't know, obey --enable-cross-guesses. - *) gl_cv_func_swprintf_works="$gl_cross_guess_normal";; - esac - ]) - ]) -]) - -dnl Test whether the *wprintf family of functions supports the 'a' and 'A' -dnl conversion specifier for hexadecimal output of 'long double' numbers. -dnl (ISO C99, POSIX:2001) -dnl Result is gl_cv_func_swprintf_directive_la. - -AC_DEFUN([gl_SWPRINTF_DIRECTIVE_LA], -[ - AC_REQUIRE([AC_PROG_CC]) - AC_REQUIRE([AC_CANONICAL_HOST]) dnl for cross-compiles - AC_CACHE_CHECK([whether swprintf supports the 'La' and 'LA' directives], - [gl_cv_func_swprintf_directive_la], - [ - AC_RUN_IFELSE( - [AC_LANG_SOURCE([[ -#include -#include -static wchar_t buf[100]; -int main () -{ - int result = 0; - /* This catches a glibc 2.15 and Haiku 2022 bug. */ - if (swprintf (buf, sizeof (buf) / sizeof (wchar_t), - L"%La %d", 3.1416015625L, 33, 44, 55) < 0 - || (wcscmp (buf, L"0x1.922p+1 33") != 0 - && wcscmp (buf, L"0x3.244p+0 33") != 0 - && wcscmp (buf, L"0x6.488p-1 33") != 0 - && wcscmp (buf, L"0xc.91p-2 33") != 0)) - result |= 1; - return result; -}]])], - [gl_cv_func_swprintf_directive_la=yes], - [gl_cv_func_swprintf_directive_la=no], - [case "$host_os" in - # Guess yes on glibc >= 2.17 systems. - *-gnu* | gnu*) - AC_EGREP_CPP([Unlucky], [ - #include - #ifdef __GNU_LIBRARY__ - #if ((__GLIBC__ == 2 && __GLIBC_MINOR__ >= 16) || (__GLIBC__ > 2)) && !defined __UCLIBC__ - Unlucky - #endif - #endif - ], - [gl_cv_func_swprintf_directive_la="guessing yes"], - [gl_cv_func_swprintf_directive_la="guessing no"]) - ;; - # Guess yes on musl systems. - *-musl* | midipix*) gl_cv_func_swprintf_directive_la="guessing yes";; - # Guess yes on Android. - linux*-android*) gl_cv_func_swprintf_directive_la="guessing no";; - # Guess yes on native Windows. - mingw*) gl_cv_func_swprintf_directive_la="guessing no";; - # If we don't know, obey --enable-cross-guesses. - *) gl_cv_func_swprintf_directive_la="$gl_cross_guess_normal";; - esac - ]) - ]) -]) - dnl The results of these tests on various platforms are: dnl dnl 1 = gl_PRINTF_SIZES_C99 -dnl 2 = gl_PRINTF_SIZES_C23 -dnl 3 = gl_PRINTF_LONG_DOUBLE -dnl 4 = gl_PRINTF_INFINITE -dnl 5 = gl_PRINTF_INFINITE_LONG_DOUBLE -dnl 6 = gl_PRINTF_DIRECTIVE_A -dnl 7 = gl_PRINTF_DIRECTIVE_B -dnl 8 = gl_PRINTF_DIRECTIVE_UPPERCASE_B -dnl 9 = gl_PRINTF_DIRECTIVE_F -dnl 10 = gl_PRINTF_DIRECTIVE_N -dnl 11 = gl_PRINTF_DIRECTIVE_LS -dnl 12 = gl_PRINTF_DIRECTIVE_LC -dnl 13 = gl_PRINTF_POSITIONS -dnl 14 = gl_PRINTF_FLAG_GROUPING -dnl 15 = gl_PRINTF_FLAG_LEFTADJUST -dnl 16 = gl_PRINTF_FLAG_ZERO -dnl 17 = gl_PRINTF_PRECISION -dnl 18 = gl_PRINTF_ENOMEM -dnl 19 = gl_SNPRINTF_PRESENCE -dnl 20 = gl_SNPRINTF_TRUNCATION_C99 -dnl 21 = gl_SNPRINTF_RETVAL_C99 -dnl 22 = gl_SNPRINTF_DIRECTIVE_N -dnl 23 = gl_SNPRINTF_SIZE1 -dnl 24 = gl_VSNPRINTF_ZEROSIZE_C99 -dnl 25 = gl_SWPRINTF_WORKS -dnl 26 = gl_SWPRINTF_DIRECTIVE_LA +dnl 2 = gl_PRINTF_LONG_DOUBLE +dnl 3 = gl_PRINTF_INFINITE +dnl 4 = gl_PRINTF_INFINITE_LONG_DOUBLE +dnl 5 = gl_PRINTF_DIRECTIVE_A +dnl 6 = gl_PRINTF_DIRECTIVE_F +dnl 7 = gl_PRINTF_DIRECTIVE_N +dnl 8 = gl_PRINTF_DIRECTIVE_LS +dnl 9 = gl_PRINTF_POSITIONS +dnl 10 = gl_PRINTF_FLAG_GROUPING +dnl 11 = gl_PRINTF_FLAG_LEFTADJUST +dnl 12 = gl_PRINTF_FLAG_ZERO +dnl 13 = gl_PRINTF_PRECISION +dnl 14 = gl_PRINTF_ENOMEM +dnl 15 = gl_SNPRINTF_PRESENCE +dnl 16 = gl_SNPRINTF_TRUNCATION_C99 +dnl 17 = gl_SNPRINTF_RETVAL_C99 +dnl 18 = gl_SNPRINTF_DIRECTIVE_N +dnl 19 = gl_SNPRINTF_SIZE1 +dnl 20 = gl_VSNPRINTF_ZEROSIZE_C99 dnl dnl 1 = checking whether printf supports size specifiers as in C99... -dnl 2 = checking whether printf supports size specifiers as in C23... -dnl 3 = checking whether printf supports 'long double' arguments... -dnl 4 = checking whether printf supports infinite 'double' arguments... -dnl 5 = checking whether printf supports infinite 'long double' arguments... -dnl 6 = checking whether printf supports the 'a' and 'A' directives... -dnl 7 = checking whether printf supports the 'b' directive... -dnl 8 = checking whether printf supports the 'B' directive... -dnl 9 = checking whether printf supports the 'F' directive... -dnl 10 = checking whether printf supports the 'n' directive... -dnl 11 = checking whether printf supports the 'ls' directive... -dnl 12 = checking whether printf supports the 'lc' directive correctly... -dnl 13 = checking whether printf supports POSIX/XSI format strings with positions... -dnl 14 = checking whether printf supports the grouping flag... -dnl 15 = checking whether printf supports the left-adjust flag correctly... -dnl 16 = checking whether printf supports the zero flag correctly... -dnl 17 = checking whether printf supports large precisions... -dnl 18 = checking whether printf survives out-of-memory conditions... -dnl 19 = checking for snprintf... -dnl 20 = checking whether snprintf truncates the result as in C99... -dnl 21 = checking whether snprintf returns a byte count as in C99... -dnl 22 = checking whether snprintf fully supports the 'n' directive... -dnl 23 = checking whether snprintf respects a size of 1... -dnl 24 = checking whether vsnprintf respects a zero size as in C99... -dnl 25 = checking whether swprintf works... -dnl 26 = checking whether swprintf supports the 'La' and 'LA' directives... +dnl 2 = checking whether printf supports 'long double' arguments... +dnl 3 = checking whether printf supports infinite 'double' arguments... +dnl 4 = checking whether printf supports infinite 'long double' arguments... +dnl 5 = checking whether printf supports the 'a' and 'A' directives... +dnl 6 = checking whether printf supports the 'F' directive... +dnl 7 = checking whether printf supports the 'n' directive... +dnl 8 = checking whether printf supports the 'ls' directive... +dnl 9 = checking whether printf supports POSIX/XSI format strings with positions... +dnl 10 = checking whether printf supports the grouping flag... +dnl 11 = checking whether printf supports the left-adjust flag correctly... +dnl 12 = checking whether printf supports the zero flag correctly... +dnl 13 = checking whether printf supports large precisions... +dnl 14 = checking whether printf survives out-of-memory conditions... +dnl 15 = checking for snprintf... +dnl 16 = checking whether snprintf truncates the result as in C99... +dnl 17 = checking whether snprintf returns a byte count as in C99... +dnl 18 = checking whether snprintf fully supports the 'n' directive... +dnl 19 = checking whether snprintf respects a size of 1... +dnl 20 = checking whether vsnprintf respects a zero size as in C99... dnl dnl . = yes, # = no. dnl -dnl 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 -dnl musl libc 1.2.3 . # . . . . # # . . . . . . . . . . . . . . . . # . -dnl glibc 2.35 . # . . . . . . . . . # . . . . . . . . . . . . . . -dnl glibc 2.5 . # . . . . # # . . . # . . . . . . . . . . . . . # -dnl glibc 2.3.6 . # . . . # # # . . . # . . . . . . . . . . . . . # -dnl FreeBSD 13.0 . # . . . # # # . . . # . . . . . # . . . . . . # . -dnl FreeBSD 5.4, 6.1 . # . . . # # # . . . # . . . # . # . . . . . . # ? -dnl Mac OS X 10.13.5 . # . . # # # # . # . # . . . . . . . . . # . . # ? -dnl Mac OS X 10.5.8 . # . . # # # # . . . # . . . # . . . . . . . . # ? -dnl Mac OS X 10.3.9 . # . . . # # # . . . # . . . # . # . . . . . . # ? -dnl OpenBSD 6.0, 6.7 . # . . . # # # . . . # . . . . . # . . . . . . # . -dnl OpenBSD 3.9, 4.0 . # . # # # # # # . # # . # . # . # . . . . . . # ? -dnl Cygwin 1.7.0 (2009) . # . . # . # # . . ? ? . . . . . ? . . . . . . ? ? -dnl Cygwin 1.5.25 (2008) . # . . # # # # . . # ? . . . . . # . . . . . . ? ? -dnl Cygwin 1.5.19 (2006) # # . . # # # # # . # ? . # . # # # . . . . . . ? ? -dnl Solaris 11.4 . # . # # # # # . . # # . . . # . . . . . . . . . ? -dnl Solaris 11.3 . # . . . # # # . . # # . . . . . . . . . . . . . ? -dnl Solaris 11.0 . # . # # # # # . . # # . . . # . . . . . . . . ? ? -dnl Solaris 10 . # . # # # # # . . # # . . . # # . . . . . . . ? ? -dnl Solaris 2.6 ... 9 # # . # # # # # # . # # . . . # # . . . # . . . ? ? -dnl Solaris 2.5.1 # # . # # # # # # . # # . . . # . . # # # # # # ? ? -dnl AIX 7.1 . # . # # # # # . . . # . . . # # . . . . . . . # . -dnl AIX 5.2 . # . # # # # # . . . # . . . # . . . . . . . . # ? -dnl AIX 4.3.2, 5.1 # # . # # # # # # . . # . . . # . . . . # . . . # ? -dnl HP-UX 11.31 . # . . . # # # . . . ? . . . # . . . . # # . . ? ? -dnl HP-UX 11.{00,11,23} # # . . . # # # # . . ? . . . # . . . . # # . # ? ? -dnl HP-UX 10.20 # # . # . # # # # . ? ? . . # # . . . . # # ? # ? ? -dnl IRIX 6.5 # # . # # # # # # . # # . . . # . . . . # . . . # ? -dnl OSF/1 5.1 # # . # # # # # # . . ? . . . # . . . . # . . # ? ? -dnl OSF/1 4.0d # # . # # # # # # . . ? . . . # . . # # # # # # ? ? -dnl NetBSD 9.0 . # . . . # # # . . . # . . . . . . . . . . . . # . -dnl NetBSD 5.0 . # . . # # # # . . . # . . . # . # . . . . . . # ? -dnl NetBSD 4.0 . # ? ? ? ? # # ? . ? # . ? ? ? ? ? . . . ? ? ? # ? -dnl NetBSD 3.0 . # . . . # # # # . ? # # # ? # . # . . . . . . # ? -dnl Haiku . # . . # # # # # . # ? . . . . . ? . . ? . . . . # -dnl BeOS # # # . # # # # # . ? ? # . ? . # ? . . ? . . . ? ? -dnl Android 4.3 . # . # # # # # # # # ? . # . # . # . . . # . . ? ? -dnl old mingw / msvcrt # # # # # # # # # . . ? # # . # # ? . # # # . . # ? -dnl MSVC 9 # # # # # # # # # # . ? # # . # # ? # # # # . . # ? -dnl mingw 2009-2011 . # # . # . # # . . . ? # # . . . ? . . . . . . # ? -dnl mingw-w64 2011 # # # # # # # # # . . ? # # . # # ? . # # # . . # ? +dnl 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 +dnl glibc 2.5 . . . . . . . . . . . . . . . . . . . . +dnl glibc 2.3.6 . . . . # . . . . . . . . . . . . . . . +dnl FreeBSD 5.4, 6.1 . . . . # . . . . . . # . # . . . . . . +dnl Mac OS X 10.13.5 . . . # # . # . . . . . . . . . . # . . +dnl Mac OS X 10.5.8 . . . # # . . . . . . # . . . . . . . . +dnl Mac OS X 10.3.9 . . . . # . . . . . . # . # . . . . . . +dnl OpenBSD 6.0, 6.7 . . . . # . . . . . . . . # . . . . . . +dnl OpenBSD 3.9, 4.0 . . # # # # . # . # . # . # . . . . . . +dnl Cygwin 1.7.0 (2009) . . . # . . . ? . . . . . ? . . . . . . +dnl Cygwin 1.5.25 (2008) . . . # # . . # . . . . . # . . . . . . +dnl Cygwin 1.5.19 (2006) # . . # # # . # . # . # # # . . . . . . +dnl Solaris 11.4 . . # # # . . # . . . # . . . . . . . . +dnl Solaris 11.3 . . . . # . . # . . . . . . . . . . . . +dnl Solaris 11.0 . . # # # . . # . . . # . . . . . . . . +dnl Solaris 10 . . # # # . . # . . . # # . . . . . . . +dnl Solaris 2.6 ... 9 # . # # # # . # . . . # # . . . # . . . +dnl Solaris 2.5.1 # . # # # # . # . . . # . . # # # # # # +dnl AIX 7.1 . . # # # . . . . . . # # . . . . . . . +dnl AIX 5.2 . . # # # . . . . . . # . . . . . . . . +dnl AIX 4.3.2, 5.1 # . # # # # . . . . . # . . . . # . . . +dnl HP-UX 11.31 . . . . # . . . . . . # . . . . # # . . +dnl HP-UX 11.{00,11,23} # . . . # # . . . . . # . . . . # # . # +dnl HP-UX 10.20 # . # . # # . ? . . # # . . . . # # ? # +dnl IRIX 6.5 # . # # # # . # . . . # . . . . # . . . +dnl OSF/1 5.1 # . # # # # . . . . . # . . . . # . . # +dnl OSF/1 4.0d # . # # # # . . . . . # . . # # # # # # +dnl NetBSD 9.0 . . . . # . . . . . . . . . . . . . . . +dnl NetBSD 5.0 . . . # # . . . . . . # . # . . . . . . +dnl NetBSD 4.0 . ? ? ? ? ? . ? . ? ? ? ? ? . . . ? ? ? +dnl NetBSD 3.0 . . . . # # . ? # # ? # . # . . . . . . +dnl Haiku . . . # # # . # . . . . . ? . . ? . . . +dnl BeOS # # . # # # . ? # . ? . # ? . . ? . . . +dnl Android 4.3 . . # # # # # # . # . # . # . . . # . . +dnl old mingw / msvcrt # # # # # # . . # # . # # ? . # # # . . +dnl MSVC 9 # # # # # # # . # # . # # ? # # # # . . +dnl mingw 2009-2011 . # . # . . . . # # . . . ? . . . . . . +dnl mingw-w64 2011 # # # # # # . . # # . # # ? . # # # . . diff -Nru mmv-2.5/m4/raise.m4 mmv-2.5.1/m4/raise.m4 --- mmv-2.5/m4/raise.m4 2023-07-20 19:40:23.000000000 +0000 +++ mmv-2.5.1/m4/raise.m4 2023-08-08 11:02:40.000000000 +0000 @@ -1,5 +1,5 @@ # raise.m4 serial 4 -dnl Copyright (C) 2011-2023 Free Software Foundation, Inc. +dnl Copyright (C) 2011-2021 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 -Nru mmv-2.5/m4/rawmemchr.m4 mmv-2.5.1/m4/rawmemchr.m4 --- mmv-2.5/m4/rawmemchr.m4 2023-07-20 19:40:23.000000000 +0000 +++ mmv-2.5.1/m4/rawmemchr.m4 2023-08-08 11:02:40.000000000 +0000 @@ -1,5 +1,5 @@ -# rawmemchr.m4 serial 3 -dnl Copyright (C) 2003, 2007-2023 Free Software Foundation, Inc. +# rawmemchr.m4 serial 2 +dnl Copyright (C) 2003, 2007-2021 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. @@ -9,7 +9,7 @@ dnl Persuade glibc to declare rawmemchr(). AC_REQUIRE([AC_USE_SYSTEM_EXTENSIONS]) - AC_REQUIRE([gl_STRING_H_DEFAULTS]) + AC_REQUIRE([gl_HEADER_STRING_H_DEFAULTS]) AC_CHECK_FUNCS([rawmemchr]) if test $ac_cv_func_rawmemchr = no; then HAVE_RAWMEMCHR=0 diff -Nru mmv-2.5/m4/read.m4 mmv-2.5.1/m4/read.m4 --- mmv-2.5/m4/read.m4 2023-07-20 19:40:23.000000000 +0000 +++ mmv-2.5.1/m4/read.m4 2023-08-08 11:02:40.000000000 +0000 @@ -1,5 +1,5 @@ # read.m4 serial 5 -dnl Copyright (C) 2011-2023 Free Software Foundation, Inc. +dnl Copyright (C) 2011-2021 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 -Nru mmv-2.5/m4/readlink.m4 mmv-2.5.1/m4/readlink.m4 --- mmv-2.5/m4/readlink.m4 2023-07-20 19:40:23.000000000 +0000 +++ mmv-2.5.1/m4/readlink.m4 2023-08-08 11:02:40.000000000 +0000 @@ -1,5 +1,5 @@ -# readlink.m4 serial 17 -dnl Copyright (C) 2003, 2007, 2009-2023 Free Software Foundation, Inc. +# readlink.m4 serial 16 +dnl Copyright (C) 2003, 2007, 2009-2021 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. @@ -38,9 +38,6 @@ # Guess yes on Linux or glibc systems. linux-* | linux | *-gnu* | gnu*) gl_cv_func_readlink_trailing_slash="guessing yes" ;; - # Guess yes on systems that emulate the Linux system calls. - midipix*) - gl_cv_func_readlink_trailing_slash="guessing yes" ;; # Guess no on AIX or HP-UX. aix* | hpux*) gl_cv_func_readlink_trailing_slash="guessing no" ;; @@ -78,9 +75,6 @@ # Guess yes on Linux or glibc systems. linux-* | linux | *-gnu* | gnu*) gl_cv_func_readlink_truncate="guessing yes" ;; - # Guess yes on systems that emulate the Linux system calls. - midipix*) - gl_cv_func_readlink_truncate="guessing yes" ;; # Guess no on AIX or HP-UX. aix* | hpux*) gl_cv_func_readlink_truncate="guessing no" ;; diff -Nru mmv-2.5/m4/realloc.m4 mmv-2.5.1/m4/realloc.m4 --- mmv-2.5/m4/realloc.m4 2023-07-20 19:40:23.000000000 +0000 +++ mmv-2.5.1/m4/realloc.m4 2023-08-08 11:02:40.000000000 +0000 @@ -1,21 +1,21 @@ -# realloc.m4 serial 27 -dnl Copyright (C) 2007, 2009-2023 Free Software Foundation, Inc. +# realloc.m4 serial 20 +dnl Copyright (C) 2007, 2009-2021 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. # This is adapted with modifications from upstream Autoconf here: -# https://git.savannah.gnu.org/cgit/autoconf.git/tree/lib/autoconf/functions.m4?id=v2.70#n1455 +# https://git.savannah.gnu.org/cgit/autoconf.git/commit/?id=04be2b7a29d65d9a08e64e8e56e594c91749598c AC_DEFUN([_AC_FUNC_REALLOC_IF], [ AC_REQUIRE([AC_CANONICAL_HOST])dnl for cross-compiles - AC_CACHE_CHECK([whether realloc (0, 0) returns nonnull], + AC_CACHE_CHECK([for GNU libc compatible realloc], [ac_cv_func_realloc_0_nonnull], [AC_RUN_IFELSE( [AC_LANG_PROGRAM( [[#include ]], - [[void *p = realloc (0, 0); + [[char *p = realloc (0, 0); int result = !p; free (p); return result;]]) @@ -24,40 +24,53 @@ [ac_cv_func_realloc_0_nonnull=no], [case "$host_os" in # Guess yes on platforms where we know the result. - *-gnu* | freebsd* | netbsd* | openbsd* | bitrig* \ - | gnu* | *-musl* | midipix* | midnightbsd* \ - | hpux* | solaris* | cygwin* | mingw* | msys* ) + *-gnu* | gnu* | *-musl* | freebsd* | midnightbsd* | netbsd* | openbsd* \ + | hpux* | solaris* | cygwin* | mingw*) ac_cv_func_realloc_0_nonnull="guessing yes" ;; # If we don't know, obey --enable-cross-guesses. *) ac_cv_func_realloc_0_nonnull="$gl_cross_guess_normal" ;; esac ]) ]) - AS_CASE([$ac_cv_func_realloc_0_nonnull], [*yes], [$1], [$2]) + case "$ac_cv_func_realloc_0_nonnull" in + *yes) + $1 + ;; + *) + $2 + ;; + esac ])# AC_FUNC_REALLOC # gl_FUNC_REALLOC_GNU # ------------------- -# Replace realloc if it is not compatible with GNU libc. +# Test whether 'realloc (0, 0)' is handled like in GNU libc, and replace +# realloc if it is not. AC_DEFUN([gl_FUNC_REALLOC_GNU], [ AC_REQUIRE([gl_STDLIB_H_DEFAULTS]) - AC_REQUIRE([gl_FUNC_REALLOC_POSIX]) - if test $REPLACE_REALLOC_FOR_REALLOC_GNU = 0; then - _AC_FUNC_REALLOC_IF([], [REPLACE_REALLOC_FOR_REALLOC_GNU=1]) - fi + dnl _AC_FUNC_REALLOC_IF is defined in Autoconf. + _AC_FUNC_REALLOC_IF( + [AC_DEFINE([HAVE_REALLOC_GNU], [1], + [Define to 1 if your system has a GNU libc compatible 'realloc' + function, and to 0 otherwise.])], + [AC_DEFINE([HAVE_REALLOC_GNU], [0]) + REPLACE_REALLOC=1 + ]) ])# gl_FUNC_REALLOC_GNU # gl_FUNC_REALLOC_POSIX # --------------------- # Test whether 'realloc' is POSIX compliant (sets errno to ENOMEM when it -# fails, and doesn't mess up with ptrdiff_t overflow), -# and replace realloc if it is not. +# fails), and replace realloc if it is not. AC_DEFUN([gl_FUNC_REALLOC_POSIX], [ AC_REQUIRE([gl_STDLIB_H_DEFAULTS]) - AC_REQUIRE([gl_FUNC_MALLOC_POSIX]) - if test $REPLACE_MALLOC_FOR_MALLOC_POSIX = 1; then - REPLACE_REALLOC_FOR_REALLOC_POSIX=1 + AC_REQUIRE([gl_CHECK_MALLOC_POSIX]) + if test $gl_cv_func_malloc_posix = yes; then + AC_DEFINE([HAVE_REALLOC_POSIX], [1], + [Define if the 'realloc' function is POSIX compliant.]) + else + REPLACE_REALLOC=1 fi ]) diff -Nru mmv-2.5/m4/reallocarray.m4 mmv-2.5.1/m4/reallocarray.m4 --- mmv-2.5/m4/reallocarray.m4 2023-07-20 19:40:23.000000000 +0000 +++ mmv-2.5.1/m4/reallocarray.m4 1970-01-01 00:00:00.000000000 +0000 @@ -1,26 +0,0 @@ -# reallocarray.m4 serial 5 -dnl Copyright (C) 2017-2023 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_FUNC_REALLOCARRAY], -[ - dnl Persuade glibc to declare reallocarray. - AC_REQUIRE([gl_USE_SYSTEM_EXTENSIONS]) - - AC_REQUIRE([gl_STDLIB_H_DEFAULTS]) - AC_REQUIRE([gl_CHECK_MALLOC_PTRDIFF]) - gl_CHECK_FUNCS_ANDROID([reallocarray], [[#include ]]) - if test "$ac_cv_func_reallocarray" = no; then - HAVE_REALLOCARRAY=0 - case "$gl_cv_onwards_func_reallocarray" in - future*) REPLACE_REALLOCARRAY=1 ;; - esac - elif test "$gl_cv_malloc_ptrdiff" = no; then - REPLACE_REALLOCARRAY=1 - fi -]) - -# Prerequisites of lib/reallocarray.c. -AC_DEFUN([gl_PREREQ_REALLOCARRAY], [:]) diff -Nru mmv-2.5/m4/rename.m4 mmv-2.5.1/m4/rename.m4 --- mmv-2.5/m4/rename.m4 2023-07-20 19:40:23.000000000 +0000 +++ mmv-2.5.1/m4/rename.m4 2023-08-08 11:02:40.000000000 +0000 @@ -1,6 +1,6 @@ -# serial 34 +# serial 33 -# Copyright (C) 2001, 2003, 2005-2006, 2009-2023 Free Software Foundation, Inc. +# Copyright (C) 2001, 2003, 2005-2006, 2009-2021 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. @@ -57,8 +57,6 @@ [case "$host_os" in # Guess yes on Linux systems. linux-* | linux) gl_cv_func_rename_slash_dst_works="guessing yes" ;; - # Guess yes on systems that emulate the Linux system calls. - midipix*) gl_cv_func_rename_slash_dst_works="guessing yes" ;; # Guess yes on glibc systems. *-gnu*) gl_cv_func_rename_slash_dst_works="guessing yes" ;; # Guess no on native Windows. @@ -115,8 +113,6 @@ [case "$host_os" in # Guess yes on Linux systems. linux-* | linux) gl_cv_func_rename_slash_src_works="guessing yes" ;; - # Guess yes on systems that emulate the Linux system calls. - midipix*) gl_cv_func_rename_slash_src_works="guessing yes" ;; # Guess yes on glibc systems. *-gnu*) gl_cv_func_rename_slash_src_works="guessing yes" ;; # Guess yes on native Windows. @@ -188,8 +184,6 @@ case "$host_os" in # Guess yes on Linux systems. linux-* | linux) gl_cv_func_rename_link_works="guessing yes" ;; - # Guess yes on systems that emulate the Linux system calls. - midipix*) gl_cv_func_rename_link_works="guessing yes" ;; # Guess yes on glibc systems. *-gnu*) gl_cv_func_rename_link_works="guessing yes" ;; # Guess yes on native Windows. diff -Nru mmv-2.5/m4/rmdir.m4 mmv-2.5.1/m4/rmdir.m4 --- mmv-2.5/m4/rmdir.m4 2023-07-20 19:40:23.000000000 +0000 +++ mmv-2.5.1/m4/rmdir.m4 2023-08-08 11:02:40.000000000 +0000 @@ -1,5 +1,5 @@ # rmdir.m4 serial 18 -dnl Copyright (C) 2002, 2005, 2009-2023 Free Software Foundation, Inc. +dnl Copyright (C) 2002, 2005, 2009-2021 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. @@ -36,8 +36,6 @@ [case "$host_os" in # Guess yes on Linux systems. linux-* | linux) gl_cv_func_rmdir_works="guessing yes" ;; - # Guess yes on systems that emulate the Linux system calls. - midipix*) gl_cv_func_rmdir_works="guessing yes" ;; # Guess yes on glibc systems. *-gnu* | gnu*) gl_cv_func_rmdir_works="guessing yes" ;; # Guess no on native Windows. diff -Nru mmv-2.5/m4/signal_h.m4 mmv-2.5.1/m4/signal_h.m4 --- mmv-2.5/m4/signal_h.m4 2023-07-20 19:40:23.000000000 +0000 +++ mmv-2.5.1/m4/signal_h.m4 2023-08-08 11:02:40.000000000 +0000 @@ -1,10 +1,10 @@ -# signal_h.m4 serial 22 -dnl Copyright (C) 2007-2023 Free Software Foundation, Inc. +# signal_h.m4 serial 19 +dnl Copyright (C) 2007-2021 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_ONCE([gl_SIGNAL_H], +AC_DEFUN([gl_SIGNAL_H], [ AC_REQUIRE([gl_SIGNAL_H_DEFAULTS]) AC_REQUIRE([gl_CHECK_TYPE_SIGSET_T]) @@ -52,37 +52,22 @@ fi ]) -# gl_SIGNAL_MODULE_INDICATOR([modulename]) -# sets the shell variable that indicates the presence of the given module -# to a C preprocessor expression that will evaluate to 1. -# This macro invocation must not occur in macros that are AC_REQUIREd. AC_DEFUN([gl_SIGNAL_MODULE_INDICATOR], [ - dnl Ensure to expand the default settings once only. - gl_SIGNAL_H_REQUIRE_DEFAULTS + dnl Use AC_REQUIRE here, so that the default settings are expanded once only. + AC_REQUIRE([gl_SIGNAL_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]) ]) -# Initializes the default values for AC_SUBSTed shell variables. -# This macro must not be AC_REQUIREd. It must only be invoked, and only -# outside of macros or in macros that are not AC_REQUIREd. -AC_DEFUN([gl_SIGNAL_H_REQUIRE_DEFAULTS], -[ - m4_defun(GL_MODULE_INDICATOR_PREFIX[_SIGNAL_H_MODULE_INDICATOR_DEFAULTS], [ - gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_PTHREAD_SIGMASK]) - gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_RAISE]) - gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_SIGNAL_H_SIGPIPE]) - gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_SIGPROCMASK]) - gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_SIGACTION]) - ]) - m4_require(GL_MODULE_INDICATOR_PREFIX[_SIGNAL_H_MODULE_INDICATOR_DEFAULTS]) - AC_REQUIRE([gl_SIGNAL_H_DEFAULTS]) -]) - AC_DEFUN([gl_SIGNAL_H_DEFAULTS], [ + GNULIB_PTHREAD_SIGMASK=0; AC_SUBST([GNULIB_PTHREAD_SIGMASK]) + GNULIB_RAISE=0; AC_SUBST([GNULIB_RAISE]) + GNULIB_SIGNAL_H_SIGPIPE=0; AC_SUBST([GNULIB_SIGNAL_H_SIGPIPE]) + GNULIB_SIGPROCMASK=0; AC_SUBST([GNULIB_SIGPROCMASK]) + GNULIB_SIGACTION=0; AC_SUBST([GNULIB_SIGACTION]) dnl Assume proper GNU behavior unless another module says otherwise. HAVE_POSIX_SIGNALBLOCKING=1; AC_SUBST([HAVE_POSIX_SIGNALBLOCKING]) HAVE_PTHREAD_SIGMASK=1; AC_SUBST([HAVE_PTHREAD_SIGMASK]) diff -Nru mmv-2.5/m4/signbit.m4 mmv-2.5.1/m4/signbit.m4 --- mmv-2.5/m4/signbit.m4 2023-07-20 19:40:23.000000000 +0000 +++ mmv-2.5.1/m4/signbit.m4 2023-08-08 11:02:40.000000000 +0000 @@ -1,5 +1,5 @@ -# signbit.m4 serial 21 -dnl Copyright (C) 2007-2023 Free Software Foundation, Inc. +# signbit.m4 serial 20 +dnl Copyright (C) 2007-2021 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. @@ -29,14 +29,14 @@ [gl_cv_func_signbit=yes], [gl_cv_func_signbit=no], [case "$host_os" in - # Guess yes on glibc systems. - *-gnu* | gnu*) gl_cv_func_signbit="guessing yes" ;; - # Guess yes on musl systems. - *-musl* | midipix*) gl_cv_func_signbit="guessing yes" ;; - # Guess yes on native Windows. - mingw*) gl_cv_func_signbit="guessing yes" ;; - # If we don't know, obey --enable-cross-guesses. - *) gl_cv_func_signbit="$gl_cross_guess_normal" ;; + # Guess yes on glibc systems. + *-gnu* | gnu*) gl_cv_func_signbit="guessing yes" ;; + # Guess yes on musl systems. + *-musl*) gl_cv_func_signbit="guessing yes" ;; + # Guess yes on native Windows. + mingw*) gl_cv_func_signbit="guessing yes" ;; + # If we don't know, obey --enable-cross-guesses. + *) gl_cv_func_signbit="$gl_cross_guess_normal" ;; esac ]) ]) @@ -63,19 +63,19 @@ [gl_cv_func_signbit_builtins=yes], [gl_cv_func_signbit_builtins=no], [case "$host_os" in - # Guess yes on glibc systems. - *-gnu* | gnu*) gl_cv_func_signbit_builtins="guessing yes" ;; - # Guess yes on musl systems. - *-musl* | midipix*) gl_cv_func_signbit_builtins="guessing yes" ;; - # Guess yes on mingw, no on MSVC. - mingw*) if test -n "$GCC"; then - gl_cv_func_signbit_builtins="guessing yes" - else - gl_cv_func_signbit_builtins="guessing no" - fi - ;; - # If we don't know, obey --enable-cross-guesses. - *) gl_cv_func_signbit_builtins="$gl_cross_guess_normal" ;; + # Guess yes on glibc systems. + *-gnu* | gnu*) gl_cv_func_signbit_builtins="guessing yes" ;; + # Guess yes on musl systems. + *-musl*) gl_cv_func_signbit_builtins="guessing yes" ;; + # Guess yes on mingw, no on MSVC. + mingw*) if test -n "$GCC"; then + gl_cv_func_signbit_builtins="guessing yes" + else + gl_cv_func_signbit_builtins="guessing no" + fi + ;; + # If we don't know, obey --enable-cross-guesses. + *) gl_cv_func_signbit_builtins="$gl_cross_guess_normal" ;; esac ]) ]) diff -Nru mmv-2.5/m4/size_max.m4 mmv-2.5.1/m4/size_max.m4 --- mmv-2.5/m4/size_max.m4 2023-07-20 19:40:23.000000000 +0000 +++ mmv-2.5.1/m4/size_max.m4 2023-08-08 11:02:40.000000000 +0000 @@ -1,5 +1,5 @@ # size_max.m4 serial 12 -dnl Copyright (C) 2003, 2005-2006, 2008-2023 Free Software Foundation, Inc. +dnl Copyright (C) 2003, 2005-2006, 2008-2021 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 -Nru mmv-2.5/m4/sprintf-posix.m4 mmv-2.5.1/m4/sprintf-posix.m4 --- mmv-2.5/m4/sprintf-posix.m4 2023-07-20 19:40:23.000000000 +0000 +++ mmv-2.5.1/m4/sprintf-posix.m4 2023-08-08 11:02:40.000000000 +0000 @@ -1,34 +1,19 @@ -# sprintf-posix.m4 serial 16 -dnl Copyright (C) 2007-2023 Free Software Foundation, Inc. +# sprintf-posix.m4 serial 12 +dnl Copyright (C) 2007-2021 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_FUNC_SPRINTF_POSIX], [ - AC_REQUIRE([gl_FUNC_SPRINTF_IS_POSIX]) - if test $gl_cv_func_sprintf_posix = no; then - gl_PREREQ_VASNPRINTF_WITH_POSIX_EXTRAS - gl_REPLACE_VASNPRINTF - gl_REPLACE_SPRINTF - fi -]) - -dnl Test whether sprintf is POSIX compliant. -dnl Result is gl_cv_func_sprintf_posix. -AC_DEFUN([gl_FUNC_SPRINTF_IS_POSIX], -[ AC_REQUIRE([gl_PRINTF_SIZES_C99]) - AC_REQUIRE([gl_PRINTF_SIZES_C23]) AC_REQUIRE([gl_PRINTF_LONG_DOUBLE]) AC_REQUIRE([gl_PRINTF_INFINITE]) AC_REQUIRE([gl_PRINTF_INFINITE_LONG_DOUBLE]) AC_REQUIRE([gl_PRINTF_DIRECTIVE_A]) - AC_REQUIRE([gl_PRINTF_DIRECTIVE_B]) AC_REQUIRE([gl_PRINTF_DIRECTIVE_F]) AC_REQUIRE([gl_PRINTF_DIRECTIVE_N]) AC_REQUIRE([gl_PRINTF_DIRECTIVE_LS]) - AC_REQUIRE([gl_PRINTF_DIRECTIVE_LC]) AC_REQUIRE([gl_PRINTF_POSITIONS]) AC_REQUIRE([gl_PRINTF_FLAG_GROUPING]) AC_REQUIRE([gl_PRINTF_FLAG_LEFTADJUST]) @@ -38,47 +23,35 @@ gl_cv_func_sprintf_posix=no case "$gl_cv_func_printf_sizes_c99" in *yes) - case "$gl_cv_func_printf_sizes_c23" in + case "$gl_cv_func_printf_long_double" in *yes) - case "$gl_cv_func_printf_long_double" in + case "$gl_cv_func_printf_infinite" in *yes) - case "$gl_cv_func_printf_infinite" in + case "$gl_cv_func_printf_infinite_long_double" in *yes) - case "$gl_cv_func_printf_infinite_long_double" in + case "$gl_cv_func_printf_directive_a" in *yes) - case "$gl_cv_func_printf_directive_a" in + case "$gl_cv_func_printf_directive_f" in *yes) - case "$gl_cv_func_printf_directive_b" in + case "$gl_cv_func_printf_directive_n" in *yes) - case "$gl_cv_func_printf_directive_f" in + case "$gl_cv_func_printf_directive_ls" in *yes) - case "$gl_cv_func_printf_directive_n" in + case "$gl_cv_func_printf_positions" in *yes) - case "$gl_cv_func_printf_directive_ls" in + case "$gl_cv_func_printf_flag_grouping" in *yes) - case "$gl_cv_func_printf_directive_lc" in + case "$gl_cv_func_printf_flag_leftadjust" in *yes) - case "$gl_cv_func_printf_positions" in + case "$gl_cv_func_printf_flag_zero" in *yes) - case "$gl_cv_func_printf_flag_grouping" in + case "$gl_cv_func_printf_precision" in *yes) - case "$gl_cv_func_printf_flag_leftadjust" in + case "$gl_cv_func_printf_enomem" in *yes) - case "$gl_cv_func_printf_flag_zero" in - *yes) - case "$gl_cv_func_printf_precision" in - *yes) - case "$gl_cv_func_printf_enomem" in - *yes) - # sprintf exists and is - # already POSIX compliant. - gl_cv_func_sprintf_posix=yes - ;; - esac - ;; - esac - ;; - esac + # sprintf exists and is + # already POSIX compliant. + gl_cv_func_sprintf_posix=yes ;; esac ;; @@ -107,6 +80,21 @@ esac ;; esac + if test $gl_cv_func_sprintf_posix = no; then + gl_PREREQ_VASNPRINTF_LONG_DOUBLE + gl_PREREQ_VASNPRINTF_INFINITE_DOUBLE + gl_PREREQ_VASNPRINTF_INFINITE_LONG_DOUBLE + gl_PREREQ_VASNPRINTF_DIRECTIVE_A + gl_PREREQ_VASNPRINTF_DIRECTIVE_F + gl_PREREQ_VASNPRINTF_DIRECTIVE_LS + gl_PREREQ_VASNPRINTF_FLAG_GROUPING + gl_PREREQ_VASNPRINTF_FLAG_LEFTADJUST + gl_PREREQ_VASNPRINTF_FLAG_ZERO + gl_PREREQ_VASNPRINTF_PRECISION + gl_PREREQ_VASNPRINTF_ENOMEM + gl_REPLACE_VASNPRINTF + gl_REPLACE_SPRINTF + fi ]) AC_DEFUN([gl_REPLACE_SPRINTF], diff -Nru mmv-2.5/m4/ssize_t.m4 mmv-2.5.1/m4/ssize_t.m4 --- mmv-2.5/m4/ssize_t.m4 2023-07-20 19:40:23.000000000 +0000 +++ mmv-2.5.1/m4/ssize_t.m4 2023-08-08 11:02:40.000000000 +0000 @@ -1,37 +1,23 @@ -# ssize_t.m4 serial 6 -dnl Copyright (C) 2001-2003, 2006, 2010-2023 Free Software Foundation, Inc. +# ssize_t.m4 serial 5 (gettext-0.18.2) +dnl Copyright (C) 2001-2003, 2006, 2010-2021 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 Bruno Haible. -dnl Define ssize_t if it does not already exist. +dnl Test whether ssize_t is defined. AC_DEFUN([gt_TYPE_SSIZE_T], [ - AC_CACHE_CHECK([for ssize_t], [gl_cv_ssize_t], + AC_CACHE_CHECK([for ssize_t], [gt_cv_ssize_t], [AC_COMPILE_IFELSE( [AC_LANG_PROGRAM( [[#include ]], [[int x = sizeof (ssize_t *) + sizeof (ssize_t); return !x;]])], - [gl_cv_ssize_t=yes], [gl_cv_ssize_t=no])]) - if test $gl_cv_ssize_t = no; then - dnl On 64-bit native Windows, ssize_t needs to be defined as 'long long', - dnl for consistency with the 64-bit size_t. - AC_CACHE_CHECK([whether size_t is wider than 'long'], [gl_cv_size_t_large], - [AC_COMPILE_IFELSE( - [AC_LANG_PROGRAM( - [[#include - typedef int array [2 * (sizeof (size_t) > sizeof (long)) - 1]; - ]])], - [gl_cv_size_t_large=yes], [gl_cv_size_t_large=no])]) - if test $gl_cv_size_t_large = yes; then - gl_def_ssize_t='long long' - else - gl_def_ssize_t='long' - fi - AC_DEFINE_UNQUOTED([ssize_t], [$gl_def_ssize_t], - [Define as a signed type of the same size as size_t.]) + [gt_cv_ssize_t=yes], [gt_cv_ssize_t=no])]) + if test $gt_cv_ssize_t = no; then + AC_DEFINE([ssize_t], [int], + [Define as a signed type of the same size as size_t.]) fi ]) diff -Nru mmv-2.5/m4/stat-time.m4 mmv-2.5.1/m4/stat-time.m4 --- mmv-2.5/m4/stat-time.m4 2023-07-20 19:40:23.000000000 +0000 +++ mmv-2.5.1/m4/stat-time.m4 2023-08-08 11:02:40.000000000 +0000 @@ -1,6 +1,6 @@ # Checks for stat-related time functions. -# Copyright (C) 1998-1999, 2001, 2003, 2005-2007, 2009-2023 Free Software +# Copyright (C) 1998-1999, 2001, 2003, 2005-2007, 2009-2021 Free Software # Foundation, Inc. # This file is free software; the Free Software Foundation diff -Nru mmv-2.5/m4/stat.m4 mmv-2.5.1/m4/stat.m4 --- mmv-2.5/m4/stat.m4 2023-07-20 19:40:23.000000000 +0000 +++ mmv-2.5.1/m4/stat.m4 2023-08-08 11:02:40.000000000 +0000 @@ -1,6 +1,6 @@ -# serial 19 +# serial 17 -# Copyright (C) 2009-2023 Free Software Foundation, Inc. +# Copyright (C) 2009-2021 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -45,8 +45,6 @@ [case "$host_os" in # Guess yes on Linux systems. linux-* | linux) gl_cv_func_stat_file_slash="guessing yes" ;; - # Guess yes on systems that emulate the Linux system calls. - midipix*) gl_cv_func_stat_file_slash="guessing yes" ;; # Guess yes on glibc systems. *-gnu* | gnu*) gl_cv_func_stat_file_slash="guessing yes" ;; # If we don't know, obey --enable-cross-guesses. @@ -71,7 +69,7 @@ # Prerequisites of lib/stat.c and lib/stat-w32.c. AC_DEFUN([gl_PREREQ_STAT], [ - AC_REQUIRE([gl_SYS_STAT_H]) + AC_REQUIRE([gl_HEADER_SYS_STAT_H]) AC_REQUIRE([gl_PREREQ_STAT_W32]) : ]) diff -Nru mmv-2.5/m4/stdalign.m4 mmv-2.5.1/m4/stdalign.m4 --- mmv-2.5/m4/stdalign.m4 2023-07-20 19:40:23.000000000 +0000 +++ mmv-2.5.1/m4/stdalign.m4 1970-01-01 00:00:00.000000000 +0000 @@ -1,200 +0,0 @@ -# Check for alignas and alignof that conform to C23. - -dnl Copyright 2011-2023 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 Written by Paul Eggert and Bruno Haible. - -# Prepare for substituting if it is not supported. - -AC_DEFUN([gl_ALIGNASOF], -[ - AC_CACHE_CHECK([for alignas and alignof], - [gl_cv_header_working_stdalign_h], - [gl_save_CFLAGS=$CFLAGS - for gl_working in "yes, keywords" "yes, macros"; do - AS_CASE([$gl_working], - [*stdalign.h*], [CFLAGS="$gl_save_CFLAGS -DINCLUDE_STDALIGN_H"]) - AC_COMPILE_IFELSE( - [AC_LANG_PROGRAM( - [[#include - #ifdef INCLUDE_STDALIGN_H - #include - #endif - #include - - /* Test that alignof yields a result consistent with offsetof. - This catches GCC bug 52023 - . */ - #ifdef __cplusplus - template struct alignof_helper { char a; t b; }; - # define ao(type) offsetof (alignof_helper, b) - #else - # define ao(type) offsetof (struct { char a; type b; }, b) - #endif - char test_double[ao (double) % _Alignof (double) == 0 ? 1 : -1]; - char test_long[ao (long int) % _Alignof (long int) == 0 ? 1 : -1]; - char test_alignof[alignof (double) == _Alignof (double) ? 1 : -1]; - - /* Test alignas only on platforms where gnulib can help. */ - #if \ - ((defined __cplusplus && 201103 <= __cplusplus) \ - || (__TINYC__ && defined __attribute__) \ - || (defined __APPLE__ && defined __MACH__ \ - ? 4 < __GNUC__ + (1 <= __GNUC_MINOR__) \ - : __GNUC__) \ - || (__ia64 && (61200 <= __HP_cc || 61200 <= __HP_aCC)) \ - || __ICC || 0x590 <= __SUNPRO_C || 0x0600 <= __xlC__ \ - || 1300 <= _MSC_VER) - struct alignas_test { char c; char alignas (8) alignas_8; }; - char test_alignas[offsetof (struct alignas_test, alignas_8) == 8 - ? 1 : -1]; - #endif - ]])], - [gl_cv_header_working_stdalign_h=$gl_working], - [gl_cv_header_working_stdalign_h=no]) - - CFLAGS=$gl_save_CFLAGS - test "$gl_cv_header_working_stdalign_h" != no && break - done]) - - AS_CASE([$gl_cv_header_working_stdalign_h], - [yes*keyword*], - [AC_DEFINE([HAVE_C_ALIGNASOF], [1], - [Define to 1 if the alignas and alignof keywords work.])]) - - dnl The "zz" puts this toward config.h's end, to avoid potential - dnl collisions with other definitions. - AH_VERBATIM([zzalignas], -[#if !defined HAVE_C_ALIGNASOF && __cplusplus < 201103 && !defined alignof -# if HAVE_STDALIGN_H -# include -# endif - -/* ISO C23 alignas and alignof for platforms that lack it. - - References: - ISO C23 (latest free draft - ) - sections 6.5.3.4, 6.7.5, 7.15. - C++11 (latest free draft - ) - section 18.10. */ - -/* alignof (TYPE), also known as _Alignof (TYPE), yields the alignment - requirement of a structure member (i.e., slot or field) that is of - type TYPE, as an integer constant expression. - - This differs from GCC's and clang's __alignof__ operator, which can - yield a better-performing alignment for an object of that type. For - example, on x86 with GCC and on Linux/x86 with clang, - __alignof__ (double) and __alignof__ (long long) are 8, whereas - alignof (double) and alignof (long long) are 4 unless the option - '-malign-double' is used. - - The result cannot be used as a value for an 'enum' constant, if you - want to be portable to HP-UX 10.20 cc and AIX 3.2.5 xlc. */ - -/* GCC releases before GCC 4.9 had a bug in _Alignof. See GCC bug 52023 - . - clang versions < 8.0.0 have the same bug. */ -# if (!defined __STDC_VERSION__ || __STDC_VERSION__ < 201112 \ - || (defined __GNUC__ && __GNUC__ < 4 + (__GNUC_MINOR__ < 9) \ - && !defined __clang__) \ - || (defined __clang__ && __clang_major__ < 8)) -# undef/**/_Alignof -# ifdef __cplusplus -# if (201103 <= __cplusplus || defined _MSC_VER) -# define _Alignof(type) alignof (type) -# else - template struct __alignof_helper { char __a; __t __b; }; -# define _Alignof(type) offsetof (__alignof_helper, __b) -# define _GL_STDALIGN_NEEDS_STDDEF 1 -# endif -# else -# if (defined __GNUC__ && 4 <= __GNUC__) || defined __clang__ -# define _Alignof(type) __builtin_offsetof (struct { char __a; type __b; }, __b) -# else -# define _Alignof(type) offsetof (struct { char __a; type __b; }, __b) -# define _GL_STDALIGN_NEEDS_STDDEF 1 -# endif -# endif -# endif -# if ! (defined __cplusplus && (201103 <= __cplusplus || defined _MSC_VER)) -# undef/**/alignof -# define alignof _Alignof -# endif - -/* alignas (A), also known as _Alignas (A), aligns a variable or type - to the alignment A, where A is an integer constant expression. For - example: - - int alignas (8) foo; - struct s { int a; int alignas (8) bar; }; - - aligns the address of FOO and the offset of BAR to be multiples of 8. - - A should be a power of two that is at least the type's alignment - and at most the implementation's alignment limit. This limit is - 2**28 on typical GNUish hosts, and 2**13 on MSVC. To be portable - to MSVC through at least version 10.0, A should be an integer - constant, as MSVC does not support expressions such as 1 << 3. - To be portable to Sun C 5.11, do not align auto variables to - anything stricter than their default alignment. - - The following C23 requirements are not supported here: - - - If A is zero, alignas has no effect. - - alignas can be used multiple times; the strictest one wins. - - alignas (TYPE) is equivalent to alignas (alignof (TYPE)). - - */ -# if !defined __STDC_VERSION__ || __STDC_VERSION__ < 201112 -# if defined __cplusplus && (201103 <= __cplusplus || defined _MSC_VER) -# define _Alignas(a) alignas (a) -# elif (!defined __attribute__ \ - && ((defined __APPLE__ && defined __MACH__ \ - ? 4 < __GNUC__ + (1 <= __GNUC_MINOR__) \ - : __GNUC__ && !defined __ibmxl__) \ - || (4 <= __clang_major__) \ - || (__ia64 && (61200 <= __HP_cc || 61200 <= __HP_aCC)) \ - || __ICC || 0x590 <= __SUNPRO_C || 0x0600 <= __xlC__)) -# define _Alignas(a) __attribute__ ((__aligned__ (a))) -# elif 1300 <= _MSC_VER -# define _Alignas(a) __declspec (align (a)) -# endif -# endif -# if !HAVE_STDALIGN_H -# if ((defined _Alignas \ - && !(defined __cplusplus \ - && (201103 <= __cplusplus || defined _MSC_VER))) \ - || (defined __STDC_VERSION__ && 201112 <= __STDC_VERSION__)) -# define alignas _Alignas -# endif -# endif - -# if _GL_STDALIGN_NEEDS_STDDEF -# include -# endif -#endif]) -]) - -AC_DEFUN([gl_STDALIGN_H], -[ - AC_REQUIRE([gl_ALIGNASOF]) - if test "$gl_cv_header_working_stdalign_h" = no; then - GL_GENERATE_STDALIGN_H=true - else - GL_GENERATE_STDALIGN_H=false - fi - - gl_CHECK_NEXT_HEADERS([stdalign.h]) - if test $ac_cv_header_stdalign_h = yes; then - HAVE_STDALIGN_H=1 - else - HAVE_STDALIGN_H=0 - fi - AC_SUBST([HAVE_STDALIGN_H]) -]) diff -Nru mmv-2.5/m4/stdbool.m4 mmv-2.5.1/m4/stdbool.m4 --- mmv-2.5/m4/stdbool.m4 1970-01-01 00:00:00.000000000 +0000 +++ mmv-2.5.1/m4/stdbool.m4 2023-08-08 11:02:40.000000000 +0000 @@ -0,0 +1,122 @@ +# Check for stdbool.h that conforms to C99. + +dnl Copyright (C) 2002-2006, 2009-2021 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. + +#serial 8 + +# Prepare for substituting if it is not supported. + +AC_DEFUN([AM_STDBOOL_H], +[ + AC_REQUIRE([AC_CHECK_HEADER_STDBOOL]) + AC_REQUIRE([AC_CANONICAL_HOST]) + + dnl On some platforms, does not exist or does not conform to C99. + dnl On Solaris 10 with CC=cc CXX=CC, exists but is not usable + dnl in C++ mode (and no exists). In this case, we use our + dnl replacement, also in C mode (for binary compatibility between C and C++). + if test "$ac_cv_header_stdbool_h" = yes; then + case "$host_os" in + solaris*) + if test -z "$GCC"; then + STDBOOL_H='stdbool.h' + else + STDBOOL_H='' + fi + ;; + *) + STDBOOL_H='' + ;; + esac + else + STDBOOL_H='stdbool.h' + fi + AC_SUBST([STDBOOL_H]) + AM_CONDITIONAL([GL_GENERATE_STDBOOL_H], [test -n "$STDBOOL_H"]) + + if test "$ac_cv_type__Bool" = yes; then + HAVE__BOOL=1 + else + HAVE__BOOL=0 + fi + AC_SUBST([HAVE__BOOL]) +]) + +# AM_STDBOOL_H will be renamed to gl_STDBOOL_H in the future. +AC_DEFUN([gl_STDBOOL_H], [AM_STDBOOL_H]) + +# This version of the macro is needed in autoconf <= 2.68. + +AC_DEFUN([AC_CHECK_HEADER_STDBOOL], + [AC_CACHE_CHECK([for stdbool.h that conforms to C99], + [ac_cv_header_stdbool_h], + [AC_COMPILE_IFELSE( + [AC_LANG_PROGRAM( + [[ + #include + + #ifdef __cplusplus + typedef bool Bool; + #else + typedef _Bool Bool; + #ifndef bool + "error: bool is not defined" + #endif + #ifndef false + "error: false is not defined" + #endif + #if false + "error: false is not 0" + #endif + #ifndef true + "error: true is not defined" + #endif + #if true != 1 + "error: true is not 1" + #endif + #endif + + #ifndef __bool_true_false_are_defined + "error: __bool_true_false_are_defined is not defined" + #endif + + struct s { Bool s: 1; Bool t; bool u: 1; bool v; } s; + + char a[true == 1 ? 1 : -1]; + char b[false == 0 ? 1 : -1]; + char c[__bool_true_false_are_defined == 1 ? 1 : -1]; + char d[(bool) 0.5 == true ? 1 : -1]; + /* See body of main program for 'e'. */ + char f[(Bool) 0.0 == false ? 1 : -1]; + char g[true]; + char h[sizeof (Bool)]; + char i[sizeof s.t]; + enum { j = false, k = true, l = false * true, m = true * 256 }; + /* The following fails for + HP aC++/ANSI C B3910B A.05.55 [Dec 04 2003]. */ + Bool n[m]; + char o[sizeof n == m * sizeof n[0] ? 1 : -1]; + char p[-1 - (Bool) 0 < 0 && -1 - (bool) 0 < 0 ? 1 : -1]; + /* Catch a bug in an HP-UX C compiler. See + https://gcc.gnu.org/ml/gcc-patches/2003-12/msg02303.html + https://lists.gnu.org/r/bug-coreutils/2005-11/msg00161.html + */ + Bool q = true; + Bool *pq = &q; + bool *qq = &q; + ]], + [[ + bool e = &s; + *pq |= q; *pq |= ! q; + *qq |= q; *qq |= ! q; + /* Refer to every declared value, to avoid compiler optimizations. */ + return (!a + !b + !c + !d + !e + !f + !g + !h + !i + !!j + !k + !!l + + !m + !n + !o + !p + !q + !pq + !qq); + ]])], + [ac_cv_header_stdbool_h=yes], + [ac_cv_header_stdbool_h=no])]) + AC_CHECK_TYPES([_Bool]) +]) diff -Nru mmv-2.5/m4/stddef_h.m4 mmv-2.5.1/m4/stddef_h.m4 --- mmv-2.5/m4/stddef_h.m4 2023-07-20 19:40:23.000000000 +0000 +++ mmv-2.5.1/m4/stddef_h.m4 2023-08-08 11:02:40.000000000 +0000 @@ -1,12 +1,12 @@ -# stddef_h.m4 serial 14 -dnl Copyright (C) 2009-2023 Free Software Foundation, Inc. +# stddef_h.m4 serial 9 +dnl Copyright (C) 2009-2021 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 A placeholder for , for platforms that have issues. -AC_DEFUN_ONCE([gl_STDDEF_H], +AC_DEFUN([gl_STDDEF_H], [ AC_REQUIRE([gl_STDDEF_H_DEFAULTS]) AC_REQUIRE([gt_TYPE_WCHAR_T]) @@ -14,7 +14,7 @@ dnl Persuade OpenBSD to declare max_align_t. AC_REQUIRE([gl_USE_SYSTEM_EXTENSIONS]) - GL_GENERATE_STDDEF_H=false + STDDEF_H= dnl Test whether the type max_align_t exists and whether its alignment dnl "is as great as is supported by the implementation in all contexts". @@ -22,14 +22,7 @@ [gl_cv_type_max_align_t], [AC_COMPILE_IFELSE( [AC_LANG_PROGRAM( - [[/* On FreeBSD 12.0/x86, max_align_t defined by has - the correct alignment with the default (wrong) definition of - _Alignof, but a wrong alignment as soon as we activate an - ISO C compliant _Alignof definition. */ - #if ((defined __GNUC__ && 4 <= __GNUC__) || defined __clang__) && !defined __cplusplus - #define _Alignof(type) __builtin_offsetof (struct { char __a; type __b; }, __b) - #endif - #include + [[#include unsigned int s = sizeof (max_align_t); #if defined __GNUC__ || defined __clang__ || defined __IBM__ALIGNOF__ int check1[2 * (__alignof__ (double) <= __alignof__ (max_align_t)) - 1]; @@ -48,12 +41,12 @@ ]) if test $gl_cv_type_max_align_t = no; then HAVE_MAX_ALIGN_T=0 - GL_GENERATE_STDDEF_H=true + STDDEF_H=stddef.h fi if test $gt_cv_c_wchar_t = no; then HAVE_WCHAR_T=0 - GL_GENERATE_STDDEF_H=true + STDDEF_H=stddef.h fi AC_CACHE_CHECK([whether NULL can be used in arbitrary expressions], @@ -65,49 +58,21 @@ [gl_cv_decl_null_works=no])]) if test $gl_cv_decl_null_works = no; then REPLACE_NULL=1 - GL_GENERATE_STDDEF_H=true + STDDEF_H=stddef.h fi - AC_CACHE_CHECK([for unreachable], - [gl_cv_func_unreachable], - [AC_LINK_IFELSE( - [AC_LANG_PROGRAM( - [[#include - ]], - [[unreachable (); - ]])], - [gl_cv_func_unreachable=yes], - [gl_cv_func_unreachable=no]) - ]) - if test $gl_cv_func_unreachable = no; then - GL_GENERATE_STDDEF_H=true - fi - - if $GL_GENERATE_STDDEF_H; then + AC_SUBST([STDDEF_H]) + AM_CONDITIONAL([GL_GENERATE_STDDEF_H], [test -n "$STDDEF_H"]) + if test -n "$STDDEF_H"; then gl_NEXT_HEADERS([stddef.h]) fi ]) -# gl_STDDEF_MODULE_INDICATOR([modulename]) -# sets the shell variable that indicates the presence of the given module -# to a C preprocessor expression that will evaluate to 1. -# This macro invocation must not occur in macros that are AC_REQUIREd. AC_DEFUN([gl_STDDEF_MODULE_INDICATOR], [ - dnl Ensure to expand the default settings once only. - gl_STDDEF_H_REQUIRE_DEFAULTS - gl_MODULE_INDICATOR_SET_VARIABLE([$1]) -]) - -# Initializes the default values for AC_SUBSTed shell variables. -# This macro must not be AC_REQUIREd. It must only be invoked, and only -# outside of macros or in macros that are not AC_REQUIREd. -AC_DEFUN([gl_STDDEF_H_REQUIRE_DEFAULTS], -[ - m4_defun(GL_MODULE_INDICATOR_PREFIX[_STDDEF_H_MODULE_INDICATOR_DEFAULTS], [ - ]) - m4_require(GL_MODULE_INDICATOR_PREFIX[_STDDEF_H_MODULE_INDICATOR_DEFAULTS]) + dnl Use AC_REQUIRE here, so that the default settings are expanded once only. AC_REQUIRE([gl_STDDEF_H_DEFAULTS]) + gl_MODULE_INDICATOR_SET_VARIABLE([$1]) ]) AC_DEFUN([gl_STDDEF_H_DEFAULTS], diff -Nru mmv-2.5/m4/stdint.m4 mmv-2.5.1/m4/stdint.m4 --- mmv-2.5/m4/stdint.m4 2023-07-20 19:40:23.000000000 +0000 +++ mmv-2.5.1/m4/stdint.m4 2023-08-08 11:02:40.000000000 +0000 @@ -1,5 +1,5 @@ -# stdint.m4 serial 61 -dnl Copyright (C) 2001-2023 Free Software Foundation, Inc. +# stdint.m4 serial 58 +dnl Copyright (C) 2001-2021 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. @@ -170,7 +170,7 @@ PTRDIFF_MIN == TYPE_MINIMUM (ptrdiff_t) && PTRDIFF_MAX == TYPE_MAXIMUM (ptrdiff_t) ? 1 : -1; - /* Detect bug in FreeBSD 6.0/ia64 and FreeBSD 13.0/arm64. */ + /* Detect bug in FreeBSD 6.0 / ia64. */ int check_SIG_ATOMIC: SIG_ATOMIC_MIN == TYPE_MINIMUM (sig_atomic_t) && SIG_ATOMIC_MAX == TYPE_MAXIMUM (sig_atomic_t) @@ -296,7 +296,7 @@ HAVE_C99_STDINT_H=0 HAVE_SYS_BITYPES_H=0 HAVE_SYS_INTTYPES_H=0 - GL_GENERATE_STDINT_H=true + STDINT_H=stdint.h case "$gl_cv_header_working_stdint_h" in *yes) HAVE_C99_STDINT_H=1 @@ -341,7 +341,7 @@ ]])], [gl_cv_header_stdint_width=yes])]) if test "$gl_cv_header_stdint_width" = yes; then - GL_GENERATE_STDINT_H=false + STDINT_H= fi ;; *) @@ -364,6 +364,8 @@ AC_SUBST([HAVE_C99_STDINT_H]) AC_SUBST([HAVE_SYS_BITYPES_H]) AC_SUBST([HAVE_SYS_INTTYPES_H]) + AC_SUBST([STDINT_H]) + AM_CONDITIONAL([GL_GENERATE_STDINT_H], [test -n "$STDINT_H"]) ]) dnl gl_STDINT_BITSIZEOF(TYPES, INCLUDES) @@ -525,7 +527,7 @@ dnl requirement that wint_t is "unchanged by default argument promotions". dnl In this case gnulib's and override wint_t. dnl Set the variable BITSIZEOF_WINT_T accordingly. - if test $GNULIBHEADERS_OVERRIDE_WINT_T = 1; then + if test $GNULIB_OVERRIDES_WINT_T = 1; then BITSIZEOF_WINT_T=32 fi ]) diff -Nru mmv-2.5/m4/stdint_h.m4 mmv-2.5.1/m4/stdint_h.m4 --- mmv-2.5/m4/stdint_h.m4 2023-07-20 19:40:23.000000000 +0000 +++ mmv-2.5.1/m4/stdint_h.m4 2023-08-08 11:02:40.000000000 +0000 @@ -1,5 +1,5 @@ # stdint_h.m4 serial 9 -dnl Copyright (C) 1997-2004, 2006, 2008-2023 Free Software Foundation, Inc. +dnl Copyright (C) 1997-2004, 2006, 2008-2021 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 -Nru mmv-2.5/m4/stdio_h.m4 mmv-2.5.1/m4/stdio_h.m4 --- mmv-2.5/m4/stdio_h.m4 2023-07-20 19:40:23.000000000 +0000 +++ mmv-2.5.1/m4/stdio_h.m4 2023-08-08 11:02:40.000000000 +0000 @@ -1,22 +1,11 @@ -# stdio_h.m4 serial 63 -dnl Copyright (C) 2007-2023 Free Software Foundation, Inc. +# stdio_h.m4 serial 52 +dnl Copyright (C) 2007-2021 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_EARLY], +AC_DEFUN([gl_STDIO_H], [ - dnl Defining __USE_MINGW_ANSI_STDIO to 1 must be done early, because - dnl the results of several configure tests depend on it: The tests - dnl - checking whether snprintf returns a byte count as in C99... - dnl - checking whether snprintf truncates the result as in C99... - dnl - checking whether printf supports the 'F' directive... - dnl - checking whether printf supports the grouping flag... - dnl - checking whether printf supports the zero flag correctly... - dnl - checking whether printf supports infinite 'double' arguments... - dnl - checking whether printf supports large precisions... - dnl report 'yes' if __USE_MINGW_ANSI_STDIO is 1 but 'no' if - dnl __USE_MINGW_ANSI_STDIO is not set. AH_VERBATIM([MINGW_ANSI_STDIO], [/* Use GNU style printf and scanf. */ #ifndef __USE_MINGW_ANSI_STDIO @@ -24,10 +13,6 @@ #endif ]) AC_DEFINE([__USE_MINGW_ANSI_STDIO]) -]) - -AC_DEFUN_ONCE([gl_STDIO_H], -[ AC_REQUIRE([gl_STDIO_H_DEFAULTS]) gl_NEXT_HEADERS([stdio.h]) @@ -55,35 +40,64 @@ attribute "__gnu_printf__" instead of "__printf__"]) fi - dnl For defining _PRINTF_NAN_LEN_MAX. - gl_MUSL_LIBC - - dnl This ifdef is an optimization, to avoid performing a configure check whose - dnl result is not used. But it does not make the test of - dnl GNULIB_STDIO_H_NONBLOCKING or GNULIB_NONBLOCKING redundant. + dnl No need to create extra modules for these functions. Everyone who uses + dnl 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 This ifdef is an optimization, to avoid performing a configure check whose - dnl result is not used. But it does not make the test of - dnl GNULIB_STDIO_H_SIGPIPE or GNULIB_SIGPIPE redundant. + dnl No need to create extra modules for these functions. Everyone who uses + dnl 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 an optimization, to avoid performing a configure check whose - dnl result is not used. But it does not make the test of - dnl GNULIB_STDIO_H_NONBLOCKING or GNULIB_NONBLOCKING redundant. + 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 ]) @@ -100,105 +114,79 @@ if test $ac_cv_have_decl_fcloseall = no; then HAVE_DECL_FCLOSEALL=0 fi - - AC_CHECK_DECLS_ONCE([getw]) - if test $ac_cv_have_decl_getw = no; then - HAVE_DECL_GETW=0 - fi - - AC_CHECK_DECLS_ONCE([putw]) - if test $ac_cv_have_decl_putw = no; then - HAVE_DECL_PUTW=0 - fi ]) -# gl_STDIO_MODULE_INDICATOR([modulename]) -# sets the shell variable that indicates the presence of the given module -# to a C preprocessor expression that will evaluate to 1. -# This macro invocation must not occur in macros that are AC_REQUIREd. AC_DEFUN([gl_STDIO_MODULE_INDICATOR], [ - dnl Ensure to expand the default settings once only. - gl_STDIO_H_REQUIRE_DEFAULTS + 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]) ]) -# Initializes the default values for AC_SUBSTed shell variables. -# This macro must not be AC_REQUIREd. It must only be invoked, and only -# outside of macros or in macros that are not AC_REQUIREd. -AC_DEFUN([gl_STDIO_H_REQUIRE_DEFAULTS], -[ - m4_defun(GL_MODULE_INDICATOR_PREFIX[_STDIO_H_MODULE_INDICATOR_DEFAULTS], [ - gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_DPRINTF]) - gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_FCLOSE]) - gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_FDOPEN]) - gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_FFLUSH]) - gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_FGETC]) - gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_FGETS]) - gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_FOPEN]) - gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_FOPEN_GNU]) - gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_FPRINTF]) - gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_FPRINTF_POSIX]) - gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_FPURGE]) - gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_FPUTC]) - gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_FPUTS]) - gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_FREAD]) - gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_FREOPEN]) - gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_FSCANF]) - gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_FSEEK]) - gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_FSEEKO]) - gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_FTELL]) - gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_FTELLO]) - gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_FWRITE]) - gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_GETC]) - gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_GETCHAR]) - gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_GETDELIM]) - gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_GETLINE]) - gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_OBSTACK_PRINTF]) - gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_OBSTACK_PRINTF_POSIX]) - gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_PCLOSE]) - gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_PERROR]) - gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_POPEN]) - gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_PRINTF]) - gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_PRINTF_POSIX]) - gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_PUTC]) - gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_PUTCHAR]) - gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_PUTS]) - gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_REMOVE]) - gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_RENAME]) - gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_RENAMEAT]) - gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_SCANF]) - gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_SNPRINTF]) - gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_SPRINTF_POSIX]) - gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_STDIO_H_NONBLOCKING]) - gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_STDIO_H_SIGPIPE]) - gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_TMPFILE]) - gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_VASPRINTF]) - gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_VFSCANF]) - gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_VSCANF]) - gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_VDPRINTF]) - gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_VFPRINTF]) - gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_VFPRINTF_POSIX]) - gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_VPRINTF]) - gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_VPRINTF_POSIX]) - gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_VSNPRINTF]) - gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_VSPRINTF_POSIX]) - dnl Support Microsoft deprecated alias function names by default. - gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MDA_FCLOSEALL], [1]) - gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MDA_FDOPEN], [1]) - gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MDA_FILENO], [1]) - gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MDA_GETW], [1]) - gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MDA_PUTW], [1]) - gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MDA_TEMPNAM], [1]) - ]) - m4_require(GL_MODULE_INDICATOR_PREFIX[_STDIO_H_MODULE_INDICATOR_DEFAULTS]) - AC_REQUIRE([gl_STDIO_H_DEFAULTS]) -]) - 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 Support Microsoft deprecated alias function names by default. + GNULIB_MDA_FCLOSEALL=1; AC_SUBST([GNULIB_MDA_FCLOSEALL]) + GNULIB_MDA_FDOPEN=1; AC_SUBST([GNULIB_MDA_FDOPEN]) + GNULIB_MDA_FILENO=1; AC_SUBST([GNULIB_MDA_FILENO]) + GNULIB_MDA_GETW=1; AC_SUBST([GNULIB_MDA_GETW]) + GNULIB_MDA_PUTW=1; AC_SUBST([GNULIB_MDA_PUTW]) + GNULIB_MDA_TEMPNAM=1; AC_SUBST([GNULIB_MDA_TEMPNAM]) dnl Assume proper GNU behavior unless another module says otherwise. HAVE_DECL_FCLOSEALL=1; AC_SUBST([HAVE_DECL_FCLOSEALL]) HAVE_DECL_FPURGE=1; AC_SUBST([HAVE_DECL_FPURGE]) @@ -206,9 +194,7 @@ 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_GETW=1; AC_SUBST([HAVE_DECL_GETW]) HAVE_DECL_OBSTACK_PRINTF=1; AC_SUBST([HAVE_DECL_OBSTACK_PRINTF]) - HAVE_DECL_PUTW=1; AC_SUBST([HAVE_DECL_PUTW]) 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]) @@ -224,7 +210,6 @@ REPLACE_FDOPEN=0; AC_SUBST([REPLACE_FDOPEN]) REPLACE_FFLUSH=0; AC_SUBST([REPLACE_FFLUSH]) REPLACE_FOPEN=0; AC_SUBST([REPLACE_FOPEN]) - REPLACE_FOPEN_FOR_FOPEN_GNU=0; AC_SUBST([REPLACE_FOPEN_FOR_FOPEN_GNU]) REPLACE_FPRINTF=0; AC_SUBST([REPLACE_FPRINTF]) REPLACE_FPURGE=0; AC_SUBST([REPLACE_FPURGE]) REPLACE_FREOPEN=0; AC_SUBST([REPLACE_FREOPEN]) diff -Nru mmv-2.5/m4/stdlib_h.m4 mmv-2.5.1/m4/stdlib_h.m4 --- mmv-2.5/m4/stdlib_h.m4 2023-07-20 19:40:23.000000000 +0000 +++ mmv-2.5.1/m4/stdlib_h.m4 2023-08-08 11:02:40.000000000 +0000 @@ -1,10 +1,10 @@ -# stdlib_h.m4 serial 75 -dnl Copyright (C) 2007-2023 Free Software Foundation, Inc. +# stdlib_h.m4 serial 55 +dnl Copyright (C) 2007-2021 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_ONCE([gl_STDLIB_H], +AC_DEFUN([gl_STDLIB_H], [ AC_REQUIRE([gl_STDLIB_H_DEFAULTS]) gl_NEXT_HEADERS([stdlib.h]) @@ -23,58 +23,15 @@ # include #endif ]], [_Exit aligned_alloc atoll canonicalize_file_name free - getloadavg getprogname getsubopt grantpt - initstate initstate_r mbstowcs mbtowc mkdtemp mkostemp mkostemps mkstemp - mkstemps posix_memalign posix_openpt ptsname ptsname_r qsort_r + getloadavg getsubopt grantpt + initstate initstate_r mbtowc mkdtemp mkostemp mkostemps mkstemp mkstemps + posix_memalign posix_openpt ptsname ptsname_r qsort_r random random_r reallocarray realpath rpmatch secure_getenv setenv setstate setstate_r srandom srandom_r - strtod strtol strtold strtoll strtoul strtoull unlockpt unsetenv]) + strtod strtold strtoll strtoull unlockpt unsetenv]) AC_REQUIRE([AC_C_RESTRICT]) - dnl Test whether MB_CUR_MAX needs to be overridden. - dnl On Solaris 10, in UTF-8 locales, its value is 3 but needs to be 4. - dnl Fortunately, we can do this because on this platform MB_LEN_MAX is 5. - AC_REQUIRE([AC_CANONICAL_HOST]) - AC_REQUIRE([gt_LOCALE_FR_UTF8]) - AC_CACHE_CHECK([whether MB_CUR_MAX is correct], - [gl_cv_macro_MB_CUR_MAX_good], - [ - dnl Initial guess, used when cross-compiling or when no suitable locale - dnl is present. -changequote(,)dnl - case "$host_os" in - # Guess no on Solaris. - solaris*) gl_cv_macro_MB_CUR_MAX_good="guessing no" ;; - # Guess yes otherwise. - *) gl_cv_macro_MB_CUR_MAX_good="guessing yes" ;; - esac -changequote([,])dnl - if test $LOCALE_FR_UTF8 != none; then - AC_RUN_IFELSE( - [AC_LANG_SOURCE([[ -#include -#include -int main () -{ - int result = 0; - if (setlocale (LC_ALL, "$LOCALE_FR_UTF8") != NULL) - { - if (MB_CUR_MAX < 4) - result |= 1; - } - return result; -}]])], - [gl_cv_macro_MB_CUR_MAX_good=yes], - [gl_cv_macro_MB_CUR_MAX_good=no], - [:]) - fi - ]) - case "$gl_cv_macro_MB_CUR_MAX_good" in - *yes) ;; - *) REPLACE_MB_CUR_MAX=1 ;; - esac - AC_CHECK_DECLS_ONCE([ecvt]) if test $ac_cv_have_decl_ecvt = no; then HAVE_DECL_ECVT=0 @@ -89,83 +46,61 @@ fi ]) -# gl_STDLIB_MODULE_INDICATOR([modulename]) -# sets the shell variable that indicates the presence of the given module -# to a C preprocessor expression that will evaluate to 1. -# This macro invocation must not occur in macros that are AC_REQUIREd. AC_DEFUN([gl_STDLIB_MODULE_INDICATOR], [ - dnl Ensure to expand the default settings once only. - gl_STDLIB_H_REQUIRE_DEFAULTS + dnl Use AC_REQUIRE here, so that the default settings are expanded once only. + AC_REQUIRE([gl_STDLIB_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]) ]) -# Initializes the default values for AC_SUBSTed shell variables. -# This macro must not be AC_REQUIREd. It must only be invoked, and only -# outside of macros or in macros that are not AC_REQUIREd. -AC_DEFUN([gl_STDLIB_H_REQUIRE_DEFAULTS], -[ - m4_defun(GL_MODULE_INDICATOR_PREFIX[_STDLIB_H_MODULE_INDICATOR_DEFAULTS], [ - gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB__EXIT]) - gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_ALIGNED_ALLOC]) - gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_ATOLL]) - gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_CALLOC_GNU]) - gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_CALLOC_POSIX]) - gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_CANONICALIZE_FILE_NAME]) - gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_FREE_POSIX]) - gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_GETLOADAVG]) - gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_GETPROGNAME]) - gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_GETSUBOPT]) - gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_GRANTPT]) - gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MALLOC_GNU]) - gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MALLOC_POSIX]) - gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MBSTOWCS]) - gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MBTOWC]) - gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MKDTEMP]) - gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MKOSTEMP]) - gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MKOSTEMPS]) - gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MKSTEMP]) - gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MKSTEMPS]) - gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_POSIX_MEMALIGN]) - gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_POSIX_OPENPT]) - gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_PTSNAME]) - gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_PTSNAME_R]) - gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_PUTENV]) - gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_QSORT_R]) - gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_RANDOM]) - gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_RANDOM_R]) - gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_REALLOCARRAY]) - gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_REALLOC_GNU]) - gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_REALLOC_POSIX]) - gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_REALPATH]) - gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_RPMATCH]) - gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_SECURE_GETENV]) - gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_SETENV]) - gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_STRTOD]) - gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_STRTOL]) - gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_STRTOLD]) - gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_STRTOLL]) - gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_STRTOUL]) - gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_STRTOULL]) - gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_SYSTEM_POSIX]) - gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_UNLOCKPT]) - gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_UNSETENV]) - gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_WCTOMB]) - dnl Support Microsoft deprecated alias function names by default. - gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MDA_ECVT], [1]) - gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MDA_FCVT], [1]) - gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MDA_GCVT], [1]) - gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MDA_MKTEMP], [1]) - gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MDA_PUTENV], [1]) - ]) - m4_require(GL_MODULE_INDICATOR_PREFIX[_STDLIB_H_MODULE_INDICATOR_DEFAULTS]) - AC_REQUIRE([gl_STDLIB_H_DEFAULTS]) -]) - AC_DEFUN([gl_STDLIB_H_DEFAULTS], [ + GNULIB__EXIT=0; AC_SUBST([GNULIB__EXIT]) + GNULIB_ALIGNED_ALLOC=0; AC_SUBST([GNULIB_ALIGNED_ALLOC]) + GNULIB_ATOLL=0; AC_SUBST([GNULIB_ATOLL]) + GNULIB_CALLOC_POSIX=0; AC_SUBST([GNULIB_CALLOC_POSIX]) + GNULIB_CANONICALIZE_FILE_NAME=0; AC_SUBST([GNULIB_CANONICALIZE_FILE_NAME]) + GNULIB_FREE_POSIX=0; AC_SUBST([GNULIB_FREE_POSIX]) + GNULIB_GETLOADAVG=0; AC_SUBST([GNULIB_GETLOADAVG]) + GNULIB_GETSUBOPT=0; AC_SUBST([GNULIB_GETSUBOPT]) + GNULIB_GRANTPT=0; AC_SUBST([GNULIB_GRANTPT]) + GNULIB_MALLOC_POSIX=0; AC_SUBST([GNULIB_MALLOC_POSIX]) + GNULIB_MBTOWC=0; AC_SUBST([GNULIB_MBTOWC]) + GNULIB_MKDTEMP=0; AC_SUBST([GNULIB_MKDTEMP]) + GNULIB_MKOSTEMP=0; AC_SUBST([GNULIB_MKOSTEMP]) + GNULIB_MKOSTEMPS=0; AC_SUBST([GNULIB_MKOSTEMPS]) + GNULIB_MKSTEMP=0; AC_SUBST([GNULIB_MKSTEMP]) + GNULIB_MKSTEMPS=0; AC_SUBST([GNULIB_MKSTEMPS]) + GNULIB_POSIX_MEMALIGN=0;AC_SUBST([GNULIB_POSIX_MEMALIGN]) + GNULIB_POSIX_OPENPT=0; AC_SUBST([GNULIB_POSIX_OPENPT]) + GNULIB_PTSNAME=0; AC_SUBST([GNULIB_PTSNAME]) + GNULIB_PTSNAME_R=0; AC_SUBST([GNULIB_PTSNAME_R]) + GNULIB_PUTENV=0; AC_SUBST([GNULIB_PUTENV]) + GNULIB_QSORT_R=0; AC_SUBST([GNULIB_QSORT_R]) + GNULIB_RANDOM=0; AC_SUBST([GNULIB_RANDOM]) + GNULIB_RANDOM_R=0; AC_SUBST([GNULIB_RANDOM_R]) + GNULIB_REALLOCARRAY=0; AC_SUBST([GNULIB_REALLOCARRAY]) + GNULIB_REALLOC_POSIX=0; AC_SUBST([GNULIB_REALLOC_POSIX]) + GNULIB_REALPATH=0; AC_SUBST([GNULIB_REALPATH]) + GNULIB_RPMATCH=0; AC_SUBST([GNULIB_RPMATCH]) + GNULIB_SECURE_GETENV=0; AC_SUBST([GNULIB_SECURE_GETENV]) + GNULIB_SETENV=0; AC_SUBST([GNULIB_SETENV]) + GNULIB_STRTOD=0; AC_SUBST([GNULIB_STRTOD]) + GNULIB_STRTOLD=0; AC_SUBST([GNULIB_STRTOLD]) + GNULIB_STRTOLL=0; AC_SUBST([GNULIB_STRTOLL]) + GNULIB_STRTOULL=0; AC_SUBST([GNULIB_STRTOULL]) + GNULIB_SYSTEM_POSIX=0; AC_SUBST([GNULIB_SYSTEM_POSIX]) + GNULIB_UNLOCKPT=0; AC_SUBST([GNULIB_UNLOCKPT]) + GNULIB_UNSETENV=0; AC_SUBST([GNULIB_UNSETENV]) + GNULIB_WCTOMB=0; AC_SUBST([GNULIB_WCTOMB]) + dnl Support Microsoft deprecated alias function names by default. + GNULIB_MDA_ECVT=1; AC_SUBST([GNULIB_MDA_ECVT]) + GNULIB_MDA_FCVT=1; AC_SUBST([GNULIB_MDA_FCVT]) + GNULIB_MDA_GCVT=1; AC_SUBST([GNULIB_MDA_GCVT]) + GNULIB_MDA_MKTEMP=1; AC_SUBST([GNULIB_MDA_MKTEMP]) + GNULIB_MDA_PUTENV=1; AC_SUBST([GNULIB_MDA_PUTENV]) dnl Assume proper GNU behavior unless another module says otherwise. HAVE__EXIT=1; AC_SUBST([HAVE__EXIT]) HAVE_ALIGNED_ALLOC=1; AC_SUBST([HAVE_ALIGNED_ALLOC]) @@ -175,8 +110,6 @@ HAVE_DECL_FCVT=1; AC_SUBST([HAVE_DECL_FCVT]) HAVE_DECL_GCVT=1; AC_SUBST([HAVE_DECL_GCVT]) HAVE_DECL_GETLOADAVG=1; AC_SUBST([HAVE_DECL_GETLOADAVG]) - HAVE_DECL_PROGRAM_INVOCATION_NAME=1; AC_SUBST([HAVE_DECL_PROGRAM_INVOCATION_NAME]) - HAVE_GETPROGNAME=1; AC_SUBST([HAVE_GETPROGNAME]) HAVE_GETSUBOPT=1; AC_SUBST([HAVE_GETSUBOPT]) HAVE_GRANTPT=1; AC_SUBST([HAVE_GRANTPT]) HAVE_INITSTATE=1; AC_SUBST([HAVE_INITSTATE]) @@ -204,53 +137,34 @@ HAVE_SETSTATE=1; AC_SUBST([HAVE_SETSTATE]) HAVE_DECL_SETSTATE=1; AC_SUBST([HAVE_DECL_SETSTATE]) HAVE_STRTOD=1; AC_SUBST([HAVE_STRTOD]) - HAVE_STRTOL=1; AC_SUBST([HAVE_STRTOL]) HAVE_STRTOLD=1; AC_SUBST([HAVE_STRTOLD]) HAVE_STRTOLL=1; AC_SUBST([HAVE_STRTOLL]) - HAVE_STRTOUL=1; AC_SUBST([HAVE_STRTOUL]) HAVE_STRTOULL=1; AC_SUBST([HAVE_STRTOULL]) HAVE_STRUCT_RANDOM_DATA=1; AC_SUBST([HAVE_STRUCT_RANDOM_DATA]) HAVE_SYS_LOADAVG_H=0; AC_SUBST([HAVE_SYS_LOADAVG_H]) HAVE_UNLOCKPT=1; AC_SUBST([HAVE_UNLOCKPT]) HAVE_DECL_UNSETENV=1; AC_SUBST([HAVE_DECL_UNSETENV]) - REPLACE__EXIT=0; AC_SUBST([REPLACE__EXIT]) REPLACE_ALIGNED_ALLOC=0; AC_SUBST([REPLACE_ALIGNED_ALLOC]) - REPLACE_CALLOC_FOR_CALLOC_GNU=0; AC_SUBST([REPLACE_CALLOC_FOR_CALLOC_GNU]) - REPLACE_CALLOC_FOR_CALLOC_POSIX=0; AC_SUBST([REPLACE_CALLOC_FOR_CALLOC_POSIX]) + REPLACE_CALLOC=0; AC_SUBST([REPLACE_CALLOC]) REPLACE_CANONICALIZE_FILE_NAME=0; AC_SUBST([REPLACE_CANONICALIZE_FILE_NAME]) REPLACE_FREE=0; AC_SUBST([REPLACE_FREE]) - REPLACE_GETLOADAVG=0; AC_SUBST([REPLACE_GETLOADAVG]) - REPLACE_GETPROGNAME=0; AC_SUBST([REPLACE_GETPROGNAME]) - REPLACE_GETSUBOPT=0; AC_SUBST([REPLACE_GETSUBOPT]) REPLACE_INITSTATE=0; AC_SUBST([REPLACE_INITSTATE]) - REPLACE_MALLOC_FOR_MALLOC_GNU=0; AC_SUBST([REPLACE_MALLOC_FOR_MALLOC_GNU]) - REPLACE_MALLOC_FOR_MALLOC_POSIX=0; AC_SUBST([REPLACE_MALLOC_FOR_MALLOC_POSIX]) - REPLACE_MB_CUR_MAX=0; AC_SUBST([REPLACE_MB_CUR_MAX]) - REPLACE_MBSTOWCS=0; AC_SUBST([REPLACE_MBSTOWCS]) + REPLACE_MALLOC=0; AC_SUBST([REPLACE_MALLOC]) REPLACE_MBTOWC=0; AC_SUBST([REPLACE_MBTOWC]) - REPLACE_MKOSTEMP=0; AC_SUBST([REPLACE_MKOSTEMP]) - REPLACE_MKOSTEMPS=0; AC_SUBST([REPLACE_MKOSTEMPS]) REPLACE_MKSTEMP=0; AC_SUBST([REPLACE_MKSTEMP]) REPLACE_POSIX_MEMALIGN=0; AC_SUBST([REPLACE_POSIX_MEMALIGN]) - REPLACE_POSIX_OPENPT=0; AC_SUBST([REPLACE_POSIX_OPENPT]) REPLACE_PTSNAME=0; AC_SUBST([REPLACE_PTSNAME]) REPLACE_PTSNAME_R=0; AC_SUBST([REPLACE_PTSNAME_R]) REPLACE_PUTENV=0; AC_SUBST([REPLACE_PUTENV]) REPLACE_QSORT_R=0; AC_SUBST([REPLACE_QSORT_R]) REPLACE_RANDOM=0; AC_SUBST([REPLACE_RANDOM]) REPLACE_RANDOM_R=0; AC_SUBST([REPLACE_RANDOM_R]) - REPLACE_REALLOC_FOR_REALLOC_GNU=0; AC_SUBST([REPLACE_REALLOC_FOR_REALLOC_GNU]) - REPLACE_REALLOC_FOR_REALLOC_POSIX=0; AC_SUBST([REPLACE_REALLOC_FOR_REALLOC_POSIX]) - REPLACE_REALLOCARRAY=0; AC_SUBST([REPLACE_REALLOCARRAY]) + REPLACE_REALLOC=0; AC_SUBST([REPLACE_REALLOC]) REPLACE_REALPATH=0; AC_SUBST([REPLACE_REALPATH]) REPLACE_SETENV=0; AC_SUBST([REPLACE_SETENV]) REPLACE_SETSTATE=0; AC_SUBST([REPLACE_SETSTATE]) REPLACE_STRTOD=0; AC_SUBST([REPLACE_STRTOD]) - REPLACE_STRTOL=0; AC_SUBST([REPLACE_STRTOL]) REPLACE_STRTOLD=0; AC_SUBST([REPLACE_STRTOLD]) - REPLACE_STRTOLL=0; AC_SUBST([REPLACE_STRTOLL]) - REPLACE_STRTOUL=0; AC_SUBST([REPLACE_STRTOUL]) - REPLACE_STRTOULL=0; AC_SUBST([REPLACE_STRTOULL]) REPLACE_UNSETENV=0; AC_SUBST([REPLACE_UNSETENV]) REPLACE_WCTOMB=0; AC_SUBST([REPLACE_WCTOMB]) ]) diff -Nru mmv-2.5/m4/strdup.m4 mmv-2.5.1/m4/strdup.m4 --- mmv-2.5/m4/strdup.m4 2023-07-20 19:40:23.000000000 +0000 +++ mmv-2.5.1/m4/strdup.m4 2023-08-08 11:02:40.000000000 +0000 @@ -1,6 +1,6 @@ -# strdup.m4 serial 15 +# strdup.m4 serial 14 -dnl Copyright (C) 2002-2023 Free Software Foundation, Inc. +dnl Copyright (C) 2002-2021 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, @@ -8,7 +8,7 @@ AC_DEFUN([gl_FUNC_STRDUP], [ - AC_REQUIRE([gl_STRING_H_DEFAULTS]) + AC_REQUIRE([gl_HEADER_STRING_H_DEFAULTS]) AC_CHECK_DECLS_ONCE([strdup]) if test $ac_cv_have_decl_strdup = no; then HAVE_DECL_STRDUP=0 @@ -17,7 +17,7 @@ AC_DEFUN([gl_FUNC_STRDUP_POSIX], [ - AC_REQUIRE([gl_STRING_H_DEFAULTS]) + AC_REQUIRE([gl_HEADER_STRING_H_DEFAULTS]) AC_REQUIRE([gl_CHECK_MALLOC_POSIX]) if test $gl_cv_func_malloc_posix != yes; then REPLACE_STRDUP=1 diff -Nru mmv-2.5/m4/strerror.m4 mmv-2.5.1/m4/strerror.m4 --- mmv-2.5/m4/strerror.m4 2023-07-20 19:40:23.000000000 +0000 +++ mmv-2.5.1/m4/strerror.m4 2023-08-08 11:02:40.000000000 +0000 @@ -1,19 +1,19 @@ -# strerror.m4 serial 24 -dnl Copyright (C) 2002, 2007-2023 Free Software Foundation, Inc. +# strerror.m4 serial 21 +dnl Copyright (C) 2002, 2007-2021 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_FUNC_STRERROR], [ - AC_REQUIRE([gl_STRING_H_DEFAULTS]) + AC_REQUIRE([gl_HEADER_STRING_H_DEFAULTS]) AC_REQUIRE([gl_HEADER_ERRNO_H]) AC_REQUIRE([gl_FUNC_STRERROR_0]) AC_REQUIRE([AC_CANONICAL_HOST]) dnl for cross-compiles m4_ifdef([gl_FUNC_STRERROR_R_WORKS], [ AC_REQUIRE([gl_FUNC_STRERROR_R_WORKS]) ]) - if test "$GL_GENERATE_ERRNO_H:$REPLACE_STRERROR_0" = false:0; then + if test "$ERRNO_H:$REPLACE_STRERROR_0" = :0; then AC_CACHE_CHECK([for working strerror function], [gl_cv_func_working_strerror], [AC_RUN_IFELSE( @@ -24,12 +24,12 @@ [gl_cv_func_working_strerror=yes], [gl_cv_func_working_strerror=no], [case "$host_os" in - # Guess yes on glibc systems. - *-gnu* | gnu*) gl_cv_func_working_strerror="guessing yes" ;; - # Guess yes on musl systems. - *-musl* | midipix*) gl_cv_func_working_strerror="guessing yes" ;; - # If we don't know, obey --enable-cross-guesses. - *) gl_cv_func_working_strerror="$gl_cross_guess_normal" ;; + # Guess yes on glibc systems. + *-gnu* | gnu*) gl_cv_func_working_strerror="guessing yes" ;; + # Guess yes on musl systems. + *-musl*) gl_cv_func_working_strerror="guessing yes" ;; + # If we don't know, obey --enable-cross-guesses. + *) gl_cv_func_working_strerror="$gl_cross_guess_normal" ;; esac ]) ]) @@ -80,14 +80,14 @@ [gl_cv_func_strerror_0_works=yes], [gl_cv_func_strerror_0_works=no], [case "$host_os" in - # Guess yes on glibc systems. - *-gnu* | gnu*) gl_cv_func_strerror_0_works="guessing yes" ;; - # Guess yes on musl systems. - *-musl* | midipix*) gl_cv_func_strerror_0_works="guessing yes" ;; - # Guess yes on native Windows. - mingw*) gl_cv_func_strerror_0_works="guessing yes" ;; - # If we don't know, obey --enable-cross-guesses. - *) gl_cv_func_strerror_0_works="$gl_cross_guess_normal" ;; + # Guess yes on glibc systems. + *-gnu* | gnu*) gl_cv_func_strerror_0_works="guessing yes" ;; + # Guess yes on musl systems. + *-musl*) gl_cv_func_strerror_0_works="guessing yes" ;; + # Guess yes on native Windows. + mingw*) gl_cv_func_strerror_0_works="guessing yes" ;; + # If we don't know, obey --enable-cross-guesses. + *) gl_cv_func_strerror_0_works="$gl_cross_guess_normal" ;; esac ]) ]) diff -Nru mmv-2.5/m4/string_h.m4 mmv-2.5.1/m4/string_h.m4 --- mmv-2.5/m4/string_h.m4 2023-07-20 19:40:23.000000000 +0000 +++ mmv-2.5.1/m4/string_h.m4 2023-08-08 11:02:40.000000000 +0000 @@ -1,19 +1,24 @@ # Configure a GNU-like replacement for . -# Copyright (C) 2007-2023 Free Software Foundation, Inc. +# Copyright (C) 2007-2021 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. -# serial 37 +# serial 29 # Written by Paul Eggert. -AC_DEFUN_ONCE([gl_STRING_H], +AC_DEFUN([gl_HEADER_STRING_H], [ - dnl Ensure to expand the default settings once only, before all statements - dnl that occur in other macros. - AC_REQUIRE([gl_STRING_H_DEFAULTS]) + 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_HEADER_STRING_H_BODY]) +]) + +AC_DEFUN([gl_HEADER_STRING_H_BODY], +[ + AC_REQUIRE([gl_HEADER_STRING_H_DEFAULTS]) gl_NEXT_HEADERS([string.h]) dnl Check for declarations of anything we want to poison if the @@ -21,95 +26,75 @@ dnl guaranteed by C89. gl_WARN_ON_USE_PREPARE([[#include ]], - [explicit_bzero ffsl ffsll memmem mempcpy memrchr memset_explicit - rawmemchr stpcpy stpncpy strchrnul + [ffsl ffsll memmem mempcpy memrchr rawmemchr stpcpy stpncpy strchrnul strdup strncat strndup strnlen strpbrk strsep strcasestr strtok_r strerror_r strerrorname_np sigabbrev_np sigdescr_np strsignal strverscmp]) AC_REQUIRE([AC_C_RESTRICT]) ]) -# gl_STRING_MODULE_INDICATOR([modulename]) -# sets the shell variable that indicates the presence of the given module -# to a C preprocessor expression that will evaluate to 1. -# This macro invocation must not occur in macros that are AC_REQUIREd. AC_DEFUN([gl_STRING_MODULE_INDICATOR], [ - dnl Ensure to expand the default settings once only. - gl_STRING_H_REQUIRE_DEFAULTS + dnl Use AC_REQUIRE here, so that the default settings are expanded once only. + AC_REQUIRE([gl_HEADER_STRING_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]) ]) -# Initializes the default values for AC_SUBSTed shell variables. -# This macro must not be AC_REQUIREd. It must only be invoked, and only -# outside of macros or in macros that are not AC_REQUIREd. -AC_DEFUN([gl_STRING_H_REQUIRE_DEFAULTS], -[ - m4_defun(GL_MODULE_INDICATOR_PREFIX[_STRING_H_MODULE_INDICATOR_DEFAULTS], [ - gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_EXPLICIT_BZERO]) - gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_FFSL]) - gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_FFSLL]) - gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MEMCHR]) - gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MEMMEM]) - gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MEMPCPY]) - gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MEMRCHR]) - gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MEMSET_EXPLICIT]) - gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_RAWMEMCHR]) - gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_STPCPY]) - gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_STPNCPY]) - gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_STRCHRNUL]) - gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_STRDUP]) - gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_STRNCAT]) - gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_STRNDUP]) - gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_STRNLEN]) - gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_STRPBRK]) - gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_STRSEP]) - gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_STRSTR]) - gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_STRCASESTR]) - gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_STRTOK_R]) - gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MBSLEN]) - gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MBSNLEN]) - gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MBSCHR]) - gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MBSRCHR]) - gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MBSSTR]) - gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MBSCASECMP]) - gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MBSNCASECMP]) - gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MBSPCASECMP]) - gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MBSCASESTR]) - gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MBSCSPN]) - gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MBSPBRK]) - gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MBSSPN]) - gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MBSSEP]) - gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MBSTOK_R]) - gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_STRERROR]) - gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_STRERROR_R]) - gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_STRERRORNAME_NP]) - gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_SIGABBREV_NP]) - gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_SIGDESCR_NP]) - gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_STRSIGNAL]) - gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_STRVERSCMP]) - dnl Support Microsoft deprecated alias function names by default. - gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MDA_MEMCCPY], [1]) - gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MDA_STRDUP], [1]) - ]) - m4_require(GL_MODULE_INDICATOR_PREFIX[_STRING_H_MODULE_INDICATOR_DEFAULTS]) - dnl Make sure the shell variable for GNULIB_FREE_POSIX is initialized. - gl_STDLIB_H_REQUIRE_DEFAULTS - AC_REQUIRE([gl_STRING_H_DEFAULTS]) -]) - -AC_DEFUN([gl_STRING_H_DEFAULTS], +AC_DEFUN([gl_HEADER_STRING_H_DEFAULTS], [ + GNULIB_EXPLICIT_BZERO=0; AC_SUBST([GNULIB_EXPLICIT_BZERO]) + GNULIB_FFSL=0; AC_SUBST([GNULIB_FFSL]) + GNULIB_FFSLL=0; AC_SUBST([GNULIB_FFSLL]) + GNULIB_MEMCHR=0; AC_SUBST([GNULIB_MEMCHR]) + GNULIB_MEMMEM=0; AC_SUBST([GNULIB_MEMMEM]) + GNULIB_MEMPCPY=0; AC_SUBST([GNULIB_MEMPCPY]) + GNULIB_MEMRCHR=0; AC_SUBST([GNULIB_MEMRCHR]) + GNULIB_RAWMEMCHR=0; AC_SUBST([GNULIB_RAWMEMCHR]) + GNULIB_STPCPY=0; AC_SUBST([GNULIB_STPCPY]) + GNULIB_STPNCPY=0; AC_SUBST([GNULIB_STPNCPY]) + GNULIB_STRCHRNUL=0; AC_SUBST([GNULIB_STRCHRNUL]) + GNULIB_STRDUP=0; AC_SUBST([GNULIB_STRDUP]) + GNULIB_STRNCAT=0; AC_SUBST([GNULIB_STRNCAT]) + GNULIB_STRNDUP=0; AC_SUBST([GNULIB_STRNDUP]) + GNULIB_STRNLEN=0; AC_SUBST([GNULIB_STRNLEN]) + GNULIB_STRPBRK=0; AC_SUBST([GNULIB_STRPBRK]) + GNULIB_STRSEP=0; AC_SUBST([GNULIB_STRSEP]) + GNULIB_STRSTR=0; AC_SUBST([GNULIB_STRSTR]) + GNULIB_STRCASESTR=0; AC_SUBST([GNULIB_STRCASESTR]) + GNULIB_STRTOK_R=0; AC_SUBST([GNULIB_STRTOK_R]) + GNULIB_MBSLEN=0; AC_SUBST([GNULIB_MBSLEN]) + GNULIB_MBSNLEN=0; AC_SUBST([GNULIB_MBSNLEN]) + GNULIB_MBSCHR=0; AC_SUBST([GNULIB_MBSCHR]) + GNULIB_MBSRCHR=0; AC_SUBST([GNULIB_MBSRCHR]) + GNULIB_MBSSTR=0; AC_SUBST([GNULIB_MBSSTR]) + GNULIB_MBSCASECMP=0; AC_SUBST([GNULIB_MBSCASECMP]) + GNULIB_MBSNCASECMP=0; AC_SUBST([GNULIB_MBSNCASECMP]) + GNULIB_MBSPCASECMP=0; AC_SUBST([GNULIB_MBSPCASECMP]) + GNULIB_MBSCASESTR=0; AC_SUBST([GNULIB_MBSCASESTR]) + GNULIB_MBSCSPN=0; AC_SUBST([GNULIB_MBSCSPN]) + GNULIB_MBSPBRK=0; AC_SUBST([GNULIB_MBSPBRK]) + GNULIB_MBSSPN=0; AC_SUBST([GNULIB_MBSSPN]) + GNULIB_MBSSEP=0; AC_SUBST([GNULIB_MBSSEP]) + GNULIB_MBSTOK_R=0; AC_SUBST([GNULIB_MBSTOK_R]) + GNULIB_STRERROR=0; AC_SUBST([GNULIB_STRERROR]) + GNULIB_STRERROR_R=0; AC_SUBST([GNULIB_STRERROR_R]) + GNULIB_STRERRORNAME_NP=0; AC_SUBST([GNULIB_STRERRORNAME_NP]) + GNULIB_SIGABBREV_NP=0; AC_SUBST([GNULIB_SIGABBREV_NP]) + GNULIB_SIGDESCR_NP=0; AC_SUBST([GNULIB_SIGDESCR_NP]) + GNULIB_STRSIGNAL=0; AC_SUBST([GNULIB_STRSIGNAL]) + GNULIB_STRVERSCMP=0; AC_SUBST([GNULIB_STRVERSCMP]) HAVE_MBSLEN=0; AC_SUBST([HAVE_MBSLEN]) + dnl Support Microsoft deprecated alias function names by default. + GNULIB_MDA_MEMCCPY=1; AC_SUBST([GNULIB_MDA_MEMCCPY]) + GNULIB_MDA_STRDUP=1; AC_SUBST([GNULIB_MDA_STRDUP]) dnl Assume proper GNU behavior unless another module says otherwise. HAVE_EXPLICIT_BZERO=1; AC_SUBST([HAVE_EXPLICIT_BZERO]) HAVE_FFSL=1; AC_SUBST([HAVE_FFSL]) HAVE_FFSLL=1; AC_SUBST([HAVE_FFSLL]) HAVE_DECL_MEMMEM=1; AC_SUBST([HAVE_DECL_MEMMEM]) HAVE_MEMPCPY=1; AC_SUBST([HAVE_MEMPCPY]) - HAVE_MEMSET_EXPLICIT=1; AC_SUBST([HAVE_MEMSET_EXPLICIT]) HAVE_DECL_MEMRCHR=1; AC_SUBST([HAVE_DECL_MEMRCHR]) HAVE_RAWMEMCHR=1; AC_SUBST([HAVE_RAWMEMCHR]) HAVE_STPCPY=1; AC_SUBST([HAVE_STPCPY]) @@ -131,8 +116,6 @@ REPLACE_FFSLL=0; AC_SUBST([REPLACE_FFSLL]) REPLACE_MEMCHR=0; AC_SUBST([REPLACE_MEMCHR]) REPLACE_MEMMEM=0; AC_SUBST([REPLACE_MEMMEM]) - REPLACE_MEMPCPY=0; AC_SUBST([REPLACE_MEMPCPY]) - REPLACE_STPCPY=0; AC_SUBST([REPLACE_STPCPY]) REPLACE_STPNCPY=0; AC_SUBST([REPLACE_STPNCPY]) REPLACE_STRCHRNUL=0; AC_SUBST([REPLACE_STRCHRNUL]) REPLACE_STRDUP=0; AC_SUBST([REPLACE_STRDUP]) diff -Nru mmv-2.5/m4/symlink.m4 mmv-2.5.1/m4/symlink.m4 --- mmv-2.5/m4/symlink.m4 2023-07-20 19:40:23.000000000 +0000 +++ mmv-2.5.1/m4/symlink.m4 2023-08-08 11:02:40.000000000 +0000 @@ -1,7 +1,7 @@ -# serial 10 +# serial 9 # See if we need to provide symlink replacement. -dnl Copyright (C) 2009-2023 Free Software Foundation, Inc. +dnl Copyright (C) 2009-2021 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. @@ -38,8 +38,6 @@ [case "$host_os" in # Guess yes on Linux systems. linux-* | linux) gl_cv_func_symlink_works="guessing yes" ;; - # Guess yes on systems that emulate the Linux system calls. - midipix*) gl_cv_func_symlink_works="guessing yes" ;; # Guess yes on glibc systems. *-gnu* | gnu*) gl_cv_func_symlink_works="guessing yes" ;; # If we don't know, obey --enable-cross-guesses. diff -Nru mmv-2.5/m4/sys_socket_h.m4 mmv-2.5.1/m4/sys_socket_h.m4 --- mmv-2.5/m4/sys_socket_h.m4 2023-07-20 19:40:23.000000000 +0000 +++ mmv-2.5.1/m4/sys_socket_h.m4 2023-08-08 11:02:40.000000000 +0000 @@ -1,12 +1,12 @@ -# sys_socket_h.m4 serial 29 -dnl Copyright (C) 2005-2023 Free Software Foundation, Inc. +# sys_socket_h.m4 serial 25 +dnl Copyright (C) 2005-2021 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 Simon Josefsson. -AC_DEFUN_ONCE([gl_SYS_SOCKET_H], +AC_DEFUN([gl_HEADER_SYS_SOCKET], [ AC_REQUIRE([gl_SYS_SOCKET_H_DEFAULTS]) AC_REQUIRE([AC_CANONICAL_HOST]) @@ -22,7 +22,6 @@ ;; esac - GL_GENERATE_SYS_SOCKET_H=false AC_CACHE_CHECK([whether is self-contained], [gl_cv_header_sys_socket_h_selfcontained], [ @@ -45,7 +44,7 @@ [gl_cv_header_sys_socket_h_shut=no]) ]) if test $gl_cv_header_sys_socket_h_shut = no; then - GL_GENERATE_SYS_SOCKET_H=true + SYS_SOCKET_H='sys/socket.h' fi fi fi @@ -84,7 +83,7 @@ fi if test $HAVE_STRUCT_SOCKADDR_STORAGE = 0 || test $HAVE_SA_FAMILY_T = 0 \ || test $HAVE_STRUCT_SOCKADDR_STORAGE_SS_FAMILY = 0; then - GL_GENERATE_SYS_SOCKET_H=true + SYS_SOCKET_H='sys/socket.h' fi gl_PREREQ_SYS_H_WINSOCK2 @@ -157,47 +156,32 @@ AC_SUBST([HAVE_WS2TCPIP_H]) ]) -# gl_SYS_SOCKET_MODULE_INDICATOR([modulename]) -# sets the shell variable that indicates the presence of the given module -# to a C preprocessor expression that will evaluate to 1. -# This macro invocation must not occur in macros that are AC_REQUIREd. AC_DEFUN([gl_SYS_SOCKET_MODULE_INDICATOR], [ - dnl Ensure to expand the default settings once only. - gl_SYS_SOCKET_H_REQUIRE_DEFAULTS + dnl Use AC_REQUIRE here, so that the default settings are expanded once only. + AC_REQUIRE([gl_SYS_SOCKET_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]) ]) -# Initializes the default values for AC_SUBSTed shell variables. -# This macro must not be AC_REQUIREd. It must only be invoked, and only -# outside of macros or in macros that are not AC_REQUIREd. -AC_DEFUN([gl_SYS_SOCKET_H_REQUIRE_DEFAULTS], -[ - m4_defun(GL_MODULE_INDICATOR_PREFIX[_SYS_SOCKET_H_MODULE_INDICATOR_DEFAULTS], [ - gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_SOCKET]) - gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_CONNECT]) - gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_ACCEPT]) - gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_BIND]) - gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_GETPEERNAME]) - gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_GETSOCKNAME]) - gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_GETSOCKOPT]) - gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_LISTEN]) - gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_RECV]) - gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_SEND]) - gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_RECVFROM]) - gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_SENDTO]) - gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_SETSOCKOPT]) - gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_SHUTDOWN]) - gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_ACCEPT4]) - ]) - m4_require(GL_MODULE_INDICATOR_PREFIX[_SYS_SOCKET_H_MODULE_INDICATOR_DEFAULTS]) - AC_REQUIRE([gl_SYS_SOCKET_H_DEFAULTS]) -]) - AC_DEFUN([gl_SYS_SOCKET_H_DEFAULTS], [ + GNULIB_SOCKET=0; AC_SUBST([GNULIB_SOCKET]) + GNULIB_CONNECT=0; AC_SUBST([GNULIB_CONNECT]) + GNULIB_ACCEPT=0; AC_SUBST([GNULIB_ACCEPT]) + GNULIB_BIND=0; AC_SUBST([GNULIB_BIND]) + GNULIB_GETPEERNAME=0; AC_SUBST([GNULIB_GETPEERNAME]) + GNULIB_GETSOCKNAME=0; AC_SUBST([GNULIB_GETSOCKNAME]) + GNULIB_GETSOCKOPT=0; AC_SUBST([GNULIB_GETSOCKOPT]) + GNULIB_LISTEN=0; AC_SUBST([GNULIB_LISTEN]) + GNULIB_RECV=0; AC_SUBST([GNULIB_RECV]) + GNULIB_SEND=0; AC_SUBST([GNULIB_SEND]) + GNULIB_RECVFROM=0; AC_SUBST([GNULIB_RECVFROM]) + GNULIB_SENDTO=0; AC_SUBST([GNULIB_SENDTO]) + GNULIB_SETSOCKOPT=0; AC_SUBST([GNULIB_SETSOCKOPT]) + GNULIB_SHUTDOWN=0; AC_SUBST([GNULIB_SHUTDOWN]) + GNULIB_ACCEPT4=0; AC_SUBST([GNULIB_ACCEPT4]) HAVE_STRUCT_SOCKADDR_STORAGE=1; AC_SUBST([HAVE_STRUCT_SOCKADDR_STORAGE]) HAVE_STRUCT_SOCKADDR_STORAGE_SS_FAMILY=1; AC_SUBST([HAVE_STRUCT_SOCKADDR_STORAGE_SS_FAMILY]) diff -Nru mmv-2.5/m4/sys_stat_h.m4 mmv-2.5.1/m4/sys_stat_h.m4 --- mmv-2.5/m4/sys_stat_h.m4 2023-07-20 19:40:23.000000000 +0000 +++ mmv-2.5.1/m4/sys_stat_h.m4 2023-08-08 11:02:40.000000000 +0000 @@ -1,5 +1,5 @@ -# sys_stat_h.m4 serial 42 -*- Autoconf -*- -dnl Copyright (C) 2006-2023 Free Software Foundation, Inc. +# sys_stat_h.m4 serial 38 -*- Autoconf -*- +dnl Copyright (C) 2006-2021 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. @@ -7,7 +7,7 @@ dnl From Eric Blake. dnl Provide a GNU-like . -AC_DEFUN_ONCE([gl_SYS_STAT_H], +AC_DEFUN([gl_HEADER_SYS_STAT_H], [ AC_REQUIRE([gl_SYS_STAT_H_DEFAULTS]) @@ -46,60 +46,44 @@ dnl Check for declarations of anything we want to poison if the dnl corresponding gnulib module is not in use. gl_WARN_ON_USE_PREPARE([[#include - ]], [chmod fchmodat fstat fstatat futimens getumask lchmod lstat + ]], [fchmodat fstat fstatat futimens getumask lchmod lstat mkdirat mkfifo mkfifoat mknod mknodat stat utimensat]) AC_REQUIRE([AC_C_RESTRICT]) ]) -# gl_SYS_STAT_MODULE_INDICATOR([modulename]) -# sets the shell variable that indicates the presence of the given module -# to a C preprocessor expression that will evaluate to 1. -# This macro invocation must not occur in macros that are AC_REQUIREd. AC_DEFUN([gl_SYS_STAT_MODULE_INDICATOR], [ - dnl Ensure to expand the default settings once only. - gl_SYS_STAT_H_REQUIRE_DEFAULTS + dnl Use AC_REQUIRE here, so that the default settings are expanded once only. + AC_REQUIRE([gl_SYS_STAT_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]) ]) -# Initializes the default values for AC_SUBSTed shell variables. -# This macro must not be AC_REQUIREd. It must only be invoked, and only -# outside of macros or in macros that are not AC_REQUIREd. -AC_DEFUN([gl_SYS_STAT_H_REQUIRE_DEFAULTS], -[ - m4_defun(GL_MODULE_INDICATOR_PREFIX[_SYS_STAT_H_MODULE_INDICATOR_DEFAULTS], [ - gl_UNISTD_H_REQUIRE_DEFAULTS dnl for REPLACE_FCHDIR - gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_CHMOD]) - gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_FCHMODAT]) - gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_FSTAT]) - gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_FSTATAT]) - gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_FUTIMENS]) - gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_GETUMASK]) - gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_LCHMOD]) - gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_LSTAT]) - gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MKDIR]) - gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MKDIRAT]) - gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MKFIFO]) - gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MKFIFOAT]) - gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MKNOD]) - gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MKNODAT]) - gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_STAT]) - gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_UTIMENSAT]) - gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_OVERRIDES_STRUCT_STAT]) - dnl Support Microsoft deprecated alias function names by default. - gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MDA_CHMOD], [1]) - gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MDA_MKDIR], [1]) - gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MDA_UMASK], [1]) - ]) - m4_require(GL_MODULE_INDICATOR_PREFIX[_SYS_STAT_H_MODULE_INDICATOR_DEFAULTS]) - AC_REQUIRE([gl_SYS_STAT_H_DEFAULTS]) -]) - AC_DEFUN([gl_SYS_STAT_H_DEFAULTS], [ + AC_REQUIRE([gl_UNISTD_H_DEFAULTS]) dnl for REPLACE_FCHDIR + GNULIB_FCHMODAT=0; AC_SUBST([GNULIB_FCHMODAT]) + GNULIB_FSTAT=0; AC_SUBST([GNULIB_FSTAT]) + GNULIB_FSTATAT=0; AC_SUBST([GNULIB_FSTATAT]) + GNULIB_FUTIMENS=0; AC_SUBST([GNULIB_FUTIMENS]) + GNULIB_GETUMASK=0; AC_SUBST([GNULIB_GETUMASK]) + GNULIB_LCHMOD=0; AC_SUBST([GNULIB_LCHMOD]) + GNULIB_LSTAT=0; AC_SUBST([GNULIB_LSTAT]) + GNULIB_MKDIR=0; AC_SUBST([GNULIB_MKDIR]) + GNULIB_MKDIRAT=0; AC_SUBST([GNULIB_MKDIRAT]) + GNULIB_MKFIFO=0; AC_SUBST([GNULIB_MKFIFO]) + GNULIB_MKFIFOAT=0; AC_SUBST([GNULIB_MKFIFOAT]) + GNULIB_MKNOD=0; AC_SUBST([GNULIB_MKNOD]) + GNULIB_MKNODAT=0; AC_SUBST([GNULIB_MKNODAT]) + GNULIB_STAT=0; AC_SUBST([GNULIB_STAT]) + GNULIB_UTIMENSAT=0; AC_SUBST([GNULIB_UTIMENSAT]) + GNULIB_OVERRIDES_STRUCT_STAT=0; AC_SUBST([GNULIB_OVERRIDES_STRUCT_STAT]) + dnl Support Microsoft deprecated alias function names by default. + GNULIB_MDA_CHMOD=1; AC_SUBST([GNULIB_MDA_CHMOD]) + GNULIB_MDA_MKDIR=1; AC_SUBST([GNULIB_MDA_MKDIR]) + GNULIB_MDA_UMASK=1; AC_SUBST([GNULIB_MDA_UMASK]) dnl Assume proper GNU behavior unless another module says otherwise. HAVE_FCHMODAT=1; AC_SUBST([HAVE_FCHMODAT]) HAVE_FSTATAT=1; AC_SUBST([HAVE_FSTATAT]) @@ -113,7 +97,6 @@ HAVE_MKNOD=1; AC_SUBST([HAVE_MKNOD]) HAVE_MKNODAT=1; AC_SUBST([HAVE_MKNODAT]) HAVE_UTIMENSAT=1; AC_SUBST([HAVE_UTIMENSAT]) - REPLACE_CHMOD=0; AC_SUBST([REPLACE_CHMOD]) REPLACE_FCHMODAT=0; AC_SUBST([REPLACE_FCHMODAT]) REPLACE_FSTAT=0; AC_SUBST([REPLACE_FSTAT]) REPLACE_FSTATAT=0; AC_SUBST([REPLACE_FSTATAT]) diff -Nru mmv-2.5/m4/sys_types_h.m4 mmv-2.5.1/m4/sys_types_h.m4 --- mmv-2.5/m4/sys_types_h.m4 2023-07-20 19:40:23.000000000 +0000 +++ mmv-2.5.1/m4/sys_types_h.m4 2023-08-08 11:02:40.000000000 +0000 @@ -1,16 +1,15 @@ -# sys_types_h.m4 serial 13 -dnl Copyright (C) 2011-2023 Free Software Foundation, Inc. +# sys_types_h.m4 serial 11 +dnl Copyright (C) 2011-2021 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_ONCE([gl_SYS_TYPES_H], [ - AC_REQUIRE([gl_SYS_TYPES_H_DEFAULTS]) - 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]) dnl Ensure the type pid_t gets defined. @@ -31,17 +30,6 @@ AC_SUBST([WINDOWS_STAT_INODES]) ]) -# Initializes the default values for AC_SUBSTed shell variables. -# This macro must not be AC_REQUIREd. It must only be invoked, and only -# outside of macros or in macros that are not AC_REQUIREd. -AC_DEFUN([gl_SYS_TYPES_H_REQUIRE_DEFAULTS], -[ - m4_defun(GL_MODULE_INDICATOR_PREFIX[_SYS_TYPE_H_MODULE_INDICATOR_DEFAULTS], [ - ]) - m4_require(GL_MODULE_INDICATOR_PREFIX[_SYS_TYPE_H_MODULE_INDICATOR_DEFAULTS]) - AC_REQUIRE([gl_SYS_TYPES_H_DEFAULTS]) -]) - AC_DEFUN([gl_SYS_TYPES_H_DEFAULTS], [ ]) diff -Nru mmv-2.5/m4/time_h.m4 mmv-2.5.1/m4/time_h.m4 --- mmv-2.5/m4/time_h.m4 2023-07-20 19:40:23.000000000 +0000 +++ mmv-2.5.1/m4/time_h.m4 2023-08-08 11:02:40.000000000 +0000 @@ -1,8 +1,8 @@ # Configure a more-standard replacement for . -# Copyright (C) 2000-2001, 2003-2007, 2009-2023 Free Software Foundation, Inc. +# Copyright (C) 2000-2001, 2003-2007, 2009-2021 Free Software Foundation, Inc. -# serial 22 +# serial 15 # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -10,21 +10,20 @@ # Written by Paul Eggert and Jim Meyering. -AC_DEFUN_ONCE([gl_TIME_H], +AC_DEFUN([gl_HEADER_TIME_H], [ - dnl Ensure to expand the default settings once only, before all statements - dnl that occur in other macros. - AC_REQUIRE([gl_TIME_H_DEFAULTS]) + 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_HEADER_TIME_H_BODY]) +]) + +AC_DEFUN([gl_HEADER_TIME_H_BODY], +[ + AC_REQUIRE([gl_HEADER_TIME_H_DEFAULTS]) gl_NEXT_HEADERS([time.h]) AC_REQUIRE([gl_CHECK_TYPE_STRUCT_TIMESPEC]) - dnl Check for declarations of anything we want to poison if the - dnl corresponding gnulib module is not in use. - gl_WARN_ON_USE_PREPARE([[ -#include - ]], [asctime_r ctime_r]) - AC_REQUIRE([AC_C_RESTRICT]) AC_CACHE_CHECK([for TIME_UTC in ], @@ -112,54 +111,36 @@ AC_SUBST([UNISTD_H_DEFINES_STRUCT_TIMESPEC]) ]) -# gl_TIME_MODULE_INDICATOR([modulename]) -# sets the shell variable that indicates the presence of the given module -# to a C preprocessor expression that will evaluate to 1. -# This macro invocation must not occur in macros that are AC_REQUIREd. AC_DEFUN([gl_TIME_MODULE_INDICATOR], [ - dnl Ensure to expand the default settings once only. - gl_TIME_H_REQUIRE_DEFAULTS + dnl Use AC_REQUIRE here, so that the default settings are expanded once only. + AC_REQUIRE([gl_HEADER_TIME_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]) ]) -# Initializes the default values for AC_SUBSTed shell variables. -# This macro must not be AC_REQUIREd. It must only be invoked, and only -# outside of macros or in macros that are not AC_REQUIREd. -AC_DEFUN([gl_TIME_H_REQUIRE_DEFAULTS], -[ - m4_defun(GL_MODULE_INDICATOR_PREFIX[_TIME_H_MODULE_INDICATOR_DEFAULTS], [ - gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_CTIME]) - gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MKTIME]) - gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_LOCALTIME]) - gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_NANOSLEEP]) - gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_STRFTIME]) - gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_STRPTIME]) - gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_TIME]) - gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_TIMEGM]) - gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_TIMESPEC_GET]) - gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_TIMESPEC_GETRES]) - gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_TIME_R]) - gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_TIME_RZ]) - gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_TZSET]) - dnl Support Microsoft deprecated alias function names by default. - gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MDA_TZSET], [1]) - ]) - m4_require(GL_MODULE_INDICATOR_PREFIX[_TIME_H_MODULE_INDICATOR_DEFAULTS]) - AC_REQUIRE([gl_TIME_H_DEFAULTS]) -]) - -AC_DEFUN([gl_TIME_H_DEFAULTS], +AC_DEFUN([gl_HEADER_TIME_H_DEFAULTS], [ + GNULIB_CTIME=0; AC_SUBST([GNULIB_CTIME]) + GNULIB_MKTIME=0; AC_SUBST([GNULIB_MKTIME]) + GNULIB_LOCALTIME=0; AC_SUBST([GNULIB_LOCALTIME]) + GNULIB_NANOSLEEP=0; AC_SUBST([GNULIB_NANOSLEEP]) + GNULIB_STRFTIME=0; AC_SUBST([GNULIB_STRFTIME]) + GNULIB_STRPTIME=0; AC_SUBST([GNULIB_STRPTIME]) + GNULIB_TIMEGM=0; AC_SUBST([GNULIB_TIMEGM]) + GNULIB_TIMESPEC_GET=0; AC_SUBST([GNULIB_TIMESPEC_GET]) + GNULIB_TIME_R=0; AC_SUBST([GNULIB_TIME_R]) + GNULIB_TIME_RZ=0; AC_SUBST([GNULIB_TIME_RZ]) + GNULIB_TZSET=0; AC_SUBST([GNULIB_TZSET]) + dnl Support Microsoft deprecated alias function names by default. + GNULIB_MDA_TZSET=1; AC_SUBST([GNULIB_MDA_TZSET]) dnl Assume proper GNU behavior unless another module says otherwise. HAVE_DECL_LOCALTIME_R=1; AC_SUBST([HAVE_DECL_LOCALTIME_R]) HAVE_NANOSLEEP=1; AC_SUBST([HAVE_NANOSLEEP]) HAVE_STRPTIME=1; AC_SUBST([HAVE_STRPTIME]) HAVE_TIMEGM=1; AC_SUBST([HAVE_TIMEGM]) HAVE_TIMESPEC_GET=1; AC_SUBST([HAVE_TIMESPEC_GET]) - HAVE_TIMESPEC_GETRES=1; AC_SUBST([HAVE_TIMESPEC_GETRES]) dnl Even GNU libc does not have timezone_t yet. HAVE_TIMEZONE_T=0; AC_SUBST([HAVE_TIMEZONE_T]) dnl If another module says to replace or to not replace, do that. @@ -170,9 +151,7 @@ REPLACE_MKTIME=GNULIB_PORTCHECK; AC_SUBST([REPLACE_MKTIME]) REPLACE_NANOSLEEP=GNULIB_PORTCHECK; AC_SUBST([REPLACE_NANOSLEEP]) REPLACE_STRFTIME=GNULIB_PORTCHECK; AC_SUBST([REPLACE_STRFTIME]) - REPLACE_TIME=0; AC_SUBST([REPLACE_TIME]) REPLACE_TIMEGM=GNULIB_PORTCHECK; AC_SUBST([REPLACE_TIMEGM]) - REPLACE_TIMESPEC_GET=GNULIB_PORTCHECK; AC_SUBST([REPLACE_TIMESPEC_GET]) REPLACE_TZSET=GNULIB_PORTCHECK; AC_SUBST([REPLACE_TZSET]) dnl Hack so that the time module doesn't depend on the sys_time module. diff -Nru mmv-2.5/m4/unistd_h.m4 mmv-2.5.1/m4/unistd_h.m4 --- mmv-2.5/m4/unistd_h.m4 2023-07-20 19:40:23.000000000 +0000 +++ mmv-2.5.1/m4/unistd_h.m4 2023-08-08 11:02:40.000000000 +0000 @@ -1,15 +1,15 @@ -# unistd_h.m4 serial 94 -dnl Copyright (C) 2006-2023 Free Software Foundation, Inc. +# unistd_h.m4 serial 85 +dnl Copyright (C) 2006-2021 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 Written by Simon Josefsson, Bruno Haible. -AC_DEFUN_ONCE([gl_UNISTD_H], +AC_DEFUN([gl_UNISTD_H], [ - dnl Ensure to expand the default settings once only, before all statements - dnl that occur in other macros. + 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]) gl_CHECK_NEXT_HEADERS([unistd.h]) @@ -59,217 +59,193 @@ fi ]) -# gl_UNISTD_MODULE_INDICATOR([modulename]) -# sets the shell variable that indicates the presence of the given module -# to a C preprocessor expression that will evaluate to 1. -# This macro invocation must not occur in macros that are AC_REQUIREd. AC_DEFUN([gl_UNISTD_MODULE_INDICATOR], [ - dnl Ensure to expand the default settings once only. - gl_UNISTD_H_REQUIRE_DEFAULTS + dnl Use AC_REQUIRE here, so that the default settings are expanded once only. + AC_REQUIRE([gl_UNISTD_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]) ]) -# Initializes the default values for AC_SUBSTed shell variables. -# This macro must not be AC_REQUIREd. It must only be invoked, and only -# outside of macros or in macros that are not AC_REQUIREd. -AC_DEFUN([gl_UNISTD_H_REQUIRE_DEFAULTS], -[ - m4_defun(GL_MODULE_INDICATOR_PREFIX[_UNISTD_H_MODULE_INDICATOR_DEFAULTS], [ - gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_ACCESS]) - gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_CHDIR]) - gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_CHOWN]) - gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_CLOSE]) - gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_COPY_FILE_RANGE]) - gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_DUP]) - gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_DUP2]) - gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_DUP3]) - gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_ENVIRON]) - gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_EUIDACCESS]) - gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_EXECL]) - gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_EXECLE]) - gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_EXECLP]) - gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_EXECV]) - gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_EXECVE]) - gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_EXECVP]) - gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_EXECVPE]) - gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_FACCESSAT]) - gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_FCHDIR]) - gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_FCHOWNAT]) - gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_FDATASYNC]) - gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_FSYNC]) - gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_FTRUNCATE]) - gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_GETCWD]) - gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_GETDOMAINNAME]) - gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_GETDTABLESIZE]) - gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_GETENTROPY]) - gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_GETGROUPS]) - gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_GETHOSTNAME]) - gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_GETLOGIN]) - gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_GETLOGIN_R]) - gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_GETOPT_POSIX]) - gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_GETPAGESIZE]) - gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_GETPASS]) - gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_GETPASS_GNU]) - gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_GETUSERSHELL]) - gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_GROUP_MEMBER]) - gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_ISATTY]) - gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_LCHOWN]) - gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_LINK]) - gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_LINKAT]) - gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_LSEEK]) - gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_PIPE]) - gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_PIPE2]) - gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_PREAD]) - gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_PWRITE]) - gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_READ]) - gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_READLINK]) - gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_READLINKAT]) - gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_RMDIR]) - gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_SETHOSTNAME]) - gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_SLEEP]) - gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_SYMLINK]) - gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_SYMLINKAT]) - gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_TRUNCATE]) - gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_TTYNAME_R]) - gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_UNISTD_H_GETOPT]) - gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_UNISTD_H_NONBLOCKING]) - gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_UNISTD_H_SIGPIPE]) - gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_UNLINK]) - gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_UNLINKAT]) - gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_USLEEP]) - gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_WRITE]) - dnl Support Microsoft deprecated alias function names by default. - gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MDA_ACCESS], [1]) - gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MDA_CHDIR], [1]) - gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MDA_CLOSE], [1]) - gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MDA_DUP], [1]) - gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MDA_DUP2], [1]) - gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MDA_EXECL], [1]) - gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MDA_EXECLE], [1]) - gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MDA_EXECLP], [1]) - gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MDA_EXECV], [1]) - gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MDA_EXECVE], [1]) - gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MDA_EXECVP], [1]) - gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MDA_EXECVPE], [1]) - gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MDA_GETCWD], [1]) - gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MDA_GETPID], [1]) - gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MDA_ISATTY], [1]) - gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MDA_LSEEK], [1]) - gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MDA_READ], [1]) - gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MDA_RMDIR], [1]) - gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MDA_SWAB], [1]) - gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MDA_UNLINK], [1]) - gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MDA_WRITE], [1]) - ]) - m4_require(GL_MODULE_INDICATOR_PREFIX[_UNISTD_H_MODULE_INDICATOR_DEFAULTS]) - AC_REQUIRE([gl_UNISTD_H_DEFAULTS]) -]) - AC_DEFUN([gl_UNISTD_H_DEFAULTS], [ + GNULIB_ACCESS=0; AC_SUBST([GNULIB_ACCESS]) + GNULIB_CHDIR=0; AC_SUBST([GNULIB_CHDIR]) + GNULIB_CHOWN=0; AC_SUBST([GNULIB_CHOWN]) + GNULIB_CLOSE=0; AC_SUBST([GNULIB_CLOSE]) + GNULIB_COPY_FILE_RANGE=0; AC_SUBST([GNULIB_COPY_FILE_RANGE]) + GNULIB_DUP=0; AC_SUBST([GNULIB_DUP]) + GNULIB_DUP2=0; AC_SUBST([GNULIB_DUP2]) + GNULIB_DUP3=0; AC_SUBST([GNULIB_DUP3]) + GNULIB_ENVIRON=0; AC_SUBST([GNULIB_ENVIRON]) + GNULIB_EUIDACCESS=0; AC_SUBST([GNULIB_EUIDACCESS]) + GNULIB_EXECL=0; AC_SUBST([GNULIB_EXECL]) + GNULIB_EXECLE=0; AC_SUBST([GNULIB_EXECLE]) + GNULIB_EXECLP=0; AC_SUBST([GNULIB_EXECLP]) + GNULIB_EXECV=0; AC_SUBST([GNULIB_EXECV]) + GNULIB_EXECVE=0; AC_SUBST([GNULIB_EXECVE]) + GNULIB_EXECVP=0; AC_SUBST([GNULIB_EXECVP]) + GNULIB_EXECVPE=0; AC_SUBST([GNULIB_EXECVPE]) + GNULIB_FACCESSAT=0; AC_SUBST([GNULIB_FACCESSAT]) + GNULIB_FCHDIR=0; AC_SUBST([GNULIB_FCHDIR]) + GNULIB_FCHOWNAT=0; AC_SUBST([GNULIB_FCHOWNAT]) + GNULIB_FDATASYNC=0; AC_SUBST([GNULIB_FDATASYNC]) + GNULIB_FSYNC=0; AC_SUBST([GNULIB_FSYNC]) + GNULIB_FTRUNCATE=0; AC_SUBST([GNULIB_FTRUNCATE]) + GNULIB_GETCWD=0; AC_SUBST([GNULIB_GETCWD]) + GNULIB_GETDOMAINNAME=0; AC_SUBST([GNULIB_GETDOMAINNAME]) + GNULIB_GETDTABLESIZE=0; AC_SUBST([GNULIB_GETDTABLESIZE]) + GNULIB_GETENTROPY=0; AC_SUBST([GNULIB_GETENTROPY]) + GNULIB_GETGROUPS=0; AC_SUBST([GNULIB_GETGROUPS]) + GNULIB_GETHOSTNAME=0; AC_SUBST([GNULIB_GETHOSTNAME]) + GNULIB_GETLOGIN=0; AC_SUBST([GNULIB_GETLOGIN]) + GNULIB_GETLOGIN_R=0; AC_SUBST([GNULIB_GETLOGIN_R]) + GNULIB_GETOPT_POSIX=0; AC_SUBST([GNULIB_GETOPT_POSIX]) + GNULIB_GETPAGESIZE=0; AC_SUBST([GNULIB_GETPAGESIZE]) + GNULIB_GETPASS=0; AC_SUBST([GNULIB_GETPASS]) + GNULIB_GETUSERSHELL=0; AC_SUBST([GNULIB_GETUSERSHELL]) + GNULIB_GROUP_MEMBER=0; AC_SUBST([GNULIB_GROUP_MEMBER]) + GNULIB_ISATTY=0; AC_SUBST([GNULIB_ISATTY]) + GNULIB_LCHOWN=0; AC_SUBST([GNULIB_LCHOWN]) + GNULIB_LINK=0; AC_SUBST([GNULIB_LINK]) + GNULIB_LINKAT=0; AC_SUBST([GNULIB_LINKAT]) + GNULIB_LSEEK=0; AC_SUBST([GNULIB_LSEEK]) + GNULIB_PIPE=0; AC_SUBST([GNULIB_PIPE]) + GNULIB_PIPE2=0; AC_SUBST([GNULIB_PIPE2]) + GNULIB_PREAD=0; AC_SUBST([GNULIB_PREAD]) + GNULIB_PWRITE=0; AC_SUBST([GNULIB_PWRITE]) + GNULIB_READ=0; AC_SUBST([GNULIB_READ]) + GNULIB_READLINK=0; AC_SUBST([GNULIB_READLINK]) + GNULIB_READLINKAT=0; AC_SUBST([GNULIB_READLINKAT]) + GNULIB_RMDIR=0; AC_SUBST([GNULIB_RMDIR]) + GNULIB_SETHOSTNAME=0; AC_SUBST([GNULIB_SETHOSTNAME]) + GNULIB_SLEEP=0; AC_SUBST([GNULIB_SLEEP]) + GNULIB_SYMLINK=0; AC_SUBST([GNULIB_SYMLINK]) + GNULIB_SYMLINKAT=0; AC_SUBST([GNULIB_SYMLINKAT]) + GNULIB_TRUNCATE=0; AC_SUBST([GNULIB_TRUNCATE]) + GNULIB_TTYNAME_R=0; AC_SUBST([GNULIB_TTYNAME_R]) + GNULIB_UNISTD_H_NONBLOCKING=0; AC_SUBST([GNULIB_UNISTD_H_NONBLOCKING]) + GNULIB_UNISTD_H_SIGPIPE=0; AC_SUBST([GNULIB_UNISTD_H_SIGPIPE]) + GNULIB_UNLINK=0; AC_SUBST([GNULIB_UNLINK]) + GNULIB_UNLINKAT=0; AC_SUBST([GNULIB_UNLINKAT]) + GNULIB_USLEEP=0; AC_SUBST([GNULIB_USLEEP]) + GNULIB_WRITE=0; AC_SUBST([GNULIB_WRITE]) + dnl Support Microsoft deprecated alias function names by default. + GNULIB_MDA_ACCESS=1; AC_SUBST([GNULIB_MDA_ACCESS]) + GNULIB_MDA_CHDIR=1; AC_SUBST([GNULIB_MDA_CHDIR]) + GNULIB_MDA_CLOSE=1; AC_SUBST([GNULIB_MDA_CLOSE]) + GNULIB_MDA_DUP=1; AC_SUBST([GNULIB_MDA_DUP]) + GNULIB_MDA_DUP2=1; AC_SUBST([GNULIB_MDA_DUP2]) + GNULIB_MDA_EXECL=1; AC_SUBST([GNULIB_MDA_EXECL]) + GNULIB_MDA_EXECLE=1; AC_SUBST([GNULIB_MDA_EXECLE]) + GNULIB_MDA_EXECLP=1; AC_SUBST([GNULIB_MDA_EXECLP]) + GNULIB_MDA_EXECV=1; AC_SUBST([GNULIB_MDA_EXECV]) + GNULIB_MDA_EXECVE=1; AC_SUBST([GNULIB_MDA_EXECVE]) + GNULIB_MDA_EXECVP=1; AC_SUBST([GNULIB_MDA_EXECVP]) + GNULIB_MDA_EXECVPE=1; AC_SUBST([GNULIB_MDA_EXECVPE]) + GNULIB_MDA_GETCWD=1; AC_SUBST([GNULIB_MDA_GETCWD]) + GNULIB_MDA_GETPID=1; AC_SUBST([GNULIB_MDA_GETPID]) + GNULIB_MDA_ISATTY=1; AC_SUBST([GNULIB_MDA_ISATTY]) + GNULIB_MDA_LSEEK=1; AC_SUBST([GNULIB_MDA_LSEEK]) + GNULIB_MDA_READ=1; AC_SUBST([GNULIB_MDA_READ]) + GNULIB_MDA_RMDIR=1; AC_SUBST([GNULIB_MDA_RMDIR]) + GNULIB_MDA_SWAB=1; AC_SUBST([GNULIB_MDA_SWAB]) + GNULIB_MDA_UNLINK=1; AC_SUBST([GNULIB_MDA_UNLINK]) + GNULIB_MDA_WRITE=1; AC_SUBST([GNULIB_MDA_WRITE]) dnl Assume proper GNU behavior unless another module says otherwise. - HAVE_CHOWN=1; AC_SUBST([HAVE_CHOWN]) - HAVE_COPY_FILE_RANGE=1; AC_SUBST([HAVE_COPY_FILE_RANGE]) - HAVE_DUP3=1; AC_SUBST([HAVE_DUP3]) - HAVE_EUIDACCESS=1; AC_SUBST([HAVE_EUIDACCESS]) - HAVE_EXECVPE=1; AC_SUBST([HAVE_EXECVPE]) - HAVE_FACCESSAT=1; AC_SUBST([HAVE_FACCESSAT]) - HAVE_FCHDIR=1; AC_SUBST([HAVE_FCHDIR]) - HAVE_FCHOWNAT=1; AC_SUBST([HAVE_FCHOWNAT]) - HAVE_FDATASYNC=1; AC_SUBST([HAVE_FDATASYNC]) - HAVE_FSYNC=1; AC_SUBST([HAVE_FSYNC]) - HAVE_FTRUNCATE=1; AC_SUBST([HAVE_FTRUNCATE]) - HAVE_GETDTABLESIZE=1; AC_SUBST([HAVE_GETDTABLESIZE]) - HAVE_GETENTROPY=1; AC_SUBST([HAVE_GETENTROPY]) - HAVE_GETGROUPS=1; AC_SUBST([HAVE_GETGROUPS]) - HAVE_GETHOSTNAME=1; AC_SUBST([HAVE_GETHOSTNAME]) - HAVE_GETLOGIN=1; AC_SUBST([HAVE_GETLOGIN]) - HAVE_GETPAGESIZE=1; AC_SUBST([HAVE_GETPAGESIZE]) - HAVE_GETPASS=1; AC_SUBST([HAVE_GETPASS]) - HAVE_GROUP_MEMBER=1; AC_SUBST([HAVE_GROUP_MEMBER]) - HAVE_LCHOWN=1; AC_SUBST([HAVE_LCHOWN]) - HAVE_LINK=1; AC_SUBST([HAVE_LINK]) - HAVE_LINKAT=1; AC_SUBST([HAVE_LINKAT]) - HAVE_PIPE=1; AC_SUBST([HAVE_PIPE]) - HAVE_PIPE2=1; AC_SUBST([HAVE_PIPE2]) - HAVE_PREAD=1; AC_SUBST([HAVE_PREAD]) - HAVE_PWRITE=1; AC_SUBST([HAVE_PWRITE]) - HAVE_READLINK=1; AC_SUBST([HAVE_READLINK]) - HAVE_READLINKAT=1; AC_SUBST([HAVE_READLINKAT]) - HAVE_SETHOSTNAME=1; AC_SUBST([HAVE_SETHOSTNAME]) - HAVE_SLEEP=1; AC_SUBST([HAVE_SLEEP]) - HAVE_SYMLINK=1; AC_SUBST([HAVE_SYMLINK]) - HAVE_SYMLINKAT=1; AC_SUBST([HAVE_SYMLINKAT]) - HAVE_UNLINKAT=1; AC_SUBST([HAVE_UNLINKAT]) - HAVE_USLEEP=1; AC_SUBST([HAVE_USLEEP]) - HAVE_DECL_ENVIRON=1; AC_SUBST([HAVE_DECL_ENVIRON]) - HAVE_DECL_EXECVPE=1; AC_SUBST([HAVE_DECL_EXECVPE]) - HAVE_DECL_FCHDIR=1; AC_SUBST([HAVE_DECL_FCHDIR]) - HAVE_DECL_FDATASYNC=1; AC_SUBST([HAVE_DECL_FDATASYNC]) - HAVE_DECL_GETDOMAINNAME=1; AC_SUBST([HAVE_DECL_GETDOMAINNAME]) - HAVE_DECL_GETLOGIN=1; AC_SUBST([HAVE_DECL_GETLOGIN]) - HAVE_DECL_GETLOGIN_R=1; AC_SUBST([HAVE_DECL_GETLOGIN_R]) - HAVE_DECL_GETPAGESIZE=1; AC_SUBST([HAVE_DECL_GETPAGESIZE]) - HAVE_DECL_GETUSERSHELL=1; AC_SUBST([HAVE_DECL_GETUSERSHELL]) - HAVE_DECL_SETHOSTNAME=1; AC_SUBST([HAVE_DECL_SETHOSTNAME]) - HAVE_DECL_TRUNCATE=1; AC_SUBST([HAVE_DECL_TRUNCATE]) - HAVE_DECL_TTYNAME_R=1; AC_SUBST([HAVE_DECL_TTYNAME_R]) - HAVE_OS_H=0; AC_SUBST([HAVE_OS_H]) - HAVE_SYS_PARAM_H=0; AC_SUBST([HAVE_SYS_PARAM_H]) - REPLACE_ACCESS=0; AC_SUBST([REPLACE_ACCESS]) - REPLACE_CHOWN=0; AC_SUBST([REPLACE_CHOWN]) - REPLACE_CLOSE=0; AC_SUBST([REPLACE_CLOSE]) - REPLACE_COPY_FILE_RANGE=0; AC_SUBST([REPLACE_COPY_FILE_RANGE]) - REPLACE_DUP=0; AC_SUBST([REPLACE_DUP]) - REPLACE_DUP2=0; AC_SUBST([REPLACE_DUP2]) - REPLACE_DUP3=0; AC_SUBST([REPLACE_DUP3]) - REPLACE_EXECL=0; AC_SUBST([REPLACE_EXECL]) - REPLACE_EXECLE=0; AC_SUBST([REPLACE_EXECLE]) - REPLACE_EXECLP=0; AC_SUBST([REPLACE_EXECLP]) - REPLACE_EXECV=0; AC_SUBST([REPLACE_EXECV]) - REPLACE_EXECVE=0; AC_SUBST([REPLACE_EXECVE]) - REPLACE_EXECVP=0; AC_SUBST([REPLACE_EXECVP]) - REPLACE_EXECVPE=0; AC_SUBST([REPLACE_EXECVPE]) - REPLACE_FACCESSAT=0; AC_SUBST([REPLACE_FACCESSAT]) - REPLACE_FCHOWNAT=0; AC_SUBST([REPLACE_FCHOWNAT]) - REPLACE_FDATASYNC=0; AC_SUBST([REPLACE_FDATASYNC]) - 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_GETENTROPY=0; AC_SUBST([REPLACE_GETENTROPY]) - REPLACE_GETLOGIN_R=0; AC_SUBST([REPLACE_GETLOGIN_R]) - REPLACE_GETGROUPS=0; AC_SUBST([REPLACE_GETGROUPS]) - REPLACE_GETPAGESIZE=0; AC_SUBST([REPLACE_GETPAGESIZE]) - REPLACE_GETPASS=0; AC_SUBST([REPLACE_GETPASS]) - REPLACE_GETPASS_FOR_GETPASS_GNU=0; AC_SUBST([REPLACE_GETPASS_FOR_GETPASS_GNU]) - REPLACE_ISATTY=0; AC_SUBST([REPLACE_ISATTY]) - REPLACE_LCHOWN=0; AC_SUBST([REPLACE_LCHOWN]) - REPLACE_LINK=0; AC_SUBST([REPLACE_LINK]) - REPLACE_LINKAT=0; AC_SUBST([REPLACE_LINKAT]) - REPLACE_LSEEK=0; AC_SUBST([REPLACE_LSEEK]) - REPLACE_PIPE2=0; AC_SUBST([REPLACE_PIPE2]) - REPLACE_PREAD=0; AC_SUBST([REPLACE_PREAD]) - REPLACE_PWRITE=0; AC_SUBST([REPLACE_PWRITE]) - REPLACE_READ=0; AC_SUBST([REPLACE_READ]) - REPLACE_READLINK=0; AC_SUBST([REPLACE_READLINK]) - REPLACE_READLINKAT=0; AC_SUBST([REPLACE_READLINKAT]) - REPLACE_RMDIR=0; AC_SUBST([REPLACE_RMDIR]) - REPLACE_SETHOSTNAME=0; AC_SUBST([REPLACE_SETHOSTNAME]) - REPLACE_SLEEP=0; AC_SUBST([REPLACE_SLEEP]) - REPLACE_SYMLINK=0; AC_SUBST([REPLACE_SYMLINK]) - REPLACE_SYMLINKAT=0; AC_SUBST([REPLACE_SYMLINKAT]) - REPLACE_TRUNCATE=0; AC_SUBST([REPLACE_TRUNCATE]) - REPLACE_TTYNAME_R=0; AC_SUBST([REPLACE_TTYNAME_R]) - REPLACE_UNLINK=0; AC_SUBST([REPLACE_UNLINK]) - REPLACE_UNLINKAT=0; AC_SUBST([REPLACE_UNLINKAT]) - REPLACE_USLEEP=0; AC_SUBST([REPLACE_USLEEP]) - REPLACE_WRITE=0; AC_SUBST([REPLACE_WRITE]) - UNISTD_H_HAVE_SYS_RANDOM_H=0; AC_SUBST([UNISTD_H_HAVE_SYS_RANDOM_H]) - UNISTD_H_HAVE_WINSOCK2_H=0; AC_SUBST([UNISTD_H_HAVE_WINSOCK2_H]) + HAVE_CHOWN=1; AC_SUBST([HAVE_CHOWN]) + HAVE_COPY_FILE_RANGE=1; AC_SUBST([HAVE_COPY_FILE_RANGE]) + HAVE_DUP3=1; AC_SUBST([HAVE_DUP3]) + HAVE_EUIDACCESS=1; AC_SUBST([HAVE_EUIDACCESS]) + HAVE_EXECVPE=1; AC_SUBST([HAVE_EXECVPE]) + HAVE_FACCESSAT=1; AC_SUBST([HAVE_FACCESSAT]) + HAVE_FCHDIR=1; AC_SUBST([HAVE_FCHDIR]) + HAVE_FCHOWNAT=1; AC_SUBST([HAVE_FCHOWNAT]) + HAVE_FDATASYNC=1; AC_SUBST([HAVE_FDATASYNC]) + HAVE_FSYNC=1; AC_SUBST([HAVE_FSYNC]) + HAVE_FTRUNCATE=1; AC_SUBST([HAVE_FTRUNCATE]) + HAVE_GETDTABLESIZE=1; AC_SUBST([HAVE_GETDTABLESIZE]) + HAVE_GETENTROPY=1; AC_SUBST([HAVE_GETENTROPY]) + HAVE_GETGROUPS=1; AC_SUBST([HAVE_GETGROUPS]) + HAVE_GETHOSTNAME=1; AC_SUBST([HAVE_GETHOSTNAME]) + HAVE_GETLOGIN=1; AC_SUBST([HAVE_GETLOGIN]) + HAVE_GETPAGESIZE=1; AC_SUBST([HAVE_GETPAGESIZE]) + HAVE_GETPASS=1; AC_SUBST([HAVE_GETPASS]) + HAVE_GROUP_MEMBER=1; AC_SUBST([HAVE_GROUP_MEMBER]) + HAVE_LCHOWN=1; AC_SUBST([HAVE_LCHOWN]) + HAVE_LINK=1; AC_SUBST([HAVE_LINK]) + HAVE_LINKAT=1; AC_SUBST([HAVE_LINKAT]) + HAVE_PIPE=1; AC_SUBST([HAVE_PIPE]) + HAVE_PIPE2=1; AC_SUBST([HAVE_PIPE2]) + HAVE_PREAD=1; AC_SUBST([HAVE_PREAD]) + HAVE_PWRITE=1; AC_SUBST([HAVE_PWRITE]) + HAVE_READLINK=1; AC_SUBST([HAVE_READLINK]) + HAVE_READLINKAT=1; AC_SUBST([HAVE_READLINKAT]) + HAVE_SETHOSTNAME=1; AC_SUBST([HAVE_SETHOSTNAME]) + HAVE_SLEEP=1; AC_SUBST([HAVE_SLEEP]) + HAVE_SYMLINK=1; AC_SUBST([HAVE_SYMLINK]) + HAVE_SYMLINKAT=1; AC_SUBST([HAVE_SYMLINKAT]) + HAVE_UNLINKAT=1; AC_SUBST([HAVE_UNLINKAT]) + HAVE_USLEEP=1; AC_SUBST([HAVE_USLEEP]) + HAVE_DECL_ENVIRON=1; AC_SUBST([HAVE_DECL_ENVIRON]) + HAVE_DECL_EXECVPE=1; AC_SUBST([HAVE_DECL_EXECVPE]) + HAVE_DECL_FCHDIR=1; AC_SUBST([HAVE_DECL_FCHDIR]) + HAVE_DECL_FDATASYNC=1; AC_SUBST([HAVE_DECL_FDATASYNC]) + HAVE_DECL_GETDOMAINNAME=1; AC_SUBST([HAVE_DECL_GETDOMAINNAME]) + HAVE_DECL_GETLOGIN=1; AC_SUBST([HAVE_DECL_GETLOGIN]) + HAVE_DECL_GETLOGIN_R=1; AC_SUBST([HAVE_DECL_GETLOGIN_R]) + HAVE_DECL_GETPAGESIZE=1; AC_SUBST([HAVE_DECL_GETPAGESIZE]) + HAVE_DECL_GETUSERSHELL=1; AC_SUBST([HAVE_DECL_GETUSERSHELL]) + HAVE_DECL_SETHOSTNAME=1; AC_SUBST([HAVE_DECL_SETHOSTNAME]) + HAVE_DECL_TRUNCATE=1; AC_SUBST([HAVE_DECL_TRUNCATE]) + HAVE_DECL_TTYNAME_R=1; AC_SUBST([HAVE_DECL_TTYNAME_R]) + HAVE_OS_H=0; AC_SUBST([HAVE_OS_H]) + HAVE_SYS_PARAM_H=0; AC_SUBST([HAVE_SYS_PARAM_H]) + REPLACE_ACCESS=0; AC_SUBST([REPLACE_ACCESS]) + REPLACE_CHOWN=0; AC_SUBST([REPLACE_CHOWN]) + REPLACE_CLOSE=0; AC_SUBST([REPLACE_CLOSE]) + REPLACE_DUP=0; AC_SUBST([REPLACE_DUP]) + REPLACE_DUP2=0; AC_SUBST([REPLACE_DUP2]) + REPLACE_EXECL=0; AC_SUBST([REPLACE_EXECL]) + REPLACE_EXECLE=0; AC_SUBST([REPLACE_EXECLE]) + REPLACE_EXECLP=0; AC_SUBST([REPLACE_EXECLP]) + REPLACE_EXECV=0; AC_SUBST([REPLACE_EXECV]) + REPLACE_EXECVE=0; AC_SUBST([REPLACE_EXECVE]) + REPLACE_EXECVP=0; AC_SUBST([REPLACE_EXECVP]) + REPLACE_EXECVPE=0; AC_SUBST([REPLACE_EXECVPE]) + REPLACE_FACCESSAT=0; AC_SUBST([REPLACE_FACCESSAT]) + REPLACE_FCHOWNAT=0; AC_SUBST([REPLACE_FCHOWNAT]) + 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]) + REPLACE_GETPASS=0; AC_SUBST([REPLACE_GETPASS]) + REPLACE_ISATTY=0; AC_SUBST([REPLACE_ISATTY]) + REPLACE_LCHOWN=0; AC_SUBST([REPLACE_LCHOWN]) + REPLACE_LINK=0; AC_SUBST([REPLACE_LINK]) + REPLACE_LINKAT=0; AC_SUBST([REPLACE_LINKAT]) + REPLACE_LSEEK=0; AC_SUBST([REPLACE_LSEEK]) + REPLACE_PREAD=0; AC_SUBST([REPLACE_PREAD]) + REPLACE_PWRITE=0; AC_SUBST([REPLACE_PWRITE]) + REPLACE_READ=0; AC_SUBST([REPLACE_READ]) + REPLACE_READLINK=0; AC_SUBST([REPLACE_READLINK]) + REPLACE_READLINKAT=0; AC_SUBST([REPLACE_READLINKAT]) + REPLACE_RMDIR=0; AC_SUBST([REPLACE_RMDIR]) + REPLACE_SLEEP=0; AC_SUBST([REPLACE_SLEEP]) + REPLACE_SYMLINK=0; AC_SUBST([REPLACE_SYMLINK]) + REPLACE_SYMLINKAT=0; AC_SUBST([REPLACE_SYMLINKAT]) + REPLACE_TRUNCATE=0; AC_SUBST([REPLACE_TRUNCATE]) + REPLACE_TTYNAME_R=0; AC_SUBST([REPLACE_TTYNAME_R]) + REPLACE_UNLINK=0; AC_SUBST([REPLACE_UNLINK]) + REPLACE_UNLINKAT=0; AC_SUBST([REPLACE_UNLINKAT]) + REPLACE_USLEEP=0; AC_SUBST([REPLACE_USLEEP]) + REPLACE_WRITE=0; AC_SUBST([REPLACE_WRITE]) + UNISTD_H_HAVE_SYS_RANDOM_H=0; AC_SUBST([UNISTD_H_HAVE_SYS_RANDOM_H]) + UNISTD_H_HAVE_WINSOCK2_H=0; AC_SUBST([UNISTD_H_HAVE_WINSOCK2_H]) UNISTD_H_HAVE_WINSOCK2_H_AND_USE_SOCKETS=0; AC_SUBST([UNISTD_H_HAVE_WINSOCK2_H_AND_USE_SOCKETS]) ]) diff -Nru mmv-2.5/m4/unlink.m4 mmv-2.5.1/m4/unlink.m4 --- mmv-2.5/m4/unlink.m4 2023-07-20 19:40:23.000000000 +0000 +++ mmv-2.5.1/m4/unlink.m4 2023-08-08 11:02:40.000000000 +0000 @@ -1,5 +1,5 @@ -# unlink.m4 serial 16 -dnl Copyright (C) 2009-2023 Free Software Foundation, Inc. +# unlink.m4 serial 15 +dnl Copyright (C) 2009-2021 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. @@ -45,8 +45,6 @@ [case "$host_os" in # Guess yes on Linux systems. linux-* | linux) gl_cv_func_unlink_honors_slashes="guessing yes" ;; - # Guess yes on systems that emulate the Linux system calls. - midipix*) gl_cv_func_unlink_honors_slashes="guessing yes" ;; # Guess yes on glibc systems. *-gnu*) gl_cv_func_unlink_honors_slashes="guessing yes" ;; # Guess no on native Windows. diff -Nru mmv-2.5/m4/vasnprintf.m4 mmv-2.5.1/m4/vasnprintf.m4 --- mmv-2.5/m4/vasnprintf.m4 2023-07-20 19:40:24.000000000 +0000 +++ mmv-2.5.1/m4/vasnprintf.m4 2023-08-08 11:02:40.000000000 +0000 @@ -1,5 +1,5 @@ -# vasnprintf.m4 serial 49 -dnl Copyright (C) 2002-2004, 2006-2023 Free Software Foundation, Inc. +# vasnprintf.m4 serial 38 +dnl Copyright (C) 2002-2004, 2006-2021 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. @@ -29,15 +29,6 @@ gl_PREREQ_ASNPRINTF ]) -AC_DEFUN([gl_FUNC_VASNWPRINTF], -[ - AC_LIBOBJ([printf-args]) - gl_PREREQ_PRINTF_ARGS - gl_PREREQ_PRINTF_PARSE - gl_PREREQ_VASNWPRINTF - gl_PREREQ_ASNPRINTF -]) - # Prerequisites of lib/printf-args.h, lib/printf-args.c. AC_DEFUN([gl_PREREQ_PRINTF_ARGS], [ @@ -46,7 +37,6 @@ ]) # Prerequisites of lib/printf-parse.h, lib/printf-parse.c. -# Prerequisites of lib/wprintf-parse.h, lib/wprintf-parse.c. AC_DEFUN([gl_PREREQ_PRINTF_PARSE], [ AC_REQUIRE([gl_FEATURES_H]) @@ -60,13 +50,19 @@ AC_REQUIRE([gt_AC_TYPE_INTMAX_T]) ]) -# Prerequisites of lib/vasnprintf.c if !WIDE_CHAR_VERSION. +# Prerequisites of lib/vasnprintf.c. AC_DEFUN_ONCE([gl_PREREQ_VASNPRINTF], [ - AC_CHECK_FUNCS([snprintf strnlen wcrtomb]) + AC_REQUIRE([AC_FUNC_ALLOCA]) + AC_REQUIRE([gt_TYPE_WCHAR_T]) + AC_REQUIRE([gt_TYPE_WINT_T]) + AC_CHECK_FUNCS([snprintf strnlen wcslen wcsnlen mbrtowc wcrtomb]) dnl Use the _snprintf function only if it is declared (because on NetBSD it dnl is defined as a weak alias of snprintf; we prefer to use the latter). AC_CHECK_DECLS([_snprintf], , , [[#include ]]) + dnl Knowing DBL_EXPBIT0_WORD and DBL_EXPBIT0_BIT enables an optimization + dnl in the code for NEED_PRINTF_LONG_DOUBLE || NEED_PRINTF_DOUBLE. + AC_REQUIRE([gl_DOUBLE_EXPONENT_LOCATION]) dnl We can avoid a lot of code by assuming that snprintf's return value dnl conforms to ISO C99. So check that. AC_REQUIRE([gl_SNPRINTF_RETVAL_C99]) @@ -88,55 +84,6 @@ terminated.]) ;; esac - gl_PREREQ_VASNXPRINTF -]) - -# Prerequisites of lib/vasnwprintf.c. -AC_DEFUN_ONCE([gl_PREREQ_VASNWPRINTF], -[ - AC_CHECK_FUNCS_ONCE([swprintf wcsnlen mbrtowc]) - AC_CHECK_DECLS([_snwprintf], , , [[#include ]]) - AC_CHECK_DECLS([wcsnlen], , , [[#include ]]) - gl_SWPRINTF_WORKS - case "$gl_cv_func_swprintf_works" in - *yes) - AC_DEFINE([HAVE_WORKING_SWPRINTF], [1], - [Define if the swprintf function works correctly when it produces output - that contains null wide characters.]) - ;; - esac - gl_MBRTOWC_C_LOCALE - case "$gl_cv_func_mbrtowc_C_locale_sans_EILSEQ" in - *yes) ;; - *) - AC_DEFINE([NEED_WPRINTF_DIRECTIVE_C], [1], - [Define if the vasnwprintf implementation needs special code for - the 'c' directive.]) - ;; - esac - gl_SWPRINTF_DIRECTIVE_LA - case "$gl_cv_func_swprintf_directive_la" in - *yes) ;; - *) - AC_DEFINE([NEED_WPRINTF_DIRECTIVE_LA], [1], - [Define if the vasnwprintf implementation needs special code for - the 'a' directive with 'long double' arguments.]) - ;; - esac - gl_MUSL_LIBC - gl_PREREQ_VASNXPRINTF -]) - -# Common prerequisites of lib/vasnprintf.c and lib/vasnwprintf.c. -AC_DEFUN_ONCE([gl_PREREQ_VASNXPRINTF], -[ - AC_REQUIRE([AC_FUNC_ALLOCA]) - AC_REQUIRE([gt_TYPE_WCHAR_T]) - AC_REQUIRE([gt_TYPE_WINT_T]) - AC_CHECK_FUNCS([wcslen]) - dnl Knowing DBL_EXPBIT0_WORD and DBL_EXPBIT0_BIT enables an optimization - dnl in the code for NEED_PRINTF_LONG_DOUBLE || NEED_PRINTF_DOUBLE. - AC_REQUIRE([gl_DOUBLE_EXPONENT_LOCATION]) ]) # Extra prerequisites of lib/vasnprintf.c for supporting 'long double' @@ -205,22 +152,7 @@ AC_DEFINE([NEED_PRINTF_DIRECTIVE_A], [1], [Define if the vasnprintf implementation needs special code for the 'a' and 'A' directives.]) - gl_CHECK_FUNCS_ANDROID([nl_langinfo], [[#include ]]) - ;; - esac -]) - -# Extra prerequisites of lib/vasnprintf.c for supporting the 'b' directive. -AC_DEFUN([gl_PREREQ_VASNPRINTF_DIRECTIVE_B], -[ - AC_REQUIRE([gl_PRINTF_DIRECTIVE_B]) - case "$gl_cv_func_printf_directive_b" in - *yes) - ;; - *) - AC_DEFINE([NEED_PRINTF_DIRECTIVE_B], [1], - [Define if the vasnprintf implementation needs special code for - the 'b' directive.]) + AC_CHECK_FUNCS([nl_langinfo]) ;; esac ]) @@ -255,21 +187,6 @@ esac ]) -# Extra prerequisites of lib/vasnprintf.c for supporting the 'lc' directive. -AC_DEFUN([gl_PREREQ_VASNPRINTF_DIRECTIVE_LC], -[ - AC_REQUIRE([gl_PRINTF_DIRECTIVE_LC]) - case "$gl_cv_func_printf_directive_lc" in - *yes) - ;; - *) - AC_DEFINE([NEED_PRINTF_DIRECTIVE_LC], [1], - [Define if the vasnprintf implementation needs special code for - the 'lc' directive.]) - ;; - esac -]) - # Extra prerequisites of lib/vasnprintf.c for supporting the ' flag. AC_DEFUN([gl_PREREQ_VASNPRINTF_FLAG_GROUPING], [ @@ -359,17 +276,15 @@ ]) # Prerequisites of lib/vasnprintf.c including all extras for POSIX compliance. -AC_DEFUN([gl_PREREQ_VASNPRINTF_WITH_POSIX_EXTRAS], +AC_DEFUN([gl_PREREQ_VASNPRINTF_WITH_EXTRAS], [ AC_REQUIRE([gl_PREREQ_VASNPRINTF]) gl_PREREQ_VASNPRINTF_LONG_DOUBLE gl_PREREQ_VASNPRINTF_INFINITE_DOUBLE gl_PREREQ_VASNPRINTF_INFINITE_LONG_DOUBLE gl_PREREQ_VASNPRINTF_DIRECTIVE_A - gl_PREREQ_VASNPRINTF_DIRECTIVE_B gl_PREREQ_VASNPRINTF_DIRECTIVE_F gl_PREREQ_VASNPRINTF_DIRECTIVE_LS - gl_PREREQ_VASNPRINTF_DIRECTIVE_LC gl_PREREQ_VASNPRINTF_FLAG_GROUPING gl_PREREQ_VASNPRINTF_FLAG_LEFTADJUST gl_PREREQ_VASNPRINTF_FLAG_ZERO @@ -377,34 +292,7 @@ gl_PREREQ_VASNPRINTF_ENOMEM ]) -# Extra prerequisites of lib/vasnprintf.c for supporting the 'B' directive. -AC_DEFUN([gl_PREREQ_VASNPRINTF_DIRECTIVE_UPPERCASE_B], -[ - AC_REQUIRE([gl_PRINTF_DIRECTIVE_UPPERCASE_B]) - case "$gl_cv_func_printf_directive_uppercase_b" in - *yes) - ;; - *) - AC_DEFINE([NEED_PRINTF_DIRECTIVE_UPPERCASE_B], [1], - [Define if the vasnprintf implementation needs special code for - the 'B' directive.]) - ;; - esac -]) - -# Prerequisites of lib/vasnprintf.c including all extras for POSIX compliance -# and GNU compatibility. -AC_DEFUN([gl_PREREQ_VASNPRINTF_WITH_GNU_EXTRAS], -[ - gl_PREREQ_VASNPRINTF_WITH_POSIX_EXTRAS - AC_DEFINE([SUPPORT_GNU_PRINTF_DIRECTIVES], [1], - [Define if the vasnprintf implementation should support GNU compatible - printf directives.]) - gl_PREREQ_VASNPRINTF_DIRECTIVE_UPPERCASE_B -]) - # Prerequisites of lib/asnprintf.c. -# Prerequisites of lib/asnwprintf.c. AC_DEFUN([gl_PREREQ_ASNPRINTF], [ ]) diff -Nru mmv-2.5/m4/warn-on-use.m4 mmv-2.5.1/m4/warn-on-use.m4 --- mmv-2.5/m4/warn-on-use.m4 2023-07-20 19:40:23.000000000 +0000 +++ mmv-2.5.1/m4/warn-on-use.m4 2023-08-08 11:02:40.000000000 +0000 @@ -1,5 +1,5 @@ -# warn-on-use.m4 serial 10 -dnl Copyright (C) 2010-2023 Free Software Foundation, Inc. +# warn-on-use.m4 serial 9 +dnl Copyright (C) 2010-2021 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. @@ -32,30 +32,17 @@ undefining macros.])])dnl for gl_func in m4_flatten([$2]); do AS_VAR_PUSHDEF([gl_Symbol], [gl_cv_have_raw_decl_$gl_func])dnl - dnl As a workaround to implicit built-in function declarations in - dnl clang (e.g. strndup), reference ac_compile_for_check_decl instead - dnl of ac_compile. If, for whatever reason, the override of AC_PROG_CC - dnl in zzgnulib.m4 is inactive, use the original ac_compile. - ac_save_ac_compile="$ac_compile" - if test -n "$ac_compile_for_check_decl"; then - ac_compile="$ac_compile_for_check_decl" - fi AC_CACHE_CHECK([whether $gl_func is declared without a macro], [gl_Symbol], [AC_COMPILE_IFELSE([AC_LANG_PROGRAM([$1], [[#undef $gl_func (void) $gl_func;]])], [AS_VAR_SET([gl_Symbol], [yes])], [AS_VAR_SET([gl_Symbol], [no])])]) - ac_compile="$ac_save_ac_compile" AS_VAR_IF([gl_Symbol], [yes], [AC_DEFINE_UNQUOTED(AS_TR_CPP([HAVE_RAW_DECL_$gl_func]), [1]) - dnl Shortcut for an AC_CHECK_DECL invocation that may come later: - dnl If the raw declaration exists with the given includes, then - dnl AC_CHECK_DECL with its many includes would see it as well. - dnl So, set a cache variable to allow skipping any later - dnl AC_CHECK_DECL invocation for $gl_func. - eval "ac_cv_have_decl_$gl_func=yes" - ]) + dnl shortcut - if the raw declaration exists, then set a cache + dnl variable to allow skipping any later AC_CHECK_DECL efforts + eval ac_cv_have_decl_$gl_func=yes]) AS_VAR_POPDEF([gl_Symbol])dnl done ]) diff -Nru mmv-2.5/m4/warnings.m4 mmv-2.5.1/m4/warnings.m4 --- mmv-2.5/m4/warnings.m4 2023-07-20 19:40:24.000000000 +0000 +++ mmv-2.5.1/m4/warnings.m4 2023-08-08 11:02:40.000000000 +0000 @@ -1,5 +1,5 @@ # warnings.m4 serial 16 -dnl Copyright (C) 2008-2023 Free Software Foundation, Inc. +dnl Copyright (C) 2008-2021 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 -Nru mmv-2.5/m4/wchar_h.m4 mmv-2.5.1/m4/wchar_h.m4 --- mmv-2.5/m4/wchar_h.m4 2023-07-20 19:40:24.000000000 +0000 +++ mmv-2.5.1/m4/wchar_h.m4 2023-08-08 11:02:40.000000000 +0000 @@ -1,15 +1,15 @@ dnl A placeholder for ISO C99 , for platforms that have issues. -dnl Copyright (C) 2007-2023 Free Software Foundation, Inc. +dnl Copyright (C) 2007-2021 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 Written by Eric Blake. -# wchar_h.m4 serial 60 +# wchar_h.m4 serial 50 -AC_DEFUN_ONCE([gl_WCHAR_H], +AC_DEFUN([gl_WCHAR_H], [ AC_REQUIRE([gl_WCHAR_H_DEFAULTS]) AC_REQUIRE([gl_WCHAR_H_INLINE_OK]) @@ -125,77 +125,60 @@ fi ]) -# gl_WCHAR_MODULE_INDICATOR([modulename]) -# sets the shell variable that indicates the presence of the given module -# to a C preprocessor expression that will evaluate to 1. -# This macro invocation must not occur in macros that are AC_REQUIREd. AC_DEFUN([gl_WCHAR_MODULE_INDICATOR], [ - dnl Ensure to expand the default settings once only. - gl_WCHAR_H_REQUIRE_DEFAULTS + dnl Use AC_REQUIRE here, so that the default settings are expanded once only. + AC_REQUIRE([gl_WCHAR_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]) ]) -# Initializes the default values for AC_SUBSTed shell variables. -# This macro must not be AC_REQUIREd. It must only be invoked, and only -# outside of macros or in macros that are not AC_REQUIREd. -AC_DEFUN([gl_WCHAR_H_REQUIRE_DEFAULTS], -[ - m4_defun(GL_MODULE_INDICATOR_PREFIX[_WCHAR_H_MODULE_INDICATOR_DEFAULTS], [ - gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_BTOWC]) - gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_WCTOB]) - gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MBSINIT]) - gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MBRTOWC]) - gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MBRLEN]) - gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MBSRTOWCS]) - gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MBSNRTOWCS]) - gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_WCRTOMB]) - gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_WCSRTOMBS]) - gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_WCSNRTOMBS]) - gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_WCWIDTH]) - gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_WMEMCHR]) - gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_WMEMCMP]) - gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_WMEMCPY]) - gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_WMEMMOVE]) - gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_WMEMPCPY]) - gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_WMEMSET]) - gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_WCSLEN]) - gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_WCSNLEN]) - gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_WCSCPY]) - gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_WCPCPY]) - gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_WCSNCPY]) - gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_WCPNCPY]) - gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_WCSCAT]) - gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_WCSNCAT]) - gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_WCSCMP]) - gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_WCSNCMP]) - gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_WCSCASECMP]) - gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_WCSNCASECMP]) - gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_WCSCOLL]) - gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_WCSXFRM]) - gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_WCSDUP]) - gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_WCSCHR]) - gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_WCSRCHR]) - gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_WCSCSPN]) - gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_WCSSPN]) - gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_WCSPBRK]) - gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_WCSSTR]) - gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_WCSTOK]) - gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_WCSWIDTH]) - gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_WCSFTIME]) - dnl Support Microsoft deprecated alias function names by default. - gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MDA_WCSDUP], [1]) - ]) - m4_require(GL_MODULE_INDICATOR_PREFIX[_WCHAR_H_MODULE_INDICATOR_DEFAULTS]) - dnl Make sure the shell variable for GNULIB_FREE_POSIX is initialized. - gl_STDLIB_H_REQUIRE_DEFAULTS - AC_REQUIRE([gl_WCHAR_H_DEFAULTS]) -]) - AC_DEFUN([gl_WCHAR_H_DEFAULTS], [ + GNULIB_BTOWC=0; AC_SUBST([GNULIB_BTOWC]) + GNULIB_WCTOB=0; AC_SUBST([GNULIB_WCTOB]) + GNULIB_MBSINIT=0; AC_SUBST([GNULIB_MBSINIT]) + GNULIB_MBRTOWC=0; AC_SUBST([GNULIB_MBRTOWC]) + GNULIB_MBRLEN=0; AC_SUBST([GNULIB_MBRLEN]) + GNULIB_MBSRTOWCS=0; AC_SUBST([GNULIB_MBSRTOWCS]) + GNULIB_MBSNRTOWCS=0; AC_SUBST([GNULIB_MBSNRTOWCS]) + GNULIB_WCRTOMB=0; AC_SUBST([GNULIB_WCRTOMB]) + GNULIB_WCSRTOMBS=0; AC_SUBST([GNULIB_WCSRTOMBS]) + GNULIB_WCSNRTOMBS=0; AC_SUBST([GNULIB_WCSNRTOMBS]) + GNULIB_WCWIDTH=0; AC_SUBST([GNULIB_WCWIDTH]) + GNULIB_WMEMCHR=0; AC_SUBST([GNULIB_WMEMCHR]) + GNULIB_WMEMCMP=0; AC_SUBST([GNULIB_WMEMCMP]) + GNULIB_WMEMCPY=0; AC_SUBST([GNULIB_WMEMCPY]) + GNULIB_WMEMMOVE=0; AC_SUBST([GNULIB_WMEMMOVE]) + GNULIB_WMEMPCPY=0; AC_SUBST([GNULIB_WMEMPCPY]) + GNULIB_WMEMSET=0; AC_SUBST([GNULIB_WMEMSET]) + GNULIB_WCSLEN=0; AC_SUBST([GNULIB_WCSLEN]) + GNULIB_WCSNLEN=0; AC_SUBST([GNULIB_WCSNLEN]) + GNULIB_WCSCPY=0; AC_SUBST([GNULIB_WCSCPY]) + GNULIB_WCPCPY=0; AC_SUBST([GNULIB_WCPCPY]) + GNULIB_WCSNCPY=0; AC_SUBST([GNULIB_WCSNCPY]) + GNULIB_WCPNCPY=0; AC_SUBST([GNULIB_WCPNCPY]) + GNULIB_WCSCAT=0; AC_SUBST([GNULIB_WCSCAT]) + GNULIB_WCSNCAT=0; AC_SUBST([GNULIB_WCSNCAT]) + GNULIB_WCSCMP=0; AC_SUBST([GNULIB_WCSCMP]) + GNULIB_WCSNCMP=0; AC_SUBST([GNULIB_WCSNCMP]) + GNULIB_WCSCASECMP=0; AC_SUBST([GNULIB_WCSCASECMP]) + GNULIB_WCSNCASECMP=0; AC_SUBST([GNULIB_WCSNCASECMP]) + GNULIB_WCSCOLL=0; AC_SUBST([GNULIB_WCSCOLL]) + GNULIB_WCSXFRM=0; AC_SUBST([GNULIB_WCSXFRM]) + GNULIB_WCSDUP=0; AC_SUBST([GNULIB_WCSDUP]) + GNULIB_WCSCHR=0; AC_SUBST([GNULIB_WCSCHR]) + GNULIB_WCSRCHR=0; AC_SUBST([GNULIB_WCSRCHR]) + GNULIB_WCSCSPN=0; AC_SUBST([GNULIB_WCSCSPN]) + GNULIB_WCSSPN=0; AC_SUBST([GNULIB_WCSSPN]) + GNULIB_WCSPBRK=0; AC_SUBST([GNULIB_WCSPBRK]) + GNULIB_WCSSTR=0; AC_SUBST([GNULIB_WCSSTR]) + GNULIB_WCSTOK=0; AC_SUBST([GNULIB_WCSTOK]) + GNULIB_WCSWIDTH=0; AC_SUBST([GNULIB_WCSWIDTH]) + GNULIB_WCSFTIME=0; AC_SUBST([GNULIB_WCSFTIME]) + dnl Support Microsoft deprecated alias function names by default. + GNULIB_MDA_WCSDUP=1; AC_SUBST([GNULIB_MDA_WCSDUP]) dnl Assume proper GNU behavior unless another module says otherwise. HAVE_BTOWC=1; AC_SUBST([HAVE_BTOWC]) HAVE_MBSINIT=1; AC_SUBST([HAVE_MBSINIT]) @@ -253,10 +236,5 @@ REPLACE_WCWIDTH=0; AC_SUBST([REPLACE_WCWIDTH]) REPLACE_WCSWIDTH=0; AC_SUBST([REPLACE_WCSWIDTH]) REPLACE_WCSFTIME=0; AC_SUBST([REPLACE_WCSFTIME]) - REPLACE_WCSCMP=0; AC_SUBST([REPLACE_WCSCMP]) - REPLACE_WCSNCMP=0; AC_SUBST([REPLACE_WCSNCMP]) - REPLACE_WCSSTR=0; AC_SUBST([REPLACE_WCSSTR]) REPLACE_WCSTOK=0; AC_SUBST([REPLACE_WCSTOK]) - REPLACE_WMEMCMP=0; AC_SUBST([REPLACE_WMEMCMP]) - REPLACE_WMEMPCPY=0; AC_SUBST([REPLACE_WMEMPCPY]) ]) diff -Nru mmv-2.5/m4/wchar_t.m4 mmv-2.5.1/m4/wchar_t.m4 --- mmv-2.5/m4/wchar_t.m4 2023-07-20 19:40:23.000000000 +0000 +++ mmv-2.5.1/m4/wchar_t.m4 2023-08-08 11:02:40.000000000 +0000 @@ -1,5 +1,5 @@ # wchar_t.m4 serial 4 (gettext-0.18.2) -dnl Copyright (C) 2002-2003, 2008-2023 Free Software Foundation, Inc. +dnl Copyright (C) 2002-2003, 2008-2021 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 -Nru mmv-2.5/m4/wint_t.m4 mmv-2.5.1/m4/wint_t.m4 --- mmv-2.5/m4/wint_t.m4 2023-07-20 19:40:23.000000000 +0000 +++ mmv-2.5.1/m4/wint_t.m4 2023-08-08 11:02:40.000000000 +0000 @@ -1,5 +1,5 @@ -# wint_t.m4 serial 11 -dnl Copyright (C) 2003, 2007-2023 Free Software Foundation, Inc. +# wint_t.m4 serial 10 +dnl Copyright (C) 2003, 2007-2021 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. @@ -34,14 +34,14 @@ [gl_cv_type_wint_t_large_enough=yes], [gl_cv_type_wint_t_large_enough=no])]) if test $gl_cv_type_wint_t_large_enough = no; then - GNULIBHEADERS_OVERRIDE_WINT_T=1 + GNULIB_OVERRIDES_WINT_T=1 else - GNULIBHEADERS_OVERRIDE_WINT_T=0 + GNULIB_OVERRIDES_WINT_T=0 fi else - GNULIBHEADERS_OVERRIDE_WINT_T=0 + GNULIB_OVERRIDES_WINT_T=0 fi - AC_SUBST([GNULIBHEADERS_OVERRIDE_WINT_T]) + AC_SUBST([GNULIB_OVERRIDES_WINT_T]) ]) dnl Prerequisites of the 'wint_t' override. diff -Nru mmv-2.5/m4/write.m4 mmv-2.5.1/m4/write.m4 --- mmv-2.5/m4/write.m4 2023-07-20 19:40:23.000000000 +0000 +++ mmv-2.5.1/m4/write.m4 2023-08-08 11:02:40.000000000 +0000 @@ -1,5 +1,5 @@ # write.m4 serial 6 -dnl Copyright (C) 2008-2023 Free Software Foundation, Inc. +dnl Copyright (C) 2008-2021 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 -Nru mmv-2.5/m4/xalloc.m4 mmv-2.5.1/m4/xalloc.m4 --- mmv-2.5/m4/xalloc.m4 2023-07-20 19:40:23.000000000 +0000 +++ mmv-2.5.1/m4/xalloc.m4 2023-08-08 11:02:40.000000000 +0000 @@ -1,5 +1,5 @@ # xalloc.m4 serial 18 -dnl Copyright (C) 2002-2006, 2009-2023 Free Software Foundation, Inc. +dnl Copyright (C) 2002-2006, 2009-2021 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 -Nru mmv-2.5/m4/xsize.m4 mmv-2.5.1/m4/xsize.m4 --- mmv-2.5/m4/xsize.m4 2023-07-20 19:40:23.000000000 +0000 +++ mmv-2.5.1/m4/xsize.m4 2023-08-08 11:02:40.000000000 +0000 @@ -1,5 +1,5 @@ # xsize.m4 serial 5 -dnl Copyright (C) 2003-2004, 2008-2023 Free Software Foundation, Inc. +dnl Copyright (C) 2003-2004, 2008-2021 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 -Nru mmv-2.5/m4/zzgnulib.m4 mmv-2.5.1/m4/zzgnulib.m4 --- mmv-2.5/m4/zzgnulib.m4 2023-07-20 19:40:23.000000000 +0000 +++ mmv-2.5.1/m4/zzgnulib.m4 2023-08-08 11:02:40.000000000 +0000 @@ -1,5 +1,5 @@ # zzgnulib.m4 serial 1 -dnl Copyright (C) 2020-2023 Free Software Foundation, Inc. +dnl Copyright (C) 2020-2021 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 -Nru mmv-2.5/mmv.1 mmv-2.5.1/mmv.1 --- mmv-2.5/mmv.1 2023-07-20 19:41:17.000000000 +0000 +++ mmv-2.5.1/mmv.1 2023-08-08 10:51:57.000000000 +0000 @@ -1,9 +1,71 @@ .\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.49.1. -.TH MMV "1" "July 2023" "mmv-help2man-wrapper: 8: ./mmv: not found" "User Commands" +.TH MMV "1" "August 2023" "mmv 2.5" "User Commands" .SH NAME mmv - move/copy/link multiple files by wildcard patterns +.SH SYNOPSIS +.B mmv +[\fI\,-m|-x|-r|-c|-o|-a|-l|-s\/\fR] [\fI\,-h\/\fR] [\fI\,-d|-p\/\fR] [\fI\,-g|-t\/\fR] [\fI\,-v|-n\/\fR] \fI\,FROM TO\/\fR .SH DESCRIPTION -\&./build\-aux/mmv\-help2man\-wrapper: 6: ./mmv: not found +move/copy/link multiple files by wildcard patterns +.PP +The FROM pattern is a shell glob pattern, in which `*' stands for any number +of characters and `?' stands for a single character. +.PP +Use #[l|u]N in the TO pattern to get the string matched by the Nth +FROM pattern wildcard [lowercased|uppercased]. +.PP +Patterns should be quoted on the command line. +.TP +\fB\-\-help\fR +Print help and exit +.TP +\fB\-V\fR, \fB\-\-version\fR +Print version and exit +.TP +\fB\-h\fR, \fB\-\-hidden\fR +treat dot files normally (default=off) +.TP +\fB\-D\fR, \fB\-\-makedirs\fR +create non\-existent directories (default=off) +.TP +\fB\-m\fR, \fB\-\-move\fR +move source file to target name +.TP +\fB\-x\fR, \fB\-\-copydel\fR +copy source to target, then delete source +.TP +\fB\-r\fR, \fB\-\-rename\fR +rename source to target in same directory +.TP +\fB\-c\fR, \fB\-\-copy\fR +copy source to target, preserving source permissions +.TP +\fB\-o\fR, \fB\-\-overwrite\fR +overwrite target with source, preserving target permissions +.TP +\fB\-l\fR, \fB\-\-hardlink\fR +link target name to source file +.TP +\fB\-s\fR, \fB\-\-symlink\fR +symlink target name to source file +.TP +\fB\-d\fR, \fB\-\-force\fR +perform file deletes and overwrites without confirmation +.TP +\fB\-p\fR, \fB\-\-protect\fR +treat file deletes and overwrites as errors +.TP +\fB\-g\fR, \fB\-\-go\fR +skip any erroneous actions +.TP +\fB\-t\fR, \fB\-\-terminate\fR +erroneous actions are treated as errors +.TP +\fB\-v\fR, \fB\-\-verbose\fR +report all actions performed +.TP +\fB\-n\fR, \fB\-\-dryrun\fR +only report which actions would be performed .PP .I Mmv moves (or copies or links, as specified) @@ -427,3 +489,11 @@ To avoid difficulties in semantics and error checking, .I mmv refuses to create directories. +.SH COPYRIGHT +Copyright \(co 2023 Reuben Thomas . +.br +Copyright \(co 1990 Vladimir Lanin. +Licence GPLv3+: GNU GPL version 3 or later . +.br +This is free software: you are free to change and redistribute it. +There is NO WARRANTY, to the extent permitted by law.