X-Git-Url: https://git.piment-noir.org/?p=deb_libnfs.git;a=blobdiff_plain;f=lib%2Flibnfs-sync.c;h=fe1e063153d73fba48216acef7992d3398ac780a;hp=0dc6253f69f5f1da26e3cb9512abd785b9ac5c5e;hb=6505b5396731ca6ec1a6786fa9a67dd528cdf947;hpb=84004dbf9bb2ab8a7f8b968affc53ee3065fa911

diff --git a/lib/libnfs-sync.c b/lib/libnfs-sync.c
index 0dc6253..fe1e063 100644
--- a/lib/libnfs-sync.c
+++ b/lib/libnfs-sync.c
@@ -17,50 +17,134 @@
 /*
  * High level api to nfs filesystems
  */
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#ifdef AROS
+#include "aros_compat.h"
+#endif
+
+#ifdef WIN32
+#include "win32_compat.h"
+#endif
+
+#ifdef HAVE_SYS_SOCKET_H
+#include <sys/socket.h>
+#endif
+
+#ifdef HAVE_NET_IF_H
+#include <net/if.h>
+#endif
+
+#ifdef ANDROID
+#define statvfs statfs
+#endif
+
+#ifdef HAVE_SYS_VFS_H
+#include <sys/vfs.h>
+#endif
+
+#ifdef HAVE_SYS_STATVFS_H
+#include <sys/statvfs.h>
+#endif
+
+#ifdef HAVE_SYS_IOCTL_H
+#include <sys/ioctl.h>
+#endif
+
+#ifdef HAVE_POLL_H
+#include <poll.h>
+#endif
+
+#ifdef HAVE_NETDB_H
+#include <netdb.h>
+#endif
+
+#ifdef HAVE_UNISTD_H
+#include <unistd.h>
+#endif
+
+#ifdef HAVE_NETINET_IN_H
+#include <netinet/in.h>
+#endif
+
+#ifdef HAVE_STRINGS_H
+#include <strings.h>
+#endif
 
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include <strings.h>
+#include <assert.h>
 #include <sys/types.h>
 #include <sys/stat.h>
-#include <sys/statvfs.h>
-#include <unistd.h>
 #include <fcntl.h>
 #include <errno.h>
-#include <poll.h>
+
+#ifdef HAVE_SYS_SOCKIO_H
+#include <sys/sockio.h>
+#endif
+
+#include "libnfs-zdr.h"
 #include "libnfs.h"
 #include "libnfs-raw.h"
 #include "libnfs-raw-mount.h"
 #include "libnfs-raw-nfs.h"
+#include "libnfs-private.h"
 
 struct sync_cb_data {
-       int is_finished;
-       int status;
-       off_t offset;
-       void *return_data;
-       int return_int;
+	int is_finished;
+	int status;
+	uint64_t offset;
+	void *return_data;
+	int return_int;
+	const char *call;
 };
 
 
-static void wait_for_reply(struct nfs_context *nfs, struct sync_cb_data *cb_data)
+static void wait_for_reply(struct rpc_context *rpc, struct sync_cb_data *cb_data)
 {
 	struct pollfd pfd;
 
-	for (;;) {
-		if (cb_data->is_finished) {
+	assert(rpc->magic == RPC_CONTEXT_MAGIC);
+
+	while (!cb_data->is_finished) {
+
+		pfd.fd = rpc_get_fd(rpc);
+		pfd.events = rpc_which_events(rpc);
+		if (poll(&pfd, 1, -1) < 0) {
+			rpc_set_error(rpc, "Poll failed");
+			cb_data->status = -EIO;
 			break;
 		}
+		if (rpc_service(rpc, pfd.revents) < 0) {
+			rpc_set_error(rpc, "rpc_service failed");
+			cb_data->status = -EIO;
+			break;
+		}
+		if (rpc_get_fd(rpc) == -1) {
+			rpc_set_error(rpc, "Socket closed\n");
+			break;
+		}
+	}
+}
+
+static void wait_for_nfs_reply(struct nfs_context *nfs, struct sync_cb_data *cb_data)
+{
+	struct pollfd pfd;
+
+	while (!cb_data->is_finished) {
+
 		pfd.fd = nfs_get_fd(nfs);
 		pfd.events = nfs_which_events(nfs);
-
 		if (poll(&pfd, 1, -1) < 0) {
-			printf("Poll failed");
+			nfs_set_error(nfs, "Poll failed");
 			cb_data->status = -EIO;
 			break;
 		}
 		if (nfs_service(nfs, pfd.revents) < 0) {
-			printf("nfs_service failed\n");
+			nfs_set_error(nfs, "nfs_service failed");
 			cb_data->status = -EIO;
 			break;
 		}
@@ -75,7 +159,7 @@ static void wait_for_reply(struct nfs_context *nfs, struct sync_cb_data *cb_data
 /*
  * connect to the server and mount the export
  */
-static void mount_cb(int status, struct nfs_context *nfs _U_, void *data, void *private_data)
+static void mount_cb(int status, struct nfs_context *nfs, void *data, void *private_data)
 {
 	struct sync_cb_data *cb_data = private_data;
 
@@ -83,23 +167,29 @@ static void mount_cb(int status, struct nfs_context *nfs _U_, void *data, void *
 	cb_data->status = status;
 
 	if (status < 0) {
-		printf("mount/mnt call failed with \"%s\"\n", (char *)data);
+		nfs_set_error(nfs, "mount/mnt call failed with \"%s\"", (char *)data);
 		return;
 	}
 }
 
-int nfs_mount_sync(struct nfs_context *nfs, const char *server, const char *export)
+int nfs_mount(struct nfs_context *nfs, const char *server, const char *export)
 {
 	struct sync_cb_data cb_data;
+	struct rpc_context *rpc = nfs_get_rpc_context(nfs);
+
+	assert(rpc->magic == RPC_CONTEXT_MAGIC);
 
 	cb_data.is_finished = 0;
 
 	if (nfs_mount_async(nfs, server, export, mount_cb, &cb_data) != 0) {
-		printf("nfs_mount_async failed\n");
+		nfs_set_error(nfs, "nfs_mount_async failed");
 		return -1;
 	}
 
-	wait_for_reply(nfs, &cb_data);
+	wait_for_nfs_reply(nfs, &cb_data);
+
+	/* Dont want any more callbacks even if the socket is closed */
+	rpc->connect_cb = NULL;
 
 	return cb_data.status;
 }
@@ -108,7 +198,7 @@ int nfs_mount_sync(struct nfs_context *nfs, const char *server, const char *expo
 /*
  * stat()
  */
-static void stat_cb(int status, struct nfs_context *nfs _U_, void *data, void *private_data)
+static void stat_cb(int status, struct nfs_context *nfs, void *data, void *private_data)
 {
 	struct sync_cb_data *cb_data = private_data;
 
@@ -116,14 +206,21 @@ static void stat_cb(int status, struct nfs_context *nfs _U_, void *data, void *p
 	cb_data->status = status;
 
 	if (status < 0) {
-		printf("stat call failed with \"%s\"\n", (char *)data);
+		nfs_set_error(nfs, "stat call failed with \"%s\"", (char *)data);
 		return;
 	}
-
-	memcpy(cb_data->return_data, data, sizeof(struct stat));
+#ifdef WIN32
+	memcpy(cb_data->return_data, data, sizeof(struct __stat64));
+#else
+  memcpy(cb_data->return_data, data, sizeof(struct stat));
+#endif
 }
 
-int nfs_stat_sync(struct nfs_context *nfs, const char *path, struct stat *st)
+#ifdef WIN32
+int nfs_stat(struct nfs_context *nfs, const char *path, struct __stat64 *st)
+#else
+int nfs_stat(struct nfs_context *nfs, const char *path, struct stat *st)
+#endif
 {
 	struct sync_cb_data cb_data;
 
@@ -131,22 +228,67 @@ int nfs_stat_sync(struct nfs_context *nfs, const char *path, struct stat *st)
 	cb_data.return_data = st;
 
 	if (nfs_stat_async(nfs, path, stat_cb, &cb_data) != 0) {
-		printf("nfs_stat_async failed\n");
+		nfs_set_error(nfs, "nfs_stat_async failed");
+		return -1;
+	}
+
+	wait_for_nfs_reply(nfs, &cb_data);
+
+	return cb_data.status;
+}
+
+static void stat64_cb(int status, struct nfs_context *nfs, void *data, void *private_data)
+{
+	struct sync_cb_data *cb_data = private_data;
+
+	cb_data->is_finished = 1;
+	cb_data->status = status;
+
+	if (status < 0) {
+		nfs_set_error(nfs, "stat call failed with \"%s\"", (char *)data);
+		return;
+	}
+	memcpy(cb_data->return_data, data, sizeof(struct nfs_stat_64));
+}
+
+int nfs_stat64(struct nfs_context *nfs, const char *path, struct nfs_stat_64 *st)
+{
+	struct sync_cb_data cb_data;
+
+	cb_data.is_finished = 0;
+	cb_data.return_data = st;
+
+	if (nfs_stat64_async(nfs, path, stat64_cb, &cb_data) != 0) {
+		nfs_set_error(nfs, "nfs_stat64_async failed");
 		return -1;
 	}
 
-	wait_for_reply(nfs, &cb_data);
+	wait_for_nfs_reply(nfs, &cb_data);
 
 	return cb_data.status;
 }
 
+int nfs_lstat64(struct nfs_context *nfs, const char *path, struct nfs_stat_64 *st)
+{
+	struct sync_cb_data cb_data;
 
+	cb_data.is_finished = 0;
+	cb_data.return_data = st;
 
+	if (nfs_lstat64_async(nfs, path, stat64_cb, &cb_data) != 0) {
+		nfs_set_error(nfs, "nfs_lstat64_async failed");
+		return -1;
+	}
+
+	wait_for_nfs_reply(nfs, &cb_data);
+
+	return cb_data.status;
+}
 
 /*
  * open()
  */
-static void open_cb(int status, struct nfs_context *nfs _U_, void *data, void *private_data)
+static void open_cb(int status, struct nfs_context *nfs, void *data, void *private_data)
 {
 	struct sync_cb_data *cb_data = private_data;
 	struct nfsfh *fh, **nfsfh;
@@ -155,7 +297,7 @@ static void open_cb(int status, struct nfs_context *nfs _U_, void *data, void *p
 	cb_data->status = status;
 
 	if (status < 0) {
-		printf("open call failed with \"%s\"\n", (char *)data);
+		nfs_set_error(nfs, "open call failed with \"%s\"", (char *)data);
 		return;
 	}
 
@@ -164,30 +306,62 @@ static void open_cb(int status, struct nfs_context *nfs _U_, void *data, void *p
 	*nfsfh = fh;
 }
 
-int nfs_open_sync(struct nfs_context *nfs, const char *path, int mode, struct nfsfh **nfsfh)
+int nfs_open(struct nfs_context *nfs, const char *path, int flags, struct nfsfh **nfsfh)
 {
 	struct sync_cb_data cb_data;
 
 	cb_data.is_finished = 0;
 	cb_data.return_data = nfsfh;
 
-	if (nfs_open_async(nfs, path, mode, open_cb, &cb_data) != 0) {
-		printf("nfs_open_async failed\n");
+	if (nfs_open_async(nfs, path, flags, open_cb, &cb_data) != 0) {
+		nfs_set_error(nfs, "nfs_open_async failed");
 		return -1;
 	}
 
-	wait_for_reply(nfs, &cb_data);
+	wait_for_nfs_reply(nfs, &cb_data);
 
 	return cb_data.status;
 }
 
+/*
+ * chdir()
+ */
+static void chdir_cb(int status, struct nfs_context *nfs, void *data, void *private_data)
+{
+	struct sync_cb_data *cb_data = private_data;
+
+	cb_data->is_finished = 1;
+	cb_data->status = status;
+
+	if (status < 0) {
+		nfs_set_error(nfs, "chdir call failed with \"%s\"", (char *)data);
+		return;
+	}
+}
+
+int nfs_chdir(struct nfs_context *nfs, const char *path)
+{
+	struct sync_cb_data cb_data;
+
+	cb_data.is_finished = 0;
+
+	if (nfs_chdir_async(nfs, path, chdir_cb, &cb_data) != 0) {
+		nfs_set_error(nfs, "nfs_chdir_async failed with %s",
+			nfs_get_error(nfs));
+		return -1;
+	}
+
+	wait_for_nfs_reply(nfs, &cb_data);
+
+	return cb_data.status;
+}
 
 
 
 /*
  * pread()
  */
-static void pread_cb(int status, struct nfs_context *nfs _U_, void *data, void *private_data)
+static void pread_cb(int status, struct nfs_context *nfs, void *data, void *private_data)
 {
 	struct sync_cb_data *cb_data = private_data;
 	char *buffer;
@@ -195,7 +369,7 @@ static void pread_cb(int status, struct nfs_context *nfs _U_, void *data, void *
 	cb_data->status = status;
 
 	if (status < 0) {
-		printf("pread call failed with \"%s\"\n", (char *)data);
+		nfs_set_error(nfs, "%s call failed with \"%s\"", cb_data->call, (char *)data);
 		return;
 	}
 
@@ -203,19 +377,20 @@ static void pread_cb(int status, struct nfs_context *nfs _U_, void *data, void *
 	memcpy(buffer, (char *)data, status);
 }
 
-int nfs_pread_sync(struct nfs_context *nfs, struct nfsfh *nfsfh, off_t offset, size_t count, char *buffer)
+int nfs_pread(struct nfs_context *nfs, struct nfsfh *nfsfh, uint64_t offset, uint64_t count, char *buffer)
 {
 	struct sync_cb_data cb_data;
 
 	cb_data.is_finished = 0;
 	cb_data.return_data = buffer;
+	cb_data.call = "pread";
 
 	if (nfs_pread_async(nfs, nfsfh, offset, count, pread_cb, &cb_data) != 0) {
-		printf("nfs_pread_async failed\n");
+		nfs_set_error(nfs, "nfs_pread_async failed");
 		return -1;
 	}
 
-	wait_for_reply(nfs, &cb_data);
+	wait_for_nfs_reply(nfs, &cb_data);
 
 	return cb_data.status;
 }
@@ -223,38 +398,51 @@ int nfs_pread_sync(struct nfs_context *nfs, struct nfsfh *nfsfh, off_t offset, s
 /*
  * read()
  */
-int nfs_read_sync(struct nfs_context *nfs, struct nfsfh *nfsfh, size_t count, char *buffer)
+int nfs_read(struct nfs_context *nfs, struct nfsfh *nfsfh, uint64_t count, char *buffer)
 {
-	return nfs_pread_sync(nfs, nfsfh, nfs_get_current_offset(nfsfh), count, buffer);
+	struct sync_cb_data cb_data;
+
+	cb_data.is_finished = 0;
+	cb_data.return_data = buffer;
+	cb_data.call = "read";
+
+	if (nfs_read_async(nfs, nfsfh, count, pread_cb, &cb_data) != 0) {
+		nfs_set_error(nfs, "nfs_read_async failed");
+		return -1;
+	}
+
+	wait_for_nfs_reply(nfs, &cb_data);
+
+	return cb_data.status;
 }
 
 /*
  * close()
  */
-static void close_cb(int status, struct nfs_context *nfs _U_, void *data, void *private_data)
+static void close_cb(int status, struct nfs_context *nfs, void *data, void *private_data)
 {
 	struct sync_cb_data *cb_data = private_data;
 	cb_data->is_finished = 1;
 	cb_data->status = status;
 
 	if (status < 0) {
-		printf("close call failed with \"%s\"\n", (char *)data);
+		nfs_set_error(nfs, "close call failed with \"%s\"", (char *)data);
 		return;
 	}
 }
 
-int nfs_close_sync(struct nfs_context *nfs, struct nfsfh *nfsfh)
+int nfs_close(struct nfs_context *nfs, struct nfsfh *nfsfh)
 {
 	struct sync_cb_data cb_data;
 
 	cb_data.is_finished = 0;
 
 	if (nfs_close_async(nfs, nfsfh, close_cb, &cb_data) != 0) {
-		printf("nfs_close_async failed\n");
+		nfs_set_error(nfs, "nfs_close_async failed");
 		return -1;
 	}
 
-	wait_for_reply(nfs, &cb_data);
+	wait_for_nfs_reply(nfs, &cb_data);
 
 	return cb_data.status;
 }
@@ -265,7 +453,7 @@ int nfs_close_sync(struct nfs_context *nfs, struct nfsfh *nfsfh)
 /*
  * fstat()
  */
-int nfs_fstat_sync(struct nfs_context *nfs, struct nfsfh *nfsfh, struct stat *st)
+int nfs_fstat(struct nfs_context *nfs, struct nfsfh *nfsfh, struct stat *st)
 {
 	struct sync_cb_data cb_data;
 
@@ -273,11 +461,31 @@ int nfs_fstat_sync(struct nfs_context *nfs, struct nfsfh *nfsfh, struct stat *st
 	cb_data.return_data = st;
 
 	if (nfs_fstat_async(nfs, nfsfh, stat_cb, &cb_data) != 0) {
-		printf("nfs_fstat_async failed\n");
+		nfs_set_error(nfs, "nfs_fstat_async failed");
 		return -1;
 	}
 
-	wait_for_reply(nfs, &cb_data);
+	wait_for_nfs_reply(nfs, &cb_data);
+
+	return cb_data.status;
+}
+
+/*
+ * fstat64()
+ */
+int nfs_fstat64(struct nfs_context *nfs, struct nfsfh *nfsfh, struct nfs_stat_64 *st)
+{
+	struct sync_cb_data cb_data;
+
+	cb_data.is_finished = 0;
+	cb_data.return_data = st;
+
+	if (nfs_fstat64_async(nfs, nfsfh, stat64_cb, &cb_data) != 0) {
+		nfs_set_error(nfs, "nfs_fstat64_async failed");
+		return -1;
+	}
+
+	wait_for_nfs_reply(nfs, &cb_data);
 
 	return cb_data.status;
 }
@@ -286,30 +494,29 @@ int nfs_fstat_sync(struct nfs_context *nfs, struct nfsfh *nfsfh, struct stat *st
 /*
  * pwrite()
  */
-static void pwrite_cb(int status, struct nfs_context *nfs _U_, void *data, void *private_data)
+static void pwrite_cb(int status, struct nfs_context *nfs, void *data, void *private_data)
 {
 	struct sync_cb_data *cb_data = private_data;
 	cb_data->is_finished = 1;
 	cb_data->status = status;
 
-	if (status < 0) {
-		printf("pwrite call failed with \"%s\"\n", (char *)data);
-		return;
-	}
+	if (status < 0)
+		nfs_set_error(nfs, "%s call failed with \"%s\"", cb_data->call, (char *)data);
 }
 
-int nfs_pwrite_sync(struct nfs_context *nfs, struct nfsfh *nfsfh, off_t offset, size_t count, char *buf)
+int nfs_pwrite(struct nfs_context *nfs, struct nfsfh *nfsfh, uint64_t offset, uint64_t count, char *buf)
 {
 	struct sync_cb_data cb_data;
 
 	cb_data.is_finished = 0;
+	cb_data.call = "pwrite";
 
 	if (nfs_pwrite_async(nfs, nfsfh, offset, count, buf, pwrite_cb, &cb_data) != 0) {
-		printf("nfs_pwrite_async failed\n");
+		nfs_set_error(nfs, "nfs_pwrite_async failed");
 		return -1;
 	}
 
-	wait_for_reply(nfs, &cb_data);
+	wait_for_nfs_reply(nfs, &cb_data);
 
 	return cb_data.status;
 }
@@ -317,39 +524,51 @@ int nfs_pwrite_sync(struct nfs_context *nfs, struct nfsfh *nfsfh, off_t offset,
 /*
  * write()
  */
-int nfs_write_sync(struct nfs_context *nfs, struct nfsfh *nfsfh, size_t count, char *buf)
+int nfs_write(struct nfs_context *nfs, struct nfsfh *nfsfh, uint64_t count, char *buf)
 {
-	return nfs_pwrite_sync(nfs, nfsfh, nfs_get_current_offset(nfsfh), count, buf);
+	struct sync_cb_data cb_data;
+
+	cb_data.is_finished = 0;
+	cb_data.call = "write";
+
+	if (nfs_write_async(nfs, nfsfh, count, buf, pwrite_cb, &cb_data) != 0) {
+		nfs_set_error(nfs, "nfs_write_async failed");
+		return -1;
+	}
+
+	wait_for_nfs_reply(nfs, &cb_data);
+
+	return cb_data.status;
 }
 
 
 /*
  * fsync()
  */
-static void fsync_cb(int status, struct nfs_context *nfs _U_, void *data, void *private_data)
+static void fsync_cb(int status, struct nfs_context *nfs, void *data, void *private_data)
 {
 	struct sync_cb_data *cb_data = private_data;
 	cb_data->is_finished = 1;
 	cb_data->status = status;
 
 	if (status < 0) {
-		printf("fsync call failed with \"%s\"\n", (char *)data);
+		nfs_set_error(nfs, "fsync call failed with \"%s\"", (char *)data);
 		return;
 	}
 }
 
-int nfs_fsync_sync(struct nfs_context *nfs, struct nfsfh *nfsfh)
+int nfs_fsync(struct nfs_context *nfs, struct nfsfh *nfsfh)
 {
 	struct sync_cb_data cb_data;
 
 	cb_data.is_finished = 0;
 
 	if (nfs_fsync_async(nfs, nfsfh, fsync_cb, &cb_data) != 0) {
-		printf("nfs_fsync_async failed\n");
+		nfs_set_error(nfs, "nfs_fsync_async failed");
 		return -1;
 	}
 
-	wait_for_reply(nfs, &cb_data);
+	wait_for_nfs_reply(nfs, &cb_data);
 
 	return cb_data.status;
 }
@@ -360,30 +579,30 @@ int nfs_fsync_sync(struct nfs_context *nfs, struct nfsfh *nfsfh)
 /*
  * ftruncate()
  */
-static void ftruncate_cb(int status, struct nfs_context *nfs _U_, void *data, void *private_data)
+static void ftruncate_cb(int status, struct nfs_context *nfs, void *data, void *private_data)
 {
 	struct sync_cb_data *cb_data = private_data;
 	cb_data->is_finished = 1;
 	cb_data->status = status;
 
 	if (status < 0) {
-		printf("ftruncate call failed with \"%s\"\n", (char *)data);
+		nfs_set_error(nfs, "ftruncate call failed with \"%s\"", (char *)data);
 		return;
 	}
 }
 
-int nfs_ftruncate_sync(struct nfs_context *nfs, struct nfsfh *nfsfh, off_t length)
+int nfs_ftruncate(struct nfs_context *nfs, struct nfsfh *nfsfh, uint64_t length)
 {
 	struct sync_cb_data cb_data;
 
 	cb_data.is_finished = 0;
 
 	if (nfs_ftruncate_async(nfs, nfsfh, length, ftruncate_cb, &cb_data) != 0) {
-		printf("nfs_ftruncate_async failed\n");
+		nfs_set_error(nfs, "nfs_ftruncate_async failed");
 		return -1;
 	}
 
-	wait_for_reply(nfs, &cb_data);
+	wait_for_nfs_reply(nfs, &cb_data);
 
 	return cb_data.status;
 }
@@ -393,30 +612,30 @@ int nfs_ftruncate_sync(struct nfs_context *nfs, struct nfsfh *nfsfh, off_t lengt
 /*
  * truncate()
  */
-static void truncate_cb(int status, struct nfs_context *nfs _U_, void *data, void *private_data)
+static void truncate_cb(int status, struct nfs_context *nfs, void *data, void *private_data)
 {
 	struct sync_cb_data *cb_data = private_data;
 	cb_data->is_finished = 1;
 	cb_data->status = status;
 
 	if (status < 0) {
-		printf("truncate call failed with \"%s\"\n", (char *)data);
+		nfs_set_error(nfs, "truncate call failed with \"%s\"", (char *)data);
 		return;
 	}
 }
 
-int nfs_truncate_sync(struct nfs_context *nfs, const char *path, off_t length)
+int nfs_truncate(struct nfs_context *nfs, const char *path, uint64_t length)
 {
 	struct sync_cb_data cb_data;
 
 	cb_data.is_finished = 0;
 
 	if (nfs_truncate_async(nfs, path, length, truncate_cb, &cb_data) != 0) {
-		printf("nfs_ftruncate_async failed\n");
+		nfs_set_error(nfs, "nfs_ftruncate_async failed");
 		return -1;
 	}
 
-	wait_for_reply(nfs, &cb_data);
+	wait_for_nfs_reply(nfs, &cb_data);
 
 	return cb_data.status;
 }
@@ -428,30 +647,30 @@ int nfs_truncate_sync(struct nfs_context *nfs, const char *path, off_t length)
 /*
  * mkdir()
  */
-static void mkdir_cb(int status, struct nfs_context *nfs _U_, void *data, void *private_data)
+static void mkdir_cb(int status, struct nfs_context *nfs, void *data, void *private_data)
 {
 	struct sync_cb_data *cb_data = private_data;
 	cb_data->is_finished = 1;
 	cb_data->status = status;
 
 	if (status < 0) {
-		printf("mkdir call failed with \"%s\"\n", (char *)data);
+		nfs_set_error(nfs, "mkdir call failed with \"%s\"", (char *)data);
 		return;
 	}
 }
 
-int nfs_mkdir_sync(struct nfs_context *nfs, const char *path)
+int nfs_mkdir(struct nfs_context *nfs, const char *path)
 {
 	struct sync_cb_data cb_data;
 
 	cb_data.is_finished = 0;
 
 	if (nfs_mkdir_async(nfs, path, mkdir_cb, &cb_data) != 0) {
-		printf("nfs_mkdir_async failed\n");
+		nfs_set_error(nfs, "nfs_mkdir_async failed");
 		return -1;
 	}
 
-	wait_for_reply(nfs, &cb_data);
+	wait_for_nfs_reply(nfs, &cb_data);
 
 	return cb_data.status;
 }
@@ -463,30 +682,30 @@ int nfs_mkdir_sync(struct nfs_context *nfs, const char *path)
 /*
  * rmdir()
  */
-static void rmdir_cb(int status, struct nfs_context *nfs _U_, void *data, void *private_data)
+static void rmdir_cb(int status, struct nfs_context *nfs, void *data, void *private_data)
 {
 	struct sync_cb_data *cb_data = private_data;
 	cb_data->is_finished = 1;
 	cb_data->status = status;
 
 	if (status < 0) {
-		printf("rmdir call failed with \"%s\"\n", (char *)data);
+		nfs_set_error(nfs, "rmdir call failed with \"%s\"", (char *)data);
 		return;
 	}
 }
 
-int nfs_rmdir_sync(struct nfs_context *nfs, const char *path)
+int nfs_rmdir(struct nfs_context *nfs, const char *path)
 {
 	struct sync_cb_data cb_data;
 
 	cb_data.is_finished = 0;
 
 	if (nfs_rmdir_async(nfs, path, rmdir_cb, &cb_data) != 0) {
-		printf("nfs_rmdir_async failed\n");
+		nfs_set_error(nfs, "nfs_rmdir_async failed");
 		return -1;
 	}
 
-	wait_for_reply(nfs, &cb_data);
+	wait_for_nfs_reply(nfs, &cb_data);
 
 	return cb_data.status;
 }
@@ -496,7 +715,7 @@ int nfs_rmdir_sync(struct nfs_context *nfs, const char *path)
 /*
  * creat()
  */
-static void creat_cb(int status, struct nfs_context *nfs _U_, void *data, void *private_data)
+static void creat_cb(int status, struct nfs_context *nfs, void *data, void *private_data)
 {
 	struct sync_cb_data *cb_data = private_data;
 	struct nfsfh *fh, **nfsfh;
@@ -505,7 +724,7 @@ static void creat_cb(int status, struct nfs_context *nfs _U_, void *data, void *
 	cb_data->status = status;
 
 	if (status < 0) {
-		printf("creat call failed with \"%s\"\n", (char *)data);
+		nfs_set_error(nfs, "creat call failed with \"%s\"", (char *)data);
 		return;
 	}
 
@@ -514,30 +733,65 @@ static void creat_cb(int status, struct nfs_context *nfs _U_, void *data, void *
 	*nfsfh = fh;
 }
 
-int nfs_creat_sync(struct nfs_context *nfs, const char *path, int mode, struct nfsfh **nfsfh)
+int nfs_create(struct nfs_context *nfs, const char *path, int flags, int mode, struct nfsfh **nfsfh)
 {
 	struct sync_cb_data cb_data;
 
 	cb_data.is_finished = 0;
 	cb_data.return_data = nfsfh;
 
-	if (nfs_creat_async(nfs, path, mode, creat_cb, &cb_data) != 0) {
-		printf("nfs_creat_async failed\n");
+	if (nfs_create_async(nfs, path, flags, mode, creat_cb, &cb_data) != 0) {
+		nfs_set_error(nfs, "nfs_create_async failed");
 		return -1;
 	}
 
-	wait_for_reply(nfs, &cb_data);
+	wait_for_nfs_reply(nfs, &cb_data);
 
 	return cb_data.status;
 }
 
+int nfs_creat(struct nfs_context *nfs, const char *path, int mode, struct nfsfh **nfsfh)
+{
+	return nfs_create(nfs, path, 0, mode, nfsfh);
+}
 
+/*
+ * mknod()
+ */
+static void mknod_cb(int status, struct nfs_context *nfs, void *data, void *private_data)
+{
+	struct sync_cb_data *cb_data = private_data;
+
+	cb_data->is_finished = 1;
+	cb_data->status = status;
+
+	if (status < 0) {
+		nfs_set_error(nfs, "mknod call failed with \"%s\"", (char *)data);
+		return;
+	}
+}
+
+int nfs_mknod(struct nfs_context *nfs, const char *path, int mode, int dev)
+{
+	struct sync_cb_data cb_data;
+
+	cb_data.is_finished = 0;
+
+	if (nfs_mknod_async(nfs, path, mode, dev, mknod_cb, &cb_data) != 0) {
+		nfs_set_error(nfs, "nfs_creat_async failed");
+		return -1;
+	}
+
+	wait_for_nfs_reply(nfs, &cb_data);
+
+	return cb_data.status;
+}
 
 
 /*
  * unlink()
  */
-static void unlink_cb(int status, struct nfs_context *nfs _U_, void *data, void *private_data)
+static void unlink_cb(int status, struct nfs_context *nfs, void *data, void *private_data)
 {
 	struct sync_cb_data *cb_data = private_data;
 
@@ -545,23 +799,23 @@ static void unlink_cb(int status, struct nfs_context *nfs _U_, void *data, void
 	cb_data->status = status;
 
 	if (status < 0) {
-		printf("unlink call failed with \"%s\"\n", (char *)data);
+		nfs_set_error(nfs, "unlink call failed with \"%s\"", (char *)data);
 		return;
 	}
 }
 
-int nfs_unlink_sync(struct nfs_context *nfs, const char *path)
+int nfs_unlink(struct nfs_context *nfs, const char *path)
 {
 	struct sync_cb_data cb_data;
 
 	cb_data.is_finished = 0;
 
 	if (nfs_unlink_async(nfs, path, unlink_cb, &cb_data) != 0) {
-		printf("nfs_unlink_async failed\n");
+		nfs_set_error(nfs, "nfs_unlink_async failed");
 		return -1;
 	}
 
-	wait_for_reply(nfs, &cb_data);
+	wait_for_nfs_reply(nfs, &cb_data);
 
 	return cb_data.status;
 }
@@ -571,7 +825,7 @@ int nfs_unlink_sync(struct nfs_context *nfs, const char *path)
 /*
  * opendir()
  */
-static void opendir_cb(int status, struct nfs_context *nfs _U_, void *data, void *private_data)
+static void opendir_cb(int status, struct nfs_context *nfs, void *data, void *private_data)
 {
 	struct sync_cb_data *cb_data = private_data;
 	struct nfsdir *dir, **nfsdir;
@@ -580,7 +834,7 @@ static void opendir_cb(int status, struct nfs_context *nfs _U_, void *data, void
 	cb_data->status = status;
 
 	if (status < 0) {
-		printf("opendir call failed with \"%s\"\n", (char *)data);
+		nfs_set_error(nfs, "opendir call failed with \"%s\"", (char *)data);
 		return;
 	}
 
@@ -589,7 +843,7 @@ static void opendir_cb(int status, struct nfs_context *nfs _U_, void *data, void
 	*nfsdir = dir;
 }
 
-int nfs_opendir_sync(struct nfs_context *nfs, const char *path, struct nfsdir **nfsdir)
+int nfs_opendir(struct nfs_context *nfs, const char *path, struct nfsdir **nfsdir)
 {
 	struct sync_cb_data cb_data;
 
@@ -597,11 +851,11 @@ int nfs_opendir_sync(struct nfs_context *nfs, const char *path, struct nfsdir **
 	cb_data.return_data = nfsdir;
 
 	if (nfs_opendir_async(nfs, path, opendir_cb, &cb_data) != 0) {
-		printf("nfs_opendir_async failed\n");
+		nfs_set_error(nfs, "nfs_opendir_async failed");
 		return -1;
 	}
 
-	wait_for_reply(nfs, &cb_data);
+	wait_for_nfs_reply(nfs, &cb_data);
 
 	return cb_data.status;
 }
@@ -610,7 +864,7 @@ int nfs_opendir_sync(struct nfs_context *nfs, const char *path, struct nfsdir **
 /*
  * lseek()
  */
-static void lseek_cb(int status, struct nfs_context *nfs _U_, void *data, void *private_data)
+static void lseek_cb(int status, struct nfs_context *nfs, void *data, void *private_data)
 {
 	struct sync_cb_data *cb_data = private_data;
 
@@ -618,16 +872,16 @@ static void lseek_cb(int status, struct nfs_context *nfs _U_, void *data, void *
 	cb_data->status = status;
 
 	if (status < 0) {
-		printf("lseek call failed with \"%s\"\n", (char *)data);
+		nfs_set_error(nfs, "lseek call failed with \"%s\"", (char *)data);
 		return;
 	}
 
 	if (cb_data->return_data != NULL) {
-		memcpy(cb_data->return_data, data, sizeof(off_t));
+		memcpy(cb_data->return_data, data, sizeof(uint64_t));
 	}
 }
 
-int nfs_lseek_sync(struct nfs_context *nfs, struct nfsfh *nfsfh, off_t offset, int whence, off_t *current_offset)
+int nfs_lseek(struct nfs_context *nfs, struct nfsfh *nfsfh, int64_t offset, int whence, uint64_t *current_offset)
 {
 	struct sync_cb_data cb_data;
 
@@ -635,11 +889,11 @@ int nfs_lseek_sync(struct nfs_context *nfs, struct nfsfh *nfsfh, off_t offset, i
 	cb_data.return_data = current_offset;
 
 	if (nfs_lseek_async(nfs, nfsfh, offset, whence, lseek_cb, &cb_data) != 0) {
-		printf("nfs_lseek_async failed\n");
+		nfs_set_error(nfs, "nfs_lseek_async failed");
 		return -1;
 	}
 
-	wait_for_reply(nfs, &cb_data);
+	wait_for_nfs_reply(nfs, &cb_data);
 
 	return cb_data.status;
 }
@@ -649,7 +903,7 @@ int nfs_lseek_sync(struct nfs_context *nfs, struct nfsfh *nfsfh, off_t offset, i
 /*
  * statvfs()
  */
-static void statvfs_cb(int status, struct nfs_context *nfs _U_, void *data, void *private_data)
+static void statvfs_cb(int status, struct nfs_context *nfs, void *data, void *private_data)
 {
 	struct sync_cb_data *cb_data = private_data;
 
@@ -657,14 +911,14 @@ static void statvfs_cb(int status, struct nfs_context *nfs _U_, void *data, void
 	cb_data->status = status;
 
 	if (status < 0) {
-		printf("statvfs call failed with \"%s\"\n", (char *)data);
+		nfs_set_error(nfs, "statvfs call failed with \"%s\"", (char *)data);
 		return;
 	}
 
 	memcpy(cb_data->return_data, data, sizeof(struct statvfs));
 }
 
-int nfs_statvfs_sync(struct nfs_context *nfs, const char *path, struct statvfs *svfs)
+int nfs_statvfs(struct nfs_context *nfs, const char *path, struct statvfs *svfs)
 {
 	struct sync_cb_data cb_data;
 
@@ -672,11 +926,11 @@ int nfs_statvfs_sync(struct nfs_context *nfs, const char *path, struct statvfs *
 	cb_data.return_data = svfs;
 
 	if (nfs_statvfs_async(nfs, path, statvfs_cb, &cb_data) != 0) {
-		printf("nfs_statvfs_async failed\n");
+		nfs_set_error(nfs, "nfs_statvfs_async failed");
 		return -1;
 	}
 
-	wait_for_reply(nfs, &cb_data);
+	wait_for_nfs_reply(nfs, &cb_data);
 
 	return cb_data.status;
 }
@@ -688,7 +942,7 @@ int nfs_statvfs_sync(struct nfs_context *nfs, const char *path, struct statvfs *
 /*
  * readlink()
  */
-static void readlink_cb(int status, struct nfs_context *nfs _U_, void *data, void *private_data)
+static void readlink_cb(int status, struct nfs_context *nfs, void *data, void *private_data)
 {
 	struct sync_cb_data *cb_data = private_data;
 
@@ -696,12 +950,12 @@ static void readlink_cb(int status, struct nfs_context *nfs _U_, void *data, voi
 	cb_data->status = status;
 
 	if (status < 0) {
-		printf("readlink call failed with \"%s\"\n", (char *)data);
+		nfs_set_error(nfs, "readlink call failed with \"%s\"", (char *)data);
 		return;
 	}
 
 	if (strlen(data) > (size_t)cb_data->return_int) {
-		printf("Too small buffer for readlink\n");
+		nfs_set_error(nfs, "Too small buffer for readlink");
 		cb_data->status = -ENAMETOOLONG;
 		return;
 	}
@@ -709,7 +963,7 @@ static void readlink_cb(int status, struct nfs_context *nfs _U_, void *data, voi
 	memcpy(cb_data->return_data, data, strlen(data)+1);
 }
 
-int nfs_readlink_sync(struct nfs_context *nfs, const char *path, char *buf, int bufsize)
+int nfs_readlink(struct nfs_context *nfs, const char *path, char *buf, int bufsize)
 {
 	struct sync_cb_data cb_data;
 
@@ -718,11 +972,11 @@ int nfs_readlink_sync(struct nfs_context *nfs, const char *path, char *buf, int
 	cb_data.return_int  = bufsize;
 
 	if (nfs_readlink_async(nfs, path, readlink_cb, &cb_data) != 0) {
-		printf("nfs_readlink_async failed\n");
+		nfs_set_error(nfs, "nfs_readlink_async failed");
 		return -1;
 	}
 
-	wait_for_reply(nfs, &cb_data);
+	wait_for_nfs_reply(nfs, &cb_data);
 
 	return cb_data.status;
 }
@@ -732,7 +986,7 @@ int nfs_readlink_sync(struct nfs_context *nfs, const char *path, char *buf, int
 /*
  * chmod()
  */
-static void chmod_cb(int status, struct nfs_context *nfs _U_, void *data, void *private_data)
+static void chmod_cb(int status, struct nfs_context *nfs, void *data, void *private_data)
 {
 	struct sync_cb_data *cb_data = private_data;
 
@@ -740,23 +994,23 @@ static void chmod_cb(int status, struct nfs_context *nfs _U_, void *data, void *
 	cb_data->status = status;
 
 	if (status < 0) {
-		printf("chmod call failed with \"%s\"\n", (char *)data);
+		nfs_set_error(nfs, "chmod call failed with \"%s\"", (char *)data);
 		return;
 	}
 }
 
-int nfs_chmod_sync(struct nfs_context *nfs, const char *path, int mode)
+int nfs_chmod(struct nfs_context *nfs, const char *path, int mode)
 {
 	struct sync_cb_data cb_data;
 
 	cb_data.is_finished = 0;
 
 	if (nfs_chmod_async(nfs, path, mode, chmod_cb, &cb_data) != 0) {
-		printf("nfs_chmod_async failed\n");
+		nfs_set_error(nfs, "nfs_chmod_async failed");
 		return -1;
 	}
 
-	wait_for_reply(nfs, &cb_data);
+	wait_for_nfs_reply(nfs, &cb_data);
 
 	return cb_data.status;
 }
@@ -767,7 +1021,7 @@ int nfs_chmod_sync(struct nfs_context *nfs, const char *path, int mode)
 /*
  * fchmod()
  */
-static void fchmod_cb(int status, struct nfs_context *nfs _U_, void *data, void *private_data)
+static void fchmod_cb(int status, struct nfs_context *nfs, void *data, void *private_data)
 {
 	struct sync_cb_data *cb_data = private_data;
 
@@ -775,23 +1029,23 @@ static void fchmod_cb(int status, struct nfs_context *nfs _U_, void *data, void
 	cb_data->status = status;
 
 	if (status < 0) {
-		printf("fchmod call failed with \"%s\"\n", (char *)data);
+		nfs_set_error(nfs, "fchmod call failed with \"%s\"", (char *)data);
 		return;
 	}
 }
 
-int nfs_fchmod_sync(struct nfs_context *nfs, struct nfsfh *nfsfh, int mode)
+int nfs_fchmod(struct nfs_context *nfs, struct nfsfh *nfsfh, int mode)
 {
 	struct sync_cb_data cb_data;
 
 	cb_data.is_finished = 0;
 
 	if (nfs_fchmod_async(nfs, nfsfh, mode, fchmod_cb, &cb_data) != 0) {
-		printf("nfs_fchmod_async failed\n");
+		nfs_set_error(nfs, "nfs_fchmod_async failed");
 		return -1;
 	}
 
-	wait_for_reply(nfs, &cb_data);
+	wait_for_nfs_reply(nfs, &cb_data);
 
 	return cb_data.status;
 }
@@ -802,7 +1056,7 @@ int nfs_fchmod_sync(struct nfs_context *nfs, struct nfsfh *nfsfh, int mode)
 /*
  * chown()
  */
-static void chown_cb(int status, struct nfs_context *nfs _U_, void *data, void *private_data)
+static void chown_cb(int status, struct nfs_context *nfs, void *data, void *private_data)
 {
 	struct sync_cb_data *cb_data = private_data;
 
@@ -810,23 +1064,42 @@ static void chown_cb(int status, struct nfs_context *nfs _U_, void *data, void *
 	cb_data->status = status;
 
 	if (status < 0) {
-		printf("chown call failed with \"%s\"\n", (char *)data);
+		nfs_set_error(nfs, "chown call failed with \"%s\"", (char *)data);
 		return;
 	}
 }
 
-int nfs_chown_sync(struct nfs_context *nfs, const char *path, int uid, int gid)
+int nfs_chown(struct nfs_context *nfs, const char *path, int uid, int gid)
 {
 	struct sync_cb_data cb_data;
 
 	cb_data.is_finished = 0;
 
 	if (nfs_chown_async(nfs, path, uid, gid, chown_cb, &cb_data) != 0) {
-		printf("nfs_chown_async failed\n");
+		nfs_set_error(nfs, "nfs_chown_async failed");
 		return -1;
 	}
 
-	wait_for_reply(nfs, &cb_data);
+	wait_for_nfs_reply(nfs, &cb_data);
+
+	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;
 }
@@ -834,7 +1107,7 @@ int nfs_chown_sync(struct nfs_context *nfs, const char *path, int uid, int gid)
 /*
  * fchown()
  */
-static void fchown_cb(int status, struct nfs_context *nfs _U_, void *data, void *private_data)
+static void fchown_cb(int status, struct nfs_context *nfs, void *data, void *private_data)
 {
 	struct sync_cb_data *cb_data = private_data;
 
@@ -842,23 +1115,23 @@ static void fchown_cb(int status, struct nfs_context *nfs _U_, void *data, void
 	cb_data->status = status;
 
 	if (status < 0) {
-		printf("fchown call failed with \"%s\"\n", (char *)data);
+		nfs_set_error(nfs, "fchown call failed with \"%s\"", (char *)data);
 		return;
 	}
 }
 
-int nfs_fchown_sync(struct nfs_context *nfs, struct nfsfh *nfsfh, int uid, int gid)
+int nfs_fchown(struct nfs_context *nfs, struct nfsfh *nfsfh, int uid, int gid)
 {
 	struct sync_cb_data cb_data;
 
 	cb_data.is_finished = 0;
 
 	if (nfs_fchown_async(nfs, nfsfh, uid, gid, fchown_cb, &cb_data) != 0) {
-		printf("nfs_fchown_async failed\n");
+		nfs_set_error(nfs, "nfs_fchown_async failed");
 		return -1;
 	}
 
-	wait_for_reply(nfs, &cb_data);
+	wait_for_nfs_reply(nfs, &cb_data);
 
 	return cb_data.status;
 }
@@ -868,7 +1141,7 @@ int nfs_fchown_sync(struct nfs_context *nfs, struct nfsfh *nfsfh, int uid, int g
 /*
  * utimes()
  */
-static void utimes_cb(int status, struct nfs_context *nfs _U_, void *data, void *private_data)
+static void utimes_cb(int status, struct nfs_context *nfs, void *data, void *private_data)
 {
 	struct sync_cb_data *cb_data = private_data;
 
@@ -876,23 +1149,39 @@ static void utimes_cb(int status, struct nfs_context *nfs _U_, void *data, void
 	cb_data->status = status;
 
 	if (status < 0) {
-		printf("utimes call failed with \"%s\"\n", (char *)data);
+		nfs_set_error(nfs, "utimes call failed with \"%s\"", (char *)data);
 		return;
 	}
 }
 
-int nfs_utimes_sync(struct nfs_context *nfs, const char *path, struct timeval *times)
+int nfs_utimes(struct nfs_context *nfs, const char *path, struct timeval *times)
 {
 	struct sync_cb_data cb_data;
 
 	cb_data.is_finished = 0;
 
 	if (nfs_utimes_async(nfs, path, times, utimes_cb, &cb_data) != 0) {
-		printf("nfs_utimes_async failed\n");
+		nfs_set_error(nfs, "nfs_utimes_async failed");
 		return -1;
 	}
 
-	wait_for_reply(nfs, &cb_data);
+	wait_for_nfs_reply(nfs, &cb_data);
+
+	return cb_data.status;
+}
+
+int nfs_lutimes(struct nfs_context *nfs, const char *path, struct timeval *times)
+{
+	struct sync_cb_data cb_data;
+
+	cb_data.is_finished = 0;
+
+	if (nfs_lutimes_async(nfs, path, times, utimes_cb, &cb_data) != 0) {
+		nfs_set_error(nfs, "nfs_lutimes_async failed");
+		return -1;
+	}
+
+	wait_for_nfs_reply(nfs, &cb_data);
 
 	return cb_data.status;
 }
@@ -902,7 +1191,7 @@ int nfs_utimes_sync(struct nfs_context *nfs, const char *path, struct timeval *t
 /*
  * utime()
  */
-static void utime_cb(int status, struct nfs_context *nfs _U_, void *data, void *private_data)
+static void utime_cb(int status, struct nfs_context *nfs, void *data, void *private_data)
 {
 	struct sync_cb_data *cb_data = private_data;
 
@@ -910,23 +1199,23 @@ static void utime_cb(int status, struct nfs_context *nfs _U_, void *data, void *
 	cb_data->status = status;
 
 	if (status < 0) {
-		printf("utime call failed with \"%s\"\n", (char *)data);
+		nfs_set_error(nfs, "utime call failed with \"%s\"", (char *)data);
 		return;
 	}
 }
 
-int nfs_utime_sync(struct nfs_context *nfs, const char *path, struct utimbuf *times)
+int nfs_utime(struct nfs_context *nfs, const char *path, struct utimbuf *times)
 {
 	struct sync_cb_data cb_data;
 
 	cb_data.is_finished = 0;
 
 	if (nfs_utime_async(nfs, path, times, utime_cb, &cb_data) != 0) {
-		printf("nfs_utimes_async failed\n");
+		nfs_set_error(nfs, "nfs_utimes_async failed");
 		return -1;
 	}
 
-	wait_for_reply(nfs, &cb_data);
+	wait_for_nfs_reply(nfs, &cb_data);
 
 	return cb_data.status;
 }
@@ -937,7 +1226,7 @@ int nfs_utime_sync(struct nfs_context *nfs, const char *path, struct utimbuf *ti
 /*
  * access()
  */
-static void access_cb(int status, struct nfs_context *nfs _U_, void *data, void *private_data)
+static void access_cb(int status, struct nfs_context *nfs, void *data, void *private_data)
 {
 	struct sync_cb_data *cb_data = private_data;
 
@@ -945,23 +1234,23 @@ static void access_cb(int status, struct nfs_context *nfs _U_, void *data, void
 	cb_data->status = status;
 
 	if (status < 0) {
-		printf("access call failed with \"%s\"\n", (char *)data);
+		nfs_set_error(nfs, "access call failed with \"%s\"", (char *)data);
 		return;
 	}
 }
 
-int nfs_access_sync(struct nfs_context *nfs, const char *path, int mode)
+int nfs_access(struct nfs_context *nfs, const char *path, int mode)
 {
 	struct sync_cb_data cb_data;
 
 	cb_data.is_finished = 0;
 
 	if (nfs_access_async(nfs, path, mode, access_cb, &cb_data) != 0) {
-		printf("nfs_access_async failed\n");
+		nfs_set_error(nfs, "nfs_access_async failed");
 		return -1;
 	}
 
-	wait_for_reply(nfs, &cb_data);
+	wait_for_nfs_reply(nfs, &cb_data);
 
 	return cb_data.status;
 }
@@ -971,7 +1260,7 @@ int nfs_access_sync(struct nfs_context *nfs, const char *path, int mode)
 /*
  * symlink()
  */
-static void symlink_cb(int status, struct nfs_context *nfs _U_, void *data, void *private_data)
+static void symlink_cb(int status, struct nfs_context *nfs, void *data, void *private_data)
 {
 	struct sync_cb_data *cb_data = private_data;
 
@@ -979,23 +1268,23 @@ static void symlink_cb(int status, struct nfs_context *nfs _U_, void *data, void
 	cb_data->status = status;
 
 	if (status < 0) {
-		printf("symlink call failed with \"%s\"\n", (char *)data);
+		nfs_set_error(nfs, "symlink call failed with \"%s\"", (char *)data);
 		return;
 	}
 }
 
-int nfs_symlink_sync(struct nfs_context *nfs, const char *oldpath, const char *newpath)
+int nfs_symlink(struct nfs_context *nfs, const char *oldpath, const char *newpath)
 {
 	struct sync_cb_data cb_data;
 
 	cb_data.is_finished = 0;
 
 	if (nfs_symlink_async(nfs, oldpath, newpath, symlink_cb, &cb_data) != 0) {
-		printf("nfs_symlink_async failed\n");
+		nfs_set_error(nfs, "nfs_symlink_async failed");
 		return -1;
 	}
 
-	wait_for_reply(nfs, &cb_data);
+	wait_for_nfs_reply(nfs, &cb_data);
 
 	return cb_data.status;
 }
@@ -1005,7 +1294,7 @@ int nfs_symlink_sync(struct nfs_context *nfs, const char *oldpath, const char *n
 /*
  * rename()
  */
-static void rename_cb(int status, struct nfs_context *nfs _U_, void *data, void *private_data)
+static void rename_cb(int status, struct nfs_context *nfs, void *data, void *private_data)
 {
 	struct sync_cb_data *cb_data = private_data;
 
@@ -1013,23 +1302,23 @@ static void rename_cb(int status, struct nfs_context *nfs _U_, void *data, void
 	cb_data->status = status;
 
 	if (status < 0) {
-		printf("rename call failed with \"%s\"\n", (char *)data);
+		nfs_set_error(nfs, "rename call failed with \"%s\"", (char *)data);
 		return;
 	}
 }
 
-int nfs_rename_sync(struct nfs_context *nfs, const char *oldpath, const char *newpath)
+int nfs_rename(struct nfs_context *nfs, const char *oldpath, const char *newpath)
 {
 	struct sync_cb_data cb_data;
 
 	cb_data.is_finished = 0;
 
 	if (nfs_rename_async(nfs, oldpath, newpath, rename_cb, &cb_data) != 0) {
-		printf("nfs_rename_async failed\n");
+		nfs_set_error(nfs, "nfs_rename_async failed");
 		return -1;
 	}
 
-	wait_for_reply(nfs, &cb_data);
+	wait_for_nfs_reply(nfs, &cb_data);
 
 	return cb_data.status;
 }
@@ -1039,7 +1328,7 @@ int nfs_rename_sync(struct nfs_context *nfs, const char *oldpath, const char *ne
 /*
  * link()
  */
-static void link_cb(int status, struct nfs_context *nfs _U_, void *data, void *private_data)
+static void link_cb(int status, struct nfs_context *nfs, void *data, void *private_data)
 {
 	struct sync_cb_data *cb_data = private_data;
 
@@ -1047,23 +1336,432 @@ static void link_cb(int status, struct nfs_context *nfs _U_, void *data, void *p
 	cb_data->status = status;
 
 	if (status < 0) {
-		printf("link call failed with \"%s\"\n", (char *)data);
+		nfs_set_error(nfs, "link call failed with \"%s\"", (char *)data);
 		return;
 	}
 }
 
-int nfs_link_sync(struct nfs_context *nfs, const char *oldpath, const char *newpath)
+int nfs_link(struct nfs_context *nfs, const char *oldpath, const char *newpath)
 {
 	struct sync_cb_data cb_data;
 
 	cb_data.is_finished = 0;
 
 	if (nfs_link_async(nfs, oldpath, newpath, link_cb, &cb_data) != 0) {
-		printf("nfs_link_async failed\n");
+		nfs_set_error(nfs, "nfs_link_async failed");
 		return -1;
 	}
 
-	wait_for_reply(nfs, &cb_data);
+	wait_for_nfs_reply(nfs, &cb_data);
 
 	return cb_data.status;
 }
+
+void mount_getexports_cb(struct rpc_context *mount_context, int status, void *data, void *private_data)
+{
+	struct sync_cb_data *cb_data = private_data;
+	exports export;
+
+	assert(mount_context->magic == RPC_CONTEXT_MAGIC);
+
+	cb_data->is_finished = 1;
+	cb_data->status = status;
+	cb_data->return_data = NULL;
+
+	if (status != 0) {
+		rpc_set_error(mount_context, "mount/export call failed with \"%s\"", (char *)data);
+		return;
+	}
+
+	export = *(exports *)data;
+	while (export != NULL) {
+		exports new_export;
+
+		new_export = malloc(sizeof(*new_export));
+		memset(new_export, 0, sizeof(*new_export));
+		new_export->ex_dir  = strdup(export->ex_dir);
+		new_export->ex_next = cb_data->return_data;
+
+		cb_data->return_data = new_export;
+
+		export = export->ex_next;
+	}
+}
+
+struct exportnode *mount_getexports(const char *server)
+{
+	struct sync_cb_data cb_data;
+	struct rpc_context *rpc;
+
+
+	cb_data.is_finished = 0;
+	cb_data.return_data = NULL;
+
+	rpc = rpc_init_context();
+	if (mount_getexports_async(rpc, server, mount_getexports_cb, &cb_data) != 0) {
+		rpc_destroy_context(rpc);
+		return NULL;
+	}
+
+	wait_for_reply(rpc, &cb_data);
+	rpc_destroy_context(rpc);
+
+	return cb_data.return_data;
+}
+
+void mount_free_export_list(struct exportnode *exports)
+{
+	struct exportnode *tmp;
+
+	while ((tmp = exports)) {
+		exports = exports->ex_next;
+		free(tmp->ex_dir);
+		free(tmp);
+	}
+}
+
+
+
+void free_nfs_srvr_list(struct nfs_server_list *srv)
+{
+	while (srv != NULL) {
+		struct nfs_server_list *next = srv->next;
+
+		free(srv->addr);
+		free(srv);
+		srv = next;
+	}
+}
+
+struct nfs_list_data {
+       int status;
+       struct nfs_server_list *srvrs;
+};
+
+void callit_cb(struct rpc_context *rpc, int status, void *data _U_, void *private_data)
+{
+	struct nfs_list_data *srv_data = private_data;
+	struct sockaddr *sin;
+	char hostdd[16];
+	struct nfs_server_list *srvr;
+
+	assert(rpc->magic == RPC_CONTEXT_MAGIC);
+
+	if (status == RPC_STATUS_CANCEL) {
+		return;
+	}
+	if (status != 0) {
+		srv_data->status = -1;
+		return;
+	}
+
+	sin = rpc_get_recv_sockaddr(rpc);
+	if (sin == NULL) {
+		rpc_set_error(rpc, "failed to get sockaddr in CALLIT callback");
+		srv_data->status = -1;
+		return;
+	}
+
+	if (getnameinfo(sin, sizeof(struct sockaddr_in), &hostdd[0], sizeof(hostdd), NULL, 0, NI_NUMERICHOST) < 0) {
+		rpc_set_error(rpc, "getnameinfo failed in CALLIT callback");
+		srv_data->status = -1;
+		return;
+	}
+
+	/* check for dupes */
+	for (srvr = srv_data->srvrs; srvr; srvr = srvr->next) {
+		if (!strcmp(hostdd, srvr->addr)) {
+			return;
+		}
+	}
+
+	srvr = malloc(sizeof(struct nfs_server_list));
+	if (srvr == NULL) {
+		rpc_set_error(rpc, "Malloc failed when allocating server structure");
+		srv_data->status = -1;
+		return;
+	}
+
+	srvr->addr = strdup(hostdd);
+	if (srvr->addr == NULL) {
+		rpc_set_error(rpc, "Strdup failed when allocating server structure");
+		free(srvr);
+		srv_data->status = -1;
+		return;
+	}
+
+	srvr->next = srv_data->srvrs;
+	srv_data->srvrs = srvr;
+}
+
+#ifdef WIN32
+
+static int send_nfsd_probes(struct rpc_context *rpc, INTERFACE_INFO *InterfaceList, int numIfs, struct nfs_list_data *data)
+{
+  int i=0;
+
+  assert(rpc->magic == RPC_CONTEXT_MAGIC);
+
+  for(i = 0; i < numIfs; i++)
+  {
+    SOCKADDR *pAddress;
+    char bcdd[16];
+    unsigned long nFlags = 0;
+
+    pAddress = (SOCKADDR *) & (InterfaceList[i].iiBroadcastAddress);
+
+    if(pAddress->sa_family != AF_INET)
+      continue;
+
+    nFlags = InterfaceList[i].iiFlags;
+
+    if (!(nFlags & IFF_UP))
+    {
+      continue;
+    }
+
+    if (nFlags & IFF_LOOPBACK)
+    {
+      continue;
+    }
+
+    if (!(nFlags & IFF_BROADCAST))
+    {
+      continue;
+    }
+
+    if (getnameinfo(pAddress, sizeof(struct sockaddr_in), &bcdd[0], sizeof(bcdd), NULL, 0, NI_NUMERICHOST) < 0)
+    {
+      continue;
+    }
+
+    if (rpc_set_udp_destination(rpc, bcdd, 111, 1) < 0)
+    {
+      return -1;
+    }
+
+    if (rpc_pmap2_callit_async(rpc, MOUNT_PROGRAM, 2, 0, NULL, 0, callit_cb, data) < 0)
+    {
+      return -1;
+    }
+  }
+  return 0;
+}
+
+struct nfs_server_list *nfs_find_local_servers(void)
+{
+  struct rpc_context *rpc;
+  struct nfs_list_data data = {0, NULL};
+  struct timeval tv_start, tv_current;
+  int loop;
+  struct pollfd pfd;
+  INTERFACE_INFO InterfaceList[20];
+  unsigned long nBytesReturned;
+  int nNumInterfaces = 0;
+
+  rpc = rpc_init_udp_context();
+  if (rpc == NULL)
+  {
+    return NULL;
+  }
+
+  if (rpc_bind_udp(rpc, "0.0.0.0", 0) < 0)
+  {
+    rpc_destroy_context(rpc);
+    return NULL;
+  }
+
+  if (WSAIoctl(rpc_get_fd(rpc), SIO_GET_INTERFACE_LIST, 0, 0, &InterfaceList, sizeof(InterfaceList), &nBytesReturned, 0, 0) == SOCKET_ERROR)
+  {
+    return NULL;
+  }
+
+  nNumInterfaces = nBytesReturned / sizeof(INTERFACE_INFO);
+
+  for (loop=0; loop<3; loop++)
+  {
+    if (send_nfsd_probes(rpc, InterfaceList, nNumInterfaces, &data) != 0)
+    {
+      rpc_destroy_context(rpc);
+      return NULL;
+    }
+
+    win32_gettimeofday(&tv_start, NULL);
+    for(;;)
+    {
+      int mpt;
+
+      pfd.fd = rpc_get_fd(rpc);
+      pfd.events = rpc_which_events(rpc);
+
+      win32_gettimeofday(&tv_current, NULL);
+      mpt = 1000
+      -    (tv_current.tv_sec *1000 + tv_current.tv_usec / 1000)
+      +    (tv_start.tv_sec *1000 + tv_start.tv_usec / 1000);
+
+      if (poll(&pfd, 1, mpt) < 0)
+      {
+        free_nfs_srvr_list(data.srvrs);
+        rpc_destroy_context(rpc);
+        return NULL;
+      }
+      if (pfd.revents == 0)
+      {
+        break;
+      }
+
+      if (rpc_service(rpc, pfd.revents) < 0)
+      {
+        break;
+      }
+    }
+  }
+
+  rpc_destroy_context(rpc);
+
+  if (data.status != 0)
+  {
+    free_nfs_srvr_list(data.srvrs);
+    return NULL;
+  }
+  return data.srvrs;
+}
+#else
+
+static int send_nfsd_probes(struct rpc_context *rpc, struct ifconf *ifc, struct nfs_list_data *data)
+{
+	char *ptr;
+
+	assert(rpc->magic == RPC_CONTEXT_MAGIC);
+
+	for (ptr =(char *)(ifc->ifc_buf); ptr < (char *)(ifc->ifc_buf) + ifc->ifc_len; ) {
+		struct ifreq *ifr;
+		char bcdd[16];
+
+		ifr = (struct ifreq *)ptr;
+#ifdef HAVE_SOCKADDR_LEN
+		if (ifr->ifr_addr.sa_len > sizeof(struct sockaddr)) {
+			ptr += sizeof(ifr->ifr_name) + ifr->ifr_addr.sa_len;
+		} else {
+			ptr += sizeof(ifr->ifr_name) + sizeof(struct sockaddr);
+		}
+#else
+		ptr += sizeof(struct ifreq);
+#endif
+
+		if (ifr->ifr_addr.sa_family != AF_INET) {
+			continue;
+		}
+		if (ioctl(rpc_get_fd(rpc), SIOCGIFFLAGS, ifr) < 0) {
+			return -1;
+		}
+		if (!(ifr->ifr_flags & IFF_UP)) {
+			continue;
+		}
+		if (ifr->ifr_flags & IFF_LOOPBACK) {
+			continue;
+		}
+		if (!(ifr->ifr_flags & IFF_BROADCAST)) {
+			continue;
+		}
+		if (ioctl(rpc_get_fd(rpc), SIOCGIFBRDADDR, ifr) < 0) {
+			continue;
+		}
+		if (getnameinfo(&ifr->ifr_broadaddr, sizeof(struct sockaddr_in), &bcdd[0], sizeof(bcdd), NULL, 0, NI_NUMERICHOST) < 0) {
+			continue;
+		}
+		if (rpc_set_udp_destination(rpc, bcdd, 111, 1) < 0) {
+			return -1;
+		}
+
+		if (rpc_pmap2_callit_async(rpc, MOUNT_PROGRAM, 2, 0, NULL, 0, callit_cb, data) < 0) {
+			return -1;
+		}
+	}
+
+	return 0;
+}
+
+struct nfs_server_list *nfs_find_local_servers(void)
+{
+	struct rpc_context *rpc;
+	struct nfs_list_data data = {0, NULL};
+	struct timeval tv_start, tv_current;
+	struct ifconf ifc;
+	int size, loop;
+	struct pollfd pfd;
+
+	rpc = rpc_init_udp_context();
+	if (rpc == NULL) {
+		return NULL;
+	}
+
+	if (rpc_bind_udp(rpc, "0.0.0.0", 0) < 0) {
+		rpc_destroy_context(rpc);
+		return NULL;
+	}
+
+
+	/* get list of all interfaces */
+	size = sizeof(struct ifreq);
+	ifc.ifc_buf = NULL;
+	ifc.ifc_len = size;
+
+	while(ifc.ifc_len > (size - sizeof(struct ifreq))) {
+		size *= 2;
+
+		free(ifc.ifc_buf);
+		ifc.ifc_len = size;
+		ifc.ifc_buf = malloc(size);
+		memset(ifc.ifc_buf, 0, size);
+		if (ioctl(rpc_get_fd(rpc), SIOCGIFCONF, (caddr_t)&ifc) < 0) {
+			rpc_destroy_context(rpc);
+			free(ifc.ifc_buf);
+			return NULL;
+		}
+	}
+
+	for (loop=0; loop<3; loop++) {
+		if (send_nfsd_probes(rpc, &ifc, &data) != 0) {
+			rpc_destroy_context(rpc);
+			free(ifc.ifc_buf);
+			return NULL;
+		}
+
+		gettimeofday(&tv_start, NULL);
+		for(;;) {
+			int mpt;
+
+			pfd.fd = rpc_get_fd(rpc);
+			pfd.events = rpc_which_events(rpc);
+
+			gettimeofday(&tv_current, NULL);
+			mpt = 1000
+			-    (tv_current.tv_sec *1000 + tv_current.tv_usec / 1000)
+			+    (tv_start.tv_sec *1000 + tv_start.tv_usec / 1000);
+
+			if (poll(&pfd, 1, mpt) < 0) {
+				free_nfs_srvr_list(data.srvrs);
+				rpc_destroy_context(rpc);
+				return NULL;
+			}
+			if (pfd.revents == 0) {
+				break;
+			}
+
+			if (rpc_service(rpc, pfd.revents) < 0) {
+				break;
+			}
+		}
+	}
+
+	free(ifc.ifc_buf);
+	rpc_destroy_context(rpc);
+
+	if (data.status != 0) {
+		free_nfs_srvr_list(data.srvrs);
+		return NULL;
+	}
+	return data.srvrs;
+}
+#endif//WIN32