shaba/systemd
1
0
Fork 0
mirror of https://github.com/systemd/systemd.git synced 2024-12-23 21:35:11 +03:00
Code

core: change 'basename' to 'path_extract_filename'

Browse Source 
This is part of a cleanup effort in the TODO doc.

Tested locally: `meson compile -C build && meson test -C build`
This commit is contained in:
Jordan Rome 2023-05-25 14:40:58 -07:00 committed by Yu Watanabe
parent ba79e8c2cc
commit b58feca65c
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/core/load-fragment.c
View File

@ -6173,10 +6173,14 @@ int unit_load_fragment(Unit *u) {
* declared in the file system. In particular, this is true (and frequent) for device and swap units.
*/
const char *id = u->id;
_cleanup_free_ char *free_id = NULL;
_cleanup_free_ char *filename = NULL, *free_id = NULL;
if (fragment) {
id = basename(fragment);
r = path_extract_filename(fragment, &filename);
if (r < 0)
return log_debug_errno(r, "Failed to extract filename from fragment '%s': %m", fragment);
id = filename;
if (unit_name_is_valid(id, UNIT_NAME_TEMPLATE)) {
assert(u->instance); /* If we're not trying to use a template for non-instanced unit,
* this must be set. */