[win32] - make it compile on win32

[deb_libnfs.git] / nfs / nfs.c

diff --git a/nfs/nfs.c b/nfs/nfs.c
index 0c8ff79857f84670e2f9dc48891d4f03c7f88c8b..50836ca12f6d1528e9374bc42afa57e8853388a1 100644 (file)
--- a/nfs/nfs.c
+++ b/nfs/nfs.c
@@ -15,22 +15,14 @@
    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
+#ifdef WIN32
+#include "win32_compat.h"
+#else
+#include <sys/stat.h>
+#endif/*WIN32*/
 
 #include <stdio.h>
 #include <errno.h>
-#include <sys/stat.h>
 #include <string.h>
 #include <rpc/rpc.h>
 #include <rpc/xdr.h>
@@ -39,7 +31,9 @@
 #include "libnfs-private.h"
 #include "libnfs-raw-nfs.h"
 
-
+#ifdef WIN32
+#define bzero(a,b) memset((a),(0),(b))
+#endif/*WIN32*/
 
 char *nfsstat3_to_str(int error)
 {
@@ -363,7 +357,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;
@@ -399,7 +393,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;
@@ -432,7 +426,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;
@@ -469,7 +463,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;
@@ -500,7 +494,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;
@@ -533,7 +527,7 @@ int rpc_nfs_readdirplus_async(struct rpc_context *rpc, rpc_cb cb, struct nfs_fh3
                return -1;
        }
 
-       bzero(&args, sizeof(READDIRPLUS3args));
+       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;
@@ -655,7 +649,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;
@@ -692,7 +686,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;
@@ -729,7 +723,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;