From ab9c1bdae05cac9a4e57eeb99d9560441b71ee6d Mon Sep 17 00:00:00 2001
From: Yu Watanabe <watanabe.yu+github@gmail.com>
Date: Sat, 22 Aug 2026 00:03:30 +0900
Subject: [PATCH] coredumpctl: several cleanups for save_core()

- Rename to acquire_core().
- Make it take a fd rather than FILE*.
- Make it take two ret_ arguments to store paths so that callers can
  easily use _cleanup_(unlink_and_freep) for the created temp file.
---
 src/coredump/coredumpctl-core.c     | 31 +++++++++++++++--------------
 src/coredump/coredumpctl-core.h     |  2 +-
 src/coredump/coredumpctl-debugger.c | 16 +++++++--------
 3 files changed, 24 insertions(+), 25 deletions(-)

diff --git a/src/coredump/coredumpctl-core.c b/src/coredump/coredumpctl-core.c
index da2f04b8e2..f3c2d31eeb 100644
--- a/src/coredump/coredumpctl-core.c
+++ b/src/coredump/coredumpctl-core.c
@@ -45,14 +45,15 @@ static int coredump_open_tmpfile(char **ret_path, int *ret_fd) {
         return 0;
 }
 
-int save_core(sd_journal *j, FILE *file, char **path, bool *unlink_temp) {
+int acquire_core(sd_journal *j, int fd, char **ret_tmpfile, char **ret_path) {
         const char *data;
         _cleanup_free_ char *filename = NULL;
         size_t len;
-        int r, fd;
+        int r;
 
-        assert(!!file == !path);         /* file or path must be specified. They must not be specified together. */
-        assert(!!path == !!unlink_temp); /* Those must be specified together */
+        assert(j);
+        assert((fd >= 0) == !ret_tmpfile);
+        assert((fd >= 0) == !ret_path);
 
         /* Look for a coredump on disk first. */
         r = sd_journal_get_data(j, "COREDUMP_FILENAME", (const void**) &data, &len);
@@ -70,9 +71,9 @@ int save_core(sd_journal *j, FILE *file, char **path, bool *unlink_temp) {
 
                 free_and_replace(filename, resolved);
 
-                if (path && !ENDSWITH_SET(filename, ".xz", ".lz4", ".zst")) {
-                        *path = TAKE_PTR(filename);
-
+                if (ret_path && !ENDSWITH_SET(filename, ".xz", ".lz4", ".zst")) {
+                        *ret_tmpfile = NULL;
+                        *ret_path = TAKE_PTR(filename);
                         return 0;
                 }
 
@@ -92,14 +93,13 @@ int save_core(sd_journal *j, FILE *file, char **path, bool *unlink_temp) {
 
         _cleanup_(unlink_and_freep) char *temp = NULL;
         _cleanup_close_ int fdt = -EBADF;
-        if (path) {
+        if (fd < 0) {
                 r = coredump_open_tmpfile(&temp, &fdt);
                 if (r < 0)
                         return r;
 
                 fd = fdt;
-        } else
-                fd = fileno(file);
+        }
 
         if (filename) {
 #if HAVE_COMPRESSION
@@ -133,10 +133,11 @@ int save_core(sd_journal *j, FILE *file, char **path, bool *unlink_temp) {
                         return log_error_errno(r, "Failed to write output: %m");
         }
 
-        if (temp) {
-                *path = TAKE_PTR(temp);
-                *unlink_temp = true;
-        }
+        if (ret_tmpfile)
+                *ret_tmpfile = TAKE_PTR(temp);
+        if (ret_path)
+                *ret_path = NULL;
+
         return 0;
 }
 
@@ -168,7 +169,7 @@ int verb_dump_core(int argc, char *argv[], uintptr_t _data, void *userdata) {
 
         (void) print_entry(f ? stdout : stderr, j, /* need_space= */ false, /* table= */ NULL);
 
-        r = save_core(j, f ?: stdout, NULL, NULL);
+        r = acquire_core(j, fileno(f ?: stdout), /* ret_tmpfile= */ NULL, /* ret_path= */ NULL);
         if (r < 0)
                 return r;
 
diff --git a/src/coredump/coredumpctl-core.h b/src/coredump/coredumpctl-core.h
index 2742496dca..c46b8f296a 100644
--- a/src/coredump/coredumpctl-core.h
+++ b/src/coredump/coredumpctl-core.h
@@ -3,6 +3,6 @@
 
 #include "forward.h"
 
-int save_core(sd_journal *j, FILE *file, char **path, bool *unlink_temp);
+int acquire_core(sd_journal *j, int fd, char **ret_tmpfile, char **ret_path);
 
 int verb_dump_core(int argc, char *argv[], uintptr_t _data, void *userdata);
diff --git a/src/coredump/coredumpctl-debugger.c b/src/coredump/coredumpctl-debugger.c
index 89bc25df97..fe288df16e 100644
--- a/src/coredump/coredumpctl-debugger.c
+++ b/src/coredump/coredumpctl-debugger.c
@@ -10,6 +10,7 @@
 #include "coredumpctl-info.h"
 #include "coredumpctl-journal.h"
 #include "coredumpctl-util.h"
+#include "fs-util.h"
 #include "log.h"
 #include "path-util.h"
 #include "pidref.h"
@@ -25,9 +26,8 @@ int verb_run_debug(int argc, char *argv[], uintptr_t _data, void *userdata) {
         };
 
         _cleanup_(sd_journal_closep) sd_journal *j = NULL;
-        _cleanup_free_ char *exe = NULL, *path = NULL;
+        _cleanup_free_ char *exe = NULL;
         _cleanup_strv_free_ char **debugger_call = NULL;
-        bool unlink_path = false;
         const char *data, *fork_name;
         size_t len;
         int r;
@@ -89,11 +89,14 @@ int verb_run_debug(int argc, char *argv[], uintptr_t _data, void *userdata) {
         if (r < 0)
                 return r;
 
-        r = save_core(j, NULL, &path, &unlink_path);
+        _cleanup_(unlink_and_freep) char *temp = NULL;
+        _cleanup_free_ char *path = NULL;
+        r = acquire_core(j, /* fd= */ -EBADF, &temp, &path);
         if (r < 0)
                 return r;
 
-        r = strv_extend_many(&debugger_call, exe, "-c", path);
+        assert(!path == !!temp);
+        r = strv_extend_many(&debugger_call, exe, "-c", path ?: temp);
         if (r < 0)
                 return log_oom();
 
@@ -140,10 +143,5 @@ int verb_run_debug(int argc, char *argv[], uintptr_t _data, void *userdata) {
 finish:
         (void) default_signals(SIGINT, SIGTERM);
 
-        if (unlink_path) {
-                log_debug("Removed temporary file %s", path);
-                (void) unlink(path);
-        }
-
         return r;
 }