X-Git-Url: https://git.piment-noir.org/?a=blobdiff_plain;f=lib%2Flibnfs.c;h=543b0ce9ec89a7293e129213e7158c6d150ded77;hb=728970051cb7420c08c3c4860f09f971880e3244;hp=e68468bf79d2bfe10e083ef237cf955f2304de3f;hpb=f816bf4c7641071d83ed2c796c93ce0ddba9b3b4;p=deb_libnfs.git

diff --git a/lib/libnfs.c b/lib/libnfs.c
index e68468b..543b0ce 100644
--- a/lib/libnfs.c
+++ b/lib/libnfs.c
@@ -17,18 +17,43 @@
 /*
  * 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 <sys/statvfs.h>
 #include <utime.h>
-#include <unistd.h>
-#endif/*WIN32*/
+#endif /*WIN32*/
+
+#ifdef ANDROID
+#define statvfs statfs
+#endif
 
 #define _GNU_SOURCE
 
+#ifdef HAVE_UNISTD_H
+#include <unistd.h>
+#endif
+
+#ifdef HAVE_SYS_VFS_H
+#include <sys/vfs.h>
+#endif
+
+#ifdef HAVE_SYS_STATVFS_H
+#include <sys/statvfs.h>
+#endif
+
+#ifdef HAVE_NETINET_IN_H
+#include <netinet/in.h>
+#endif
+
 #include <stdio.h>
 #include <stdarg.h>
 #include <stdlib.h>
@@ -38,7 +63,6 @@
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <fcntl.h>
-#include <netinet/in.h>
 #include "libnfs-zdr.h"
 #include "libnfs.h"
 #include "libnfs-raw.h"
@@ -639,8 +663,8 @@ static int nfs_lookuppath_async(struct nfs_context *nfs, const char *path, nfs_c
 {
 	struct nfs_cb_data *data;
 
-	if (path[0] != '/') {
-		rpc_set_error(nfs->rpc, "Pathname is not absulute %s", path);
+	if (path[0] != 0 && path[0] != '/') {
+		rpc_set_error(nfs->rpc, "Pathname is not absolute %s", path);
 		return -1;
 	}
 
@@ -1654,10 +1678,10 @@ static void nfs_create_2_cb(struct rpc_context *rpc, int status, void *command_d
 	}
 	memset(nfsfh, 0, sizeof(struct nfsfh));
 
-	/* steal the filehandle */
-	nfsfh->fh.data.data_len = data->fh.data.data_len;
-	nfsfh->fh.data.data_val = data->fh.data.data_val;
-	data->fh.data.data_val = NULL;
+	/* copy the filehandle */
+	nfsfh->fh.data.data_len = res->LOOKUP3res_u.resok.object.data.data_len;
+	nfsfh->fh.data.data_val = malloc(nfsfh->fh.data.data_len);
+	memcpy(nfsfh->fh.data.data_val, res->LOOKUP3res_u.resok.object.data.data_val, nfsfh->fh.data.data_len);
 
 	data->cb(0, nfs, nfsfh, data->private_data);
 	free_nfs_cb_data(data);
@@ -1710,7 +1734,6 @@ static int nfs_creat_continue_internal(struct nfs_context *nfs, struct nfs_cb_da
 
 	str = &str[strlen(str) + 1];
 
-
 	memset(&args, 0, sizeof(CREATE3args));
 	args.where.dir.data.data_len = data->fh.data.data_len;
 	args.where.dir.data.data_val = data->fh.data.data_val;
@@ -1746,7 +1769,7 @@ int nfs_creat_async(struct nfs_context *nfs, const char *path, int mode, nfs_cb
 	}
 	*ptr = 0;
 
-	/* new_path now points to the parent directory,  and beyond the nul terminateor is the new directory to create */
+	/* new_path now points to the parent directory,  and beyond the nul terminator is the new directory to create */
 	if (nfs_lookuppath_async(nfs, new_path, cb, private_data, nfs_creat_continue_internal, new_path, free, mode) != 0) {
 		rpc_set_error(nfs->rpc, "Out of memory: failed to start parsing the path components");
 		return -1;
@@ -2414,10 +2437,12 @@ static void nfs_statvfs_1_cb(struct rpc_context *rpc, int status, void *command_
 	svfs.f_bavail  = res->FSSTAT3res_u.resok.abytes/4096;
 	svfs.f_files   = res->FSSTAT3res_u.resok.tfiles;
 	svfs.f_ffree   = res->FSSTAT3res_u.resok.ffiles;
+#if !defined(ANDROID)
 	svfs.f_favail  = res->FSSTAT3res_u.resok.afiles;
 	svfs.f_fsid    = 0;
 	svfs.f_flag    = 0;
 	svfs.f_namemax = 256;
+#endif
 
 	data->cb(0, nfs, &svfs, data->private_data);
 	free_nfs_cb_data(data);