summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBruce Momjian1998-05-12 21:44:08 +0000
committerBruce Momjian1998-05-12 21:44:08 +0000
commit58fffea03c11c753633411955b8e783178b3d381 (patch)
tree90fb30e3cd162fe7e9734286f87839dd78567340
parent1b70585d4b41b3ffa4532b9ed72ae9ac9d920206 (diff)
Cleanups for large objects, so file is trucated on open, fix for
solaris/spare shared libararies, new error message for postmaster startup, and makefile cleanups.
-rw-r--r--INSTALL12
-rw-r--r--src/backend/libpq/be-fsstubs.c4
-rw-r--r--src/backend/main/main.c11
-rw-r--r--src/interfaces/libpgtcl/Makefile.in11
-rw-r--r--src/interfaces/libpq/Makefile.in8
-rw-r--r--src/interfaces/libpq/fe-lobj.c4
-rw-r--r--src/man/psql.15
-rw-r--r--src/test/examples/testlo.c4
-rw-r--r--src/test/examples/testlo2.c4
9 files changed, 38 insertions, 25 deletions
diff --git a/INSTALL b/INSTALL
index 85c89e7483f..749507fccd0 100644
--- a/INSTALL
+++ b/INSTALL
@@ -119,7 +119,7 @@ PostgreSQL:
To check for disk space, use command "df -k".
- 4) Ftp file ftp://ftp.postgresql.org/pub/postgresql-v6.3.2.tar.gz from the
+ 4) Ftp file ftp://ftp.postgresql.org/pub/postgresql-6.3.2.tar.gz from the
Internet. Store it in your home directory.
5) Some platforms use flex. If your system uses flex then make sure
@@ -161,7 +161,7 @@ PostgreSQL:
step. Type (with the gunzip line and the following line typed as one
line):
cd
- gunzip -c postgresql-v6.3.2.tar.gz |
+ gunzip -c postgresql-6.3.2.tar.gz |
tar xvf - src/bin/pg_dump/pg_dumpall
chmod a+x src/bin/pg_dump/pg_dumpall
src/bin/pg_dump/pg_dumpall > db.out
@@ -227,7 +227,7 @@ PostgreSQL:
10) Unzip and untar the new source file. Type
cd /usr/src/pgsql
- gunzip -c ~/postgresql-v6.3.2.tar.gz | tar xvf -
+ gunzip -c ~/postgresql-6.3.2.tar.gz | tar xvf -
11) Configure the source code for your system. It is this step at which
you can specify your actual source path and installation paths for
@@ -487,7 +487,7 @@ PostgreSQL:
root:bin.
#!/bin/sh
[ -x /usr/local/pgsql/bin/postmaster ] && {
- su -l pgsql -c 'exec /usr/local/pgsql/bin/postmaster
+ su -l postgres -c 'exec /usr/local/pgsql/bin/postmaster
-D/usr/local/pgsql/data
-S -o -F > /usr/local/pgsql/errlog' &
echo -n ' pgsql'
@@ -552,7 +552,7 @@ PostgreSQL:
rm -rf /usr/local/pgsql_6_0
# Also delete old database directory tree if it is not in
# /usr/local/pgsql_6_0/data
- rm ~/postgresql-v6.3.2.tar.gz
+ rm ~/postgresql-6.3.2.tar.gz
26) You will probably want to print out the documentation. Here is how
you might do it if you have Ghostscript on your system and are
@@ -579,7 +579,7 @@ PostgreSQL:
supported platforms. We therefore ask you to let us know if you did
or did not get PostgreSQL to work on you system. Please send a
mail message to [email protected] telling us the following:
- - The version of PostgreSQL (v6.3.2, 6.2.1, beta 970703, etc.).
+ - The version of PostgreSQL (6.3.2, 6.2.1, beta 970703, etc.).
- Your operating system (i.e. RedHat v4.0 Linux v2.0.26).
- Your hardware (SPARC, i486, etc.).
- Did you compile, install and run the regression tests cleanly?
diff --git a/src/backend/libpq/be-fsstubs.c b/src/backend/libpq/be-fsstubs.c
index 365ec974342..c60e060cd21 100644
--- a/src/backend/libpq/be-fsstubs.c
+++ b/src/backend/libpq/be-fsstubs.c
@@ -7,7 +7,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/libpq/be-fsstubs.c,v 1.19 1998/01/07 21:03:12 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/libpq/be-fsstubs.c,v 1.20 1998/05/12 21:43:58 momjian Exp $
*
* NOTES
* This should be moved to a more appropriate place. It is here
@@ -344,7 +344,7 @@ lo_export(Oid lobjId, text *filename)
*/
oumask = umask((mode_t) 0);
StrNCpy(fnamebuf, VARDATA(filename), VARSIZE(filename) - VARHDRSZ + 1);
- fd = open(fnamebuf, O_CREAT | O_WRONLY, 0666);
+ fd = open(fnamebuf, O_CREAT | O_WRONLY | O_TRUNC, 0666);
umask(oumask);
if (fd < 0)
{ /* error */
diff --git a/src/backend/main/main.c b/src/backend/main/main.c
index af16267aad6..dfb9ad78245 100644
--- a/src/backend/main/main.c
+++ b/src/backend/main/main.c
@@ -7,7 +7,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/main/main.c,v 1.18 1998/04/30 14:25:13 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/main/main.c,v 1.19 1998/05/12 21:43:59 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -31,11 +31,10 @@
#include "tcop/tcopprot.h" /* for PostgresMain() */
#define NOROOTEXEC "\
-\n\"root\" execution of the PostgreSQL backend is not permitted\n\n\
-It is highly recommended that the backend be started under it's own userid\n\
-to prevent possible system security compromise. This can be accomplished\n\
-by placing the following command in the PostgreSQL startup script.\n\n\
-echo \"postmaster >/var/log/pglog 2>&1 &\" | su - postgres\n\n"
+\n\"root\" execution of the PostgreSQL backend is not permitted.\n\n\
+The backend must be started under it's own userid to prevent\n\
+a possible system security compromise. See the INSTALL file for\n\
+more information on how to properly start the postmaster.\n\n"
int
main(int argc, char *argv[])
diff --git a/src/interfaces/libpgtcl/Makefile.in b/src/interfaces/libpgtcl/Makefile.in
index 49c87ca3e86..d178d74b452 100644
--- a/src/interfaces/libpgtcl/Makefile.in
+++ b/src/interfaces/libpgtcl/Makefile.in
@@ -7,7 +7,7 @@
#
#
# IDENTIFICATION
-# $Header: /cvsroot/pgsql/src/interfaces/libpgtcl/Attic/Makefile.in,v 1.13 1998/04/27 14:54:50 scrappy Exp $
+# $Header: /cvsroot/pgsql/src/interfaces/libpgtcl/Attic/Makefile.in,v 1.14 1998/05/12 21:44:01 momjian Exp $
#
#-------------------------------------------------------------------------
@@ -31,7 +31,7 @@ endif
install-shlib-dep :=
shlib :=
-LIBPQ = -L $(SRCDIR)/interfaces/libpq -lpq
+LIBPQ = -L$(SRCDIR)/interfaces/libpq -lpq
ifeq ($(PORTNAME), linux)
LINUX_ELF=@LINUX_ELF@
@@ -59,6 +59,13 @@ ifeq ($(PORTNAME), i386_solaris)
CFLAGS += $(CFLAGS_SL)
endif
+ifeq ($(PORTNAME), sparc_solaris)
+ install-shlib-dep := install-shlib
+ shlib := libpgtcl.so.1
+ LDFLAGS_SL = -G
+ CFLAGS += $(CFLAGS_SL)
+endif
+
ifeq ($(PORTNAME), univel)
install-shlib-dep := install-shlib
shlib := libpgtcl.so.1
diff --git a/src/interfaces/libpq/Makefile.in b/src/interfaces/libpq/Makefile.in
index 025b0b9363d..5aa507e47a1 100644
--- a/src/interfaces/libpq/Makefile.in
+++ b/src/interfaces/libpq/Makefile.in
@@ -7,7 +7,7 @@
#
#
# IDENTIFICATION
-# $Header: /cvsroot/pgsql/src/interfaces/libpq/Attic/Makefile.in,v 1.17 1998/05/06 23:51:06 momjian Exp $
+# $Header: /cvsroot/pgsql/src/interfaces/libpq/Attic/Makefile.in,v 1.18 1998/05/12 21:44:02 momjian Exp $
#
#-------------------------------------------------------------------------
@@ -53,6 +53,12 @@ ifeq ($(PORTNAME), i386_solaris)
LDFLAGS_SL = -G -z text
CFLAGS += $(CFLAGS_SL)
endif
+ifeq ($(PORTNAME), sparc_solaris)
+ install-shlib-dep := install-shlib
+ shlib := libpq.so.$(SO_MAJOR_VERSION).$(SO_MINOR_VERSION)
+ LDFLAGS_SL = -G
+ CFLAGS += $(CFLAGS_SL)
+endif
ifeq ($(PORTNAME), univel)
install-shlib-dep := install-shlib
shlib := libpq.so.1
diff --git a/src/interfaces/libpq/fe-lobj.c b/src/interfaces/libpq/fe-lobj.c
index acf345a380c..126a704b32c 100644
--- a/src/interfaces/libpq/fe-lobj.c
+++ b/src/interfaces/libpq/fe-lobj.c
@@ -7,7 +7,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/interfaces/libpq/fe-lobj.c,v 1.11 1997/09/18 20:22:49 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/interfaces/libpq/fe-lobj.c,v 1.12 1998/05/12 21:44:03 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -449,7 +449,7 @@ lo_export(PGconn *conn, Oid lobjId, char *filename)
/*
* open the file to be written to
*/
- fd = open(filename, O_CREAT | O_WRONLY, 0666);
+ fd = open(filename, O_CREAT | O_WRONLY | O_TRUNC, 0666);
if (fd < 0)
{ /* error */
sprintf(conn->errorMessage,
diff --git a/src/man/psql.1 b/src/man/psql.1
index 2c5137b4c02..ba1c191d18a 100644
--- a/src/man/psql.1
+++ b/src/man/psql.1
@@ -1,6 +1,6 @@
.\" This is -*-nroff-*-
.\" XXX standard disclaimer belongs here....
-.\" $Header: /cvsroot/pgsql/src/man/Attic/psql.1,v 1.23 1998/01/26 01:42:53 scrappy Exp $
+.\" $Header: /cvsroot/pgsql/src/man/Attic/psql.1,v 1.24 1998/05/12 21:44:05 momjian Exp $
.TH PSQL UNIX 1/20/96 PostgreSQL PostgreSQL
.SH NAME
psql - run the interactive query front-end
@@ -298,7 +298,8 @@ Establish a connection to a new database. The previous connection is closed.
Perform a frontend copy. This is an operation that runs a SQL COPY command,
but instead of the backend reading or writing a specified file, and
consequently requiring special user privilege, psql reads or writes the
-file and routes the data to or from the backend.
+file and routes the data to or from the backend. The default TAB
+delimiter is used.
.IP "\ed [\fItable\fR]"
List tables in the database, or if
.IR table
diff --git a/src/test/examples/testlo.c b/src/test/examples/testlo.c
index 972894fdf92..8c18a2463c8 100644
--- a/src/test/examples/testlo.c
+++ b/src/test/examples/testlo.c
@@ -7,7 +7,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/test/examples/testlo.c,v 1.7 1997/09/25 16:35:50 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/test/examples/testlo.c,v 1.8 1998/05/12 21:44:07 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -168,7 +168,7 @@ exportFile(PGconn *conn, Oid lobjId, char *filename)
/*
* open the file to be written to
*/
- fd = open(filename, O_CREAT | O_WRONLY, 0666);
+ fd = open(filename, O_CREAT | O_WRONLY | O_TRUNC, 0666);
if (fd < 0)
{ /* error */
fprintf(stderr, "can't open unix file\"%s\"",
diff --git a/src/test/examples/testlo2.c b/src/test/examples/testlo2.c
index f23ded84588..31607ba0f17 100644
--- a/src/test/examples/testlo2.c
+++ b/src/test/examples/testlo2.c
@@ -7,7 +7,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/test/examples/Attic/testlo2.c,v 1.6 1997/09/25 16:35:52 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/test/examples/Attic/testlo2.c,v 1.7 1998/05/12 21:44:08 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -164,7 +164,7 @@ exportFile(PGconn *conn, Oid lobjId, char *filename)
/*
* open the file to be written to
*/
- fd = open(filename, O_CREAT | O_WRONLY, 0666);
+ fd = open(filename, O_CREAT | O_WRONLY | O_TRUNC, 0666);
if (fd < 0)
{ /* error */
fprintf(stderr, "can't open unix file\"%s\"",