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
410
411
412
413
414
415
416
417
418
419
420
421
422
423
424
425
426
427
428
429
430
431
432
433
434
435
436
437
438
439
440
441
442
443
444
445
446
447
448
449
450
451
452
453
|
*** team.c.ORIG Wed Nov 6 17:51:42 1996
--- team.c Wed Nov 6 18:07:15 1996
***************
*** 58,65 ****
upstream to it, which has much the same effect.
*/
! #define TeamLVOLSZ (1L<<10)
! #define TeamHVOLSZ ((long unsigned) 3 * ((long unsigned) 1 << 30))
#define TeamLBUFSZ (64) /* Low buffer size */
#define TeamDBUFSZ (60*512) /* Default buffer size */
--- 58,65 ----
upstream to it, which has much the same effect.
*/
! #define TeamLVOLSZ (off_t unsigned)(1L<<10)
! #define TeamHVOLSZ ((off_t unsigned) 3 * ((off_t unsigned) 1 << 62))
#define TeamLBUFSZ (64) /* Low buffer size */
#define TeamDBUFSZ (60*512) /* Default buffer size */
***************
*** 195,201 ****
{
int fd;
short status;
! long unsigned size;
};
local Fd FdIn,FdOut;
--- 195,201 ----
{
int fd;
short status;
! off_t unsigned size;
};
local Fd FdIn,FdOut;
***************
*** 204,210 ****
(
fast Fd *fd
_ int ffd
! _ long unsigned size
)
{
fd->status = (ffd >= 0) ? FdOPEN : FdCLOSED;
--- 204,210 ----
(
fast Fd *fd
_ int ffd
! _ off_t unsigned size
)
{
fd->status = (ffd >= 0) ? FdOPEN : FdCLOSED;
***************
*** 257,268 ****
to->fd = from->fd;
}
! local long unsigned FdRetry on((fd,which,done,space)) is
(
fast Fd *fd
_ char *which
! _ long unsigned done
! _ long unsigned space
)
{
int tty;
--- 257,268 ----
to->fd = from->fd;
}
! local off_t unsigned FdRetry on((fd,which,done,space)) is
(
fast Fd *fd
_ char *which
! _ off_t unsigned done
! _ off_t unsigned space
)
{
int tty;
***************
*** 303,311 ****
(void) sprintf(errmsg,"Error %d",errno);
#endif
if (errno)
! mesg("'%s' on %s after %luk. Continue [cyn] ? ",errmsg,which,done>>10);
else
! mesg("EOF on %s after %luk. Continue [cyn] ? ",which,done>>10);
read(tty,reply,sizeof reply);
}
--- 303,311 ----
(void) sprintf(errmsg,"Error %d",errno);
#endif
if (errno)
! mesg("'%s' on %s after %quk. Continue [cyn] ? ",errmsg,which,done>>10);
else
! mesg("EOF on %s after %quk. Continue [cyn] ? ",which,done>>10);
read(tty,reply,sizeof reply);
}
***************
*** 330,336 ****
local unsigned FdCanDo on((remaining,available)) is
(
fast address remaining
! _ fast long unsigned available
)
{
return (remaining < available)
--- 330,336 ----
local unsigned FdCanDo on((remaining,available)) is
(
fast address remaining
! _ fast off_t unsigned available
)
{
return (remaining < available)
***************
*** 342,351 ****
fast Fd *fd
_ pointer buffer
_ fast address todo
! _ long unsigned done
)
{
! fast long unsigned space;
fast int bytesRead;
fast address justDone;
--- 342,351 ----
fast Fd *fd
_ pointer buffer
_ fast address todo
! _ off_t unsigned done
)
{
! fast off_t unsigned space;
fast int bytesRead;
fast address justDone;
***************
*** 383,392 ****
fast Fd *fd
_ pointer buffer
_ fast address todo
! _ long unsigned done
)
{
! fast long unsigned space;
fast int bytesWritten;
fast address justDone;
--- 383,392 ----
fast Fd *fd
_ pointer buffer
_ fast address todo
! _ off_t unsigned done
)
{
! fast off_t unsigned space;
fast int bytesWritten;
fast address justDone;
***************
*** 463,469 ****
{
Token token;
short status;
! long unsigned done;
};
local bool StreamSend on((fd,token,status,done)) is
--- 463,469 ----
{
Token token;
short status;
! off_t unsigned done;
};
local bool StreamSend on((fd,token,status,done)) is
***************
*** 471,477 ****
fast Fd *fd
_ Token token
_ short status
! _ long unsigned done
)
{
fast int n;
--- 471,477 ----
fast Fd *fd
_ Token token
_ short status
! _ off_t unsigned done
)
{
fast int n;
***************
*** 493,499 ****
fast Fd *fd
_ Token *tokenp
_ short *statusp
! _ long unsigned *donep
)
{
fast int n;
--- 493,499 ----
fast Fd *fd
_ Token *tokenp
_ short *statusp
! _ off_t unsigned *donep
)
{
fast int n;
***************
*** 546,552 ****
#define GuyRECEIVE(guy,tokenp,statusp,donep) \
StreamReceive(&guy->upStream,tokenp,statusp,donep)
! local bool GuyStop of((Guy *,char *,long unsigned));
local bool GuyStart on((guy,bufsize)) is
(
--- 546,552 ----
#define GuyRECEIVE(guy,tokenp,statusp,donep) \
StreamReceive(&guy->upStream,tokenp,statusp,donep)
! local bool GuyStop of((Guy *,char *,off_t unsigned));
local bool GuyStart on((guy,bufsize)) is
(
***************
*** 557,563 ****
fast char *buffer;
Token token;
short status;
! long unsigned done;
bool received;
static int bytesRead,bytesWritten;
--- 557,563 ----
fast char *buffer;
Token token;
short status;
! off_t unsigned done;
bool received;
static int bytesRead,bytesWritten;
***************
*** 587,593 ****
done += bytesRead;
if (verbose)
! mesg("%luk read \r",done>>10);
if (!GuySEND(guy,TokenREAD,FdIn.status,done))
GuyStop(guy,"guy cannot send READ",done);
--- 587,593 ----
done += bytesRead;
if (verbose)
! mesg("%quk read \r",done>>10);
if (!GuySEND(guy,TokenREAD,FdIn.status,done))
GuyStop(guy,"guy cannot send READ",done);
***************
*** 605,611 ****
done += bytesWritten;
if (verbose)
! mesg("%luk written\r",done>>10);
if (!GuySEND(guy,TokenWRITE,FdOut.status,done))
GuyStop(guy,"guy cannot send WRITE",done);
--- 605,611 ----
done += bytesWritten;
if (verbose)
! mesg("%quk written\r",done>>10);
if (!GuySEND(guy,TokenWRITE,FdOut.status,done))
GuyStop(guy,"guy cannot send WRITE",done);
***************
*** 629,635 ****
(
fast Guy *guy
_ char *errormsg
! _ long unsigned done
)
{
Mesg(("GuyStop guy %#o\n",guy));
--- 629,635 ----
(
fast Guy *guy
_ char *errormsg
! _ off_t unsigned done
)
{
Mesg(("GuyStop guy %#o\n",guy));
***************
*** 637,644 ****
if (done)
{
if (report)
! mesg("%lu kilobytes, %lu seconds\r\n",
! done>>10,(long unsigned) (time((time_t *) 0)-origin));
else if (verbose)
mesg("\n");
}
--- 637,644 ----
if (done)
{
if (report)
! mesg("%qu kilobytes, %lu seconds\r\n",
! done>>10,(off_t unsigned) (time((time_t *) 0)-origin));
else if (verbose)
mesg("\n");
}
***************
*** 707,714 ****
(
fast Team *team
_ address bufsize
! _ long unsigned isize
! _ long unsigned osize
)
{
/*
--- 707,714 ----
(
fast Team *team
_ address bufsize
! _ off_t unsigned isize
! _ off_t unsigned osize
)
{
/*
***************
*** 924,931 ****
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\
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\
--- 924,931 ----
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 %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\
***************
*** 937,955 ****
/*NOTREACHED*/
}
! local long unsigned atos on((s)) is
(
fast char *s
)
{
! fast unsigned long l;
for (
s, l = 0L;
*s >= '0' && *s <= '9';
s++
)
! l = l*10L + (long unsigned) (*s-'0');
if (*s == 'b') l *= (1L<<9);
if (*s == 'k') l *= (1L<<10);
--- 937,955 ----
/*NOTREACHED*/
}
! local off_t unsigned atos on((s)) is
(
fast char *s
)
{
! fast off_t unsigned l;
for (
s, l = 0L;
*s >= '0' && *s <= '9';
s++
)
! l = l*10L + (off_t unsigned) (*s-'0');
if (*s == 'b') l *= (1L<<9);
if (*s == 'k') l *= (1L<<10);
***************
*** 968,975 ****
short unsigned teamsize;
address bufsize;
! long unsigned isize;
! long unsigned osize;
int opt;
teamsize = TeamDTEAMSZ;
--- 968,975 ----
short unsigned teamsize;
address bufsize;
! off_t unsigned isize;
! off_t unsigned osize;
int opt;
teamsize = TeamDTEAMSZ;
***************
*** 985,991 ****
isize = atos(optarg);
if (isize < TeamLVOLSZ || isize > TeamHVOLSZ)
{
! fprintf(stderr,"team: invalid input volume size %lu\n",isize);
usage();
}
--- 985,991 ----
isize = atos(optarg);
if (isize < TeamLVOLSZ || isize > TeamHVOLSZ)
{
! fprintf(stderr,"team: invalid input volume size %qu\n",isize);
usage();
}
***************
*** 993,999 ****
osize = atos(optarg);
if (osize < TeamLVOLSZ || osize > TeamHVOLSZ)
{
! fprintf(stderr,"team: invalid output volume size %lu\n",osize);
usage();
}
--- 993,999 ----
osize = atos(optarg);
if (osize < TeamLVOLSZ || osize > TeamHVOLSZ)
{
! fprintf(stderr,"team: invalid output volume size %qu\n",osize);
usage();
}
|