Skip to content

Commit dcb6346

Browse files
committed
Unicode enabled on ssh prompts
1 parent 0af8ae3 commit dcb6346

File tree

2 files changed

+1
-41
lines changed

2 files changed

+1
-41
lines changed

readpass.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -334,7 +334,7 @@ read_passphrase(const char *prompt, int flags)
334334
/*
335335
* Show prompt for user.
336336
*/
337-
_cputs(prompt);
337+
_cputws(utf8_to_utf16(prompt));
338338

339339
len = retr = 0;
340340
int bufsize = sizeof(buf);

sshd.c

Lines changed: 0 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -1691,43 +1691,6 @@ server_accept_loop(int *sock_in, int *sock_out, int *newsock, int *config_s)
16911691
}
16921692
}
16931693

1694-
#ifdef WIN32_FIXME
1695-
1696-
/*
1697-
* Win32 only.
1698-
*/
1699-
1700-
1701-
/*
1702-
* This function handles exit signal from parent process.
1703-
*/
1704-
1705-
BOOL WINAPI CtrlHandlerRoutine(DWORD dwCtrlType)
1706-
{
1707-
switch( dwCtrlType )
1708-
{
1709-
case CTRL_C_EVENT:
1710-
return TRUE; // control C will be passed to shell but sshd wil not exit
1711-
1712-
case CTRL_BREAK_EVENT:
1713-
case CTRL_LOGOFF_EVENT:
1714-
break;
1715-
1716-
default:
1717-
break;
1718-
}
1719-
1720-
debug("Exit signal received...");
1721-
1722-
cleanup_exit(0);
1723-
1724-
return TRUE;
1725-
}
1726-
1727-
#endif /* WIN32_FIXME */
1728-
1729-
1730-
17311694
/*
17321695
* Main program for the daemon.
17331696
*/
@@ -1768,9 +1731,6 @@ main(int ac, char **av)
17681731

17691732
AllocConsole();
17701733

1771-
SetConsoleCtrlHandler(CtrlHandlerRoutine, TRUE);
1772-
1773-
17741734
#endif /* WIN32_FIXME */
17751735

17761736

0 commit comments

Comments
 (0)