Massive commits for SunOS4 port.

7 files changed, 50 insertions, 12 deletions

diff --git a/src/bin/pg_dump/Makefile b/src/bin/pg_dump/Makefile
index 406816a1346..ac453df7a3b 100644
--- a/src/bin/pg_dump/Makefile
+++ b/src/bin/pg_dump/Makefile
@@ -5,7 +5,7 @@
 # Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group
 # Portions Copyright (c) 1994, Regents of the University of California
 #
-# $Header: /cvsroot/pgsql/src/bin/pg_dump/Makefile,v 1.29 2001/02/20 19:20:28 petere Exp $
+# $Header: /cvsroot/pgsql/src/bin/pg_dump/Makefile,v 1.30 2001/02/27 08:13:28 ishii Exp $
 #
 #-------------------------------------------------------------------------
 
@@ -14,7 +14,21 @@ top_builddir = ../../..
 include $(top_builddir)/src/Makefile.global
 
 OBJS= pg_backup_archiver.o pg_backup_db.o pg_backup_custom.o pg_backup_files.o \
-       pg_backup_null.o pg_backup_tar.o $(STRDUP)
+       pg_backup_null.o pg_backup_tar.o
+
+ifdef STRDUP
+OBJS+=$(top_builddir)/src/utils/strdup.o
+
+$(top_builddir)/src/utils/strdup.o:
+	$(MAKE) -C $(top_builddir)/src/utils strdup.o
+endif
+
+ifdef STRTOUL
+OBJS+=$(top_builddir)/src/backend/port/strtoul.o
+
+$(top_builddir)/src/backend/port/strtoul.o:
+	$(MAKE) -C $(top_builddir)/src/backend/port strtoul.o
+endif
 
 override CPPFLAGS := -I$(libpq_srcdir) $(CPPFLAGS)
 
@@ -26,9 +40,6 @@ pg_dump: pg_dump.o common.o $(OBJS) $(libpq_builddir)/libpq.a
 pg_restore: pg_restore.o $(OBJS) $(libpq_builddir)/libpq.a
 	$(CC) $(CFLAGS) pg_restore.o $(OBJS) $(libpq) $(LDFLAGS) $(LIBS) -o $@
 
-../../utils/strdup.o:
-	$(MAKE) -C ../../utils strdup.o
-
 pg_dumpall: pg_dumpall.sh
 	sed -e 's,@VERSION@,$(VERSION),g' \
 	    -e 's,@MULTIBYTE@,$(MULTIBYTE),g' \
diff --git a/src/bin/pg_dump/pg_restore.c b/src/bin/pg_dump/pg_restore.c
index 851688ef1e5..7e446ac21f4 100644
--- a/src/bin/pg_dump/pg_restore.c
+++ b/src/bin/pg_dump/pg_restore.c
@@ -68,8 +68,13 @@
 #ifdef HAVE_GETOPT_H 
 #include <getopt.h>
 #else
+#ifdef HAVE_OPTARG_DECL
 #include <unistd.h>
-#endif
+#else
+extern char *optarg;
+extern int optind, opterr, optopt;
+#endif	/* HAVE_OPTARG_DECL */
+#endif	/* HAVE_GETOPT_H */
 
 /* Forward decls */
 static void usage(const char *progname);
diff --git a/src/bin/pg_id/pg_id.c b/src/bin/pg_id/pg_id.c
index e5a3ec3fd6b..325d6d6b142 100644
--- a/src/bin/pg_id/pg_id.c
+++ b/src/bin/pg_id/pg_id.c
@@ -6,13 +6,21 @@
  *
  * Copyright (C) 2000 by PostgreSQL Global Development Group
  *
- * $Header: /cvsroot/pgsql/src/bin/pg_id/Attic/pg_id.c,v 1.17 2001/02/10 02:31:27 tgl Exp $
+ * $Header: /cvsroot/pgsql/src/bin/pg_id/Attic/pg_id.c,v 1.18 2001/02/27 08:13:28 ishii Exp $
  */
 #include "postgres_fe.h"
 
 #ifdef HAVE_GETOPT_H
 #include <getopt.h>
-#endif
+#else
+#ifdef HAVE_OPTARG_DECL
+#include <unistd.h>
+#else
+extern char *optarg;
+extern int optind, opterr, optopt;
+#endif	/* HAVE_OPTARG_DECL */
+#endif	/* HAVE_GETOPT_H */
+
 #include <pwd.h>
 #include <stdio.h>
 #include <stdlib.h>
diff --git a/src/bin/psql/Makefile b/src/bin/psql/Makefile
index 0d0d0ec9e9a..8c653103308 100644
--- a/src/bin/psql/Makefile
+++ b/src/bin/psql/Makefile
@@ -5,7 +5,7 @@
 # Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group
 # Portions Copyright (c) 1994, Regents of the University of California
 #
-# $Header: /cvsroot/pgsql/src/bin/psql/Makefile,v 1.29 2001/02/20 19:20:29 petere Exp $
+# $Header: /cvsroot/pgsql/src/bin/psql/Makefile,v 1.30 2001/02/27 08:13:27 ishii Exp $
 #
 #-------------------------------------------------------------------------
 
@@ -46,6 +46,13 @@ $(top_builddir)/src/backend/port/snprintf.o:
 	$(MAKE) -C $(top_builddir)/src/backend/port snprintf.o
 endif
 
+ifdef STRTOUL
+OBJS+=$(top_builddir)/src/backend/port/strtoul.o
+
+$(top_builddir)/src/backend/port/strtoul.o:
+	$(MAKE) -C $(top_builddir)/src/backend/port strtoul.o
+endif
+
 # End of hacks for picking up backend 'port' modules
 
 psql: $(OBJS) $(libpq_builddir)/libpq.a
diff --git a/src/bin/psql/input.c b/src/bin/psql/input.c
index b3fdd55c132..894fc8d4547 100644
--- a/src/bin/psql/input.c
+++ b/src/bin/psql/input.c
@@ -3,7 +3,7 @@
  *
  * Copyright 2000 by PostgreSQL Global Development Group
  *
- * $Header: /cvsroot/pgsql/src/bin/psql/input.c,v 1.15 2001/02/10 02:31:28 tgl Exp $
+ * $Header: /cvsroot/pgsql/src/bin/psql/input.c,v 1.16 2001/02/27 08:13:27 ishii Exp $
  */
 #include "postgres_fe.h"
 #include "input.h"
@@ -151,7 +151,11 @@ initializeInput(int flags)
 	}
 #endif
 
+#ifdef HAVE_ATEXIT
 	atexit(finishInput);
+#else
+	on_exit(finishInput);
+#endif
 }
 
 
diff --git a/src/bin/psql/print.c b/src/bin/psql/print.c
index 681d47b14b0..f5daa5c5922 100644
--- a/src/bin/psql/print.c
+++ b/src/bin/psql/print.c
@@ -3,7 +3,7 @@
  *
  * Copyright 2000 by PostgreSQL Global Development Group
  *
- * $Header: /cvsroot/pgsql/src/bin/psql/print.c,v 1.15 2001/02/10 02:31:28 tgl Exp $
+ * $Header: /cvsroot/pgsql/src/bin/psql/print.c,v 1.16 2001/02/27 08:13:27 ishii Exp $
  */
 #include "postgres_fe.h"
 #include "print.h"
@@ -21,6 +21,8 @@
 #include "pqsignal.h"
 #include "libpq-fe.h"
 
+#include "settings.h"
+
 #ifndef __CYGWIN__
 #define DEFAULT_PAGER "more"
 #else
diff --git a/src/bin/psql/stringutils.c b/src/bin/psql/stringutils.c
index 083b582c274..a3b44e8bf17 100644
--- a/src/bin/psql/stringutils.c
+++ b/src/bin/psql/stringutils.c
@@ -3,10 +3,11 @@
  *
  * Copyright 2000 by PostgreSQL Global Development Group
  *
- * $Header: /cvsroot/pgsql/src/bin/psql/stringutils.c,v 1.27 2001/02/10 02:31:28 tgl Exp $
+ * $Header: /cvsroot/pgsql/src/bin/psql/stringutils.c,v 1.28 2001/02/27 08:13:27 ishii Exp $
  */
 #include "postgres_fe.h"
 #include "stringutils.h"
+#include "settings.h"
 
 #include <ctype.h>
 #include <assert.h>