[PATCH 1/5] gnulib: update

[Akim Demaille]

* src/output.c, src/print-xml.c: Adjust.
---
 bootstrap       | 15 +++++++++------
 gnulib          |  2 +-
 lib/.gitignore  | 46 ++++++++++++++++++++++++++++++++++++++++++++++
 m4/.gitignore   | 27 +++++++++++++++++++++++++++
 src/output.c    |  9 ++++++---
 src/print-xml.c |  5 +++--
 6 files changed, 92 insertions(+), 12 deletions(-)

diff --git a/bootstrap b/bootstrap
index 5f1b1b70c..c17a36f1f 100755
--- a/bootstrap
+++ b/bootstrap
@@ -1,10 +1,10 @@
 #! /bin/sh
 # Print a version string.
-scriptversion=2020-11-18.17; # UTC
+scriptversion=2021-01-10.00; # UTC
 
 # Bootstrap this package from checked-out sources.
 
-# Copyright (C) 2003-2020 Free Software Foundation, Inc.
+# Copyright (C) 2003-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
@@ -47,7 +47,7 @@ PERL="${PERL-perl}"
 
 me=$0
 
-default_gnulib_url=git://git.sv.gnu.org/gnulib
+default_gnulib_url=https://git.savannah.gnu.org/git/gnulib.git
 
 usage() {
   cat <<EOF
@@ -184,7 +184,7 @@ po_download_command_format=\
  https://translationproject.org/latest/%s/";
 
 # Prefer a non-empty tarname (4th argument of AC_INIT if given), else
-# fall back to the package name (1st argument with munging)
+# fall back to the package name (1st argument with munging).
 extract_package_name='
   /^AC_INIT(\[*/{
      s///
@@ -201,8 +201,11 @@ extract_package_name='
      p
   }
 '
-package=$(sed -n "$extract_package_name" configure.ac) \
-  || die 'cannot find package name in configure.ac'
+package=$(${AUTOCONF:-autoconf} --trace AC_INIT:\$4 configure.ac 2>/dev/null)
+if test -z "$package"; then
+  package=$(sed -n "$extract_package_name" configure.ac) \
+      || die 'cannot find package name in configure.ac'
+fi
 gnulib_name=lib$package
 
 build_aux=build-aux
diff --git a/gnulib b/gnulib
index b141afaf9..028296a91 160000
--- a/gnulib
+++ b/gnulib
@@ -1 +1 @@
-Subproject commit b141afaf9ba197e361510da075556822ac453ff6
+Subproject commit 028296a9118b409434894631d8921b4a4718c1ce
diff --git a/lib/.gitignore b/lib/.gitignore
index e32769c3b..5d7f60e5b 100644
--- a/lib/.gitignore
+++ b/lib/.gitignore
@@ -5,6 +5,7 @@
 /.deps
 /.dirstamp
 /_Noreturn.h
+/access.c
 /alignof.h
 /alloca.h
 /alloca.in.h
@@ -18,6 +19,7 @@
 /asnprintf.c
 /asprintf.c
 /assure.h
+/at-func.c
 /attribute.h
 /basename-lgpl.c
 /basename-lgpl.h
@@ -40,15 +42,20 @@
 /c-strncasecmp.c
 /calloc.c
 /canonicalize-lgpl.c
+/canonicalize.c
+/canonicalize.h
 /careadlinkat.c
 /careadlinkat.h
 /cdefs.h
 /charset.alias
+/chdir-long.c
+/chdir-long.h
 /cloexec.c
 /cloexec.h
 /close-stream.c
 /close-stream.h
 /close.c
+/closedir.c
 /closeout.c
 /closeout.h
 /concat-filename.c
@@ -57,12 +64,17 @@
 /config.in.h
 /configmake.h
 /diffseq.h
+/dirent-private.h
+/dirent.in.h
+/dirfd.c
 /dirname-lgpl.c
 /dirname.c
 /dirname.h
 /dup-safer-flag.c
 /dup-safer.c
+/dup.c
 /dup2.c
+/eloop-threshold.h
 /errno.h
 /errno.in.h
 /error.c
@@ -73,6 +85,7 @@
 /exitfail.h
 /fatal-signal.c
 /fatal-signal.h
+/fchdir.c
 /fcntl.c
 /fcntl.h
 /fcntl.in.h
@@ -80,10 +93,17 @@
 /fd-hook.h
 /fd-safer-flag.c
 /fd-safer.c
+/fdopendir.c
 /ffs.c
 /ffsl.c
 /ffsl.h
+/file-set.c
+/file-set.h
 /filename.h
+/filenamecat-lgpl.c
+/filenamecat.h
+/findprog-in.c
+/findprog.h
 /float+.h
 /float.c
 /float.h
@@ -94,14 +114,18 @@
 /fpending.h
 /fprintf.c
 /fpucw.h
+/free.c
 /frexp.c
 /frexpl.c
 /fseterr.c
 /fseterr.h
 /fstat.c
+/fstatat.c
 /fstrcmp.c
 /fstrcmp.h
 /fsync.c
+/getcwd-lgpl.c
+/getcwd.c
 /getdelim.c
 /getdtablesize.c
 /gethrxtime.c
@@ -154,6 +178,10 @@
 /gnulib.mk
 /hard-locale.c
 /hard-locale.h
+/hash-pjw.c
+/hash-pjw.h
+/hash-triple-simple.c
+/hash-triple.h
 /hash.c
 /hash.h
 /iconv.c
@@ -173,6 +201,7 @@
 /iconv_open-zos.gperf
 /iconv_open-zos.h
 /iconv_open.c
+/idx.h
 /integer_length.c
 /integer_length.h
 /integer_length_l.c
@@ -221,6 +250,8 @@
 /mbtowc-lock.h
 /memchr.c
 /memchr.valgrind
+/mempcpy.c
+/memrchr.c
 /minmax.h
 /msvc-inval.c
 /msvc-inval.h
@@ -230,11 +261,18 @@
 /obstack.h
 /obstack_printf.c
 /open.c
+/openat-die.c
+/openat-priv.h
+/openat-proc.c
+/openat.c
+/openat.h
+/opendir.c
 /os2-spawn.c
 /os2-spawn.h
 /pathmax.h
 /perror.c
 /pipe-safer.c
+/pipe.c
 /pipe2-safer.c
 /pipe2.c
 /printf-args.c
@@ -255,6 +293,7 @@
 /raise.c
 /rawmemchr.c
 /rawmemchr.valgrind
+/readdir.c
 /readline.c
 /readline.h
 /readlink.c
@@ -265,10 +304,14 @@
 /relocatable.h
 /relocwrapper.c
 /rename.c
+/rewinddir.c
 /rmdir.c
 /same-inode.h
+/save-cwd.c
+/save-cwd.h
 /sched.h
 /sched.in.h
+/scratch_buffer.h
 /setenv.c
 /setlocale-lock.c
 /setlocale_null.c
@@ -286,8 +329,10 @@
 /snprintf.c
 /spawn-pipe.c
 /spawn-pipe.h
+/spawn.c
 /spawn.h
 /spawn.in.h
+/spawn_faction_addchdir.c
 /spawn_faction_addclose.c
 /spawn_faction_adddup2.c
 /spawn_faction_addopen.c
@@ -297,6 +342,7 @@
 /spawnattr_destroy.c
 /spawnattr_init.c
 /spawnattr_setflags.c
+/spawnattr_setpgroup.c
 /spawnattr_setsigmask.c
 /spawni.c
 /spawnp.c
diff --git a/m4/.gitignore b/m4/.gitignore
index daec41555..dc8e14784 100644
--- a/m4/.gitignore
+++ b/m4/.gitignore
@@ -2,19 +2,27 @@
 /00gnulib.m4
 /__inline.m4
 /absolute-header.m4
+/access.m4
 /alloca.m4
 /asm-underscore.m4
 /assert.m4
 /builtin-expect.m4
 /calloc.m4
 /canonicalize.m4
+/chdir-long.m4
 /clock_time.m4
 /close.m4
+/closedir.m4
 /codeset.m4
 /config-h.m4
 /configmake.m4
+/d-ino.m4
+/dirent_h.m4
+/dirfd.m4
 /double-slash-root.m4
+/dup.m4
 /dup2.m4
+/eaccess.m4
 /eealloc.m4
 /environ.m4
 /errno_h.m4
@@ -27,26 +35,36 @@
 /extern-inline.m4
 /extern-inline.m4~
 /fatal-signal.m4
+/fchdir.m4
 /fcntl-o.m4
 /fcntl.m4
 /fcntl_h.m4
+/fdopendir.m4
 /ffs.m4
 /ffsl.m4
+/filenamecat.m4
+/findprog-in.m4
 /float_h.m4
 /fopen.m4
 /fpending.m4
 /fpieee.m4
 /fprintf-posix.m4
+/free.m4
 /frexp.m4
 /frexpl.m4
 /fseterr.m4
 /fstat.m4
+/fstatat.m4
 /fsync.m4
+/getcwd-abort-bug.m4
+/getcwd-path-max.m4
+/getcwd.m4
 /getdelim.m4
 /getdtablesize.m4
 /gethrxtime.m4
 /getline.m4
 /getopt.m4
+/getpagesize.m4
 /getprogname.m4
 /getrusage.m4
 /gettext.m4
@@ -113,6 +131,8 @@
 /mbstate_t.m4
 /mbswidth.m4
 /memchr.m4
+/mempcpy.m4
+/memrchr.m4
 /minmax.m4
 /mmap-anon.m4
 /mode_t.m4
@@ -129,12 +149,16 @@
 /open-cloexec.m4
 /open-slash.m4
 /open.m4
+/openat.m4
+/opendir.m4
 /pathmax.m4
 /perror.m4
 /pid_t.m4
+/pipe.m4
 /pipe2.m4
 /po.m4
 /posix_spawn.m4
+/posix_spawn_faction_addchdir.m4
 /printf-frexp.m4
 /printf-frexpl.m4
 /printf-posix-rpl.m4
@@ -146,13 +170,16 @@
 /quotearg.m4
 /raise.m4
 /rawmemchr.m4
+/readdir.m4
 /readline.m4
 /readlink.m4
 /realloc.m4
 /relocatable-lib.m4
 /relocatable.m4
 /rename.m4
+/rewinddir.m4
 /rmdir.m4
+/save-cwd.m4
 /sched_h.m4
 /setenv.m4
 /setlocale_null.m4
diff --git a/src/output.c b/src/output.c
index 1d63c043f..e31f93322 100644
--- a/src/output.c
+++ b/src/output.c
@@ -782,9 +782,12 @@ output_skeleton (void)
         fputc ('\n', stderr);
       }
 
-    /* The ugly cast is because gnulib gets the const-ness wrong.  */
-    pid = create_pipe_bidi ("m4", m4, (char **)(void*)argv, false, true,
-                            true, filter_fd);
+    pid = create_pipe_bidi ("m4", m4, argv,
+                            /* directory */ NULL,
+                            /* null_stderr */ false,
+                            /* slave_process */ true,
+                            /* exit_on_error */ true,
+                            filter_fd);
   }
 
   free (skeldir);
diff --git a/src/print-xml.c b/src/print-xml.c
index b1f728d1f..049b678fb 100644
--- a/src/print-xml.c
+++ b/src/print-xml.c
@@ -564,11 +564,12 @@ print_html (void)
 
   int status
     = execute (argv[0],
-               argv[0], (char **)(void*)(argv),
+               argv[0], argv,
+               /* directory */ NULL,
                /* ignore_sigpipe */ false,
                /* null_stdin, null_stdout, null_stderr */ true, true, true,
                /* slave_process */ true, /* exit_on_error */ false,
-               NULL);
+               /* termsigp */ NULL);
   if (status)
     complain (NULL, complaint, _("%s failed with status %d"), argv[0], status);
   free (xml2html);
-- 
2.30.0