diff options
| author | martin <martin@NetBSD.org> | 2020-12-06 10:31:02 +0000 |
|---|---|---|
| committer | martin <martin@NetBSD.org> | 2020-12-06 10:31:02 +0000 |
| commit | 9b6226493c2a61c7cece2192a6145820f88e48ca (patch) | |
| tree | 9e885479b097b5b46a1c056ce801093e5a128564 /sbin | |
| parent | b7b73dd8388413c0fd074691887b2d8ba0f5d8ea (diff) | |
Pull up following revision(s) (requested by kre in ticket #1139):
sbin/dump/dump.h: revision 1.59
sbin/dump/main.c: revision 1.78
PR bin/55834
count blocks written in unsigned 64 bit counter
rather than signed int which overflows after 2^31-1
blocks (2TiB) after which neither the 5 minute
status updates or SIGINFO (^T) reports are issued
until the negative numbers increase past 0 and
wildly inaccurate reports would be written.
Diffstat (limited to 'sbin')
| -rw-r--r-- | sbin/dump/dump.h | 4 | ||||
| -rw-r--r-- | sbin/dump/main.c | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/sbin/dump/dump.h b/sbin/dump/dump.h index c1c25a3118c..363c5f02961 100644 --- a/sbin/dump/dump.h +++ b/sbin/dump/dump.h @@ -1,4 +1,4 @@ -/* $NetBSD: dump.h,v 1.57 2019/03/25 02:13:01 manu Exp $ */ +/* $NetBSD: dump.h,v 1.57.2.1 2020/12/06 10:31:02 martin Exp $ */ /*- * Copyright (c) 1980, 1993 @@ -134,7 +134,7 @@ int unlimited; /* if set, write to end of medium */ extern int density; /* density in 0.1" units */ extern int notify; /* notify operator flag */ extern int timestamp; /* timestamp messages */ -extern int blockswritten; /* number of blocks written on current tape */ +extern u_int64_t blockswritten; /* blocks written on current tape */ extern int tapeno; /* current tape number */ extern int is_ufs2; diff --git a/sbin/dump/main.c b/sbin/dump/main.c index 7df2582df14..64e2469e48c 100644 --- a/sbin/dump/main.c +++ b/sbin/dump/main.c @@ -1,4 +1,4 @@ -/* $NetBSD: main.c,v 1.75 2019/03/25 02:13:01 manu Exp $ */ +/* $NetBSD: main.c,v 1.75.2.1 2020/12/06 10:31:02 martin Exp $ */ /*- * Copyright (c) 1980, 1991, 1993, 1994 @@ -39,7 +39,7 @@ __COPYRIGHT("@(#) Copyright (c) 1980, 1991, 1993, 1994\ #if 0 static char sccsid[] = "@(#)main.c 8.6 (Berkeley) 5/1/95"; #else -__RCSID("$NetBSD: main.c,v 1.75 2019/03/25 02:13:01 manu Exp $"); +__RCSID("$NetBSD: main.c,v 1.75.2.1 2020/12/06 10:31:02 martin Exp $"); #endif #endif /* not lint */ @@ -71,7 +71,7 @@ __RCSID("$NetBSD: main.c,v 1.75 2019/03/25 02:13:01 manu Exp $"); int timestamp; /* print message timestamps */ int notify; /* notify operator flag */ -int blockswritten; /* number of blocks written on current tape */ +u_int64_t blockswritten; /* number of blocks written on current tape */ int tapeno; /* current tape number */ int density; /* density in bytes/0.1" */ int ntrec = NTREC; /* # tape blocks in each tape record */ |
