mirror of
https://github.com/curl/curl.git
synced 2026-08-25 14:33:44 +03:00
scripts: fix perl indentation, whitespace, semicolons
Ref: #17116 Closes #17209
This commit is contained in:
Viktor Szakats
parent
fd4c342d88
commit
3fcddc835c
14 changed files with 1418 additions and 1422 deletions
|
|
@ -59,84 +59,84 @@ sub scan_header {
|
|||
|
||||
open(my $h, "<", "$f");
|
||||
while(<$h>) {
|
||||
s/^\s*(.*?)\s*$/$1/; # Trim.
|
||||
# Remove multi-line comment trail.
|
||||
if($incomment) {
|
||||
if($_ !~ /.*?\*\/\s*(.*)$/) {
|
||||
next;
|
||||
s/^\s*(.*?)\s*$/$1/; # Trim.
|
||||
# Remove multi-line comment trail.
|
||||
if($incomment) {
|
||||
if($_ !~ /.*?\*\/\s*(.*)$/) {
|
||||
next;
|
||||
}
|
||||
$_ = $1;
|
||||
$incomment = 0;
|
||||
}
|
||||
$_ = $1;
|
||||
$incomment = 0;
|
||||
}
|
||||
if($line ne "") {
|
||||
# Unfold line.
|
||||
$_ = "$line $1";
|
||||
$line = "";
|
||||
}
|
||||
# Remove comments.
|
||||
while($_ =~ /^(.*?)\/\*.*?\*\/(.*)$/) {
|
||||
$_ = "$1 $2";
|
||||
}
|
||||
if($_ =~ /^(.*)\/\*/) {
|
||||
$_ = "$1 ";
|
||||
$incomment = 1;
|
||||
}
|
||||
s/^\s*(.*?)\s*$/$1/; # Trim again.
|
||||
# Ignore preprocessor directives and blank lines.
|
||||
if($_ =~ /^(?:#|$)/) {
|
||||
next;
|
||||
}
|
||||
# Handle lines that may be continued as if they were folded.
|
||||
if($_ !~ /[;,{}]$/) {
|
||||
# Folded line.
|
||||
$line = $_;
|
||||
next;
|
||||
}
|
||||
if($_ =~ /CURLOPTDEPRECATED\(/) {
|
||||
# Handle deprecated CURLOPT_* option.
|
||||
if($_ !~ /CURLOPTDEPRECATED\(\s*(\S+)\s*,(?:.*?,){2}\s*(.*?)\s*,.*"\)/) {
|
||||
# Folded line.
|
||||
$line = $_;
|
||||
next;
|
||||
if($line ne "") {
|
||||
# Unfold line.
|
||||
$_ = "$line $1";
|
||||
$line = "";
|
||||
}
|
||||
$hdr{$1} = $2;
|
||||
}
|
||||
elsif($_ =~ /CURLOPT\(/) {
|
||||
# Handle non-deprecated CURLOPT_* option.
|
||||
if($_ !~ /CURLOPT\(\s*(\S+)\s*(?:,.*?){2}\)/) {
|
||||
# Folded line.
|
||||
$line = $_;
|
||||
next;
|
||||
# Remove comments.
|
||||
while($_ =~ /^(.*?)\/\*.*?\*\/(.*)$/) {
|
||||
$_ = "$1 $2";
|
||||
}
|
||||
$hdr{$1} = "X";
|
||||
}
|
||||
else {
|
||||
my $version = "X";
|
||||
|
||||
# Get other kind of deprecation from this line.
|
||||
if($_ =~ /CURL_DEPRECATED\(/) {
|
||||
if($_ !~ /^(.*)CURL_DEPRECATED\(\s*(\S+?)\s*,.*?"\)(.*)$/) {
|
||||
if($_ =~ /^(.*)\/\*/) {
|
||||
$_ = "$1 ";
|
||||
$incomment = 1;
|
||||
}
|
||||
s/^\s*(.*?)\s*$/$1/; # Trim again.
|
||||
# Ignore preprocessor directives and blank lines.
|
||||
if($_ =~ /^(?:#|$)/) {
|
||||
next;
|
||||
}
|
||||
# Handle lines that may be continued as if they were folded.
|
||||
if($_ !~ /[;,{}]$/) {
|
||||
# Folded line.
|
||||
$line = $_;
|
||||
next;
|
||||
}
|
||||
$version = $2;
|
||||
$_ = "$1 $3";
|
||||
}
|
||||
if($_ =~ /^CURL_EXTERN\s+.*\s+(\S+?)\s*\(/) {
|
||||
# Flag public function.
|
||||
$hdr{$1} = $version;
|
||||
if($_ =~ /CURLOPTDEPRECATED\(/) {
|
||||
# Handle deprecated CURLOPT_* option.
|
||||
if($_ !~ /CURLOPTDEPRECATED\(\s*(\S+)\s*,(?:.*?,){2}\s*(.*?)\s*,.*"\)/) {
|
||||
# Folded line.
|
||||
$line = $_;
|
||||
next;
|
||||
}
|
||||
$hdr{$1} = $2;
|
||||
}
|
||||
elsif($inenum && $_ =~ /(\w+)\s*[,=}]/) {
|
||||
# Flag enum value.
|
||||
$hdr{$1} = $version;
|
||||
elsif($_ =~ /CURLOPT\(/) {
|
||||
# Handle non-deprecated CURLOPT_* option.
|
||||
if($_ !~ /CURLOPT\(\s*(\S+)\s*(?:,.*?){2}\)/) {
|
||||
# Folded line.
|
||||
$line = $_;
|
||||
next;
|
||||
}
|
||||
$hdr{$1} = "X";
|
||||
}
|
||||
else {
|
||||
my $version = "X";
|
||||
|
||||
# Get other kind of deprecation from this line.
|
||||
if($_ =~ /CURL_DEPRECATED\(/) {
|
||||
if($_ !~ /^(.*)CURL_DEPRECATED\(\s*(\S+?)\s*,.*?"\)(.*)$/) {
|
||||
# Folded line.
|
||||
$line = $_;
|
||||
next;
|
||||
}
|
||||
$version = $2;
|
||||
$_ = "$1 $3";
|
||||
}
|
||||
if($_ =~ /^CURL_EXTERN\s+.*\s+(\S+?)\s*\(/) {
|
||||
# Flag public function.
|
||||
$hdr{$1} = $version;
|
||||
}
|
||||
elsif($inenum && $_ =~ /(\w+)\s*[,=}]/) {
|
||||
# Flag enum value.
|
||||
$hdr{$1} = $version;
|
||||
}
|
||||
}
|
||||
# Remember if we are in an enum definition.
|
||||
$inenum |= ($_ =~ /\benum\b/);
|
||||
if($_ =~ /}/) {
|
||||
$inenum = 0;
|
||||
}
|
||||
}
|
||||
# Remember if we are in an enum definition.
|
||||
$inenum |= ($_ =~ /\benum\b/);
|
||||
if($_ =~ /}/) {
|
||||
$inenum = 0;
|
||||
}
|
||||
}
|
||||
close $h;
|
||||
}
|
||||
|
|
@ -151,31 +151,31 @@ sub scan_man_for_opts {
|
|||
|
||||
open(my $m, "<", "$f");
|
||||
while(<$m>) {
|
||||
if($_ =~ /^\./) {
|
||||
# roff directive found: end current option paragraph.
|
||||
my $o = $opt;
|
||||
$opt = "";
|
||||
if($_ =~ /^\.IP\s+((?:$prefix)_\w+)/) {
|
||||
# A new option has been found.
|
||||
$opt = $1;
|
||||
if($_ =~ /^\./) {
|
||||
# roff directive found: end current option paragraph.
|
||||
my $o = $opt;
|
||||
$opt = "";
|
||||
if($_ =~ /^\.IP\s+((?:$prefix)_\w+)/) {
|
||||
# A new option has been found.
|
||||
$opt = $1;
|
||||
}
|
||||
$_ = $line; # Get full paragraph.
|
||||
$line = "";
|
||||
s/\\f.//g; # Remove font formatting.
|
||||
s/\s+/ /g; # One line with single space only.
|
||||
if($o) {
|
||||
$funcman{$o} = "X";
|
||||
# Check if paragraph is mentioning deprecation.
|
||||
while($_ =~ /(?:deprecated|obsoleted?)\b\s*(?:in\b|since\b)?\s*(?:version\b|curl\b|libcurl\b)?\s*(\d[0-9.]*\d)?\b\s*(.*)$/i) {
|
||||
$funcman{$o} = $1 || "?";
|
||||
$_ = $2;
|
||||
}
|
||||
}
|
||||
}
|
||||
$_ = $line; # Get full paragraph.
|
||||
$line = "";
|
||||
s/\\f.//g; # Remove font formatting.
|
||||
s/\s+/ /g; # One line with single space only.
|
||||
if($o) {
|
||||
$funcman{$o} = "X";
|
||||
# Check if paragraph is mentioning deprecation.
|
||||
while($_ =~ /(?:deprecated|obsoleted?)\b\s*(?:in\b|since\b)?\s*(?:version\b|curl\b|libcurl\b)?\s*(\d[0-9.]*\d)?\b\s*(.*)$/i) {
|
||||
$funcman{$o} = $1 || "?";
|
||||
$_ = $2;
|
||||
}
|
||||
else {
|
||||
# Text line: accumulate.
|
||||
$line .= $_;
|
||||
}
|
||||
}
|
||||
else {
|
||||
# Text line: accumulate.
|
||||
$line .= $_;
|
||||
}
|
||||
}
|
||||
close $m;
|
||||
}
|
||||
|
|
@ -186,52 +186,52 @@ sub scan_man_page {
|
|||
my $version = "X";
|
||||
|
||||
if(open(my $fh, "<", "$path")) {
|
||||
my $section = "";
|
||||
my $line = "";
|
||||
my $section = "";
|
||||
my $line = "";
|
||||
|
||||
while(<$fh>) {
|
||||
if($_ =~ /\.so\s+man3\/(.*\.3\b)/) {
|
||||
# Handle manpage inclusion.
|
||||
scan_man_page(dirname($path) . "/$1", $sym, $table);
|
||||
$version = exists($$table{$sym})? $$table{$sym}: $version;
|
||||
}
|
||||
elsif($_ =~ /^\./) {
|
||||
# Line is a roff directive.
|
||||
if($_ =~ /^\.SH\b\s*(\w*)/) {
|
||||
# Section starts. End previous one.
|
||||
my $sh = $section;
|
||||
|
||||
$section = $1;
|
||||
$_ = $line; # Previous section text.
|
||||
$line = "";
|
||||
s/\\f.//g;
|
||||
s/\s+/ /g;
|
||||
s/\\f.//g; # Remove font formatting.
|
||||
s/\s+/ /g; # One line with single space only.
|
||||
if($sh =~ /DESCRIPTION|DEPRECATED/) {
|
||||
while($_ =~ /(?:deprecated|obsoleted?)\b\s*(?:in\b|since\b)?\s*(?:version\b|curl\b|libcurl\b)?\s*(\d[0-9.]*\d)?\b\s*(.*)$/i) {
|
||||
# Flag deprecation status.
|
||||
if($version ne "X" && $version ne "?") {
|
||||
if($1 && $1 ne $version) {
|
||||
print "error: $sym manpage lists unmatching deprecation versions $version and $1\n";
|
||||
$errcode++;
|
||||
}
|
||||
}
|
||||
else {
|
||||
$version = $1 || "?";
|
||||
}
|
||||
$_ = $2;
|
||||
}
|
||||
while(<$fh>) {
|
||||
if($_ =~ /\.so\s+man3\/(.*\.3\b)/) {
|
||||
# Handle manpage inclusion.
|
||||
scan_man_page(dirname($path) . "/$1", $sym, $table);
|
||||
$version = exists($$table{$sym})? $$table{$sym}: $version;
|
||||
}
|
||||
elsif($_ =~ /^\./) {
|
||||
# Line is a roff directive.
|
||||
if($_ =~ /^\.SH\b\s*(\w*)/) {
|
||||
# Section starts. End previous one.
|
||||
my $sh = $section;
|
||||
|
||||
$section = $1;
|
||||
$_ = $line; # Previous section text.
|
||||
$line = "";
|
||||
s/\\f.//g;
|
||||
s/\s+/ /g;
|
||||
s/\\f.//g; # Remove font formatting.
|
||||
s/\s+/ /g; # One line with single space only.
|
||||
if($sh =~ /DESCRIPTION|DEPRECATED/) {
|
||||
while($_ =~ /(?:deprecated|obsoleted?)\b\s*(?:in\b|since\b)?\s*(?:version\b|curl\b|libcurl\b)?\s*(\d[0-9.]*\d)?\b\s*(.*)$/i) {
|
||||
# Flag deprecation status.
|
||||
if($version ne "X" && $version ne "?") {
|
||||
if($1 && $1 ne $version) {
|
||||
print "error: $sym manpage lists unmatching deprecation versions $version and $1\n";
|
||||
$errcode++;
|
||||
}
|
||||
}
|
||||
else {
|
||||
$version = $1 || "?";
|
||||
}
|
||||
$_ = $2;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
else {
|
||||
# Text line: accumulate.
|
||||
$line .= $_;
|
||||
}
|
||||
}
|
||||
}
|
||||
else {
|
||||
# Text line: accumulate.
|
||||
$line .= $_;
|
||||
}
|
||||
}
|
||||
close $fh;
|
||||
$$table{$sym} = $version;
|
||||
close $fh;
|
||||
$$table{$sym} = $version;
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -240,14 +240,14 @@ sub scan_man_page {
|
|||
open(my $fh, "<", "$libdocdir/symbols-in-versions") ||
|
||||
die "$libdocdir/symbols-in-versions";
|
||||
while(<$fh>) {
|
||||
if($_ =~ /^((?:CURL|LIBCURL)\S+)\s+\S+\s*(\S*)\s*(\S*)$/) {
|
||||
if($3 eq "") {
|
||||
$syminver{$1} = "X";
|
||||
if($2 ne "" && $2 ne ".") {
|
||||
$syminver{$1} = $2;
|
||||
}
|
||||
if($_ =~ /^((?:CURL|LIBCURL)\S+)\s+\S+\s*(\S*)\s*(\S*)$/) {
|
||||
if($3 eq "") {
|
||||
$syminver{$1} = "X";
|
||||
if($2 ne "" && $2 ne ".") {
|
||||
$syminver{$1} = $2;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
close($fh);
|
||||
|
||||
|
|
@ -258,14 +258,14 @@ closedir $dh;
|
|||
|
||||
# Get functions and enum symbols from header files.
|
||||
for(@hfiles) {
|
||||
scan_header("$incdir/$_");
|
||||
scan_header("$incdir/$_");
|
||||
}
|
||||
|
||||
# Get function statuses from manpages.
|
||||
foreach my $sym (keys %hdr) {
|
||||
if($sym =~/^(?:curl|curlx)_\w/) {
|
||||
scan_man_page("$libdocdir/$sym.3", $sym, \%funcman);
|
||||
}
|
||||
if($sym =~/^(?:curl|curlx)_\w/) {
|
||||
scan_man_page("$libdocdir/$sym.3", $sym, \%funcman);
|
||||
}
|
||||
}
|
||||
|
||||
# Get options from function manpages.
|
||||
|
|
@ -274,9 +274,9 @@ scan_man_for_opts("$libdocdir/curl_easy_getinfo.3", "CURLINFO");
|
|||
|
||||
# Get deprecation status from option manpages.
|
||||
foreach my $sym (keys %syminver) {
|
||||
if($sym =~ /^(?:CURLOPT|CURLINFO)_\w+$/) {
|
||||
scan_man_page("$libdocdir/opts/$sym.3", $sym, \%optman);
|
||||
}
|
||||
if($sym =~ /^(?:CURLOPT|CURLINFO)_\w+$/) {
|
||||
scan_man_page("$libdocdir/opts/$sym.3", $sym, \%optman);
|
||||
}
|
||||
}
|
||||
|
||||
# Print results.
|
||||
|
|
@ -293,37 +293,37 @@ Symbol symbols-in func man opt man .h
|
|||
HEADER
|
||||
;
|
||||
foreach my $sym (sort {$a cmp $b} keys %keys) {
|
||||
if($sym =~ /^(?:CURLOPT|CURLINFO|curl|curlx)_\w/) {
|
||||
my $s = exists($syminver{$sym})? $syminver{$sym}: " ";
|
||||
my $f = exists($funcman{$sym})? $funcman{$sym}: " ";
|
||||
my $o = exists($optman{$sym})? $optman{$sym}: " ";
|
||||
my $h = exists($hdr{$sym})? $hdr{$sym}: " ";
|
||||
my $r = " ";
|
||||
if($sym =~ /^(?:CURLOPT|CURLINFO|curl|curlx)_\w/) {
|
||||
my $s = exists($syminver{$sym})? $syminver{$sym}: " ";
|
||||
my $f = exists($funcman{$sym})? $funcman{$sym}: " ";
|
||||
my $o = exists($optman{$sym})? $optman{$sym}: " ";
|
||||
my $h = exists($hdr{$sym})? $hdr{$sym}: " ";
|
||||
my $r = " ";
|
||||
|
||||
# There are deprecated symbols in symbols-in-versions that are aliases
|
||||
# and thus not listed anywhere else. Ignore them.
|
||||
"$f$o$h" =~ /[X ]{3}/ && next;
|
||||
# There are deprecated symbols in symbols-in-versions that are aliases
|
||||
# and thus not listed anywhere else. Ignore them.
|
||||
"$f$o$h" =~ /[X ]{3}/ && next;
|
||||
|
||||
# Check for inconsistencies between deprecations from the different sources.
|
||||
foreach my $k ($s, $f, $o, $h) {
|
||||
$r = $r eq " "? $k: $r;
|
||||
if($k ne " " && $r ne $k) {
|
||||
if($r eq "?") {
|
||||
$r = $k ne "X"? $k: "!";
|
||||
# Check for inconsistencies between deprecations from the different sources.
|
||||
foreach my $k ($s, $f, $o, $h) {
|
||||
$r = $r eq " "? $k: $r;
|
||||
if($k ne " " && $r ne $k) {
|
||||
if($r eq "?") {
|
||||
$r = $k ne "X"? $k: "!";
|
||||
}
|
||||
elsif($r eq "X" || $k ne "?") {
|
||||
$r = "!";
|
||||
}
|
||||
}
|
||||
}
|
||||
elsif($r eq "X" || $k ne "?") {
|
||||
$r = "!";
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
if($r eq "!") {
|
||||
print $leader;
|
||||
$leader = "";
|
||||
printf("%-38s %-11s %-9s %-9s %s\n", $sym, $s, $f, $o, $h);
|
||||
$errcode++;
|
||||
if($r eq "!") {
|
||||
print $leader;
|
||||
$leader = "";
|
||||
printf("%-38s %-11s %-9s %-9s %s\n", $sym, $s, $f, $o, $h);
|
||||
$errcode++;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
exit $errcode;
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue