Re: [Qemu-devel] [PATCH 10/13] 9p: darwin: *xattr_nofollow implementations

[Greg Kurz]

On Sat, 26 May 2018 01:23:12 -0400
address@hidden wrote:

> From: Keno Fischer <address@hidden>
> 
> Signed-off-by: Keno Fischer <address@hidden>
> ---

As mentioned in patch 3, this should go to 9p-util-darwin.c

>  hw/9pfs/9p-util.c | 49 +++++++++++++++++++++++++++++++++++++++++++++----
>  1 file changed, 45 insertions(+), 4 deletions(-)
> 
> diff --git a/hw/9pfs/9p-util.c b/hw/9pfs/9p-util.c
> index 8cf5554..98004ac 100644
> --- a/hw/9pfs/9p-util.c
> +++ b/hw/9pfs/9p-util.c
> @@ -17,49 +17,90 @@
>  ssize_t fgetxattrat_nofollow(int dirfd, const char *filename, const char 
> *name,
>                               void *value, size_t size)
>  {
> -    char *proc_path = g_strdup_printf("/proc/self/fd/%d/%s", dirfd, 
> filename);
>      int ret;
> +#ifdef CONFIG_DARWIN
> +    int fd = openat_file(dirfd, filename, O_RDONLY | O_PATH_9P_UTIL | 
> O_NOFOLLOW, 0);
> +    if (fd == -1)
> +        return -1;
> +
> +    ret = fgetxattr(fd, name, value, size, 0, XATTR_NOFOLLOW);
> +    close_preserve_errno(fd);
> +#else
> +    char *proc_path = g_strdup_printf("/proc/self/fd/%d/%s", dirfd, 
> filename);
>  
>      ret = lgetxattr(proc_path, name, value, size);
>      g_free(proc_path);
> +#endif
>      return ret;
>  }
>  
>  ssize_t fgetxattr_follow(int fd, const char *name,
>                           void *value, size_t size)
>  {
> +#ifdef CONFIG_DARWIN
> +    return fgetxattr(fd, name, value, size, 0, 0);
> +#else
>      return fgetxattr(fd, name, value, size);
> +#endif
>  }
>  
>  ssize_t flistxattrat_nofollow(int dirfd, const char *filename,
>                                char *list, size_t size)
>  {
> -    char *proc_path = g_strdup_printf("/proc/self/fd/%d/%s", dirfd, 
> filename);
>      int ret;
> +#ifdef CONFIG_DARWIN
> +    int fd = openat_file(dirfd, filename, O_RDONLY | O_PATH_9P_UTIL | 
> O_NOFOLLOW, 0);
> +    if (fd == -1)
> +        return -1;
> +
> +    ret = flistxattr(fd, list, size, XATTR_NOFOLLOW);
> +    close_preserve_errno(fd);
> +#else
> +    char *proc_path = g_strdup_printf("/proc/self/fd/%d/%s", dirfd, 
> filename);
>  
>      ret = llistxattr(proc_path, list, size);
>      g_free(proc_path);
> +#endif
>      return ret;
>  }
>  
>  ssize_t fremovexattrat_nofollow(int dirfd, const char *filename,
>                                  const char *name)
>  {
> -    char *proc_path = g_strdup_printf("/proc/self/fd/%d/%s", dirfd, 
> filename);
>      int ret;
> +#ifdef CONFIG_DARWIN
> +    int fd = openat_file(dirfd, filename, O_PATH_9P_UTIL | O_NOFOLLOW, 0);
> +    if (fd == -1)
> +        return -1;
> +
> +    ret = fremovexattr(fd, name, XATTR_NOFOLLOW);
> +    close_preserve_errno(fd);
> +    return ret;
> +#else
> +    char *proc_path = g_strdup_printf("/proc/self/fd/%d/%s", dirfd, 
> filename);
>  
>      ret = lremovexattr(proc_path, name);
>      g_free(proc_path);
>      return ret;
> +#endif
>  }
>  
>  int fsetxattrat_nofollow(int dirfd, const char *filename, const char *name,
>                           void *value, size_t size, int flags)
>  {
> -    char *proc_path = g_strdup_printf("/proc/self/fd/%d/%s", dirfd, 
> filename);
>      int ret;
> +#ifdef CONFIG_DARWIN
> +    int fd = openat_file(dirfd, filename, O_PATH_9P_UTIL | O_NOFOLLOW, 0);
> +    if (fd == -1)
> +        return -1;
> +
> +    ret = fsetxattr(fd, name, value, size, 0, XATTR_NOFOLLOW);
> +    close_preserve_errno(fd);
> +#else
> +    char *proc_path = g_strdup_printf("/proc/self/fd/%d/%s", dirfd, 
> filename);
>  
>      ret = lsetxattr(proc_path, name, value, size, flags);
>      g_free(proc_path);
> +#endif
>      return ret;
>  }