From fb784507f128464864f521c9b45ac6d3d6c49367 Mon Sep 17 00:00:00 2001 From: minima Date: Fri, 14 Dec 2001 18:03:21 +0000 Subject: [PATCH] remove any trailing \rs from the ends of lines --- cmd/apropos.pl | 2 ++ cmd/help.pl | 3 ++- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/cmd/apropos.pl b/cmd/apropos.pl index 9b7bcde9..d3def0cd 100644 --- a/cmd/apropos.pl +++ b/cmd/apropos.pl @@ -44,6 +44,7 @@ my $include; foreach $in (<$defh>) { next if $in =~ /^\#/; chomp $in; + $in =~ s/\r$//; if ($in =~ /^===/) { $cmd{$cmd} = "$cmd $desc" if $include; $include = 0; @@ -66,6 +67,7 @@ if ($h) { foreach $in (<$h>) { next if $in =~ /^\#/; chomp $in; + $in =~ s/\r$//; if ($in =~ /^===/) { $cmd{$cmd} = "$cmd $desc" if $include; $include = 0; diff --git a/cmd/help.pl b/cmd/help.pl index b8e74c06..ae11eedb 100644 --- a/cmd/help.pl +++ b/cmd/help.pl @@ -59,7 +59,7 @@ my $in; $line =~ s{[^\w/]}{}g; $line =~ s{/}{.*/}g; $line =~ s/^\s+//g; -$line =~ s/\s+$//g; +$line =~ s/[\s\r]+$//g; $line = "help" if $line =~ /^\s*$/; # sort out aliases @@ -72,6 +72,7 @@ if ($h) { foreach $in (<$h>) { next if $in =~ /^\#/; chomp $in; + $in =~ s/\r$//; if ($in =~ /^===/) { last if $state == 2; # come out on next command $in =~ s/=== //; -- 2.43.0