diff options
author | Nikhil Sontakke | 2014-05-30 12:14:43 +0000 |
---|---|---|
committer | Pavan Deolasee | 2014-09-01 14:20:28 +0000 |
commit | 61f2c978d89475e7123e32479e2f30a743fdbe19 (patch) | |
tree | c650e0fb61a4cf2d41d1c8d6ce5dc3c784e1b863 | |
parent | 05b0566c87b79fa99a3c92abcf79b53d3f88561a (diff) |
Allow the postgres-xl files to compile ok on Mac OSX Mavericks. Patch from Pavan Deolasee. Some additional Makefile foo by me.
-rw-r--r-- | src/backend/tcop/postgres.c | 1 | ||||
-rw-r--r-- | src/gtm/client/Makefile | 2 | ||||
-rw-r--r-- | src/gtm/client/strlcpy.c | 72 | ||||
-rw-r--r-- | src/gtm/libpq/strlcpy.c | 3 |
4 files changed, 3 insertions, 75 deletions
diff --git a/src/backend/tcop/postgres.c b/src/backend/tcop/postgres.c index 633b69b8db..53fdaf4e12 100644 --- a/src/backend/tcop/postgres.c +++ b/src/backend/tcop/postgres.c @@ -4308,7 +4308,6 @@ PostgresMain(int argc, char *argv[], const char *username) ereport(ERROR, (errcode(ERRCODE_IO_ERROR), errmsg("Can not connect to pool manager"))); - return STATUS_ERROR; } /* Pooler initialization has to be made before ressource is released */ PoolManagerConnect(pool_handle, dbname, username, session_options()); diff --git a/src/gtm/client/Makefile b/src/gtm/client/Makefile index e8204bb4b9..bedbaf8cbf 100644 --- a/src/gtm/client/Makefile +++ b/src/gtm/client/Makefile @@ -15,7 +15,7 @@ NAME=gtmclient SO_MAJOR_VERSION= 1 SO_MINOR_VERSION= 0 -OBJS=fe-misc.o fe-connect.o pqexpbuffer.o ip.o strlcpy.o gtm_client.o fe-protocol.o +OBJS=fe-misc.o fe-connect.o pqexpbuffer.o ip.o gtm_client.o fe-protocol.o LDFLAGS=-L$(top_build_dir)/common -L$(top_build_dir)/libpq LIBS=-lpthread diff --git a/src/gtm/client/strlcpy.c b/src/gtm/client/strlcpy.c deleted file mode 100644 index 48cdf5e2c9..0000000000 --- a/src/gtm/client/strlcpy.c +++ /dev/null @@ -1,72 +0,0 @@ -/*------------------------------------------------------------------------- - * - * strlcpy.c - * strncpy done right - * - * Portions Copyright (c) 1996-2009, PostgreSQL Global Development Group - * Portions Copyright (c) 2010-2012 Postgres-XC Development Group - * - * - * IDENTIFICATION - * $PostgreSQL: pgsql/src/port/strlcpy.c,v 1.5 2008/01/01 19:46:00 momjian Exp $ - * - * This file was taken from OpenBSD and is used on platforms that don't - * provide strlcpy(). The OpenBSD copyright terms follow. - *------------------------------------------------------------------------- - */ - -/* $OpenBSD: strlcpy.c,v 1.11 2006/05/05 15:27:38 millert Exp $ */ - -/* - * Copyright (c) 1998 Todd C. Miller <[email protected]> - * - * Permission to use, copy, modify, and distribute this software for any - * purpose with or without fee is hereby granted, provided that the above - * copyright notice and this permission notice appear in all copies. - * - * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES - * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF - * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR - * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES - * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN - * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF - * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. - */ - -#include "gtm/gtm_c.h" - - -/* - * Copy src to string dst of size siz. At most siz-1 characters - * will be copied. Always NUL terminates (unless siz == 0). - * Returns strlen(src); if retval >= siz, truncation occurred. - * Function creation history: http://www.gratisoft.us/todd/papers/strlcpy.html - */ -size_t -strlcpy(char *dst, const char *src, size_t siz) -{ - char *d = dst; - const char *s = src; - size_t n = siz; - - /* Copy as many bytes as will fit */ - if (n != 0) - { - while (--n != 0) - { - if ((*d++ = *s++) == '\0') - break; - } - } - - /* Not enough room in dst, add NUL and traverse rest of src */ - if (n == 0) - { - if (siz != 0) - *d = '\0'; /* NUL-terminate dst */ - while (*s++) - ; - } - - return (s - src - 1); /* count does not include NUL */ -} diff --git a/src/gtm/libpq/strlcpy.c b/src/gtm/libpq/strlcpy.c index 48cdf5e2c9..01c9f5e7dc 100644 --- a/src/gtm/libpq/strlcpy.c +++ b/src/gtm/libpq/strlcpy.c @@ -35,7 +35,7 @@ #include "gtm/gtm_c.h" - +#ifndef HAVE_STRLCPY /* * Copy src to string dst of size siz. At most siz-1 characters * will be copied. Always NUL terminates (unless siz == 0). @@ -70,3 +70,4 @@ strlcpy(char *dst, const char *src, size_t siz) return (s - src - 1); /* count does not include NUL */ } +#endif |