From 59a77060e023a6e13bfeee4c73a7d8725c093825 Mon Sep 17 00:00:00 2001
From: Daan De Meyer <daan.j.demeyer@gmail.com>
Date: Sat, 11 Apr 2020 21:57:28 +0200
Subject: [PATCH 1/2] sd-bus: Use pointer syntax for sd_bus_set_exec argv
 parameter

---
 src/libsystemd/sd-bus/sd-bus.c | 2 +-
 src/systemd/sd-bus.h           | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/libsystemd/sd-bus/sd-bus.c b/src/libsystemd/sd-bus/sd-bus.c
index 78e18e3b94c..366f36645a1 100644
--- a/src/libsystemd/sd-bus/sd-bus.c
+++ b/src/libsystemd/sd-bus/sd-bus.c
@@ -284,7 +284,7 @@ _public_ int sd_bus_set_fd(sd_bus *bus, int input_fd, int output_fd) {
         return 0;
 }
 
-_public_ int sd_bus_set_exec(sd_bus *bus, const char *path, char *const argv[]) {
+_public_ int sd_bus_set_exec(sd_bus *bus, const char *path, char *const *argv) {
         _cleanup_strv_free_ char **a = NULL;
         int r;
 
diff --git a/src/systemd/sd-bus.h b/src/systemd/sd-bus.h
index cd307dbd566..6f72e4b3b25 100644
--- a/src/systemd/sd-bus.h
+++ b/src/systemd/sd-bus.h
@@ -143,7 +143,7 @@ int sd_bus_new(sd_bus **ret);
 
 int sd_bus_set_address(sd_bus *bus, const char *address);
 int sd_bus_set_fd(sd_bus *bus, int input_fd, int output_fd);
-int sd_bus_set_exec(sd_bus *bus, const char *path, char *const argv[]);
+int sd_bus_set_exec(sd_bus *bus, const char *path, char *const *argv);
 int sd_bus_get_address(sd_bus *bus, const char **address);
 int sd_bus_set_bus_client(sd_bus *bus, int b);
 int sd_bus_is_bus_client(sd_bus *bus);

From 3415b0cc8a4d69a0a314f407ed334c1b90f7944c Mon Sep 17 00:00:00 2001
From: Daan De Meyer <daan.j.demeyer@gmail.com>
Date: Sat, 11 Apr 2020 21:57:36 +0200
Subject: [PATCH 2/2] sd-bus: Add sd_bus_set_exec docs

---
 man/rules/meson.build      |  2 +-
 man/sd_bus_set_address.xml | 20 ++++++++++++++++----
 2 files changed, 17 insertions(+), 5 deletions(-)

diff --git a/man/rules/meson.build b/man/rules/meson.build
index 16e0ffca3f7..aa9271a2a04 100644
--- a/man/rules/meson.build
+++ b/man/rules/meson.build
@@ -342,7 +342,7 @@ manpages = [
    'sd_bus_request_name_async'],
   ''],
  ['sd_bus_send', '3', [], ''],
- ['sd_bus_set_address', '3', ['sd_bus_get_address'], ''],
+ ['sd_bus_set_address', '3', ['sd_bus_get_address', 'sd_bus_set_exec'], ''],
  ['sd_bus_set_close_on_exit', '3', ['sd_bus_get_close_on_exit'], ''],
  ['sd_bus_set_connected_signal', '3', ['sd_bus_get_connected_signal'], ''],
  ['sd_bus_set_description',
diff --git a/man/sd_bus_set_address.xml b/man/sd_bus_set_address.xml
index b022741ff49..8404da53f1e 100644
--- a/man/sd_bus_set_address.xml
+++ b/man/sd_bus_set_address.xml
@@ -19,6 +19,7 @@
   <refnamediv>
     <refname>sd_bus_set_address</refname>
     <refname>sd_bus_get_address</refname>
+    <refname>sd_bus_set_exec</refname>
 
     <refpurpose>Set or query the address of the bus connection</refpurpose>
   </refnamediv>
@@ -30,15 +31,21 @@
       <funcprototype>
         <funcdef>int <function>sd_bus_set_address</function></funcdef>
         <paramdef>sd_bus *<parameter>bus</parameter></paramdef>
-        <paramdef>const char* <parameter>address</parameter></paramdef>
+        <paramdef>const char *<parameter>address</parameter></paramdef>
       </funcprototype>
 
       <funcprototype>
         <funcdef>int <function>sd_bus_get_address</function></funcdef>
         <paramdef>sd_bus *<parameter>bus</parameter></paramdef>
-        <paramdef>const char** <parameter>address</parameter></paramdef>
+        <paramdef>const char **<parameter>address</parameter></paramdef>
       </funcprototype>
 
+      <funcprototype>
+        <funcdef>int <function>sd_bus_set_exec</function></funcdef>
+        <paramdef>sd_bus *<parameter>bus</parameter></paramdef>
+        <paramdef>const char *<parameter>path</parameter></paramdef>
+        <paramdef>char *const *<parameter>argv</parameter></paramdef>
+      </funcprototype>
     </funcsynopsis>
   </refsynopsisdiv>
 
@@ -68,13 +75,13 @@
         the rest is optional. <replaceable>family</replaceable> may be either <option>ipv4</option> or
         <option>ipv6</option>.</para>
       </listitem>
-      
+
       <listitem>
         <para>An executable to spawn specified as
         <literal>unixexec:guid=<replaceable>guid</replaceable>,path=<replaceable>path</replaceable>,argv1=<replaceable>argument</replaceable>,argv2=<replaceable>argument</replaceable>,...</literal>.
         The <varname>path=</varname> key must be present, while <varname>guid=</varname> is optional.</para>
       </listitem>
-      
+
       <listitem>
         <para>A machine (container) to connect to specified as
         <literal>x-machine-unix:guid=<replaceable>guid</replaceable>,machine=<replaceable>machine</replaceable>,pid=<replaceable>pid</replaceable></literal>.
@@ -104,6 +111,11 @@
     automatically by
     <citerefentry><refentrytitle>sd_bus_open</refentrytitle><manvolnum>3</manvolnum></citerefentry> and
     similar calls, based on environment variables or built-in defaults.</para>
+
+    <para><function>sd_bus_set_exec</function> is a shorthand function for setting a
+    <literal>unixexec</literal> address that spawns the given executable with the given arguments.
+    If <parameter>argv</parameter> is <constant>NULL</constant>, the given executable is spawned
+    without any extra arguments.</para>
   </refsect1>
 
   <refsect1>