[Midnightbsd-cvs] src [11094] trunk/sbin/recoverdisk/recoverdisk.c: sync up

[laffer1 at midnightbsd.org]

Revision: 11094
          http://svnweb.midnightbsd.org/src/?rev=11094
Author:   laffer1
Date:     2018-06-19 14:07:45 -0400 (Tue, 19 Jun 2018)
Log Message:
-----------
sync up

Modified Paths:
--------------
    trunk/sbin/recoverdisk/Makefile
    trunk/sbin/recoverdisk/recoverdisk.1
    trunk/sbin/recoverdisk/recoverdisk.c

Property Changed:
----------------
    trunk/sbin/recoverdisk/recoverdisk.1

Modified: trunk/sbin/recoverdisk/Makefile
===================================================================
--- trunk/sbin/recoverdisk/Makefile	2018-06-19 18:07:16 UTC (rev 11093)
+++ trunk/sbin/recoverdisk/Makefile	2018-06-19 18:07:45 UTC (rev 11094)
@@ -1,4 +1,5 @@
 # $MidnightBSD$
+# $FreeBSD: stable/10/sbin/recoverdisk/Makefile 198236 2009-10-19 16:00:24Z ru $
 
 PROG=	recoverdisk
 

Modified: trunk/sbin/recoverdisk/recoverdisk.1
===================================================================
--- trunk/sbin/recoverdisk/recoverdisk.1	2018-06-19 18:07:16 UTC (rev 11093)
+++ trunk/sbin/recoverdisk/recoverdisk.1	2018-06-19 18:07:45 UTC (rev 11094)
@@ -1,3 +1,4 @@
+.\" $MidnightBSD$
 .\" Copyright (c) 2006 Ulrich Spoerlein <uspoerlein at gmail.com>
 .\" All rights reserved.
 .\"
@@ -22,9 +23,9 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $MidnightBSD$
+.\" $FreeBSD: stable/10/sbin/recoverdisk/recoverdisk.1 307403 2016-10-16 22:02:50Z sevan $
 .\"
-.Dd May 1, 2011
+.Dd October 1, 2013
 .Dt RECOVERDISK 1
 .Os
 .Sh NAME
@@ -104,11 +105,11 @@
 .El
 .Sh EXAMPLES
 .Bd -literal
-# recover data from failing hard drive ad3
-recoverdisk /dev/ad3 /data/disk.img
+# recover data from failing hard drive ada3
+recoverdisk /dev/ada3 /data/disk.img
 
 # clone a hard disk
-recoverdisk /dev/ad3 /dev/ad4
+recoverdisk /dev/ada3 /dev/ada4
 
 # read an ISO image from a CD-ROM
 recoverdisk /dev/cd0 /data/cd.iso
@@ -120,11 +121,15 @@
 recoverdisk /cdrom/file.avi file.avi
 
 # If the disk hangs the system on read-errors try:
-recoverdisk -b 0 /dev/ad3 /somewhere
+recoverdisk -b 0 /dev/ada3 /somewhere
 
 .Ed
 .Sh SEE ALSO
-.Xr dd 1
+.Xr dd 1 ,
+.Xr ada 4 ,
+.Xr cam 4 ,
+.Xr cd 4 ,
+.Xr da 4
 .Sh HISTORY
 The
 .Nm
@@ -133,9 +138,9 @@
 .Sh AUTHORS
 .An -nosplit
 The original implementation was done by
-.An Poul-Henning Kamp Aq phk at FreeBSD.org
+.An Poul-Henning Kamp Aq Mt phk at FreeBSD.org
 with minor improvements from
-.An Ulrich Sp\(:orlein Aq uqs at FreeBSD.org .
+.An Ulrich Sp\(:orlein Aq Mt uqs at FreeBSD.org .
 .Pp
 This manual page was written by
 .An Ulrich Sp\(:orlein .
@@ -149,6 +154,18 @@
 This is harmless and can be avoided by setting
 .Fl b
 to no more than 128kB.
+.Pp
+.Nm
+needs to know about read errors as fast as possible, i.e. retries by lower
+layers will usually slow down the operation.
+When using
+.Xr cam 4
+attached drives, you may want to set kern.cam.XX.retry_count to zero, e.g.:
+.Bd -literal
+# sysctl kern.cam.ada.retry_count=0
+# sysctl kern.cam.cd.retry_count=0
+# sysctl kern.cam.da.retry_count=0
+.Ed
 .\".Pp
 .\"When reading from optical media, a bug in the GEOM framework will
 .\"prevent it from seeing that the media has been removed.


Property changes on: trunk/sbin/recoverdisk/recoverdisk.1
___________________________________________________________________
Added: svn:keywords
## -0,0 +1 ##
+MidnightBSD=%H
\ No newline at end of property
Modified: trunk/sbin/recoverdisk/recoverdisk.c
===================================================================
--- trunk/sbin/recoverdisk/recoverdisk.c	2018-06-19 18:07:16 UTC (rev 11093)
+++ trunk/sbin/recoverdisk/recoverdisk.c	2018-06-19 18:07:45 UTC (rev 11094)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
 /*-
  * ----------------------------------------------------------------------------
  * "THE BEER-WARE LICENSE" (Revision 42):
@@ -6,7 +7,7 @@
  * this stuff is worth it, you can buy me a beer in return.   Poul-Henning Kamp
  * ----------------------------------------------------------------------------
  *
- * $MidnightBSD$
+ * $FreeBSD: stable/10/sbin/recoverdisk/recoverdisk.c 248279 2013-03-14 20:05:49Z delphij $
  */
 #include <sys/param.h>
 #include <sys/queue.h>
@@ -24,7 +25,7 @@
 #include <time.h>
 #include <unistd.h>
 
-volatile sig_atomic_t aborting = 0;
+static volatile sig_atomic_t aborting = 0;
 static size_t bigsize = 1024 * 1024;
 static size_t medsize;
 static size_t minsize = 512;