From owner-svn-src-head@freebsd.org  Thu Mar 10 23:19:36 2016
Return-Path: <owner-svn-src-head@freebsd.org>
Delivered-To: svn-src-head@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id 709B8ACB07D;
 Thu, 10 Mar 2016 23:19:36 +0000 (UTC)
 (envelope-from sobomax@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 42C96B2C;
 Thu, 10 Mar 2016 23:19:36 +0000 (UTC)
 (envelope-from sobomax@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u2ANJZTf046977;
 Thu, 10 Mar 2016 23:19:35 GMT (envelope-from sobomax@FreeBSD.org)
Received: (from sobomax@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id u2ANJZMb046976;
 Thu, 10 Mar 2016 23:19:35 GMT (envelope-from sobomax@FreeBSD.org)
Message-Id: <201603102319.u2ANJZMb046976@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: sobomax set sender to
 sobomax@FreeBSD.org using -f
From: Maxim Sobolev <sobomax@FreeBSD.org>
Date: Thu, 10 Mar 2016 23:19:35 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r296628 - head/usr.bin/mkuzip
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.21
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head/>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 10 Mar 2016 23:19:36 -0000

Author: sobomax
Date: Thu Mar 10 23:19:35 2016
New Revision: 296628
URL: https://svnweb.freebsd.org/changeset/base/296628

Log:
  When -S is specified dump summary to stdout, not stderr, so it's
  easier to capture and process it with external tools via pipe.

Modified:
  head/usr.bin/mkuzip/mkuzip.c

Modified: head/usr.bin/mkuzip/mkuzip.c
==============================================================================
--- head/usr.bin/mkuzip/mkuzip.c	Thu Mar 10 23:17:26 2016	(r296627)
+++ head/usr.bin/mkuzip/mkuzip.c	Thu Mar 10 23:19:35 2016	(r296628)
@@ -90,7 +90,10 @@ int main(int argc, char **argv)
 	char *iname, *oname, *obuf, *ibuf;
 	uint64_t *toc;
 	int fdr, fdw, i, opt, verbose, no_zcomp, tmp, en_dedup;
-	int summary;
+	struct {
+		int en;
+		FILE *f;
+	} summary;
 	struct iovec iov[2];
 	struct stat sb;
 	uint32_t destlen;
@@ -105,7 +108,8 @@ int main(int argc, char **argv)
 	verbose = 0;
 	no_zcomp = 0;
 	en_dedup = 0;
-	summary = 0;
+	summary.en = 0;
+	summary.f = stderr;
 	handler = &uzip_fmt;
 
 	while((opt = getopt(argc, argv, "o:s:vZdLS")) != -1) {
@@ -141,7 +145,8 @@ int main(int argc, char **argv)
 			break;
 
 		case 'S':
-			summary = 1;
+			summary.en = 1;
+			summary.f = stdout;
 			break;
 
 		default:
@@ -300,8 +305,8 @@ int main(int argc, char **argv)
 	}
 	close(fdr);
 
-	if (verbose != 0 || summary != 0)
-		fprintf(stderr, "compressed data to %ju bytes, saved %lld "
+	if (verbose != 0 || summary.en != 0)
+		fprintf(summary.f, "compressed data to %ju bytes, saved %lld "
 		    "bytes, %.2f%% decrease.\n", offset,
 		    (long long)(sb.st_size - offset),
 		    100.0 * (long long)(sb.st_size - offset) /