FreeBSD Bugzilla – Attachment 228676 Details for
Bug 259151
misc/team [patch included] fixing ancient code with K&R compatibility layer and bad pointers and non-varargs. Ugh.
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
Remember
[x]
|
Forgot Password
Login:
[x]
[patch]
patch for team.c (assumes other patches already applied)
team-patch (text/plain), 12.64 KB, created by
dgilbert
on 2021-10-13 18:50:15 UTC
(
hide
)
Description:
patch for team.c (assumes other patches already applied)
Filename:
MIME Type:
Creator:
dgilbert
Created:
2021-10-13 18:50:15 UTC
Size:
12.64 KB
patch
obsolete
>--- team.c 2021-10-13 14:39:09.493383000 -0400 >+++ /home/dgilbert/devel/team-3.1/team.c 2021-10-13 02:08:15.894333000 -0400 >@@ -1,10 +1,10 @@ >-/* >- $Header: /fs/mumon/aware/piercarl/Cmd./Commands./team.c,v 3.1 1994/01/13 15:03:25 piercarl Exp piercarl $ >-*/ > > static char Notice[] = > "Copyright 1987,1989 Piercarlo Grandi. All rights reserved."; > >+static char Notice2[] = >+ "Copyright 2021 David Gilbert. All rights reserved."; >+ > /* > This program is free software; you can redistribute it and/or > modify it under the terms of the GNU General Public License as >@@ -118,7 +118,6 @@ > #else > # define call (void) > # define were if >-# define fast register > # define global /* extern */ > # define local static > # define when break; case >@@ -129,12 +128,10 @@ > # define false 0 > # define nil(type) ((type) 0) > # define scalar int >- typedef char *pointer; >-# if (defined(SMALL_M)) >- typedef unsigned address; >-# else >- typedef long address; >-# endif >+ >+typedef void *pointer; >+typedef size_t address; >+ > # if (__STDC__) > # define of(list) list > # define on(list) >@@ -162,7 +159,8 @@ > void mesg(char *a, ...) > { > va_list ap; >- >+ char buf[256]; >+ > va_start(ap, a); > > # if (defined F_SETLKW) >@@ -173,7 +171,8 @@ > # if (defined LOCK_EX) > flock(fileno(stderr),LOCK_EX); > # endif >- vfprintf(stderr,a,ap); >+ snprintf(buf, sizeof(buf), "%d: %s", getpid(), a); >+ vfprintf(stderr,buf,ap); > # if (defined LOCK_EX) > flock(fileno(stderr),LOCK_UN); > # endif >@@ -182,12 +181,12 @@ > # endif > } > >-local bool verbose = false; >-local bool report = true; >-local bool guyhaderror = false; >+static bool verbose = false; >+static bool report = true; >+static bool guyhaderror = false; > > // extern int errno; >-local time_t origin; >+static time_t origin; > > > /* >@@ -209,14 +208,9 @@ > UOFF_T size; > }; > >-local Fd FdIn,FdOut; >+static Fd FdIn,FdOut; > >-local bool FdOpen on((fd,ffd,size)) is >-( >- fast Fd *fd >-_ int ffd >-_ UOFF_T size >-) >+static bool FdOpen (Fd *fd, int ffd, UOFF_T size) > { > fd->status = (ffd >= 0) ? FdOPEN : FdCLOSED; > fd->fd = ffd; >@@ -227,10 +221,7 @@ > return ffd >= 0; > } > >-local bool FdClose on((fd)) is >-( >- fast Fd *fd >-) >+static bool FdClose(Fd *fd) > { > int ffd; > >@@ -242,11 +233,7 @@ > return close(ffd) >= 0; > } > >-local bool FdCopy on((to,from)) is >-( >- fast Fd *to >-_ fast Fd *from >-) >+static bool FdCopy(Fd *to, Fd *from) > { > to->size = from->size; > to->status = from->status; >@@ -255,11 +242,7 @@ > return to->fd >= 0; > } > >-local void FdSet on((to,from)) is >-( >- fast Fd *to >-_ fast Fd *from >-) >+static void FdSet(Fd *to, Fd *from) > { > if (from->fd < 0) > mesg("team: set an invalid fd\n"); >@@ -268,13 +251,7 @@ > to->fd = from->fd; > } > >-local UOFF_T FdRetry on((fd,which,done,space)) is >-( >- fast Fd *fd >-_ char *which >-_ UOFF_T done >-_ UOFF_T space >-) >+static UOFF_T FdRetry(Fd *fd, char *which, UOFF_T done, UOFF_T space) > { > int tty; > char reply[2]; >@@ -314,9 +291,9 @@ > (void) sprintf(errmsg,"Error %d",errno); > #endif > if (errno) >- mesg("'%s' on %s after %quk. Continue [cyn] ? ",errmsg,which,done>>10); >+ mesg("'%s' on %s after %luM. Continue [cyn] ? ",errmsg,which,done>>20); > else >- mesg("EOF on %s after %quk. Continue [cyn] ? ",which,done>>10); >+ mesg("EOF on %s after %luM. Continue [cyn] ? ",which,done>>20); > > read(tty,reply,sizeof reply); > } >@@ -338,27 +315,17 @@ > return space; > } > >-local unsigned FdCanDo on((remaining,available)) is >-( >- fast address remaining >-_ fast UOFF_T available >-) >+static unsigned FdCanDo(address remaining, UOFF_T available) > { > return (remaining < available) > ? (unsigned) remaining : (unsigned) available; > } > >-local address FdRead on((fd,buffer,todo,done)) is >-( >- fast Fd *fd >-_ pointer buffer >-_ fast address todo >-_ UOFF_T done >-) >+static address FdRead(Fd *fd, pointer buffer, address todo, UOFF_T done) > { >- fast UOFF_T space; >- fast int bytesRead; >- fast address justDone; >+ UOFF_T space; >+ int bytesRead; >+ address justDone; > > switch (fd->status) > { >@@ -390,17 +357,11 @@ > assert(0); > } > >-local address FdWrite on((fd,buffer,todo,done)) is >-( >- fast Fd *fd >-_ pointer buffer >-_ fast address todo >-_ UOFF_T done >-) >+static address FdWrite(Fd *fd, pointer buffer, address todo, UOFF_T done) > { >- fast UOFF_T space; >- fast int bytesWritten; >- fast address justDone; >+ UOFF_T space; >+ size_t bytesWritten; >+ address justDone; > > switch (fd->status) > { >@@ -409,16 +370,17 @@ > when FdCLOSED: return -1; > > when FdOPEN: >- > space = fd->size - done%fd->size; > >+ Mesg(("FdWrite %d going to write %p %d bytes last %d\n",fd->fd,buffer,todo,bytesWritten)); >+ > for (justDone = 0; space != 0L && justDone < todo;) > { > bytesWritten = write(fd->fd,buffer+justDone, >- FdCanDo(todo-justDone,space-justDone)); >+ FdCanDo(todo-justDone,space-justDone)); > > if (bytesWritten <= 0 || (justDone += bytesWritten) == space) >- space = FdRetry(fd,"output",done+justDone,space-justDone); >+ space = FdRetry(fd,"output",done+justDone,space-justDone); > } > > Mesg(("FdWrite %d writes %d last %d\n",fd->fd,justDone,bytesWritten)); >@@ -452,11 +414,7 @@ > abstraction for input and output... > */ > >-local bool StreamPipe on((downstream,upstream)) is >-( >- fast Fd *downstream >-_ fast Fd *upstream >-) >+static bool StreamPipe(Fd *downstream, Fd *upstream) > { > int links[2]; > >@@ -479,15 +437,9 @@ > UOFF_T done; > }; > >-local bool StreamSend on((fd,token,status,done)) is >-( >- fast Fd *fd >-_ Token token >-_ short status >-_ UOFF_T done >-) >+static bool StreamSend(Fd *fd, Token token, short status, UOFF_T done) > { >- fast int n; >+ int n; > StreamMsg message; > > message.token = token; >@@ -501,15 +453,9 @@ > return n == sizeof message; > } > >-local bool StreamReceive on((fd,tokenp,statusp,donep)) is >-( >- fast Fd *fd >-_ Token *tokenp >-_ short *statusp >-_ UOFF_T *donep >-) >+static bool StreamReceive(Fd *fd, Token *tokenp, short *statusp, UOFF_T *donep) > { >- fast int n; >+ int n; > StreamMsg message; > > n = read(fd->fd,(pointer) &message,(unsigned) sizeof message); >@@ -535,13 +481,7 @@ > Fd downStream; > }; > >-local bool GuyOpen on((guy,pid,upstream,downstream)) is >-( >- fast Guy *guy >-_ int pid >-_ Fd *upstream >-_ Fd *downstream >-) >+static bool GuyOpen(Guy *guy, int pid, Fd *upstream, Fd *downstream) > { > Mesg(("GuyOpen pid %u upstream %u downstream %u\n", > pid,upstream->fd,downstream->fd)); >@@ -559,22 +499,18 @@ > #define GuyRECEIVE(guy,tokenp,statusp,donep) \ > StreamReceive(&guy->upStream,tokenp,statusp,donep) > >-local bool GuyStop of((Guy *,char *,UOFF_T)); >+static bool GuyStop(Guy *,char *,UOFF_T); > >-local bool GuyStart on((guy,bufsize)) is >-( >- fast Guy *guy >-_ address bufsize >-) >+static bool GuyStart(Guy *guy, address bufsize) > { >- fast char *buffer; >+ char *buffer; > Token token; > short status; > UOFF_T done; > bool received; > static int bytesRead,bytesWritten; > >- Mesg(("GuyStart guy %#o bufsize %u\n",guy,bufsize)); >+ Mesg(("GuyStart guy %p bufsize %u\n",guy,bufsize)); > > buffer = (pointer) malloc((unsigned) bufsize); > if (buffer == nil(pointer)) >@@ -600,7 +536,7 @@ > done += bytesRead; > > if (verbose) >- mesg("%quk read \r",done>>10); >+ mesg("%luk read \r",done>>10); > > if (!GuySEND(guy,TokenREAD,FdIn.status,done)) > GuyStop(guy,"guy cannot send READ",done); >@@ -618,7 +554,7 @@ > done += bytesWritten; > > if (verbose) >- mesg("%quk written\r",done>>10); >+ mesg("%luk written\r",done>>10); > > if (!GuySEND(guy,TokenWRITE,FdOut.status,done)) > GuyStop(guy,"guy cannot send WRITE",done); >@@ -639,20 +575,15 @@ > /*return true;*/ > } > >-local bool GuyStop on((guy,errormsg,done)) is >-( >- fast Guy *guy >-_ char *errormsg >-_ UOFF_T done >-) >+static bool GuyStop(Guy *guy, char *errormsg, UOFF_T done) > { >- Mesg(("GuyStop guy %#o\n",guy)); >+ Mesg(("GuyStop guy %p\n",guy)); > > if (done) > { > if (report) > mesg("%qu kilobytes, %lu seconds\r\n", >- done>>10,(UOFF_T) (time((time_t *) 0)-origin)); >+ done>>10,(UOFF_T) (time((time_t *) 0)-origin)); > else if (verbose) > mesg("\n"); > } >@@ -675,10 +606,7 @@ > /*NOTREACHED*/ > } > >-local bool GuyClose on((guy)) is >-( >- fast Guy *guy >-) >+static bool GuyClose(Guy *guy) > { > return FdClose(&guy->upStream) && FdClose(&guy->downStream); > } >@@ -696,11 +624,7 @@ > short unsigned active; > }; > >-local bool TeamOpen on((team,nominalsize)) is >-( >- Team *team >-_ short unsigned nominalsize >-) >+static bool TeamOpen(Team *team, short unsigned nominalsize) > { > Mesg(("TeamOpen nominalsize %u\n",nominalsize)); > >@@ -717,13 +641,7 @@ > return true; > } > >-local bool TeamStart on((team,bufsize,isize,osize)) is >-( >- fast Team *team >-_ address bufsize >-_ UOFF_T isize >-_ UOFF_T osize >-) >+static bool TeamStart(Team *team, address bufsize, UOFF_T isize, UOFF_T osize) > { > /* > When generating each guy, we pass it an upstream link that >@@ -760,15 +678,15 @@ > Fd this_downstream; > Fd next_upstream; > >- Mesg(("TeamStart team %#o size %u bufsize %u\n", >+ Mesg(("TeamStart team %p size %u bufsize %u\n", > team,team->size,bufsize)); > > call FdOpen(&FdIn,0,isize); call FdOpen(&FdOut,1,osize); > > for (team->active = 0; team->active < team->size; team->active++) > { >- fast Guy *guy; >- fast int pid; >+ Guy *guy; >+ int pid; > > guy = team->guys+team->active; > >@@ -801,13 +719,13 @@ > perror("team: cannot copy last downstream"); > } > >- Mesg(("TeamStart going to fork for guy %#o\n",guy)); >+ Mesg(("TeamStart going to fork for guy %p\n",guy)); > > pid = fork(); > > if (pid > 0) > { >- Mesg(("TeamStart forked guy %#o as pid %u\n",guy,pid)); >+ Mesg(("TeamStart forked guy %p as pid %u\n",guy,pid)); > guy->pid = pid; > > if (!FdClose(&this_upstream)) >@@ -861,10 +779,7 @@ > return true; > } > >-local bool TeamWait on((team)) is >-( >- fast Team *team >-) >+static bool TeamWait(Team *team) > { > while (team->active != 0) > { >@@ -874,7 +789,7 @@ > guypid = wait(&status); > if (guypid >= 0) > { >- fast short unsigned guyno; >+ short unsigned guyno; > > for (guyno = 0; guyno < team->size; guyno++) > if (guypid == team->guys[guyno].pid) >@@ -906,18 +821,15 @@ > return true; > } > >-local bool TeamStop on((team)) is >-( >- fast Team *team >-) >+static bool TeamStop(Team *team) > { >- fast short unsigned guyno; >+ short unsigned guyno; > >- Mesg(("TeamStop team %#o\n",team)); >+ Mesg(("TeamStop team %p\n",team)); > > for (guyno = 0; guyno < team->size; guyno++) > { >- fast Guy *guy; >+ Guy *guy; > > guy = team->guys+guyno; > if (guy->pid >= 0) >@@ -930,10 +842,7 @@ > return team->active == 0; > } > >-local bool TeamClose on((team)) is >-( >- fast Team *team >-) >+static bool TeamClose(Team *team) > { > for (; team->size != 0; --team->size) > continue; >@@ -943,7 +852,7 @@ > return true; > } > >-local void usage of((noparms)) >+static void usage(void) > { > fprintf(stderr,"\ > syntax: team [-[vr]] [-iI[bkm] [-oO[bkm] [N[bkm] [P]]\n\ >@@ -962,12 +871,9 @@ > /*NOTREACHED*/ > } > >-local UOFF_T atos on((s)) is >-( >- fast char *s >-) >+static UOFF_T atos(char *s) > { >- fast UOFF_T l; >+ UOFF_T l; > > for ( > l = 0L; >@@ -983,11 +889,7 @@ > return l; > } > >-global int main on((argc,argv)) is >-( >- int argc >-_ char *(argv[]) >-) >+global int main(int argc, char *(argv[])) > { > Team team; > short unsigned teamsize; >@@ -996,7 +898,9 @@ > UOFF_T isize; > UOFF_T osize; > int opt; >- >+ // NB: we never free these. >+ char *input_filename=0, *output_filename=0; >+ > teamsize = TeamDTEAMSZ; > bufsize = TeamDBUFSZ; > isize = TeamHVOLSZ; >@@ -1006,30 +910,36 @@ > while ((opt = getopt(argc,argv,"vri:o:")) != -1) > switch (opt) > { >- when 'i': >+ case 'i': > isize = atos(optarg); > if (isize < TeamLVOLSZ || isize > TeamHVOLSZ) > { > fprintf(stderr,"team: invalid input volume size %lu\n",isize); > usage(); > } >- >- when 'o': >+ break; >+ >+ case 'o': > osize = atos(optarg); > if (osize < TeamLVOLSZ || osize > TeamHVOLSZ) > { > fprintf(stderr,"team: invalid output volume size %lu\n",osize); > usage(); > } >- >- when 'v': >+ break; >+ >+ case 'v': > verbose ^= 1; >- >- when 'r': >+ break; >+ >+ case 'r': > report ^= 1; >- >- otherwise: >+ break; >+ >+ default: > usage(); >+ break; >+ > } > > argc -= optind, argv += optind;
<b>You cannot view the attachment while viewing its details because your browser does not support IFRAMEs. <a href="attachment.cgi?id=228676">View the attachment on a separate page</a>.</b>
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
Attachments on
bug 259151
: 228676