sync ports with The Matrix
This commit is contained in:
parent
74706e64f4
commit
77bea1694c
1060 changed files with 39921 additions and 2746 deletions
|
@ -1,59 +0,0 @@
|
|||
- unveil: unveil the provided mime_dir
|
||||
- pledge: https://bugs.freedesktop.org/show_bug.cgi?id=104368
|
||||
|
||||
Index: src/update-mime-database.c
|
||||
--- src/update-mime-database.c.orig
|
||||
+++ src/update-mime-database.c
|
||||
@@ -2165,6 +2165,11 @@ static void check_in_path_xdg_data(const char *mime_pa
|
||||
|
||||
path = g_path_get_dirname(mime_path);
|
||||
|
||||
+ if (unveil(path, "r") == -1) {
|
||||
+ g_warning("Can't unveil '%s' directory: %s",
|
||||
+ path, g_strerror(errno));
|
||||
+ }
|
||||
+
|
||||
if (stat(path, &path_info))
|
||||
{
|
||||
g_warning("Can't stat '%s' directory: %s",
|
||||
@@ -2189,12 +2194,23 @@ static void check_in_path_xdg_data(const char *mime_pa
|
||||
|
||||
for (i = 0; i < n; i++)
|
||||
{
|
||||
+ if (unveil(dirs[i], "r") == -1) {
|
||||
+ g_warning("Can't unveil '%s' directory: %s",
|
||||
+ dirs[i], g_strerror(errno));
|
||||
+ goto out;
|
||||
+ }
|
||||
+
|
||||
if (stat(dirs[i], &dir_info) == 0 &&
|
||||
dir_info.st_ino == path_info.st_ino &&
|
||||
dir_info.st_dev == path_info.st_dev)
|
||||
break;
|
||||
}
|
||||
|
||||
+ if (unveil(NULL, NULL) == -1) {
|
||||
+ g_warning(_("unveil"));
|
||||
+ goto out;
|
||||
+ }
|
||||
+
|
||||
if (i == n)
|
||||
{
|
||||
g_printerr(_("\nNote that '%s' is not in the search path\n"
|
||||
@@ -3685,6 +3701,16 @@ int main(int argc, char **argv)
|
||||
LIBXML_TEST_VERSION;
|
||||
|
||||
mime_dir = argv[optind];
|
||||
+
|
||||
+ if (unveil(mime_dir, "rwc") == -1) {
|
||||
+ g_warning(_("unveil"));
|
||||
+ return EXIT_FAILURE;
|
||||
+ }
|
||||
+
|
||||
+ if (pledge("stdio rpath wpath cpath getpw unveil", NULL) == -1) {
|
||||
+ g_warning(_("pledge"));
|
||||
+ return EXIT_FAILURE;
|
||||
+ }
|
||||
|
||||
/* Strip trailing / characters */
|
||||
{
|
Loading…
Add table
Add a link
Reference in a new issue