9pfs: local: simplify file opening
The logic to open a path currently sits between local_open_nofollow() and
the relative_openat_nofollow() helper, which has no other user.
For the sake of clarity, this patch moves all the code of the helper into
its unique caller. While here we also:
- drop the code to skip leading "/" because the backend isn't supposed to
pass anything but relative paths without consecutive slashes. The assert()
is kept because we really don't want a buggy backend to pass an absolute
path to openat().
- use strchrnul() to get a simpler code. This is ok since virtfs is for
linux+glibc hosts only.
- don't dup() the initial directory and add an assert() to ensure we don't
return the global mountfd to the caller. BTW, this would mean that the
caller passed an empty path, which isn't supposed to happen either.
Signed-off-by: Greg Kurz <groug@kaod.org>
Reviewed-by: Eric Blake <eblake@redhat.com>
[groug: fixed typos in changelog]
diff --git a/hw/9pfs/9p-local.c b/hw/9pfs/9p-local.c
index 68e9265..ddc5038 100644
--- a/hw/9pfs/9p-local.c
+++ b/hw/9pfs/9p-local.c
@@ -53,13 +53,37 @@
mode_t mode)
{
LocalData *data = fs_ctx->private;
+ int fd = data->mountfd;
- /* All paths are relative to the path data->mountfd points to */
- while (*path == '/') {
- path++;
+ while (*path && fd != -1) {
+ const char *c;
+ int next_fd;
+ char *head;
+
+ /* Only relative paths without consecutive slashes */
+ assert(*path != '/');
+
+ head = g_strdup(path);
+ c = strchrnul(path, '/');
+ if (*c) {
+ /* Intermediate path element */
+ head[c - path] = 0;
+ path = c + 1;
+ next_fd = openat_dir(fd, head);
+ } else {
+ /* Rightmost path element */
+ next_fd = openat_file(fd, head, flags, mode);
+ path = c;
+ }
+ g_free(head);
+ if (fd != data->mountfd) {
+ close_preserve_errno(fd);
+ }
+ fd = next_fd;
}
- return relative_openat_nofollow(data->mountfd, path, flags, mode);
+ assert(fd != data->mountfd);
+ return fd;
}
int local_opendir_nofollow(FsContext *fs_ctx, const char *path)
