}
int path_is_mount_point(const char *t, bool allow_symlink) {
- char *parent;
- int r;
- struct file_handle *h;
+
+ union file_handle_union h = {
+ .handle.handle_bytes = MAX_HANDLE_SZ
+ };
+
int mount_id, mount_id_parent;
+ char *parent;
struct stat a, b;
+ int r;
/* We are not actually interested in the file handles, but
* name_to_handle_at() also passes us the mount ID, hence use
if (path_equal(t, "/"))
return 1;
- h = alloca(MAX_HANDLE_SZ);
- h->handle_bytes = MAX_HANDLE_SZ;
-
- r = name_to_handle_at(AT_FDCWD, t, h, &mount_id, allow_symlink ? AT_SYMLINK_FOLLOW : 0);
+ r = name_to_handle_at(AT_FDCWD, t, &h.handle, &mount_id, allow_symlink ? AT_SYMLINK_FOLLOW : 0);
if (r < 0) {
- if (errno == ENOSYS || errno == ENOTSUP)
+ if (IN_SET(errno, ENOSYS, EOPNOTSUPP))
/* This kernel or file system does not support
* name_to_handle_at(), hence fallback to the
* traditional stat() logic */
if (r < 0)
return r;
- h->handle_bytes = MAX_HANDLE_SZ;
- r = name_to_handle_at(AT_FDCWD, parent, h, &mount_id_parent, 0);
+ h.handle.handle_bytes = MAX_HANDLE_SZ;
+ r = name_to_handle_at(AT_FDCWD, parent, &h.handle, &mount_id_parent, 0);
free(parent);
-
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)
+ if (errno == EOPNOTSUPP)
return 1;
return -errno;
r = lstat(parent, &b);
free(parent);
-
if (r < 0)
return -errno;
int find_binary(const char *name, char **filename) {
assert(name);
- assert(filename);
if (strchr(name, '/')) {
- char *p;
+ if (access(name, X_OK) < 0)
+ return -errno;
+
+ if (filename) {
+ char *p;
- if (path_is_absolute(name))
- p = strdup(name);
- else
p = path_make_absolute_cwd(name);
- if (!p)
- return -ENOMEM;
+ if (!p)
+ return -ENOMEM;
+
+ *filename = p;
+ }
- *filename = p;
return 0;
} else {
const char *path;
path = DEFAULT_PATH;
FOREACH_WORD_SEPARATOR(w, l, path, ":", state) {
- char *p;
+ _cleanup_free_ char *p = NULL;
if (asprintf(&p, "%.*s/%s", (int) l, w, name) < 0)
return -ENOMEM;
- if (access(p, X_OK) < 0) {
- free(p);
+ if (access(p, X_OK) < 0)
continue;
- }
- path_kill_slashes(p);
- *filename = p;
+ if (filename) {
+ *filename = path_kill_slashes(p);
+ p = NULL;
+ }
return 0;
}
return changed;
}
+
+int fsck_exists(const char *fstype) {
+ const char *checker;
+
+ checker = strappenda("fsck.", fstype);
+ return find_binary(checker, NULL);
+}