SymbX/systemd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #12870 from yuwata/tree-wide-further-path-join-cleanups

Browse Source 
tree-wide: further path_join() and path_joina() cleanups
This commit is contained in:
Lennart Poettering
2019-06-25 09:27:01 +02:00
committed by GitHub
parent 01a619a6ac 270384b2d4
commit 05b2ace147
20 changed files with 50 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/basic/fs-util.c
+2 -2
View File
@@ -980,9 +980,9 @@ int chase_symlinks(const char *path, const char *original_root, unsigned flags,
/* Prefix what's left to do with what we just read, and start the loop again, but
* remain in the current directory. */
joined = strjoin(destination, todo);
joined = path_join(destination, todo);
} else
joined = strjoin("/", destination, todo);
joined = path_join("/", destination, todo);
if (!joined)
return -ENOMEM;
src/basic/path-util.h
+2 -2
View File
@@ -117,7 +117,7 @@ int mkfs_exists(const char *fstype);
_slash = strrchr((prefix), '/'))
/* Similar to path_join(), but only works for two components, and only the first one may be NULL and returns
* an alloca() buffer, or possibly a const pointer into the path parameter */
* an alloca() buffer, or possibly a const pointer into the path parameter. */
#define prefix_roota(root, path) \
({ \
const char* _path = (path), *_root = (root), *_ret; \
@@ -125,7 +125,7 @@ int mkfs_exists(const char *fstype);
size_t _l; \
while (_path[0] == '/' && _path[1] == '/') \
_path ++; \
if (empty_or_root(_root)) \
if (isempty(_root)) \
_ret = _path; \
else { \
_l = strlen(_root) + 1 + strlen(_path) + 1; \