Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/netbsd-9]: src/sbin/dump Pull up following revision(s) (requested by kre...



details:   https://anonhg.NetBSD.org/src/rev/d8f209653b43
branches:  netbsd-9
changeset: 964206:d8f209653b43
user:      martin <martin%NetBSD.org@localhost>
date:      Sun Dec 06 10:31:02 2020 +0000

description:
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:

 sbin/dump/dump.h |  4 ++--
 sbin/dump/main.c |  6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

diffs (45 lines):

diff -r bfbcabf28686 -r d8f209653b43 sbin/dump/dump.h
--- a/sbin/dump/dump.h  Sun Nov 29 11:41:49 2020 +0000
+++ b/sbin/dump/dump.h  Sun Dec 06 10:31:02 2020 +0000
@@ -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 @@
 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 -r bfbcabf28686 -r d8f209653b43 sbin/dump/main.c
--- a/sbin/dump/main.c  Sun Nov 29 11:41:49 2020 +0000
+++ b/sbin/dump/main.c  Sun Dec 06 10:31:02 2020 +0000
@@ -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 @@
 #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 @@
 
 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 */



Home | Main Index | Thread Index | Old Index