X-Git-Url: https://git.decadent.org.uk/gitweb/?p=nfs-utils.git;a=blobdiff_plain;f=utils%2Fshowmount%2Fshowmount.c;h=213a573613c3215314e71543e9d762ad012f8f30;hp=f3ac671c9308f08df356226c6fda10596db6eccd;hb=7f6ca07a8836dbdf30a227580441b99607639fd4;hpb=66d8e2870b8d3e91c27a66ebc85e012a3cda9c69

diff --git a/utils/showmount/showmount.c b/utils/showmount/showmount.c
index f3ac671..213a573 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,8 @@ int n;
  *
  *  tout contains the timeout.  It will be modified to contain the time
  *  remaining (i.e. time provided - time elasped).
+ *
+ *  Returns 0 for success 
  */
 static int connect_nb(int fd, struct sockaddr_in *addr, struct timeval *tout)
 {
@@ -179,7 +179,7 @@ static unsigned short getport(struct sockaddr_in *addr,
 		tout.tv_sec = TIMEOUT_TCP;
 
 		ret = connect_nb(sock, &saddr, &tout);
-		if (ret == -1) {
+		if (ret < 0) {
 			close(sock);
 			rpc_createerr.cf_stat = RPC_SYSTEMERROR;
 			rpc_createerr.cf_error.re_errno = errno;
@@ -242,6 +242,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);
@@ -249,9 +251,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;
@@ -354,7 +354,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);
@@ -368,7 +368,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;