X-Git-Url: https://git.piment-noir.org/?a=blobdiff_plain;f=lib%2Fsocket.c;h=6f626529be9a2c3d6c7b982a648e9edf806d2e2d;hb=099be710b67ac221279f7d69c5c902206f69f587;hp=413ebbe4c8e4009cca6f0ccbc506a5a02b657014;hpb=4a2b08768a0d9ec9f5604da76f8e41263f20b821;p=deb_libnfs.git

diff --git a/lib/socket.c b/lib/socket.c
index 413ebbe..6f62652 100644
--- a/lib/socket.c
+++ b/lib/socket.c
@@ -18,7 +18,6 @@
 #include "win32_compat.h"
 #else
 #include <unistd.h>
-#include <poll.h>
 #include <arpa/inet.h>
 #include <sys/ioctl.h>
 #include <sys/socket.h>
@@ -28,14 +27,21 @@
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
+
+#ifdef AROS
+#include "aros_compat.h"
+#endif
+
+#ifdef HAVE_POLL_H
+#include <poll.h>
+#endif
+
 #include <stdio.h>
 #include <stdlib.h>
 #include <assert.h>
 #include <fcntl.h>
 #include <string.h>
 #include <errno.h>
-#include <rpc/rpc.h>
-#include <rpc/xdr.h>
 #ifdef HAVE_SYS_FILIO_H
 #include <sys/filio.h>
 #endif
@@ -43,6 +49,7 @@
 #include <sys/sockio.h>
 #endif
 #include <sys/types.h>
+#include "libnfs-zdr.h"
 #include "libnfs.h"
 #include "libnfs-raw.h"
 #include "libnfs-private.h"
@@ -97,7 +104,7 @@ int rpc_which_events(struct rpc_context *rpc)
 
 static int rpc_write_to_socket(struct rpc_context *rpc)
 {
-	int64_t count;
+	int32_t count;
 
 	assert(rpc->magic == RPC_CONTEXT_MAGIC);
 
@@ -111,11 +118,7 @@ static int rpc_write_to_socket(struct rpc_context *rpc)
 
 		total = rpc->outqueue->outdata.size;
 
-#if defined(WIN32)
 		count = send(rpc->fd, rpc->outqueue->outdata.data + rpc->outqueue->written, total - rpc->outqueue->written, 0);
-#else
-		count = write(rpc->fd, rpc->outqueue->outdata.data + rpc->outqueue->written, total - rpc->outqueue->written);
-#endif
 		if (count == -1) {
 			if (errno == EAGAIN || errno == EWOULDBLOCK) {
 				return 0;
@@ -140,7 +143,9 @@ static int rpc_read_from_socket(struct rpc_context *rpc)
 	int available;
 	int size;
 	int pdu_size;
-	int64_t count;
+	int32_t count;
+
+	assert(rpc->magic == RPC_CONTEXT_MAGIC);
 
 	assert(rpc->magic == RPC_CONTEXT_MAGIC);
 
@@ -193,11 +198,7 @@ static int rpc_read_from_socket(struct rpc_context *rpc)
 	if (rpc->inpos < 4) {
 		size = 4 - rpc->inpos;
 
-#if defined(WIN32)
 		count = recv(rpc->fd, rpc->inbuf + rpc->inpos, size, 0);
-#else
-		count = read(rpc->fd, rpc->inbuf + rpc->inpos, size);
-#endif
 		if (count == -1) {
 			if (errno == EINTR) {
 				return 0;
@@ -233,11 +234,7 @@ static int rpc_read_from_socket(struct rpc_context *rpc)
 		size = rpc->insize - rpc->inpos;
 	}
 
-#if defined(WIN32)
 	count = recv(rpc->fd, rpc->inbuf + rpc->inpos, size, 0);
-#else
-	count = read(rpc->fd, rpc->inbuf + rpc->inpos, size);
-#endif
 	if (count == -1) {
 		if (errno == EINTR) {
 			return 0;