tyler.durden/Win32-OpenSSH
1
0
Fork 0
mirror of https://github.com/PowerShell/Win32-OpenSSH.git synced 2025-07-27 07:54:50 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fix output in sftp.

Browse Source
This commit is contained in:
Ray Hayes 2016-10-21 16:13:39 -07:00
parent 5d600bcad6
commit 24175599cc
1 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
sftp.c
View File

@ -855,7 +855,9 @@ do_ls_dir(struct sftp_conn *conn, char *path, char *strip_path, int lflag)
(lflag & LS_SI_UNITS)); (lflag & LS_SI_UNITS));
#ifdef WINDOWS #ifdef WINDOWS
wchar_t* wtmp = utf8_to_utf16(lname); wchar_t* wtmp = utf8_to_utf16(lname);
wprintf_s(L"%ls\n", wtmp); WriteConsoleW(GetStdHandle(STD_OUTPUT_HANDLE), wtmp, wcslen(wtmp), 0, 0);
WriteConsoleW(GetStdHandle(STD_OUTPUT_HANDLE), L"\n", 1, 0, 0);
free(tmp); free(tmp);
#else #else
printf("%s\n", lname); printf("%s\n", lname);
@ -865,7 +867,8 @@ do_ls_dir(struct sftp_conn *conn, char *path, char *strip_path, int lflag)
else { else {
#ifdef WINDOWS #ifdef WINDOWS
wchar_t* wtmp = utf8_to_utf16(d[n]->longname); wchar_t* wtmp = utf8_to_utf16(d[n]->longname);
wprintf_s(L"%ls\n", wtmp); WriteConsoleW(GetStdHandle(STD_OUTPUT_HANDLE), wtmp, wcslen(wtmp), 0, 0);
WriteConsoleW(GetStdHandle(STD_OUTPUT_HANDLE), L"\n", 1, 0, 0);
free(wtmp); free(wtmp);
#else #else
printf("%s\n", d[n]->longname); printf("%s\n", d[n]->longname);
@ -875,7 +878,9 @@ do_ls_dir(struct sftp_conn *conn, char *path, char *strip_path, int lflag)
else { else {
#ifdef WINDOWS #ifdef WINDOWS
wchar_t* wtmp = utf8_to_utf16(fname); wchar_t* wtmp = utf8_to_utf16(fname);
wprintf_s(L"%-*ls", colspace, wtmp); // TODO: Deal with the sizing wprintf_s(L"%-*s", colspace, wtmp);
WriteConsoleW(GetStdHandle(STD_OUTPUT_HANDLE), wtmp, wcslen(wtmp), 0, 0);
WriteConsoleW(GetStdHandle(STD_OUTPUT_HANDLE), L" ", 1, 0, 0);
free(wtmp); free(wtmp);
#else #else
printf("%-*s", colspace, fname); printf("%-*s", colspace, fname);
@ -1641,7 +1646,10 @@ parse_dispatch_command(struct sftp_conn *conn, const char *cmd, char **pwd,
} }
break; break;
case I_PWD: case I_PWD:
printf("Remote working directory: %s\n", *pwd); printf("Remote working directory: ");
wchar_t* wtmp = utf8_to_utf16(*pwd);
WriteConsoleW(GetStdHandle(STD_OUTPUT_HANDLE), wtmp, wcslen(wtmp), 0, 0);
WriteConsoleW(GetStdHandle(STD_OUTPUT_HANDLE), L"\n", 1, 0, 0);
break; break;
case I_LPWD: case I_LPWD:
if (!getcwd(path_buf, sizeof(path_buf))) { if (!getcwd(path_buf, sizeof(path_buf))) {