From owner-svn-src-head@freebsd.org  Mon Jun 18 04:54:10 2018
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:2610:1c1:1:606c::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id 9374F1016C2A;
 Mon, 18 Jun 2018 04:54:10 +0000 (UTC)
 (envelope-from eadler@FreeBSD.org)
Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org
 [IPv6:2610:1c1:1:606c::19:3])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client CN "mxrelay.nyi.freebsd.org",
 Issuer "Let's Encrypt Authority X3" (verified OK))
 by mx1.freebsd.org (Postfix) with ESMTPS id 42FCA6E585;
 Mon, 18 Jun 2018 04:54:10 +0000 (UTC)
 (envelope-from eadler@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 mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 241E01F81A;
 Mon, 18 Jun 2018 04:54:10 +0000 (UTC)
 (envelope-from eadler@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w5I4sA6q082084;
 Mon, 18 Jun 2018 04:54:10 GMT (envelope-from eadler@FreeBSD.org)
Received: (from eadler@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id w5I4sAmk082083;
 Mon, 18 Jun 2018 04:54:10 GMT (envelope-from eadler@FreeBSD.org)
Message-Id: <201806180454.w5I4sAmk082083@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: eadler set sender to
 eadler@FreeBSD.org using -f
From: Eitan Adler <eadler@FreeBSD.org>
Date: Mon, 18 Jun 2018 04:54:10 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r335312 - head/usr.bin/dc
X-SVN-Group: head
X-SVN-Commit-Author: eadler
X-SVN-Commit-Paths: head/usr.bin/dc
X-SVN-Commit-Revision: 335312
X-SVN-Commit-Repository: base
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.26
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: Mon, 18 Jun 2018 04:54:10 -0000

Author: eadler
Date: Mon Jun 18 04:54:09 2018
New Revision: 335312
URL: https://svnweb.freebsd.org/changeset/base/335312

Log:
  dc: make use of caph_enter
  
  We already use caph library so this makes sense.

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

Modified: head/usr.bin/dc/dc.c
==============================================================================
--- head/usr.bin/dc/dc.c	Mon Jun 18 04:12:58 2018	(r335311)
+++ head/usr.bin/dc/dc.c	Mon Jun 18 04:54:09 2018	(r335312)
@@ -137,7 +137,7 @@ main(int argc, char *argv[])
 
 		if (caph_limit_stream(fd, CAPH_READ) < 0 ||
 		    caph_limit_stdio() < 0 ||
-		    (cap_enter() < 0 && errno != ENOSYS))
+		    caph_enter() < 0)
 			err(1, "capsicum");
 
 		procfd(fd, argv[0]);
@@ -146,7 +146,7 @@ main(int argc, char *argv[])
 	if (preproc_done)
 		return (0);
 
-	if (caph_limit_stdio() < 0 || (cap_enter() < 0 && errno != ENOSYS))
+	if (caph_limit_stdio() < 0 || caph_enter())
 		err(1, "capsicum");
 	src_setstream(&src, stdin);
 	reset_bmachine(&src);