diff options
Diffstat (limited to 'inet/rexec.c')
-rw-r--r-- | inet/rexec.c | 36 |
1 files changed, 18 insertions, 18 deletions
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); } |