summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarc G. Fournier1997-05-07 02:59:59 +0000
committerMarc G. Fournier1997-05-07 02:59:59 +0000
commita5d7eb90a8295dae6cbd872d8f81920c63a397bc (patch)
tree31941ba20697aa36295c4b1389b5e5939c50078a
parent505a4709e21c427a2574a58356b27e34fe21479c (diff)
From: Keith Parks <[email protected]>
Subject: [PATCHES] Three small patches. Hi, Here are 3 small patches to the postgreSQL source sup'd on the 6th May 1997. The 1st 2 fix the shell backslash "c" handling used to suppress the newline on some unix shells. (The \c needs to be inside quote.) The 3rd may or may not be the correct way to fix the missing define of INDEX_MAX_KEYS in pg_dump.h
-rw-r--r--src/bin/createuser/createuser.sh10
-rw-r--r--src/bin/destroyuser/destroyuser.sh6
-rw-r--r--src/bin/pg_dump/pg_dump.h3
3 files changed, 10 insertions, 9 deletions
diff --git a/src/bin/createuser/createuser.sh b/src/bin/createuser/createuser.sh
index a62509fb7d2..39149018102 100644
--- a/src/bin/createuser/createuser.sh
+++ b/src/bin/createuser/createuser.sh
@@ -8,7 +8,7 @@
#
#
# IDENTIFICATION
-# $Header: /cvsroot/pgsql/src/bin/createuser/Attic/createuser.sh,v 1.7 1996/11/17 03:54:54 bryanh Exp $
+# $Header: /cvsroot/pgsql/src/bin/createuser/Attic/createuser.sh,v 1.8 1997/05/07 02:59:46 scrappy Exp $
#
# Note - this should NOT be setuid.
#
@@ -96,7 +96,7 @@ fi
if [ -z "$NEWUSER" ]
then
- echo _fUnKy_DASH_N_sTuFf_ "Enter name of user to add ---> "_fUnKy_BACKSLASH_C_sTuFf_
+ echo _fUnKy_DASH_N_sTuFf_ "Enter name of user to add ---> _fUnKy_BACKSLASH_C_sTuFf_"
read NEWUSER
fi
@@ -134,7 +134,7 @@ do
fi
while [ -z "$SYSID" ]
do
- echo _fUnKy_DASH_N_sTuFf_ "Enter user's postgres ID$DEFMSG -> "_fUnKy_BACKSLASH_C_sTuFf_
+ echo _fUnKy_DASH_N_sTuFf_ "Enter user's postgres ID$DEFMSG -> _fUnKy_BACKSLASH_C_sTuFf_"
read SYSID
[ -z "$SYSID" ] && SYSID=$DEFSYSID;
SYSIDISNUM=`echo $SYSID | egrep '^[0-9]+$'`
@@ -173,7 +173,7 @@ yn=f
while [ "$yn" != y -a "$yn" != n ]
do
- echo _fUnKy_DASH_N_sTuFf_ "Is user \"$NEWUSER\" allowed to create databases (y/n) "_fUnKy_BACKSLASH_C_sTuFf_
+ echo _fUnKy_DASH_N_sTuFf_ "Is user \"$NEWUSER\" allowed to create databases (y/n) _fUnKy_BACKSLASH_C_sTuFf_"
read yn
done
@@ -192,7 +192,7 @@ yn=f
while [ "$yn" != y -a "$yn" != n ]
do
- echo _fUnKy_DASH_N_sTuFf_ "Is user \"$NEWUSER\" allowed to add users? (y/n) "_fUnKy_BACKSLASH_C_sTuFf_
+ echo _fUnKy_DASH_N_sTuFf_ "Is user \"$NEWUSER\" allowed to add users? (y/n) _fUnKy_BACKSLASH_C_sTuFf_"
read yn
done
diff --git a/src/bin/destroyuser/destroyuser.sh b/src/bin/destroyuser/destroyuser.sh
index 3fee61559c3..ec329128276 100644
--- a/src/bin/destroyuser/destroyuser.sh
+++ b/src/bin/destroyuser/destroyuser.sh
@@ -8,7 +8,7 @@
#
#
# IDENTIFICATION
-# $Header: /cvsroot/pgsql/src/bin/destroyuser/Attic/destroyuser.sh,v 1.6 1996/11/17 03:55:07 bryanh Exp $
+# $Header: /cvsroot/pgsql/src/bin/destroyuser/Attic/destroyuser.sh,v 1.7 1997/05/07 02:59:52 scrappy Exp $
#
# Note - this should NOT be setuid.
#
@@ -90,7 +90,7 @@ fi
if [ -z "$DELUSER" ]
then
- echo _fUnKy_DASH_N_sTuFf_ "Enter name of user to delete ---> "_fUnKy_BACKSLASH_C_sTuFf_
+ echo _fUnKy_DASH_N_sTuFf_ "Enter name of user to delete ---> _fUnKy_BACKSLASH_C_sTuFf_"
read DELUSER
fi
@@ -154,7 +154,7 @@ then
yn=f
while [ $yn != y -a $yn != n ]
do
- echo _fUnKy_DASH_N_sTuFf_ "Deleting user $DELUSER will destroy them. Continue (y/n)? "_fUnKy_BACKSLASH_C_sTuFf_
+ echo _fUnKy_DASH_N_sTuFf_ "Deleting user $DELUSER will destroy them. Continue (y/n)? _fUnKy_BACKSLASH_C_sTuFf_"
read yn
done
diff --git a/src/bin/pg_dump/pg_dump.h b/src/bin/pg_dump/pg_dump.h
index 1dbc95562a6..da2ceba628b 100644
--- a/src/bin/pg_dump/pg_dump.h
+++ b/src/bin/pg_dump/pg_dump.h
@@ -5,7 +5,7 @@
*
* Copyright (c) 1994, Regents of the University of California
*
- * $Id: pg_dump.h,v 1.13 1997/05/06 05:20:21 vadim Exp $
+ * $Id: pg_dump.h,v 1.14 1997/05/07 02:59:59 scrappy Exp $
*
* Modifications - 6/12/96 - [email protected] - version 1.13.dhb.2
*
@@ -15,6 +15,7 @@
*-------------------------------------------------------------------------
*/
+#include <catalog/pg_index.h>
/* The *Info data structures run-time C structures used to store
system catalog information */