diff options
| author | David E. O'Brien <obrien@FreeBSD.org> | 1998-03-18 18:53:00 +0000 |
|---|---|---|
| committer | David E. O'Brien <obrien@FreeBSD.org> | 1998-03-18 18:53:00 +0000 |
| commit | 50b0e6ce97291d2f55622b534877f88908715908 (patch) | |
| tree | 4cde940101fdec2702231036c4bbd2ce4566e20a /net/ztelnet/files/patch-ao | |
| parent | vim --> vim4 (diff) | |
Split patch-aa into patches for the individual *_26_* files that are patched.
Forgotten by: steve
Diffstat (limited to 'net/ztelnet/files/patch-ao')
| -rw-r--r-- | net/ztelnet/files/patch-ao | 69 |
1 files changed, 69 insertions, 0 deletions
diff --git a/net/ztelnet/files/patch-ao b/net/ztelnet/files/patch-ao new file mode 100644 index 000000000000..2392e64ec30c --- /dev/null +++ b/net/ztelnet/files/patch-ao @@ -0,0 +1,69 @@ +diff -uNr ../ztelnet/telnet/utilities.c ./telnet/utilities.c +--- ../ztelnet/telnet/utilities.c Tue Sep 19 21:41:41 1995 ++++ ./telnet/utilities.c Wed Dec 3 01:57:23 1997 +@@ -40,6 +40,15 @@ + + #include "externs.h" + ++#ifdef SLC_NAME_OK ++#undef SLC_NAME_OK ++#define SLC_NAME_OK(x) ( (x) < NSLC ) ++#endif ++#ifdef TELOPT_OK ++#undef TELOPT_OK ++#define TELOPT_OK(x) ((x) <= TELOPT_LAST) ++#endif ++ + FILE *NetTrace = 0; /* Not in bss, since needs to stay */ + int prettydump; + +@@ -282,9 +291,6 @@ + register int i; + char buf[512]; + extern int want_status_response; +-#ifdef BYPMS +- unsigned int bypms; +-#endif /* PMS */ + + if (showoptions || direction == 0 || + (want_status_response && (pointer[0] == TELOPT_STATUS))) { +@@ -578,12 +584,7 @@ + case LM_SLC: + fprintf(NetTrace, "SLC"); + for (i = 2; i < length - 2; i += 3) { +-#ifdef BYPMS +- bypms = (unsigned int) pointer[i+SLC_FUNC]; +- if (SLC_NAME_OK(bypms)) +-#else + if (SLC_NAME_OK(pointer[i+SLC_FUNC])) +-#endif /* PMS */ + fprintf(NetTrace, " %s", SLC_NAME(pointer[i+SLC_FUNC])); + else + fprintf(NetTrace, " %d", pointer[i+SLC_FUNC]); +@@ -672,12 +673,7 @@ + case WONT: cp = "WONT"; goto common2; + common2: + i++; +-#ifdef BYPMS +- bypms = (unsigned int) pointer[i]; +- if (TELOPT_OK(bypms)) +-#else + if (TELOPT_OK((int)pointer[i])) +-#endif /* PMS */ + fprintf(NetTrace, " %s %s", cp, TELOPT(pointer[i])); + else + fprintf(NetTrace, " %s %d", cp, pointer[i]); +@@ -799,12 +795,7 @@ + break; + + default: +-#ifdef BYPMS +- bypms = (unsigned int) pointer[0]; +- if (TELOPT_OK(bypms)) +-#else +- if (TELOPT_OK(pointer[0])) +-#endif /* PMS */ ++ if (TELOPT_OK(pointer[0])) + fprintf(NetTrace, "%s (unknown)", TELOPT(pointer[0])); + else + fprintf(NetTrace, "%d (unknown)", pointer[i]); |