diff options
author | Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> | 2013-12-06 21:29:55 -0500 |
---|---|---|
committer | Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> | 2013-12-06 21:29:55 -0500 |
commit | 2b6bf07dd23bb467099d213c97b3875c5e453491 (patch) | |
tree | 2127e24f28714b48f6c00e92eaec351bcb57e5d5 /src/core/unit.c | |
parent | f4336098941f94d23f2f6c79bc8d055a0907c392 (diff) |
Get rid of our reimplementation of basename
The only problem is that libgen.h #defines basename to point to it's
own broken implementation instead of the GNU one. This can be fixed
by #undefining basename.
Diffstat (limited to 'src/core/unit.c')
-rw-r--r-- | src/core/unit.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/core/unit.c b/src/core/unit.c index 81d21622d0..6458c7f570 100644 --- a/src/core/unit.c +++ b/src/core/unit.c @@ -1848,7 +1848,7 @@ static const char *resolve_template(Unit *u, const char *name, const char*path, assert(p); if (!name) - name = path_get_file_name(path); + name = basename(path); if (!unit_name_is_template(name)) { *p = NULL; @@ -2615,7 +2615,7 @@ UnitFileState unit_get_unit_file_state(Unit *u) { if (u->unit_file_state < 0 && u->fragment_path) u->unit_file_state = unit_file_get_state( u->manager->running_as == SYSTEMD_SYSTEM ? UNIT_FILE_SYSTEM : UNIT_FILE_USER, - NULL, path_get_file_name(u->fragment_path)); + NULL, basename(u->fragment_path)); return u->unit_file_state; } |