b8f10be4f2 — curl

Subject

libssh: acknowledge SSH_AGAIN in the SFTP state machine

Binary

No binary (build failed)

Architecture & Compiler Flags

Architecture: x86_64-linux-gnu Compiler: gcc (Ubuntu 11.4.0-1ubuntu1~22.04.3) 11.4.0

—

Build Log

(log yok)

Commit Diff GitHub →

lib/vssh/libssh.c +12 -0

lib/vssh/libssh.c+12 -0

@@ -1959,6 +1959,8 @@ static CURLcode myssh_statemach_act(struct Curl_easy *data,
	case SSH_SFTP_QUOTE_SETSTAT:
	rc = sftp_setstat(sshc->sftp_session, sshc->quote_path2,
	sshc->quote_attrs);
+	if(rc == SSH_AGAIN)
+	break;
	if(rc && !sshc->acceptfail) {
	Curl_safefree(sshc->quote_path1);
	Curl_safefree(sshc->quote_path2);
@@ -1978,6 +1980,8 @@ static CURLcode myssh_statemach_act(struct Curl_easy *data,
	case SSH_SFTP_QUOTE_SYMLINK:
	rc = sftp_symlink(sshc->sftp_session, sshc->quote_path2,
	sshc->quote_path1);
+	if(rc == SSH_AGAIN)
+	break;
	if(rc && !sshc->acceptfail) {
	Curl_safefree(sshc->quote_path1);
	Curl_safefree(sshc->quote_path2);
@@ -1994,6 +1998,8 @@ static CURLcode myssh_statemach_act(struct Curl_easy *data,
	case SSH_SFTP_QUOTE_MKDIR:
	rc = sftp_mkdir(sshc->sftp_session, sshc->quote_path1,
	(mode_t)data->set.new_directory_perms);
+	if(rc == SSH_AGAIN)
+	break;
	if(rc && !sshc->acceptfail) {
	Curl_safefree(sshc->quote_path1);
	failf(data, "mkdir command failed: %s",
@@ -2009,6 +2015,8 @@ static CURLcode myssh_statemach_act(struct Curl_easy *data,
	case SSH_SFTP_QUOTE_RENAME:
	rc = sftp_rename(sshc->sftp_session, sshc->quote_path1,
	sshc->quote_path2);
+	if(rc == SSH_AGAIN)
+	break;
	if(rc && !sshc->acceptfail) {
	Curl_safefree(sshc->quote_path1);
	Curl_safefree(sshc->quote_path2);
@@ -2024,6 +2032,8 @@ static CURLcode myssh_statemach_act(struct Curl_easy *data,

	case SSH_SFTP_QUOTE_RMDIR:
	rc = sftp_rmdir(sshc->sftp_session, sshc->quote_path1);
+	if(rc == SSH_AGAIN)
+	break;
	if(rc && !sshc->acceptfail) {
	Curl_safefree(sshc->quote_path1);
	failf(data, "rmdir command failed: %s",
@@ -2038,6 +2048,8 @@ static CURLcode myssh_statemach_act(struct Curl_easy *data,

	case SSH_SFTP_QUOTE_UNLINK:
	rc = sftp_unlink(sshc->sftp_session, sshc->quote_path1);
+	if(rc == SSH_AGAIN)
+	break;
	if(rc && !sshc->acceptfail) {
	Curl_safefree(sshc->quote_path1);
	failf(data, "rm command failed: %s",