Page MenuHomeFreeBSD
Files F140790375

D20393.id57877.diff
No OneTemporary
Actions

D20393.id57877.diff
View Options

Index: Makefile
===================================================================
--- Makefile
+++ Makefile
@@ -6,6 +6,12 @@
PROG= tail
SRCS= forward.c misc.c read.c reverse.c tail.c
+.if ${MK_CASPER} != "no"
+LIBADD+= casper
+LIBADD+= cap_fileargs
+CFLAGS+= -DWITH_CASPER
+.endif
+
HAS_TESTS=
SUBDIR.${MK_TESTS}+= tests
Index: tail.c
===================================================================
--- tail.c
+++ tail.c
@@ -46,9 +46,11 @@
static const char sccsid[] = "@(#)tail.c 8.1 (Berkeley) 6/6/93";
#endif
+#include <sys/capsicum.h>
#include <sys/types.h>
#include <sys/stat.h>
+#include <capsicum_helpers.h>
#include <err.h>
#include <errno.h>
#include <getopt.h>
@@ -57,6 +59,9 @@
#include <string.h>
#include <unistd.h>
+#include <libcasper.h>
+#include <casper/cap_fileargs.h>
+
#include "extern.h"
int Fflag, fflag, qflag, rflag, rval, no_files;
@@ -85,7 +90,17 @@
int i, ch, first;
file_info_t *file;
char *p;
+ fileargs_t *fa;
+ cap_rights_t rights;
+ cap_rights_t rights_wo;
+ cap_rights_init(&rights, CAP_FSTAT, CAP_FCNTL, CAP_MMAP_RW);
+ cap_rights_init(&rights_wo, CAP_WRITE);
+ if (caph_rights_limit(STDIN_FILENO, &rights) < 0 ||
+ caph_rights_limit(STDOUT_FILENO, &rights_wo) < 0 ||
+ caph_rights_limit(STDERR_FILENO, &rights_wo) < 0 )
+ err(1, "can't limit stdio rights");
+
/*
* Tail's options are weird. First, -n10 is the same as -n-10, not
* -n+10. Second, the number options are 1 based and not offsets,
@@ -155,6 +170,15 @@
no_files = argc ? argc : 1;
+ fa = fileargs_init(argc, argv, O_RDONLY, 0, &rights, FA_OPEN);
+ if (fa == NULL)
+ errx(1, "unable to init casper");
+
+ caph_cache_catpages();
+ if (caph_enter_casper() < 0)
+ err(1, "unable to enter capability mode");
+
+
/*
* If displaying in reverse, don't permit follow option, and convert
* style values.
@@ -192,7 +216,7 @@
file->file_name = strdup(fn);
if (! file->file_name)
errx(1, "Couldn't malloc space for file name.");
- if ((file->fp = fopen(file->file_name, "r")) == NULL ||
+ if ((file->fp = fileargs_fopen(fa, file->file_name, "r")) == NULL ||
fstat(fileno(file->fp), &file->st)) {
if (file->fp != NULL) {
fclose(file->fp);
@@ -209,7 +233,7 @@
free(files);
} else if (*argv) {
for (first = 1; (fn = *argv++);) {
- if ((fp = fopen(fn, "r")) == NULL ||
+ if ((fp = fileargs_fopen(fa, fn, "r")) == NULL ||
fstat(fileno(fp), &sb)) {
ierr(fn);
continue;
@@ -247,6 +271,7 @@
else
forward(stdin, fn, style, off, &sb);
}
+ fileargs_free(fa);
exit(rval);
}

File Metadata

Mime Type
text/plain
Expires
Mon, Dec 29, 2:05 AM (21 h, 29 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
27349030
Default Alt Text
D20393.id57877.diff (2 KB)

Event Timeline