remove any trailing \rs from the ends of lines

diff --git a/cmd/apropos.pl b/cmd/apropos.pl
index 9b7bcde9c4ce50e8d70f806d91e8ad0472e4470a..d3def0cd5dffe9230122ff759d0e68fc22377a55 100644 (file)
--- 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 b8e74c06b3997b6bca804de1e638fa94c8dff0c9..ae11eedbc12b380b9583724141e2776a9ac3d00f 100644 (file)
--- 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/=== //;