tyler.durden
/
Win32-OpenSSH
mirror of https://github.com/PowerShell/Win32-OpenSSH.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

cleaned up do_exec on Windows

This commit is contained in:
Manoj Ampalam 2016-10-18 23:20:24 -07:00
parent 1f3c6ff246
commit 601c2b6e81
4 changed files with 8 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
contrib/win32/win32compat/console.c
View File

@ -46,7 +46,6 @@
#define ENABLE_VIRTUAL_TERMINAL_PROCESSING 0x4
#endif
HANDLE hInputConsole = NULL;
HANDLE hOutputConsole = NULL;
DWORD dwSavedAttributes = 0;
WORD wStartingAttributes = 0;

42
session.c
View File

@ -112,9 +112,6 @@ FIXME: GFPZR: Function stat() may be undeclared.
#include <Userenv.h>
#include <shlobj.h>
#ifdef WIN32_PRAGMA_REMCON
#include <shlwapi.h>
#endif
extern char HomeDirLsaW[MAX_PATH];
#endif
@ -498,24 +495,6 @@ int do_exec_windows(Session *s, const char *command, int pty) {
wchar_t* pw_dir_utf16 = utf8_to_utf16(s->pw->pw_dir);
extern int debug_flag;
if (s->is_subsystem == SUBSYSTEM_INT_SFTP_ERROR)
{
printf("This service allows sftp connections only.\n");
fflush(NULL);
exit(1);
}
else if (s->is_subsystem == SUBSYSTEM_INT_SFTP)
{
u_int i;
for (i = 0; i < options.num_subsystems; i++)
{
if (strcmp("sftp", options.subsystem_name[i]) == 0)
{
command = options.subsystem_args[i];
}
}
}
PROCESS_INFORMATION pi;
STARTUPINFOW si;
@ -532,9 +511,14 @@ int do_exec_windows(Session *s, const char *command, int pty) {
char *exec_command;
char *laddr;
char buf[256];
#ifdef WIN32_PRAGMA_REMCON
char exec_command_str[512];
#endif
if (s->is_subsystem >= SUBSYSTEM_INT_SFTP_ERROR)
{
error("sub system not supported, exiting\n");
fflush(NULL);
exit(1);
}
if (!command)
{
@ -555,12 +539,6 @@ int do_exec_windows(Session *s, const char *command, int pty) {
int retcode = -1;
if ((!s->is_subsystem) && (s->ttyfd != -1))
{
extern HANDLE hInputConsole;
extern HANDLE hOutputConsole;
hInputConsole = GetConsoleInputHandle();
hOutputConsole = GetConsoleOutputHandle();
ConSetScreenSize(s->col, s->row);
s->ptyfd = pipein[1]; // hConsole; // the pty is the Windows console output handle in our Win32 port
}
debug3("sockin[0]: %d sockin[1]: %d", pipein[0], pipein[1]);
@ -2539,9 +2517,7 @@ session_pty_req(Session *s)
/* for SSH1 the tty modes length is not given */
if (!compat20)
n_bytes = packet_remaining();
#ifndef WIN32_PRAGMA_REMCON
tty_parse_modes(s->ttyfd, &n_bytes);
#endif
if (!use_privsep)
pty_setowner(s->pw, s->tty);
@ -2549,9 +2525,7 @@ session_pty_req(Session *s)
/* Set window size from the packet. */
pty_change_window_size(s->ptyfd, s->row, s->col, s->xpixel, s->ypixel);
#ifndef WIN32_PRAGMA_REMCON
packet_check_eom();
#endif
session_proctitle(s);
return 1;
}

2
ssh.c
View File

@ -118,7 +118,6 @@
#include <sys/stat.h>
char dotsshdir[MAX_PATH];
extern HANDLE hInputConsole;
#endif /* WIN32_FIXME */
@ -1393,7 +1392,6 @@ main(int ac, char **av)
if (tty_flag) {
//AllocConsole();
ConInputInitParams(); // init the Console input side with global parameters
hInputConsole = GetStdHandle(STD_INPUT_HANDLE);
ConInit(STD_OUTPUT_HANDLE, TRUE); //init the output console surface for us to write
ConClearScreen();
}

1
sshpty.c
View File

@ -21,7 +21,6 @@
#ifdef WIN32_FIXME
#undef GSSAPI
#undef KRB5
//#define WIN32_PRAGMA_REMCON
#endif
#include <sys/types.h>