From e961ace3ca67ec24de27b017056fdbfe89e8423a Mon Sep 17 00:00:00 2001
From: Conrad Meyer <cem@FreeBSD.org>
Date: Tue, 15 Nov 2016 00:24:18 +0000
Subject: [PATCH] fold(1): Revert incorrect r308432
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

As Jean-Sébastien notes, fold(1) requires handling argv-supplied files.  That
will require a slightly more sophisticated approach.

Reported by:	dumbbell@
Sponsored by:	Dell EMC Isilon
---
 usr.bin/fold/fold.c | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/usr.bin/fold/fold.c b/usr.bin/fold/fold.c
index 7eedfe252c0..1ce9b5eb3a9 100644
--- a/usr.bin/fold/fold.c
+++ b/usr.bin/fold/fold.c
@@ -45,7 +45,6 @@ static char sccsid[] = "@(#)fold.c	8.1 (Berkeley) 6/6/93";
 #include <sys/cdefs.h>
 __FBSDID("$FreeBSD$");
 
-#include <capsicum_helpers.h>
 #include <err.h>
 #include <limits.h>
 #include <locale.h>
@@ -73,9 +72,6 @@ main(int argc, char **argv)
 
 	(void) setlocale(LC_CTYPE, "");
 
-	if (caph_limit_stdio() < 0 || (cap_enter() < 0 && errno != ENOSYS))
-		err(1, "capsicum");
-
 	width = -1;
 	previous_ch = 0;
 	while ((ch = getopt(argc, argv, "0123456789bsw:")) != -1) {