diff options
| -rw-r--r-- | contrib/telnet/telnet/commands.c | 11 | ||||
| -rw-r--r-- | crypto/telnet/telnet/commands.c | 11 | ||||
| -rw-r--r-- | usr.bin/telnet/commands.c | 11 |
3 files changed, 9 insertions, 24 deletions
diff --git a/contrib/telnet/telnet/commands.c b/contrib/telnet/telnet/commands.c index 11cc055..24e5e43 100644 --- a/contrib/telnet/telnet/commands.c +++ b/contrib/telnet/telnet/commands.c @@ -2532,8 +2532,8 @@ tn(argc, argv) goto fail; } } - printf("Trying %s...\n", sockaddr_ntop(res->ai_addr)); do { + printf("Trying %s...\n", sockaddr_ntop(res->ai_addr)); net = socket(res->ai_family, res->ai_socktype, res->ai_protocol); setuid(getuid()); if (net < 0) { @@ -2609,18 +2609,13 @@ tn(argc, argv) if (af_error != 0) while (next != NULL && next->ai_family != res->ai_family) next = next->ai_next; + warn("connect to address %s", sockaddr_ntop(res->ai_addr)); if (next != NULL) { - int oerrno = errno; - - fprintf(stderr, "telnet: connect to address %s: ", - sockaddr_ntop(res->ai_addr)); - errno = oerrno; - perror((char *)0); res = next; (void) NetClose(net); continue; } - perror("telnet: Unable to connect to remote host"); + warnx("Unable to connect to remote host"); (void) NetClose(net); goto fail; } diff --git a/crypto/telnet/telnet/commands.c b/crypto/telnet/telnet/commands.c index 11cc055..24e5e43 100644 --- a/crypto/telnet/telnet/commands.c +++ b/crypto/telnet/telnet/commands.c @@ -2532,8 +2532,8 @@ tn(argc, argv) goto fail; } } - printf("Trying %s...\n", sockaddr_ntop(res->ai_addr)); do { + printf("Trying %s...\n", sockaddr_ntop(res->ai_addr)); net = socket(res->ai_family, res->ai_socktype, res->ai_protocol); setuid(getuid()); if (net < 0) { @@ -2609,18 +2609,13 @@ tn(argc, argv) if (af_error != 0) while (next != NULL && next->ai_family != res->ai_family) next = next->ai_next; + warn("connect to address %s", sockaddr_ntop(res->ai_addr)); if (next != NULL) { - int oerrno = errno; - - fprintf(stderr, "telnet: connect to address %s: ", - sockaddr_ntop(res->ai_addr)); - errno = oerrno; - perror((char *)0); res = next; (void) NetClose(net); continue; } - perror("telnet: Unable to connect to remote host"); + warnx("Unable to connect to remote host"); (void) NetClose(net); goto fail; } diff --git a/usr.bin/telnet/commands.c b/usr.bin/telnet/commands.c index 31a3838..9ff560a 100644 --- a/usr.bin/telnet/commands.c +++ b/usr.bin/telnet/commands.c @@ -2356,8 +2356,8 @@ tn(argc, argv) goto fail; } } - printf("Trying %s...\n", sockaddr_ntop(res->ai_addr)); do { + printf("Trying %s...\n", sockaddr_ntop(res->ai_addr)); net = socket(res->ai_family, res->ai_socktype, res->ai_protocol); setuid(getuid()); if (net < 0) { @@ -2433,18 +2433,13 @@ tn(argc, argv) if (af_error != 0) while (next != NULL && next->ai_family != res->ai_family) next = next->ai_next; + warn("connect to address %s", sockaddr_ntop(res->ai_addr)); if (next != NULL) { - int oerrno = errno; - - fprintf(stderr, "telnet: connect to address %s: ", - sockaddr_ntop(res->ai_addr)); - errno = oerrno; - perror((char *)0); res = next; (void) NetClose(net); continue; } - perror("telnet: Unable to connect to remote host"); + warnx("Unable to connect to remote host"); (void) NetClose(net); goto fail; } |
