Date: Tue, 13 Nov 2018 01:30:31 +0000 (UTC) From: Ed Maste <emaste@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r340391 - head/contrib/elftoolchain/strings Message-ID: <201811130130.wAD1UVAK003003@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: emaste Date: Tue Nov 13 01:30:31 2018 New Revision: 340391 URL: https://svnweb.freebsd.org/changeset/base/340391 Log: Revert r340385, strings capability mode This needs to be reworked for bootstrapping. Modified: head/contrib/elftoolchain/strings/strings.c Modified: head/contrib/elftoolchain/strings/strings.c ============================================================================== --- head/contrib/elftoolchain/strings/strings.c Mon Nov 12 22:18:11 2018 (r340390) +++ head/contrib/elftoolchain/strings/strings.c Tue Nov 13 01:30:31 2018 (r340391) @@ -27,7 +27,6 @@ #include <sys/stat.h> #include <sys/types.h> -#include <capsicum_helpers.h> #include <ctype.h> #include <err.h> #include <errno.h> @@ -189,12 +188,9 @@ main(int argc, char **argv) if (!min_len) min_len = 4; - if (!*argv) { - if (caph_limit_stdio() < 0 || caph_enter() < 0) - err(1, "unable to enter capability mode"); - return (find_strings("{standard input}", 0, 0)); - } - while (*argv) { + if (!*argv) + rc = find_strings("{standard input}", 0, 0); + else while (*argv) { if (handle_file(*argv) != 0) rc = 1; argv++;
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201811130130.wAD1UVAK003003>