|
1 | 1 | #!/bin/sh |
2 | 2 |
|
3 | | -# $PostgreSQL: pgsql/src/tools/pgindent/pgindent,v 1.101 2009/06/11 22:21:44 momjian Exp $ |
| 3 | +# $PostgreSQL: pgsql/src/tools/pgindent/pgindent,v 1.102 2010/04/05 03:09:09 adunstan Exp $ |
4 | 4 |
|
5 | 5 | # Known bugs: |
6 | 6 | # |
@@ -39,7 +39,7 @@ if [ "$?" -eq 0 ] |
39 | 39 | thenecho"You appear to have GNU indent rather than BSD indent.">&2 |
40 | 40 | echo"See the pgindent/README file for a description of its problems.">&2 |
41 | 41 | EXTRA_OPTS="-cdb -bli0 -npcs -cli4 -sc" |
42 | | -elseecho"Hope you installed /src/tools/pgindent/indent.bsd.patch.">&2 |
| 42 | +else |
43 | 43 | EXTRA_OPTS="-cli1" |
44 | 44 | fi |
45 | 45 |
|
|
138 | 138 | # We get the list of typedef's from /src/tools/find_typedef |
139 | 139 | indent -bad -bap -bc -bl -d0 -cdb -nce -nfc1 -di12 -i4 -l79 \ |
140 | 140 | -lp -nip -npro -bbb$EXTRA_OPTS \ |
141 | | -`cat"$TYPEDEFS"| sed -e'/^$/d' -e's/.*/-T& /'` \ |
| 141 | +`egrep -v'^(FD_SET|date|interval|timestamp|ANY)$'"$TYPEDEFS"| sed -e'/^$/d' -e's/.*/-T& /'` \ |
142 | 142 | /tmp/$$a>/tmp/$$2>&1 |
143 | 143 |
|
144 | 144 | if ["$?"-ne 0-o-s /tmp/$$ ] |
|
226 | 226 | skips--; |
227 | 227 | if (line1 ~ /*{$/ && |
228 | 228 | line2 ~ /^$/ && |
229 | | - line3 ~ /*\/\*$/) |
| 229 | + line3 ~ /*\/[*]$/) |
230 | 230 | { |
231 | 231 | print line1; |
232 | 232 | print line3; |
|
252 | 252 | { |
253 | 253 | if (NR != 1) |
254 | 254 | { |
255 | | -if ($0 ~ "/\* _PGMV") |
| 255 | +if ($0 ~ "/[*] _PGMV") |
256 | 256 | { |
257 | 257 | # remove tag |
258 | 258 | sub(" _PGMV", "", $0); |
|