diff options
Diffstat (limited to 'src')
| -rwxr-xr-x | src/tools/pgindent/pgindent | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/src/tools/pgindent/pgindent b/src/tools/pgindent/pgindent index 5eff1f8032d..1f95a1a34e6 100755 --- a/src/tools/pgindent/pgindent +++ b/src/tools/pgindent/pgindent @@ -63,6 +63,10 @@ $code_base ||= '.' unless @ARGV; $excludes ||= "$code_base/src/tools/pgindent/exclude_file_patterns" if $code_base && -f "$code_base/src/tools/pgindent/exclude_file_patterns"; +# also look under the current directory for the exclude patterns file +$excludes ||= "src/tools/pgindent/exclude_file_patterns" + if -f "src/tools/pgindent/exclude_file_patterns"; + # The typedef list that's mechanically extracted by the buildfarm may omit # some names we want to treat like typedefs, e.g. "bool" (which is a macro # according to <stdbool.h>), and may include some names we don't want @@ -421,8 +425,6 @@ File::Find::find( }, $code_base) if $code_base; -process_exclude(); - $filtered_typedefs_fh = load_typedefs(); check_indent(); @@ -430,6 +432,9 @@ check_indent(); # any non-option arguments are files to be processed push(@files, @ARGV); +# the exclude list applies to command line arguments as well as found files +process_exclude(); + foreach my $source_filename (@files) { # ignore anything that's not a .c or .h file |