Commit Diff


commit - 9f36809872a2f83a341568b0c94a0506dc75c6ad0f7abc5f1363b7fc9da3bb77
commit + 47b6dcda28d3d88cfb90d72726792d2e7653c063ca0697fe2811edee991da39a
blob - 6073909ef39f244e119a8643edb780623ee2b267e41ac765f1b2adef9bfa7395
blob + e5e5b850baef35c829bdf371109a690e6aaa1e504279eba09e25cee504cb58e7
--- got/got.c	
+++ got/got.c	
@@ -327,8 +327,8 @@ get_editor(char **abspath)
 }
 
 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;
 
@@ -339,7 +339,8 @@ apply_unveil_internal(const char *repo_path, int repo_
 	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)
@@ -355,22 +356,6 @@ apply_unveil_internal(const char *repo_path, int repo_
 	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)
 {
@@ -431,7 +416,7 @@ cmd_init(int argc, char *argv[])
 	    !(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;
 
@@ -944,7 +929,7 @@ cmd_import(int argc, char *argv[])
 		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;
 
@@ -1800,7 +1785,7 @@ cmd_clone(int argc, char *argv[])
 	if (error)
 		goto done;
 
-	error = apply_unveil(repo_path, 0, NULL);
+	error = apply_unveil(repo_path, 0, NULL, 0);
 	if (error)
 		goto done;
 
@@ -2708,7 +2693,7 @@ cmd_fetch(int argc, char *argv[])
 	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;
 
@@ -3303,7 +3288,7 @@ cmd_checkout(int argc, char *argv[])
 		}
 	}
 
-	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;
 
@@ -3753,7 +3738,7 @@ cmd_update(int argc, char *argv[])
 		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;
 
@@ -4941,8 +4926,8 @@ cmd_log(int argc, char *argv[])
 	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;
 
@@ -5507,8 +5492,8 @@ cmd_diff(int argc, char *argv[])
 		}
 	}
 
-	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;
 
@@ -6074,9 +6059,9 @@ cmd_blame(int argc, char *argv[])
 			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);
@@ -6480,11 +6465,11 @@ cmd_tree(int argc, char *argv[])
 			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)
@@ -6757,8 +6742,8 @@ cmd_status(int argc, char *argv[])
 	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;
 
@@ -7048,8 +7033,8 @@ cmd_ref(int argc, char *argv[])
 	}
 #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;
 
@@ -7433,11 +7418,11 @@ cmd_branch(int argc, char *argv[])
 #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;
@@ -8199,7 +8184,7 @@ cmd_tag(int argc, char *argv[])
 				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,
@@ -8233,7 +8218,7 @@ cmd_tag(int argc, char *argv[])
 			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;
 
@@ -8376,7 +8361,7 @@ cmd_add(int argc, char *argv[])
 		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;
 
@@ -8550,7 +8535,7 @@ cmd_remove(int argc, char *argv[])
 		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;
 
@@ -8816,7 +8801,7 @@ cmd_patch(int argc, char *argv[])
 		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;
 
@@ -9319,7 +9304,7 @@ cmd_revert(int argc, char *argv[])
 	 * 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;
 
@@ -9827,7 +9812,7 @@ cmd_commit(int argc, char *argv[])
 	}
 
 	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;
 
@@ -10342,7 +10327,7 @@ cmd_send(int argc, char *argv[])
 	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;
 
@@ -10816,7 +10801,7 @@ cmd_cherrypick(int argc, char *argv[])
 		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;
 
@@ -10965,7 +10950,7 @@ cmd_backout(int argc, char *argv[])
 		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;
 
@@ -11852,7 +11837,7 @@ cmd_rebase(int argc, char *argv[])
 		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;
 
@@ -13204,7 +13189,7 @@ cmd_histedit(int argc, char *argv[])
 		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(
@@ -13235,7 +13220,7 @@ cmd_histedit(int argc, char *argv[])
 			}
 		}
 		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;
 	}
@@ -13707,7 +13692,7 @@ cmd_integrate(int argc, char *argv[])
 		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;
 
@@ -13920,7 +13905,7 @@ cmd_merge(int argc, char *argv[])
 	}
 
 	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;
 
@@ -14278,7 +14263,7 @@ cmd_stage(int argc, char *argv[])
 		}
 	}
 	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;
 
@@ -14408,7 +14393,7 @@ cmd_unstage(int argc, char *argv[])
 	}
 
 	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;
 
@@ -14713,7 +14698,7 @@ cmd_cat(int argc, char *argv[])
 	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;
 
@@ -14949,8 +14934,7 @@ cmd_info(int argc, char *argv[])
 	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;