Set exit status for pgindent if pg_bsd_indent fails

adunstan · adunstan · commit b20fe54c9c21 · 2025-01-08T10:56:12.000-05:00
Also document the exit codes in the script. The new exit code is 3, and is not overridden by the exit code set in --check mode. Author: Ashutosh Bapat Discussion: https://postgr.es/m/CAExHW5sPRSiFeLdP-u1Fa5ba7YS2f0gvLjmKOobopKadJwQ_GQ@mail.gmail.com
diff --git a/src/tools/pgindent/pgindent b/src/tools/pgindent/pgindent
@@ -2,6 +2,13 @@
 
 # Copyright (c) 2021-2025, PostgreSQL Global Development Group
 
+# Program to maintain uniform layout style in our C code.
+# Exit codes:
+#   0 -- all OK
+#   1 -- error invoking pgindent, nothing done
+#   2 -- --check mode and at least one file requires changes
+#   3 -- pg_bsd_indent failed on at least one file
+
 use strict;
 use warnings FATAL => 'all';
 
@@ -408,6 +415,7 @@ foreach my $source_filename (@files)
 	if ($source eq "")
 	{
 		print STDERR "Failure in $source_filename: " . $error_message . "\n";
+		$status = 3;
 		next;
 	}
 
@@ -428,7 +436,7 @@ foreach my $source_filename (@files)
 
 			if ($check)
 			{
-				$status = 2;
+				$status ||= 2;
 				last unless $diff;
 			}
 		}

Original file line number	Diff line number	Diff line change
`@@ -2,6 +2,13 @@`
`2`	`2`
`3`	`3`	`# Copyright (c) 2021-2025, PostgreSQL Global Development Group`
`4`	`4`
	`5`	`+# Program to maintain uniform layout style in our C code.`
	`6`	`+# Exit codes:`
	`7`	`+# 0 -- all OK`
	`8`	`+# 1 -- error invoking pgindent, nothing done`
	`9`	`+# 2 -- --check mode and at least one file requires changes`
	`10`	`+# 3 -- pg_bsd_indent failed on at least one file`
	`11`	`+`
`5`	`12`	`use strict;`
`6`	`13`	`use warnings FATAL => 'all';`
`7`	`14`
`@@ -408,6 +415,7 @@ foreach my $source_filename (@files)`
`408`	`415`	`if ($source eq "")`
`409`	`416`	`{`
`410`	`417`	`print STDERR "Failure in $source_filename: " . $error_message . "\n";`
	`418`	`+ $status = 3;`
`411`	`419`	`next;`
`412`	`420`	`}`
`413`	`421`
`@@ -428,7 +436,7 @@ foreach my $source_filename (@files)`
`428`	`436`
`429`	`437`	`if ($check)`
`430`	`438`	`{`
`431`		`- $status = 2;`
	`439`	`+ $status \|\|= 2;`
`432`	`440`	`last unless $diff;`
`433`	`441`	`}`
`434`	`442`	`}`