diff options
author | guenther <> | 2014-05-20 01:25:24 +0000 |
---|---|---|
committer | guenther <> | 2014-05-20 01:25:24 +0000 |
commit | c5dc4929a3e8bc91a204eff5b55c10ce54cec591 (patch) | |
tree | 35f3e235e477c74cd6b783d86d4b098a8b54aa11 /src/usr.bin | |
parent | 3c12c2aea2c1cdfaab42054ed8643b2bd31e4fdd (diff) | |
download | openbsd-c5dc4929a3e8bc91a204eff5b55c10ce54cec591.tar.gz openbsd-c5dc4929a3e8bc91a204eff5b55c10ce54cec591.tar.bz2 openbsd-c5dc4929a3e8bc91a204eff5b55c10ce54cec591.zip |
Use errc/warnc to simplify code.
Also, in 'ftp', always put the error message last, after the hostname/ipaddr.
ok jsing@ krw@ millert@
Diffstat (limited to 'src/usr.bin')
-rw-r--r-- | src/usr.bin/nc/netcat.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/usr.bin/nc/netcat.c b/src/usr.bin/nc/netcat.c index c120016912..1454dd7b90 100644 --- a/src/usr.bin/nc/netcat.c +++ b/src/usr.bin/nc/netcat.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: netcat.c,v 1.118 2014/03/12 10:19:40 jca Exp $ */ | 1 | /* $OpenBSD: netcat.c,v 1.119 2014/05/20 01:25:23 guenther Exp $ */ |
2 | /* | 2 | /* |
3 | * Copyright (c) 2001 Eric Jackson <ericj@monkey.org> | 3 | * Copyright (c) 2001 Eric Jackson <ericj@monkey.org> |
4 | * | 4 | * |
@@ -608,7 +608,7 @@ remote_connect(const char *host, const char *port, struct addrinfo hints) | |||
608 | 608 | ||
609 | if (bind(s, (struct sockaddr *)ares->ai_addr, | 609 | if (bind(s, (struct sockaddr *)ares->ai_addr, |
610 | ares->ai_addrlen) < 0) | 610 | ares->ai_addrlen) < 0) |
611 | errx(1, "bind failed: %s", strerror(errno)); | 611 | err(1, "bind failed"); |
612 | freeaddrinfo(ares); | 612 | freeaddrinfo(ares); |
613 | } | 613 | } |
614 | 614 | ||