Exclude unwanted typedef symbols in pgindent, including FD_SET which is found on...

diff --git a/src/tools/pgindent/pgindent b/src/tools/pgindent/pgindent
index f8f91767640d61452f33273ec940f1ee458a0ec5..67c9253c47e79f7fb36fc0ba13f0fbd7a9ee68cf 100755 (executable)
--- a/src/tools/pgindent/pgindent
+++ b/src/tools/pgindent/pgindent
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# $PostgreSQL: pgsql/src/tools/pgindent/pgindent,v 1.101 2009/06/11 22:21:44 momjian Exp $
+# $PostgreSQL: pgsql/src/tools/pgindent/pgindent,v 1.102 2010/04/05 03:09:09 adunstan Exp $
 
 # Known bugs:
 #
@@ -39,7 +39,7 @@ if [ "$?" -eq 0 ]
 then   echo "You appear to have GNU indent rather than BSD indent." >&2
    echo "See the pgindent/README file for a description of its problems." >&2
    EXTRA_OPTS="-cdb -bli0 -npcs -cli4 -sc"
-else   echo "Hope you installed /src/tools/pgindent/indent.bsd.patch." >&2
+else   
    EXTRA_OPTS="-cli1"
 fi
 
@@ -138,7 +138,7 @@ do
 # We get the list of typedef's from /src/tools/find_typedef
    indent -bad -bap -bc -bl -d0 -cdb -nce -nfc1 -di12 -i4 -l79 \
        -lp -nip -npro -bbb $EXTRA_OPTS \
-       `cat "$TYPEDEFS" | sed -e '/^$/d' -e 's/.*/-T& /'` \
+       `egrep -v '^(FD_SET|date|interval|timestamp|ANY)$' "$TYPEDEFS" | sed -e '/^$/d' -e 's/.*/-T& /'` \
        /tmp/$$a >/tmp/$$ 2>&1
 
    if [ "$?" -ne 0 -o -s /tmp/$$ ]
@@ -226,7 +226,7 @@ do
                skips--;
            if (line1 ~ /   *{$/ &&
                line2 ~ /^$/ &&
-               line3 ~ /       *\/\*$/)
+               line3 ~ /       *\/[*]$/)
            {
                print line1;
                print line3;
@@ -252,7 +252,7 @@ do
        {
            if (NR != 1)
            {
-               if ($0 ~ "/\* _PGMV")
+               if ($0 ~ "/[*] _PGMV")
                {
                    # remove tag
                    sub(" _PGMV", "", $0);