Index: usr.bin/head/Makefile =================================================================== --- usr.bin/head/Makefile +++ usr.bin/head/Makefile @@ -8,4 +8,10 @@ HAS_TESTS= SUBDIR.${MK_TESTS}+= tests +.if ${MK_CASPER} != "no" && !defined(RESCUE) +LIBADD+= casper +LIBADD+= cap_fileargs +CFLAGS+=-DWITH_CASPER +.endif + .include Index: usr.bin/head/head.c =================================================================== --- usr.bin/head/head.c +++ usr.bin/head/head.c @@ -44,15 +44,21 @@ __FBSDID("$FreeBSD$"); #include +#include +#include #include #include +#include #include #include #include #include #include +#include +#include + /* * head - give the first few lines of a stream or of each of a set of files * @@ -72,6 +78,8 @@ int first, linecnt = -1, eval = 0; off_t bytecnt = -1; char *ep; + fileargs_t *fa; + cap_rights_t rights; obsolete(argv); while ((ch = getopt(argc, argv, "n:c:")) != -1) @@ -93,13 +101,22 @@ argc -= optind; argv += optind; + fa = fileargs_init(argc, argv, O_RDONLY, 0, + cap_rights_init(&rights, CAP_READ, CAP_FSTAT, CAP_FCNTL)); + if (fa == NULL) + errx(1, "unable to init casper"); + + caph_cache_catpages(); + if (caph_limit_stdio() < 0 || (cap_enter() < 0 && errno != ENOSYS)) + err(1, "unable to enter capability mode"); + if (linecnt != -1 && bytecnt != -1) errx(1, "can't combine line and byte counts"); if (linecnt == -1 ) linecnt = 10; if (*argv) { for (first = 1; *argv; ++argv) { - if ((fp = fopen(*argv, "r")) == NULL) { + if ((fp = fileargs_fopen(fa, *argv, "r")) == NULL) { warn("%s", *argv); eval = 1; continue; @@ -120,6 +137,7 @@ else head_bytes(stdin, bytecnt); + fileargs_free(fa); exit(eval); }