diff options
| author | Theo de Raadt <deraadt@cvs.openbsd.org> | 1996-12-04 01:41:55 +0000 |
|---|---|---|
| committer | Theo de Raadt <deraadt@cvs.openbsd.org> | 1996-12-04 01:41:55 +0000 |
| commit | 69f2b2f184eb3dbee3e10cb6ec5c47307e03ecdc (patch) | |
| tree | c2d659e7d6d9991455fc496525a2b12ef24f517a /sbin/restore/tape.c | |
| parent | 60f43a6530032d89e196ad56fd215e0a345db042 (diff) | |
64 bit patches, tih@nhh.no
Diffstat (limited to 'sbin/restore/tape.c')
| -rw-r--r-- | sbin/restore/tape.c | 44 |
1 files changed, 22 insertions, 22 deletions
diff --git a/sbin/restore/tape.c b/sbin/restore/tape.c index 4be709de8c8..455c6852823 100644 --- a/sbin/restore/tape.c +++ b/sbin/restore/tape.c @@ -1,5 +1,5 @@ -/* $OpenBSD: tape.c,v 1.3 1996/09/01 15:27:29 deraadt Exp $ */ -/* $NetBSD: tape.c,v 1.20 1996/03/15 22:39:41 scottr Exp $ */ +/* $OpenBSD: tape.c,v 1.4 1996/12/04 01:41:54 deraadt Exp $ */ +/* $NetBSD: tape.c,v 1.22 1996/11/30 18:31:29 cgd Exp $ */ /* * Copyright (c) 1983, 1993 @@ -43,7 +43,7 @@ #if 0 static char sccsid[] = "@(#)tape.c 8.6 (Berkeley) 9/13/94"; #else -static char rcsid[] = "$NetBSD: tape.c,v 1.20 1996/03/15 22:39:41 scottr Exp $"; +static char rcsid[] = "$NetBSD: tape.c,v 1.22 1996/11/30 18:31:29 cgd Exp $"; #endif #endif /* not lint */ @@ -233,7 +233,7 @@ setup() fprintf(stderr, "cannot stat .: %s\n", strerror(errno)); exit(1); } - if (stbuf.st_blksize > 0 && stbuf.st_blksize <= MAXBSIZE) + if (stbuf.st_blksize >= TP_BSIZE && stbuf.st_blksize <= MAXBSIZE) fssize = stbuf.st_blksize; if (((fssize - 1) & fssize) != 0) { fprintf(stderr, "bad block size %d\n", fssize); @@ -999,32 +999,32 @@ gethead(buf) long i; union { quad_t qval; - long val[2]; + int32_t val[2]; } qcvt; union u_ospcl { char dummy[TP_BSIZE]; struct s_ospcl { - long c_type; - long c_date; - long c_ddate; - long c_volume; - long c_tapea; - u_short c_inumber; - long c_magic; - long c_checksum; + int32_t c_type; + int32_t c_date; + int32_t c_ddate; + int32_t c_volume; + int32_t c_tapea; + u_int16_t c_inumber; + int32_t c_magic; + int32_t c_checksum; struct odinode { unsigned short odi_mode; - u_short odi_nlink; - u_short odi_uid; - u_short odi_gid; - long odi_size; - long odi_rdev; + u_int16_t odi_nlink; + u_int16_t odi_uid; + u_int16_t odi_gid; + int32_t odi_size; + int32_t odi_rdev; char odi_addr[36]; - long odi_atime; - long odi_mtime; - long odi_ctime; + int32_t odi_atime; + int32_t odi_mtime; + int32_t odi_ctime; } c_dinode; - long c_count; + int32_t c_count; char c_addr[256]; } s_ospcl; } u_ospcl; |