diff options
| author | Robert Haas | 2011-02-04 20:52:21 +0000 |
|---|---|---|
| committer | Robert Haas | 2011-02-04 20:52:21 +0000 |
| commit | b1e65c32168a2b64276a57be8c4dc5a63d33e12d (patch) | |
| tree | 3ec244f7fad20bd370c263538f9eac6384360324 /src/port | |
| parent | b157a1d5554d6dfbd13fb605f08d51ce17532375 (diff) | |
Move pipe.c into the backend.
It's full of backend-specific error reporting, so it's neither possible
nor necessary for this to be used from frontend code.
Diffstat (limited to 'src/port')
| -rw-r--r-- | src/port/Makefile | 4 | ||||
| -rw-r--r-- | src/port/pipe.c | 99 |
2 files changed, 0 insertions, 103 deletions
diff --git a/src/port/Makefile b/src/port/Makefile index c005140f83f..60295dcdefd 100644 --- a/src/port/Makefile +++ b/src/port/Makefile @@ -34,10 +34,6 @@ OBJS = $(LIBOBJS) chklocale.o dirmod.o exec.o inet_net_ntop.o noblock.o \ path.o pgcheckdir.o pgmkdirp.o pgsleep.o pgstrcasecmp.o \ qsort.o qsort_arg.o sprompt.o thread.o -ifneq (,$(filter $(PORTNAME),cygwin win32)) -OBJS += pipe.o -endif - # foo_srv.o and foo.o are both built from foo.c, but only foo.o has -DFRONTEND OBJS_SRV = $(OBJS:%.o=%_srv.o) diff --git a/src/port/pipe.c b/src/port/pipe.c deleted file mode 100644 index 95839c65830..00000000000 --- a/src/port/pipe.c +++ /dev/null @@ -1,99 +0,0 @@ -/*------------------------------------------------------------------------- - * - * pipe.c - * pipe() - * - * Copyright (c) 1996-2011, PostgreSQL Global Development Group - * - * This is a replacement version of pipe for Win32 which allows - * returned handles to be used in select(). Note that read/write calls - * must be replaced with recv/send. - * - * IDENTIFICATION - * src/port/pipe.c - * - *------------------------------------------------------------------------- - */ - -#ifndef FRONTEND -#include "postgres.h" -#else -#include "postgres_fe.h" -#endif - -#ifdef WIN32 -int -pgpipe(int handles[2]) -{ - SOCKET s; - struct sockaddr_in serv_addr; - int len = sizeof(serv_addr); - - handles[0] = handles[1] = INVALID_SOCKET; - - if ((s = socket(AF_INET, SOCK_STREAM, 0)) == INVALID_SOCKET) - { - ereport(LOG, (errmsg_internal("pgpipe failed to create socket: %ui", WSAGetLastError()))); - return -1; - } - - memset((void *) &serv_addr, 0, sizeof(serv_addr)); - serv_addr.sin_family = AF_INET; - serv_addr.sin_port = htons(0); - serv_addr.sin_addr.s_addr = htonl(INADDR_LOOPBACK); - if (bind(s, (SOCKADDR *) & serv_addr, len) == SOCKET_ERROR) - { - ereport(LOG, (errmsg_internal("pgpipe failed to bind: %ui", WSAGetLastError()))); - closesocket(s); - return -1; - } - if (listen(s, 1) == SOCKET_ERROR) - { - ereport(LOG, (errmsg_internal("pgpipe failed to listen: %ui", WSAGetLastError()))); - closesocket(s); - return -1; - } - if (getsockname(s, (SOCKADDR *) & serv_addr, &len) == SOCKET_ERROR) - { - ereport(LOG, (errmsg_internal("pgpipe failed to getsockname: %ui", WSAGetLastError()))); - closesocket(s); - return -1; - } - if ((handles[1] = socket(PF_INET, SOCK_STREAM, 0)) == INVALID_SOCKET) - { - ereport(LOG, (errmsg_internal("pgpipe failed to create socket 2: %ui", WSAGetLastError()))); - closesocket(s); - return -1; - } - - if (connect(handles[1], (SOCKADDR *) & serv_addr, len) == SOCKET_ERROR) - { - ereport(LOG, (errmsg_internal("pgpipe failed to connect socket: %ui", WSAGetLastError()))); - closesocket(s); - return -1; - } - if ((handles[0] = accept(s, (SOCKADDR *) & serv_addr, &len)) == INVALID_SOCKET) - { - ereport(LOG, (errmsg_internal("pgpipe failed to accept socket: %ui", WSAGetLastError()))); - closesocket(handles[1]); - handles[1] = INVALID_SOCKET; - closesocket(s); - return -1; - } - closesocket(s); - return 0; -} - - -int -piperead(int s, char *buf, int len) -{ - int ret = recv(s, buf, len, 0); - - if (ret < 0 && WSAGetLastError() == WSAECONNRESET) - /* EOF on the pipe! (win32 socket based implementation) */ - ret = 0; - return ret; -} - -#endif |
