From: Darold Gilles <gilles@darold.net>
Date: Tue, 9 Apr 2013 16:54:06 +0000 (+0200)
Subject: Replace %% in log line prefix internally by a single %. Thanks to Cal Heldenbrand... 
X-Git-Tag: v3.3~16
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=d09b77f764e34282393b087b4408e9b82eebdf3d;p=pgbadger

Replace %% in log line prefix internally by a single %. Thanks to Cal Heldenbrand for the report.
---

diff --git a/pgbadger b/pgbadger
index ab12000..adee04a 100755
--- a/pgbadger
+++ b/pgbadger
@@ -429,6 +429,7 @@ my @action_regex = (
 # Compile custom log line prefix prefix
 my @prefix_params = ();
 if ($log_line_prefix) {
+	# Build parameters name that will be extracted from the prefix regexp
 	@prefix_params = &build_log_line_prefix_regex();
 	&check_regex($log_line_prefix, '--prefix');
 	if ($format eq 'syslog') {
@@ -5653,6 +5654,8 @@ sub build_log_line_prefix_regex
 	while ($log_line_prefix =~ s/(\%[audrhptmlscvxie])/$regex_map{"$1"}->[1]/) {
 		push(@param_list, $regex_map{"$1"}->[0]);
 	}
+	# replace %% by a single %
+	$log_line_prefix =~ s/\%\%/\%/;
 	return @param_list;
 }