Fix some issues near recent chomp changes.

[openssl.git] / util / files.pl

diff --git a/util/files.pl b/util/files.pl
index d984196616053efd2d73e23f4b07ac049ea41f66..32e712586d72bfac676f454f53ff92afa8b40ec4 100755 (executable)
--- a/util/files.pl
+++ b/util/files.pl
@@ -25,8 +25,8 @@ while (<>)
                                {
                                $b=$`; # Keep what is before the backslash
                                $o.=$b." ";
                                {
                                $b=$`; # Keep what is before the backslash
                                $o.=$b." ";

-                               $b=<>;
-                               $b =~ s|\R$||; # Better chomp
+                               $b = "" unless defined($b = <>);
+                               $b =~ s{\R$}{};

                                }
                        else
                                {
                                }
                        else
                                {


@@ -43,7 +43,7 @@ while (<>)
                }
        }
 
                }
        }
 

-$pwd=`pwd`; $pwd =~ s|\R$||;
+($pwd=`pwd`) =~ s{\R$}{};

 
 if ($sym{'TOP'} eq ".")
        {
 
 if ($sym{'TOP'} eq ".")
        {