summaryrefslogtreecommitdiff
path: root/misc/team/patches/patch-ab
blob: 89839af5cdb7c767cc8fd383394f1cf7891d0f62 (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293
294
295
296
297
298
299
300
301
302
303
304
305
306
307
308
309
310
311
312
313
314
315
316
317
318
319
320
321
322
323
324
325
326
327
328
329
330
331
332
333
334
335
336
337
338
339
340
341
342
343
344
345
346
347
348
349
350
351
352
353
354
355
356
357
358
359
360
361
362
363
364
365
366
367
368
369
370
371
372
373
374
375
376
377
378
379
380
381
382
383
384
385
386
387
388
389
390
391
392
393
394
395
396
397
398
399
400
401
402
403
404
405
406
407
408
409
$NetBSD: patch-ab,v 1.4 2005/11/10 18:29:01 joerg Exp $

--- team.c.orig	1995-07-01 15:33:24.000000000 +0000
+++ team.c
@@ -58,8 +58,8 @@ static char Notice[] =
   upstream to it, which has much the same effect.
 */
 
-#define TeamLVOLSZ	(1L<<10)
-#define TeamHVOLSZ	((long unsigned) 3 * ((long unsigned) 1 << 30))
+#define TeamLVOLSZ	(unsigned long long)(1L<<10)
+#define TeamHVOLSZ	((unsigned long long) 3 * ((unsigned long long)1 << 62))
 
 #define TeamLBUFSZ	(64)		/* Low buffer size		*/
 #define TeamDBUFSZ	(60*512)	/* Default buffer size		*/
@@ -84,11 +84,23 @@ static char Notice[] =
 #include <sys/file.h>
 #include <sys/stat.h>
 #include <fcntl.h>
+#ifdef HAVE_WAIT_H
+#include <sys/wait.h>
+#endif
+
+#ifdef HAVE_PARAM_H
+#include <sys/param.h>
+#endif
+
 
 #ifdef sun
 # undef F_SETLKW
 #endif
 
+#if (defined(BSD) && BSD >= 199306)
+# undef F_SETLKW
+#endif
+
 #if (PCG)
 # include "Extend.h"
 # include "Here.h"
@@ -99,6 +111,7 @@ static char Notice[] =
 # define fast		register
 # define global     	/* extern */
 # define local		static
+# define When		case
 # define when		break; case
 # define otherwise	break; default
 # define mode(which,name) typedef which name name; which name
@@ -160,8 +173,8 @@ mesg(a,b,c,d,e,f,g,h,i)
 
 local bool		verbose = false;
 local bool		report = true;
+local bool		guyhaderror = false;
 
-extern int		errno;
 local time_t		origin;
 
 extern time_t		time of((time_t *));
@@ -190,7 +203,7 @@ mode(struct,Fd)
 {
   int 	    fd;
   short	    status;
-  long unsigned   size;
+  unsigned long long   size;
 };
 
 local Fd		FdIn,FdOut;
@@ -199,7 +212,7 @@ local bool		FdOpen on((fd,ffd,size)) is
 (
   fast Fd		  *fd
 _ int			  ffd
-_ long unsigned		  size
+_ unsigned long long	  size
 )
 {
   fd->status = (ffd >= 0) ? FdOPEN :   FdCLOSED;
@@ -252,12 +265,12 @@ _ fast Fd		  *from
   to->fd	= from->fd;
 }
 
-local long unsigned	FdRetry on((fd,which,done,space)) is
+local unsigned long long	FdRetry on((fd,which,done,space)) is
 (
   fast Fd		  *fd
 _ char			  *which
-_ long unsigned		  done
-_ long unsigned		  space
+_ unsigned long long	  done
+_ unsigned long long	  space
 )
 {
   int			  tty;
@@ -286,16 +299,21 @@ _ long unsigned		  space
   do
   {
 #if (defined i386 || defined sun)
+#  if !(defined(BSD) && (BSD >= 199306))
     extern char		*(sys_errlist[]);
+#  endif
+#  if (defined(BSD) && (BSD >= 199306)) && __STDC__
+    const
+#  endif
     char		*errmsg = sys_errlist[errno];
 #else
     char		errmsg[32];
     (void) sprintf(errmsg,"Error %d",errno);
 #endif
     if (errno)
-      mesg("'%s' on %s after %luk. Continue [cyn] ? ",errmsg,which,done>>10);
+      mesg("'%s' on %s after %quk. Continue [cyn] ? ",errmsg,which,done>>10);
     else
-      mesg("EOF on %s after %luk. Continue [cyn] ? ",which,done>>10);
+      mesg("EOF on %s after %quk. Continue [cyn] ? ",which,done>>10);
 
     read(tty,reply,sizeof reply);
   }
@@ -320,7 +338,7 @@ _ long unsigned		  space
 local unsigned		FdCanDo on((remaining,available)) is
 (
   fast address		  remaining
-_ fast long unsigned	  available
+_ fast unsigned long long	  available
 )
 {
   return (remaining < available)
@@ -332,16 +350,16 @@ local address		FdRead on((fd,buffer,todo
   fast Fd		  *fd
 _ pointer		  buffer
 _ fast address		  todo
-_ long unsigned		  done
+_ unsigned long long	  done
 )
 {
-  fast long unsigned	  space;
+  fast unsigned long long	  space;
   fast int		  bytesRead;
   fast address		  justDone;
 
   switch (fd->status)
   {
-  when FdEOF:     return 0;
+  When FdEOF:     return 0;
   when FdERROR:   return -1;
   when FdCLOSED:  return -1;
 
@@ -373,16 +391,16 @@ local address		FdWrite on((fd,buffer,tod
   fast Fd		  *fd
 _ pointer		  buffer
 _ fast address		  todo
-_ long unsigned		  done
+_ unsigned long long	  done
 )
 {
-  fast long unsigned	  space;
+  fast unsigned long long	  space;
   fast int		  bytesWritten;
   fast address		  justDone;
 
   switch (fd->status)
   {
-  when FdEOF:     return 0;
+  When FdEOF:     return 0;
   when FdERROR:   return -1;
   when FdCLOSED:  return -1;
 
@@ -453,7 +471,7 @@ mode(struct,StreamMsg)
 {
   Token			  token;
   short			  status;
-  long unsigned		  done;
+  unsigned long long	  done;
 };
 
 local bool		StreamSend on((fd,token,status,done)) is
@@ -461,7 +479,7 @@ local bool		StreamSend on((fd,token,stat
   fast Fd		  *fd
 _ Token 		  token
 _ short 		  status
-_ long unsigned		  done
+_ unsigned long long	  done
 )
 {
   fast int		  n;
@@ -483,7 +501,7 @@ local bool		StreamReceive on((fd,tokenp,
   fast Fd		  *fd
 _ Token 		  *tokenp
 _ short 		  *statusp
-_ long unsigned		  *donep
+_ unsigned long long	  *donep
 )
 {
   fast int		  n;
@@ -536,7 +554,7 @@ _ Fd			  *downstream
 #define GuyRECEIVE(guy,tokenp,statusp,donep) \
   StreamReceive(&guy->upStream,tokenp,statusp,donep)
 
-local bool		GuyStop of((Guy *,char *,long unsigned));
+local bool		GuyStop of((Guy *,char *,unsigned long long));
 
 local bool		GuyStart on((guy,bufsize)) is
 (
@@ -547,7 +565,7 @@ _ address		  bufsize
   fast char		  *buffer;
   Token 		  token;
   short 		  status;
-  long unsigned		  done;
+  unsigned long long	  done;
   bool		  received;
   static int 		  bytesRead,bytesWritten;
 
@@ -564,7 +582,7 @@ _ address		  bufsize
   while ((received = GuyRECEIVE(guy,&token,&status,&done)) && token != TokenSTOP)
   switch (token)
   {
-  when TokenREAD:
+  When TokenREAD:
     FdIn.status = status;
 
     Mesg(("GuyStart reading %d chars\n",bufsize));
@@ -577,7 +595,7 @@ _ address		  bufsize
     done += bytesRead;
 
     if (verbose)
-      mesg("%luk read   \r",done>>10);
+      mesg("%quk read   \r",done>>10);
 
     if (!GuySEND(guy,TokenREAD,FdIn.status,done))
       GuyStop(guy,"guy cannot send READ",done);
@@ -595,7 +613,7 @@ _ address		  bufsize
     done += bytesWritten;
 
     if (verbose)
-      mesg("%luk written\r",done>>10);
+      mesg("%quk written\r",done>>10);
 
     if (!GuySEND(guy,TokenWRITE,FdOut.status,done))
       GuyStop(guy,"guy cannot send WRITE",done);
@@ -619,7 +637,7 @@ local bool		GuyStop on((guy,errormsg,don
 (
   fast Guy		  *guy
 _ char			  *errormsg
-_ long unsigned		  done
+_ unsigned long long	  done
 )
 {
   Mesg(("GuyStop guy %#o\n",guy));
@@ -627,8 +645,8 @@ _ long unsigned		  done
   if (done)
   {
     if (report)
-      mesg("%lu kilobytes, %lu seconds\r\n",
-	  done>>10,(long unsigned) (time((time_t *) 0)-origin));
+      mesg("%qu kilobytes, %lu seconds\r\n",
+	  done>>10,(unsigned long long) (time((time_t *) 0)-origin));
     else if (verbose)
       mesg("\n");
   }
@@ -637,7 +655,7 @@ _ long unsigned		  done
   {
     mesg("team: guy pid %u: %s\n",guy->pid,errormsg);
     call GuySEND(guy,TokenABORT,FdERROR,0L);
-    exit(1);
+    exit(2);
     /*NOTREACHED*/
   }
 
@@ -697,8 +715,8 @@ local bool		TeamStart on((team,bufsize,i
 (
   fast Team		  *team
 _ address		  bufsize
-_ long unsigned		  isize
-_ long unsigned		  osize
+_ unsigned long long		  isize
+_ unsigned long long		  osize
 )
 {
   /*
@@ -797,6 +815,9 @@ _ long unsigned		  osize
     {
       pid = getpid();
 
+      /* Set SIGPIPE handling back to the default in the guys */
+      signal(SIGPIPE, SIG_DFL);
+
       if (!FdClose(&last_downstream))
 	perror("cannot close inherited first link");
 
@@ -816,13 +837,13 @@ _ long unsigned		  osize
     }
   }
 
-  if (!StreamSend(&last_downstream,TokenREAD,FdOPEN,0L))
+  if (!StreamSend(&last_downstream,TokenREAD,FdOPEN,0L) && errno != EPIPE)
   {
     perror("cannot send first READ token");
     return false;
   }
 
-  if (!StreamSend(&last_downstream,TokenWRITE,FdOPEN,0L))
+  if (!StreamSend(&last_downstream,TokenWRITE,FdOPEN,0L) && errno != EPIPE)
   {
     perror("cannot send first WRITE token");
     return false;
@@ -864,6 +885,14 @@ local bool		TeamWait on((team)) is
 
     --team->active;
 
+#ifdef WIFEXITED
+    /* If a guy had an error, its exit status is 2.  Also catch a killed guy */
+    if ((WIFEXITED(status) && WEXITSTATUS(status) == 2) ||
+	(WIFSIGNALED(status) && WTERMSIG(status) != SIGPIPE)) {
+      guyhaderror = true;
+    }
+#endif
+
     if (status != 0   && team->active != 0)
       return false;
   }
@@ -914,8 +943,8 @@ local void		usage of((noparms))
 syntax: team [-[vr]] [-iI[bkm] [-oO[bkm] [N[bkm] [P]]\n\
   copies standard input to output\n\
   -v gives ongoing report, -r final report\n\
-  I is input volume size (default %lum)\n\
-  O is output volume size (default %lum)\n\
+  I is input volume size (default %qum)\n\
+  O is output volume size (default %qum)\n\
   N is buffer size (default %luk)\n\
   P is number of processes (default %u)\n\
   (postfix b means *512, k means *1KB, m means *1MB)\n\
@@ -927,19 +956,19 @@ syntax: team [-[vr]] [-iI[bkm] [-oO[bkm]
   /*NOTREACHED*/
 }
 
-local long unsigned	atos on((s)) is
+local unsigned long long	atos on((s)) is
 (
   fast char		  *s
 )
 {
-  fast unsigned long	  l;
+  fast unsigned long long	  l;
 
   for (
     s, l = 0L;
     *s >= '0' && *s <= '9';
     s++
   )
-    l = l*10L + (long unsigned) (*s-'0');
+    l = l*10L + (unsigned long long) (*s-'0');
 
   if (*s == 'b') l *= (1L<<9);
   if (*s == 'k') l *= (1L<<10);
@@ -958,8 +987,8 @@ _ char			  *(argv[])
   short unsigned	  teamsize;
 
   address		  bufsize;
-  long unsigned		  isize;
-  long unsigned		  osize;
+  unsigned long long	  isize;
+  unsigned long long	  osize;
   int			  opt;
 
   teamsize = TeamDTEAMSZ;
@@ -971,11 +1000,11 @@ _ char			  *(argv[])
   while ((opt = getopt(argc,argv,"vri:o:")) != -1)
     switch (opt)
     {
-    when 'i':
+    When 'i':
       isize = atos(optarg);
       if (isize < TeamLVOLSZ || isize > TeamHVOLSZ)
       {
-	fprintf(stderr,"team: invalid input volume size %lu\n",isize);
+	fprintf(stderr,"team: invalid input volume size %qu\n",isize);
 	usage();
       }
   
@@ -983,7 +1012,7 @@ _ char			  *(argv[])
       osize = atos(optarg);
       if (osize < TeamLVOLSZ || osize > TeamHVOLSZ)
       {
-	fprintf(stderr,"team: invalid output volume size %lu\n",osize);
+	fprintf(stderr,"team: invalid output volume size %qu\n",osize);
 	usage();
       }
 
@@ -1032,6 +1061,11 @@ _ char			  *(argv[])
 
   origin = time((time_t *) 0);
 
+  /*
+   * Ignore SIGPIPE in the parent as it affects the exit status reporting.
+   */
+  signal(SIGPIPE, SIG_IGN);
+
   if (!TeamStart(&team,bufsize,isize,osize))
   {
     mesg("team: cannot start the team\n");
@@ -1055,5 +1089,11 @@ _ char			  *(argv[])
     return 1;
   }
 
+  if (guyhaderror)
+  {
+    mesg("team: guy had error\n");
+    return 1;
+  }
+
   return 0;
 }