From owner-svn-soc-all@FreeBSD.ORG  Mon Jun 24 20:35:49 2013
Return-Path: <owner-svn-soc-all@FreeBSD.ORG>
Delivered-To: svn-soc-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 A5DD17FA
 for <svn-soc-all@FreeBSD.org>; Mon, 24 Jun 2013 20:35:49 +0000 (UTC)
 (envelope-from dpl@FreeBSD.org)
Received: from socsvn.freebsd.org (socsvn.freebsd.org
 [IPv6:2001:1900:2254:206a::50:2])
 by mx1.freebsd.org (Postfix) with ESMTP id 978621EA3
 for <svn-soc-all@FreeBSD.org>; Mon, 24 Jun 2013 20:35:49 +0000 (UTC)
Received: from socsvn.freebsd.org ([127.0.1.124])
 by socsvn.freebsd.org (8.14.7/8.14.7) with ESMTP id r5OKZnHw069371
 for <svn-soc-all@FreeBSD.org>; Mon, 24 Jun 2013 20:35:49 GMT
 (envelope-from dpl@FreeBSD.org)
Received: (from www@localhost)
 by socsvn.freebsd.org (8.14.7/8.14.6/Submit) id r5OKZnXV069365
 for svn-soc-all@FreeBSD.org; Mon, 24 Jun 2013 20:35:49 GMT
 (envelope-from dpl@FreeBSD.org)
Date: Mon, 24 Jun 2013 20:35:49 GMT
Message-Id: <201306242035.r5OKZnXV069365@socsvn.freebsd.org>
X-Authentication-Warning: socsvn.freebsd.org: www set sender to
 dpl@FreeBSD.org using -f
From: dpl@FreeBSD.org
To: svn-soc-all@FreeBSD.org
Subject: socsvn commit: r253446 - soc2013/dpl/head/contrib/bzip2
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-soc-all@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for the entire Summer of Code repository
 <svn-soc-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-soc-all>,
 <mailto:svn-soc-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-soc-all>
List-Post: <mailto:svn-soc-all@freebsd.org>
List-Help: <mailto:svn-soc-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-soc-all>,
 <mailto:svn-soc-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 24 Jun 2013 20:35:49 -0000

Author: dpl
Date: Mon Jun 24 20:35:49 2013
New Revision: 253446
URL: http://svnweb.FreeBSD.org/socsvn/?view=rev&rev=253446

Log:
  Use FD passing in compression. (Not in uncompress() )
  

Modified:
  soc2013/dpl/head/contrib/bzip2/bzip2.c

Modified: soc2013/dpl/head/contrib/bzip2/bzip2.c
==============================================================================
--- soc2013/dpl/head/contrib/bzip2/bzip2.c	Mon Jun 24 20:27:50 2013	(r253445)
+++ soc2013/dpl/head/contrib/bzip2/bzip2.c	Mon Jun 24 20:35:49 2013	(r253446)
@@ -1441,10 +1441,6 @@
    FILE  *inStr;
    FILE  *outStr;
    Int32 n, i;
-/*#  if CAPSICUM*/
-   /*Int32 infd;*/
-   /*pid_t forkpid;*/
-/*#  endif*/
    Bool  magicNumberOK;
    Bool  cantGuess;
    struct MY_STAT statBuf;
@@ -2085,13 +2081,6 @@
 #     endif
    }
 
-#  if CAPSICUM
-   if ( socketpair(PF_LOCAL, SOCK_STREAM, 0, sv) == -1 ){
-      fprintf ( stderr, "%s: Can't create socket: %s.\n", progName, strerror(errno) );
-	  exit(1);
-   }
-#  endif
-
    if (opMode == OM_Z) {
      if (srcMode == SM_I2O) {
         compress ( NULL );