Merge pull request #653 from JacobBarthelmeh/sftp_large

fix for build on windows, and fix for sftp file transfer from windows
wolfSSL · Feb 2, 2024 · 94354d4 · 94354d4
2 parents 53a82e7 + 23e8405
commit 94354d4
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/apps/wolfsshd/wolfsshd.c b/apps/wolfsshd/wolfsshd.c
@@ -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)

diff --git a/src/wolfsftp.c b/src/wolfsftp.c
@@ -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 */