Index: head/usr.bin/talk/ctl_transact.c =================================================================== --- head/usr.bin/talk/ctl_transact.c (revision 296053) +++ head/usr.bin/talk/ctl_transact.c (revision 296054) @@ -1,111 +1,105 @@ /* * Copyright (c) 1983, 1993 * The Regents of the University of California. All rights reserved. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions * are met: * 1. Redistributions of source code must retain the above copyright * notice, this list of conditions and the following disclaimer. * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. * 4. Neither the name of the University nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. * * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. */ #include __FBSDID("$FreeBSD$"); #ifndef lint static const char sccsid[] = "@(#)ctl_transact.c 8.1 (Berkeley) 6/6/93"; #endif #include #include +#include #include "talk.h" #include "talk_ctl.h" #define CTL_WAIT 2 /* time to wait for a response, in seconds */ /* * SOCKDGRAM is unreliable, so we must repeat messages if we have * not received an acknowledgement within a reasonable amount * of time */ void ctl_transact(struct in_addr target, CTL_MSG lmsg, int type, CTL_RESPONSE *rp) { - fd_set read_mask, ctl_mask; + struct pollfd pfd[1]; int nready = 0, cc; - struct timeval wait; lmsg.type = type; daemon_addr.sin_addr = target; daemon_addr.sin_port = daemon_port; - FD_ZERO(&ctl_mask); - FD_SET(ctl_sockt, &ctl_mask); + pfd[0].fd = ctl_sockt; + pfd[0].events = POLLIN; /* * Keep sending the message until a response of * the proper type is obtained. */ do { - wait.tv_sec = CTL_WAIT; - wait.tv_usec = 0; /* resend message until a response is obtained */ do { cc = sendto(ctl_sockt, (char *)&lmsg, sizeof (lmsg), 0, (struct sockaddr *)&daemon_addr, sizeof (daemon_addr)); if (cc != sizeof (lmsg)) { if (errno == EINTR) continue; p_error("Error on write to talk daemon"); } - read_mask = ctl_mask; - nready = select(32, &read_mask, 0, 0, &wait); + nready = poll(pfd, 1, CTL_WAIT * 1000); if (nready < 0) { if (errno == EINTR) continue; p_error("Error waiting for daemon response"); } } while (nready == 0); /* * Keep reading while there are queued messages * (this is not necessary, it just saves extra * request/acknowledgements being sent) */ do { cc = recv(ctl_sockt, (char *)rp, sizeof (*rp), 0); if (cc < 0) { if (errno == EINTR) continue; p_error("Error on read from talk daemon"); } - read_mask = ctl_mask; - /* an immediate poll */ - timerclear(&wait); - nready = select(32, &read_mask, 0, 0, &wait); + nready = poll(pfd, 1, 0); } while (nready > 0 && (rp->vers != TALK_VERSION || rp->type != type)); } while (rp->vers != TALK_VERSION || rp->type != type); rp->id_num = ntohl(rp->id_num); rp->addr.sa_family = ntohs(rp->addr.sa_family); } Index: head/usr.bin/talk/io.c =================================================================== --- head/usr.bin/talk/io.c (revision 296053) +++ head/usr.bin/talk/io.c (revision 296054) @@ -1,175 +1,177 @@ /* * Copyright (c) 1983, 1993 * The Regents of the University of California. All rights reserved. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions * are met: * 1. Redistributions of source code must retain the above copyright * notice, this list of conditions and the following disclaimer. * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. * 4. Neither the name of the University nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. * * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. */ #include __FBSDID("$FreeBSD$"); #ifndef lint static const char sccsid[] = "@(#)io.c 8.1 (Berkeley) 6/6/93"; #endif /* * This file contains the I/O handling and the exchange of * edit characters. This connection itself is established in * ctl.c */ #include #include #include #include +#include #include #include #include #include #define _XOPEN_SOURCE_EXTENDED #include #include "talk.h" #include "talk_ctl.h" extern void display(xwin_t *, wchar_t *); volatile sig_atomic_t gotwinch = 0; /* * The routine to do the actual talking */ void talk(void) { struct hostent *hp, *hp2; + struct pollfd fds[2]; int nb; - fd_set read_set; wchar_t buf[BUFSIZ]; char **addr, *his_machine_name; FILE *sockfp; his_machine_name = NULL; hp = gethostbyaddr((const char *)&his_machine_addr.s_addr, sizeof(his_machine_addr.s_addr), AF_INET); if (hp != NULL) { hp2 = gethostbyname(hp->h_name); if (hp2 != NULL && hp2->h_addrtype == AF_INET && hp2->h_length == sizeof(his_machine_addr)) for (addr = hp2->h_addr_list; *addr != NULL; addr++) if (memcmp(*addr, &his_machine_addr, sizeof(his_machine_addr)) == 0) { his_machine_name = strdup(hp->h_name); break; } } if (his_machine_name == NULL) his_machine_name = strdup(inet_ntoa(his_machine_addr)); snprintf((char *)buf, sizeof(buf), "Connection established with %s@%s.", msg.r_name, his_machine_name); free(his_machine_name); message((char *)buf); write(STDOUT_FILENO, "\007\007\007", 3); current_line = 0; if ((sockfp = fdopen(sockt, "w+")) == NULL) p_error("fdopen"); setvbuf(sockfp, NULL, _IONBF, 0); setvbuf(stdin, NULL, _IONBF, 0); /* * Wait on both the other process (sockt) and standard input. */ for (;;) { - FD_ZERO(&read_set); - FD_SET(sockt, &read_set); - FD_SET(fileno(stdin), &read_set); - nb = select(32, &read_set, 0, 0, NULL); + fds[0].fd = fileno(stdin); + fds[0].events = POLLIN; + fds[1].fd = sockt; + fds[1].events = POLLIN; + nb = poll(fds, 2, INFTIM); if (gotwinch) { resize_display(); gotwinch = 0; } if (nb <= 0) { if (errno == EINTR) continue; /* Panic, we don't know what happened. */ - p_error("Unexpected error from select"); + p_error("Unexpected error from poll"); quit(); } - if (FD_ISSET(sockt, &read_set)) { + if (fds[1].revents & POLLIN) { wint_t w; /* There is data on sockt. */ w = fgetwc(sockfp); if (w == WEOF) { message("Connection closed. Exiting"); quit(); } display(&his_win, &w); } - if (FD_ISSET(fileno(stdin), &read_set)) { + if (fds[0].revents & POLLIN) { wint_t w; if ((w = getwchar()) != WEOF) { display(&my_win, &w); (void )fputwc(w, sockfp); (void )fflush(sockfp); } } } } /* * p_error prints the system error message on the standard location * on the screen and then exits. (i.e. a curses version of perror) */ void p_error(const char *string) { wmove(my_win.x_win, current_line, 0); wprintw(my_win.x_win, "[%s : %s (%d)]\n", string, strerror(errno), errno); wrefresh(my_win.x_win); move(LINES-1, 0); refresh(); quit(); } /* * Display string in the standard location */ void message(const char *string) { wmove(my_win.x_win, current_line, 0); wprintw(my_win.x_win, "[%s]\n", string); if (current_line < my_win.x_nlines - 1) current_line++; wrefresh(my_win.x_win); }