Update to prevent CATALOG() from wrapping.

bmomjian · bmomjian · commit 59da2105d8e6 · 2001-10-25T05:07:56.000Z
diff --git 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 ~ "^$" &&
