mirror of
https://github.com/curl/curl.git
synced 2026-07-27 21:33:05 +03:00
code: language cleanup in comments
Based on the standards and guidelines we use for our documentation. - expand contractions (they're => they are etc) - host name = > hostname - file name => filename - user name = username - man page => manpage - run-time => runtime - set-up => setup - back-end => backend - a HTTP => an HTTP - Two spaces after a period => one space after period Closes #14073
This commit is contained in:
Daniel Stenberg
parent
9b683577e1
commit
c074ba64a8
213 changed files with 1719 additions and 1715 deletions
|
|
@ -661,7 +661,7 @@ restart:
|
|||
|
||||
/*
|
||||
* ssh_statemach_act() runs the SSH state machine as far as it can without
|
||||
* blocking and without reaching the end. The data the pointer 'block' points
|
||||
* blocking and without reaching the end. The data the pointer 'block' points
|
||||
* to will be set to TRUE if the libssh function returns SSH_AGAIN
|
||||
* meaning it wants to be called again when the socket is ready
|
||||
*/
|
||||
|
|
@ -675,7 +675,7 @@ static CURLcode myssh_statemach_act(struct Curl_easy *data, bool *block)
|
|||
int rc = SSH_NO_ERROR, err;
|
||||
int seekerr = CURL_SEEKFUNC_OK;
|
||||
const char *err_msg;
|
||||
*block = 0; /* we're not blocking by default */
|
||||
*block = 0; /* we are not blocking by default */
|
||||
|
||||
do {
|
||||
|
||||
|
|
@ -1307,7 +1307,7 @@ static CURLcode myssh_statemach_act(struct Curl_easy *data, bool *block)
|
|||
failf(data, "Could not seek stream");
|
||||
return CURLE_FTP_COULDNT_USE_REST;
|
||||
}
|
||||
/* seekerr == CURL_SEEKFUNC_CANTSEEK (can't seek to offset) */
|
||||
/* seekerr == CURL_SEEKFUNC_CANTSEEK (cannot seek to offset) */
|
||||
do {
|
||||
char scratch[4*1024];
|
||||
size_t readthisamountnow =
|
||||
|
|
@ -1355,7 +1355,7 @@ static CURLcode myssh_statemach_act(struct Curl_easy *data, bool *block)
|
|||
/* not set by Curl_xfer_setup to preserve keepon bits */
|
||||
conn->sockfd = conn->writesockfd;
|
||||
|
||||
/* store this original bitmask setup to use later on if we can't
|
||||
/* store this original bitmask setup to use later on if we cannot
|
||||
figure out a "real" bitmask */
|
||||
sshc->orig_waitfor = data->req.keepon;
|
||||
|
||||
|
|
@ -1364,7 +1364,7 @@ static CURLcode myssh_statemach_act(struct Curl_easy *data, bool *block)
|
|||
with both accordingly */
|
||||
data->state.select_bits = CURL_CSELECT_OUT;
|
||||
|
||||
/* since we don't really wait for anything at this point, we want the
|
||||
/* since we do not really wait for anything at this point, we want the
|
||||
state machine to move on as soon as possible so we set a very short
|
||||
timeout here */
|
||||
Curl_expire(data, 0, EXPIRE_RUN_NOW);
|
||||
|
|
@ -1403,7 +1403,7 @@ static CURLcode myssh_statemach_act(struct Curl_easy *data, bool *block)
|
|||
++sshc->slash_pos;
|
||||
if(rc < 0) {
|
||||
/*
|
||||
* Abort if failure wasn't that the dir already exists or the
|
||||
* Abort if failure was not that the dir already exists or the
|
||||
* permission was denied (creation might succeed further down the
|
||||
* path) - retry on unspecific FAILURE also
|
||||
*/
|
||||
|
|
@ -1610,9 +1610,9 @@ static CURLcode myssh_statemach_act(struct Curl_easy *data, bool *block)
|
|||
!(attrs->flags & SSH_FILEXFER_ATTR_SIZE) ||
|
||||
(attrs->size == 0)) {
|
||||
/*
|
||||
* sftp_fstat didn't return an error, so maybe the server
|
||||
* just doesn't support stat()
|
||||
* OR the server doesn't return a file size with a stat()
|
||||
* sftp_fstat did not return an error, so maybe the server
|
||||
* just does not support stat()
|
||||
* OR the server does not return a file size with a stat()
|
||||
* OR file size is 0
|
||||
*/
|
||||
data->req.size = -1;
|
||||
|
|
@ -1685,7 +1685,7 @@ static CURLcode myssh_statemach_act(struct Curl_easy *data, bool *block)
|
|||
/* We can resume if we can seek to the resume position */
|
||||
if(data->state.resume_from) {
|
||||
if(data->state.resume_from < 0) {
|
||||
/* We're supposed to download the last abs(from) bytes */
|
||||
/* We are supposed to download the last abs(from) bytes */
|
||||
if((curl_off_t)size < -data->state.resume_from) {
|
||||
failf(data, "Offset (%"
|
||||
CURL_FORMAT_CURL_OFF_T ") was beyond file size (%"
|
||||
|
|
@ -1855,7 +1855,7 @@ static CURLcode myssh_statemach_act(struct Curl_easy *data, bool *block)
|
|||
/* not set by Curl_xfer_setup to preserve keepon bits */
|
||||
conn->sockfd = conn->writesockfd;
|
||||
|
||||
/* store this original bitmask setup to use later on if we can't
|
||||
/* store this original bitmask setup to use later on if we cannot
|
||||
figure out a "real" bitmask */
|
||||
sshc->orig_waitfor = data->req.keepon;
|
||||
|
||||
|
|
@ -1945,7 +1945,7 @@ static CURLcode myssh_statemach_act(struct Curl_easy *data, bool *block)
|
|||
FALLTHROUGH();
|
||||
|
||||
case SSH_SESSION_DISCONNECT:
|
||||
/* during weird times when we've been prematurely aborted, the channel
|
||||
/* during weird times when we have been prematurely aborted, the channel
|
||||
is still alive when we reach this state and we MUST kill the channel
|
||||
properly first */
|
||||
if(sshc->scp_session) {
|
||||
|
|
@ -2062,7 +2062,7 @@ static void myssh_block2waitfor(struct connectdata *conn, bool block)
|
|||
{
|
||||
struct ssh_conn *sshc = &conn->proto.sshc;
|
||||
|
||||
/* If it didn't block, or nothing was returned by ssh_get_poll_flags
|
||||
/* If it did not block, or nothing was returned by ssh_get_poll_flags
|
||||
* have the original set */
|
||||
conn->waitfor = sshc->orig_waitfor;
|
||||
|
||||
|
|
@ -2357,7 +2357,7 @@ static CURLcode scp_disconnect(struct Curl_easy *data,
|
|||
(void) dead_connection;
|
||||
|
||||
if(ssh->ssh_session) {
|
||||
/* only if there's a session still around to use! */
|
||||
/* only if there is a session still around to use! */
|
||||
|
||||
state(data, SSH_SESSION_DISCONNECT);
|
||||
|
||||
|
|
@ -2522,7 +2522,7 @@ static CURLcode sftp_disconnect(struct Curl_easy *data,
|
|||
DEBUGF(infof(data, "SSH DISCONNECT starts now"));
|
||||
|
||||
if(conn->proto.sshc.ssh_session) {
|
||||
/* only if there's a session still around to use! */
|
||||
/* only if there is a session still around to use! */
|
||||
state(data, SSH_SFTP_SHUTDOWN);
|
||||
result = myssh_block_statemach(data, TRUE);
|
||||
}
|
||||
|
|
@ -2716,7 +2716,7 @@ static void sftp_quote(struct Curl_easy *data)
|
|||
}
|
||||
|
||||
/*
|
||||
* SFTP is a binary protocol, so we don't send text commands
|
||||
* SFTP is a binary protocol, so we do not send text commands
|
||||
* to the server. Instead, we scan for commands used by
|
||||
* OpenSSH's sftp program and call the appropriate libssh
|
||||
* functions.
|
||||
|
|
|
|||
|
|
@ -405,8 +405,8 @@ static int sshkeycallback(struct Curl_easy *easy,
|
|||
#endif
|
||||
|
||||
/*
|
||||
* Earlier libssh2 versions didn't have the ability to seek to 64bit positions
|
||||
* with 32bit size_t.
|
||||
* Earlier libssh2 versions did not have the ability to seek to 64-bit
|
||||
* positions with 32-bit size_t.
|
||||
*/
|
||||
#ifdef HAVE_LIBSSH2_SFTP_SEEK64
|
||||
#define SFTP_SEEK(x,y) libssh2_sftp_seek64(x, (libssh2_uint64_t)y)
|
||||
|
|
@ -415,8 +415,8 @@ static int sshkeycallback(struct Curl_easy *easy,
|
|||
#endif
|
||||
|
||||
/*
|
||||
* Earlier libssh2 versions didn't do SCP properly beyond 32bit sizes on 32bit
|
||||
* architectures so we check of the necessary function is present.
|
||||
* Earlier libssh2 versions did not do SCP properly beyond 32-bit sizes on
|
||||
* 32-bit architectures so we check of the necessary function is present.
|
||||
*/
|
||||
#ifndef HAVE_LIBSSH2_SCP_SEND64
|
||||
#define SCP_SEND(a,b,c,d) libssh2_scp_send_ex(a, b, (int)(c), (size_t)d, 0, 0)
|
||||
|
|
@ -476,7 +476,7 @@ static CURLcode ssh_knownhost(struct Curl_easy *data)
|
|||
|
||||
#ifdef HAVE_LIBSSH2_KNOWNHOST_API
|
||||
if(data->set.str[STRING_SSH_KNOWNHOSTS]) {
|
||||
/* we're asked to verify the host against a file */
|
||||
/* we are asked to verify the host against a file */
|
||||
struct connectdata *conn = data->conn;
|
||||
struct ssh_conn *sshc = &conn->proto.sshc;
|
||||
struct libssh2_knownhost *host = NULL;
|
||||
|
|
@ -487,8 +487,8 @@ static CURLcode ssh_knownhost(struct Curl_easy *data)
|
|||
|
||||
if(remotekey) {
|
||||
/*
|
||||
* A subject to figure out is what host name we need to pass in here.
|
||||
* What host name does OpenSSH store in its file if an IDN name is
|
||||
* A subject to figure out is what hostname we need to pass in here.
|
||||
* What hostname does OpenSSH store in its file if an IDN name is
|
||||
* used?
|
||||
*/
|
||||
enum curl_khmatch keymatch;
|
||||
|
|
@ -526,7 +526,7 @@ static CURLcode ssh_knownhost(struct Curl_easy *data)
|
|||
break;
|
||||
#endif
|
||||
default:
|
||||
infof(data, "unsupported key type, can't check knownhosts");
|
||||
infof(data, "unsupported key type, cannot check knownhosts");
|
||||
keybit = 0;
|
||||
break;
|
||||
}
|
||||
|
|
@ -600,7 +600,7 @@ static CURLcode ssh_knownhost(struct Curl_easy *data)
|
|||
result = sshc->actualcode = CURLE_PEER_FAILED_VERIFICATION;
|
||||
break;
|
||||
case CURLKHSTAT_FINE_REPLACE:
|
||||
/* remove old host+key that doesn't match */
|
||||
/* remove old host+key that does not match */
|
||||
if(host)
|
||||
libssh2_knownhost_del(sshc->kh, host);
|
||||
FALLTHROUGH();
|
||||
|
|
@ -608,7 +608,7 @@ static CURLcode ssh_knownhost(struct Curl_easy *data)
|
|||
case CURLKHSTAT_FINE_ADD_TO_FILE:
|
||||
/* proceed */
|
||||
if(keycheck != LIBSSH2_KNOWNHOST_CHECK_MATCH) {
|
||||
/* the found host+key didn't match but has been told to be fine
|
||||
/* the found host+key did not match but has been told to be fine
|
||||
anyway so we add it in memory */
|
||||
int addrc = libssh2_knownhost_add(sshc->kh,
|
||||
conn->host.name, NULL,
|
||||
|
|
@ -662,7 +662,7 @@ static CURLcode ssh_check_fingerprint(struct Curl_easy *data)
|
|||
size_t b64_pos = 0;
|
||||
|
||||
#ifdef LIBSSH2_HOSTKEY_HASH_SHA256
|
||||
/* The fingerprint points to static storage (!), don't free() it. */
|
||||
/* The fingerprint points to static storage (!), do not free() it. */
|
||||
fingerprint = libssh2_hostkey_hash(sshc->ssh_session,
|
||||
LIBSSH2_HOSTKEY_HASH_SHA256);
|
||||
#else
|
||||
|
|
@ -742,7 +742,7 @@ static CURLcode ssh_check_fingerprint(struct Curl_easy *data)
|
|||
LIBSSH2_HOSTKEY_HASH_MD5);
|
||||
|
||||
if(fingerprint) {
|
||||
/* The fingerprint points to static storage (!), don't free() it. */
|
||||
/* The fingerprint points to static storage (!), do not free() it. */
|
||||
int i;
|
||||
for(i = 0; i < 16; i++) {
|
||||
msnprintf(&md5buffer[i*2], 3, "%02x", (unsigned char) fingerprint[i]);
|
||||
|
|
@ -960,7 +960,7 @@ static CURLcode ssh_force_knownhost_key_type(struct Curl_easy *data)
|
|||
|
||||
/*
|
||||
* ssh_statemach_act() runs the SSH state machine as far as it can without
|
||||
* blocking and without reaching the end. The data the pointer 'block' points
|
||||
* blocking and without reaching the end. The data the pointer 'block' points
|
||||
* to will be set to TRUE if the libssh2 function returns LIBSSH2_ERROR_EAGAIN
|
||||
* meaning it wants to be called again when the socket is ready
|
||||
*/
|
||||
|
|
@ -977,7 +977,7 @@ static CURLcode ssh_statemach_act(struct Curl_easy *data, bool *block)
|
|||
unsigned long sftperr;
|
||||
int seekerr = CURL_SEEKFUNC_OK;
|
||||
size_t readdir_len;
|
||||
*block = 0; /* we're not blocking by default */
|
||||
*block = 0; /* we are not blocking by default */
|
||||
|
||||
do {
|
||||
switch(sshc->state) {
|
||||
|
|
@ -1037,7 +1037,7 @@ static CURLcode ssh_statemach_act(struct Curl_easy *data, bool *block)
|
|||
* must never change it later. Thus, always specify the correct username
|
||||
* here, even though the libssh2 docs kind of indicate that it should be
|
||||
* possible to get a 'generic' list (not user-specific) of authentication
|
||||
* methods, presumably with a blank username. That won't work in my
|
||||
* methods, presumably with a blank username. That will not work in my
|
||||
* experience.
|
||||
* So always specify it here.
|
||||
*/
|
||||
|
|
@ -1440,7 +1440,7 @@ static CURLcode ssh_statemach_act(struct Curl_easy *data, bool *block)
|
|||
if(sftperr)
|
||||
result = sftp_libssh2_error_to_CURLE(sftperr);
|
||||
else
|
||||
/* in this case, the error wasn't in the SFTP level but for example
|
||||
/* in this case, the error was not in the SFTP level but for example
|
||||
a time-out or similar */
|
||||
result = CURLE_SSH;
|
||||
sshc->actualcode = result;
|
||||
|
|
@ -1571,7 +1571,7 @@ static CURLcode ssh_statemach_act(struct Curl_easy *data, bool *block)
|
|||
}
|
||||
|
||||
/*
|
||||
* SFTP is a binary protocol, so we don't send text commands
|
||||
* SFTP is a binary protocol, so we do not send text commands
|
||||
* to the server. Instead, we scan for commands used by
|
||||
* OpenSSH's sftp program and call the appropriate libssh2
|
||||
* functions.
|
||||
|
|
@ -1709,7 +1709,7 @@ static CURLcode ssh_statemach_act(struct Curl_easy *data, bool *block)
|
|||
if(!strncasecompare(cmd, "chmod", 5)) {
|
||||
/* Since chown and chgrp only set owner OR group but libssh2 wants to
|
||||
* set them both at once, we need to obtain the current ownership
|
||||
* first. This takes an extra protocol round trip.
|
||||
* first. This takes an extra protocol round trip.
|
||||
*/
|
||||
rc = libssh2_sftp_stat_ex(sshc->sftp_session, sshc->quote_path2,
|
||||
curlx_uztoui(strlen(sshc->quote_path2)),
|
||||
|
|
@ -1786,7 +1786,7 @@ static CURLcode ssh_statemach_act(struct Curl_easy *data, bool *block)
|
|||
}
|
||||
#if SIZEOF_TIME_T > SIZEOF_LONG
|
||||
if(date > 0xffffffff) {
|
||||
/* if 'long' can't old >32bit, this date cannot be sent */
|
||||
/* if 'long' cannot old >32bit, this date cannot be sent */
|
||||
failf(data, "date overflow");
|
||||
fail = TRUE;
|
||||
}
|
||||
|
|
@ -2160,7 +2160,7 @@ static CURLcode ssh_statemach_act(struct Curl_easy *data, bool *block)
|
|||
failf(data, "Could not seek stream");
|
||||
return CURLE_FTP_COULDNT_USE_REST;
|
||||
}
|
||||
/* seekerr == CURL_SEEKFUNC_CANTSEEK (can't seek to offset) */
|
||||
/* seekerr == CURL_SEEKFUNC_CANTSEEK (cannot seek to offset) */
|
||||
do {
|
||||
char scratch[4*1024];
|
||||
size_t readthisamountnow =
|
||||
|
|
@ -2209,7 +2209,7 @@ static CURLcode ssh_statemach_act(struct Curl_easy *data, bool *block)
|
|||
sshc->actualcode = result;
|
||||
}
|
||||
else {
|
||||
/* store this original bitmask setup to use later on if we can't
|
||||
/* store this original bitmask setup to use later on if we cannot
|
||||
figure out a "real" bitmask */
|
||||
sshc->orig_waitfor = data->req.keepon;
|
||||
|
||||
|
|
@ -2218,7 +2218,7 @@ static CURLcode ssh_statemach_act(struct Curl_easy *data, bool *block)
|
|||
with both accordingly */
|
||||
data->state.select_bits = CURL_CSELECT_OUT;
|
||||
|
||||
/* since we don't really wait for anything at this point, we want the
|
||||
/* since we do not really wait for anything at this point, we want the
|
||||
state machine to move on as soon as possible so we set a very short
|
||||
timeout here */
|
||||
Curl_expire(data, 0, EXPIRE_RUN_NOW);
|
||||
|
|
@ -2262,7 +2262,7 @@ static CURLcode ssh_statemach_act(struct Curl_easy *data, bool *block)
|
|||
++sshc->slash_pos;
|
||||
if(rc < 0) {
|
||||
/*
|
||||
* Abort if failure wasn't that the dir already exists or the
|
||||
* Abort if failure was not that the dir already exists or the
|
||||
* permission was denied (creation might succeed further down the
|
||||
* path) - retry on unspecific FAILURE also
|
||||
*/
|
||||
|
|
@ -2497,9 +2497,9 @@ static CURLcode ssh_statemach_act(struct Curl_easy *data, bool *block)
|
|||
!(attrs.flags & LIBSSH2_SFTP_ATTR_SIZE) ||
|
||||
(attrs.filesize == 0)) {
|
||||
/*
|
||||
* libssh2_sftp_open() didn't return an error, so maybe the server
|
||||
* just doesn't support stat()
|
||||
* OR the server doesn't return a file size with a stat()
|
||||
* libssh2_sftp_open() did not return an error, so maybe the server
|
||||
* just does not support stat()
|
||||
* OR the server does not return a file size with a stat()
|
||||
* OR file size is 0
|
||||
*/
|
||||
data->req.size = -1;
|
||||
|
|
@ -2564,7 +2564,7 @@ static CURLcode ssh_statemach_act(struct Curl_easy *data, bool *block)
|
|||
/* We can resume if we can seek to the resume position */
|
||||
if(data->state.resume_from) {
|
||||
if(data->state.resume_from < 0) {
|
||||
/* We're supposed to download the last abs(from) bytes */
|
||||
/* We are supposed to download the last abs(from) bytes */
|
||||
if((curl_off_t)attrs.filesize < -data->state.resume_from) {
|
||||
failf(data, "Offset (%"
|
||||
CURL_FORMAT_CURL_OFF_T ") was beyond file size (%"
|
||||
|
|
@ -2714,7 +2714,7 @@ static CURLcode ssh_statemach_act(struct Curl_easy *data, bool *block)
|
|||
case SSH_SCP_UPLOAD_INIT:
|
||||
/*
|
||||
* libssh2 requires that the destination path is a full path that
|
||||
* includes the destination file and name OR ends in a "/" . If this is
|
||||
* includes the destination file and name OR ends in a "/" . If this is
|
||||
* not done the destination file will be named the same name as the last
|
||||
* directory in the path.
|
||||
*/
|
||||
|
|
@ -2756,7 +2756,7 @@ static CURLcode ssh_statemach_act(struct Curl_easy *data, bool *block)
|
|||
sshc->actualcode = result;
|
||||
}
|
||||
else {
|
||||
/* store this original bitmask setup to use later on if we can't
|
||||
/* store this original bitmask setup to use later on if we cannot
|
||||
figure out a "real" bitmask */
|
||||
sshc->orig_waitfor = data->req.keepon;
|
||||
|
||||
|
|
@ -2916,7 +2916,7 @@ static CURLcode ssh_statemach_act(struct Curl_easy *data, bool *block)
|
|||
break;
|
||||
|
||||
case SSH_SESSION_DISCONNECT:
|
||||
/* during weird times when we've been prematurely aborted, the channel
|
||||
/* during weird times when we have been prematurely aborted, the channel
|
||||
is still alive when we reach this state and we MUST kill the channel
|
||||
properly first */
|
||||
if(sshc->ssh_channel) {
|
||||
|
|
@ -3072,7 +3072,7 @@ static int ssh_getsock(struct Curl_easy *data,
|
|||
* When one of the libssh2 functions has returned LIBSSH2_ERROR_EAGAIN this
|
||||
* function is used to figure out in what direction and stores this info so
|
||||
* that the multi interface can take advantage of it. Make sure to call this
|
||||
* function in all cases so that when it _doesn't_ return EAGAIN we can
|
||||
* function in all cases so that when it _does not_ return EAGAIN we can
|
||||
* restore the default wait bits.
|
||||
*/
|
||||
static void ssh_block2waitfor(struct Curl_easy *data, bool block)
|
||||
|
|
@ -3089,7 +3089,7 @@ static void ssh_block2waitfor(struct Curl_easy *data, bool block)
|
|||
}
|
||||
}
|
||||
if(!dir)
|
||||
/* It didn't block or libssh2 didn't reveal in which direction, put back
|
||||
/* It did not block or libssh2 did not reveal in which direction, put back
|
||||
the original set */
|
||||
conn->waitfor = sshc->orig_waitfor;
|
||||
}
|
||||
|
|
@ -3105,7 +3105,7 @@ static CURLcode ssh_multi_statemach(struct Curl_easy *data, bool *done)
|
|||
do {
|
||||
result = ssh_statemach_act(data, &block);
|
||||
*done = (sshc->state == SSH_STOP) ? TRUE : FALSE;
|
||||
/* if there's no error, it isn't done and it didn't EWOULDBLOCK, then
|
||||
/* if there is no error, it is not done and it did not EWOULDBLOCK, then
|
||||
try again */
|
||||
} while(!result && !*done && !block);
|
||||
ssh_block2waitfor(data, block);
|
||||
|
|
@ -3492,7 +3492,7 @@ static CURLcode scp_disconnect(struct Curl_easy *data,
|
|||
(void) dead_connection;
|
||||
|
||||
if(sshc->ssh_session) {
|
||||
/* only if there's a session still around to use! */
|
||||
/* only if there is a session still around to use! */
|
||||
state(data, SSH_SESSION_DISCONNECT);
|
||||
result = ssh_block_statemach(data, conn, TRUE);
|
||||
}
|
||||
|
|
@ -3648,7 +3648,7 @@ static CURLcode sftp_disconnect(struct Curl_easy *data,
|
|||
DEBUGF(infof(data, "SSH DISCONNECT starts now"));
|
||||
|
||||
if(sshc->ssh_session) {
|
||||
/* only if there's a session still around to use! */
|
||||
/* only if there is a session still around to use! */
|
||||
state(data, SSH_SFTP_SHUTDOWN);
|
||||
result = ssh_block_statemach(data, conn, TRUE);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -243,10 +243,10 @@ struct ssh_conn {
|
|||
#endif
|
||||
|
||||
#ifdef HAVE_LIBSSH2_VERSION
|
||||
/* get it run-time if possible */
|
||||
/* get it runtime if possible */
|
||||
#define CURL_LIBSSH2_VERSION libssh2_version(0)
|
||||
#else
|
||||
/* use build-time if run-time not possible */
|
||||
/* use build-time if runtime not possible */
|
||||
#define CURL_LIBSSH2_VERSION LIBSSH2_VERSION
|
||||
#endif
|
||||
|
||||
|
|
|
|||
|
|
@ -400,7 +400,7 @@ static CURLcode wssh_connect(struct Curl_easy *data, bool *done)
|
|||
|
||||
rc = wolfSSH_SetUsername(sshc->ssh_session, conn->user);
|
||||
if(rc != WS_SUCCESS) {
|
||||
failf(data, "wolfSSH failed to set user name");
|
||||
failf(data, "wolfSSH failed to set username");
|
||||
goto error;
|
||||
}
|
||||
|
||||
|
|
@ -433,7 +433,7 @@ error:
|
|||
|
||||
/*
|
||||
* wssh_statemach_act() runs the SSH state machine as far as it can without
|
||||
* blocking and without reaching the end. The data the pointer 'block' points
|
||||
* blocking and without reaching the end. The data the pointer 'block' points
|
||||
* to will be set to TRUE if the wolfssh function returns EAGAIN meaning it
|
||||
* wants to be called again when the socket is ready
|
||||
*/
|
||||
|
|
@ -446,7 +446,7 @@ static CURLcode wssh_statemach_act(struct Curl_easy *data, bool *block)
|
|||
struct SSHPROTO *sftp_scp = data->req.p.ssh;
|
||||
WS_SFTPNAME *name;
|
||||
int rc = 0;
|
||||
*block = FALSE; /* we're not blocking by default */
|
||||
*block = FALSE; /* we are not blocking by default */
|
||||
|
||||
do {
|
||||
switch(sshc->state) {
|
||||
|
|
@ -641,7 +641,7 @@ static CURLcode wssh_statemach_act(struct Curl_easy *data, bool *block)
|
|||
failf(data, "Could not seek stream");
|
||||
return CURLE_FTP_COULDNT_USE_REST;
|
||||
}
|
||||
/* seekerr == CURL_SEEKFUNC_CANTSEEK (can't seek to offset) */
|
||||
/* seekerr == CURL_SEEKFUNC_CANTSEEK (cannot seek to offset) */
|
||||
do {
|
||||
char scratch[4*1024];
|
||||
size_t readthisamountnow =
|
||||
|
|
@ -690,7 +690,7 @@ static CURLcode wssh_statemach_act(struct Curl_easy *data, bool *block)
|
|||
sshc->actualcode = result;
|
||||
}
|
||||
else {
|
||||
/* store this original bitmask setup to use later on if we can't
|
||||
/* store this original bitmask setup to use later on if we cannot
|
||||
figure out a "real" bitmask */
|
||||
sshc->orig_waitfor = data->req.keepon;
|
||||
|
||||
|
|
@ -699,7 +699,7 @@ static CURLcode wssh_statemach_act(struct Curl_easy *data, bool *block)
|
|||
with both accordingly */
|
||||
data->state.select_bits = CURL_CSELECT_OUT;
|
||||
|
||||
/* since we don't really wait for anything at this point, we want the
|
||||
/* since we do not really wait for anything at this point, we want the
|
||||
state machine to move on as soon as possible so we set a very short
|
||||
timeout here */
|
||||
Curl_expire(data, 0, EXPIRE_RUN_NOW);
|
||||
|
|
@ -908,7 +908,7 @@ static CURLcode wssh_multi_statemach(struct Curl_easy *data, bool *done)
|
|||
do {
|
||||
result = wssh_statemach_act(data, &block);
|
||||
*done = (sshc->state == SSH_STOP) ? TRUE : FALSE;
|
||||
/* if there's no error, it isn't done and it didn't EWOULDBLOCK, then
|
||||
/* if there is no error, it is not done and it did not EWOULDBLOCK, then
|
||||
try again */
|
||||
if(*done) {
|
||||
DEBUGF(infof(data, "wssh_statemach_act says DONE"));
|
||||
|
|
@ -1121,7 +1121,7 @@ static CURLcode wsftp_disconnect(struct Curl_easy *data,
|
|||
DEBUGF(infof(data, "SSH DISCONNECT starts now"));
|
||||
|
||||
if(conn->proto.sshc.ssh_session) {
|
||||
/* only if there's a session still around to use! */
|
||||
/* only if there is a session still around to use! */
|
||||
state(data, SSH_SFTP_SHUTDOWN);
|
||||
result = wssh_block_statemach(data, TRUE);
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue