X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=utils%2Fshowmount%2Fshowmount.c;h=4e10a292846c50610ab636e2b2c6e618ec66d95b;hb=a4b10d48a730fbc6ff62197facddccdf7e204610;hp=9979621e3c3a26d4cbcd2e994cfb3c71b0a8ece2;hpb=a68d983fb3b571720eb94f68d56e8849583a2a21;p=nfs-utils.git

diff --git a/utils/showmount/showmount.c b/utils/showmount/showmount.c
index 9979621..4e10a29 100644
--- a/utils/showmount/showmount.c
+++ b/utils/showmount/showmount.c
@@ -62,16 +62,14 @@ static struct option longopts[] =
 
 #define MAXHOSTLEN 256
 
-int dump_cmp(p, q)
-char **p;
-char **q;
+static int dump_cmp(const void *pv, const void *qv)
 {
+	const char **p = (const char **)pv;
+	const char **q = (const char **)qv;
 	return strcmp(*p, *q);
 }
 
-static void usage(fp, n)
-FILE *fp;
-int n;
+static void usage(FILE *fp, int n)
 {
 	fprintf(fp, "Usage: %s [-adehv]\n", program_name);
 	fprintf(fp, "       [--all] [--directories] [--exports]\n");
@@ -118,7 +116,7 @@ static int connect_nb(int fd, struct sockaddr_in *addr, struct timeval *tout)
 	FD_ZERO(&rset);
 	FD_SET(fd, &rset);
 
-	ret = select(fd + 1, &rset, NULL, NULL, tout);
+	ret = select(fd + 1, NULL, &rset, NULL, tout);
 	if (ret <= 0) {
 		if (ret == 0)
 			ret = -ETIMEDOUT;
@@ -185,6 +183,9 @@ static unsigned short getport(struct sockaddr_in *addr,
 			rpc_createerr.cf_error.re_errno = errno;
 			return 0;
 		}
+		client = clnttcp_create(&saddr,
+					PMAPPROG, PMAPVERS, &sock,
+					0, 0);
 	} else {
 		/*
 		 * bind to any unused port.  If we left this up to the rpc
@@ -213,10 +214,10 @@ static unsigned short getport(struct sockaddr_in *addr,
 			sock = RPC_ANYSOCK;
 			/* FALLTHROUGH */
 		}
+		client = clntudp_bufcreate(&saddr, PMAPPROG, PMAPVERS,
+					   tout, &sock, send_sz, recv_sz);
 	}
 
-	client = clntudp_bufcreate(&saddr, PMAPPROG, PMAPVERS,
-				   tout, &sock, send_sz, recv_sz);
 	if (!client) {
 		close(sock);
 		rpc_createerr.cf_stat = RPC_RPCBFAILURE;
@@ -246,9 +247,7 @@ static unsigned short getport(struct sockaddr_in *addr,
 	return htons(port);
 }
 
-int main(argc, argv)
-int argc;
-char **argv;
+int main(int argc, char **argv)
 {
 	char hostname_buf[MAXHOSTLEN];
 	char *hostname;