Author: cem
Date: Tue Nov 15 00:24:18 2016
New Revision: 308657
URL: https://svnweb.freebsd.org/changeset/base/308657

Log:
  fold(1): Revert incorrect r308432
  
  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

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

Modified: head/usr.bin/fold/fold.c
==============================================================================
--- head/usr.bin/fold/fold.c    Mon Nov 14 23:51:28 2016        (r308656)
+++ head/usr.bin/fold/fold.c    Tue Nov 15 00:24:18 2016        (r308657)
@@ -45,7 +45,6 @@ static char sccsid[] = "@(#)fold.c    8.1 (
 #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) {
_______________________________________________
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"

Reply via email to