summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorBruce Momjian <bruce@momjian.us>2001-10-25 05:07:56 +0000
committerBruce Momjian <bruce@momjian.us>2001-10-25 05:07:56 +0000
commit59da2105d8e6d95345b3b942a2e2aba8cead4838 (patch)
tree37c6891d0f8ec1dccb5b3854e81f334993130309 /src
parentbbc7491de10e05afc4080281311fbf4f40765dd9 (diff)
downloadpostgresql-59da2105d8e6d95345b3b942a2e2aba8cead4838.tar.gz
Update to prevent CATALOG() from wrapping.
Diffstat (limited to 'src')
-rwxr-xr-xsrc/tools/pgindent/pgindent11
1 files changed, 7 insertions, 4 deletions
diff --git a/src/tools/pgindent/pgindent b/src/tools/pgindent/pgindent
index c4069bd0ee..2c40b84f4a 100755
--- a/src/tools/pgindent/pgindent
+++ b/src/tools/pgindent/pgindent
@@ -39,7 +39,9 @@ do
int pgindent_func_no_var_fix;\
,g' |
# protect backslashes in DATA()
- sed 's;^DATA(.*$;/*&*/;' >/tmp/$$a
+ sed 's;^DATA(.*$;/*&*/;' |
+# protect wrapping in CATALOG()
+ sed 's;^CATALOG(.*$;/*&*/;' >/tmp/$$a
# We get the list of typedef's from /src/tools/find_typedef
indent -bad -bap -bc -bl -d0 -cdb -nce -nfc1 -di12 -i4 -l75 \
@@ -1282,6 +1284,7 @@ int pgindent_func_no_var_fix;\
fi
cat /tmp/$$a |
sed 's;^/\*\(DATA(.*\)\*/$;\1;' |
+ sed 's;^/\*\(CATALOG(.*\)\*/$;\1;' |
sed 's;/\*---X_X;/* ---;g' |
# workaround indent bug
sed 's;^static[ ][ ]*;static ;g' |
@@ -1366,9 +1369,9 @@ int pgindent_func_no_var_fix;\
print line2;
}' |
# remove blank line before #endif
- awk '
- {
- line2 = $0;
+ awk ' BEGIN {line1 = ""; line2 = ""; skips = 0}
+ {
+ line2 = $0;
if (skips > 0)
skips--;
if (line1 ~ "^$" &&