From owner-svn-src-all@FreeBSD.ORG  Fri Jan 17 10:18:46 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 745FFD86;
 Fri, 17 Jan 2014 10:18:46 +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 5EB301364;
 Fri, 17 Jan 2014 10:18:46 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id s0HAIkLh013523;
 Fri, 17 Jan 2014 10:18:46 GMT (envelope-from avg@svn.freebsd.org)
Received: (from avg@localhost)
 by svn.freebsd.org (8.14.7/8.14.7/Submit) id s0HAIknP013522;
 Fri, 17 Jan 2014 10:18:46 GMT (envelope-from avg@svn.freebsd.org)
Message-Id: <201401171018.s0HAIknP013522@svn.freebsd.org>
From: Andriy Gapon <avg@FreeBSD.org>
Date: Fri, 17 Jan 2014 10:18:46 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r260811 - head/cddl/contrib/opensolaris/cmd/zdb
X-SVN-Group: head
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: Fri, 17 Jan 2014 10:18:46 -0000

Author: avg
Date: Fri Jan 17 10:18:45 2014
New Revision: 260811
URL: http://svnweb.freebsd.org/changeset/base/260811

Log:
  zdb -R: do not treat numeric parameters to a flag as more flags
  
  Reviewed by:	Matthew Ahrens <mahrens@delphix.com>
  MFC after:	1 week

Modified:
  head/cddl/contrib/opensolaris/cmd/zdb/zdb.c

Modified: head/cddl/contrib/opensolaris/cmd/zdb/zdb.c
==============================================================================
--- head/cddl/contrib/opensolaris/cmd/zdb/zdb.c	Fri Jan 17 09:11:44 2014	(r260810)
+++ head/cddl/contrib/opensolaris/cmd/zdb/zdb.c	Fri Jan 17 10:18:45 2014	(r260811)
@@ -3012,6 +3012,7 @@ zdb_read_block(char *thing, spa_t *spa)
 				free(dup);
 				return;
 			}
+			i += p - &flagstr[i + 1]; /* skip over the number */
 		}
 	}