From owner-svn-soc-all@FreeBSD.ORG  Sat Jul  6 17:40:46 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 5724CA66
 for <svn-soc-all@FreeBSD.org>; Sat,  6 Jul 2013 17:40:46 +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 49E9B1E15
 for <svn-soc-all@FreeBSD.org>; Sat,  6 Jul 2013 17:40:46 +0000 (UTC)
Received: from socsvn.freebsd.org ([127.0.1.124])
 by socsvn.freebsd.org (8.14.7/8.14.7) with ESMTP id r66HekJI037126
 for <svn-soc-all@FreeBSD.org>; Sat, 6 Jul 2013 17:40:46 GMT
 (envelope-from dpl@FreeBSD.org)
Received: (from www@localhost)
 by socsvn.freebsd.org (8.14.7/8.14.6/Submit) id r66HekM6037110
 for svn-soc-all@FreeBSD.org; Sat, 6 Jul 2013 17:40:46 GMT
 (envelope-from dpl@FreeBSD.org)
Date: Sat, 6 Jul 2013 17:40:46 GMT
Message-Id: <201307061740.r66HekM6037110@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: r254248 - 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: Sat, 06 Jul 2013 17:40:46 -0000

Author: dpl
Date: Sat Jul  6 17:40:46 2013
New Revision: 254248
URL: http://svnweb.FreeBSD.org/socsvn/?view=rev&rev=254248

Log:
  Little changes, I get SIGSEGV at line 1234.
  

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

Modified: soc2013/dpl/head/contrib/bzip2/bzip2.c
==============================================================================
--- soc2013/dpl/head/contrib/bzip2/bzip2.c	Sat Jul  6 17:34:33 2013	(r254247)
+++ soc2013/dpl/head/contrib/bzip2/bzip2.c	Sat Jul  6 17:40:46 2013	(r254248)
@@ -1177,12 +1177,11 @@
 static 
 void compress ( Char *name )
 {
-#ifndef CAPSICUM
-   FILE  *inStr;
-   FILE  *outStr;
-#endif
 #if CAPSICUM
    pid_t forkpid;
+#elif
+   FILE  *inStr;
+   FILE  *outStr;
 #endif
    Int32 n, i;
    struct MY_STATS statBuf;
@@ -1387,13 +1386,13 @@
 static 
 void uncompress ( Char *name )
 {
-#ifndef CAPSICUM
-   FILE  *inStr;
-   FILE  *outStr;
-#endif
 #if CAPSICUM
    pid_t forkpid;
+#elif
+   FILE  *inStr;
+   FILE  *outStr;
 #endif
+
    Int32 n, i;
    Bool  magicNumberOK;
    Bool  cantGuess;
@@ -1616,7 +1615,9 @@
 static 
 void testf ( Char *name )
 {
+#  ifndef CAPSICUM
    FILE *inStr;
+#  endif
    Bool allOK;
    struct MY_STATS statBuf;