projects
/
systemd
/
.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
3e02a6a
)
fs-util: use path_extract_filename() at one more place
author
Yu Watanabe
<watanabe.yu+github@gmail.com>
Fri, 15 Apr 2022 04:33:43 +0000
(13:33 +0900)
committer
Yu Watanabe
<watanabe.yu+github@gmail.com>
Fri, 15 Apr 2022 15:50:01 +0000
(
00:50
+0900)
src/basic/fs-util.c
patch
|
blob
|
history
diff --git
a/src/basic/fs-util.c
b/src/basic/fs-util.c
index d67b30429c0911b9df3ddf61c909209d4f4f51cb..96b588a4b51c46dc2606c18e76d18e66b61a829f 100644
(file)
--- a/
src/basic/fs-util.c
+++ b/
src/basic/fs-util.c
@@
-156,24
+156,16
@@
int readlink_malloc(const char *p, char **ret) {
int readlink_value(const char *p, char **ret) {
_cleanup_free_ char *link = NULL;
- char *value;
int r;
+ assert(p);
+ assert(ret);
+
r = readlink_malloc(p, &link);
if (r < 0)
return r;
- value = basename(link);
- if (!value)
- return -ENOENT;
-
- value = strdup(value);
- if (!value)
- return -ENOMEM;
-
- *ret = value;
-
- return 0;
+ return path_extract_filename(link, ret);
}
int readlink_and_make_absolute(const char *p, char **r) {