diff options
| author | Viktor Dukhovni <openssl-users@dukhovni.org> | 2016-02-13 02:53:13 -0500 |
|---|---|---|
| committer | Viktor Dukhovni <openssl-users@dukhovni.org> | 2016-02-13 02:54:48 -0500 |
| commit | ce3d25d3e5a7e82fd59fd30dff7acc39baed8b5e (patch) | |
| tree | fe3f497a9aaaf49078391eae17a74d7fe6be97a6 /util | |
| parent | e314c340736830a6fc0260cf72cc51ea0c227e9d (diff) | |
Fix some issues near recent chomp changes.
Reviewed-by: Richard Levitte <levitte@openssl.org>
Diffstat (limited to 'util')
| -rwxr-xr-x | util/files.pl | 6 | ||||
| -rwxr-xr-x | util/mk1mf.pl | 4 | ||||
| -rwxr-xr-x | util/mkfiles.pl | 4 |
3 files changed, 8 insertions, 6 deletions
diff --git a/util/files.pl b/util/files.pl index d984196616..32e712586d 100755 --- a/util/files.pl +++ b/util/files.pl @@ -25,8 +25,8 @@ while (<>) { $b=$`; # Keep what is before the backslash $o.=$b." "; - $b=<>; - $b =~ s|\R$||; # Better chomp + $b = "" unless defined($b = <>); + $b =~ s{\R$}{}; } else { @@ -43,7 +43,7 @@ while (<>) } } -$pwd=`pwd`; $pwd =~ s|\R$||; +($pwd=`pwd`) =~ s{\R$}{}; if ($sym{'TOP'} eq ".") { diff --git a/util/mk1mf.pl b/util/mk1mf.pl index 3a9f0d76b8..f29e50bb77 100755 --- a/util/mk1mf.pl +++ b/util/mk1mf.pl @@ -553,8 +553,10 @@ if ($fips) { open (IN, "util/fipslib_path.txt") || fipslib_error(); $fipslibdir = <IN>; - $fipslibdir =~ s|\R$||; close IN; + $fipslibdir = "" unless defined($fipslibdir); + $fipslibdir =~ s{\R$}{}; + fipslib_error() if ($fipslibdir eq ""); } fips_check_files($fipslibdir, "fipscanister.lib", "fipscanister.lib.sha1", diff --git a/util/mkfiles.pl b/util/mkfiles.pl index 4fbe29ac75..55dfbc64e3 100755 --- a/util/mkfiles.pl +++ b/util/mkfiles.pl @@ -107,8 +107,8 @@ while (<IN>) { $b=$`; $o.=$b." "; - $b=<IN>; - $b =~ s|\R$||; + $b = "" unless defined($b = <IN>); + $b =~ s{\R$}{}; } else { |