Update to prevent CATALOG() from wrapping.

diff --git a/src/tools/pgindent/pgindent b/src/tools/pgindent/pgindent
index c4069bd0ee3f0e71477f0df1416ff8fd61b5602d..2c40b84f4adb8d996832826aece2d3602bc8c831 100755 (executable)
--- 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 ~ "^$" &&