X-Git-Url: https://git.piment-noir.org/?a=blobdiff_plain;f=examples%2Fnfsclient-bcast.c;h=ec19a69f958b23ed0f3c4b9949268f294f73250e;hb=6a88df2924732760074db7d3c05713ea4fa7e217;hp=89b1376aae9c9dcb1026202e732c680133ad42b3;hpb=9a96dd46d2e03d5ae3c30ef89886c31ef83ad34a;p=deb_libnfs.git

diff --git a/examples/nfsclient-bcast.c b/examples/nfsclient-bcast.c
index 89b1376..ec19a69 100644
--- a/examples/nfsclient-bcast.c
+++ b/examples/nfsclient-bcast.c
@@ -17,19 +17,47 @@
 
 /* Example program using the lowlevel raw broadcast interface.
  */
-
+#ifdef HAVE_CONFIG_H
 #include "config.h"
-#include <stdio.h>
+#endif
+
+#ifdef WIN32
+#include "win32_compat.h"
+#endif
+
+#ifdef HAVE_POLL_H
+#include <poll.h>
+#endif
+
+#ifdef HAVE_UNISTD_H
 #include <unistd.h>
+#endif
+
+#include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include <poll.h>
 #include <errno.h>
-#include <sys/socket.h>
-#include <sys/ioctl.h>
+
+#ifdef HAVE_SYS_TIME_H
 #include <sys/time.h>
+#endif
+
+#ifdef HAVE_NET_IF_H
 #include <net/if.h>
+#endif
+
+#ifdef HAVE_NETDB_H
 #include <netdb.h>
+#endif
+
+#ifdef HAVE_SYS_IOCTL_H
+#include <sys/ioctl.h>
+#endif
+
+#ifdef HAVE_SYS_SOCKET_H
+#include <sys/socket.h>
+#endif
+
 #include "libnfs.h"
 #include "libnfs-raw.h"
 #include "libnfs-private.h"
@@ -128,7 +156,7 @@ int main(int argc _U_, char *argv[] _U_)
 	ifc.ifc_buf = NULL;
 	ifc.ifc_len = size;
 
-	while (ifc.ifc_len == size) {
+	while(ifc.ifc_len > (size - sizeof(struct ifreq))) {
 		size *= 2;
 
 		free(ifc.ifc_buf);	
@@ -183,7 +211,7 @@ int main(int argc _U_, char *argv[] _U_)
 			exit(10);
 		}
 
-		if (rpc_pmap_callit_async(rpc, MOUNT_PROGRAM, 2, 0, NULL, 0, pm_cb, &data) < 0) {
+		if (rpc_pmap2_callit_async(rpc, MOUNT_PROGRAM, 2, 0, NULL, 0, pm_cb, &data) < 0) {
 			printf("Failed to set up callit function\n");
 			exit(10);
 		}