Cleaned up ecpglib and renamed functions that do not need to be exported.

Created export list for ecpglib.

Author: Michael Meskes

src/interfaces/ecpg/ChangeLog

@@ -2256,5 +2256,8 @@ Tue, 02 Oct 2007 11:32:25 +0200
 Wed, 03 Oct 2007 10:48:39 +0200
 
 	- Hopefully fixed some stuff that causes Windows builds to fail.
+	- Cleaned up ecpglib and renamed functions that do not need to be
+	  exported.
+	- Created export list for ecpglib.
 	- Set ecpg library version to 6.0.
 	- Set ecpg version to 4.4.

src/interfaces/ecpg/compatlib/informix.c

@@ -1,4 +1,4 @@
-/* $PostgreSQL: pgsql/src/interfaces/ecpg/compatlib/informix.c,v 1.49 2007/08/14 10:01:52 meskes Exp $ */
+/* $PostgreSQL: pgsql/src/interfaces/ecpg/compatlib/informix.c,v 1.50 2007/10/03 11:11:11 meskes Exp $ */
 
 #include <stdlib.h>
 #include <string.h>
@@ -7,14 +7,15 @@
 #include <ctype.h>
 #include <limits.h>
 
+#define POSTGRES_ECPG_INTERNAL
 #include <ecpgtype.h>
 #include <ecpg_informix.h>
 #include <pgtypes_error.h>
 #include <pgtypes_date.h>
 #include <pgtypes_numeric.h>
 #include <sqltypes.h>
-
-char	   *ECPGalloc(long, int);
+#include <sqlca.h>
+#include <ecpgerrno.h>
 
 static int
 deccall2(decimal *arg1, decimal *arg2, int (*ptr) (numeric *, numeric *))
@@ -667,7 +668,7 @@ static struct
  * initialize the struct, which holds the different forms
  * of the long value
  */
-static void
+static int
 initValue(long lng_val)
 {
 	int			i,
@@ -701,7 +702,8 @@ initValue(long lng_val)
 	value.remaining = value.digits;
 
 	/* convert the long to string */
-	value.val_string = (char *) malloc(value.digits + 1);
+	if ((value.val_string = (char *) malloc(value.digits + 1)) == NULL) 
+		return -1;
 	dig = value.val;
 	for (i = value.digits, j = 0; i > 0; i--, j++)
 	{
@@ -710,6 +712,7 @@ initValue(long lng_val)
 		l /= 10;
 	}
 	value.val_string[value.digits] = '\0';
+	return 0;
 }
 
 /* return the position oft the right-most dot in some string */
@@ -755,7 +758,11 @@ rfmtlong(long lng_val, char *fmt, char *outbuf)
 	temp = (char *) malloc(fmt_len + 1);
 
 	/* put all info about the long in a struct */
-	initValue(lng_val);
+	if (!temp || initValue(lng_val) == -1)
+	{
+		errno = ENOMEM;
+		return -1;
+	}
 
 	/* '<' is the only format, where we have to align left */
 	if (strchr(fmt, (int) '<'))
@@ -991,11 +998,25 @@ ECPG_informix_set_var(int number, void *pointer, int lineno)
 	}
 
 	/* a new one has to be added */
-	ptr = (struct var_list *) ECPGalloc(sizeof(struct var_list), lineno);
-	ptr->number = number;
-	ptr->pointer = pointer;
-	ptr->next = ivlist;
-	ivlist = ptr;
+	ptr = (struct var_list *) calloc(1L, sizeof(struct var_list));
+	if (!ptr)
+	{
+		struct sqlca_t *sqlca = ECPGget_sqlca();
+
+		sqlca->sqlcode = ECPG_OUT_OF_MEMORY;
+		strncpy(sqlca->sqlstate, "YE001", sizeof("YE001"));
+		snprintf(sqlca->sqlerrm.sqlerrmc, sizeof(sqlca->sqlerrm.sqlerrmc), "Out of memory in line %d.", lineno);
+		sqlca->sqlerrm.sqlerrml = strlen(sqlca->sqlerrm.sqlerrmc);
+		/* free all memory we have allocated for the user */
+		ECPGfree_auto_mem();
+	}
+	else
+	{
+		ptr->number = number;
+		ptr->pointer = pointer;
+		ptr->next = ivlist;
+		ivlist = ptr;
+	}
 }
 
 void *

src/interfaces/ecpg/ecpglib/Makefile

@@ -4,7 +4,7 @@
 #
 # Copyright (c) 1994, Regents of the University of California
 #
-# $PostgreSQL: pgsql/src/interfaces/ecpg/ecpglib/Makefile,v 1.48 2007/09/27 19:53:44 tgl Exp $
+# $PostgreSQL: pgsql/src/interfaces/ecpg/ecpglib/Makefile,v 1.49 2007/10/03 11:11:12 meskes Exp $
 #
 #-------------------------------------------------------------------------
 
@@ -31,6 +31,7 @@ OBJS= execute.o typename.o descriptor.o data.o error.o prepare.o memory.o \
 # thread.c is needed only for non-WIN32 implementation of path.c
 ifneq ($(PORTNAME), win32)
 OBJS += thread.o
+DLL_DEFFILE=libecpgdll.def
 endif
 
 SHLIB_LINK = -L../pgtypeslib -lpgtypes $(libpq) -lm $(PTHREAD_LIBS)
@@ -58,6 +59,52 @@ path.o: path.c $(top_builddir)/src/port/pg_config_paths.h
 $(top_builddir)/src/port/pg_config_paths.h:
 	$(MAKE) -C $(top_builddir)/src/port pg_config_paths.h
 
+# We need several not-quite-identical variants of .DEF files to build libecpg
+# DLLs for Windows.  These are made from the single source file exports.txt.
+# Since we can't assume that Windows boxes will have sed, the .DEF files are
+# always built and included in distribution tarballs.
+
+.PHONY: def-files
+def-files: $(srcdir)/libecpgdll.def $(srcdir)/blibecpgdll.def
+
+$(srcdir)/libecpgdll.def: exports.txt
+	echo '; DEF file for MS VC++' > $@
+	echo 'LIBRARY LIBECPG' >> $@
+	echo 'EXPORTS' >> $@
+	sed -e '/^#/d' -e 's/^\(.* \)\([0-9][0-9]*\)/    \1@ \2/' < $< >> $@
+
+$(srcdir)/blibecpgdll.def: exports.txt
+	echo '; DEF file for Borland C++ Builder' > $@
+	echo 'LIBRARY BLIBECPG' >> $@
+	echo 'EXPORTS' >> $@
+	sed -e '/^#/d' -e 's/^\(.* \)\([0-9][0-9]*\)/    _\1@ \2/' < $< >> $@
+	echo '' >> $@
+	echo '; Aliases for MS compatible names' >> $@
+	sed -e '/^#/d' -e 's/^\(.* \)\([0-9][0-9]*\)/    \1= _\1/' < $< | sed 's/ *$$//' >> $@
+
+# Where possible, restrict the symbols exported by the library to just the
+# official list, so as to avoid unintentional ABI changes.
+
+ifeq ($(PORTNAME), darwin)
+$(shlib): exports.list
+
+exports.list: exports.txt
+	$(AWK) '/^[^#]/ {printf "_%s\n",$$1}' $< >$@
+
+exported_symbols_list = -exported_symbols_list exports.list
+endif
+
+ifeq ($(PORTNAME), linux)
+$(shlib): exports.list
+
+exports.list: exports.txt
+	echo '{ global:' >$@
+	$(AWK) '/^[^#]/ {printf "%s;\n",$$1}' $< >>$@
+	echo ' local: *; };' >>$@
+
+exported_symbols_list = -Wl,--version-script=exports.list
+endif
+
 install: all installdirs install-lib
 
 installdirs:
@@ -66,4 +113,4 @@ installdirs:
 uninstall: uninstall-lib
 
 clean distclean maintainer-clean: clean-lib
-	rm -f $(OBJS) path.c snprintf.c strlcpy.c thread.c
+	rm -f $(OBJS) path.c snprintf.c strlcpy.c thread.c exports.list