diff options
| author | Hiltjo Posthuma <hiltjo@codemadness.org> | 2018-05-25 18:43:36 +0200 |
|---|---|---|
| committer | Hiltjo Posthuma <hiltjo@codemadness.org> | 2018-05-25 18:43:36 +0200 |
| commit | 187daac42007c87e6af9317a20446e3b81907f63 (patch) | |
| tree | 9fa7eac70a4888d32c96b42c1195095aab7b908f | |
| parent | c7f158c58c338961b1a1a91f41a5dade42853dec (diff) | |
| download | stagit-fork-187daac42007c87e6af9317a20446e3b81907f63.zip | |
assume OpenBSD 5.9+, always try pledge(2) on OpenBSD
| -rw-r--r-- | config.mk | 3 | ||||
| -rw-r--r-- | stagit-index.c | 6 | ||||
| -rw-r--r-- | stagit.c | 6 |
3 files changed, 4 insertions, 11 deletions
@@ -27,6 +27,3 @@ LDFLAGS = -s ${LIBS} #LDFLAGS = -static -s ${LIBS} CPPFLAGS = -D_XOPEN_SOURCE=700 -D_DEFAULT_SOURCE -D_BSD_SOURCE ${INCS} - -# OpenBSD 5.9+: use pledge(2) -#CPPFLAGS = -D_XOPEN_SOURCE=700 -D_DEFAULT_SOURCE -D_BSD_SOURCE -DUSE_PLEDGE ${INCS} diff --git a/stagit-index.c b/stagit-index.c index 6b7c699..e019793 100644 --- a/stagit-index.c +++ b/stagit-index.c @@ -21,10 +21,6 @@ static char description[255] = "Repositories"; static char *name = ""; static char owner[255]; -#ifndef USE_PLEDGE -#define pledge(p1,p2) 0 -#endif - void joinpath(char *buf, size_t bufsiz, const char *path, const char *path2) { @@ -164,8 +160,10 @@ main(int argc, char *argv[]) git_libgit2_init(); +#ifdef __OpenBSD__ if (pledge("stdio rpath", NULL) == -1) err(1, "pledge"); +#endif writeheader(stdout); @@ -65,10 +65,6 @@ static char lastoidstr[GIT_OID_HEXSZ + 2]; /* id + newline + nul byte */ static FILE *rcachefp, *wcachefp; static const char *cachefile; -#ifndef USE_PLEDGE -#define pledge(p1,p2) 0 -#endif - void joinpath(char *buf, size_t bufsiz, const char *path, const char *path2) { @@ -1057,6 +1053,7 @@ main(int argc, char *argv[]) git_libgit2_init(); +#ifdef __OpenBSD__ if (cachefile) { if (pledge("stdio rpath wpath cpath fattr", NULL) == -1) err(1, "pledge"); @@ -1064,6 +1061,7 @@ main(int argc, char *argv[]) if (pledge("stdio rpath wpath cpath", NULL) == -1) err(1, "pledge"); } +#endif if (git_repository_open_ext(&repo, repodir, GIT_REPOSITORY_OPEN_NO_SEARCH, NULL) < 0) { |