summaryrefslogtreecommitdiffstats
path: root/usr.sbin/mount_portalfs/pt_tcp.c
diff options
context:
space:
mode:
authorpeter <peter@FreeBSD.org>1997-03-11 12:40:45 +0000
committerpeter <peter@FreeBSD.org>1997-03-11 12:40:45 +0000
commit1c0f77f024b01c2df41c395b7e5afd760d0a9062 (patch)
tree8250189179b31e1866ff4aede6002aa33af8d808 /usr.sbin/mount_portalfs/pt_tcp.c
parentf461294e0761e04bbc572e265770de9410b31c41 (diff)
downloadFreeBSD-src-1c0f77f024b01c2df41c395b7e5afd760d0a9062.zip
FreeBSD-src-1c0f77f024b01c2df41c395b7e5afd760d0a9062.tar.gz
Merge from Lite2 (use new getvfsbyname() and mount(2) interface)
Diffstat (limited to 'usr.sbin/mount_portalfs/pt_tcp.c')
-rw-r--r--usr.sbin/mount_portalfs/pt_tcp.c23
1 files changed, 12 insertions, 11 deletions
diff --git a/usr.sbin/mount_portalfs/pt_tcp.c b/usr.sbin/mount_portalfs/pt_tcp.c
index 3c4962c..ea7ac31 100644
--- a/usr.sbin/mount_portalfs/pt_tcp.c
+++ b/usr.sbin/mount_portalfs/pt_tcp.c
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1992, 1993
+ * Copyright (c) 1992, 1993, 1994
* The Regents of the University of California. All rights reserved.
* All rights reserved.
*
@@ -34,9 +34,9 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * @(#)pt_tcp.c 8.3 (Berkeley) 3/27/94
+ * @(#)pt_tcp.c 8.5 (Berkeley) 4/28/95
*
- * $Id$
+ * $Id: pt_tcp.c,v 1.4 1997/02/22 14:32:56 peter Exp $
*/
#include <stdio.h>
@@ -62,11 +62,11 @@
* An unrecognised suffix is an error.
*/
int portal_tcp(pcr, key, v, kso, fdp)
-struct portal_cred *pcr;
-char *key;
-char **v;
-int kso;
-int *fdp;
+ struct portal_cred *pcr;
+ char *key;
+ char **v;
+ int kso;
+ int *fdp;
{
char host[MAXHOSTNAMELEN];
char port[MAXHOSTNAMELEN];
@@ -125,15 +125,16 @@ int *fdp;
if (sp != NULL)
s_port = (u_short)sp->s_port;
else {
- s_port = htons ((u_short)strtol (port, (char**)NULL, 10));
- if (s_port == 0)
+ s_port = strtoul(port, &p, 0);
+ if (s_port == 0 || *p != '\0')
return (EINVAL);
+ s_port = htons(s_port);
}
#ifdef DEBUG
printf ("port number for %s is %d\n", port, s_port);
#endif
- bzero(&sain, sizeof(sain));
+ memset(&sain, 0, sizeof(sain));
sain.sin_len = sizeof(sain);
sain.sin_family = AF_INET;
sain.sin_port = s_port;
OpenPOWER on IntegriCloud