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

Merge pull request #653 from JacobBarthelmeh/sftp_large 

fix for build on windows, and fix for sftp file transfer from windows
pull/655/head
Daniel Pouzzner 2024-02-02 17:51:15 -05:00 committed by GitHub
parent 53a82e7524 23e8405c43
commit 94354d43bd
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
apps/wolfsshd/wolfsshd.c
View File

@ -904,8 +904,8 @@ static int SHELL_Subsystem(WOLFSSHD_CONNECTION* conn, WOLFSSH* ssh,
CreatePipe(&cnslIn, &ptyIn, NULL, 0);
CreatePipe(&ptyOut, &cnslOut, NULL, 0);
cord.X = ssh->curX;
cord.Y = ssh->curY;
cord.X = ssh->widthChar;
cord.Y = ssh->heightRows;
/* Sanity check on cord values, if 0 than assume was not set.
* (can happen with exec and not req-pty message)

3
src/wolfsftp.c
View File

@ -4489,7 +4489,8 @@ int SFTP_GetAttributes(void* fs, const char* fileName, WS_SFTP_FILEATRB* atr,
atr->flags |= WOLFSSH_FILEATRB_PERM;
atr->per = 0555 |
(stats.dwFileAttributes | FILE_ATTRIBUTE_READONLY ? 0 : 0200);
atr->per |= (stats.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY) ? 0x4000:0;
atr->per |= (stats.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY) ? 0x4000:
FILEATRB_PER_FILE;
#if 0
/* @TODO handle the constellation of possible Windows FILETIMEs */