mirror of
https://git.tartarus.org/simon/putty.git
synced 2025-07-02 12:02:47 -05:00
Whitespace rationalisation of entire code base.
The number of people has been steadily increasing who read our source
code with an editor that thinks tab stops are 4 spaces apart, as
opposed to the traditional tty-derived 8 that the PuTTY code expects.
So I've been wondering for ages about just fixing it, and switching to
a spaces-only policy throughout the code. And I recently found out
about 'git blame -w', which should make this change not too disruptive
for the purposes of source-control archaeology; so perhaps now is the
time.
While I'm at it, I've also taken the opportunity to remove all the
trailing spaces from source lines (on the basis that git dislikes
them, and is the only thing that seems to have a strong opinion one
way or the other).
Apologies to anyone downstream of this code who has complicated patch
sets to rebase past this change. I don't intend it to be needed again.
This commit is contained in:
Simon Tatham
@ -13,27 +13,27 @@
|
||||
#include "malloc.h"
|
||||
#include "pty.h"
|
||||
|
||||
#define IAC 255 /* interpret as command: */
|
||||
#define DONT 254 /* you are not to use option */
|
||||
#define DO 253 /* please, you use option */
|
||||
#define WONT 252 /* I won't use option */
|
||||
#define WILL 251 /* I will use option */
|
||||
#define SB 250 /* interpret as subnegotiation */
|
||||
#define SE 240 /* end sub negotiation */
|
||||
#define IAC 255 /* interpret as command: */
|
||||
#define DONT 254 /* you are not to use option */
|
||||
#define DO 253 /* please, you use option */
|
||||
#define WONT 252 /* I won't use option */
|
||||
#define WILL 251 /* I will use option */
|
||||
#define SB 250 /* interpret as subnegotiation */
|
||||
#define SE 240 /* end sub negotiation */
|
||||
|
||||
#define GA 249 /* you may reverse the line */
|
||||
#define EL 248 /* erase the current line */
|
||||
#define EC 247 /* erase the current character */
|
||||
#define AYT 246 /* are you there */
|
||||
#define AO 245 /* abort output--but let prog finish */
|
||||
#define IP 244 /* interrupt process--permanently */
|
||||
#define BREAK 243 /* break */
|
||||
#define DM 242 /* data mark--for connect. cleaning */
|
||||
#define NOP 241 /* nop */
|
||||
#define EOR 239 /* end of record (transparent mode) */
|
||||
#define ABORT 238 /* Abort process */
|
||||
#define SUSP 237 /* Suspend process */
|
||||
#define xEOF 236 /* End of file: EOF is already used... */
|
||||
#define GA 249 /* you may reverse the line */
|
||||
#define EL 248 /* erase the current line */
|
||||
#define EC 247 /* erase the current character */
|
||||
#define AYT 246 /* are you there */
|
||||
#define AO 245 /* abort output--but let prog finish */
|
||||
#define IP 244 /* interrupt process--permanently */
|
||||
#define BREAK 243 /* break */
|
||||
#define DM 242 /* data mark--for connect. cleaning */
|
||||
#define NOP 241 /* nop */
|
||||
#define EOR 239 /* end of record (transparent mode) */
|
||||
#define ABORT 238 /* Abort process */
|
||||
#define SUSP 237 /* Suspend process */
|
||||
#define xEOF 236 /* End of file: EOF is already used... */
|
||||
|
||||
#define TELOPTS(X) \
|
||||
X(BINARY, 0) /* 8-bit data path */ \
|
||||
@ -95,9 +95,9 @@
|
||||
enum { TELOPTS(telnet_enum) dummy=0 };
|
||||
#undef telnet_enum
|
||||
|
||||
#define TELQUAL_IS 0 /* option is... */
|
||||
#define TELQUAL_SEND 1 /* send option */
|
||||
#define TELQUAL_INFO 2 /* ENVIRON: informational version of IS */
|
||||
#define TELQUAL_IS 0 /* option is... */
|
||||
#define TELQUAL_SEND 1 /* send option */
|
||||
#define TELQUAL_INFO 2 /* ENVIRON: informational version of IS */
|
||||
#define BSD_VAR 1
|
||||
#define BSD_VALUE 0
|
||||
#define RFC_VAR 0
|
||||
@ -113,9 +113,9 @@ static char *telopt(int opt)
|
||||
{
|
||||
#define telnet_str(x,y) case TELOPT_##x: return #x;
|
||||
switch (opt) {
|
||||
TELOPTS(telnet_str)
|
||||
TELOPTS(telnet_str)
|
||||
default:
|
||||
return "<unknown>";
|
||||
return "<unknown>";
|
||||
}
|
||||
#undef telnet_str
|
||||
}
|
||||
@ -123,13 +123,13 @@ static char *telopt(int opt)
|
||||
static void telnet_size(void *handle, int width, int height);
|
||||
|
||||
struct Opt {
|
||||
int send; /* what we initially send */
|
||||
int nsend; /* -ve send if requested to stop it */
|
||||
int ack, nak; /* +ve and -ve acknowledgements */
|
||||
int option; /* the option code */
|
||||
int index; /* index into telnet->opt_states[] */
|
||||
int send; /* what we initially send */
|
||||
int nsend; /* -ve send if requested to stop it */
|
||||
int ack, nak; /* +ve and -ve acknowledgements */
|
||||
int option; /* the option code */
|
||||
int index; /* index into telnet->opt_states[] */
|
||||
enum {
|
||||
REQUESTED, ACTIVE, INACTIVE, REALLY_INACTIVE
|
||||
REQUESTED, ACTIVE, INACTIVE, REALLY_INACTIVE
|
||||
} initial_state;
|
||||
};
|
||||
|
||||
@ -174,8 +174,8 @@ struct Telnet {
|
||||
int sb_size;
|
||||
|
||||
enum {
|
||||
TOP_LEVEL, SEENIAC, SEENWILL, SEENWONT, SEENDO, SEENDONT,
|
||||
SEENSB, SUBNEGOT, SUBNEG_IAC, SEENCR
|
||||
TOP_LEVEL, SEENIAC, SEENWILL, SEENWONT, SEENDO, SEENDONT,
|
||||
SEENSB, SUBNEGOT, SUBNEG_IAC, SEENCR
|
||||
} state;
|
||||
|
||||
sel_wfd *net, *pty;
|
||||
@ -210,8 +210,8 @@ static void send_opt(Telnet *telnet, int cmd, int option)
|
||||
static void deactivate_option(Telnet *telnet, const struct Opt *o)
|
||||
{
|
||||
if (telnet->opt_states[o->index] == REQUESTED ||
|
||||
telnet->opt_states[o->index] == ACTIVE)
|
||||
send_opt(telnet, o->nsend, o->option);
|
||||
telnet->opt_states[o->index] == ACTIVE)
|
||||
send_opt(telnet, o->nsend, o->option);
|
||||
telnet->opt_states[o->index] = REALLY_INACTIVE;
|
||||
}
|
||||
|
||||
@ -225,16 +225,16 @@ static void option_side_effects(Telnet *telnet, const struct Opt *o, int enabled
|
||||
static void activate_option(Telnet *telnet, const struct Opt *o)
|
||||
{
|
||||
if (o->option == TELOPT_NEW_ENVIRON ||
|
||||
o->option == TELOPT_OLD_ENVIRON ||
|
||||
o->option == TELOPT_TTYPE) {
|
||||
char buf[6];
|
||||
buf[0] = IAC;
|
||||
buf[1] = SB;
|
||||
buf[2] = o->option;
|
||||
buf[3] = TELQUAL_SEND;
|
||||
buf[4] = IAC;
|
||||
buf[5] = SE;
|
||||
sel_write(telnet->net, buf, 6);
|
||||
o->option == TELOPT_OLD_ENVIRON ||
|
||||
o->option == TELOPT_TTYPE) {
|
||||
char buf[6];
|
||||
buf[0] = IAC;
|
||||
buf[1] = SB;
|
||||
buf[2] = o->option;
|
||||
buf[3] = TELQUAL_SEND;
|
||||
buf[4] = IAC;
|
||||
buf[5] = SE;
|
||||
sel_write(telnet->net, buf, 6);
|
||||
}
|
||||
option_side_effects(telnet, o, 1);
|
||||
}
|
||||
@ -242,15 +242,15 @@ static void activate_option(Telnet *telnet, const struct Opt *o)
|
||||
static void done_option(Telnet *telnet, int option)
|
||||
{
|
||||
if (option == TELOPT_OLD_ENVIRON)
|
||||
telnet->old_environ_done = 1;
|
||||
telnet->old_environ_done = 1;
|
||||
else if (option == TELOPT_NEW_ENVIRON)
|
||||
telnet->new_environ_done = 1;
|
||||
telnet->new_environ_done = 1;
|
||||
else if (option == TELOPT_TTYPE)
|
||||
telnet->ttype_done = 1;
|
||||
telnet->ttype_done = 1;
|
||||
|
||||
if (telnet->old_environ_done && telnet->new_environ_done &&
|
||||
telnet->ttype_done) {
|
||||
telnet->shell_ok = 1;
|
||||
telnet->ttype_done) {
|
||||
telnet->shell_ok = 1;
|
||||
}
|
||||
}
|
||||
|
||||
@ -258,10 +258,10 @@ static void refused_option(Telnet *telnet, const struct Opt *o)
|
||||
{
|
||||
done_option(telnet, o->option);
|
||||
if (o->send == WILL && o->option == TELOPT_NEW_ENVIRON &&
|
||||
telnet->opt_states[o_oenv.index] == INACTIVE) {
|
||||
send_opt(telnet, WILL, TELOPT_OLD_ENVIRON);
|
||||
telnet->opt_states[o_oenv.index] = REQUESTED;
|
||||
telnet->old_environ_done = 0;
|
||||
telnet->opt_states[o_oenv.index] == INACTIVE) {
|
||||
send_opt(telnet, WILL, TELOPT_OLD_ENVIRON);
|
||||
telnet->opt_states[o_oenv.index] = REQUESTED;
|
||||
telnet->old_environ_done = 0;
|
||||
}
|
||||
option_side_effects(telnet, o, 0);
|
||||
}
|
||||
@ -271,41 +271,41 @@ static void proc_rec_opt(Telnet *telnet, int cmd, int option)
|
||||
const struct Opt *const *o;
|
||||
|
||||
for (o = opts; *o; o++) {
|
||||
if ((*o)->option == option && (*o)->ack == cmd) {
|
||||
switch (telnet->opt_states[(*o)->index]) {
|
||||
case REQUESTED:
|
||||
telnet->opt_states[(*o)->index] = ACTIVE;
|
||||
activate_option(telnet, *o);
|
||||
break;
|
||||
case ACTIVE:
|
||||
break;
|
||||
case INACTIVE:
|
||||
telnet->opt_states[(*o)->index] = ACTIVE;
|
||||
send_opt(telnet, (*o)->send, option);
|
||||
activate_option(telnet, *o);
|
||||
break;
|
||||
case REALLY_INACTIVE:
|
||||
send_opt(telnet, (*o)->nsend, option);
|
||||
break;
|
||||
}
|
||||
return;
|
||||
} else if ((*o)->option == option && (*o)->nak == cmd) {
|
||||
switch (telnet->opt_states[(*o)->index]) {
|
||||
case REQUESTED:
|
||||
telnet->opt_states[(*o)->index] = INACTIVE;
|
||||
refused_option(telnet, *o);
|
||||
break;
|
||||
case ACTIVE:
|
||||
telnet->opt_states[(*o)->index] = INACTIVE;
|
||||
send_opt(telnet, (*o)->nsend, option);
|
||||
option_side_effects(telnet, *o, 0);
|
||||
break;
|
||||
case INACTIVE:
|
||||
case REALLY_INACTIVE:
|
||||
break;
|
||||
}
|
||||
return;
|
||||
}
|
||||
if ((*o)->option == option && (*o)->ack == cmd) {
|
||||
switch (telnet->opt_states[(*o)->index]) {
|
||||
case REQUESTED:
|
||||
telnet->opt_states[(*o)->index] = ACTIVE;
|
||||
activate_option(telnet, *o);
|
||||
break;
|
||||
case ACTIVE:
|
||||
break;
|
||||
case INACTIVE:
|
||||
telnet->opt_states[(*o)->index] = ACTIVE;
|
||||
send_opt(telnet, (*o)->send, option);
|
||||
activate_option(telnet, *o);
|
||||
break;
|
||||
case REALLY_INACTIVE:
|
||||
send_opt(telnet, (*o)->nsend, option);
|
||||
break;
|
||||
}
|
||||
return;
|
||||
} else if ((*o)->option == option && (*o)->nak == cmd) {
|
||||
switch (telnet->opt_states[(*o)->index]) {
|
||||
case REQUESTED:
|
||||
telnet->opt_states[(*o)->index] = INACTIVE;
|
||||
refused_option(telnet, *o);
|
||||
break;
|
||||
case ACTIVE:
|
||||
telnet->opt_states[(*o)->index] = INACTIVE;
|
||||
send_opt(telnet, (*o)->nsend, option);
|
||||
option_side_effects(telnet, *o, 0);
|
||||
break;
|
||||
case INACTIVE:
|
||||
case REALLY_INACTIVE:
|
||||
break;
|
||||
}
|
||||
return;
|
||||
}
|
||||
}
|
||||
/*
|
||||
* If we reach here, the option was one we weren't prepared to
|
||||
@ -324,52 +324,52 @@ static void process_subneg(Telnet *telnet)
|
||||
switch (telnet->sb_opt) {
|
||||
case TELOPT_OLD_ENVIRON:
|
||||
case TELOPT_NEW_ENVIRON:
|
||||
if (telnet->sb_buf[0] == TELQUAL_IS) {
|
||||
if (telnet->sb_opt == TELOPT_NEW_ENVIRON) {
|
||||
var = RFC_VAR;
|
||||
value = RFC_VALUE;
|
||||
} else {
|
||||
if (telnet->sb_len > 1 && !(telnet->sb_buf[0] &~ 1)) {
|
||||
var = telnet->sb_buf[0];
|
||||
value = BSD_VAR ^ BSD_VALUE ^ var;
|
||||
} else {
|
||||
var = BSD_VAR;
|
||||
value = BSD_VALUE;
|
||||
}
|
||||
}
|
||||
}
|
||||
n = 1;
|
||||
while (n < telnet->sb_len && telnet->sb_buf[n] == var) {
|
||||
int varpos, varlen, valpos, vallen;
|
||||
char *result;
|
||||
if (telnet->sb_buf[0] == TELQUAL_IS) {
|
||||
if (telnet->sb_opt == TELOPT_NEW_ENVIRON) {
|
||||
var = RFC_VAR;
|
||||
value = RFC_VALUE;
|
||||
} else {
|
||||
if (telnet->sb_len > 1 && !(telnet->sb_buf[0] &~ 1)) {
|
||||
var = telnet->sb_buf[0];
|
||||
value = BSD_VAR ^ BSD_VALUE ^ var;
|
||||
} else {
|
||||
var = BSD_VAR;
|
||||
value = BSD_VALUE;
|
||||
}
|
||||
}
|
||||
}
|
||||
n = 1;
|
||||
while (n < telnet->sb_len && telnet->sb_buf[n] == var) {
|
||||
int varpos, varlen, valpos, vallen;
|
||||
char *result;
|
||||
|
||||
varpos = ++n;
|
||||
while (n < telnet->sb_len && telnet->sb_buf[n] != value)
|
||||
n++;
|
||||
if (n == telnet->sb_len)
|
||||
break;
|
||||
varlen = n - varpos;
|
||||
valpos = ++n;
|
||||
while (n < telnet->sb_len && telnet->sb_buf[n] != var)
|
||||
n++;
|
||||
vallen = n - valpos;
|
||||
varpos = ++n;
|
||||
while (n < telnet->sb_len && telnet->sb_buf[n] != value)
|
||||
n++;
|
||||
if (n == telnet->sb_len)
|
||||
break;
|
||||
varlen = n - varpos;
|
||||
valpos = ++n;
|
||||
while (n < telnet->sb_len && telnet->sb_buf[n] != var)
|
||||
n++;
|
||||
vallen = n - valpos;
|
||||
|
||||
result = snewn(varlen + vallen + 2, char);
|
||||
sprintf(result, "%.*s=%.*s",
|
||||
varlen, telnet->sb_buf+varpos,
|
||||
vallen, telnet->sb_buf+valpos);
|
||||
if (telnet->shdata.nenvvars >= telnet->envvarsize) {
|
||||
telnet->envvarsize = telnet->shdata.nenvvars * 3 / 2 + 16;
|
||||
telnet->shdata.envvars = sresize(telnet->shdata.envvars,
|
||||
telnet->envvarsize, char *);
|
||||
}
|
||||
telnet->shdata.envvars[telnet->shdata.nenvvars++] = result;
|
||||
}
|
||||
done_option(telnet, telnet->sb_opt);
|
||||
break;
|
||||
result = snewn(varlen + vallen + 2, char);
|
||||
sprintf(result, "%.*s=%.*s",
|
||||
varlen, telnet->sb_buf+varpos,
|
||||
vallen, telnet->sb_buf+valpos);
|
||||
if (telnet->shdata.nenvvars >= telnet->envvarsize) {
|
||||
telnet->envvarsize = telnet->shdata.nenvvars * 3 / 2 + 16;
|
||||
telnet->shdata.envvars = sresize(telnet->shdata.envvars,
|
||||
telnet->envvarsize, char *);
|
||||
}
|
||||
telnet->shdata.envvars[telnet->shdata.nenvvars++] = result;
|
||||
}
|
||||
done_option(telnet, telnet->sb_opt);
|
||||
break;
|
||||
case TELOPT_TTYPE:
|
||||
if (telnet->sb_len >= 1 && telnet->sb_buf[0] == TELQUAL_IS) {
|
||||
telnet->shdata.termtype = snewn(5 + telnet->sb_len, char);
|
||||
if (telnet->sb_len >= 1 && telnet->sb_buf[0] == TELQUAL_IS) {
|
||||
telnet->shdata.termtype = snewn(5 + telnet->sb_len, char);
|
||||
strcpy(telnet->shdata.termtype, "TERM=");
|
||||
for (n = 0; n < telnet->sb_len-1; n++) {
|
||||
char c = telnet->sb_buf[n+1];
|
||||
@ -377,117 +377,117 @@ static void process_subneg(Telnet *telnet)
|
||||
c = c + 'a' - 'A';
|
||||
telnet->shdata.termtype[n+5] = c;
|
||||
}
|
||||
telnet->shdata.termtype[telnet->sb_len+5-1] = '\0';
|
||||
}
|
||||
done_option(telnet, telnet->sb_opt);
|
||||
break;
|
||||
telnet->shdata.termtype[telnet->sb_len+5-1] = '\0';
|
||||
}
|
||||
done_option(telnet, telnet->sb_opt);
|
||||
break;
|
||||
case TELOPT_NAWS:
|
||||
if (telnet->sb_len == 4) {
|
||||
int w, h;
|
||||
w = (unsigned char)telnet->sb_buf[0];
|
||||
w = (w << 8) | (unsigned char)telnet->sb_buf[1];
|
||||
h = (unsigned char)telnet->sb_buf[2];
|
||||
h = (h << 8) | (unsigned char)telnet->sb_buf[3];
|
||||
pty_resize(w, h);
|
||||
}
|
||||
break;
|
||||
if (telnet->sb_len == 4) {
|
||||
int w, h;
|
||||
w = (unsigned char)telnet->sb_buf[0];
|
||||
w = (w << 8) | (unsigned char)telnet->sb_buf[1];
|
||||
h = (unsigned char)telnet->sb_buf[2];
|
||||
h = (h << 8) | (unsigned char)telnet->sb_buf[3];
|
||||
pty_resize(w, h);
|
||||
}
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
void telnet_from_net(Telnet *telnet, char *buf, int len)
|
||||
{
|
||||
while (len--) {
|
||||
int c = (unsigned char) *buf++;
|
||||
int c = (unsigned char) *buf++;
|
||||
|
||||
switch (telnet->state) {
|
||||
case TOP_LEVEL:
|
||||
case SEENCR:
|
||||
/*
|
||||
* PuTTY sends Telnet's new line sequence (CR LF on
|
||||
* the wire) in response to the return key. We must
|
||||
* therefore treat that as equivalent to CR NUL, and
|
||||
* send CR to the pty.
|
||||
*/
|
||||
if ((c == NUL || c == '\n') && telnet->state == SEENCR)
|
||||
telnet->state = TOP_LEVEL;
|
||||
else if (c == IAC)
|
||||
telnet->state = SEENIAC;
|
||||
else {
|
||||
char cc = c;
|
||||
sel_write(telnet->pty, &cc, 1);
|
||||
switch (telnet->state) {
|
||||
case TOP_LEVEL:
|
||||
case SEENCR:
|
||||
/*
|
||||
* PuTTY sends Telnet's new line sequence (CR LF on
|
||||
* the wire) in response to the return key. We must
|
||||
* therefore treat that as equivalent to CR NUL, and
|
||||
* send CR to the pty.
|
||||
*/
|
||||
if ((c == NUL || c == '\n') && telnet->state == SEENCR)
|
||||
telnet->state = TOP_LEVEL;
|
||||
else if (c == IAC)
|
||||
telnet->state = SEENIAC;
|
||||
else {
|
||||
char cc = c;
|
||||
sel_write(telnet->pty, &cc, 1);
|
||||
|
||||
if (c == CR)
|
||||
telnet->state = SEENCR;
|
||||
else
|
||||
telnet->state = TOP_LEVEL;
|
||||
}
|
||||
break;
|
||||
case SEENIAC:
|
||||
if (c == DO)
|
||||
telnet->state = SEENDO;
|
||||
else if (c == DONT)
|
||||
telnet->state = SEENDONT;
|
||||
else if (c == WILL)
|
||||
telnet->state = SEENWILL;
|
||||
else if (c == WONT)
|
||||
telnet->state = SEENWONT;
|
||||
else if (c == SB)
|
||||
telnet->state = SEENSB;
|
||||
else if (c == DM)
|
||||
telnet->state = TOP_LEVEL;
|
||||
else {
|
||||
/* ignore everything else; print it if it's IAC */
|
||||
if (c == IAC) {
|
||||
char cc = c;
|
||||
sel_write(telnet->pty, &cc, 1);
|
||||
}
|
||||
telnet->state = TOP_LEVEL;
|
||||
}
|
||||
break;
|
||||
case SEENWILL:
|
||||
proc_rec_opt(telnet, WILL, c);
|
||||
telnet->state = TOP_LEVEL;
|
||||
break;
|
||||
case SEENWONT:
|
||||
proc_rec_opt(telnet, WONT, c);
|
||||
telnet->state = TOP_LEVEL;
|
||||
break;
|
||||
case SEENDO:
|
||||
proc_rec_opt(telnet, DO, c);
|
||||
telnet->state = TOP_LEVEL;
|
||||
break;
|
||||
case SEENDONT:
|
||||
proc_rec_opt(telnet, DONT, c);
|
||||
telnet->state = TOP_LEVEL;
|
||||
break;
|
||||
case SEENSB:
|
||||
telnet->sb_opt = c;
|
||||
telnet->sb_len = 0;
|
||||
telnet->state = SUBNEGOT;
|
||||
break;
|
||||
case SUBNEGOT:
|
||||
if (c == IAC)
|
||||
telnet->state = SUBNEG_IAC;
|
||||
else {
|
||||
subneg_addchar:
|
||||
if (telnet->sb_len >= telnet->sb_size) {
|
||||
telnet->sb_size += SB_DELTA;
|
||||
telnet->sb_buf = sresize(telnet->sb_buf, telnet->sb_size,
|
||||
unsigned char);
|
||||
}
|
||||
telnet->sb_buf[telnet->sb_len++] = c;
|
||||
telnet->state = SUBNEGOT; /* in case we came here by goto */
|
||||
}
|
||||
break;
|
||||
case SUBNEG_IAC:
|
||||
if (c != SE)
|
||||
goto subneg_addchar; /* yes, it's a hack, I know, but... */
|
||||
else {
|
||||
process_subneg(telnet);
|
||||
telnet->state = TOP_LEVEL;
|
||||
}
|
||||
break;
|
||||
}
|
||||
if (c == CR)
|
||||
telnet->state = SEENCR;
|
||||
else
|
||||
telnet->state = TOP_LEVEL;
|
||||
}
|
||||
break;
|
||||
case SEENIAC:
|
||||
if (c == DO)
|
||||
telnet->state = SEENDO;
|
||||
else if (c == DONT)
|
||||
telnet->state = SEENDONT;
|
||||
else if (c == WILL)
|
||||
telnet->state = SEENWILL;
|
||||
else if (c == WONT)
|
||||
telnet->state = SEENWONT;
|
||||
else if (c == SB)
|
||||
telnet->state = SEENSB;
|
||||
else if (c == DM)
|
||||
telnet->state = TOP_LEVEL;
|
||||
else {
|
||||
/* ignore everything else; print it if it's IAC */
|
||||
if (c == IAC) {
|
||||
char cc = c;
|
||||
sel_write(telnet->pty, &cc, 1);
|
||||
}
|
||||
telnet->state = TOP_LEVEL;
|
||||
}
|
||||
break;
|
||||
case SEENWILL:
|
||||
proc_rec_opt(telnet, WILL, c);
|
||||
telnet->state = TOP_LEVEL;
|
||||
break;
|
||||
case SEENWONT:
|
||||
proc_rec_opt(telnet, WONT, c);
|
||||
telnet->state = TOP_LEVEL;
|
||||
break;
|
||||
case SEENDO:
|
||||
proc_rec_opt(telnet, DO, c);
|
||||
telnet->state = TOP_LEVEL;
|
||||
break;
|
||||
case SEENDONT:
|
||||
proc_rec_opt(telnet, DONT, c);
|
||||
telnet->state = TOP_LEVEL;
|
||||
break;
|
||||
case SEENSB:
|
||||
telnet->sb_opt = c;
|
||||
telnet->sb_len = 0;
|
||||
telnet->state = SUBNEGOT;
|
||||
break;
|
||||
case SUBNEGOT:
|
||||
if (c == IAC)
|
||||
telnet->state = SUBNEG_IAC;
|
||||
else {
|
||||
subneg_addchar:
|
||||
if (telnet->sb_len >= telnet->sb_size) {
|
||||
telnet->sb_size += SB_DELTA;
|
||||
telnet->sb_buf = sresize(telnet->sb_buf, telnet->sb_size,
|
||||
unsigned char);
|
||||
}
|
||||
telnet->sb_buf[telnet->sb_len++] = c;
|
||||
telnet->state = SUBNEGOT; /* in case we came here by goto */
|
||||
}
|
||||
break;
|
||||
case SUBNEG_IAC:
|
||||
if (c != SE)
|
||||
goto subneg_addchar; /* yes, it's a hack, I know, but... */
|
||||
else {
|
||||
process_subneg(telnet);
|
||||
telnet->state = TOP_LEVEL;
|
||||
}
|
||||
break;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@ -509,13 +509,13 @@ Telnet *telnet_new(sel_wfd *net, sel_wfd *pty)
|
||||
* Initialise option states.
|
||||
*/
|
||||
{
|
||||
const struct Opt *const *o;
|
||||
const struct Opt *const *o;
|
||||
|
||||
for (o = opts; *o; o++) {
|
||||
telnet->opt_states[(*o)->index] = (*o)->initial_state;
|
||||
if (telnet->opt_states[(*o)->index] == REQUESTED)
|
||||
send_opt(telnet, (*o)->send, (*o)->option);
|
||||
}
|
||||
for (o = opts; *o; o++) {
|
||||
telnet->opt_states[(*o)->index] = (*o)->initial_state;
|
||||
if (telnet->opt_states[(*o)->index] == REQUESTED)
|
||||
send_opt(telnet, (*o)->send, (*o)->option);
|
||||
}
|
||||
}
|
||||
|
||||
telnet->old_environ_done = 1; /* initially don't want to bother */
|
||||
@ -544,22 +544,22 @@ void telnet_from_pty(Telnet *telnet, char *buf, int len)
|
||||
p = (unsigned char *)buf;
|
||||
end = (unsigned char *)(buf + len);
|
||||
while (p < end) {
|
||||
unsigned char *q = p;
|
||||
unsigned char *q = p;
|
||||
|
||||
while (p < end && iswritable(*p))
|
||||
p++;
|
||||
sel_write(telnet->net, q, p - q);
|
||||
while (p < end && iswritable(*p))
|
||||
p++;
|
||||
sel_write(telnet->net, q, p - q);
|
||||
|
||||
while (p < end && !iswritable(*p)) {
|
||||
sel_write(telnet->net, *p == IAC ? iac : cr, 2);
|
||||
p++;
|
||||
}
|
||||
while (p < end && !iswritable(*p)) {
|
||||
sel_write(telnet->net, *p == IAC ? iac : cr, 2);
|
||||
p++;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
int telnet_shell_ok(Telnet *telnet, struct shell_data *shdata)
|
||||
{
|
||||
if (telnet->shell_ok)
|
||||
*shdata = telnet->shdata; /* structure copy */
|
||||
*shdata = telnet->shdata; /* structure copy */
|
||||
return telnet->shell_ok;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user