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

diff --git a/utils/showmount/showmount.c b/utils/showmount/showmount.c
index 9979621..5e3e419 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");
@@ -84,6 +82,9 @@ int n;
  *
  *  tout contains the timeout.  It will be modified to contain the time
  *  remaining (i.e. time provided - time elasped).
+ *
+ *  Returns zero on success; otherwise, -1 is returned and errno is set
+ *  to reflect the nature of the error.
  */
 static int connect_nb(int fd, struct sockaddr_in *addr, struct timeval *tout)
 {
@@ -107,7 +108,7 @@ static int connect_nb(int fd, struct sockaddr_in *addr, struct timeval *tout)
 	len = sizeof(struct sockaddr);
 	ret = connect(fd, (struct sockaddr *)addr, len);
 	if (ret < 0 && errno != EINPROGRESS) {
-		ret = -errno;
+		ret = -1;
 		goto done;
 	}
 
@@ -118,12 +119,11 @@ 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;
-		else
-			ret = -errno;
+			errno = ETIMEDOUT;
+		ret = -1;
 		goto done;
 	}
 
@@ -133,13 +133,15 @@ static int connect_nb(int fd, struct sockaddr_in *addr, struct timeval *tout)
 		len = sizeof(ret);
 		status = getsockopt(fd, SOL_SOCKET, SO_ERROR, &ret, &len);
 		if (status < 0) {
-			ret = -errno;
+			ret = -1;
 			goto done;
 		}
 
 		/* Oops - something wrong with connect */
-		if (ret)
-			ret = -ret;
+		if (ret != 0) {
+			errno = ret;
+			ret = -1;
+		}
 	}
 
 done:
@@ -179,12 +181,15 @@ static unsigned short getport(struct sockaddr_in *addr,
 		tout.tv_sec = TIMEOUT_TCP;
 
 		ret = connect_nb(sock, &saddr, &tout);
-		if (ret == -1) {
-			close(sock);
+		if (ret != 0) {
 			rpc_createerr.cf_stat = RPC_SYSTEMERROR;
 			rpc_createerr.cf_error.re_errno = errno;
+			close(sock);
 			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 +218,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;
@@ -239,6 +244,8 @@ static unsigned short getport(struct sockaddr_in *addr,
 		rpc_createerr.cf_stat = status;
 		clnt_destroy(client);
 		return 0;
+	} else if (port == 0) {
+		rpc_createerr.cf_stat = RPC_PROGNOTREGISTERED;
 	}
 
 	clnt_destroy(client);
@@ -246,9 +253,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;
@@ -351,7 +356,7 @@ char **argv;
 					 MOUNTPROG, MOUNTVERS, IPPROTO_TCP);
 		if (server_addr.sin_port) {
 			ret = connect_nb(msock, &server_addr, 0);
-			if (ret != -1)
+			if (ret == 0) /* success */
 				mclient = clnttcp_create(&server_addr,
 						MOUNTPROG, MOUNTVERS, &msock,
 						0, 0);
@@ -365,7 +370,7 @@ char **argv;
 		server_addr.sin_port = getport(&server_addr,
 					 MOUNTPROG, MOUNTVERS, IPPROTO_UDP);
 		if (!server_addr.sin_port) {
-			clnt_pcreateerror("portmap getport");
+			clnt_pcreateerror("showmount");
 			exit(1);
 		}
 		msock = RPC_ANYSOCK;