[win32] - make it compile on win32

[deb_libnfs.git] / lib / init.c

diff --git a/lib/init.c b/lib/init.c
index fb2ae83512150b4f0eb0114eccbc11ec9b5dcad5..45aa78da9f295acb92c5da2d333a53744801b170 100644 (file)
--- a/lib/init.c
+++ b/lib/init.c
@@ -1,10 +1,7 @@
 /*
    Copyright (C) 2010 by Ronnie Sahlberg <ronniesahlberg@gmail.com>
 
-   This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU Lesser General Public License as published by
-   the Free Software Foundation; either version 2.1 of the License, or
-   (at your option) any later version.
+
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -15,12 +12,19 @@
    along with this program; if not, see <http://www.gnu.org/licenses/>.
 */
 
+#ifdef WIN32
+#include "win32_compat.h"
+#else
+#include <unistd.h>
+#include <strings.h>
+#endif/*WIN32*/
 #define _GNU_SOURCE
+
 #include <stdio.h>
 #include <stdarg.h>
-#include <unistd.h>
 #include <string.h>
-#include <strings.h>
+#include <stdlib.h>
+#include <rpc/rpc.h>
 #include <rpc/xdr.h>
 #include "slist.h"
 #include "libnfs.h"
@@ -33,22 +37,23 @@ struct rpc_context *rpc_init_context(void)
 
        rpc = malloc(sizeof(struct rpc_context));
        if (rpc == NULL) {
-               printf("Failed to allocate rpc context\n");
                return NULL;
        }
-       bzero(rpc, sizeof(struct rpc_context));
+       memset(rpc, 0, sizeof(struct rpc_context));
 
        rpc->encodebuflen = 65536;
        rpc->encodebuf = malloc(rpc->encodebuflen);
        if (rpc->encodebuf == NULL) {
-               printf("Failed to allocate a buffer for rpc encoding\n");
                free(rpc);
                return NULL;
        }
 
-       rpc->auth = authunix_create_default();
+#if defined(WIN32)
+       rpc->auth = authunix_create("LibNFS", 65535, 65535, 0, NULL);
+#else
+       rpc->auth = authunix_create_default();
+#endif
        if (rpc->auth == NULL) {
-               printf("failed to create authunix\n");
                free(rpc->encodebuf);
                free(rpc);
                return NULL;
@@ -60,26 +65,37 @@ struct rpc_context *rpc_init_context(void)
 }
 
 
+struct rpc_context *rpc_init_udp_context(void)
+{
+       struct rpc_context *rpc;
+
+       rpc = rpc_init_context();
+       if (rpc != NULL) {
+               rpc->is_udp = 1;
+       }
+       
+       return rpc;
+}
+
 void rpc_set_auth(struct rpc_context *rpc, struct AUTH *auth)
 {
        if (rpc->auth != NULL) {
                auth_destroy(rpc->auth);
        }
-       rpc->auth = auth;
+       rpc->auth = (AUTH *)auth;
 }
 
 
 void rpc_set_error(struct rpc_context *rpc, char *error_string, ...)
 {
         va_list ap;
-       char *str;
 
        if (rpc->error_string != NULL) {
                free(rpc->error_string);
        }
         va_start(ap, error_string);
-       vasprintf(&str, error_string, ap);
-       rpc->error_string = str;
+       rpc->error_string = malloc(1024);
+       vsnprintf(rpc->error_string, 1024, error_string, ap);
         va_end(ap);
 }
 
@@ -124,7 +140,11 @@ void rpc_destroy_context(struct rpc_context *rpc)
        rpc->auth =NULL;
 
        if (rpc->fd != -1) {
-               close(rpc->fd);
+#if defined(WIN32)
+               closesocket(rpc->fd);
+#else
+               close(rpc->fd);
+#endif
        }
 
        if (rpc->encodebuf != NULL) {
@@ -137,6 +157,11 @@ void rpc_destroy_context(struct rpc_context *rpc)
                rpc->error_string = NULL;
        }
 
+       if (rpc->udp_dest != NULL) {
+               free(rpc->udp_dest);
+               rpc->udp_dest = NULL;
+       }
+
        free(rpc);
 }