chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
getty-generator: fix stripping /dev/
[elogind.git]
/
src
/
shared
/
unit-name.c
diff --git
a/src/shared/unit-name.c
b/src/shared/unit-name.c
index 8f6c28e86a84f6ea1fbcc9f6661e98952fa005c7..178efefdbfe147fdd5f9411bc458d87391b7b680 100644
(file)
--- a/
src/shared/unit-name.c
+++ b/
src/shared/unit-name.c
@@
-23,6
+23,7
@@
#include <string.h>
#include <assert.h>
#include <string.h>
#include <assert.h>
+#include "sd-bus.h"
#include "path-util.h"
#include "util.h"
#include "unit-name.h"
#include "path-util.h"
#include "util.h"
#include "unit-name.h"
@@
-35,13
+36,14
@@
static const char* const unit_type_table[_UNIT_TYPE_MAX] = {
[UNIT_SERVICE] = "service",
[UNIT_SOCKET] = "socket",
static const char* const unit_type_table[_UNIT_TYPE_MAX] = {
[UNIT_SERVICE] = "service",
[UNIT_SOCKET] = "socket",
+ [UNIT_BUSNAME] = "busname",
[UNIT_TARGET] = "target",
[UNIT_TARGET] = "target",
+ [UNIT_SNAPSHOT] = "snapshot",
[UNIT_DEVICE] = "device",
[UNIT_MOUNT] = "mount",
[UNIT_AUTOMOUNT] = "automount",
[UNIT_DEVICE] = "device",
[UNIT_MOUNT] = "mount",
[UNIT_AUTOMOUNT] = "automount",
- [UNIT_SNAPSHOT] = "snapshot",
- [UNIT_TIMER] = "timer",
[UNIT_SWAP] = "swap",
[UNIT_SWAP] = "swap",
+ [UNIT_TIMER] = "timer",
[UNIT_PATH] = "path",
[UNIT_SLICE] = "slice",
[UNIT_SCOPE] = "scope"
[UNIT_PATH] = "path",
[UNIT_SLICE] = "slice",
[UNIT_SCOPE] = "scope"
@@
-301,7
+303,7
@@
char *unit_name_path_escape(const char *f) {
path_kill_slashes(p);
path_kill_slashes(p);
- if (streq(p, "/")) {
+ if (streq(p, "/")
|| streq(p, "")
) {
free(p);
return strdup("-");
}
free(p);
return strdup("-");
}
@@
-440,7
+442,7
@@
char *unit_name_from_path_instance(const char *prefix, const char *path, const c
}
char *unit_name_to_path(const char *name) {
}
char *unit_name_to_path(const char *name) {
-
char *w, *e
;
+
_cleanup_free_ char *w = NULL
;
assert(name);
assert(name);
@@
-448,10
+450,7
@@
char *unit_name_to_path(const char *name) {
if (!w)
return NULL;
if (!w)
return NULL;
- e = unit_name_path_unescape(w);
- free(w);
-
- return e;
+ return unit_name_path_unescape(w);
}
char *unit_dbus_path_from_name(const char *name) {
}
char *unit_dbus_path_from_name(const char *name) {
@@
-459,7
+458,7
@@
char *unit_dbus_path_from_name(const char *name) {
assert(name);
assert(name);
- e =
bus_path
_escape(name);
+ e =
sd_bus_label
_escape(name);
if (!e)
return NULL;
if (!e)
return NULL;
@@
-474,7
+473,7
@@
int unit_name_from_dbus_path(const char *path, char **name) {
if (!e)
return -EINVAL;
if (!e)
return -EINVAL;
- n =
bus_path
_unescape(e);
+ n =
sd_bus_label
_unescape(e);
if (!n)
return -ENOMEM;
if (!n)
return -ENOMEM;