Deleted Added
full compact
45c45
< "$Id$";
---
> "$Id: tcopy.c,v 1.4 1997/08/14 06:41:00 charnier Exp $";
68c68
< u_long lastrec, record, size, tsize;
---
> u_int64_t lastrec, record, size, tsize;
75a76
> void rewind_tape(int);
159c160
< err(1, "read error, file %d, record %ld", filen, record);
---
> err(1, "read error, file %d, record %qu", filen, record);
163c164
< fprintf(msg, "%ld records\n", record);
---
> fprintf(msg, "%qu records\n", record);
165c166
< fprintf(msg, "records %ld to %ld\n",
---
> fprintf(msg, "records %qu to %qu\n",
168c169
< fprintf(msg, "record %ld\n", lastrec);
---
> fprintf(msg, "record %qu\n", lastrec);
186c187
< warn("write error, file %d, record %ld", filen, record);
---
> warn("write error, file %d, record %qu", filen, record);
188c189
< warnx("write error, file %d, record %ld", filen, record);
---
> warnx("write error, file %d, record %qu", filen, record);
202c203
< "file %d: eof after %lu records: %lu bytes\n",
---
> "file %d: eof after %qu records: %qu bytes\n",
212c213
< fprintf(msg, "total length: %lu bytes\n", tsize);
---
> fprintf(msg, "total length: %qu bytes\n", tsize);
218,219c219,220
< writeop(outp, MTREW);
< writeop(inp, MTREW);
---
> rewind_tape(outp);
> rewind_tape(inp);
286c287
< fprintf(msg, "records %ld to %ld\n", lastrec, record);
---
> fprintf(msg, "records %qu to %qu\n", lastrec, record);
288,289c289,290
< fprintf(msg, "record %ld\n", lastrec);
< fprintf(msg, "interrupt at file %d: record %ld\n", filen, record);
---
> fprintf(msg, "record %qu\n", lastrec);
> fprintf(msg, "interrupt at file %d: record %qu\n", filen, record);
322a324,342
>
> void
> rewind_tape(int fd)
> {
> struct stat sp;
>
> if(fstat(fd, &sp))
> errx(12, "fstat in rewind");
>
> /*
> * don't want to do tape ioctl on regular files:
> */
> if( S_ISREG(sp.st_mode) ) {
> if( lseek(fd, 0, SEEK_SET) == -1 )
> errx(13, "lseek");
> } else
> /* assume its a tape */
> writeop(fd, MTREW);
> }