socsvn commit: r253446 - soc2013/dpl/head/contrib/bzip2

[dpl at FreeBSD.org]

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 );