openbsd/xenocara
1
0
Fork 0
mirror of https://github.com/openbsd/xenocara.git synced 2025-12-11 03:39:26 +00:00
Code Issues Projects Releases Wiki Activity

If unveil(2) fails, display an error with the failing path.

Browse Source 
Discussed with deraadt@ ok millert@
This commit is contained in:
matthieu
2022-08-07 07:10:54 +00:00
parent 3494fdb660
commit 10a4b7d422
1 changed files with 26 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
app/xterm/main.c
View File

@@ -2928,50 +2928,62 @@ main(int argc, char *argv[]ENVP_ARG)
if ((env = getenv("HOME"))) {
char homefile[PATH_MAX];
/* we ignore unveil() errors - they are no relevant here */
if (snprintf(homefile, sizeof homefile, "%s/.fonts",
env) <= sizeof(homefile))
unveil(homefile, "r");
if (unveil(homefile, "r") == -1)
xtermPerror("unveil %s", homefile);
if (snprintf(homefile, sizeof homefile, "%s/.cache/fontconfig",
env) <= sizeof(homefile))
unveil(homefile, "r");
if (unveil(homefile, "r") == 1)
xtermPerror("unveil %s", homefile);
if (snprintf(homefile, sizeof homefile, "%s/.icons",
env) <= sizeof(homefile))
unveil(homefile, "r");
if (unveil(homefile, "r") == -1)
xtermPerror("unveil %s", homefile);
}
if ((env = getenv("XDG_CONFIG_HOME"))) {
char xdgfile[PATH_MAX];
if (snprintf(xdgfile, sizeof xdgfile, "%s/fontconfig",
env) <= sizeof(xdgfile))
unveil(xdgfile, "r");
if (unveil(xdgfile, "r") == -1)
xtermPerror("unveil %s", xdgfile);
if (snprintf(xdgfile, sizeof xdgfile, "%s/icons",
env) <= sizeof(xdgfile))
unveil(xdgfile, "r");
if (unveil(xdgfile, "r") == -1)
xtermPerror("unveil %s", xdgfile);
}
if ((env = getenv("XDG_DATA_HOME"))) {
char xdgfile[PATH_MAX];
if (snprintf(xdgfile, sizeof xdgfile, "%s/fontconfig",
env) <= sizeof(xdgfile))
unveil(xdgfile, "r");
if (unveil(xdgfile, "r") == -1)
xtermPerror("unveil %s", xdgfile);
if (snprintf(xdgfile, sizeof xdgfile, "%s/icons",
env) <= sizeof(xdgfile))
unveil(xdgfile, "r");
if (unveil(xdgfile, "r") == -1)
xtermPerror("unveil %s", xdgfile);
}
if ((env = getenv("XDG_CACHE_HOME"))) {
char xdgfile[PATH_MAX];
if (snprintf(xdgfile, sizeof xdgfile, "%s/fontconfig",
env) <= sizeof(xdgfile))
unveil(xdgfile, "r");
if (unveil(xdgfile, "r") == -1)
xtermPerror("unveil %s", xdgfile);
}
unveil("/usr/X11R6", "r");
unveil("/usr/local/share/fonts", "r");
unveil("/var/cache/fontconfig", "r");
unveil("/usr/local/share/icons", "r");
unveil("/usr/local/lib/X11/icons", "r");
if (unveil("/usr/X11R6", "r") == -1)
xtermPerror("unveil /usr/X11R6");
if (unveil("/usr/local/share/fonts", "r") == -1)
xtermPerror("unveil /usr/local/share/fonts");
if (unveil("/var/cache/fontconfig", "r") == -1)
xtermPerror("unveil /var/cache/fontconfig");
if (unveil("/usr/local/share/icons", "r") == -1)
xtermPerror("unveil /usr/local/share/icons");
if (unveil("/usr/local/lib/X11/icons", "r") == -1)
xtermPerror("unveil /usr/local/lib/X11/icons");
if (pledge("stdio rpath proc tty", NULL) == -1) {
xtermWarning("pledge\n");