chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
when determining unit file list, include invalid unit names in an "invalid" state
[elogind.git]
/
src
/
shared
/
path-util.c
diff --git
a/src/shared/path-util.c
b/src/shared/path-util.c
index 2bdbd22dc71becce8484dec92fb81dc8326e68ef..b51a68d6d2ff7c47d1949cdbc3f2497f064dc9f1 100644
(file)
--- a/
src/shared/path-util.c
+++ b/
src/shared/path-util.c
@@
-35,6
+35,7
@@
#include "log.h"
#include "strv.h"
#include "path-util.h"
#include "log.h"
#include "strv.h"
#include "path-util.h"
+#include "missing.h"
bool path_is_absolute(const char *p) {
return p[0] == '/';
bool path_is_absolute(const char *p) {
return p[0] == '/';
@@
-334,6
+335,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
@@
-347,6
+349,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;
@@
-361,11
+369,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) {