Use mkdtempat instead of mkdtemp

This fixes an interaction of -C with incremental 'X'.
Problem reported by Pavel Cahyna.
* gnulib.modules: Remove mkdtemp.
Add tempname, since our mkdtempat uses it.
* lib/mkdtempat.c, lib/mkdtempat.h: New files.
* lib/Makefile.am (noinst_HEADERS): Add mkdtempat.h.
(libtar_a_SOURCES): Add mkdtempat.c.
* src/incremen.c: Include mkdtempat.h.
(purge_directory): Use mkdtempat, not mkdtemp.

diff --git a/gnulib.modules b/gnulib.modules
index 17ef44fd7e6d07bd6bd57d89c6a80c4f51e1c637..0dc024feac7aacfff4fc66aa819bbc9b92966f57 100644 (file)
--- a/gnulib.modules
+++ b/gnulib.modules
@@ -80,7 +80,6 @@ mbrtoc32-regular
 mcel-prefer
 mempcpy
 mkdirat
 mcel-prefer
 mempcpy
 mkdirat

-mkdtemp

 mkfifoat
 modechange
 nstrftime-limited
 mkfifoat
 modechange
 nstrftime-limited


@@ -115,6 +114,7 @@ stringeq
 strnlen
 symlinkat
 sys_stat-h
 strnlen
 symlinkat
 sys_stat-h

+tempname

 time_rz
 timespec
 timespec-sub
 time_rz
 timespec
 timespec-sub

diff --git a/lib/Makefile.am b/lib/Makefile.am
index 2baa7be5e41a029004030f17eefcad50d0d4c8eb..4888ed36f426031d093513158885dcb66e47290d 100644 (file)
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -30,6 +30,7 @@ AM_CPPFLAGS = -I$(top_srcdir)/gnu -I../ -I../gnu
 AM_CFLAGS = $(GNULIB_WARN_CFLAGS) $(WERROR_CFLAGS)
 
 noinst_HEADERS = \
 AM_CFLAGS = $(GNULIB_WARN_CFLAGS) $(WERROR_CFLAGS)
 
 noinst_HEADERS = \

+ mkdtempat.h\

  paxlib.h\
  rmt.h\
  system.h\
  paxlib.h\
  rmt.h\
  system.h\


@@ -37,6 +38,7 @@ noinst_HEADERS = \
  xattr-at.h
 
 libtar_a_SOURCES = \
  xattr-at.h
 
 libtar_a_SOURCES = \

+  mkdtempat.c\

   paxerror.c paxexit-status.c paxlib.h paxnames.c \
   rtapelib.c \
   rmt.h \
   paxerror.c paxexit-status.c paxlib.h paxnames.c \
   rtapelib.c \
   rmt.h \

diff --git a/lib/mkdtempat.c b/lib/mkdtempat.c
new file mode 100644 (file)
index 0000000..e35b9bb
--- /dev/null
+++ b/lib/mkdtempat.c
@@ -0,0 +1,45 @@
+/* Copyright 2026 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 (at your
+   option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License along
+   with this program. If not, see <http://www.gnu.org/licenses/>.
+
+   Written by Paul Eggert.  */
+
+#include <config.h>
+
+#include "mkdtempat.h"
+
+#include <tempname.h>
+
+#include <stddef.h>
+#include <sys/stat.h>
+
+static int
+try_dir (char *tmpl, void *flags)
+{
+  int *pdirfd = flags;
+  return mkdirat (*pdirfd, tmpl, S_IRUSR | S_IWUSR | S_IXUSR);
+}
+
+/* Relative to the directory DIRFD if XTEMPLATE is relative,
+   generate a unique temporary directory from XTEMPLATE.
+   The last six characters of XTEMPLATE must be "XXXXXX";
+   replace them with a string that makes the generated directory unique.
+   Create the directory mode 700, and return its name.
+   On failure, return NULL and set errno.  */
+char *
+mkdtempat (int dirfd, char *xtemplate)
+{
+  return (try_tempname_len (xtemplate, 0, &dirfd, try_dir, 6) < 0
+         ? NULL : xtemplate);
+}

diff --git a/lib/mkdtempat.h b/lib/mkdtempat.h
new file mode 100644 (file)
index 0000000..03a18dc
--- /dev/null
+++ b/lib/mkdtempat.h
@@ -0,0 +1 @@
+char *mkdtempat (int, char *);

diff --git a/src/incremen.c b/src/incremen.c
index 923c632385cc87e95f1abb33eb853d9cdf370451..53c6b3f32d706a7c937c7b1699873b890d17d9e0 100644 (file)
--- a/src/incremen.c
+++ b/src/incremen.c
@@ -21,6 +21,7 @@
 #include <c-ctype.h>
 #include <flexmember.h>
 #include <hash.h>
 #include <c-ctype.h>
 #include <flexmember.h>
 #include <hash.h>

+#include <mkdtempat.h>

 #include <quotearg.h>
 #include <same-inode.h>
 #include "common.h"
 #include <quotearg.h>
 #include <same-inode.h>
 #include "common.h"


@@ -1665,7 +1666,9 @@ purge_directory (char const *directory_name)
          *copy_end = '/';
          memcpy (copy_end + !ISSLASH (copy_end[-1]), TEMP_DIR_TEMPLATE,
                  sizeof TEMP_DIR_TEMPLATE);
          *copy_end = '/';
          memcpy (copy_end + !ISSLASH (copy_end[-1]), TEMP_DIR_TEMPLATE,
                  sizeof TEMP_DIR_TEMPLATE);

-         if (!mkdtemp (temp_stub))
+         struct fdbase f = fdbase (temp_stub);
+         if (f.fd == BADFD
+             || !mkdtempat (f.fd, temp_stub + (f.base - temp_stub)))

            {
              paxerror (errno, _("Cannot create temporary directory using template %s"),
                        quote (temp_stub));
            {
              paxerror (errno, _("Cannot create temporary directory using template %s"),
                        quote (temp_stub));