oysteikt/heimdal
0
0
Fork 0
Code Issues 5 Pull Requests Releases Activity

rename ispeed and ospeed to handle netbsd

Browse Source 
git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@1664 ec53bebd-3082-4978-b11e-865c3cabbd6b
This commit is contained in:
Assar Westerlund
1997-05-04 09:53:15 +00:00
parent 113c04632b
commit 65d1958a9b
3 changed files with 11 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
appl/telnet/telnet/externs.h
View File

@@ -250,7 +250,7 @@ void TerminalSaveState(void);
void TerminalDefaultChars(void); void TerminalDefaultChars(void);
void TerminalNewMode(int f); void TerminalNewMode(int f);
cc_t *tcval(int func); cc_t *tcval(int func);
void TerminalSpeeds(long *ispeed, long *ospeed); void TerminalSpeeds(long *input_speed, long *output_speed);
int TerminalWindowSize(long *rows, long *cols); int TerminalWindowSize(long *rows, long *cols);
int NetClose(int fd); int NetClose(int fd);
void NetNonblockingIO(int fd, int onoff); void NetNonblockingIO(int fd, int onoff);

10
appl/telnet/telnet/sys_bsd.c
View File

@@ -578,7 +578,7 @@ struct termspeeds {
#endif /* DECODE_BAUD */ #endif /* DECODE_BAUD */
void void
TerminalSpeeds(long *ispeed, long *ospeed) TerminalSpeeds(long *input_speed, long *output_speed)
{ {
#ifdef DECODE_BAUD #ifdef DECODE_BAUD
struct termspeeds *tp; struct termspeeds *tp;
@@ -594,15 +594,15 @@ TerminalSpeeds(long *ispeed, long *ospeed)
tp = termspeeds; tp = termspeeds;
while ((tp->speed != -1) && (tp->value < in)) while ((tp->speed != -1) && (tp->value < in))
tp++; tp++;
*ispeed = tp->speed; *input_speed = tp->speed;
tp = termspeeds; tp = termspeeds;
while ((tp->speed != -1) && (tp->value < out)) while ((tp->speed != -1) && (tp->value < out))
tp++; tp++;
*ospeed = tp->speed; *output_speed = tp->speed;
#else /* DECODE_BAUD */ #else /* DECODE_BAUD */
*ispeed = in; *input_speed = in;
*ospeed = out; *output_speed = out;
#endif /* DECODE_BAUD */ #endif /* DECODE_BAUD */
} }

8
appl/telnet/telnet/telnet.c
View File

@@ -731,15 +731,17 @@ suboption()
if (SB_EOF()) if (SB_EOF())
return; return;
if (SB_GET() == TELQUAL_SEND) { if (SB_GET() == TELQUAL_SEND) {
long ospeed, ispeed; long output_speed, input_speed;
unsigned char temp[50]; unsigned char temp[50];
int len; int len;
TerminalSpeeds(&ispeed, &ospeed); TerminalSpeeds(&input_speed, &output_speed);
snprintf((char *)temp, sizeof(temp), snprintf((char *)temp, sizeof(temp),
"%c%c%c%c%u,%u%c%c", IAC, SB, TELOPT_TSPEED, "%c%c%c%c%u,%u%c%c", IAC, SB, TELOPT_TSPEED,
TELQUAL_IS, (unsigned)ospeed, (unsigned)ispeed, IAC, SE); TELQUAL_IS,
(unsigned)output_speed,
(unsigned)input_speed, IAC, SE);
len = strlen((char *)temp+4) + 4; /* temp[3] is 0 ... */ len = strlen((char *)temp+4) + 4; /* temp[3] is 0 ... */
if (len < NETROOM()) { if (len < NETROOM()) {