cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Mark it unbroken and update to 3.54.

Browse Source 
Change the MAINTAINER to kevlo@
This commit is contained in:
kevlo 1999-11-30 07:57:48 +00:00
parent 51c143e2c4
commit bc862a5c36
6 changed files with 128 additions and 137 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
comms/rzsz/Makefile
View File

@ -1,9 +1,7 @@
# $OpenBSD: Makefile,v 1.7 1999/09/19 13:44:14 turan Exp $
BROKEN= "checksum mismatch"
# $OpenBSD: Makefile,v 1.8 1999/11/30 07:57:48 kevlo Exp $
DISTNAME= rzsz
PKGNAME= rzsz-3.50
PKGNAME= rzsz-3.54
CATEGORIES= comms
MASTER_SITES= ftp://ftp.cs.pdx.edu/pub/zmodem/
@ -12,7 +10,7 @@ NEED_VERSION= 1.91
NO_CDROM= "COMM: commercial software"
RESTRICTED= "This port is shareware"
MAINTAINER= ports@openbsd.org
MAINTAINER= kevlo@openbsd.org
NO_WRKSUBDIR= yes
USE_ZIP= yes

6
comms/rzsz/files/md5
View File

@ -1,3 +1,3 @@
MD5 (rzsz.zip) = 5691b030b20866e2408bde4e5b960732
RMD160 (rzsz.zip) = 0bbaf916f8d57dda045ffe1c23c50869b3ee4001
SHA1 (rzsz.zip) = 6d8f33b93a966736ba7486af1793c645b4c302ae
MD5 (rzsz.zip) = 55b4578a63d07852698395522066fee1
RMD160 (rzsz.zip) = 396a80227226aab701a9844b8616dc5ad173fe46
SHA1 (rzsz.zip) = 2035758d00961a66ed3b4c210bc404576edbf02c

6
comms/rzsz/patches/patch-aa
View File

@ -1,10 +1,10 @@
--- crc.c.orig Sun May 2 19:14:18 1993
+++ crc.c Thu May 20 19:50:25 1999
--- crc.c.orig Tue Nov 30 14:27:00 1999
+++ crc.c Tue Nov 30 14:27:32 1999
@@ -117,6 +117,10 @@
{
register errors = 0;
+ if(argc < 2) {
+ if(argc < 2) {
+ fprintf(stderr, "Usage: %s [-x] [-k] file ...\n", argv[0]);
+ exit(0);
+ }

47
comms/rzsz/patches/patch-ab
View File

@ -1,5 +1,5 @@
--- rbsb.c.orig Wed Mar 3 10:28:10 1999
+++ rbsb.c Thu May 20 19:50:25 1999
--- rbsb.c.orig Tue Nov 30 14:28:16 1999
+++ rbsb.c Tue Nov 30 14:47:42 1999
@@ -17,8 +17,9 @@
#ifdef LLITOUT
long Locmode; /* Saved "local mode" for 4.x BSD "new driver" */
@ -34,7 +34,7 @@
#endif
+#ifdef TIOCFLUSH
+ { static int fread = 1;
+ ioctl(Tty, TIOCFLUSH, &fread); /* Flush input queue */
+ ioctl(Tty, TIOCFLUSH, &fread); /* Flush input queue */
+ }
+#else
+ lseek(Tty, 0L, 2);
@ -66,9 +66,9 @@
- Ttystream = fdopen(Tty, "w");
+ Tty = 0;
+ Ttystream = stdout;
+ Nametty = ttyname(Tty);
+ if (!Nametty || !*Nametty)
+ Nametty = "|pipe|";
+ Nametty = ttyname(Tty);
+ if (!Nametty || !*Nametty)
+ Nametty = "|pipe|";
+ Logstream = stderr;
+ setbuf(Ttystream, xXbuf);
}
@ -88,7 +88,7 @@
n = 2;
if (Verbose > 5)
- fprintf(stderr, "Calling read: alarm=%d Readnum=%d ",
+ fprintf(Logstream, "Calling read: alarm=%d Readnum=%d ",
+ fprintf(Logstream, "Calling read: alarm=%d Readnum=%d ",
n, Readnum);
if (setjmp(tohere)) {
-#ifdef TIOCFLUSH
@ -122,7 +122,7 @@
}
--Lleft;
return (*cdq++ & 0377);
@@ -492,15 +494,45 @@
@@ -492,13 +494,44 @@
Lleft = 0;
#ifdef USG
#ifdef POSIX
@ -140,53 +140,42 @@
lseek(Tty, 0L, 2);
#endif
+#endif
}
+}
+
+/*
+ * Purge the modem output queue of all characters
+ */
+purgeout()
+{
+#ifdef __FreeBSD__
+#ifdef __FreeBSD__
+ fpurge(Ttystream);
+#else
+ rewind(Ttystream);
+#endif
+#ifdef POSIX
+#ifdef POSIX
+ tcflush(Tty, TCOFLUSH);
+#else
+#ifdef TCFLSH
+#ifdef TCFLSH
+ ioctl(Tty, TCFLSH, 1);
+#else
+#ifdef TIOCFLUSH
+ { static int fwrite = 2;
+ ioctl(Tty, TIOCFLUSH, &fwrite);
+ }
+ {static int fwrite = 2;
+ ioctl(Tty, TIOCFLUSH, &fwrite);
+ }
+#endif
+#endif
+#endif
+}
/* send cancel string to get the other end to shut up */
canit()
@@ -509,8 +541,8 @@
24,24,24,24,24,24,24,24,24,24,8,8,8,8,8,8,8,8,8,8,0
};
+ purgeline(); /* Do read next time ... */
zmputs(canistr);
- Lleft=0; /* Do read next time ... */
}
/*
@@ -543,8 +575,8 @@
@@ -531,8 +564,8 @@
long a, b, c, d;
{
if (Verbose > 2) {
- fprintf(stderr, f, a, b, c, d);
- fprintf(stderr, "\n");
+ fprintf(Logstream, f, a, b, c, d);
+ fprintf(Logstream, "\n");
+ fprintf(Logstream, "\n");
}
}

91
comms/rzsz/patches/patch-ac
View File

@ -1,36 +1,38 @@
--- rz.c.orig Tue Mar 30 12:16:48 1999
+++ rz.c Thu May 20 19:50:26 1999
@@ -1,5 +1,5 @@
-#define VERSION "3.50 03-30-99"
-#define PUBDIR "/usr/spool/uucppublic"
+#define VERSION "3.50/ache 03-30-99"
+#define PUBDIR "/var/spool/uucppublic"
--- rz.c.orig Tue Nov 30 14:44:57 1999
+++ rz.c Tue Nov 30 15:48:37 1999
@@ -132,9 +132,8 @@
static char canistr[] = {
24,24,24,24,24,24,24,24,24,24,0
};
-
+ purgeline(); /* Do read next time ... */
zmputs(canistr);
- Lleft=0; /* Do read next time ... */
}
/*
*
@@ -174,6 +174,8 @@
@@ -185,6 +184,7 @@
char ztrans; /* ZMODEM file transport request */
int Zctlesc; /* Encode control characters */
int Zrwindow = 1400; /* RX window size (controls garbage count) */
+int log_to_screen = 0; /* Don't make log file */
+
/*
* Log an error
*/
@@ -205,9 +207,9 @@
@@ -195,9 +195,9 @@
{
if (Verbose <= 0)
return;
- fprintf(stderr, "Retry %d: ", errors);
- fprintf(stderr, s, p, u);
- fprintf(stderr, s);
- fprintf(stderr, "\n");
+ fprintf(Logstream, "Retry %d: ", errors);
+ fprintf(Logstream, s, p, u);
+ fprintf(Logstream, "\n");
+ fprintf(Logstream, s);
+ fprintf(Logstream, "\n");
}
#include "zm.c"
@@ -222,7 +224,7 @@
void
@@ -234,7 +234,7 @@
if (Zmodem)
zmputs(Attn);
canit(); mode(0);
@ -39,7 +41,7 @@
exit(3);
}
@@ -285,6 +287,9 @@
@@ -297,6 +297,9 @@
Zrwindow = atoi(*++argv);
}
break;
@ -49,31 +51,28 @@
case 'v':
++Verbose; break;
case 'y':
@@ -306,15 +311,15 @@
@@ -318,14 +321,14 @@
usage();
if (Batch && npats)
usage();
- if (Verbose) {
- if (freopen(LOGFILE, "a", stderr)==NULL)
- if (freopen(LOGFILE2, "a", stderr)==NULL) {
- fprintf(stderr, "Can't open log file!\n");
+ if (Verbose && !log_to_screen) {
+ if ((Logstream = fopen(LOGFILE, "a"))==NULL)
+ if ((Logstream = fopen(LOGFILE, "a"))==NULL)
+ if ((Logstream = fopen(LOGFILE2, "a"))==NULL) {
fprintf(stderr, "Can't open log file!\n");
- exit(2);
- }
+ fprintf(stderr, "Can't open log file!\n");
exit(2);
}
- setbuf(stderr, NULL);
- fprintf(stderr, "argv[0]=%s Progname=%s\n", virgin, Progname);
- }
+ exit(2);
+ }
+ setbuf(Logstream, NULL);
+ fprintf(Logstream, "argv[0]=%s Progname=%s\n", virgin, Progname);
+ }
}
vfile("%s %s for %s tty=%s\n", Progname, VERSION, OS, Nametty);
mode(1);
if (signal(SIGINT, bibi) == SIG_IGN) {
@@ -330,8 +335,11 @@
@@ -342,8 +345,11 @@
}
if (exitcode && !Zmodem) /* bellow again with all thy might. */
canit();
@ -85,8 +84,8 @@
+ }
fprintf(stderr, "%s %s finished.\r\n", Progname, VERSION);
fflush(stderr);
#ifndef REGISTERED
@@ -355,10 +363,10 @@
if(exitcode) {
@@ -374,10 +380,10 @@
{
fprintf(stderr,
"Receive Files and Commands with ZMODEM/YMODEM/XMODEM Protocol\n\n");
@ -94,18 +93,18 @@
- fprintf(stderr,"or rb [-avy] [-tT] (YMODEM)\n");
- fprintf(stderr,"or rc [-avy] [-tT] file (XMODEM-CRC)\n");
- fprintf(stderr,"or rx [-avy] [-tT] file (XMODEM)\n\n");
+ fprintf(stderr,"Usage: rz [-vV] [-wN] [-tT] (ZMODEM)\n");
+ fprintf(stderr,"Usage: rz [-vV] [-wN] [-tT] (ZMODEM)\n");
+ fprintf(stderr,"or rb [-avVy] [-tT] (YMODEM)\n");
+ fprintf(stderr,"or rc [-avVy] [-tT] file (XMODEM-CRC)\n");
+ fprintf(stderr,"or rx [-avVy] [-tT] file (XMODEM)\n\n");
fprintf(stderr,
"Supports the following incoming ZMODEM options given to the sending program:\n\
compression (-Z), binary (-b), ASCII CR/LF>NL (-a), newer(-n),\n\
@@ -451,13 +459,13 @@
@@ -471,13 +477,13 @@
et_tu:
Firstsec=TRUE; Eofseen=FALSE;
+ purgeline(); /* Do read next time ... */
+ purgeline(); /* Do read next time ... */
sendline(Crcflg?WANTCRC:NAK); flushmo();
- Lleft=0; /* Do read next time ... */
switch (c = wcgetsec(rpn, 100)) {
@ -117,7 +116,7 @@
readline(1);
goto et_tu;
case 0:
@@ -482,9 +490,9 @@
@@ -502,9 +508,9 @@
sendchar=Crcflg?WANTCRC:NAK;
for (;;) {
@ -128,17 +127,17 @@
sectcurr=wcgetsec(secbuf, (sectnum&0177)?50:130);
if (sectcurr==(sectnum+1 &0377)) {
sectnum++;
@@ -502,8 +510,8 @@
@@ -523,8 +529,8 @@
else if (sectcurr==WCEOT) {
if (closeit())
return ERROR;
+ purgeline(); /* Do read next time ... */
sendline(ACK); flushmo();
- Lleft=0; /* Do read next time ... */
++Totfiles;
return OK;
}
else if (sectcurr==ERROR)
@@ -602,11 +610,11 @@
@@ -624,11 +630,11 @@
while(readline(1)!=TIMEOUT)
;
if (Firstsec) {
@ -152,9 +151,9 @@
}
}
/* try to stop the bubble machine. */
@@ -660,9 +668,9 @@
if (Filemode & UNIXFILE)
@@ -683,9 +689,9 @@
++Thisbinary;
++Totfiles; Totbytes += Bytesleft;
if (Verbose) {
- fprintf(stderr, "Incoming: %s %ld %lo %o\n",
+ fprintf(Logstream, "Incoming: %s %ld %lo %o\n",
@ -164,7 +163,7 @@
}
}
@@ -683,7 +691,7 @@
@@ -706,7 +712,7 @@
zmanag &= ZMMASK;
if (zmanag==ZMPROT)
goto skipfile;
@ -173,7 +172,7 @@
if (Thisbinary && zconv==ZCRESUM) {
rxbytes = f.st_size & ~511;
if (Bytesleft < rxbytes) {
@@ -930,7 +938,7 @@
@@ -953,7 +959,7 @@
if (Restricted) {
if (fopen(name, "r") != NULL) {
canit();
@ -182,7 +181,7 @@
bibi(-1);
}
/* restrict pathnames to current tree or uucppublic */
@@ -1049,6 +1057,10 @@
@@ -1072,6 +1078,10 @@
return ERROR;
}
#endif
@ -193,7 +192,7 @@
cmdzack1flg = Rxhdr[ZF0];
if (zrdata(secbuf, 1024) == GOTCRCW) {
void exec2();
@@ -1068,6 +1080,7 @@
@@ -1091,6 +1101,7 @@
return ZCOMPL;
}
zshhdr(4,ZNAK, Txhdr); goto again;
@ -201,7 +200,7 @@
case ZCOMPL:
goto again;
default:
@@ -1222,7 +1235,7 @@
@@ -1245,7 +1256,7 @@
}
moredata:
if (Verbose>1)

107
comms/rzsz/patches/patch-ad
View File

@ -1,21 +1,26 @@
--- sz.c.orig Wed Mar 3 11:01:52 1999
+++ sz.c Thu May 20 19:50:27 1999
@@ -1,5 +1,5 @@
-#define VERSION "3.49 03-03-99"
-#define PUBDIR "/usr/spool/uucppublic"
+#define VERSION "3.49/ache 03-03-99"
+#define PUBDIR "/var/spool/uucppublic"
/*
**************************************************************************
@@ -192,17 +192,18 @@
--- sz.c.orig Tue Nov 30 15:08:18 1999
+++ sz.c Tue Nov 30 15:49:37 1999
@@ -192,6 +192,8 @@
STATIC jmp_buf intrjmp; /* For the interrupt on RX CAN */
+int log_to_screen = 0; /* Don't make log file */
+int log_to_screen = 0; /* Don't make log file *
+
/* called by signal interrupt or terminate to clean things up */
void
/* send cancel string to get the other end to shut up */
canit()
@@ -199,9 +201,8 @@
static char canistr[] = {
24,24,24,24,24,24,24,24,24,24,0
};
-
+ purgeline(); /* Do read next time ... */
zmputs(canistr);
- Lleft=0; /* Do read next time ... */
}
@@ -210,11 +211,11 @@
bibi(n)
{
canit(); fflush(stdout); mode(0);
@ -25,34 +30,34 @@
abort();
if (n == 99)
- fprintf(stderr, "mode(2) in rbsb.c not implemented!!\n");
+ fprintf(Logstream, "mode(2) in rbsb.c not implemented!!\n");
+ fprintf(Logstream, "mode(2) in rbsb.c not implemented!!\n");
exit(3);
}
@@ -251,9 +252,9 @@
@@ -252,9 +253,9 @@
{
if (Verbose <= 0)
return;
- fprintf(stderr, "Retry %d: ", errors);
- fprintf(stderr, s, p, u);
- fprintf(stderr, s, p);
- fprintf(stderr, "\n");
+ fprintf(Logstream, "Retry %d: ", errors);
+ fprintf(Logstream, s, p, u);
+ fprintf(Logstream, s, p);
+ fprintf(Logstream, "\n");
}
@@ -348,6 +349,9 @@
void
@@ -360,6 +361,9 @@
mode(0); exit(0);
case 'u':
++Unlinkafter; break;
+ case 'V':
+ case 'V':
+ log_to_screen = 1;
+ /* fall */
+ /* fall */
case 'v':
++Verbose; break;
case 'w':
@@ -396,13 +400,13 @@
@@ -408,13 +412,13 @@
}
if (npats < 1 && !Command && !Test)
usage();
@ -71,7 +76,7 @@
}
vfile("%s %s for %s tty=%s\n", Progname, VERSION, OS, Nametty);
@@ -452,12 +456,11 @@
@@ -464,12 +468,11 @@
"%d file(s) skipped by receiver request\r\n", Skipcount);
}
if (endmsg[0]) {
@ -79,27 +84,27 @@
+ fprintf(stderr, "\r\n%s: %s\r\n", Progname, endmsg);
if (Verbose)
- fprintf(stderr, "%s\r\n", endmsg);
+ fprintf(Logstream, "%s\r\n", endmsg);
+ fprintf(Logstream, "%s\r\n", endmsg);
}
- printf("%s %s finished.\r\n", Progname, VERSION);
- fflush(stdout);
+ fprintf(stderr, "%s %s finished.\r\n", Progname, VERSION);
mode(0);
if(errcnt || Exitcode)
exit(1);
@@ -465,9 +468,8 @@
#ifndef REGISTERED
/* Removing or disabling this code without registering is theft */
if (!Usevhdrs) {
if(errcnt || Exitcode) {
mode(0); exit(1);
}
@@ -484,9 +487,8 @@
canit();
sleep(4);
printf("%s %s finished.\r\n", Progname, VERSION);
- printf("\n\n\n**** UNREGISTERED COPY *****\r\n");
- printf("\n\n\nPlease read the License Agreement in sz.doc\n");
- printf("\n\n\nPlease read the License Agreement in sz.doc\r\n");
- fflush(stdout);
+ fprintf(stderr, "\n\n\n**** UNREGISTERED COPY *****\r\n");
+ fprintf(stderr, "\n\n\nPlease read the License Agreement in sz.doc\n");
sleep(10);
}
#endif
@@ -502,8 +504,7 @@
fflush(stdout);
@@ -522,8 +524,7 @@
bytcnt = maxbytcnt = -1;
vfile("wcsend: argc=%d", argc);
if (Nozmodem) {
@ -109,7 +114,7 @@
}
for (n=0; n<argc; ++n) {
Totsecs = 0;
@@ -597,7 +598,7 @@
@@ -617,7 +618,7 @@
default:
return ERROR;
}
@ -118,7 +123,7 @@
return ERROR;
if (Unlinkafter)
@@ -623,11 +624,10 @@
@@ -643,11 +644,10 @@
vfile("wctxpn: %s", name);
if (Modem2) {
if (*name && fstat(fileno(in), &f)!= -1) {
@ -133,7 +138,7 @@
return OK;
}
zperr2("Awaiting pathname nak for %s", *name?name:"<END>");
@@ -660,7 +660,7 @@
@@ -680,7 +680,7 @@
*q++ = 0;
if (*name) {
if (fstat(fileno(in), &f)!= -1)
@ -142,7 +147,7 @@
f.st_mode, Filesleft, Totalleft);
Totalleft -= f.st_size;
}
@@ -783,7 +783,7 @@
@@ -805,7 +805,7 @@
firstch=0; /* part of logic to detect CAN CAN */
if (Verbose>1)
@ -151,7 +156,7 @@
for (attempts=0; attempts <= RETRYMAX; attempts++) {
Lastrx= firstch;
sendline(cseclen==1024?STX:SOH);
@@ -901,7 +901,7 @@
@@ -923,7 +923,7 @@
{
long m, n;
@ -160,7 +165,7 @@
/* Seek offset < current buffer */
if (pos < (vpos -TXBSIZE +1024)) {
BEofseen = 0;
@@ -983,11 +983,13 @@
@@ -1005,11 +1005,13 @@
char *usinfo[] = {
"Send Files and Commands with ZMODEM/YMODEM/XMODEM Protocol\n",
@ -169,7 +174,7 @@
- "\t zcommandi [-egv] COMMAND",
- "\t sb [-adfkuv] [-] file ...",
- "\t sx [-akuv] [-] file",
+ "Usage:",
+ "Usage:",
+ " sz [-+abcdefgknNouvVxyYZ] [-lN] [-LN] [-wN] [-r[r]] [-] file ...",
+ " sz -T",
+ " zcommand [-egvV] COMMAND",
@ -179,7 +184,7 @@
""
};
@@ -1364,9 +1366,9 @@
@@ -1391,9 +1393,9 @@
}
signal(SIGINT, SIG_IGN); canit();
sleep(20); purgeline(); mode(0);
@ -191,7 +196,7 @@
exit(1);
}
exit(0);
@@ -1387,7 +1389,7 @@
@@ -1414,7 +1416,7 @@
} else
e = ZCRCG;
if (Verbose>1)
@ -200,7 +205,7 @@
Txpos, Crc32t?" CRC-32":"");
zsdata(txbuf, n, e);
bytcnt = Txpos += n;
@@ -1479,7 +1481,7 @@
@@ -1506,7 +1508,7 @@
for (;;) {
if (Test) {
@ -209,7 +214,7 @@
Rxpos = 0; c = ZRPOS;
} else
c = zgethdr(Rxhdr);
@@ -1633,17 +1635,16 @@
@@ -1660,17 +1662,16 @@
for (Totalleft = 0, Filesleft = 0; --argc >=0; ++argv) {
f.st_size = -1;
if (Verbose>2) {
@ -228,9 +233,9 @@
- fprintf(stderr, "\ncountem: Total %d %ld\n",
+ fprintf(Logstream, "\ncountem: Total %d %ld\n",
Filesleft, Totalleft);
Totfiles = Filesleft; Totbytes = Totalleft;
}
@@ -1652,33 +1653,34 @@
@@ -1680,33 +1681,34 @@
register n;
mode(m);
@ -239,7 +244,7 @@
- printf("Hit Enter.\021"); fflush(stdout);
+ fprintf(stderr, "\r\n\nCharacter Transparency Test Mode %d\r\n", m);
+ fprintf(stderr, "If Pro-YAM/ZCOMM is not displaying ^M hit ALT-V NOW.\r\n");
+ purgeline();
+ purgeline();
+ fprintf(stderr, "Hit Enter.");
readline(500);
@ -263,7 +268,7 @@
}
- printf("\021\r\nEnter Characters, echo is in hex.\r\n");
- printf("Hit SPACE or pause 40 seconds for exit.\r\n");
+ purgeline();
+ purgeline();
+ fprintf(stderr, "\r\nEnter Characters, echo is in hex.\r\n");
+ fprintf(stderr, "Hit SPACE or pause 40 seconds for exit.\r\n");
@ -271,7 +276,7 @@
n = readline(400);
- printf("%02x\r\n", n);
- fflush(stdout);
+ fprintf(stderr, "%02x\r\n", n);
+ fprintf(stderr, "%02x\r\n", n);
}
- printf("\r\nMode %d character transparency test ends.\r\n", m);
- fflush(stdout);