about summary refs log tree commit diff
path: root/inet
diff options
context:
space:
mode:
Diffstat (limited to 'inet')
-rw-r--r--inet/getnameinfo.c6
-rw-r--r--inet/getnetgrent_r.c2
-rw-r--r--inet/inet_ntoa.c3
-rw-r--r--inet/rcmd.c58
-rw-r--r--inet/rexec.c36
-rw-r--r--inet/ruserpass.c14
6 files changed, 60 insertions, 59 deletions
diff --git a/inet/getnameinfo.c b/inet/getnameinfo.c
index 5cfb6ded35..f31d3b9538 100644
--- a/inet/getnameinfo.c
+++ b/inet/getnameinfo.c
@@ -102,7 +102,7 @@ nrl_domainname (void)
 	    {
 	      /* The name contains no domain information.  Use the name
 		 now to get more information.  */
-	      while (gethostname (tmpbuf, tmpbuflen))
+	      while (__gethostname (tmpbuf, tmpbuflen))
 		{
 		  tmpbuflen *= 2;
 		  tmpbuf = alloca (tmpbuflen);
@@ -337,8 +337,8 @@ getnameinfo (const struct sockaddr *sa, socklen_t addrlen, char *host,
 		break;
 	      }
 	  }
-	snprintf (serv, servlen, "%d",
-		  ntohs (((struct sockaddr_in *) sa)->sin_port));
+	__snprintf (serv, servlen, "%d",
+		    ntohs (((struct sockaddr_in *) sa)->sin_port));
 	break;
 
       case AF_LOCAL:
diff --git a/inet/getnetgrent_r.c b/inet/getnetgrent_r.c
index 5b2b241195..a04a47712a 100644
--- a/inet/getnetgrent_r.c
+++ b/inet/getnetgrent_r.c
@@ -319,7 +319,7 @@ innetgr (const char *netgroup, const char *host, const char *user,
 	  struct __netgrent entry;
 
 	  /* Clear the space for the netgroup data.  */
-	  bzero (&entry, sizeof (entry));
+	  __bzero (&entry, sizeof (entry));
 
 	  /* Open netgroup.  */
 	  status = (*setfct) (current_group, &entry);
diff --git a/inet/inet_ntoa.c b/inet/inet_ntoa.c
index d895a59ebf..d9c3153aba 100644
--- a/inet/inet_ntoa.c
+++ b/inet/inet_ntoa.c
@@ -70,7 +70,8 @@ inet_ntoa (struct in_addr in)
     }
 
   bytes = (unsigned char *) ∈
-  snprintf (buffer, 18, "%d.%d.%d.%d", bytes[0], bytes[1], bytes[2], bytes[3]);
+  __snprintf (buffer, 18, "%d.%d.%d.%d",
+	      bytes[0], bytes[1], bytes[2], bytes[3]);
 
   return buffer;
 }
diff --git a/inet/rcmd.c b/inet/rcmd.c
index e54d894f84..c734f2721f 100644
--- a/inet/rcmd.c
+++ b/inet/rcmd.c
@@ -76,7 +76,7 @@ rcmd(ahost, rport, locuser, remuser, cmd, fd2p)
 	char c;
 	int herr;
 
-	pid = getpid();
+	pid = __getpid();
 
 	hstbuflen = 1024;
 	tmphstbuf = __alloca (hstbuflen);
@@ -99,7 +99,7 @@ rcmd(ahost, rport, locuser, remuser, cmd, fd2p)
 	pfd[1].events = POLLIN;
 
 	*ahost = hp->h_name;
-	oldmask = sigblock(sigmask(SIGURG));
+	oldmask = __sigblock(sigmask(SIGURG));
 	for (timo = 1, lport = IPPORT_RESERVED - 1;;) {
 		s = rresvport(&lport);
 		if (s < 0) {
@@ -108,23 +108,23 @@ rcmd(ahost, rport, locuser, remuser, cmd, fd2p)
 				    _("rcmd: socket: All ports in use\n"));
 			else
 				(void)fprintf(stderr, "rcmd: socket: %m\n");
-			sigsetmask(oldmask);
+			__sigsetmask(oldmask);
 			return -1;
 		}
-		fcntl(s, F_SETOWN, pid);
+		__fcntl(s, F_SETOWN, pid);
 		sin.sin_family = hp->h_addrtype;
 		bcopy(hp->h_addr_list[0], &sin.sin_addr,
 		      MIN (sizeof (sin.sin_addr), hp->h_length));
 		sin.sin_port = rport;
-		if (connect(s, (struct sockaddr *)&sin, sizeof(sin)) >= 0)
+		if (__connect(s, (struct sockaddr *)&sin, sizeof(sin)) >= 0)
 			break;
-		(void)close(s);
+		(void)__close(s);
 		if (errno == EADDRINUSE) {
 			lport--;
 			continue;
 		}
 		if (errno == ECONNREFUSED && timo <= 16) {
-			(void)sleep(timo);
+			(void)__sleep(timo);
 			timo *= 2;
 			continue;
 		}
@@ -143,12 +143,12 @@ rcmd(ahost, rport, locuser, remuser, cmd, fd2p)
 			continue;
 		}
 		(void)fprintf(stderr, "%s: %m\n", hp->h_name);
-		sigsetmask(oldmask);
+		__sigsetmask(oldmask);
 		return -1;
 	}
 	lport--;
 	if (fd2p == 0) {
-		write(s, "", 1);
+		__write(s, "", 1);
 		lport = 0;
 	} else {
 		char num[8];
@@ -158,11 +158,11 @@ rcmd(ahost, rport, locuser, remuser, cmd, fd2p)
 		if (s2 < 0)
 			goto bad;
 		listen(s2, 1);
-		(void)snprintf(num, sizeof(num), "%d", lport);
-		if (write(s, num, strlen(num)+1) != strlen(num)+1) {
+		(void)__snprintf(num, sizeof(num), "%d", lport);
+		if (__write(s, num, strlen(num)+1) != strlen(num)+1) {
 			(void)fprintf(stderr,
 			    _("rcmd: write (setting up stderr): %m\n"));
-			(void)close(s2);
+			(void)__close(s2);
 			goto bad;
 		}
 		pfd[0].fd = s;
@@ -175,11 +175,11 @@ rcmd(ahost, rport, locuser, remuser, cmd, fd2p)
 			else
 				(void)fprintf(stderr,
 			     _("poll: protocol failure in circuit setup\n"));
-			(void)close(s2);
+			(void)__close(s2);
 			goto bad;
 		}
 		s3 = accept(s2, (struct sockaddr *)&from, &len);
-		(void)close(s2);
+		(void)__close(s2);
 		if (s3 < 0) {
 			(void)fprintf(stderr,
 			    "rcmd: accept: %m\n");
@@ -196,30 +196,30 @@ rcmd(ahost, rport, locuser, remuser, cmd, fd2p)
 			goto bad2;
 		}
 	}
-	(void)write(s, locuser, strlen(locuser)+1);
-	(void)write(s, remuser, strlen(remuser)+1);
-	(void)write(s, cmd, strlen(cmd)+1);
-	if (read(s, &c, 1) != 1) {
+	(void)__write(s, locuser, strlen(locuser)+1);
+	(void)__write(s, remuser, strlen(remuser)+1);
+	(void)__write(s, cmd, strlen(cmd)+1);
+	if (__read(s, &c, 1) != 1) {
 		(void)fprintf(stderr,
 		    "rcmd: %s: %m\n", *ahost);
 		goto bad2;
 	}
 	if (c != 0) {
-		while (read(s, &c, 1) == 1) {
-			(void)write(STDERR_FILENO, &c, 1);
+		while (__read(s, &c, 1) == 1) {
+			(void)__write(STDERR_FILENO, &c, 1);
 			if (c == '\n')
 				break;
 		}
 		goto bad2;
 	}
-	sigsetmask(oldmask);
+	__sigsetmask(oldmask);
 	return s;
 bad2:
 	if (lport)
-		(void)close(*fd2p);
+		(void)__close(*fd2p);
 bad:
-	(void)close(s);
-	sigsetmask(oldmask);
+	(void)__close(s);
+	__sigsetmask(oldmask);
 	return -1;
 }
 
@@ -232,7 +232,7 @@ rresvport(alport)
 
 	sin.sin_family = AF_INET;
 	sin.sin_addr.s_addr = INADDR_ANY;
-	s = socket(AF_INET, SOCK_STREAM, 0);
+	s = __socket(AF_INET, SOCK_STREAM, 0);
 	if (s < 0)
 		return -1;
 	for (;;) {
@@ -240,12 +240,12 @@ rresvport(alport)
 		if (bind(s, (struct sockaddr *)&sin, sizeof(sin)) >= 0)
 			return s;
 		if (errno != EADDRINUSE) {
-			(void)close(s);
+			(void)__close(s);
 			return -1;
 		}
 		(*alport)--;
 		if (*alport == IPPORT_RESERVED/2) {
-			(void)close(s);
+			(void)__close(s);
 			__set_errno (EAGAIN);		/* close */
 			return -1;
 		}
@@ -382,7 +382,7 @@ iruserok (raddr, superuser, ruser, luser)
        /* Change effective uid while reading .rhosts.  If root and
 	  reading an NFS mounted file system, can't read files that
 	  are protected read/write owner only.  */
-       uid = geteuid ();
+       uid = __geteuid ();
        seteuid (pwd->pw_uid);
        hostf = iruserfopen (pbuf, pwd->pw_uid);
 
@@ -481,7 +481,7 @@ __icheckhost(raddr, lhost)
 
 	/* Spin through ip addresses. */
 	for (pp = hp->h_addr_list; *pp; ++pp)
-		if (!bcmp(&raddr, *pp, sizeof(u_int32_t)))
+		if (!memcmp(&raddr, *pp, sizeof(u_int32_t)))
 			return 1;
 
 	/* No match. */
diff --git a/inet/rexec.c b/inet/rexec.c
index 72df066b03..8f329b575c 100644
--- a/inet/rexec.c
+++ b/inet/rexec.c
@@ -85,7 +85,7 @@ rexec(ahost, rport, name, pass, cmd, fd2p)
 	*ahost = hp->h_name;
 	ruserpass(hp->h_name, &name, &pass);
 retry:
-	s = socket(AF_INET, SOCK_STREAM, 0);
+	s = __socket(AF_INET, SOCK_STREAM, 0);
 	if (s < 0) {
 		perror("rexec: socket");
 		return (-1);
@@ -93,10 +93,10 @@ retry:
 	sin.sin_family = hp->h_addrtype;
 	sin.sin_port = rport;
 	bcopy(hp->h_addr, (caddr_t)&sin.sin_addr, hp->h_length);
-	if (connect(s, (struct sockaddr *)&sin, sizeof(sin)) < 0) {
+	if (__connect(s, (struct sockaddr *)&sin, sizeof(sin)) < 0) {
 		if (errno == ECONNREFUSED && timo <= 16) {
-			(void) close(s);
-			sleep(timo);
+			(void) __close(s);
+			__sleep(timo);
 			timo *= 2;
 			goto retry;
 		}
@@ -104,15 +104,15 @@ retry:
 		return (-1);
 	}
 	if (fd2p == 0) {
-		(void) write(s, "", 1);
+		(void) __write(s, "", 1);
 		port = 0;
 	} else {
 		char num[32];
 		int s2, sin2len;
 
-		s2 = socket(AF_INET, SOCK_STREAM, 0);
+		s2 = __socket(AF_INET, SOCK_STREAM, 0);
 		if (s2 < 0) {
-			(void) close(s);
+			(void) __close(s);
 			return (-1);
 		}
 		listen(s2, 1);
@@ -120,15 +120,15 @@ retry:
 		if (getsockname(s2, (struct sockaddr *)&sin2, &sin2len) < 0 ||
 		  sin2len != sizeof (sin2)) {
 			perror("getsockname");
-			(void) close(s2);
+			(void) __close(s2);
 			goto bad;
 		}
 		port = ntohs((u_short)sin2.sin_port);
 		(void) sprintf(num, "%u", port);
-		(void) write(s, num, strlen(num)+1);
+		(void) __write(s, num, strlen(num)+1);
 		{ int len = sizeof (from);
 		  s3 = accept(s2, (struct sockaddr *)&from, &len);
-		  close(s2);
+		  __close(s2);
 		  if (s3 < 0) {
 			perror("accept");
 			port = 0;
@@ -137,17 +137,17 @@ retry:
 		}
 		*fd2p = s3;
 	}
-	(void) write(s, name, strlen(name) + 1);
+	(void) __write(s, name, strlen(name) + 1);
 	/* should public key encypt the password here */
-	(void) write(s, pass, strlen(pass) + 1);
-	(void) write(s, cmd, strlen(cmd) + 1);
-	if (read(s, &c, 1) != 1) {
+	(void) __write(s, pass, strlen(pass) + 1);
+	(void) __write(s, cmd, strlen(cmd) + 1);
+	if (__read(s, &c, 1) != 1) {
 		perror(*ahost);
 		goto bad;
 	}
 	if (c != 0) {
-		while (read(s, &c, 1) == 1) {
-			(void) write(2, &c, 1);
+		while (__read(s, &c, 1) == 1) {
+			(void) __write(2, &c, 1);
 			if (c == '\n')
 				break;
 		}
@@ -156,7 +156,7 @@ retry:
 	return (s);
 bad:
 	if (port)
-		(void) close(*fd2p);
-	(void) close(s);
+		(void) __close(*fd2p);
+	(void) __close(s);
 	return (-1);
 }
diff --git a/inet/ruserpass.c b/inet/ruserpass.c
index 3cdacd1625..f56931fb4b 100644
--- a/inet/ruserpass.c
+++ b/inet/ruserpass.c
@@ -105,7 +105,7 @@ ruserpass(host, aname, apass)
 			warn("%s", buf);
 		return (0);
 	}
-	if (gethostname(myname, sizeof(myname)) < 0)
+	if (__gethostname(myname, sizeof(myname)) < 0)
 		myname[0] = '\0';
 	if ((mydomain = strchr(myname, '.')) == NULL)
 		mydomain = "";
@@ -125,18 +125,18 @@ next:
 			 * or official hostname.  Also allow match of
 			 * incompletely-specified host in local domain.
 			 */
-			if (strcasecmp(host, tokval) == 0)
+			if (__strcasecmp(host, tokval) == 0)
 				goto match;
-/*			if (strcasecmp(hostname, tokval) == 0)
+/*			if (__strcasecmp(hostname, tokval) == 0)
 				goto match;
 			if ((tmp = strchr(hostname, '.')) != NULL &&
-			    strcasecmp(tmp, mydomain) == 0 &&
-			    strncasecmp(hostname, tokval, tmp-hostname) == 0 &&
+			    __strcasecmp(tmp, mydomain) == 0 &&
+			    __strncasecmp(hostname, tokval, tmp-hostname) == 0 &&
 			    tokval[tmp - hostname] == '\0')
 				goto match; */
 			if ((tmp = strchr(host, '.')) != NULL &&
-			    strcasecmp(tmp, mydomain) == 0 &&
-			    strncasecmp(host, tokval, tmp - host) == 0 &&
+			    __strcasecmp(tmp, mydomain) == 0 &&
+			    __strncasecmp(host, tokval, tmp - host) == 0 &&
 			    tokval[tmp - host] == '\0')
 				goto match;
 			continue;
generated by cgit-pink 1.4.1 (git 2.36.1) at 2024-08-01 11:54:54 +0000