From 9ba96fbb2523cb12747c559c704c58bd8f9e7982 Mon Sep 17 00:00:00 2001 From: Richard Levitte Date: Thu, 11 Feb 2016 21:47:30 +0100 Subject: Perl's chop / chomp considered bad, use a regexp instead Once upon a time, there was chop, which somply chopped off the last character of $_ or a given variable, and it was used to take off the EOL character (\n) of strings. ... but then, you had to check for the presence of such character. So came chomp, the better chop which checks for \n before chopping it off. And this worked well, as long as Perl made internally sure that all EOLs were converted to \n. These days, though, there seems to be a mixture of perls, so lines from files in the "wrong" environment might have \r\n as EOL, or just \r (Mac OS, unless I'm misinformed). So it's time we went for the more generic variant and use s|\R$||, the better chomp which recognises all kinds of known EOLs and chops them off. A few chops were left alone, as they are use as surgical tools to remove one last slash or one last comma. NOTE: \R came with perl 5.10.0. It means that from now on, our scripts will fail with any older version. Reviewed-by: Rich Salz --- VMS/VMSify-conf.pl | 2 +- VMS/translatesyms.pl | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'VMS') diff --git a/VMS/VMSify-conf.pl b/VMS/VMSify-conf.pl index d3be6a29e7..9890362d5b 100644 --- a/VMS/VMSify-conf.pl +++ b/VMS/VMSify-conf.pl @@ -7,7 +7,7 @@ my @directory_vars = ( "dir", "certs", "crl_dir", "new_certs_dir" ); my @file_vars = ( "database", "certificate", "serial", "crlnumber", "crl", "private_key", "RANDFILE" ); while() { - chomp; + s|\R$||; foreach my $d (@directory_vars) { if (/^(\s*\#?\s*${d}\s*=\s*)\.\/([^\s\#]*)([\s\#].*)$/) { $_ = "$1sys\\\$disk:\[.$2$3"; diff --git a/VMS/translatesyms.pl b/VMS/translatesyms.pl index 8ffdbd8aa8..de3db6ccaf 100644 --- a/VMS/translatesyms.pl +++ b/VMS/translatesyms.pl @@ -28,7 +28,7 @@ my %translations = (); open DEMANGLER_DATA, $ARGV[0] or die "Couldn't open $ARGV[0]: $!\n"; while() { - chomp; + s|\R$||; (my $translated, my $original) = split /\$/; $translations{$original} = $translated.'$'; } -- cgit v1.2.3