From 4f0989d42d8f4f81c41284582937e38b066d5e59 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= <zbyszek@amutable.com>
Date: Fri, 13 Mar 2026 10:42:46 +0100
Subject: [PATCH] test-tar-extract: rename and add support for creating
 archives

This makes it much easier to test importd code without the
surrounding machinery.
---
 src/import/meson.build        |  2 +-
 src/import/test-tar-extract.c | 38 -----------------------
 src/import/test-tar.c         | 58 +++++++++++++++++++++++++++++++++++
 3 files changed, 59 insertions(+), 39 deletions(-)
 delete mode 100644 src/import/test-tar-extract.c
 create mode 100644 src/import/test-tar.c

diff --git a/src/import/meson.build b/src/import/meson.build
index c0589ddd4e..8349202a32 100644
--- a/src/import/meson.build
+++ b/src/import/meson.build
@@ -88,7 +88,7 @@ executables += [
                 'sources' : files('import-generator.c'),
         },
         test_template + {
-                'sources' : files('test-tar-extract.c'),
+                'sources' : files('test-tar.c'),
                 'type' : 'manual',
         },
         test_template + {
diff --git a/src/import/test-tar-extract.c b/src/import/test-tar-extract.c
deleted file mode 100644
index 0d44196c38..0000000000
--- a/src/import/test-tar-extract.c
+++ /dev/null
@@ -1,38 +0,0 @@
-/* SPDX-License-Identifier: LGPL-2.1-or-later */
-
-#include "errno-util.h"
-#include "fd-util.h"
-#include "libarchive-util.h"
-#include "main-func.h"
-#include "tar-util.h"
-#include "tests.h"
-
-static int run(int argc, char **argv) {
-        int r;
-
-        test_setup_logging(LOG_DEBUG);
-
-        if (argc != 3)
-                return log_error_errno(SYNTHETIC_ERRNO(EINVAL),
-                                       "Need two arguments exactly: <input> <output>");
-
-        r = dlopen_libarchive();
-        if (r < 0)
-                return r;
-
-        _cleanup_close_ int input_fd = RET_NERRNO(open(argv[1], O_RDONLY | O_CLOEXEC));
-        if (input_fd < 0)
-                return log_error_errno(input_fd, "Cannot open %s: %m", argv[1]);
-
-        _cleanup_close_ int output_fd = RET_NERRNO(open(argv[2], O_DIRECTORY | O_CLOEXEC));
-        if (output_fd < 0)
-                return log_error_errno(output_fd, "Cannot open %s: %m", argv[2]);
-
-        r = tar_x(input_fd, output_fd, /* flags= */ TAR_SELINUX);
-        if (r < 0)
-                return log_error_errno(r, "tar_x failed: %m");
-
-        return 0;
-}
-
-DEFINE_MAIN_FUNCTION(run);
diff --git a/src/import/test-tar.c b/src/import/test-tar.c
new file mode 100644
index 0000000000..c0e55c3597
--- /dev/null
+++ b/src/import/test-tar.c
@@ -0,0 +1,58 @@
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
+
+#include <sys/stat.h>
+
+#include "errno-util.h"
+#include "fd-util.h"
+#include "libarchive-util.h"
+#include "main-func.h"
+#include "tar-util.h"
+#include "tests.h"
+
+static int run(int argc, char **argv) {
+        int r;
+
+        test_setup_logging(LOG_DEBUG);
+
+        if (argc != 4)
+                return log_error_errno(SYNTHETIC_ERRNO(EINVAL),
+                                       "Need three arguments exactly: -c <output> <input> | -x <input> <output>");
+
+        bool create;
+        if (streq(argv[1], "-c"))
+                create = true;
+        else if (streq(argv[1], "-x"))
+                create = false;
+        else
+                return log_error_errno(SYNTHETIC_ERRNO(EINVAL), "Unknown operation '%s'.", argv[1]);
+
+        r = dlopen_libarchive();
+        if (r < 0)
+                return r;
+
+        int flags = create ? O_CREAT | O_WRONLY | O_TRUNC : O_RDONLY;
+        _cleanup_close_ int fd1 = RET_NERRNO(open(argv[2], flags | O_CLOEXEC, 0666));
+        if (fd1 < 0)
+                return log_error_errno(fd1, "Cannot open %s: %m", argv[2]);
+
+        if (!create) {
+                r = RET_NERRNO(mkdir(argv[3], 0777));
+                if (r < 0 && r != -EEXIST)
+                        return log_error_errno(r, "Failed to mkdir %s: %m", argv[3]);
+        }
+
+        _cleanup_close_ int fd2 = RET_NERRNO(open(argv[3], O_DIRECTORY | O_CLOEXEC));
+        if (fd2 < 0)
+                return log_error_errno(fd2, "Cannot open %s: %m", argv[3]);
+
+        if (create)
+                r = tar_c(fd2, fd1, argv[2], /* flags= */ TAR_SELINUX);
+        else
+                r = tar_x(fd1, fd2, /* flags= */ TAR_SELINUX);
+        if (r < 0)
+                return log_error_errno(r, "tar %s failed: %m", argv[1]);
+
+        return 0;
+}
+
+DEFINE_MAIN_FUNCTION(run);