From a787b88e3cbaa3f9c019b1f1c2a97682d5031184 Mon Sep 17 00:00:00 2001
From: Tom Lane <tgl@sss.pgh.pa.us>
Date: Wed, 28 Oct 1998 19:38:47 +0000
Subject: [PATCH] Eliminate need for cpp-from-stdin by using a temp file.

---
 src/backend/catalog/genbki.sh.in    |  9 +++++----
 src/backend/utils/Gen_fmgrtab.sh.in | 14 +++++++++-----
 2 files changed, 14 insertions(+), 9 deletions(-)

diff --git a/src/backend/catalog/genbki.sh.in b/src/backend/catalog/genbki.sh.in
index 3eb219e386..52655243cf 100644
--- a/src/backend/catalog/genbki.sh.in
+++ b/src/backend/catalog/genbki.sh.in
@@ -10,7 +10,7 @@
 #
 #
 # IDENTIFICATION
-#    $Header: /cvsroot/pgsql/src/backend/catalog/Attic/genbki.sh.in,v 1.1 1998/10/14 16:05:01 thomas Exp $
+#    $Header: /cvsroot/pgsql/src/backend/catalog/Attic/genbki.sh.in,v 1.2 1998/10/28 19:38:46 tgl Exp $
 #
 # NOTES
 #    non-essential whitespace is removed from the generated file.
@@ -18,7 +18,7 @@
 #    end can be changed into another awk script or something smarter..
 #
 #-------------------------------------------------------------------------
-trap "rm -f /tmp/genbki.tmp" 0 1 2 3 15
+trap "rm -f /tmp/genbki.tmp /tmp/genbkitmp.c" 0 1 2 3 15
 
 # make sure it is empty
 >/tmp/genbki.tmp
@@ -261,8 +261,9 @@ END {
 		reln_open = 0;
 	}
 }
-' | \
-@CPP@ @CPPSTDIN@ $BKIOPTS | \
+' >/tmp/genbkitmp.c
+
+@CPP@ $BKIOPTS /tmp/genbkitmp.c | \
 sed -e '/^[ 	]*$/d' \
     -e 's/[ 	][ 	]*/ /g' || exit 1
 
diff --git a/src/backend/utils/Gen_fmgrtab.sh.in b/src/backend/utils/Gen_fmgrtab.sh.in
index 1ccf22de57..c31decfc53 100644
--- a/src/backend/utils/Gen_fmgrtab.sh.in
+++ b/src/backend/utils/Gen_fmgrtab.sh.in
@@ -8,7 +8,7 @@
 #
 #
 # IDENTIFICATION
-#    $Header: /cvsroot/pgsql/src/backend/utils/Attic/Gen_fmgrtab.sh.in,v 1.11 1998/10/26 01:04:04 tgl Exp $
+#    $Header: /cvsroot/pgsql/src/backend/utils/Attic/Gen_fmgrtab.sh.in,v 1.12 1998/10/28 19:38:47 tgl Exp $
 #
 # NOTES
 #    Passes any -D options on to cpp prior to generating the list
@@ -40,6 +40,7 @@ done
 
 INFILE=$1
 RAWFILE=fmgr.raw
+CPPTMPFILE=fmgrtmp.c
 HFILE=fmgr.h
 TABCFILE=fmgrtab.c
 
@@ -62,11 +63,14 @@ sed 	-e 's/^.*OID[^=]*=[^0-9]*//' \
 	-e 's/[ 	]*).*$//' | \
 awk '
 /^#/		{ print; next; }
-$4 == "11"	{ print; next; }' | \
-@CPP@ @CPPSTDIN@ $BKIOPTS | \
+$4 == "11"	{ print; next; }' > $CPPTMPFILE
+
+@CPP@ $BKIOPTS $CPPTMPFILE | \
 egrep '^[0-9]' | \
 sort -n > $RAWFILE
 
+rm -f $CPPTMPFILE
+
 #
 # Generate fmgr.h
 #
@@ -79,7 +83,7 @@ cat > $HFILE <<FuNkYfMgRsTuFf
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: Gen_fmgrtab.sh.in,v 1.11 1998/10/26 01:04:04 tgl Exp $
+ * $Id: Gen_fmgrtab.sh.in,v 1.12 1998/10/28 19:38:47 tgl Exp $
  *
  * NOTES
  *	******************************
@@ -193,7 +197,7 @@ cat > $TABCFILE <<FuNkYfMgRtAbStUfF
  *
  *
  * IDENTIFICATION
- *    $Header: /cvsroot/pgsql/src/backend/utils/Attic/Gen_fmgrtab.sh.in,v 1.11 1998/10/26 01:04:04 tgl Exp $
+ *    $Header: /cvsroot/pgsql/src/backend/utils/Attic/Gen_fmgrtab.sh.in,v 1.12 1998/10/28 19:38:47 tgl Exp $
  *
  * NOTES
  *