Commit ec70b956 authored by Keno Fischer's avatar Keno Fischer Committed by Greg Kurz
Browse files

9p: Move a couple xattr functions to 9p-util 



These functions will need custom implementations on Darwin. Since the
implementation is very similar among all of them, and 9p-util already
has the _nofollow version of fgetxattrat, let's move them all there.

Signed-off-by: default avatarKeno Fischer <keno@juliacomputing.com>
Signed-off-by: default avatarGreg Kurz <groug@kaod.org>
parent 2306271c

hw/9pfs/9p-util.c

+33 −0
Original line number Diff line number Diff line
@@ -24,3 +24,36 @@ ssize_t fgetxattrat_nofollow(int dirfd, const char *filename, const char *name, 
    g_free(proc_path);

    return ret;

}



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;



    ret = llistxattr(proc_path, list, size);

    g_free(proc_path);

    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;



    ret = lremovexattr(proc_path, name);

    g_free(proc_path);

    return ret;

}



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;



    ret = lsetxattr(proc_path, name, value, size, flags);

    g_free(proc_path);

    return ret;

}

hw/9pfs/9p-util.h

+4 −0
Original line number Diff line number Diff line
@@ -60,5 +60,9 @@ ssize_t fgetxattrat_nofollow(int dirfd, const char *path, const char *name, 
                             void *value, size_t size);

int fsetxattrat_nofollow(int dirfd, const char *path, const char *name,

                         void *value, size_t size, int flags);

ssize_t flistxattrat_nofollow(int dirfd, const char *filename,

                              char *list, size_t size);

ssize_t fremovexattrat_nofollow(int dirfd, const char *filename,

                                const char *name);



#endif

hw/9pfs/9p-xattr.c

+0 −33
Original line number Diff line number Diff line
@@ -60,17 +60,6 @@ ssize_t pt_listxattr(FsContext *ctx, const char *path, 
    return name_size;

}



static 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;



    ret = llistxattr(proc_path, list, size);

    g_free(proc_path);

    return ret;

}



/*

 * Get the list and pass to each layer to find out whether

 * to send the data or not
@@ -196,17 +185,6 @@ ssize_t pt_getxattr(FsContext *ctx, const char *path, const char *name, 
    return local_getxattr_nofollow(ctx, path, name, value, size);

}



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;



    ret = lsetxattr(proc_path, name, value, size, flags);

    g_free(proc_path);

    return ret;

}



ssize_t local_setxattr_nofollow(FsContext *ctx, const char *path,

                                const char *name, void *value, size_t size,

                                int flags)
@@ -235,17 +213,6 @@ int pt_setxattr(FsContext *ctx, const char *path, const char *name, void *value, 
    return local_setxattr_nofollow(ctx, path, name, value, size, flags);

}



static 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;



    ret = lremovexattr(proc_path, name);

    g_free(proc_path);

    return ret;

}



ssize_t local_removexattr_nofollow(FsContext *ctx, const char *path,

                                   const char *name)

{