chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Print kdbus path when opening fails
[elogind.git]
/
src
/
libsystemd
/
sd-bus
/
bus-kernel.c
diff --git
a/src/libsystemd/sd-bus/bus-kernel.c
b/src/libsystemd/sd-bus/bus-kernel.c
index f49fb5b3944bf9faae6f9d42803fa829ecb78f2b..8b961c38eb2ffe6e72c444ba99609a1e823fa909 100644
(file)
--- a/
src/libsystemd/sd-bus/bus-kernel.c
+++ b/
src/libsystemd/sd-bus/bus-kernel.c
@@
-1402,11
+1402,20
@@
static int bus_kernel_translate_policy(const BusNamePolicy *policy, struct kdbus
return 0;
}
return 0;
}
-int bus_kernel_open_bus_fd(const char *bus) {
+int bus_kernel_open_bus_fd(const char *bus
, char **path
) {
char *p;
int fd;
char *p;
int fd;
+ size_t len;
- p = alloca(strlen("/dev/kdbus/") + DECIMAL_STR_MAX(uid_t) + 1 + strlen(bus) + strlen("/bus") + 1);
+ len = strlen("/dev/kdbus/") + DECIMAL_STR_MAX(uid_t) + 1 + strlen(bus) + strlen("/bus") + 1;
+
+ if (path) {
+ p = malloc(len);
+ if (!p)
+ return -ENOMEM;
+ *path = p;
+ } else
+ p = alloca(len);
sprintf(p, "/dev/kdbus/" UID_FMT "-%s/bus", getuid(), bus);
fd = open(p, O_RDWR|O_NOCTTY|O_CLOEXEC);
sprintf(p, "/dev/kdbus/" UID_FMT "-%s/bus", getuid(), bus);
fd = open(p, O_RDWR|O_NOCTTY|O_CLOEXEC);
@@
-1549,7
+1558,7
@@
int bus_kernel_create_monitor(const char *bus) {
assert(bus);
assert(bus);
- fd = bus_kernel_open_bus_fd(bus);
+ fd = bus_kernel_open_bus_fd(bus
, NULL
);
if (fd < 0)
return fd;
if (fd < 0)
return fd;