commit - 9f36809872a2f83a341568b0c94a0506dc75c6ad0f7abc5f1363b7fc9da3bb77
commit + 47b6dcda28d3d88cfb90d72726792d2e7653c063ca0697fe2811edee991da39a
blob - 6073909ef39f244e119a8643edb780623ee2b267e41ac765f1b2adef9bfa7395
blob + e5e5b850baef35c829bdf371109a690e6aaa1e504279eba09e25cee504cb58e7
--- got/got.c
+++ got/got.c
}
static const struct got_error *
-apply_unveil_internal(const char *repo_path, int repo_read_only,
- const char *worktree_path, const char *worktree_perms)
+apply_unveil(const char *repo_path, int repo_read_only,
+ const char *worktree_path, int worktree_read_only)
{
const struct got_error *err;
if (repo_path && unveil(repo_path, repo_read_only ? "r" : "rwc") != 0)
return got_error_from_errno2("unveil", repo_path);
- if (worktree_path && unveil(worktree_path, worktree_perms) != 0)
+ if (worktree_path && unveil(worktree_path,
+ worktree_read_only ? "r" : "rwc") != 0)
return got_error_from_errno2("unveil", worktree_path);
if (unveil(GOT_TMPDIR_STR, "rwc") != 0)
return NULL;
}
-static const struct got_error *
-apply_unveil(const char *repo_path, int repo_read_only,
- const char *worktree_path)
-{
- return apply_unveil_internal(repo_path, repo_read_only,
- worktree_path, "rwc");
-}
-
-static const struct got_error *
-apply_unveil_worktree_ro(const char *repo_path, int repo_read_only,
- const char *worktree_path)
-{
- return apply_unveil_internal(repo_path, repo_read_only,
- worktree_path, "r");
-}
-
__dead static void
usage_init(int status)
{
!(error->code == GOT_ERR_ERRNO && errno == EEXIST))
goto done;
- error = apply_unveil(repo_path, 0, NULL);
+ error = apply_unveil(repo_path, 0, NULL, 0);
if (error)
goto done;
error = got_error_from_errno2("unveil", editor);
goto done;
}
- error = apply_unveil(got_repo_get_path(repo), 0, NULL);
+ error = apply_unveil(got_repo_get_path(repo), 0, NULL, 0);
if (error)
goto done;
if (error)
goto done;
- error = apply_unveil(repo_path, 0, NULL);
+ error = apply_unveil(repo_path, 0, NULL, 0);
if (error)
goto done;
if (error)
goto done;
- error = apply_unveil(got_repo_get_path(repo), 0, NULL);
+ error = apply_unveil(got_repo_get_path(repo), 0, NULL, 0);
if (error)
goto done;
}
}
- error = apply_unveil(got_repo_get_path(repo), 0, worktree_path);
+ error = apply_unveil(got_repo_get_path(repo), 0, worktree_path, 0);
if (error)
goto done;
goto done;
error = apply_unveil(got_repo_get_path(repo), 0,
- got_worktree_get_root_path(worktree));
+ got_worktree_get_root_path(worktree), 0);
if (error)
goto done;
if (error != NULL)
goto done;
- error = apply_unveil_worktree_ro(got_repo_get_path(repo), 1,
- worktree ? got_worktree_get_root_path(worktree) : NULL);
+ error = apply_unveil(got_repo_get_path(repo), 1,
+ worktree ? got_worktree_get_root_path(worktree) : NULL, 1);
if (error)
goto done;
}
}
- error = apply_unveil_worktree_ro(got_repo_get_path(repo), 1,
- worktree ? got_worktree_get_root_path(worktree) : NULL);
+ error = apply_unveil(got_repo_get_path(repo), 1,
+ worktree ? got_worktree_get_root_path(worktree) : NULL, 1);
if (error)
goto done;
goto done;
}
free(p);
- error = apply_unveil(got_repo_get_path(repo), 1, NULL);
+ error = apply_unveil(got_repo_get_path(repo), 1, NULL, 0);
} else {
- error = apply_unveil(got_repo_get_path(repo), 1, NULL);
+ error = apply_unveil(got_repo_get_path(repo), 1, NULL, 0);
if (error)
goto done;
error = got_repo_map_path(&in_repo_path, repo, path);
goto done;
}
free(p);
- error = apply_unveil(got_repo_get_path(repo), 1, NULL);
+ error = apply_unveil(got_repo_get_path(repo), 1, NULL, 0);
if (error)
goto done;
} else {
- error = apply_unveil(got_repo_get_path(repo), 1, NULL);
+ error = apply_unveil(got_repo_get_path(repo), 1, NULL, 0);
if (error)
goto done;
if (path == NULL)
if (error != NULL)
goto done;
- error = apply_unveil_worktree_ro(got_repo_get_path(repo), 1,
- got_worktree_get_root_path(worktree));
+ error = apply_unveil(got_repo_get_path(repo), 1,
+ got_worktree_get_root_path(worktree), 1);
if (error)
goto done;
}
#endif
- error = apply_unveil_worktree_ro(got_repo_get_path(repo), do_list,
- worktree ? got_worktree_get_root_path(worktree) : NULL);
+ error = apply_unveil(got_repo_get_path(repo), do_list,
+ worktree ? got_worktree_get_root_path(worktree) : NULL, 1);
if (error)
goto done;
#endif
if (do_list || do_show) {
- error = apply_unveil_worktree_ro(got_repo_get_path(repo), 1,
- worktree ? got_worktree_get_root_path(worktree) : NULL);
+ error = apply_unveil(got_repo_get_path(repo), 1,
+ worktree ? got_worktree_get_root_path(worktree) : NULL, 1);
} else {
error = apply_unveil(got_repo_get_path(repo), 0,
- worktree ? got_worktree_get_root_path(worktree) : NULL);
+ worktree ? got_worktree_get_root_path(worktree) : NULL, 0);
}
if (error)
goto done;
err(1, "pledge");
#endif
}
- error = apply_unveil(got_repo_get_path(repo), 1, NULL);
+ error = apply_unveil(got_repo_get_path(repo), 1, NULL, 0);
if (error)
goto done;
error = list_tags(repo, tag_name, verify_tags, allowed_signers,
if (error)
goto done;
}
- error = apply_unveil(got_repo_get_path(repo), 0, NULL);
+ error = apply_unveil(got_repo_get_path(repo), 0, NULL, 0);
if (error)
goto done;
goto done;
error = apply_unveil(got_repo_get_path(repo), 1,
- got_worktree_get_root_path(worktree));
+ got_worktree_get_root_path(worktree), 0);
if (error)
goto done;
goto done;
error = apply_unveil(got_repo_get_path(repo), 1,
- got_worktree_get_root_path(worktree));
+ got_worktree_get_root_path(worktree), 0);
if (error)
goto done;
goto done;
error = apply_unveil(got_repo_get_path(repo), 0,
- got_worktree_get_root_path(worktree));
+ got_worktree_get_root_path(worktree), 0);
if (error != NULL)
goto done;
* XXX "c" perm needed on repo dir to delete merge references.
*/
error = apply_unveil(got_repo_get_path(repo), 0,
- got_worktree_get_root_path(worktree));
+ got_worktree_get_root_path(worktree), 0);
if (error)
goto done;
}
error = apply_unveil(got_repo_get_path(repo), 0,
- got_worktree_get_root_path(worktree));
+ got_worktree_get_root_path(worktree), 0);
if (error)
goto done;
if (error)
goto done;
- error = apply_unveil(got_repo_get_path(repo), 0, NULL);
+ error = apply_unveil(got_repo_get_path(repo), 0, NULL, 0);
if (error)
goto done;
goto done;
error = apply_unveil(got_repo_get_path(repo), 0,
- worktree ? got_worktree_get_root_path(worktree) : NULL);
+ worktree ? got_worktree_get_root_path(worktree) : NULL, 0);
if (error)
goto done;
goto done;
error = apply_unveil(got_repo_get_path(repo), 0,
- worktree ? got_worktree_get_root_path(worktree) : NULL);
+ worktree ? got_worktree_get_root_path(worktree) : NULL, 0);
if (error)
goto done;
goto done;
error = apply_unveil(got_repo_get_path(repo), 0,
- worktree ? got_worktree_get_root_path(worktree) : NULL);
+ worktree ? got_worktree_get_root_path(worktree) : NULL, 0);
if (error)
goto done;
if (error != NULL)
goto done;
error = apply_unveil(got_repo_get_path(repo), 0,
- worktree ? got_worktree_get_root_path(worktree) : NULL);
+ worktree ? got_worktree_get_root_path(worktree) : NULL, 0);
if (error)
goto done;
error = process_backup_refs(
}
}
error = apply_unveil(got_repo_get_path(repo), 0,
- got_worktree_get_root_path(worktree));
+ got_worktree_get_root_path(worktree), 0);
if (error)
goto done;
}
goto done;
error = apply_unveil(got_repo_get_path(repo), 0,
- got_worktree_get_root_path(worktree));
+ got_worktree_get_root_path(worktree), 0);
if (error)
goto done;
}
error = apply_unveil(got_repo_get_path(repo), 0,
- worktree ? got_worktree_get_root_path(worktree) : NULL);
+ worktree ? got_worktree_get_root_path(worktree) : NULL, 0);
if (error)
goto done;
}
}
error = apply_unveil(got_repo_get_path(repo), 0,
- got_worktree_get_root_path(worktree));
+ got_worktree_get_root_path(worktree), 0);
if (error)
goto done;
}
error = apply_unveil(got_repo_get_path(repo), 0,
- got_worktree_get_root_path(worktree));
+ got_worktree_get_root_path(worktree), 0);
if (error)
goto done;
if (error != NULL)
goto done;
- error = apply_unveil(got_repo_get_path(repo), 1, NULL);
+ error = apply_unveil(got_repo_get_path(repo), 1, NULL, 0);
if (error)
goto done;
if (pledge("stdio rpath flock unveil", NULL) == -1)
err(1, "pledge");
#endif
- error = apply_unveil_worktree_ro(NULL, 0,
- got_worktree_get_root_path(worktree));
+ error = apply_unveil(NULL, 0, got_worktree_get_root_path(worktree), 1);
if (error)
goto done;