[systemd-commits] 5 commits - TODO src/core src/libsystemd src/systemctl

[Lennart Poettering]

 TODO                               |    2 ++
 src/core/mount.c                   |    8 ++++----
 src/libsystemd/sd-bus/bus-kernel.c |   10 +++++++---
 src/systemctl/systemctl.c          |    4 +---
 4 files changed, 14 insertions(+), 10 deletions(-)

New commits:
commit 2ff8abbd40feee90dbac8788efba2218b546df6c
Author: Lennart Poettering <lennart at poettering.net>
Date:   Thu Oct 2 21:02:03 2014 +0200

    Revert "mount: order options before other arguments to mount"
    
    This reverts commit 141a1ceaa62578f1ed14f04cae2113dd0f49fd7f.
    
    People should fix their libc's getopt(), instead of us using a weird
    option ordering...

diff --git a/src/core/mount.c b/src/core/mount.c
index f3ec736..e284357 100644
--- a/src/core/mount.c
+++ b/src/core/mount.c
@@ -903,10 +903,10 @@ static void mount_enter_mounting(Mount *m) {
                                 m->control_command,
                                 "/bin/mount",
                                 m->sloppy_options ? "-ns" : "-n",
-                                "-t", m->parameters_fragment.fstype ? m->parameters_fragment.fstype : "auto",
-                                "-o", m->parameters_fragment.options ? m->parameters_fragment.options : "",
                                 m->parameters_fragment.what,
                                 m->where,
+                                "-t", m->parameters_fragment.fstype ? m->parameters_fragment.fstype : "auto",
+                                m->parameters_fragment.options ? "-o" : NULL, m->parameters_fragment.options,
                                 NULL);
         else
                 r = -ENOENT;
@@ -951,10 +951,10 @@ static void mount_enter_remounting(Mount *m) {
                                 m->control_command,
                                 "/bin/mount",
                                 m->sloppy_options ? "-ns" : "-n",
-                                "-t", m->parameters_fragment.fstype ? m->parameters_fragment.fstype : "auto",
-                                "-o", o,
                                 m->parameters_fragment.what,
                                 m->where,
+                                "-t", m->parameters_fragment.fstype ? m->parameters_fragment.fstype : "auto",
+                                "-o", o,
                                 NULL);
         } else
                 r = -ENOENT;

commit cc19881a694c26af2d941246f72221df7e76ee02
Author: Lennart Poettering <lennart at poettering.net>
Date:   Thu Oct 2 20:37:50 2014 +0200

    systemctl: remove spurious newline

diff --git a/src/systemctl/systemctl.c b/src/systemctl/systemctl.c
index 9012128..1c6fef4 100644
--- a/src/systemctl/systemctl.c
+++ b/src/systemctl/systemctl.c
@@ -4466,9 +4466,7 @@ static int cat(sd_bus *bus, char **args) {
         STRV_FOREACH(name, names) {
                 _cleanup_bus_error_free_ sd_bus_error error = SD_BUS_ERROR_NULL;
                 _cleanup_strv_free_ char **dropin_paths = NULL;
-                _cleanup_free_ char *fragment_path = NULL;
-                _cleanup_free_ char *unit = NULL;
-
+                _cleanup_free_ char *fragment_path = NULL, *unit = NULL;
                 char **path;
 
                 unit = unit_dbus_path_from_name(*name);

commit 2c652b6bfe816296a5664dae1125e6bb665b9d5e
Author: Lennart Poettering <lennart at poettering.net>
Date:   Thu Oct 2 20:37:36 2014 +0200

    kdbus: don't clobber return values, use strjoin() instead of asprintf(), keep function invocations and variable declarations separate

diff --git a/src/libsystemd/sd-bus/bus-kernel.c b/src/libsystemd/sd-bus/bus-kernel.c
index 0e74f91..0c39e22 100644
--- a/src/libsystemd/sd-bus/bus-kernel.c
+++ b/src/libsystemd/sd-bus/bus-kernel.c
@@ -1447,11 +1447,15 @@ int bus_kernel_create_endpoint(const char *bus_name, const char *ep_name, char *
         }
 
         if (ep_path) {
-                int r = asprintf(ep_path, "%s/%s", dirname(path), ep_name);
-                if (r == -1 || !*ep_path) {
+                char *p;
+
+                p = strjoin(dirname(path), "/", ep_name, NULL);
+                if (!p) {
                         safe_close(fd);
                         return -ENOMEM;
                 }
+
+                *ep_path = p;
         }
 
         return fd;

commit 8e00bfc234f43f49b16aa0124fb4b3f1c8eae4ef
Author: Lennart Poettering <lennart at poettering.net>
Date:   Thu Oct 2 20:36:58 2014 +0200

    kdbus: make sure we never invoke free() on an uninitialized pointer on OOM

diff --git a/src/libsystemd/sd-bus/bus-kernel.c b/src/libsystemd/sd-bus/bus-kernel.c
index 236e878..0e74f91 100644
--- a/src/libsystemd/sd-bus/bus-kernel.c
+++ b/src/libsystemd/sd-bus/bus-kernel.c
@@ -1411,7 +1411,7 @@ int bus_kernel_open_bus_fd(const char *bus, char **path) {
 }
 
 int bus_kernel_create_endpoint(const char *bus_name, const char *ep_name, char **ep_path) {
-        _cleanup_free_ char *path;
+        _cleanup_free_ char *path = NULL;
         struct kdbus_cmd_make *make;
         struct kdbus_item *n;
         size_t size;

commit c7eff5ec06c3025d1ef14f955c653259ae7c615b
Author: Lennart Poettering <lennart at poettering.net>
Date:   Thu Oct 2 20:36:23 2014 +0200

    update TODO

diff --git a/TODO b/TODO
index 9ac6fac..526926f 100644
--- a/TODO
+++ b/TODO
@@ -26,6 +26,8 @@ External:
 
 Features:
 
+* busctl: add a pcap writer, using LINKTYPE_DBUS/231
+
 * man: maybe use the word "inspect" rather than "introspect"?
 
 * introduce machines.target to order after all nspawn instances