From owner-svn-soc-all@FreeBSD.ORG  Tue Sep 10 09:14:38 2013
Return-Path: <owner-svn-soc-all@FreeBSD.ORG>
Delivered-To: svn-soc-all@FreeBSD.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTP id AB762481
 for <svn-soc-all@FreeBSD.org>; Tue, 10 Sep 2013 09:14:38 +0000 (UTC)
 (envelope-from dpl@FreeBSD.org)
Received: from socsvn.freebsd.org (socsvn.freebsd.org
 [IPv6:2001:1900:2254:206a::50:2])
 (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by mx1.freebsd.org (Postfix) with ESMTPS id 99660265E
 for <svn-soc-all@FreeBSD.org>; Tue, 10 Sep 2013 09:14:38 +0000 (UTC)
Received: from socsvn.freebsd.org ([127.0.1.124])
 by socsvn.freebsd.org (8.14.7/8.14.7) with ESMTP id r8A9Ec66033924
 for <svn-soc-all@FreeBSD.org>; Tue, 10 Sep 2013 09:14:38 GMT
 (envelope-from dpl@FreeBSD.org)
Received: (from www@localhost)
 by socsvn.freebsd.org (8.14.7/8.14.6/Submit) id r8A9EcvH033921
 for svn-soc-all@FreeBSD.org; Tue, 10 Sep 2013 09:14:38 GMT
 (envelope-from dpl@FreeBSD.org)
Date: Tue, 10 Sep 2013 09:14:38 GMT
Message-Id: <201309100914.r8A9EcvH033921@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: r257184 - 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: Tue, 10 Sep 2013 09:14:38 -0000

Author: dpl
Date: Tue Sep 10 09:14:38 2013
New Revision: 257184
URL: http://svnweb.FreeBSD.org/socsvn/?view=rev&rev=257184

Log:
  Changed bzip2 to use cap_rights_init instead of cap_rights_init();; cap_rights_set();
  

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

Modified: soc2013/dpl/head/contrib/bzip2/bzip2.c
==============================================================================
--- soc2013/dpl/head/contrib/bzip2/bzip2.c	Tue Sep 10 08:00:28 2013	(r257183)
+++ soc2013/dpl/head/contrib/bzip2/bzip2.c	Tue Sep 10 09:14:38 2013	(r257184)
@@ -671,14 +671,15 @@
    cap_rights_t rights;
 
    cap_rights_init(&rights);
+
    if (fd == OUT_FILENO)
-	  cap_rights_set(&rights, CAP_READ|CAP_FSTAT|CAP_WRITE|CAP_FCHMOD|CAP_FCHOWN|CAP_FUTIMES);
+      cap_rights_init(&rights, CAP_READ, CAP_FSTAT, CAP_WRITE, CAP_FCHMOD, CAP_FCHOWN, CAP_FUTIMES);
    else if (fd == IN_FILENO)
-	  cap_rights_set(&rights, CAP_WRITE|CAP_READ|CAP_FSTAT);
+      cap_rights_init(&rights, CAP_WRITE, CAP_READ, CAP_FSTAT);
    else if (fd == STDERR_FILENO)
-	  cap_rights_set(&rights, CAP_WRITE);
+      cap_rights_init(&rights, CAP_WRITE);
    else if (fd == cwd)
-	  cap_rights_set(&rights, CAP_UNLINKAT|CAP_LOOKUP);
+      cap_rights_init(&rights, CAP_UNLINKAT, CAP_LOOKUP);
    else {
       fprintf (stderr, "%s: Wrong file descriptor.\n", progName);
       setExit(1);