mirror of
https://github.com/curl/curl.git
synced 2026-08-05 06:46:13 +03:00
tidy-up: miscellaneous
- drop stray duplicate empty lines in docs, scripts, test data, include, examples, tests. - drop duplicate PP parenthesis. - curl-functions.m4: move literals to the right side in if expressions, to match rest of the source code. - FAQ.md: delete language designator from an URL. - packages: apply clang-format (OS400, VMS). - scripts/schemetable.c: apply clang-format. - data320: delete duplicate empty line that doesn't change the outcome. - spacecheck: extend to check for duplicate empty lines (with exceptions.) - fix whitespace nits Closes #19936
This commit is contained in:
Viktor Szakats
parent
141ce4be64
commit
fe8393d7db
116 changed files with 674 additions and 1039 deletions
|
|
@ -225,7 +225,6 @@ $logfile = "$logdir/sshserver.log"; # used by logmsg
|
|||
#
|
||||
my $loglevel = $debugprotocol?'DEBUG3':'DEBUG2';
|
||||
|
||||
|
||||
#***************************************************************************
|
||||
# Validate username
|
||||
#
|
||||
|
|
@ -240,7 +239,6 @@ if($error) {
|
|||
exit 1;
|
||||
}
|
||||
|
||||
|
||||
#***************************************************************************
|
||||
# Find out ssh daemon canonical filename
|
||||
#
|
||||
|
|
@ -250,7 +248,6 @@ if(!$sshd) {
|
|||
exit 1;
|
||||
}
|
||||
|
||||
|
||||
#***************************************************************************
|
||||
# Find out ssh daemon version info
|
||||
#
|
||||
|
|
@ -263,7 +260,6 @@ if(!$sshdid) {
|
|||
}
|
||||
logmsg "ssh server found $sshd is $sshdverstr\n" if($verbose);
|
||||
|
||||
|
||||
#***************************************************************************
|
||||
# ssh daemon command line options we might use and version support
|
||||
#
|
||||
|
|
@ -281,7 +277,6 @@ logmsg "ssh server found $sshd is $sshdverstr\n" if($verbose);
|
|||
# -t: test config file : SunSSH 1.0.0 and later
|
||||
# -?: sshd version info : SunSSH 1.0.0 and later
|
||||
|
||||
|
||||
#***************************************************************************
|
||||
# Verify minimum ssh daemon version
|
||||
#
|
||||
|
|
@ -291,7 +286,6 @@ if((($sshdid =~ /OpenSSH/) && ($sshdvernum < 299)) ||
|
|||
exit 1;
|
||||
}
|
||||
|
||||
|
||||
#***************************************************************************
|
||||
# Find out sftp server plugin canonical filename
|
||||
#
|
||||
|
|
@ -302,7 +296,6 @@ if(!$sftpsrv) {
|
|||
}
|
||||
logmsg "sftp server plugin found $sftpsrv\n" if($verbose);
|
||||
|
||||
|
||||
#***************************************************************************
|
||||
# Find out sftp client canonical filename
|
||||
#
|
||||
|
|
@ -313,7 +306,6 @@ if(!$sftp) {
|
|||
}
|
||||
logmsg "sftp client found $sftp\n" if($verbose);
|
||||
|
||||
|
||||
#***************************************************************************
|
||||
# Find out ssh keygen canonical filename
|
||||
#
|
||||
|
|
@ -324,7 +316,6 @@ if(!$sshkeygen) {
|
|||
}
|
||||
logmsg "ssh keygen found $sshkeygen\n" if($verbose);
|
||||
|
||||
|
||||
#***************************************************************************
|
||||
# Find out ssh client canonical filename
|
||||
#
|
||||
|
|
@ -334,7 +325,6 @@ if(!$ssh) {
|
|||
exit 1;
|
||||
}
|
||||
|
||||
|
||||
#***************************************************************************
|
||||
# Find out ssh client version info
|
||||
#
|
||||
|
|
@ -347,7 +337,6 @@ if(!$sshid) {
|
|||
}
|
||||
logmsg "ssh client found $ssh is $sshverstr\n" if($verbose);
|
||||
|
||||
|
||||
#***************************************************************************
|
||||
# ssh client command line options we might use and version support
|
||||
#
|
||||
|
|
@ -367,7 +356,6 @@ logmsg "ssh client found $ssh is $sshverstr\n" if($verbose);
|
|||
# -vv: increase verbosity : SunSSH 1.0.0 and later
|
||||
# -V: ssh version info : SunSSH 1.0.0 and later
|
||||
|
||||
|
||||
#***************************************************************************
|
||||
# Verify minimum ssh client version
|
||||
#
|
||||
|
|
@ -377,7 +365,6 @@ if((($sshid =~ /OpenSSH/) && ($sshvernum < 299)) ||
|
|||
exit 1;
|
||||
}
|
||||
|
||||
|
||||
#***************************************************************************
|
||||
# ssh keygen command line options we actually use and version support
|
||||
#
|
||||
|
|
@ -473,7 +460,6 @@ if((! -e pp($hstprvkeyf)) || (! -s pp($hstprvkeyf)) ||
|
|||
}
|
||||
}
|
||||
|
||||
|
||||
#***************************************************************************
|
||||
# Convert paths for curl's tests running on Windows with Cygwin/MSYS OpenSSH
|
||||
#
|
||||
|
|
@ -587,7 +573,6 @@ else {
|
|||
# [2] Option specific for portable versions
|
||||
# [3] Option not used in our ssh server config file
|
||||
|
||||
|
||||
#***************************************************************************
|
||||
# Initialize sshd config with options actually supported in OpenSSH 2.9.9
|
||||
#
|
||||
|
|
@ -662,7 +647,6 @@ if(!($sshdid =~ /OpenSSH/) || ($sshdvernum <= 730)) {
|
|||
push @cfgarr, 'X11Forwarding no';
|
||||
push @cfgarr, '#';
|
||||
|
||||
|
||||
#***************************************************************************
|
||||
# Write out initial sshd configuration file for curl's tests
|
||||
#
|
||||
|
|
@ -672,7 +656,6 @@ if($error) {
|
|||
exit 1;
|
||||
}
|
||||
|
||||
|
||||
#***************************************************************************
|
||||
# Verifies at run time if sshd supports a given configuration file option
|
||||
#
|
||||
|
|
@ -702,7 +685,6 @@ sub sshd_supports_opt {
|
|||
return 0;
|
||||
}
|
||||
|
||||
|
||||
#***************************************************************************
|
||||
# Kerberos Authentication support may have not been built into sshd
|
||||
#
|
||||
|
|
@ -722,7 +704,6 @@ if(sshd_supports_opt('KerberosTicketCleanup','yes')) {
|
|||
push @cfgarr, 'KerberosTicketCleanup yes';
|
||||
}
|
||||
|
||||
|
||||
#***************************************************************************
|
||||
# Andrew File System support may have not been built into sshd
|
||||
#
|
||||
|
|
@ -730,7 +711,6 @@ if(sshd_supports_opt('AFSTokenPassing','no')) {
|
|||
push @cfgarr, 'AFSTokenPassing no';
|
||||
}
|
||||
|
||||
|
||||
#***************************************************************************
|
||||
# S/Key authentication support may have not been built into sshd
|
||||
#
|
||||
|
|
@ -738,7 +718,6 @@ if(sshd_supports_opt('SkeyAuthentication','no')) {
|
|||
push @cfgarr, 'SkeyAuthentication no';
|
||||
}
|
||||
|
||||
|
||||
#***************************************************************************
|
||||
# GSSAPI Authentication support may have not been built into sshd
|
||||
#
|
||||
|
|
@ -764,7 +743,6 @@ if(sshd_supports_opt('GSSUseSessionCredCache','no')) {
|
|||
}
|
||||
push @cfgarr, '#';
|
||||
|
||||
|
||||
#***************************************************************************
|
||||
# Options that might be supported or not in sshd OpenSSH 2.9.9 and later
|
||||
#
|
||||
|
|
@ -824,7 +802,6 @@ if(sshd_supports_opt('X11UseLocalhost','yes')) {
|
|||
}
|
||||
push @cfgarr, '#';
|
||||
|
||||
|
||||
#***************************************************************************
|
||||
# Write out resulting sshd configuration file for curl's tests
|
||||
#
|
||||
|
|
@ -834,7 +811,6 @@ if($error) {
|
|||
exit 1;
|
||||
}
|
||||
|
||||
|
||||
#***************************************************************************
|
||||
# Verify that sshd actually supports our generated configuration file
|
||||
#
|
||||
|
|
@ -845,7 +821,6 @@ if(system "\"$sshd\" -t -f $sshdconfig_abs > $sshdlog 2>&1") {
|
|||
exit 1;
|
||||
}
|
||||
|
||||
|
||||
#***************************************************************************
|
||||
# Generate ssh client host key database file for curl's tests
|
||||
#
|
||||
|
|
@ -878,7 +853,6 @@ if((! -e pp($knownhosts)) || (! -s pp($knownhosts))) {
|
|||
}
|
||||
}
|
||||
|
||||
|
||||
#***************************************************************************
|
||||
# Convert paths for curl's tests running on Windows using Cygwin OpenSSH
|
||||
#
|
||||
|
|
@ -899,7 +873,6 @@ else {
|
|||
$knownhosts_config = abs_path(pp($knownhosts));
|
||||
}
|
||||
|
||||
|
||||
#***************************************************************************
|
||||
# ssh client configuration file options we might use and version support
|
||||
#
|
||||
|
|
@ -976,7 +949,6 @@ else {
|
|||
# [2] Option specific for portable versions
|
||||
# [3] Option not used in our ssh client config file
|
||||
|
||||
|
||||
#***************************************************************************
|
||||
# Initialize ssh config with options actually supported in OpenSSH 2.9.9
|
||||
#
|
||||
|
|
@ -1032,7 +1004,6 @@ push @cfgarr, 'StrictHostKeyChecking no';
|
|||
push @cfgarr, 'UsePrivilegedPort no';
|
||||
push @cfgarr, '#';
|
||||
|
||||
|
||||
#***************************************************************************
|
||||
# Options supported in ssh client newer than OpenSSH 2.9.9
|
||||
#
|
||||
|
|
@ -1132,7 +1103,6 @@ if(($sshid =~ /OpenSSH/) && ($sshvernum >= 380)) {
|
|||
|
||||
push @cfgarr, '#';
|
||||
|
||||
|
||||
#***************************************************************************
|
||||
# Write out resulting ssh client configuration file for curl's tests
|
||||
#
|
||||
|
|
@ -1142,7 +1112,6 @@ if($error) {
|
|||
exit 1;
|
||||
}
|
||||
|
||||
|
||||
#***************************************************************************
|
||||
# Initialize client sftp config with options actually supported.
|
||||
#
|
||||
|
|
@ -1160,7 +1129,6 @@ for(my $i = scalar(@cfgarr) - 1; $i > 0; $i--) {
|
|||
}
|
||||
}
|
||||
|
||||
|
||||
#***************************************************************************
|
||||
# Write out resulting sftp client configuration file for curl's tests
|
||||
#
|
||||
|
|
@ -1171,7 +1139,6 @@ if($error) {
|
|||
}
|
||||
@cfgarr = ();
|
||||
|
||||
|
||||
#***************************************************************************
|
||||
# Generate client sftp commands batch file for sftp server verification
|
||||
#
|
||||
|
|
@ -1232,7 +1199,6 @@ elsif($verbose && ($rc >> 8)) {
|
|||
logmsg sprintf("\"$sshd\" exited with %d\n", $rc >> 8);
|
||||
}
|
||||
|
||||
|
||||
#***************************************************************************
|
||||
# Clean up once the server has stopped
|
||||
#
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue