diff options
author | Theo de Raadt <deraadt@cvs.openbsd.org> | 2003-06-26 21:59:12 +0000 |
---|---|---|
committer | Theo de Raadt <deraadt@cvs.openbsd.org> | 2003-06-26 21:59:12 +0000 |
commit | ef38a0e957c4e18974e4f95e9ca96458e557c58f (patch) | |
tree | faf2c38d4d78ee3f7c34405b2d21f433984fca46 /usr.bin/nc/netcat.c | |
parent | f1352fa502cddfd41ce2f093a0b44a482e6ec5ad (diff) |
more proto fixes
Diffstat (limited to 'usr.bin/nc/netcat.c')
-rw-r--r-- | usr.bin/nc/netcat.c | 16 |
1 files changed, 11 insertions, 5 deletions
diff --git a/usr.bin/nc/netcat.c b/usr.bin/nc/netcat.c index 0f7f3e2cff7..84f131091a7 100644 --- a/usr.bin/nc/netcat.c +++ b/usr.bin/nc/netcat.c @@ -1,4 +1,4 @@ -/* $OpenBSD: netcat.c,v 1.58 2003/06/10 22:20:48 deraadt Exp $ */ +/* $OpenBSD: netcat.c,v 1.59 2003/06/26 21:59:11 deraadt Exp $ */ /* * Copyright (c) 2001 Eric Jackson <ericj@monkey.org> * @@ -76,7 +76,7 @@ int timeout = -1; int family = AF_UNSPEC; char *portlist[PORT_MAX]; -ssize_t atomicio(ssize_t (*)(), int, void *, size_t); +ssize_t atomicio(ssize_t (*)(int, void *, size_t), int, void *, size_t); void atelnet(int, unsigned char *, unsigned int); void build_ports(char *); void help(void); @@ -569,7 +569,9 @@ readwrite(int nfd) } else { if (tflag) atelnet(nfd, buf, n); - if ((ret = atomicio(write, lfd, buf, n)) != n) + if ((ret = atomicio( + (ssize_t (*)(int, void *, size_t))write, + lfd, buf, n)) != n) return; } } @@ -582,7 +584,9 @@ readwrite(int nfd) pfd[1].fd = -1; pfd[1].events = 0; } else { - if((ret = atomicio(write, nfd, buf, n)) != n) + if((ret = atomicio( + (ssize_t (*)(int, void *, size_t))write, + nfd, buf, n)) != n) return; } } @@ -614,7 +618,9 @@ atelnet(int nfd, unsigned char *buf, unsigned int size) p++; obuf[2] = *p; obuf[3] = '\0'; - if ((ret = atomicio(write , nfd, obuf, 3)) != 3) + if ((ret = atomicio( + (ssize_t (*)(int, void *, size_t))write, + nfd, obuf, 3)) != 3) warnx("Write Error!"); obuf[0] = '\0'; } |