chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
core/group-util: merge two functions
[elogind.git]
/
src
/
shared
/
path-util.c
diff --git
a/src/shared/path-util.c
b/src/shared/path-util.c
index 97a200504ba80f61e9e745b5aab6390bf4996070..dd12d3d63409654fb446028ba92a0860bc83e4c1 100644
(file)
--- a/
src/shared/path-util.c
+++ b/
src/shared/path-util.c
@@
-181,6
+181,7
@@
char **path_strv_canonicalize(char **l) {
t = path_make_absolute_cwd(*s);
free(*s);
t = path_make_absolute_cwd(*s);
free(*s);
+ *s = NULL;
if (!t) {
enomem = true;
if (!t) {
enomem = true;
@@
-264,12
+265,12
@@
char *path_kill_slashes(char *path) {
return path;
}
return path;
}
-
bool
path_startswith(const char *path, const char *prefix) {
+
char*
path_startswith(const char *path, const char *prefix) {
assert(path);
assert(prefix);
if ((path[0] == '/') != (prefix[0] == '/'))
assert(path);
assert(prefix);
if ((path[0] == '/') != (prefix[0] == '/'))
- return
false
;
+ return
NULL
;
for (;;) {
size_t a, b;
for (;;) {
size_t a, b;
@@
-278,19
+279,19
@@
bool path_startswith(const char *path, const char *prefix) {
prefix += strspn(prefix, "/");
if (*prefix == 0)
prefix += strspn(prefix, "/");
if (*prefix == 0)
- return
true
;
+ return
(char*) path
;
if (*path == 0)
if (*path == 0)
- return
false
;
+ return
NULL
;
a = strcspn(path, "/");
b = strcspn(prefix, "/");
if (a != b)
a = strcspn(path, "/");
b = strcspn(prefix, "/");
if (a != b)
- return
false
;
+ return
NULL
;
if (memcmp(path, prefix, a) != 0)
if (memcmp(path, prefix, a) != 0)
- return
false
;
+ return
NULL
;
path += a;
prefix += b;
path += a;
prefix += b;
@@
-349,8
+350,8
@@
int path_is_mount_point(const char *t, bool allow_symlink) {
r = name_to_handle_at(AT_FDCWD, t, h, &mount_id, allow_symlink ? AT_SYMLINK_FOLLOW : 0);
if (r < 0) {
r = name_to_handle_at(AT_FDCWD, t, h, &mount_id, allow_symlink ? AT_SYMLINK_FOLLOW : 0);
if (r < 0) {
- if (errno == ENOTSUP)
- /* This file system does not support
+ if (errno == ENO
SYS || errno == ENO
TSUP)
+ /* This
kernel or
file system does not support
* name_to_handle_at(), hence fallback to the
* traditional stat() logic */
goto fallback;
* name_to_handle_at(), hence fallback to the
* traditional stat() logic */
goto fallback;