X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=src%2Fshared%2Fpath-util.c;h=12d1ec321f174619183f1423cbdf5f83c2389e90;hb=0aa3b7830fd59d8b4ca275e9a9c4e79f8a23ff6d;hp=fae5d20ebb0f6528a2312a33f05d1455c0e85481;hpb=b890bf6a81acfc989743ef7a66ba5710aec66411;p=elogind.git
diff --git a/src/shared/path-util.c b/src/shared/path-util.c
index fae5d20eb..12d1ec321 100644
--- a/src/shared/path-util.c
+++ b/src/shared/path-util.c
@@ -19,15 +19,12 @@
along with systemd; If not, see .
***/
-#include
#include
#include
#include
#include
-#include
#include
#include
-#include
#include
#include "macro.h"
@@ -436,6 +433,10 @@ bool path_equal(const char *a, const char *b) {
}
}
+bool path_equal_or_files_same(const char *a, const char *b) {
+ return path_equal(a, b) || files_same(a, b) > 0;
+}
+
char* path_join(const char *root, const char *path, const char *rest) {
assert(path);
@@ -454,14 +455,12 @@ char* path_join(const char *root, const char *path, const char *rest) {
int path_is_mount_point(const char *t, bool allow_symlink) {
- union file_handle_union h = {
- .handle.handle_bytes = MAX_HANDLE_SZ
- };
-
- int mount_id, mount_id_parent;
+ union file_handle_union h = FILE_HANDLE_INIT;
+ int mount_id = -1, mount_id_parent = -1;
_cleanup_free_ char *parent = NULL;
struct stat a, b;
int r;
+ bool nosupp = false;
/* We are not actually interested in the file handles, but
* name_to_handle_at() also passes us the mount ID, hence use
@@ -472,16 +471,19 @@ int path_is_mount_point(const char *t, bool allow_symlink) {
r = name_to_handle_at(AT_FDCWD, t, &h.handle, &mount_id, allow_symlink ? AT_SYMLINK_FOLLOW : 0);
if (r < 0) {
- if (IN_SET(errno, ENOSYS, EOPNOTSUPP))
+ if (errno == ENOSYS)
+ /* This kernel does not support name_to_handle_at()
+ * fall back to the traditional stat() logic. */
+ goto fallback;
+ else if (errno == EOPNOTSUPP)
/* This kernel or file system does not support
* name_to_handle_at(), hence fallback to the
* traditional stat() logic */
- goto fallback;
-
- if (errno == ENOENT)
+ nosupp = true;
+ else if (errno == ENOENT)
return 0;
-
- return -errno;
+ else
+ return -errno;
}
r = path_get_parent(t, &parent);
@@ -490,17 +492,22 @@ int path_is_mount_point(const char *t, bool allow_symlink) {
h.handle.handle_bytes = MAX_HANDLE_SZ;
r = name_to_handle_at(AT_FDCWD, parent, &h.handle, &mount_id_parent, AT_SYMLINK_FOLLOW);
- 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 (r < 0)
if (errno == EOPNOTSUPP)
- return 1;
-
- return -errno;
- }
-
- return mount_id != mount_id_parent;
+ if (nosupp)
+ /* Neither parent nor child do name_to_handle_at()?
+ We have no choice but to fall back. */
+ goto fallback;
+ else
+ /* The parent can't do name_to_handle_at() but
+ * the directory we are interested in can?
+ * Or the other way around?
+ * If so, it must be a mount point. */
+ return 1;
+ else
+ return -errno;
+ else
+ return mount_id != mount_id_parent;
fallback:
if (allow_symlink)
@@ -515,6 +522,9 @@ fallback:
return -errno;
}
+ free(parent);
+ parent = NULL;
+
r = path_get_parent(t, &parent);
if (r < 0)
return r;
@@ -551,14 +561,14 @@ int path_is_os_tree(const char *path) {
int r;
/* We use /usr/lib/os-release as flag file if something is an OS */
- p = strappenda(path, "/usr/lib/os-release");
+ p = strjoina(path, "/usr/lib/os-release");
r = access(p, F_OK);
if (r >= 0)
return 1;
/* Also check for the old location in /etc, just in case. */
- p = strappenda(path, "/etc/os-release");
+ p = strjoina(path, "/etc/os-release");
r = access(p, F_OK);
return r >= 0;
@@ -656,7 +666,7 @@ int fsck_exists(const char *fstype) {
const char *checker;
int r;
- checker = strappenda("fsck.", fstype);
+ checker = strjoina("fsck.", fstype);
r = find_binary(checker, true, &p);
if (r < 0)