]> granicus.if.org Git - postgresql/blobdiff - src/interfaces/libpq/libpq-int.h
Avoid extra system calls to block SIGPIPE if the platform provides either
[postgresql] / src / interfaces / libpq / libpq-int.h
index 019683ac2650cbe69d1ea3ce84d85e8ec105a173..d93ba4d25e230657863770f23f0f7351827e0293 100644 (file)
@@ -9,10 +9,10 @@
  *       more likely to break across PostgreSQL releases than code that uses
  *       only the official API.
  *
- * Portions Copyright (c) 1996-2002, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2009, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
- * $Id: libpq-int.h,v 1.74 2003/06/14 17:49:54 momjian Exp $
+ * $PostgreSQL: pgsql/src/interfaces/libpq/libpq-int.h,v 1.144 2009/07/24 17:58:31 tgl Exp $
  *
  *-------------------------------------------------------------------------
  */
 #ifndef LIBPQ_INT_H
 #define LIBPQ_INT_H
 
+/* We assume libpq-fe.h has already been included. */
+#include "postgres_fe.h"
+#include "libpq-events.h"
+
 #include <time.h>
 #include <sys/types.h>
 #ifndef WIN32
 #include <sys/time.h>
 #endif
 
-
-#if defined(WIN32) && (!defined(ssize_t))
-typedef int ssize_t;                   /* ssize_t doesn't exist in VC (atleast
-                                                                * not VC6) */
+#ifdef ENABLE_THREAD_SAFETY
+#ifdef WIN32
+#include "pthread-win32.h"
+#else
+#include <pthread.h>
+#endif
+#include <signal.h>
 #endif
-
-/* We assume libpq-fe.h has already been included. */
-#include "postgres_fe.h"
 
 /* include stuff common to fe and be */
 #include "getaddrinfo.h"
 #include "libpq/pqcomm.h"
-#include "lib/dllist.h"
 /* include stuff found in fe only */
 #include "pqexpbuffer.h"
 
+#ifdef ENABLE_GSS
+#if defined(HAVE_GSSAPI_H)
+#include <gssapi.h>
+#else
+#include <gssapi/gssapi.h>
+#endif
+#endif
+
+#ifdef ENABLE_SSPI
+#define SECURITY_WIN32
+#if defined(WIN32) && !defined(WIN32_ONLY_COMPILER)
+#include <ntsecapi.h>
+#endif
+#include <security.h>
+#undef SECURITY_WIN32
+
+#ifndef ENABLE_GSS
+/*
+ * Define a fake structure compatible with GSSAPI on Unix.
+ */
+typedef struct
+{
+       void       *value;
+       int                     length;
+} gss_buffer_desc;
+#endif
+#endif   /* ENABLE_SSPI */
+
 #ifdef USE_SSL
 #include <openssl/ssl.h>
 #include <openssl/err.h>
+
+#if (SSLEAY_VERSION_NUMBER >= 0x00907000L) && !defined(OPENSSL_NO_ENGINE)
+#define USE_SSL_ENGINE
 #endif
 
+#endif /* USE_SSL */
+
 /*
  * POSTGRES backend dependent Constants.
  */
-#define PQERRORMSG_LENGTH 1024
-#define CMDSTATUS_LEN 40
+#define CMDSTATUS_LEN 64               /* should match COMPLETION_TAG_BUFSIZE */
 
 /*
  * PGresult and the subsidiary types PGresAttDesc, PGresAttValue
@@ -74,15 +109,11 @@ union pgresult_data
        char            space[1];               /* dummy for accessing block as bytes */
 };
 
-/* Data about a single attribute (column) of a query result */
-
-typedef struct pgresAttDesc
+/* Data about a single parameter of a prepared statement */
+typedef struct pgresParamDesc
 {
-       char       *name;                       /* type name */
        Oid                     typid;                  /* type id */
-       int                     typlen;                 /* type size */
-       int                     atttypmod;              /* type-specific modifier info */
-}      PGresAttDesc;
+} PGresParamDesc;
 
 /*
  * Data for a single attribute of a single tuple
@@ -91,7 +122,7 @@ typedef struct pgresAttDesc
  *
  * The value pointer always points to a null-terminated area; we add a
  * null (zero) byte after whatever the backend sends us.  This is only
- * particularly useful for text tuples ... with a binary value, the
+ * particularly useful for text values ... with a binary value, the
  * value might have embedded nulls, so the application can't use C string
  * operators on it.  But we add a null anyway for consistency.
  * Note that the value itself does not contain a length word.
@@ -107,9 +138,34 @@ typedef struct pgresAttDesc
 typedef struct pgresAttValue
 {
        int                     len;                    /* length in bytes of the value */
-       char       *value;                      /* actual value, plus terminating zero
-                                                                * byte */
-}      PGresAttValue;
+       char       *value;                      /* actual value, plus terminating zero byte */
+} PGresAttValue;
+
+/* Typedef for message-field list entries */
+typedef struct pgMessageField
+{
+       struct pgMessageField *next;    /* list link */
+       char            code;                   /* field code */
+       char            contents[1];    /* field value (VARIABLE LENGTH) */
+} PGMessageField;
+
+/* Fields needed for notice handling */
+typedef struct
+{
+       PQnoticeReceiver noticeRec; /* notice message receiver */
+       void       *noticeRecArg;
+       PQnoticeProcessor noticeProc;           /* notice message processor */
+       void       *noticeProcArg;
+} PGNoticeHooks;
+
+typedef struct PGEvent
+{
+       PGEventProc proc;                       /* the function to call on events */
+       char       *name;                       /* used only for error messages */
+       void       *passThrough;        /* pointer supplied at registration time */
+       void       *data;                       /* optional state (instance) data */
+       bool            resultInitialized;              /* T if RESULTCREATE/COPY succeeded */
+} PGEvent;
 
 struct pg_result
 {
@@ -118,45 +174,36 @@ struct pg_result
        PGresAttDesc *attDescs;
        PGresAttValue **tuples;         /* each PGresTuple is an array of
                                                                 * PGresAttValue's */
-       int                     tupArrSize;             /* size of tuples array allocated */
+       int                     tupArrSize;             /* allocated size of tuples array */
+       int                     numParameters;
+       PGresParamDesc *paramDescs;
        ExecStatusType resultStatus;
-       char            cmdStatus[CMDSTATUS_LEN];               /* cmd status from the
-                                                                                                * last query */
+       char            cmdStatus[CMDSTATUS_LEN];               /* cmd status from the query */
        int                     binary;                 /* binary tuple values if binary == 1,
                                                                 * otherwise text */
 
        /*
-        * These fields are copied from the originating PGconn, so that
-        * operations on the PGresult don't have to reference the PGconn.
+        * These fields are copied from the originating PGconn, so that operations
+        * on the PGresult don't have to reference the PGconn.
         */
-       PQnoticeProcessor noticeHook;           /* notice/error message processor */
-       void       *noticeArg;
+       PGNoticeHooks noticeHooks;
+       PGEvent    *events;
+       int                     nEvents;
        int                     client_encoding;        /* encoding id */
 
        /*
         * Error information (all NULL if not an error result).  errMsg is the
-        * "overall" error message returned by PQresultErrorMessage.  If we
-        * got a field-ized error from the server then the additional fields
-        * may be set.
+        * "overall" error message returned by PQresultErrorMessage.  If we have
+        * per-field info then it is stored in a linked list.
         */
        char       *errMsg;                     /* error message, or NULL if no error */
-
-       char       *errSeverity;        /* severity code */
-       char       *errCode;            /* SQLSTATE code */
-       char       *errPrimary;         /* primary message text */
-       char       *errDetail;          /* detail text */
-       char       *errHint;            /* hint text */
-       char       *errPosition;        /* cursor position */
-       char       *errContext;         /* location information */
-       char       *errFilename;        /* source-code file name */
-       char       *errLineno;          /* source-code line number */
-       char       *errFuncname;        /* source-code function name */
+       PGMessageField *errFields;      /* message broken into fields */
 
        /* All NULL attributes in the query result point to this null string */
        char            null_field[1];
 
        /*
-        * Space management information.  Note that attDescs and errMsg, if
+        * Space management information.  Note that attDescs and error stuff, if
         * not null, point into allocated blocks.  But tuples points to a
         * separately malloc'd block, so that we can realloc it.
         */
@@ -173,7 +220,16 @@ typedef enum
        PGASYNC_READY,                          /* result ready for PQgetResult */
        PGASYNC_COPY_IN,                        /* Copy In data transfer in progress */
        PGASYNC_COPY_OUT                        /* Copy Out data transfer in progress */
-}      PGAsyncStatusType;
+} PGAsyncStatusType;
+
+/* PGQueryClass tracks which query protocol we are now executing */
+typedef enum
+{
+       PGQUERY_SIMPLE,                         /* simple Query protocol (PQexec) */
+       PGQUERY_EXTENDED,                       /* full Extended protocol (PQexecParams) */
+       PGQUERY_PREPARE,                        /* Parse only (PQprepare) */
+       PGQUERY_DESCRIBE                        /* Describe Statement or Portal */
+} PGQueryClass;
 
 /* PGSetenvStatusType defines the state of the PQSetenv state machine */
 /* (this is used only for 2.0-protocol connections) */
@@ -186,7 +242,7 @@ typedef enum
        SETENV_STATE_QUERY2_SEND,       /* About to send a status query */
        SETENV_STATE_QUERY2_WAIT,       /* Waiting for query to complete */
        SETENV_STATE_IDLE
-}      PGSetenvStatusType;
+} PGSetenvStatusType;
 
 /* Typedef for the EnvironmentOptions[] array */
 typedef struct PQEnvironmentOption
@@ -198,7 +254,7 @@ typedef struct PQEnvironmentOption
 /* Typedef for parameter-status list entries */
 typedef struct pgParameterStatus
 {
-       struct pgParameterStatus *next; /* list link */
+       struct pgParameterStatus *next;         /* list link */
        char       *name;                       /* parameter name */
        char       *value;                      /* parameter value */
        /* Note: name and value are stored in same malloc block as struct is */
@@ -210,12 +266,14 @@ typedef struct pgLobjfuncs
        Oid                     fn_lo_open;             /* OID of backend function lo_open              */
        Oid                     fn_lo_close;    /* OID of backend function lo_close             */
        Oid                     fn_lo_creat;    /* OID of backend function lo_creat             */
+       Oid                     fn_lo_create;   /* OID of backend function lo_create    */
        Oid                     fn_lo_unlink;   /* OID of backend function lo_unlink    */
        Oid                     fn_lo_lseek;    /* OID of backend function lo_lseek             */
        Oid                     fn_lo_tell;             /* OID of backend function lo_tell              */
+       Oid                     fn_lo_truncate; /* OID of backend function lo_truncate  */
        Oid                     fn_lo_read;             /* OID of backend function LOread               */
        Oid                     fn_lo_write;    /* OID of backend function LOwrite              */
-}      PGlobjfuncs;
+} PGlobjfuncs;
 
 /*
  * PGconn stores all the state data associated with a single connection
@@ -224,74 +282,91 @@ typedef struct pgLobjfuncs
 struct pg_conn
 {
        /* Saved values of connection options */
-       char       *pghost;                     /* the machine on which the server is
-                                                                * running */
-       char       *pghostaddr;         /* the IPv4 address of the machine on
-                                                                * which the server is running, in IPv4
-                                                                * numbers-and-dots notation. Takes
-                                                                * precedence over above. */
+       char       *pghost;                     /* the machine on which the server is running */
+       char       *pghostaddr;         /* the IPv4 address of the machine on which
+                                                                * the server is running, in IPv4
+                                                                * numbers-and-dots notation. Takes precedence
+                                                                * over above. */
        char       *pgport;                     /* the server's communication port */
-       char       *pgunixsocket;       /* the Unix-domain socket that the server
-                                                                * is listening on; if NULL, uses a
-                                                                * default constructed from pgport */
+       char       *pgunixsocket;       /* the Unix-domain socket that the server is
+                                                                * listening on; if NULL, uses a default
+                                                                * constructed from pgport */
        char       *pgtty;                      /* tty on which the backend messages is
                                                                 * displayed (OBSOLETE, NOT USED) */
-       char       *connect_timeout; /* connection timeout (numeric string) */
+       char       *connect_timeout;    /* connection timeout (numeric string) */
        char       *pgoptions;          /* options to start the backend with */
        char       *dbName;                     /* database name */
        char       *pguser;                     /* Postgres username and password, if any */
        char       *pgpass;
+       char       *sslmode;            /* SSL mode (require,prefer,allow,disable) */
+       char       *sslkey;                     /* client key filename */
+       char       *sslcert;            /* client certificate filename */
+       char       *sslrootcert;        /* root certificate filename */
+       char       *sslcrl;                     /* certificate revocation list filename */
+
+#if defined(KRB5) || defined(ENABLE_GSS) || defined(ENABLE_SSPI)
+       char       *krbsrvname;         /* Kerberos service name */
+#endif
 
        /* Optional file to write trace info to */
        FILE       *Pfdebug;
 
-       /* Callback procedure for notice/error message processing */
-       PQnoticeProcessor noticeHook;
-       void       *noticeArg;
+       /* Callback procedures for notice message processing */
+       PGNoticeHooks noticeHooks;
+
+       /* Event procs registered via PQregisterEventProc */
+       PGEvent    *events;                     /* expandable array of event data */
+       int                     nEvents;                /* number of active events */
+       int                     eventArraySize; /* allocated array size */
 
        /* Status indicators */
        ConnStatusType status;
        PGAsyncStatusType asyncStatus;
-       char            xact_status;    /* status flag from latest ReadyForQuery */
-       char            copy_is_binary; /* 1 = copy binary, 0 = copy text */
-       int                     copy_already_done; /* # bytes already returned in COPY OUT */
-       int                     nonblocking;    /* whether this connection is using a
-                                                                * blocking socket to the backend or not */
-       Dllist     *notifyList;         /* Notify msgs not yet handed to
-                                                                * application */
+       PGTransactionStatusType xactStatus; /* never changes to ACTIVE */
+       PGQueryClass queryclass;
+       char       *last_query;         /* last SQL command, or NULL if unknown */
+       bool            options_valid;  /* true if OK to attempt connection */
+       bool            nonblocking;    /* whether this connection is using nonblock
+                                                                * sending semantics */
+       char            copy_is_binary; /* 1 = copy binary, 0 = copy text */
+       int                     copy_already_done;              /* # bytes already returned in COPY
+                                                                                * OUT */
+       PGnotify   *notifyHead;         /* oldest unreported Notify msg */
+       PGnotify   *notifyTail;         /* newest unreported Notify msg */
 
        /* Connection data */
        int                     sock;                   /* Unix FD for socket, -1 if not connected */
        SockAddr        laddr;                  /* Local address */
        SockAddr        raddr;                  /* Remote address */
        ProtocolVersion pversion;       /* FE/BE protocol version in use */
-       char            sversion[8];    /* The first few bytes of server version */
+       int                     sversion;               /* server version, e.g. 70401 for 7.4.1 */
+       bool            password_needed;        /* true if server demanded a password */
+       bool            sigpipe_so;             /* have we masked SIGPIPE via SO_NOSIGPIPE? */
+       bool            sigpipe_flag;   /* can we mask SIGPIPE via MSG_NOSIGNAL? */
 
        /* Transient state needed while establishing connection */
        struct addrinfo *addrlist;      /* list of possible backend addresses */
        struct addrinfo *addr_cur;      /* the one currently being tried */
-       int                     addrlist_family; /* needed to know how to free addrlist */
-       PGSetenvStatusType setenv_state; /* for 2.0 protocol only */
+       int                     addrlist_family;        /* needed to know how to free addrlist */
+       PGSetenvStatusType setenv_state;        /* for 2.0 protocol only */
        const PQEnvironmentOption *next_eo;
 
        /* Miscellaneous stuff */
        int                     be_pid;                 /* PID of backend --- needed for cancels */
        int                     be_key;                 /* key of backend --- needed for cancels */
        char            md5Salt[4];             /* password salt received from backend */
-       char            cryptSalt[2];   /* password salt received from backend */
-       pgParameterStatus *pstatus;     /* ParameterStatus data */
-       int                     client_encoding; /* encoding id */
-       PGlobjfuncs *lobjfuncs;         /* private state for large-object access
-                                                                * fns */
+       pgParameterStatus *pstatus; /* ParameterStatus data */
+       int                     client_encoding;        /* encoding id */
+       bool            std_strings;    /* standard_conforming_strings */
+       PGVerbosity verbosity;          /* error/notice message verbosity */
+       PGlobjfuncs *lobjfuncs;         /* private state for large-object access fns */
 
        /* Buffer for data received from backend and not yet processed */
        char       *inBuffer;           /* currently allocated buffer */
        int                     inBufSize;              /* allocated size of buffer */
-       int                     inStart;                /* offset to first unconsumed data in
-                                                                * buffer */
+       int                     inStart;                /* offset to first unconsumed data in buffer */
        int                     inCursor;               /* next byte to tentatively consume */
-       int                     inEnd;                  /* offset to first position after avail
-                                                                * data */
+       int                     inEnd;                  /* offset to first position after avail data */
 
        /* Buffer for data not yet sent to backend */
        char       *outBuffer;          /* currently allocated buffer */
@@ -299,8 +374,8 @@ struct pg_conn
        int                     outCount;               /* number of chars waiting in buffer */
 
        /* State for constructing messages in outBuffer */
-       int                     outMsgStart;    /* offset to msg start (length word);
-                                                                * if -1, msg has no length word */
+       int                     outMsgStart;    /* offset to msg start (length word); if -1,
+                                                                * msg has no length word */
        int                     outMsgEnd;              /* offset to msg end (so far) */
 
        /* Status for asynchronous result construction */
@@ -309,12 +384,41 @@ struct pg_conn
 
 #ifdef USE_SSL
        bool            allow_ssl_try;  /* Allowed to try SSL negotiation */
-       bool            require_ssl;    /* Require SSL to make connection */
+       bool            wait_ssl_try;   /* Delay SSL negotiation until after
+                                                                * attempting normal connection */
        SSL                *ssl;                        /* SSL status, if have SSL connection */
        X509       *peer;                       /* X509 cert of server */
        char            peer_dn[256 + 1];               /* peer distinguished name */
        char            peer_cn[SM_USER + 1];   /* peer common name */
+#ifdef USE_SSL_ENGINE
+       ENGINE     *engine;                     /* SSL engine, if any */
+#else
+       void       *engine;                     /* dummy field to keep struct the same
+                                                                  if OpenSSL version changes */
 #endif
+#endif /* USE_SSL */
+
+#ifdef ENABLE_GSS
+       gss_ctx_id_t gctx;                      /* GSS context */
+       gss_name_t      gtarg_nam;              /* GSS target name */
+       gss_buffer_desc ginbuf;         /* GSS input token */
+       gss_buffer_desc goutbuf;        /* GSS output token */
+#endif
+
+#ifdef ENABLE_SSPI
+#ifndef ENABLE_GSS
+       gss_buffer_desc ginbuf;         /* GSS input token */
+#else
+       char       *gsslib;                     /* What GSS librart to use ("gssapi" or
+                                                                * "sspi") */
+#endif
+       CredHandle *sspicred;           /* SSPI credentials handle */
+       CtxtHandle *sspictx;            /* SSPI context */
+       char       *sspitarget;         /* SSPI target name */
+       int                     usesspi;                /* Indicate if SSPI is in use on the
+                                                                * connection */
+#endif
+
 
        /* Buffer for current error message */
        PQExpBufferData errorMessage;           /* expansible string */
@@ -323,6 +427,18 @@ struct pg_conn
        PQExpBufferData workBuffer; /* expansible string */
 };
 
+/* PGcancel stores all data necessary to cancel a connection. A copy of this
+ * data is required to safely cancel a connection running on a different
+ * thread.
+ */
+struct pg_cancel
+{
+       SockAddr        raddr;                  /* Remote address */
+       int                     be_pid;                 /* PID of backend --- needed for cancels */
+       int                     be_key;                 /* key of backend --- needed for cancels */
+};
+
+
 /* String descriptions of the ExecStatusTypes.
  * direct use of this array is deprecated; call PQresStatus() instead.
  */
@@ -339,8 +455,26 @@ extern char *const pgresStatus[];
 
 /* === in fe-connect.c === */
 
-extern int     pqPacketSend(PGconn *conn, char pack_type,
-                                                const void *buf, size_t buf_len);
+extern int pqPacketSend(PGconn *conn, char pack_type,
+                        const void *buf, size_t buf_len);
+extern bool pqGetHomeDirectory(char *buf, int bufsize);
+
+#ifdef ENABLE_THREAD_SAFETY
+extern pgthreadlock_t pg_g_threadlock;
+
+#define PGTHREAD_ERROR(msg) \
+       do { \
+               fprintf(stderr, "%s\n", msg); \
+               exit(1); \
+       } while (0)
+
+
+#define pglock_thread()                pg_g_threadlock(true)
+#define pgunlock_thread()      pg_g_threadlock(false)
+#else
+#define pglock_thread()                ((void) 0)
+#define pgunlock_thread()      ((void) 0)
+#endif
 
 /* === in fe-exec.c === */
 
@@ -351,10 +485,15 @@ extern char *pqResultStrdup(PGresult *res, const char *str);
 extern void pqClearAsyncResult(PGconn *conn);
 extern void pqSaveErrorResult(PGconn *conn);
 extern PGresult *pqPrepareAsyncResult(PGconn *conn);
+extern void
+pqInternalNotice(const PGNoticeHooks *hooks, const char *fmt,...)
+/* This lets gcc check the format string for consistency. */
+__attribute__((format(printf, 2, 3)));
 extern int     pqAddTuple(PGresult *res, PGresAttValue *tup);
+extern void pqSaveMessageField(PGresult *res, char code,
+                                  const char *value);
 extern void pqSaveParameterStatus(PGconn *conn, const char *name,
-                                                                 const char *value);
-extern const char *pqGetParameterStatus(PGconn *conn, const char *name);
+                                         const char *value);
 extern void pqHandleSendFailure(PGconn *conn);
 
 /* === in fe-protocol2.c === */
@@ -362,41 +501,45 @@ extern void pqHandleSendFailure(PGconn *conn);
 extern PostgresPollingStatusType pqSetenvPoll(PGconn *conn);
 
 extern char *pqBuildStartupPacket2(PGconn *conn, int *packetlen,
-                                                                  const PQEnvironmentOption *options);
+                                         const PQEnvironmentOption *options);
 extern void pqParseInput2(PGconn *conn);
+extern int     pqGetCopyData2(PGconn *conn, char **buffer, int async);
 extern int     pqGetline2(PGconn *conn, char *s, int maxlen);
 extern int     pqGetlineAsync2(PGconn *conn, char *buffer, int bufsize);
 extern int     pqEndcopy2(PGconn *conn);
 extern PGresult *pqFunctionCall2(PGconn *conn, Oid fnid,
-                                                                int *result_buf, int *actual_result_len,
-                                                                int result_is_int,
-                                                                const PQArgBlock *args, int nargs);
+                               int *result_buf, int *actual_result_len,
+                               int result_is_int,
+                               const PQArgBlock *args, int nargs);
 
 /* === in fe-protocol3.c === */
 
 extern char *pqBuildStartupPacket3(PGconn *conn, int *packetlen,
-                                                                  const PQEnvironmentOption *options);
+                                         const PQEnvironmentOption *options);
 extern void pqParseInput3(PGconn *conn);
 extern int     pqGetErrorNotice3(PGconn *conn, bool isError);
+extern int     pqGetCopyData3(PGconn *conn, char **buffer, int async);
 extern int     pqGetline3(PGconn *conn, char *s, int maxlen);
 extern int     pqGetlineAsync3(PGconn *conn, char *buffer, int bufsize);
 extern int     pqEndcopy3(PGconn *conn);
 extern PGresult *pqFunctionCall3(PGconn *conn, Oid fnid,
-                                                                int *result_buf, int *actual_result_len,
-                                                                int result_is_int,
-                                                                const PQArgBlock *args, int nargs);
+                               int *result_buf, int *actual_result_len,
+                               int result_is_int,
+                               const PQArgBlock *args, int nargs);
 
 /* === in fe-misc.c === */
 
  /*
-  * "Get" and "Put" routines return 0 if successful, EOF if not. Note that
-  * for Get, EOF merely means the buffer is exhausted, not that there is
+  * "Get" and "Put" routines return 0 if successful, EOF if not. Note that for
+  * Get, EOF merely means the buffer is exhausted, not that there is
   * necessarily any error.
   */
-extern int     pqCheckInBufferSpace(int bytes_needed, PGconn *conn);
+extern int     pqCheckOutBufferSpace(size_t bytes_needed, PGconn *conn);
+extern int     pqCheckInBufferSpace(size_t bytes_needed, PGconn *conn);
 extern int     pqGetc(char *result, PGconn *conn);
 extern int     pqPutc(char c, PGconn *conn);
 extern int     pqGets(PQExpBuffer buf, PGconn *conn);
+extern int     pqGets_append(PQExpBuffer buf, PGconn *conn);
 extern int     pqPuts(const char *s, PGconn *conn);
 extern int     pqGetnchar(char *s, size_t len, PGconn *conn);
 extern int     pqPutnchar(const char *s, size_t len, PGconn *conn);
@@ -407,8 +550,8 @@ extern int  pqPutMsgEnd(PGconn *conn);
 extern int     pqReadData(PGconn *conn);
 extern int     pqFlush(PGconn *conn);
 extern int     pqWait(int forRead, int forWrite, PGconn *conn);
-extern int     pqWaitTimed(int forRead, int forWrite, PGconn *conn, 
-                                               time_t finish_time);
+extern int pqWaitTimed(int forRead, int forWrite, PGconn *conn,
+                       time_t finish_time);
 extern int     pqReadReady(PGconn *conn);
 extern int     pqWriteReady(PGconn *conn);
 
@@ -421,12 +564,14 @@ extern void pqsecure_close(PGconn *);
 extern ssize_t pqsecure_read(PGconn *, void *ptr, size_t len);
 extern ssize_t pqsecure_write(PGconn *, const void *ptr, size_t len);
 
-/* Note: PGDONOTICE macro will work if applied to either PGconn or PGresult */
-#define PGDONOTICE(conn,message) \
-       ((*(conn)->noticeHook) ((conn)->noticeArg, (message)))
+#if defined(ENABLE_THREAD_SAFETY) && !defined(WIN32)
+extern int     pq_block_sigpipe(sigset_t *osigset, bool *sigpipe_pending);
+extern void pq_reset_sigpipe(sigset_t *osigset, bool sigpipe_pending,
+                                bool got_epipe);
+#endif
 
 /*
- * this is so that we can check is a connection is non-blocking internally
+ * this is so that we can check if a connection is non-blocking internally
  * without the overhead of a function call
  */
 #define pqIsnonblocking(conn)  ((conn)->nonblocking)
@@ -435,7 +580,6 @@ extern ssize_t pqsecure_write(PGconn *, const void *ptr, size_t len);
 extern char *
 libpq_gettext(const char *msgid)
 __attribute__((format_arg(1)));
-
 #else
 #define libpq_gettext(x) (x)
 #endif
@@ -447,9 +591,11 @@ __attribute__((format_arg(1)));
 #ifdef WIN32
 #define SOCK_ERRNO (WSAGetLastError())
 #define SOCK_STRERROR winsock_strerror
+#define SOCK_ERRNO_SET(e) WSASetLastError(e)
 #else
 #define SOCK_ERRNO errno
 #define SOCK_STRERROR pqStrerror
+#define SOCK_ERRNO_SET(e) (errno = (e))
 #endif
 
 #endif   /* LIBPQ_INT_H */