From 94869593e304b470914f86c07ad45ab4c7acb0d6 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Jo=C3=A3o=20Valverde?= Date: Mon, 7 Mar 2016 14:38:49 +0000 Subject: [PATCH] AUTHORS: Use LF line endings and remove BOM Change-Id: I03c582baa03238ac82916d8bf865a3bf25f04cd5 Reviewed-on: https://code.wireshark.org/review/14384 Reviewed-by: Alexis La Goutte --- AUTHORS.src | 2 +- tools/generate_authors.pl | 7 +------ 2 files changed, 2 insertions(+), 7 deletions(-) diff --git a/AUTHORS.src b/AUTHORS.src index d89e4e19fd..3c9122e5ef 100644 --- a/AUTHORS.src +++ b/AUTHORS.src @@ -1,4 +1,4 @@ - + Original Author -------- ------ diff --git a/tools/generate_authors.pl b/tools/generate_authors.pl index aaf207ef0a..5a50c25596 100755 --- a/tools/generate_authors.pl +++ b/tools/generate_authors.pl @@ -40,8 +40,6 @@ use Encode qw(encode decode); my $state = ""; my %contributors = (); my $is_contributing = 0; -my $crlf_find = "\n"; -my $crlf_replace = "\r\n"; my $header = " @@ -140,7 +138,7 @@ sub parse_git_name { $ntab -= $len / 8; $ntab +=1 if ($len % 8); $line = $name . "\t" x $ntab . "<$email>"; - print encode('UTF-8', "$line\r\n"); + print encode('UTF-8', "$line\n"); } } } @@ -151,7 +149,6 @@ sub parse_git_name { # MAIN # -$header =~ s/$crlf_find/$crlf_replace/g; print $header; open( my $author_fh, '<', $ARGV[0] ) or die "Can't open $ARGV[0]: $!"; @@ -186,7 +183,6 @@ while ( my $line = decode('UTF-8', <$author_fh>) ) { } close $author_fh; -$git_log_text =~ s/$crlf_find/$crlf_replace/g; print $git_log_text; # XXX open "git shortlog ... |" instead? @@ -199,7 +195,6 @@ while ( my $git_line = decode('UTF-8', <$git_author_fh>) ) { } close $git_author_fh; -$trailer =~ s/$crlf_find/$crlf_replace/g; print $trailer; __END__ -- 2.34.1