Clean up connect_nb() in the showmount command.
Sometimes it returns -1 on error, and sometimes a negative errno. On error,
it should always return one of these or the other, not both.
Similar functions in other parts of nfs-utils return -1 on error, and set
errno; so let's do that here too.
Signed-off-by: Chuck Lever <[email protected]>
---
utils/showmount/showmount.c | 22 ++++++++++++----------
1 files changed, 12 insertions(+), 10 deletions(-)
diff --git a/utils/showmount/showmount.c b/utils/showmount/showmount.c
index b6cea92..6acd7e6 100644
--- a/utils/showmount/showmount.c
+++ b/utils/showmount/showmount.c
@@ -83,7 +83,8 @@ static void usage(FILE *fp, 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
+ * 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;
}
@@ -121,9 +122,8 @@ static int connect_nb(int fd, struct sockaddr_in *addr, struct timeval *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) {
+ errno = ret;
+ ret = -1;
+ }
}
done:
@@ -179,10 +181,10 @@ static unsigned short getport(struct sockaddr_in *addr,
tout.tv_sec = TIMEOUT_TCP;
ret = connect_nb(sock, &saddr, &tout);
- if (ret < 0) {
- 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,