From owner-svn-src-all@FreeBSD.ORG  Mon Feb 17 17:49:04 2014
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:1900:2254:206a::19:1])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 657AA17E;
 Mon, 17 Feb 2014 17:49:04 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (No client certificate requested)
 by mx1.freebsd.org (Postfix) with ESMTPS id 514201C47;
 Mon, 17 Feb 2014 17:49:04 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s1HHn43K069485;
 Mon, 17 Feb 2014 17:49:04 GMT (envelope-from avg@svn.freebsd.org)
Received: (from avg@localhost)
 by svn.freebsd.org (8.14.8/8.14.8/Submit) id s1HHn4KQ069484;
 Mon, 17 Feb 2014 17:49:04 GMT (envelope-from avg@svn.freebsd.org)
Message-Id: <201402171749.s1HHn4KQ069484@svn.freebsd.org>
From: Andriy Gapon <avg@FreeBSD.org>
Date: Mon, 17 Feb 2014 17:49:04 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-stable@freebsd.org, svn-src-stable-8@freebsd.org
Subject: svn commit: r262106 - stable/8/cddl/contrib/opensolaris/cmd/zdb
X-SVN-Group: stable-8
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.17
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/options/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: Mon, 17 Feb 2014 17:49:04 -0000

Author: avg
Date: Mon Feb 17 17:49:03 2014
New Revision: 262106
URL: http://svnweb.freebsd.org/changeset/base/262106

Log:
  MFC r260811: zdb -R: do not treat numeric parameters to a flag as more flags

Modified:
  stable/8/cddl/contrib/opensolaris/cmd/zdb/zdb.c
Directory Properties:
  stable/8/cddl/contrib/opensolaris/   (props changed)

Modified: stable/8/cddl/contrib/opensolaris/cmd/zdb/zdb.c
==============================================================================
--- stable/8/cddl/contrib/opensolaris/cmd/zdb/zdb.c	Mon Feb 17 17:48:50 2014	(r262105)
+++ stable/8/cddl/contrib/opensolaris/cmd/zdb/zdb.c	Mon Feb 17 17:49:03 2014	(r262106)
@@ -2960,6 +2960,7 @@ zdb_read_block(char *thing, spa_t *spa)
 				free(dup);
 				return;
 			}
+			i += p - &flagstr[i + 1]; /* skip over the number */
 		}
 	}