diff options
| -rw-r--r-- | src/shared/unit-name.c | 16 |
1 files changed, 12 insertions, 4 deletions
diff --git a/src/shared/unit-name.c b/src/shared/unit-name.c index 6c167b4331..d0e71f2403 100644 --- a/src/shared/unit-name.c +++ b/src/shared/unit-name.c @@ -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) { |