WolfSSL
/
wolfssh
mirror of https://github.com/wolfSSL/wolfssh.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge pull request #433 from anhu/dir_list_all 

Fixes directory listing output in sftp.
pull/438/head
David Garske 2022-08-08 07:57:37 -07:00 committed by GitHub
parent 0f6e7841de 9830846ec1
commit 7c1fd84af7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 34 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
src/wolfsftp.c
View File

@ -5723,6 +5723,9 @@ static WS_SFTPNAME* wolfSSH_SFTP_DoName(WOLFSSH* ssh)
wolfSSH_SFTP_buffer_rewind(&state->buffer); wolfSSH_SFTP_buffer_rewind(&state->buffer);
wolfSSH_SFTP_DoStatus(ssh, reqId, &state->buffer); wolfSSH_SFTP_DoStatus(ssh, reqId, &state->buffer);
if (ssh->error != WS_WANT_READ) {
wolfSSH_SFTP_ClearState(ssh, STATE_ID_NAME);
}
return NULL; return NULL;
} }
NO_BREAK; NO_BREAK;
@ -6017,6 +6020,7 @@ WS_SFTPNAME* wolfSSH_SFTP_LS(WOLFSSH* ssh, char* dir)
{ {
struct WS_SFTP_LS_STATE* state = NULL; struct WS_SFTP_LS_STATE* state = NULL;
WS_SFTPNAME* name = NULL; WS_SFTPNAME* name = NULL;
WS_SFTPNAME* names = NULL;
if (ssh == NULL || dir == NULL) { if (ssh == NULL || dir == NULL) {
WLOG(WS_LOG_SFTP, "Bad argument passed in"); WLOG(WS_LOG_SFTP, "Bad argument passed in");
@ -6077,15 +6081,42 @@ WS_SFTPNAME* wolfSSH_SFTP_LS(WOLFSSH* ssh, char* dir)
NO_BREAK; NO_BREAK;
case STATE_LS_READDIR: case STATE_LS_READDIR:
/* now read the dir */ /* Now read the dir. Note in non-blocking we might get here multiple
state->name = wolfSSH_SFTP_ReadDir(ssh, state->handle, state->sz); * times so we have to assign to state->name later. */
if (state->name == NULL) { names = wolfSSH_SFTP_ReadDir(ssh, state->handle, state->sz);
if (names == NULL) {
if (ssh->error == WS_WANT_READ || ssh->error == WS_WANT_WRITE) { if (ssh->error == WS_WANT_READ || ssh->error == WS_WANT_WRITE) {
return NULL; return NULL;
} }
WLOG(WS_LOG_SFTP, "Error reading directory"); WLOG(WS_LOG_SFTP, "Error reading directory");
/* fall through because the handle should always be closed */ /* fall through because the handle should always be closed */
} }
while (names != NULL) {
if (state->name == NULL) {
state->name = names;
}
else {
WS_SFTPNAME* runner = NULL;
/* Got more entries so we append them. */
for (runner = state->name;
runner->next != NULL;
runner = runner->next);
runner->next = names;
}
names = wolfSSH_SFTP_ReadDir(ssh, state->handle, state->sz);
if (names == NULL) {
if (ssh->error == WS_WANT_READ
|| ssh->error == WS_WANT_WRITE) {
/* State does not change so we will get back to this case
* clause in non-blocking mode. */
return NULL;
}
WLOG(WS_LOG_SFTP, "Error reading directory");
/* fall through because the handle should always be closed. */
}
}
state->state = STATE_LS_CLOSE; state->state = STATE_LS_CLOSE;
NO_BREAK; NO_BREAK;