From owner-svn-src-all@FreeBSD.ORG  Tue Apr 23 16:08:25 2013
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])
 by hub.freebsd.org (Postfix) with ESMTP id 67891756;
 Tue, 23 Apr 2013 16:08:25 +0000 (UTC) (envelope-from kib@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id 584931E03;
 Tue, 23 Apr 2013 16:08:25 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.6/8.14.6) with ESMTP id r3NG8ODw090563;
 Tue, 23 Apr 2013 16:08:24 GMT (envelope-from kib@svn.freebsd.org)
Received: (from kib@localhost)
 by svn.freebsd.org (8.14.6/8.14.5/Submit) id r3NG8OQC090562;
 Tue, 23 Apr 2013 16:08:24 GMT (envelope-from kib@svn.freebsd.org)
Message-Id: <201304231608.r3NG8OQC090562@svn.freebsd.org>
From: Konstantin Belousov <kib@FreeBSD.org>
Date: Tue, 23 Apr 2013 16:08:24 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r249811 - head/bin/dd
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.14
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: Tue, 23 Apr 2013 16:08:25 -0000

Author: kib
Date: Tue Apr 23 16:08:24 2013
New Revision: 249811
URL: http://svnweb.freebsd.org/changeset/base/249811

Log:
  Literally follow POSIX:
  If the bs= expr operand is specified and no conversions other than sync,
  noerror, or notrunc are requested, the data returned from each input
  block shall be written as a separate output block.
  
  In particular, when both bs=size and conv=sparce were specified, the
  resulted file was fully filled, instead of sparce.
  
  PR:	standards/177742
  Submitted by:	Matthew Rezny <mrezny@hexaneinc.com>
  MFC after:	2 weeks

Modified:
  head/bin/dd/dd.c

Modified: head/bin/dd/dd.c
==============================================================================
--- head/bin/dd/dd.c	Tue Apr 23 14:36:44 2013	(r249810)
+++ head/bin/dd/dd.c	Tue Apr 23 16:08:24 2013	(r249811)
@@ -358,7 +358,7 @@ dd_in(void)
 		 * than noerror, notrunc or sync are specified, the block
 		 * is output without buffering as it is read.
 		 */
-		if (ddflags & C_BS) {
+		if ((ddflags & ~(C_NOERROR | C_NOTRUNC | C_SYNC)) == C_BS) {
 			out.dbcnt = in.dbcnt;
 			dd_out(1);
 			in.dbcnt = 0;