diff options
| -rw-r--r-- | sbin/dump/dump.h | 10 | ||||
| -rw-r--r-- | sbin/dump/dumprmt.c | 4 | ||||
| -rw-r--r-- | sbin/dump/main.c | 4 | ||||
| -rw-r--r-- | sbin/dump/traverse.c | 13 |
4 files changed, 16 insertions, 15 deletions
diff --git a/sbin/dump/dump.h b/sbin/dump/dump.h index 878a6597eda..e7d80f3dd68 100644 --- a/sbin/dump/dump.h +++ b/sbin/dump/dump.h @@ -1,4 +1,4 @@ -/* $OpenBSD: dump.h,v 1.7 1998/07/14 19:04:03 deraadt Exp $ */ +/* $OpenBSD: dump.h,v 1.8 1998/11/24 01:25:46 deraadt Exp $ */ /* $NetBSD: dump.h,v 1.11 1997/06/05 11:13:20 lukem Exp $ */ /*- @@ -72,7 +72,7 @@ int pipeout; /* true => output to standard output */ ino_t curino; /* current inumber; used globally */ int newtape; /* new tape flag */ int density; /* density in 0.1" units */ -long tapesize; /* estimated tape size, blocks */ +u_int64_t tapesize; /* estimated tape size, blocks */ long tsize; /* tape size in 0.1" units */ int unlimited; /* if set, write to end of medium */ long asize; /* number of 0.1" units written on current tape */ @@ -108,10 +108,10 @@ void timeest __P((void)); /* mapping routines */ struct dinode; long blockest __P((struct dinode *dp)); -void mapfileino __P((ino_t, long *, int *)); -int mapfiles __P((ino_t maxino, long *tapesize, char *disk, +void mapfileino __P((ino_t, u_int64_t *, int *)); +int mapfiles __P((ino_t maxino, u_int64_t *tapesize, char *disk, char * const *dirv)); -int mapdirs __P((ino_t maxino, long *tapesize)); +int mapdirs __P((ino_t maxino, u_int64_t *tapesize)); /* file dumping routines */ void blksout __P((daddr_t *blkp, int frags, ino_t ino)); diff --git a/sbin/dump/dumprmt.c b/sbin/dump/dumprmt.c index 2684d6093cb..833e61b9de5 100644 --- a/sbin/dump/dumprmt.c +++ b/sbin/dump/dumprmt.c @@ -1,4 +1,4 @@ -/* $OpenBSD: dumprmt.c,v 1.10 1998/07/14 19:04:05 deraadt Exp $ */ +/* $OpenBSD: dumprmt.c,v 1.11 1998/11/24 01:25:47 deraadt Exp $ */ /* $NetBSD: dumprmt.c,v 1.17 1997/06/05 16:10:47 mrg Exp $ */ /*- @@ -220,7 +220,7 @@ rmtread(buf, count) { char line[30]; int n, i, cc; - extern errno; + extern int errno; (void)snprintf(line, sizeof(line), "R%d\n", count); n = rmtcall("read", line); diff --git a/sbin/dump/main.c b/sbin/dump/main.c index 5ddd007a07b..899c0cb869b 100644 --- a/sbin/dump/main.c +++ b/sbin/dump/main.c @@ -1,4 +1,4 @@ -/* $OpenBSD: main.c,v 1.24 1998/08/22 07:44:03 mickey Exp $ */ +/* $OpenBSD: main.c,v 1.25 1998/11/24 01:25:47 deraadt Exp $ */ /* $NetBSD: main.c,v 1.14 1997/06/05 11:13:24 lukem Exp $ */ /*- @@ -479,7 +479,7 @@ main(argc, argv) tapesize += (etapes - 1) * (howmany(mapsize * sizeof(char), TP_BSIZE) + 1); tapesize += etapes + 10; /* headers + 10 trailer blks */ - msg("estimated %ld tape blocks on %3.2f tape(s).\n", + msg("estimated %qd tape blocks on %3.2f tape(s).\n", tapesize, fetapes); } diff --git a/sbin/dump/traverse.c b/sbin/dump/traverse.c index b12df71ff79..091423186cf 100644 --- a/sbin/dump/traverse.c +++ b/sbin/dump/traverse.c @@ -1,4 +1,4 @@ -/* $OpenBSD: traverse.c,v 1.4 1997/07/05 05:35:59 millert Exp $ */ +/* $OpenBSD: traverse.c,v 1.5 1998/11/24 01:25:47 deraadt Exp $ */ /* $NetBSD: traverse.c,v 1.17 1997/06/05 11:13:27 lukem Exp $ */ /*- @@ -38,7 +38,7 @@ #if 0 static char sccsid[] = "@(#)traverse.c 8.2 (Berkeley) 9/23/93"; #else -static char rcsid[] = "$OpenBSD: traverse.c,v 1.4 1997/07/05 05:35:59 millert Exp $"; +static char rcsid[] = "$OpenBSD: traverse.c,v 1.5 1998/11/24 01:25:47 deraadt Exp $"; #endif #endif /* not lint */ @@ -142,7 +142,7 @@ blockest(dp) void mapfileino(ino, tapesize, dirskipped) ino_t ino; - long *tapesize; + u_int64_t *tapesize; int *dirskipped; { int mode; @@ -176,7 +176,7 @@ mapfileino(ino, tapesize, dirskipped) int mapfiles(maxino, tapesize, disk, dirv) ino_t maxino; - long *tapesize; + u_int64_t *tapesize; char *disk; char * const *dirv; { @@ -279,7 +279,7 @@ mapfiles(maxino, tapesize, disk, dirv) int mapdirs(maxino, tapesize) ino_t maxino; - long *tapesize; + u_int64_t *tapesize; { register struct dinode *dp; register int i, isdir; @@ -560,11 +560,12 @@ blksout(blkp, frags, ino) writeheader(ino); bp = &blkp[i / tbperdb]; for (j = i; j < count; j += tbperdb, bp++) - if (*bp != 0) + if (*bp != 0) { if (j + tbperdb <= count) dumpblock(*bp, (int)sblock->fs_bsize); else dumpblock(*bp, (count - j) * TP_BSIZE); + } spcl.c_type = TS_ADDR; } } |