From 3211c85bf71bbbe784de3f4fa01a8c0f96a060d6 Mon Sep 17 00:00:00 2001 From: Stelian Pop Date: Fri, 10 Jan 2003 10:31:06 +0000 Subject: [PATCH] Made dump accept -I 0 (unlimited read errors) --- CHANGES | 7 ++++++- THANKS | 3 ++- dump/dump.8.in | 4 +++- dump/main.c | 4 ++-- dump/traverse.c | 4 ++-- 5 files changed, 15 insertions(+), 7 deletions(-) diff --git a/CHANGES b/CHANGES index ec6f5ef..5410011 100644 --- a/CHANGES +++ b/CHANGES @@ -1,4 +1,4 @@ -$Id: CHANGES,v 1.203 2002/12/12 11:49:35 stelian Exp $ +$Id: CHANGES,v 1.204 2003/01/10 10:31:06 stelian Exp $ Changes between versions 0.4b32 and 0.4b33 (released ?????????????????) ======================================================================= @@ -22,6 +22,11 @@ Changes between versions 0.4b32 and 0.4b33 (released ?????????????????) , Greg Edwards . (fixes Debian bugs #147086 and #160305, Sourceforge bug #618699) +5. Made dump's -I option accept the value '0' meaning all the + read errors will be ignored. This can be useful when running + dump from unattended sessions (like cron jobs). Thanks to + John I Wang for the suggestion. + Changes between versions 0.4b31 and 0.4b32 (released November 15, 2002) ======================================================================= diff --git a/THANKS b/THANKS index 00dcc8c..eaeb111 100644 --- a/THANKS +++ b/THANKS @@ -1,4 +1,4 @@ -$Id: THANKS,v 1.72 2002/12/12 11:49:35 stelian Exp $ +$Id: THANKS,v 1.73 2003/01/10 10:31:07 stelian Exp $ Dump and restore were written by the people of the CSRG at the University of California, Berkeley. @@ -107,6 +107,7 @@ Matus Uhlar uhlar@fantomas.sk Amith Varghese amithv@yahoo.com Daniel Veillard Daniel.Veillard@imag.fr Jason Venner jason@idiom.com +John I Wang jiwang@users.sourceforge.net Christian Weisgerber naddy@mips.rhein-neckar.de Kim Yong-jun loveyou@hackerslab.org John Yu jky@it.bu.edu diff --git a/dump/dump.8.in b/dump/dump.8.in index 7bdf735..cbb3177 100644 --- a/dump/dump.8.in +++ b/dump/dump.8.in @@ -30,7 +30,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $Id: dump.8.in,v 1.46 2002/11/12 13:05:31 stelian Exp $ +.\" $Id: dump.8.in,v 1.47 2003/01/10 10:31:10 stelian Exp $ .\" .TH DUMP 8 "version __VERSION__ of __DATE__" BSD "System management commands" .SH NAME @@ -224,6 +224,8 @@ is useful when running .B dump on an active filesystem where read errors simply indicate an inconsistency between the mapping and dumping passes. +.IP +A value of 0 means that all read errors will be ignored. .TP .BI \-j "compression level" Compress every block to be written on the tape using bzlib library. This option diff --git a/dump/main.c b/dump/main.c index 6424674..57ab003 100644 --- a/dump/main.c +++ b/dump/main.c @@ -41,7 +41,7 @@ #ifndef lint static const char rcsid[] = - "$Id: main.c,v 1.78 2002/12/12 11:49:35 stelian Exp $"; + "$Id: main.c,v 1.79 2003/01/10 10:31:10 stelian Exp $"; #endif /* not lint */ #include @@ -355,7 +355,7 @@ main(int argc, char *argv[]) case 'I': breademax = - numarg ("number of errors to ignore", 1L, 0L); + numarg ("number of errors to ignore", 0L, 0L); break; #ifdef KERBEROS diff --git a/dump/traverse.c b/dump/traverse.c index 2613b5e..00f0321 100644 --- a/dump/traverse.c +++ b/dump/traverse.c @@ -41,7 +41,7 @@ #ifndef lint static const char rcsid[] = - "$Id: traverse.c,v 1.52 2002/12/09 10:53:59 stelian Exp $"; + "$Id: traverse.c,v 1.53 2003/01/10 10:31:10 stelian Exp $"; #endif /* not lint */ #include @@ -1346,7 +1346,7 @@ loop: else msg("short read error from %s: [block %d, ext2blk %d]: count=%d, got=%d\n", disk, blkno, dbtofsb(sblock, blkno), size, cnt); - if (++breaderrors > breademax) { + if (breademax && ++breaderrors > breademax) { msg("More than %d block read errors from %d\n", breademax, disk); broadcast("DUMP IS AILING!\n"); -- 2.39.5