libnfs: Add lchown

Add lchown which is like chown but operates on the symbolic link itself
if the destination is a symbolic link.

Signed-off-by: Ross Lagerwall <rosslagerwall@gmail.com>

diff --git a/include/nfsc/libnfs.h b/include/nfsc/libnfs.h
index 2149b8a8fa8ebe1fffe4cc7700569aae7f8f1c93..a806fdb3ebc12c54b52691e3422e126776b28c5e 100644 (file)
--- a/include/nfsc/libnfs.h
+++ b/include/nfsc/libnfs.h
@@ -1047,6 +1047,34 @@ EXTERN int nfs_chown_async(struct nfs_context *nfs, const char *path, int uid, i
  * -errno : The command failed.
  */
 EXTERN int nfs_chown(struct nfs_context *nfs, const char *path, int uid, int gid);
+/*
+ * Async chown(<name>)
+ *
+ * Like chown except if the destination is a symbolic link, it acts on the
+ * symbolic link itself.
+ *
+ * Function returns
+ *  0 : The operation was initiated. Once the operation finishes, the callback will be invoked.
+ * <0 : An error occured when trying to set up the operation. The callback will not be invoked.
+ *
+ * When the callback is invoked, status indicates the result:
+ *      0 : Success.
+ *          data is NULL
+ * -errno : An error occured.
+ *          data is the error string.
+ */
+EXTERN int nfs_lchown_async(struct nfs_context *nfs, const char *path, int uid, int gid, nfs_cb cb, void *private_data);
+/*
+ * Sync chown(<name>)
+ *
+ * Like chown except if the destination is a symbolic link, it acts on the
+ * symbolic link itself.
+ *
+ * Function returns
+ *      0 : The operation was successfull.
+ * -errno : The command failed.
+ */
+EXTERN int nfs_lchown(struct nfs_context *nfs, const char *path, int uid, int gid);
 
 
 

diff --git a/lib/libnfs-sync.c b/lib/libnfs-sync.c
index 9d351f75f44a62afbbbd1e99a5740e3c7ee49006..a31a607696ba4702e2fc31ef54749f9aa93ab74c 100644 (file)
--- a/lib/libnfs-sync.c
+++ b/lib/libnfs-sync.c
@@ -1068,6 +1068,25 @@ int nfs_chown(struct nfs_context *nfs, const char *path, int uid, int gid)
        return cb_data.status;
 }
 
+/*
+ * lchown()
+ */
+int nfs_lchown(struct nfs_context *nfs, const char *path, int uid, int gid)
+{
+       struct sync_cb_data cb_data;
+
+       cb_data.is_finished = 0;
+
+       if (nfs_lchown_async(nfs, path, uid, gid, chown_cb, &cb_data) != 0) {
+               nfs_set_error(nfs, "nfs_lchown_async failed");
+               return -1;
+       }
+
+       wait_for_nfs_reply(nfs, &cb_data);
+
+       return cb_data.status;
+}
+
 /*
  * fchown()
  */

diff --git a/lib/libnfs.c b/lib/libnfs.c
index 2acd17213f12820d76e7be0294d49620e9faded5..a7ac3ef684f799dabb85190c9e75d69778e2cbad 100644 (file)
--- a/lib/libnfs.c
+++ b/lib/libnfs.c
@@ -4076,7 +4076,7 @@ static int nfs_chown_continue_internal(struct nfs_context *nfs, fattr3 *attr _U_
 }
 
 
-int nfs_chown_async(struct nfs_context *nfs, const char *path, int uid, int gid, nfs_cb cb, void *private_data)
+int nfs_chown_async_internal(struct nfs_context *nfs, const char *path, int no_follow, int uid, int gid, nfs_cb cb, void *private_data)
 {
        struct nfs_chown_data *chown_data;
 
@@ -4089,7 +4089,7 @@ int nfs_chown_async(struct nfs_context *nfs, const char *path, int uid, int gid,
        chown_data->uid = uid;
        chown_data->gid = gid;
 
-       if (nfs_lookuppath_async(nfs, path, 0, cb, private_data, nfs_chown_continue_internal, chown_data, free, 0) != 0) {
+       if (nfs_lookuppath_async(nfs, path, no_follow, cb, private_data, nfs_chown_continue_internal, chown_data, free, 0) != 0) {
                rpc_set_error(nfs->rpc, "Out of memory: failed to start parsing the path components");
                return -1;
        }
@@ -4097,6 +4097,15 @@ int nfs_chown_async(struct nfs_context *nfs, const char *path, int uid, int gid,
        return 0;
 }
 
+int nfs_chown_async(struct nfs_context *nfs, const char *path, int uid, int gid, nfs_cb cb, void *private_data)
+{
+       return nfs_chown_async_internal(nfs, path, 0, uid, gid, cb, private_data);
+}
+
+int nfs_lchown_async(struct nfs_context *nfs, const char *path, int uid, int gid, nfs_cb cb, void *private_data)
+{
+       return nfs_chown_async_internal(nfs, path, 1, uid, gid, cb, private_data);
+}
 
 /*
  * Async fchown()