From owner-svn-src-all@FreeBSD.ORG  Sat Jan 17 11:57:32 2009
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id CC692106564A;
	Sat, 17 Jan 2009 11:57:32 +0000 (UTC) (envelope-from phk@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id BB8178FC25;
	Sat, 17 Jan 2009 11:57:32 +0000 (UTC) (envelope-from phk@FreeBSD.org)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n0HBvWt6042179;
	Sat, 17 Jan 2009 11:57:32 GMT (envelope-from phk@svn.freebsd.org)
Received: (from phk@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id n0HBvW4K042178;
	Sat, 17 Jan 2009 11:57:32 GMT (envelope-from phk@svn.freebsd.org)
Message-Id: <200901171157.n0HBvW4K042178@svn.freebsd.org>
From: Poul-Henning Kamp <phk@FreeBSD.org>
Date: Sat, 17 Jan 2009 11:57:32 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-head@freebsd.org
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r187360 - head/sbin/recoverdisk
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
	user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 17 Jan 2009 11:57:33 -0000

Author: phk
Date: Sat Jan 17 11:57:32 2009
New Revision: 187360
URL: http://svn.freebsd.org/changeset/base/187360

Log:
  Bail on ENXIO, you won't get any further any way.
  
  Submitted by:	tobez

Modified:
  head/sbin/recoverdisk/recoverdisk.c

Modified: head/sbin/recoverdisk/recoverdisk.c
==============================================================================
--- head/sbin/recoverdisk/recoverdisk.c	Sat Jan 17 11:19:15 2009	(r187359)
+++ head/sbin/recoverdisk/recoverdisk.c	Sat Jan 17 11:57:32 2009	(r187360)
@@ -276,7 +276,10 @@ main(int argc, char * const argv[])
 				lp->len -= i;
 				continue;
 			}
-			printf("\n%jd %zu failed %d\n", lp->start, i, errno);
+			printf("\n%jd %zu failed (%s)\n",
+			    lp->start, i, strerror(errno));
+			if (errno == ENXIO)
+				aborting = 1;
 			new_lump(lp->start, i, lp->state + 1);
 			lp->start += i;
 			lp->len -= i;