X-Git-Url: https://git.piment-noir.org/?a=blobdiff_plain;f=nfs%2Fnfs.c;h=8e8baf4370ee8c10401e1ccc00cb2780f9d95645;hb=ea98629aef9428ca270a76b77e8de49e523be0e4;hp=c21046a20bd9d5720a928c25c6327a87d349d054;hpb=1058201ef0ba4ea34e71f07a3e3582c19ee93a1e;p=deb_libnfs.git

diff --git a/nfs/nfs.c b/nfs/nfs.c
index c21046a..8e8baf4 100644
--- a/nfs/nfs.c
+++ b/nfs/nfs.c
@@ -15,9 +15,24 @@
    along with this program; if not, see <http://www.gnu.org/licenses/>.
 */
 
+#if defined(WIN32)
+#include <winsock2.h>
+#define S_IRUSR 0000400
+#define S_IWUSR 0000200
+#define S_IXUSR 0000100
+#define S_IRGRP 0000040
+#define S_IWGRP 0000020
+#define S_IXGRP 0000010
+#define S_IROTH 0000004
+#define S_IWOTH 0000002
+#define S_IXOTH 0000001
+#endif
+
 #include <stdio.h>
 #include <errno.h>
 #include <sys/stat.h>
+#include <string.h>
+#include <rpc/rpc.h>
 #include <rpc/xdr.h>
 #include "libnfs.h"
 #include "libnfs-raw.h"
@@ -348,7 +363,7 @@ int rpc_nfs_mkdir_async(struct rpc_context *rpc, rpc_cb cb, struct nfs_fh3 *fh,
 		return -1;
 	}
 
-	bzero(&args, sizeof(MKDIR3args));
+	memset(&args, 0, sizeof(MKDIR3args));
 	args.where.dir.data.data_len = fh->data.data_len;
 	args.where.dir.data.data_val = fh->data.data_val;
 	args.where.name = dir;
@@ -384,7 +399,7 @@ int rpc_nfs_rmdir_async(struct rpc_context *rpc, rpc_cb cb, struct nfs_fh3 *fh,
 		return -1;
 	}
 
-	bzero(&args, sizeof(RMDIR3args));
+	memset(&args, 0, sizeof(RMDIR3args));
 	args.object.dir.data.data_len = fh->data.data_len;
 	args.object.dir.data.data_val = fh->data.data_val;
 	args.object.name = dir;
@@ -417,7 +432,7 @@ int rpc_nfs_create_async(struct rpc_context *rpc, rpc_cb cb, struct nfs_fh3 *fh,
 		return -1;
 	}
 
-	bzero(&args, sizeof(CREATE3args));
+	memset(&args, 0, sizeof(CREATE3args));
 	args.where.dir.data.data_len = fh->data.data_len;
 	args.where.dir.data.data_val = fh->data.data_val;
 	args.where.name = file;
@@ -454,7 +469,7 @@ int rpc_nfs_remove_async(struct rpc_context *rpc, rpc_cb cb, struct nfs_fh3 *fh,
 		return -1;
 	}
 
-	bzero(&args, sizeof(REMOVE3args));
+	memset(&args, 0, sizeof(REMOVE3args));
 	args.object.dir.data.data_len = fh->data.data_len;
 	args.object.dir.data.data_val = fh->data.data_val;
 	args.object.name = file;
@@ -474,7 +489,6 @@ int rpc_nfs_remove_async(struct rpc_context *rpc, rpc_cb cb, struct nfs_fh3 *fh,
 	return 0;
 }
 
-
 int rpc_nfs_readdir_async(struct rpc_context *rpc, rpc_cb cb, struct nfs_fh3 *fh, uint64_t cookie, char *cookieverf, int count, void *private_data)
 {
 	struct rpc_pdu *pdu;
@@ -486,7 +500,7 @@ int rpc_nfs_readdir_async(struct rpc_context *rpc, rpc_cb cb, struct nfs_fh3 *fh
 		return -1;
 	}
 
-	bzero(&args, sizeof(READDIR3args));
+	memset(&args, 0, sizeof(READDIR3args));
 	args.dir.data.data_len = fh->data.data_len;
 	args.dir.data.data_val = fh->data.data_val;
 	args.cookie = cookie;
@@ -508,6 +522,40 @@ int rpc_nfs_readdir_async(struct rpc_context *rpc, rpc_cb cb, struct nfs_fh3 *fh
 	return 0;
 }
 
+int rpc_nfs_readdirplus_async(struct rpc_context *rpc, rpc_cb cb, struct nfs_fh3 *fh, uint64_t cookie, char *cookieverf, int count, void *private_data)
+{
+	struct rpc_pdu *pdu;
+	READDIRPLUS3args args;
+
+	pdu = rpc_allocate_pdu(rpc, NFS_PROGRAM, NFS_V3, NFS3_READDIRPLUS, cb, private_data, (xdrproc_t)xdr_READDIRPLUS3res, sizeof(READDIRPLUS3res));
+	if (pdu == NULL) {
+		rpc_set_error(rpc, "Out of memory. Failed to allocate pdu for nfs/readdirplus call");
+		return -1;
+	}
+
+	memset(&args, 0, sizeof(READDIRPLUS3args));
+	args.dir.data.data_len = fh->data.data_len;
+	args.dir.data.data_val = fh->data.data_val;
+	args.cookie = cookie;
+	memcpy(&args.cookieverf, cookieverf, sizeof(cookieverf3)); 
+	args.dircount = count;
+	args.maxcount = count;
+
+	if (xdr_READDIRPLUS3args(&pdu->xdr, &args) == 0) {
+		rpc_set_error(rpc, "XDR error: Failed to encode READDIRPLUS3args");
+		rpc_free_pdu(rpc, pdu);
+		return -2;
+	}
+
+	if (rpc_queue_pdu(rpc, pdu) != 0) {
+		rpc_set_error(rpc, "Out of memory. Failed to queue pdu for nfs/readdirplus call");
+		rpc_free_pdu(rpc, pdu);
+		return -3;
+	}
+
+	return 0;
+}
+
 int rpc_nfs_fsstat_async(struct rpc_context *rpc, rpc_cb cb, struct nfs_fh3 *fh, void *private_data)
 {
 	struct rpc_pdu *pdu;
@@ -607,7 +655,7 @@ int rpc_nfs_symlink_async(struct rpc_context *rpc, rpc_cb cb, struct nfs_fh3 *fh
 		return -1;
 	}
 
-	bzero(&args, sizeof(SYMLINK3args));
+	memset(&args, 0, sizeof(SYMLINK3args));
 	args.where.dir.data.data_len = fh->data.data_len;
 	args.where.dir.data.data_val = fh->data.data_val;
 	args.where.name = newname;
@@ -644,7 +692,7 @@ int rpc_nfs_rename_async(struct rpc_context *rpc, rpc_cb cb, struct nfs_fh3 *old
 		return -1;
 	}
 
-	bzero(&args, sizeof(RENAME3args));
+	memset(&args, 0, sizeof(RENAME3args));
 	args.from.dir.data.data_len = olddir->data.data_len;
 	args.from.dir.data.data_val = olddir->data.data_val;
 	args.from.name = oldname;
@@ -681,7 +729,7 @@ int rpc_nfs_link_async(struct rpc_context *rpc, rpc_cb cb, struct nfs_fh3 *file,
 		return -1;
 	}
 
-	bzero(&args, sizeof(LINK3args));
+	memset(&args, 0, sizeof(LINK3args));
 	args.file.data.data_len = file->data.data_len;
 	args.file.data.data_val = file->data.data_val;
 	args.link.dir.data.data_len = newdir->data.data_len;