Commit Diff

Commit:
4010e238a0826aba0cbc42d3a0a175d1edb4c547
From:
Stefan Sperling <stsp@stsp.name>
Date:
Message:
make tog call pledge(2) directly in main() instead of per-command All of tog's pledges are currently the same, and they must be the same because tog allows switching between available command views at run-time. ok tracey
Actions:
Patch | Tree
commit - 41ad2652808e8c045a2a82b97bb309e35fde2887
commit + 4010e238a0826aba0cbc42d3a0a175d1edb4c547
blob - 50fefd43b456ae573fe7ef9c214a59c72cb42a9e
blob + f3eeaf4b50fe79efeb2540158e9b5c58b40e3a7c
--- tog/tog.c
+++ tog/tog.c
@@ -2644,12 +2644,6 @@ cmd_log(int argc, char *argv[])
 	char *start_commit = NULL, *head_ref_name = NULL;
 	int ch, log_branches = 0;
 	struct tog_view *view;
-
-#ifndef PROFILE
-	if (pledge("stdio rpath wpath cpath flock proc tty exec sendfd unveil",
-	    NULL) == -1)
-		err(1, "pledge");
-#endif
 
 	while ((ch = getopt(argc, argv, "bc:r:")) != -1) {
 		switch (ch) {
@@ -3732,11 +3726,6 @@ cmd_diff(int argc, char *argv[])
 	const char *errstr;
 	struct tog_view *view;
 
-#ifndef PROFILE
-	if (pledge("stdio rpath wpath cpath flock proc tty exec sendfd unveil",
-	    NULL) == -1)
-		err(1, "pledge");
-#endif
 	while ((ch = getopt(argc, argv, "aC:r:w")) != -1) {
 		switch (ch) {
 		case 'a':
@@ -4633,12 +4622,6 @@ cmd_blame(int argc, char *argv[])
 	char *commit_id_str = NULL;
 	int ch;
 	struct tog_view *view;
-
-#ifndef PROFILE
-	if (pledge("stdio rpath wpath cpath flock proc tty exec sendfd unveil",
-	    NULL) == -1)
-		err(1, "pledge");
-#endif
 
 	while ((ch = getopt(argc, argv, "c:r:")) != -1) {
 		switch (ch) {
@@ -5435,12 +5418,6 @@ cmd_tree(int argc, char *argv[])
 	int ch;
 	struct tog_view *view;
 
-#ifndef PROFILE
-	if (pledge("stdio rpath wpath cpath flock proc tty exec sendfd unveil",
-	    NULL) == -1)
-		err(1, "pledge");
-#endif
-
 	while ((ch = getopt(argc, argv, "c:r:")) != -1) {
 		switch (ch) {
 		case 'c':
@@ -6144,12 +6121,6 @@ cmd_ref(int argc, char *argv[])
 	int ch;
 	struct tog_view *view;
 
-#ifndef PROFILE
-	if (pledge("stdio rpath wpath cpath flock proc tty exec sendfd unveil",
-	    NULL) == -1)
-		err(1, "pledge");
-#endif
-
 	while ((ch = getopt(argc, argv, "r:")) != -1) {
 		switch (ch) {
 		case 'r':
@@ -6406,6 +6377,12 @@ main(int argc, char *argv[])
 		got_version_print_str();
 		return 0;
 	}
+
+#ifndef PROFILE
+	if (pledge("stdio rpath wpath cpath flock proc tty exec sendfd unveil",
+	    NULL) == -1)
+		err(1, "pledge");
+#endif
 
 	if (argc == 0) {
 		if (hflag)