55 *
66 * Copyright (c) 1994, Regents of the University of California
77 *
8- * $Id: pqcomm.c,v 1.61 1999/01/12 12:49:51 scrappy Exp $
8+ * $Id: pqcomm.c,v 1.62 1999/01/17 03:10:23 tgl Exp $
99 *
1010 *-------------------------------------------------------------------------
1111 */
@@ -102,16 +102,11 @@ int
102102pq_getchar (void )
103103{
104104char c ;
105- char isDone = 0 ;
106105
107- do {
108- if (recv (MyProcPort -> sock ,& c ,1 ,MSG_WAITALL )!= 1 ) {
106+ while (recv (MyProcPort -> sock ,& c ,1 ,0 )!= 1 ) {
109107if (errno != EINTR )
110- return EOF ;/* Not interrupted, so something went wrong */
111- }
112- else
113- isDone = 1 ;
114- }while (!isDone );
108+ return EOF ;/* Not interrupted, so something went wrong */
109+ }
115110
116111return c ;
117112}
@@ -123,17 +118,12 @@ pq_getchar(void)
123118int
124119pq_peekchar (void ) {
125120char c ;
126- char isDone = 0 ;
127121
128- do {
129- if (recv (MyProcPort -> sock ,& c ,1 ,MSG_WAITALL |MSG_PEEK )!= 1 ) {
122+ while (recv (MyProcPort -> sock ,& c ,1 ,MSG_PEEK )!= 1 ) {
130123if (errno != EINTR )
131- return EOF ;/* Not interrupted, so something went wrong */
132- }
133- else
134- isDone = 1 ;
135- }while (!isDone );
136-
124+ return EOF ;/* Not interrupted, so something went wrong */
125+ }
126+
137127return c ;
138128}
139129
@@ -568,14 +558,10 @@ StreamServerPort(char *hostName, short portName, int *fdP)
568558int
569559StreamConnection (int server_fd ,Port * port )
570560{
571- int len ;
572561SOCKET_SIZE_TYPE addrlen ;
573- int family = port -> raddr .sa .sa_family ;
574562
575563/* accept connection (and fill in the client (remote) address) */
576- len = family == AF_INET ?
577- sizeof (struct sockaddr_in ) :sizeof (struct sockaddr_un );
578- addrlen = len ;
564+ addrlen = sizeof (port -> raddr );
579565if ((port -> sock = accept (server_fd ,
580566 (struct sockaddr * )& port -> raddr ,
581567& addrlen ))< 0 )
@@ -585,14 +571,16 @@ StreamConnection(int server_fd, Port *port)
585571}
586572
587573/* fill in the server (local) address */
588- addrlen = len ;
574+ addrlen = sizeof ( port -> laddr ) ;
589575if (getsockname (port -> sock , (struct sockaddr * )& port -> laddr ,
590576& addrlen )< 0 )
591577{
592578elog (ERROR ,"postmaster: StreamConnection: getsockname: %m" );
593579return STATUS_ERROR ;
594580}
595- if (family == AF_INET )
581+
582+ /* select TCP_NODELAY option if it's a TCP connection */
583+ if (port -> laddr .sa .sa_family == AF_INET )
596584{
597585struct protoent * pe ;
598586int on = 1 ;