*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/interfaces/libpq/fe-connect.c,v 1.168 2001/07/16 20:05:51 petere Exp $
+ * $Header: /cvsroot/pgsql/src/interfaces/libpq/fe-connect.c,v 1.169 2001/07/20 17:45:05 momjian Exp $
*
*-------------------------------------------------------------------------
*/
printfPQExpBuffer(&conn->errorMessage,
libpq_gettext("could not set socket to TCP no delay mode: %s\n"),
strerror(errno));
-#ifdef WIN32
- printf("Winsock error: %i\n", WSAGetLastError());
-#endif
return 0;
}
*/
if (connect(conn->sock, &conn->raddr.sa, conn->raddr_len) < 0)
{
-#ifndef WIN32
if (errno == EINPROGRESS || errno == 0)
-#else
- if (WSAGetLastError() == WSAEINPROGRESS)
-#endif
{
/*
strcpy(conn->errorMessage.data,
"PQrequestCancel() -- connection is not open\n");
conn->errorMessage.len = strlen(conn->errorMessage.data);
+#ifdef WIN32
+ WSASetLastError(save_errno);
+#else
errno = save_errno;
+#endif
return FALSE;
}
/* Sent it, done */
#ifdef WIN32
closesocket(tmpsock);
+ WSASetLastError(save_errno);
#else
close(tmpsock);
+ errno = save_errno;
#endif
- errno = save_errno;
return TRUE;
cancel_errReturn:
{
#ifdef WIN32
closesocket(tmpsock);
+ WSASetLastError(save_errno);
#else
close(tmpsock);
+ errno = save_errno;
#endif
}
- errno = save_errno;
return FALSE;
}
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/interfaces/libpq/fe-exec.c,v 1.103 2001/07/15 13:45:04 petere Exp $
+ * $Header: /cvsroot/pgsql/src/interfaces/libpq/fe-exec.c,v 1.104 2001/07/20 17:45:06 momjian Exp $
*
*-------------------------------------------------------------------------
*/
}
/* If there's enough space in the current block, no problem. */
- if (nBytes <= res->spaceLeft)
+ if (nBytes <= (size_t)res->spaceLeft)
{
space = res->curBlock->space + res->curOffset;
res->curOffset += nBytes;
vlen = 0;
if (tup[i].value == NULL)
{
- tup[i].value = (char *) pqResultAlloc(result, vlen + 1, binary);
+ tup[i].value = (char *) pqResultAlloc(result, vlen + 1, (bool)binary);
if (tup[i].value == NULL)
goto outOfMemory;
}
if (!res || !res->cmdStatus || strncmp(res->cmdStatus, "INSERT ", 7) != 0)
return InvalidOid;
+#ifdef WIN32
+ WSASetLastError(0);
+#else
errno = 0;
+#endif
result = strtoul(res->cmdStatus + 7, &endptr, 10);
if (!endptr || (*endptr != ' ' && *endptr != '\0') || errno == ERANGE)
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/interfaces/libpq/fe-misc.c,v 1.51 2001/07/15 13:45:04 petere Exp $
+ * $Header: /cvsroot/pgsql/src/interfaces/libpq/fe-misc.c,v 1.52 2001/07/20 17:45:06 momjian Exp $
*
*-------------------------------------------------------------------------
*/
#include "postgres_fe.h"
+#include <errno.h>
+#include <signal.h>
+#include <time.h>
+
#ifdef WIN32
#include "win32.h"
#else
#include <sys/time.h>
#endif
-#include <errno.h>
-#include <signal.h>
-#include <time.h>
-
#ifdef HAVE_SYS_SELECT_H
#include <sys/select.h>
#endif
* crypt not available (yet)
*/
#define crypt(a,b) a
+
+/*
+ * assumes that errno is used for sockets only
+ *
+ */
+
+#undef errno
+#undef EINTR
+#undef EAGAIN /* doesn't apply on sockets */
+
+#define errno WSAGetLastError()
+#define EINTR WSAEINTR
+#define EWOULDBLOCK WSAEWOULDBLOCK
+#define ECONNRESET WSAECONNRESET
+#define EINPROGRESS WSAEINPROGRESS