From 46c26454bd061c6ebda0fd40317018c08b32c7fd Mon Sep 17 00:00:00 2001
From: Yu Watanabe <watanabe.yu+github@gmail.com>
Date: Sun, 1 Dec 2024 17:43:31 +0900
Subject: [PATCH] exec-util: use strv_from_stdarg_alloca()

No functional change, just refactoring.
---
 src/shared/ask-password-agent.c |  1 -
 src/shared/exec-util.c          | 18 +-----------------
 src/shared/polkit-agent.c       |  1 -
 3 files changed, 1 insertion(+), 19 deletions(-)

diff --git a/src/shared/ask-password-agent.c b/src/shared/ask-password-agent.c
index b16d222359c..c5898ca5640 100644
--- a/src/shared/ask-password-agent.c
+++ b/src/shared/ask-password-agent.c
@@ -25,7 +25,6 @@ int ask_password_agent_open(void) {
                        NULL, 0,
                        &agent_pid,
                        SYSTEMD_TTY_ASK_PASSWORD_AGENT_BINARY_PATH,
-                       SYSTEMD_TTY_ASK_PASSWORD_AGENT_BINARY_PATH,
                        "--watch");
         if (r < 0)
                 return log_error_errno(r, "Failed to fork TTY ask password agent: %m");
diff --git a/src/shared/exec-util.c b/src/shared/exec-util.c
index 6ab32bea920..35ceab980bb 100644
--- a/src/shared/exec-util.c
+++ b/src/shared/exec-util.c
@@ -561,9 +561,6 @@ int shall_fork_agent(void) {
 }
 
 int _fork_agent(const char *name, const int except[], size_t n_except, pid_t *ret_pid, const char *path, ...) {
-        size_t n, i;
-        va_list ap;
-        char **l;
         int r;
 
         assert(path);
@@ -619,20 +616,7 @@ int _fork_agent(const char *name, const int except[], size_t n_except, pid_t *re
         }
 
         /* Count arguments */
-        va_start(ap, path);
-        for (n = 0; va_arg(ap, char*); n++)
-                ;
-        va_end(ap);
-
-        /* Allocate strv */
-        l = newa(char*, n + 1);
-
-        /* Fill in arguments */
-        va_start(ap, path);
-        for (i = 0; i <= n; i++)
-                l[i] = va_arg(ap, char*);
-        va_end(ap);
-
+        char **l = strv_from_stdarg_alloca(path);
         execv(path, l);
         log_error_errno(errno, "Failed to execute %s: %m", path);
         _exit(EXIT_FAILURE);
diff --git a/src/shared/polkit-agent.c b/src/shared/polkit-agent.c
index ce1212e15e3..a652b465b9f 100644
--- a/src/shared/polkit-agent.c
+++ b/src/shared/polkit-agent.c
@@ -45,7 +45,6 @@ int polkit_agent_open(void) {
                        1,
                        &agent_pid,
                        POLKIT_AGENT_BINARY_PATH,
-                       POLKIT_AGENT_BINARY_PATH,
                        "--notify-fd", notify_fd,
                        "--fallback");
         if (r < 0)
-- 
2.47.3