X-Git-Url: https://git.piment-noir.org/?a=blobdiff_plain;f=lib%2Flibnfs.c;h=06697e10c62311d7d59a0e88f19e837e044e4531;hb=9cac8a63409f8b6160d3ad48a65a6358372c4fdd;hp=a7ac3ef684f799dabb85190c9e75d69778e2cbad;hpb=5935a28a0e8cb9751f89ed7085b8e1d37c44d9d1;p=deb_libnfs.git

diff --git a/lib/libnfs.c b/lib/libnfs.c
index a7ac3ef..06697e1 100644
--- a/lib/libnfs.c
+++ b/lib/libnfs.c
@@ -1548,9 +1548,9 @@ static int nfs_stat64_continue_internal(struct nfs_context *nfs, fattr3 *attr _U
 	return 0;
 }
 
-int nfs_stat64_async(struct nfs_context *nfs, const char *path, nfs_cb cb, void *private_data)
+int nfs_stat64_async_internal(struct nfs_context *nfs, const char *path, int no_follow, nfs_cb cb, void *private_data)
 {
-	if (nfs_lookuppath_async(nfs, path, 0, cb, private_data, nfs_stat64_continue_internal, NULL, NULL, 0) != 0) {
+	if (nfs_lookuppath_async(nfs, path, no_follow, cb, private_data, nfs_stat64_continue_internal, NULL, NULL, 0) != 0) {
 		rpc_set_error(nfs->rpc, "Out of memory: failed to start parsing the path components");
 		return -1;
 	}
@@ -1558,6 +1558,16 @@ int nfs_stat64_async(struct nfs_context *nfs, const char *path, nfs_cb cb, void
 	return 0;
 }
 
+int nfs_stat64_async(struct nfs_context *nfs, const char *path, nfs_cb cb, void *private_data)
+{
+	return nfs_stat64_async_internal(nfs, path, 0, cb, private_data);
+}
+
+int nfs_lstat64_async(struct nfs_context *nfs, const char *path, nfs_cb cb, void *private_data)
+{
+	return nfs_stat64_async_internal(nfs, path, 1, cb, private_data);
+}
+
 /*
  * Async open()
  */
@@ -1797,6 +1807,8 @@ static void nfs_pread_mcb(struct rpc_context *rpc, int status, void *command_dat
 	struct nfs_cb_data *data = mdata->data;
 	struct nfs_context *nfs = data->nfs;
 	READ3res *res;
+	int cb_err;
+	void *cb_data;
 
 	assert(rpc->magic == RPC_CONTEXT_MAGIC);
 
@@ -1895,9 +1907,11 @@ static void nfs_pread_mcb(struct rpc_context *rpc, int status, void *command_dat
 		if (data->max_offset > data->org_offset + data->org_count) {
 			data->max_offset = data->org_offset + data->org_count;
 		}
-		data->cb(data->max_offset - data->org_offset, nfs, data->buffer + (data->org_offset - data->offset), data->private_data);
+		cb_err = data->max_offset - data->org_offset;
+		cb_data = data->buffer + (data->org_offset - data->offset);
 	} else {
-		data->cb(res->READ3res_u.resok.count, nfs, res->READ3res_u.resok.data.data_val, data->private_data);
+		cb_err = res->READ3res_u.resok.count;
+		cb_data = res->READ3res_u.resok.data.data_val;
 	}
 
 	data->nfsfh->ra.fh_offset = data->max_offset;
@@ -1909,6 +1923,8 @@ static void nfs_pread_mcb(struct rpc_context *rpc, int status, void *command_dat
 		data->nfsfh->ra.buf_ts = time(NULL);
 		data->buffer = NULL;
 	}
+
+	data->cb(cb_err, nfs, cb_data, data->private_data);
 	free_nfs_cb_data(data);
 }
 
@@ -3966,9 +3982,9 @@ static int nfs_chmod_continue_internal(struct nfs_context *nfs, fattr3 *attr _U_
 }
 
 
-int nfs_chmod_async(struct nfs_context *nfs, const char *path, int mode, nfs_cb cb, void *private_data)
+int nfs_chmod_async_internal(struct nfs_context *nfs, const char *path, int no_follow, int mode, nfs_cb cb, void *private_data)
 {
-	if (nfs_lookuppath_async(nfs, path, 0, cb, private_data, nfs_chmod_continue_internal, NULL, NULL, mode) != 0) {
+	if (nfs_lookuppath_async(nfs, path, no_follow, cb, private_data, nfs_chmod_continue_internal, NULL, NULL, mode) != 0) {
 		rpc_set_error(nfs->rpc, "Out of memory: failed to start parsing the path components");
 		return -1;
 	}
@@ -3976,6 +3992,16 @@ int nfs_chmod_async(struct nfs_context *nfs, const char *path, int mode, nfs_cb
 	return 0;
 }
 
+int nfs_chmod_async(struct nfs_context *nfs, const char *path, int mode, nfs_cb cb, void *private_data)
+{
+	return nfs_chown_async_internal(nfs, path, 0, mode, cb, private_data);
+}
+
+int nfs_lchmod_async(struct nfs_context *nfs, const char *path, int mode, nfs_cb cb, void *private_data)
+{
+	return nfs_chown_async_internal(nfs, path, 1, mode, cb, private_data);
+}
+
 /*
  * Async fchmod()
  */
@@ -4218,8 +4244,7 @@ static int nfs_utimes_continue_internal(struct nfs_context *nfs, fattr3 *attr _U
 	return 0;
 }
 
-
-int nfs_utimes_async(struct nfs_context *nfs, const char *path, struct timeval *times, nfs_cb cb, void *private_data)
+int nfs_utimes_async_internal(struct nfs_context *nfs, const char *path, int no_follow, struct timeval *times, nfs_cb cb, void *private_data)
 {
 	struct timeval *new_times = NULL;
 
@@ -4233,7 +4258,7 @@ int nfs_utimes_async(struct nfs_context *nfs, const char *path, struct timeval *
 		memcpy(new_times, times, sizeof(struct timeval)*2);
 	}
 
-	if (nfs_lookuppath_async(nfs, path, 0, cb, private_data, nfs_utimes_continue_internal, new_times, free, 0) != 0) {
+	if (nfs_lookuppath_async(nfs, path, no_follow, cb, private_data, nfs_utimes_continue_internal, new_times, free, 0) != 0) {
 		rpc_set_error(nfs->rpc, "Out of memory: failed to start parsing the path components");
 		return -1;
 	}
@@ -4241,6 +4266,16 @@ int nfs_utimes_async(struct nfs_context *nfs, const char *path, struct timeval *
 	return 0;
 }
 
+int nfs_utimes_async(struct nfs_context *nfs, const char *path, struct timeval *times, nfs_cb cb, void *private_data)
+{
+	return nfs_utimes_async_internal(nfs, path, 0, times, cb, private_data);
+}
+
+int nfs_lutimes_async(struct nfs_context *nfs, const char *path, struct timeval *times, nfs_cb cb, void *private_data)
+{
+	return nfs_utimes_async_internal(nfs, path, 1, times, cb, private_data);
+}
+
 /*
  * Async utime()
  */