nhyatt/putty-source
1
0
Fork 0
mirror of https://git.tartarus.org/simon/putty.git synced 2025-01-27 02:02:26 +00:00
Code Issues Projects Releases Wiki Activity

Robert de Bath's patch: when the user presses CR, the Telnet backend

Browse Source 
now sends NVT `NL' (CR,LF) instead of NVT `CR' (CR,NUL). Unix
telnetd apparently cares not a jot for the difference, but others do.

[originally from svn r407]
This commit is contained in:
Simon Tatham 2000-03-11 14:25:35 +00:00
parent 30ee1109f1
commit de9572d7a6
1 changed files with 33 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
telnet.c
View File

@ -575,6 +575,15 @@ static char *telnet_init (HWND hwnd, char *host, int port, char **realhost) {
/* /*
* Initialise option states. * Initialise option states.
*/ */
if( cfg.ldisc_term )
{
struct Opt **o;
for (o = opts; *o; o++)
if ((*o)->state == REQUESTED)
(*o)->state = INACTIVE;
}
else
{ {
struct Opt **o; struct Opt **o;
@ -666,19 +675,41 @@ static void telnet_send (char *buf, int len) {
char *p; char *p;
static unsigned char iac[2] = { IAC, IAC }; static unsigned char iac[2] = { IAC, IAC };
static unsigned char cr[2] = { CR, NUL }; static unsigned char cr[2] = { CR, NUL };
static unsigned char nl[2] = { CR, LF };
if (s == INVALID_SOCKET) if (s == INVALID_SOCKET)
return; return;
p = buf; p = buf;
if (cfg.ldisc_term) {
while (p < buf+len) { while (p < buf+len) {
char *q = p; char *q = p;
unsigned char * cstr = 0;
while (p < buf+len) {
if ((unsigned char)*p == IAC) {
cstr = iac;
break;
}
if (*p == '\r') {
if( p+1 >= buf+len || ( p[1] != '\n' && p[1] != '\0'))
{
cstr = cr;
break;
}
}
p++;
}
if (p!=q) s_write (q, p-q);
if (cstr) s_write (cstr,2), p++;
}
} else while (p < buf+len) {
char *q = p;
while (iswritable((unsigned char)*p) && p < buf+len) p++; while (iswritable((unsigned char)*p) && p < buf+len) p++;
s_write (q, p-q); s_write (q, p-q);
while (p < buf+len && !iswritable((unsigned char)*p)) { while (p < buf+len && !iswritable((unsigned char)*p)) {
s_write ((unsigned char)*p == IAC ? iac : cr, 2); s_write ((unsigned char)*p == IAC ? iac : nl, 2);
p++; p++;
} }
} }