tassume OpenBSD 5.9+, always try pledge(2) on OpenBSD - stagit - static git pag… | |
git clone git://src.adamsgaard.dk/stagit | |
Log | |
Files | |
Refs | |
README | |
LICENSE | |
--- | |
commit 187daac42007c87e6af9317a20446e3b81907f63 | |
parent c7f158c58c338961b1a1a91f41a5dade42853dec | |
Author: Hiltjo Posthuma <[email protected]> | |
Date: Fri, 25 May 2018 18:43:36 +0200 | |
assume OpenBSD 5.9+, always try pledge(2) on OpenBSD | |
Diffstat: | |
M config.mk | 3 --- | |
M stagit-index.c | 6 ++---- | |
M stagit.c | 6 ++---- | |
3 files changed, 4 insertions(+), 11 deletions(-) | |
--- | |
diff --git a/config.mk b/config.mk | |
t@@ -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 $… | |
diff --git a/stagit-index.c b/stagit-index.c | |
t@@ -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) | |
{ | |
t@@ -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); | |
diff --git a/stagit.c b/stagit.c | |
t@@ -65,10 +65,6 @@ static char lastoidstr[GIT_OID_HEXSZ + 2]; /* id + newline … | |
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) | |
{ | |
t@@ -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"); | |
t@@ -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) { |