chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
bus-proxy: close each connection fd only once
[elogind.git]
/
src
/
shared
/
path-util.c
diff --git
a/src/shared/path-util.c
b/src/shared/path-util.c
index 8c43d060fb2ed93f1eb008f4c56cb63cfe3352a9..b9db7f1047ab8c6e31b970a63cb9188c7b6a3ef3 100644
(file)
--- a/
src/shared/path-util.c
+++ b/
src/shared/path-util.c
@@
-454,11
+454,8
@@
char* path_join(const char *root, const char *path, const char *rest) {
int path_is_mount_point(const char *t, bool allow_symlink) {
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;
_cleanup_free_ char *parent = NULL;
struct stat a, b;
int r;
@@
-473,7
+470,11
@@
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) {
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 */
/* This kernel or file system does not support
* name_to_handle_at(), hence fallback to the
* traditional stat() logic */
@@
-520,6
+521,9
@@
fallback:
return -errno;
}
return -errno;
}
+ free(parent);
+ parent = NULL;
+
r = path_get_parent(t, &parent);
if (r < 0)
return r;
r = path_get_parent(t, &parent);
if (r < 0)
return r;
@@
-556,14
+560,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 */
int r;
/* We use /usr/lib/os-release as flag file if something is an OS */
- p = str
append
a(path, "/usr/lib/os-release");
+ p = str
join
a(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. */
r = access(p, F_OK);
if (r >= 0)
return 1;
/* Also check for the old location in /etc, just in case. */
- p = str
append
a(path, "/etc/os-release");
+ p = str
join
a(path, "/etc/os-release");
r = access(p, F_OK);
return r >= 0;
r = access(p, F_OK);
return r >= 0;
@@
-661,7
+665,7
@@
int fsck_exists(const char *fstype) {
const char *checker;
int r;
const char *checker;
int r;
- checker = str
append
a("fsck.", fstype);
+ checker = str
join
a("fsck.", fstype);
r = find_binary(checker, true, &p);
if (r < 0)
r = find_binary(checker, true, &p);
if (r < 0)