unit: when reading description from LSB prefer short over long description

[elogind.git] / src / dbus-target.c

diff --git a/src/dbus-target.c b/src/dbus-target.c
index be984b9bb47faada58fff0bf7bc5ae02b21e368d..c109d9accb6c293379f180d2b9ebe1527c5018ae 100644 (file)
--- a/src/dbus-target.c
+++ b/src/dbus-target.c
@@ -19,24 +19,54 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
+#include <errno.h>
+
 #include "dbus-unit.h"
 #include "dbus-target.h"
 
-static const char introspection[] =
-        DBUS_INTROSPECT_1_0_XML_DOCTYPE_DECL_NODE
-        "<node>"
-        BUS_UNIT_INTERFACE
-        BUS_PROPERTIES_INTERFACE
-        " <interface name=\"org.freedesktop.systemd1.Target\">"
-        " </interface>"
-        BUS_INTROSPECTABLE_INTERFACE
-        "</node>";
-
-DBusHandlerResult bus_target_message_handler(Unit *u, DBusMessage *message) {
+#define BUS_TARGET_INTERFACE                                            \
+        " <interface name=\"org.freedesktop.systemd1.Target\">\n"       \
+        "  <property name=\"SysVRunLevel\" type=\"s\" access=\"read\"/>\n" \
+        " </interface>\n"
+
+#define INTROSPECTION                                                   \
+        DBUS_INTROSPECT_1_0_XML_DOCTYPE_DECL_NODE                       \
+        "<node>\n"                                                      \
+        BUS_UNIT_INTERFACE                                              \
+        BUS_TARGET_INTERFACE                                            \
+        BUS_PROPERTIES_INTERFACE                                        \
+        BUS_INTROSPECTABLE_INTERFACE                                    \
+        "</node>\n"
+
+const char bus_target_interface[] = BUS_TARGET_INTERFACE;
+
+static int bus_target_append_runlevel(Manager *n, DBusMessageIter *i, const char *property, void *data) {
+        Target *t = data;
+        const char *d;
+        char buf[2];
+
+        assert(n);
+        assert(i);
+        assert(property);
+        assert(t);
+
+        buf[0] = (char) target_get_runlevel(t);
+        buf[1] = 0;
+
+        d = buf;
+
+        if (!dbus_message_iter_append_basic(i, DBUS_TYPE_STRING, &d))
+                return -ENOMEM;
+
+        return 0;
+}
+
+DBusHandlerResult bus_target_message_handler(Unit *u, DBusConnection *c, DBusMessage *message) {
         const BusProperty properties[] = {
                 BUS_UNIT_PROPERTIES,
+                { "org.freedesktop.systemd1.Target", "SysVRunLevel", bus_target_append_runlevel, "s", u },
                 { NULL, NULL, NULL, NULL, NULL }
         };
 
-        return bus_default_message_handler(u->meta.manager, message, introspection, properties);
+        return bus_default_message_handler(u->meta.manager, c, message, INTROSPECTION, properties);
 }