chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
udev: hwdb - exit if no database is available
[elogind.git]
/
src
/
shared
/
unit-name.c
diff --git
a/src/shared/unit-name.c
b/src/shared/unit-name.c
index d6391228f2118686d4cae9cd79ca230a3d8ffc20..50031e608e066b299b216dd4c8878167cafde49f 100644
(file)
--- a/
src/shared/unit-name.c
+++ b/
src/shared/unit-name.c
@@
-470,15
+470,13
@@
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);
/* Try to turn a string that might not be a unit name into a
* sensible unit name. */
assert(name);
/* Try to turn a string that might not be a unit name into a
* sensible unit name. */
- if (path_startswith(name, "/dev/") ||
- path_startswith(name, "/sys/"))
+ if (is_device_path(name))
return unit_name_from_path(name, ".device");
if (path_is_absolute(name))
return unit_name_from_path(name, ".device");
if (path_is_absolute(name))
@@
-492,10
+490,6
@@
char *unit_name_mangle(const char *name) {
return NULL;
for (f = name, t = r; *f; f++) {
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))
@@
-504,7
+498,7
@@
char *unit_name_mangle(const char *name) {
*(t++) = *f;
}
*(t++) = *f;
}
- if (
!dot
)
+ if (
unit_name_to_type(name) < 0
)
strcpy(t, ".service");
else
*t = 0;
strcpy(t, ".service");
else
*t = 0;