picnoir/Systemd
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

unit-name: fix detection of unit templates/instances

Browse source 
We need to check for the last dot, not the first one in a unit name, for
the suffix. Correct that.
This commit is contained in:
Lennart Poettering 2014-06-16 17:01:26 +02:00
parent e94b5a7bc2
commit 6ef9eeed61
1 changed files with 12 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
src/shared/unit-name.c
View file

@ -332,7 +332,7 @@ char *unit_name_path_unescape(const char *f) {
}
bool unit_name_is_template(const char *n) {
const char *p;
const char *p, *e;
assert(n);
@ -340,11 +340,15 @@ bool unit_name_is_template(const char *n) {
if (!p)
return false;
return p[1] == '.';
e = strrchr(p+1, '.');
if (!e)
return false;
return e == p + 1;
}
bool unit_name_is_instance(const char *n) {
const char *p;
const char *p, *e;
assert(n);
@ -352,7 +356,11 @@ bool unit_name_is_instance(const char *n) {
if (!p)
return false;
return p[1] != '.';
e = strrchr(p+1, '.');
if (!e)
return false;
return e > p + 1;
}
char *unit_name_replace_instance(const char *f, const char *i) {