chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
test-env-replace: assert results instead of printing them
[elogind.git]
/
src
/
shared
/
path-util.c
diff --git
a/src/shared/path-util.c
b/src/shared/path-util.c
index 4cb0b03c5a55c8d0af3b36c078788cfb89d14286..ae12c05317f4d34a4f3ae74a52afa46ac3f38e07 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;
@@
-189,13
+190,17
@@
char **path_strv_canonicalize(char **l) {
errno = 0;
u = canonicalize_file_name(t);
errno = 0;
u = canonicalize_file_name(t);
- free(t);
if (!u) {
if (!u) {
- if (errno == ENOMEM || !errno)
- enomem = true;
-
- continue;
+ if (errno == ENOENT)
+ u = t;
+ else {
+ free(t);
+ if (errno == ENOMEM || !errno)
+ enomem = true;
+
+ continue;
+ }
}
l[k++] = u;
}
l[k++] = u;
@@
-209,26
+214,6
@@
char **path_strv_canonicalize(char **l) {
return l;
}
return l;
}
-char **path_strv_remove_empty(char **l) {
- char **f, **t;
-
- if (!l)
- return NULL;
-
- for (f = t = l; *f; f++) {
-
- if (dir_is_empty(*f) > 0) {
- free(*f);
- continue;
- }
-
- *(t++) = *f;
- }
-
- *t = NULL;
- return l;
-}
-
char *path_kill_slashes(char *path) {
char *f, *t;
bool slash = false;
char *path_kill_slashes(char *path) {
char *f, *t;
bool slash = false;
@@
-264,12
+249,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
+263,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;
@@
-335,6
+320,7
@@
int path_is_mount_point(const char *t, bool allow_symlink) {
int r;
struct file_handle *h;
int mount_id, mount_id_parent;
int r;
struct file_handle *h;
int mount_id, mount_id_parent;
+ struct stat a, b;
/* We are not actually interested in the file handles, but
* name_to_handle_at() also passes us the mount ID, hence use
/* We are not actually interested in the file handles, but
* name_to_handle_at() also passes us the mount ID, hence use
@@
-348,6
+334,12
@@
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 == ENOSYS || errno == ENOTSUP)
+ /* This kernel or file system does not support
+ * name_to_handle_at(), hence fallback to the
+ * traditional stat() logic */
+ goto fallback;
+
if (errno == ENOENT)
return 0;
if (errno == ENOENT)
return 0;
@@
-362,11
+354,42
@@
int path_is_mount_point(const char *t, bool allow_symlink) {
r = name_to_handle_at(AT_FDCWD, parent, h, &mount_id_parent, 0);
free(parent);
r = name_to_handle_at(AT_FDCWD, parent, h, &mount_id_parent, 0);
free(parent);
- if (r < 0)
- return -errno;
+ if (r < 0) {
+ /* The parent can't do name_to_handle_at() but the
+ * directory we are interested in can? If so, it must
+ * be a mount point */
+ if (errno == ENOTSUP)
+ return 1;
+ return -errno;
+ }
return mount_id != mount_id_parent;
return mount_id != mount_id_parent;
+
+fallback:
+ if (allow_symlink)
+ r = stat(t, &a);
+ else
+ r = lstat(t, &a);
+
+ if (r < 0) {
+ if (errno == ENOENT)
+ return 0;
+
+ return -errno;
+ }
+
+ r = path_get_parent(t, &parent);
+ if (r < 0)
+ return r;
+
+ r = lstat(parent, &b);
+ free(parent);
+
+ if (r < 0)
+ return -errno;
+
+ return a.st_dev != b.st_dev;
}
int path_is_read_only_fs(const char *path) {
}
int path_is_read_only_fs(const char *path) {