From 6999ccb8e016acf9fdb21fc73a5a81388f12bf76 Mon Sep 17 00:00:00 2001 From: Viktor Szakats Date: Sat, 16 May 2026 18:20:37 +0200 Subject: [PATCH] managen: apply minor fixes and improvements - replace `goto` with `while` loop. - fix newlines in a warning message. - handle open error for `curl/curlver.h` header. Ref: #21646 Closes #21670 --- scripts/managen | 42 +++++++++++++++++++++--------------------- 1 file changed, 21 insertions(+), 21 deletions(-) diff --git a/scripts/managen b/scripts/managen index e117e335ce..554f4c984e 100755 --- a/scripts/managen +++ b/scripts/managen @@ -705,7 +705,7 @@ sub single { } else { chomp; - print STDERR "$f:$line:1:WARN: unrecognized line in $f, ignoring:\n:'$_';" + print STDERR "$f:$line:1:WARN: unrecognized line in $f, ignoring: '$_';\n"; } } @@ -1337,25 +1337,25 @@ my $dir = "."; my $include = "../../include"; my $cmd = shift @ARGV || ''; -check: - -if($cmd eq "-d") { - # specifies source directory - $dir = shift @ARGV; - $cmd = shift @ARGV; - goto check; -} -elsif($cmd eq "-I") { - # include path root - $include = shift @ARGV; - $cmd = shift @ARGV; - goto check; -} -elsif($cmd eq "-c") { - # Column width - $colwidth = 0 + shift @ARGV; - $cmd = shift @ARGV; - goto check; +while(1) { + if($cmd eq "-d") { + # specifies source directory + $dir = shift @ARGV; + $cmd = shift @ARGV; + } + elsif($cmd eq "-I") { + # include path root + $include = shift @ARGV; + $cmd = shift @ARGV; + } + elsif($cmd eq "-c") { + # Column width + $colwidth = 0 + shift @ARGV; + $cmd = shift @ARGV; + } + else { + last; + } } my @files = @ARGV; # the rest are the files @@ -1365,7 +1365,7 @@ if($ENV{'CURL_MAKETGZ_VERSION'}) { $version = $ENV{'CURL_MAKETGZ_VERSION'}; } else { - open(INC, "<$include/curl/curlver.h"); + open(INC, "<$include/curl/curlver.h") || die "no $include/curl/curlver.h"; while() { if($_ =~ /^#define LIBCURL_VERSION \"([0-9.]*)/) { $version = $1;