Get rid of most uses of chomp, which is fragile.

andrewcmyers · Oct 11, 2021 · 8c39b9c · 8c39b9c
1 parent fdc88b5
commit 8c39b9c
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 6 deletions.
diff --git a/cgi-bin/civs_common.pm b/cgi-bin/civs_common.pm
@@ -136,8 +136,8 @@ sub GetPrivateHostID {
 	      end_html();
 	exit 0;
     }
-    $private_host_id=<HOSTID>;
-    chomp $private_host_id;
+    $private_host_id = <HOSTID>;
+    $private_host_id =~ s/(\s)+$//;  # remove trailing whitespace
     close(HOSTID);
 }
 
@@ -275,7 +275,7 @@ sub SecureNonce {
     open(NONCEFILE, "<$nonce_seed_file")
 	    or die "Can't open nonce file for read: $!\n";
     my $seed = <NONCEFILE>;
-    chomp $seed;
+    $seed =~ s/(\s)+$//;
     close(NONCEFILE);
     my $ret = substr($seed, 0, 16);
 

diff --git a/cgi-bin/election.pm b/cgi-bin/election.pm
@@ -484,7 +484,7 @@ sub CheckElectionID {
 # Log the string provided
 sub ElectionLog {
     my $log_msg = shift;
-    chomp($log_msg);
+    $log_msg =~ s/(\s)+$//;
     my $now = strftime "%a %b %e %H:%M:%S %Y", localtime;
     # print pre("trying to log to $election_log");
     if (!open ELECTION_LOG, ">>$election_log") {

diff --git a/cgi-bin/mail.pm b/cgi-bin/mail.pm
@@ -44,7 +44,7 @@ sub init {
 
 sub CheckAddr {
     (my $addr) = @_;
-    chomp $addr;
+    $addr = &TrimAddr($addr);
 
     return ($addr =~ m/^[a-z0-9!#$%&'*+\/=?^_`{|}~-]+(?:\.[a-z0-9!#$%&'*+\/=?^_`{|}~-]+)*@(?:[a-z0-9](?:[a-z0-9-]*[a-z0-9])?\.)+(?:[A-Z]{2,8})$/i);
 }

diff --git a/cgi-bin/request_activation b/cgi-bin/request_activation
@@ -103,7 +103,7 @@ if (!defined($code)) {
             $invites = <INVITES>;
             my @lines = split /\n/, $invites;
             for my $line (@lines) {
-                chomp $line;
+                $line =~ s/(\s)+$//;
                 (my $url, my $title) = split / /, $line, 2;
                 push @rows, [$url, $title];
             }