chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
systemctl: append .service to unit names lacking suffix
[elogind.git]
/
src
/
shared
/
unit-name.c
diff --git
a/src/shared/unit-name.c
b/src/shared/unit-name.c
index 3e437b77a1d0c10f7281672395982c51ae3c83b0..71937187922835fb3fcf3d6c3c8037356f0bfa9d 100644
(file)
--- a/
src/shared/unit-name.c
+++ b/
src/shared/unit-name.c
@@
-208,7
+208,7
@@
char *unit_name_build(const char *prefix, const char *instance, const char *suff
if (!instance)
return strappend(prefix, suffix);
if (!instance)
return strappend(prefix, suffix);
- return join(prefix, "@", instance, suffix, NULL);
+ return
str
join(prefix, "@", instance, suffix, NULL);
}
static char *do_escape_char(char c, char *t) {
}
static char *do_escape_char(char c, char *t) {
@@
-335,12
+335,25
@@
bool unit_name_is_template(const char *n) {
assert(n);
assert(n);
- if (!(p = strchr(n, '@')))
+ p = strchr(n, '@');
+ if (!p)
return false;
return p[1] == '.';
}
return false;
return p[1] == '.';
}
+bool unit_name_is_instance(const char *n) {
+ const char *p;
+
+ assert(n);
+
+ p = strchr(n, '@');
+ if (!p)
+ return false;
+
+ return p[1] != '.';
+}
+
char *unit_name_replace_instance(const char *f, const char *i) {
const char *p, *e;
char *r, *k;
char *unit_name_replace_instance(const char *f, const char *i) {
const char *p, *e;
char *r, *k;
@@
-425,7
+438,7
@@
char *unit_name_from_path_instance(const char *prefix, const char *path, const c
if (!p)
return NULL;
if (!p)
return NULL;
- r = join(prefix, "@", p, suffix, NULL);
+ r =
str
join(prefix, "@", p, suffix, NULL);
free(p);
return r;
free(p);
return r;
@@
-464,6
+477,7
@@
char *unit_dbus_path_from_name(const char *name) {
char *unit_name_mangle(const char *name) {
char *r, *t;
const char *f;
char *unit_name_mangle(const char *name) {
char *r, *t;
const char *f;
+ bool dot = false;
assert(name);
assert(name);
@@
-480,12
+494,15
@@
char *unit_name_mangle(const char *name) {
/* We'll only escape the obvious characters here, to play
* safe. */
/* We'll only escape the obvious characters here, to play
* safe. */
- r = new(char, strlen(name) * 4 + 1);
+ r = new(char, strlen(name) * 4 + 1
+ sizeof(".service")-1
);
if (!r)
return NULL;
for (f = name, t = r; *f; f++) {
if (!r)
return NULL;
for (f = name, t = r; *f; f++) {
+ if (*f == '.')
+ dot = true;
+
if (*f == '/')
*(t++) = '-';
else if (!strchr("@" VALID_CHARS, *f))
if (*f == '/')
*(t++) = '-';
else if (!strchr("@" VALID_CHARS, *f))
@@
-494,7
+511,10
@@
char *unit_name_mangle(const char *name) {
*(t++) = *f;
}
*(t++) = *f;
}
- *t = 0;
+ if (!dot)
+ strcpy(t, ".service");
+ else
+ *t = 0;
return r;
}
return r;
}