diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/usr.bin/nc/atomicio.c | 2 | ||||
| -rw-r--r-- | src/usr.bin/nc/netcat.c | 16 |
2 files changed, 12 insertions, 6 deletions
diff --git a/src/usr.bin/nc/atomicio.c b/src/usr.bin/nc/atomicio.c index f404eeedd8..02289f0a2a 100644 --- a/src/usr.bin/nc/atomicio.c +++ b/src/usr.bin/nc/atomicio.c | |||
| @@ -34,7 +34,7 @@ | |||
| 34 | */ | 34 | */ |
| 35 | ssize_t | 35 | ssize_t |
| 36 | atomicio(f, fd, _s, n) | 36 | atomicio(f, fd, _s, n) |
| 37 | ssize_t (*f) (); | 37 | ssize_t (*f) (int, void *, size_t); |
| 38 | int fd; | 38 | int fd; |
| 39 | void *_s; | 39 | void *_s; |
| 40 | size_t n; | 40 | size_t n; |
diff --git a/src/usr.bin/nc/netcat.c b/src/usr.bin/nc/netcat.c index 0f7f3e2cff..84f131091a 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.58 2003/06/10 22:20:48 deraadt Exp $ */ | 1 | /* $OpenBSD: netcat.c,v 1.59 2003/06/26 21:59:11 deraadt Exp $ */ |
| 2 | /* | 2 | /* |
| 3 | * Copyright (c) 2001 Eric Jackson <ericj@monkey.org> | 3 | * Copyright (c) 2001 Eric Jackson <ericj@monkey.org> |
| 4 | * | 4 | * |
| @@ -76,7 +76,7 @@ int timeout = -1; | |||
| 76 | int family = AF_UNSPEC; | 76 | int family = AF_UNSPEC; |
| 77 | char *portlist[PORT_MAX]; | 77 | char *portlist[PORT_MAX]; |
| 78 | 78 | ||
| 79 | ssize_t atomicio(ssize_t (*)(), int, void *, size_t); | 79 | ssize_t atomicio(ssize_t (*)(int, void *, size_t), int, void *, size_t); |
| 80 | void atelnet(int, unsigned char *, unsigned int); | 80 | void atelnet(int, unsigned char *, unsigned int); |
| 81 | void build_ports(char *); | 81 | void build_ports(char *); |
| 82 | void help(void); | 82 | void help(void); |
| @@ -569,7 +569,9 @@ readwrite(int nfd) | |||
| 569 | } else { | 569 | } else { |
| 570 | if (tflag) | 570 | if (tflag) |
| 571 | atelnet(nfd, buf, n); | 571 | atelnet(nfd, buf, n); |
| 572 | if ((ret = atomicio(write, lfd, buf, n)) != n) | 572 | if ((ret = atomicio( |
| 573 | (ssize_t (*)(int, void *, size_t))write, | ||
| 574 | lfd, buf, n)) != n) | ||
| 573 | return; | 575 | return; |
| 574 | } | 576 | } |
| 575 | } | 577 | } |
| @@ -582,7 +584,9 @@ readwrite(int nfd) | |||
| 582 | pfd[1].fd = -1; | 584 | pfd[1].fd = -1; |
| 583 | pfd[1].events = 0; | 585 | pfd[1].events = 0; |
| 584 | } else { | 586 | } else { |
| 585 | if((ret = atomicio(write, nfd, buf, n)) != n) | 587 | if((ret = atomicio( |
| 588 | (ssize_t (*)(int, void *, size_t))write, | ||
| 589 | nfd, buf, n)) != n) | ||
| 586 | return; | 590 | return; |
| 587 | } | 591 | } |
| 588 | } | 592 | } |
| @@ -614,7 +618,9 @@ atelnet(int nfd, unsigned char *buf, unsigned int size) | |||
| 614 | p++; | 618 | p++; |
| 615 | obuf[2] = *p; | 619 | obuf[2] = *p; |
| 616 | obuf[3] = '\0'; | 620 | obuf[3] = '\0'; |
| 617 | if ((ret = atomicio(write , nfd, obuf, 3)) != 3) | 621 | if ((ret = atomicio( |
| 622 | (ssize_t (*)(int, void *, size_t))write, | ||
| 623 | nfd, obuf, 3)) != 3) | ||
| 618 | warnx("Write Error!"); | 624 | warnx("Write Error!"); |
| 619 | obuf[0] = '\0'; | 625 | obuf[0] = '\0'; |
| 620 | } | 626 | } |
