tyler.durden
/
openssh-portable
mirror of https://github.com/PowerShell/openssh-portable.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

portability fixes for regress/netcat.c 

Mostly avoiding "err(1, NULL)"
This commit is contained in:
Damien Miller 2015-02-28 08:20:11 -08:00
parent 02973ad5f6
commit e47536ba96
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
regress/netcat.c
View File

@ -269,7 +269,7 @@ main(int argc, char *argv[])
case 'x': case 'x':
xflag = 1; xflag = 1;
if ((proxy = strdup(optarg)) == NULL) if ((proxy = strdup(optarg)) == NULL)
err(1, NULL); errx(1, "strdup");
break; break;
case 'z': case 'z':
zflag = 1; zflag = 1;
@ -404,7 +404,7 @@ main(int argc, char *argv[])
if (family != AF_UNIX) if (family != AF_UNIX)
s = local_listen(host, uport, hints); s = local_listen(host, uport, hints);
if (s < 0) if (s < 0)
err(1, NULL); err(1, "local_listen");
/* /*
* For UDP and -k, don't connect the socket, let it * For UDP and -k, don't connect the socket, let it
* receive datagrams from multiple socket pairs. * receive datagrams from multiple socket pairs.
@ -629,7 +629,7 @@ remote_connect(const char *host, const char *port, struct addrinfo hints)
{ {
struct addrinfo *res, *res0; struct addrinfo *res, *res0;
int s, error; int s, error;
#ifdef SO_RTABLE #if defined(SO_RTABLE) || defined(SO_BINDANY)
int on = 1; int on = 1;
#endif #endif
@ -762,7 +762,7 @@ local_listen(char *host, char *port, struct addrinfo hints)
#ifdef SO_REUSEPORT #ifdef SO_REUSEPORT
ret = setsockopt(s, SOL_SOCKET, SO_REUSEPORT, &x, sizeof(x)); ret = setsockopt(s, SOL_SOCKET, SO_REUSEPORT, &x, sizeof(x));
if (ret == -1) if (ret == -1)
err(1, NULL); err(1, "setsockopt");
#endif #endif
set_common_sockopts(s); set_common_sockopts(s);
@ -1137,7 +1137,7 @@ build_ports(char *p)
for (cp = lo; cp <= hi; cp++) { for (cp = lo; cp <= hi; cp++) {
portlist[x] = calloc(1, PORT_MAX_LEN); portlist[x] = calloc(1, PORT_MAX_LEN);
if (portlist[x] == NULL) if (portlist[x] == NULL)
err(1, NULL); errx(1, "calloc");
snprintf(portlist[x], PORT_MAX_LEN, "%d", cp); snprintf(portlist[x], PORT_MAX_LEN, "%d", cp);
x++; x++;
} }
@ -1160,7 +1160,7 @@ build_ports(char *p)
errx(1, "port number %s: %s", errstr, p); errx(1, "port number %s: %s", errstr, p);
portlist[0] = strdup(p); portlist[0] = strdup(p);
if (portlist[0] == NULL) if (portlist[0] == NULL)
err(1, NULL); errx(1, "strdup");
} }
} }
@ -1192,13 +1192,13 @@ set_common_sockopts(int s)
if (Sflag) { if (Sflag) {
if (setsockopt(s, IPPROTO_TCP, TCP_MD5SIG, if (setsockopt(s, IPPROTO_TCP, TCP_MD5SIG,
&x, sizeof(x)) == -1) &x, sizeof(x)) == -1)
err(1, NULL); err(1, "setsockopt");
} }
#endif #endif
if (Dflag) { if (Dflag) {
if (setsockopt(s, SOL_SOCKET, SO_DEBUG, if (setsockopt(s, SOL_SOCKET, SO_DEBUG,
&x, sizeof(x)) == -1) &x, sizeof(x)) == -1)
err(1, NULL); err(1, "setsockopt");
} }
if (Tflag != -1) { if (Tflag != -1) {
if (setsockopt(s, IPPROTO_IP, IP_TOS, if (setsockopt(s, IPPROTO_IP, IP_TOS,