#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");
*
* 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)
{
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;
rpc_createerr.cf_stat = status;
clnt_destroy(client);
return 0;
+ } else if (port == 0) {
+ rpc_createerr.cf_stat = RPC_PROGNOTREGISTERED;
}
clnt_destroy(client);
return htons(port);
}
-int main(argc, argv)
-int argc;
-char **argv;
+int main(int argc, char **argv)
{
char hostname_buf[MAXHOSTLEN];
char *hostname;
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);
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;