diff options
Diffstat (limited to 'net/ztelnet/files/patch-aq')
| -rw-r--r-- | net/ztelnet/files/patch-aq | 214 |
1 files changed, 69 insertions, 145 deletions
diff --git a/net/ztelnet/files/patch-aq b/net/ztelnet/files/patch-aq index 61701326740d..e4b410cb4dbc 100644 --- a/net/ztelnet/files/patch-aq +++ b/net/ztelnet/files/patch-aq @@ -1,145 +1,69 @@ -diff -uNr ../ztelnet/zmodem/Makefile.old ./zmodem/Makefile.old ---- ../ztelnet/zmodem/Makefile.old Thu Jan 1 00:00:00 1970 -+++ ./zmodem/Makefile.old Wed Dec 3 04:04:23 1997 -@@ -0,0 +1,141 @@ -+# Makefile for Unix/Xenix rz and sz programs -+# the makefile is not too well tested yet -+CFLAGS= -c -+OBJS=sz.o rz.o -+SRCS= rbsb.c minirb.c zm.c zmr.c crctab.c crc.c zmodem.h -+ARCFILES= README rbsb.c gz *.t minirb.c zmodem.h \ -+ zm.c zmr.c crctab.c sz.c rz.c mailer.rz crc.c -+ -+nothing: -+ @echo -+ @echo "Please study the #ifdef's in crctab.c, rbsb.c, rz.c and sz.c," -+ @echo "make any necessary hacks for oddball or merged SYSV/BSD systems," -+ @echo "then type 'make SYSTEM' where SYSTEM is one of:" -+ @echo -+ @echo " posix POSIX compliant systems" -+ @echo " odt SCO Open Desktop" -+ @echo " sysvr4 SYSTEM 5.4 Unix, SCO Open Desktop" -+ @echo " sysvr3 SYSTEM 5.3 Unix with mkdir(2)" -+ @echo " sysv SYSTEM 3/5 Unix" -+ @echo " xenix Xenix" -+ @echo " x386 386 Xenix" -+ @echo " bsd Berkeley 4.x BSD, Ultrix, V7" -+ @echo " tandy Tandy 6000 Xenix" -+ @echo " dnix DIAB Dnix 5.2" -+ @echo " dnix5r3 DIAB Dnix 5.3" -+ @echo " amiga 3000UX running SVR4" -+ @echo " POSIX POSIX compliant systems (SCO Open Desktop, strict)" -+ @echo -+ @echo " doc Format the man pages with nroff" -+ @echo -+ -+usenet:doc -+ shar -c -a -n rzsz -o /tmp/rzsz -l64 \ -+ README Makefile zmodem.h zm.c rz.c rbsb.c \ -+ crc.c crctab.c minirb.c mailer.rz zmr.c *.doc gz sz.c *.t -+ -+shar:doc -+ shar -c README Makefile zmodem.h zm.c \ -+ zmr.c sz.c rz.c crctab.c \ -+ mailer.rz crc.c rbsb.c minirb.c *.doc gz *.t >/tmp/rzsz -+ -+unixforum: shar -+ compress /tmp/rzsz.sh -+ -+unix: -+ undos $(ARCFILES) -+ -+dos: -+ todos $(ARCFILES) -+ -+doc:rz.doc sz.doc crc.doc minirb.doc -+ -+minirb.doc:minirb.1 -+ nroff -man minirb.1 | col >minirb.doc -+ -+rz.doc:rz.1 -+ nroff -man rz.1 | col >rz.doc -+ -+sz.doc:sz.1 -+ nroff -man sz.1 | col >sz.doc -+ -+crc.doc:crc.1 -+ nroff -man crc.1 | col >crc.doc -+ -+zoo: doc -+ -rm -f /tmp/rzsz.zoo -+ zoo ah /tmp/rzsz README Makefile zmodem.h zm.c sz.c rz.c \ -+ mailer.rz crctab.c rbsb.c *.doc \ -+ zmr.c crc.c gz *.t minirb.c -+ touch /tmp/rzsz.zoo -+ chmod og-w /tmp/rzsz.zoo -+ mv /tmp/rzsz.zoo /u/t/yam -+ -rm -f rzsz.zip -+ zip rzsz readme mailer.rz makefile zmodem.h zm.c sz.c rz.c -+ zip rzsz crctab.c rbsb.c *.doc -+ zip rzsz zmr.c crc.c gz *.t minirb.c -+ mv rzsz.zip /u/t/yam -+ -+tar:doc -+ tar cvf /tmp/rzsz.tar README Makefile zmodem.h zm.c sz.c rz.c \ -+ mailer.rz crctab.c rbsb.c \ -+ zmr.c crc.c *.1 *.doc gz *.t minirb.c -+ -+tags: -+ ctags sz.c rz.c zm.c zmr.c rbsb.c -+ -+clean: -+ rm -f *.o -+ -+xenix: -+ $(CC) $(CFLAGS) -M0 -K -i -DUSG -DNFGVMIN -DREADCHECK sz.c -+ $(CC) $(CFLAGS) -M0 -K -i -DUSG -DMD rz.c -+ -+x386: -+ $(CC) $(CFLAGS) -DUSG -DMD sz.c -+ $(CC) $(CFLAGS) -DUSG -DNFGVMIN -DREADCHECK rz.c -+ -+sysv: -+ $(CC) $(CFLAGS) -DUSG -DMD sz.c -+ $(CC) $(CFLAGS) -DUSG -DSV -DNFGVMIN rz.c -+ -+sysvr3 : -+ $(CC) $(CFLAGS) -DUSG -DMD=2 sz.c -+ $(CC) $(CFLAGS) -DSV -DUSG -DNFGVMIN rz.c -+ -+sysvr4 : -+ $(CC) $(CFLAGS) -DUSG -DMD=2 sz.c -+ $(CC) $(CFLAGS) -DSV -DUSG rz.c -+ -+odt: -+ $(CC) $(CFLAGS) -strict -W2 -n -DUSG -DMD=2 sz.c -+ $(CC) $(CFLAGS) -strict -W2 -n -DUSG -DREADCHECK rz.c -+ -+posix: -+ $(CC) $(CFLAGS) -DPOSIX -DMD=2 sz.c -+ $(CC) $(CFLAGS) -DPOSIX rz.c -+ -+POSIX: -+ @echo "Well, stricter, as in *safer sex* ..." -+ $(CC) $(CFLAGS) -posix -W2 -DPOSIX -DMD=2 sz.c -+ $(CC) $(CFLAGS) -posix -W2 -DPOSIX rz.c -+ -+bsd: -+ $(CC) $(CFLAGS) -DMD=2 -Dstrchr=index -DV7 sz.c -+ $(CC) $(CFLAGS) -DV7 -DNFGVMIN rz.c -+ -+tandy: -+ $(CC) $(CFLAGS) -n -DUSG -DMD -DT6K sz.c -+ $(CC) $(CFLAGS) -n -DUSG -DMD -DT6K rz.c -+ -+dnix: -+ $(CC) $(CFLAGS) -DUSG -DMD sz.c -+ $(CC) $(CFLAGS) -DSV -DUSG -DNFGVMIN -DREADCHECK rz.c -+ -+dnix5r3: -+ $(CC) $(CFLAGS) -DUSG -DMD=2 sz.c -+ $(CC) $(CFLAGS) -DUSG -DSV -DNFGVMIN -DREADCHECK rz.c -+ -+amiga: -+ $(CC) $(CFLAGS) -DUSG -DNFGVMIN -g sz.c -+ $(CC) $(CFLAGS) -DUSG -DSV -DNFGVMIN -g rz.c +diff -uNr --exclude=*.orig work.old/ztelnet/telnet/utilities.c work/ztelnet/telnet/utilities.c +--- work.old/ztelnet/telnet/utilities.c Wed Sep 20 06:41:41 1995 ++++ work/ztelnet/telnet/utilities.c Tue Jun 20 22:58:32 2000 +@@ -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]); |