moparisthebest/curl
1
0
Fork 0
mirror of https://github.com/moparisthebest/curl synced 2024-12-22 08:08:50 -05:00
Code Issues Releases Wiki Activity

SSH: support CURLINFO_FILETIME

Browse Source
This commit is contained in:
marquis-de-muesli 2016-02-23 23:18:31 +01:00 committed by Daniel Stenberg
parent e32644851a
commit f9d27e0f8e
2 changed files with 36 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
lib/ssh.c
View File

@ -362,6 +362,8 @@ static void state(struct connectdata *conn, sshstate nowstate)
"SSH_SFTP_QUOTE_RENAME", "SSH_SFTP_QUOTE_RENAME",
"SSH_SFTP_QUOTE_RMDIR", "SSH_SFTP_QUOTE_RMDIR",
"SSH_SFTP_QUOTE_UNLINK", "SSH_SFTP_QUOTE_UNLINK",
"SSH_SFTP_GETINFO",
"SSH_SFTP_FILETIME",
"SSH_SFTP_TRANS_INIT", "SSH_SFTP_TRANS_INIT",
"SSH_SFTP_UPLOAD_INIT", "SSH_SFTP_UPLOAD_INIT",
"SSH_SFTP_CREATE_DIRS_INIT", "SSH_SFTP_CREATE_DIRS_INIT",
@ -1183,7 +1185,7 @@ static CURLcode ssh_statemach_act(struct connectdata *conn, bool *block)
state(conn, SSH_SFTP_QUOTE); state(conn, SSH_SFTP_QUOTE);
} }
else { else {
state(conn, SSH_SFTP_TRANS_INIT); state(conn, SSH_SFTP_GETINFO);
} }
break; break;
@ -1372,7 +1374,7 @@ static CURLcode ssh_statemach_act(struct connectdata *conn, bool *block)
} }
} }
if(!sshc->quote_item) { if(!sshc->quote_item) {
state(conn, SSH_SFTP_TRANS_INIT); state(conn, SSH_SFTP_GETINFO);
} }
break; break;
@ -1391,7 +1393,7 @@ static CURLcode ssh_statemach_act(struct connectdata *conn, bool *block)
sshc->nextstate = SSH_NO_STATE; sshc->nextstate = SSH_NO_STATE;
} }
else { else {
state(conn, SSH_SFTP_TRANS_INIT); state(conn, SSH_SFTP_GETINFO);
} }
} }
break; break;
@ -1611,6 +1613,35 @@ static CURLcode ssh_statemach_act(struct connectdata *conn, bool *block)
state(conn, SSH_SFTP_NEXT_QUOTE); state(conn, SSH_SFTP_NEXT_QUOTE);
break; break;
case SSH_SFTP_GETINFO:
{
if(data->set.get_filetime) {
state(conn, SSH_SFTP_FILETIME);
}
else {
state(conn, SSH_SFTP_TRANS_INIT);
}
break;
}
case SSH_SFTP_FILETIME:
{
LIBSSH2_SFTP_ATTRIBUTES attrs;
rc = libssh2_sftp_stat_ex(sshc->sftp_session, sftp_scp->path,
curlx_uztoui(strlen(sftp_scp->path)),
LIBSSH2_SFTP_STAT, &attrs);
if(rc == LIBSSH2_ERROR_EAGAIN) {
break;
}
else if(rc == 0) {
data->info.filetime = (long)attrs.mtime;
}
state(conn, SSH_SFTP_TRANS_INIT);
break;
}
case SSH_SFTP_TRANS_INIT: case SSH_SFTP_TRANS_INIT:
if(data->set.upload) if(data->set.upload)
state(conn, SSH_SFTP_UPLOAD_INIT); state(conn, SSH_SFTP_UPLOAD_INIT);

2
lib/ssh.h
View File

@ -66,6 +66,8 @@ typedef enum {
SSH_SFTP_QUOTE_RENAME, SSH_SFTP_QUOTE_RENAME,
SSH_SFTP_QUOTE_RMDIR, SSH_SFTP_QUOTE_RMDIR,
SSH_SFTP_QUOTE_UNLINK, SSH_SFTP_QUOTE_UNLINK,
SSH_SFTP_GETINFO,
SSH_SFTP_FILETIME,
SSH_SFTP_TRANS_INIT, SSH_SFTP_TRANS_INIT,
SSH_SFTP_UPLOAD_INIT, SSH_SFTP_UPLOAD_INIT,
SSH_SFTP_CREATE_DIRS_INIT, SSH_SFTP_CREATE_DIRS_INIT,