X-Git-Url: https://git.piment-noir.org/?a=blobdiff_plain;f=lib%2Flibnfs-sync.c;h=580f76dd63ce3ef453f97a5fd675ce94c085a571;hb=6b1f14ca0177a25a72eaf1f62ed1ad00f6ae4f5f;hp=fd6f796e3f830a869fc0b6c8f849e4de1e8a7a57;hpb=252aa90dc87de7a4f6cdaff5a71edc74b9f8bad1;p=deb_libnfs.git

diff --git a/lib/libnfs-sync.c b/lib/libnfs-sync.c
index fd6f796..580f76d 100644
--- a/lib/libnfs-sync.c
+++ b/lib/libnfs-sync.c
@@ -17,28 +17,60 @@
 /*
  * 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"
-#define DllExport
-#else
-#include <strings.h>
-#include <unistd.h>
-#ifndef ANDROID
-#include <sys/statvfs.h>
-#else
-#include <netinet/in.h>
-#include <sys/vfs.h>
+#endif
+
+#ifdef HAVE_NET_IF_H
+#include <net/if.h>
+#endif
+
+#ifdef ANDROID
 #define statvfs statfs
 #endif
-#include <poll.h>
+
+#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>
-#include <netdb.h>
+#endif
+
+#ifdef HAVE_SYS_SOCKET_H
 #include <sys/socket.h>
-#include <net/if.h>
 #endif
 
-#ifdef HAVE_CONFIG_H
-#include "config.h"
+#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>
@@ -176,11 +208,18 @@ static void stat_cb(int status, struct nfs_context *nfs, void *data, void *priva
 		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
 }
 
+#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;
 
@@ -198,8 +237,6 @@ int nfs_stat(struct nfs_context *nfs, const char *path, struct stat *st)
 }
 
 
-
-
 /*
  * open()
  */
@@ -221,14 +258,14 @@ static void open_cb(int status, struct nfs_context *nfs, void *data, void *priva
 	*nfsfh = fh;
 }
 
-int nfs_open(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) {
+	if (nfs_open_async(nfs, path, flags, open_cb, &cb_data) != 0) {
 		nfs_set_error(nfs, "nfs_open_async failed");
 		return -1;
 	}
@@ -238,6 +275,38 @@ int nfs_open(struct nfs_context *nfs, const char *path, int mode, struct nfsfh *
 	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;
+}