d499aa5238
Viktor Szakats
2025-11-12
Subject
mk-ca-bundle.pl: use `open()` with argument list to replace backticks
Binary
No binary (build failed)
Architecture & Compiler Flags
—
Build Log
(log yok)
Commit Diff GitHub →
scripts/mdlinkcheck+0 -4
| @@ -145,10 +145,6 @@ sub checkurl { | |
| @content = <$fh>; | |
| close $fh; | |
| } | |
| - | else { |
| - | print STDERR "FAIL\n"; |
| - | return 1; # fail |
| - | } |
| if(!$content[0]) { | |
| print STDERR "FAIL\n"; | |
| return 1; # fail | |
scripts/mk-ca-bundle.pl+13 -5
| @@ -247,7 +247,9 @@ sub sha256 { | |
| close(FILE); | |
| } else { | |
| # Use OpenSSL command if Perl Digest::SHA modules not available | |
| - | $result = `"$openssl" dgst -r -sha256 "$_[0]"`; |
| + | open(my $fh, '-|', $openssl, 'dgst', '-r', '-sha256', $_[0]) or die "Failed running openssl on '$_[0]': $!"; |
| + | $result = <$fh>; # read first line |
| + | close $fh; |
| $result =~ s/^([0-9a-f]{64}) .+/$1/is; | |
| } | |
| return $result; | |
| @@ -311,10 +313,16 @@ if(!$opt_n) { | |
| if($curl) { | |
| if($curl =~ /^Protocols:.* https( |$)/m) { | |
| report "Get certdata with curl!"; | |
| - | my $proto = !$opt_k ? "--proto =https" : ""; |
| - | my $quiet = $opt_q ? "-s" : ""; |
| - | my @out = `curl -Lw %{response_code} $proto $quiet -o "$txt" "$url"`; |
| - | if(!$? && @out && $out[0] == 200) { |
| + | my @opts = (); |
| + | push @opts, '--proto', '=https' if !$opt_k; |
| + | push @opts, '-s' if $opt_q; |
| + | my $out = ''; |
| + | if(open(my $fh, '-|', 'curl', '-Lw', '%{response_code}', (@opts), '-o', $txt, $url)) { |
| + | $out = <$fh>; # read first line |
| + | chomp $out; |
| + | close $fh; |
| + | } |
| + | if($out && $out == 200) { |
| $fetched = 1; | |
| report "Downloaded $txt"; | |
| } | |