summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorC. McEnroe2021-06-10 15:40:45 -0400
committerC. McEnroe2021-06-10 15:40:45 -0400
commit275d657b8b3bccd7d7d6055cbe09de4e85be7659 (patch)
tree7fcf0f60c9b81933c49cf0d848518521c28f663f
parent0b4004c202283565a9e90fd03df3d17bd53a5393 (diff)
Move unveilAll back into main
It doesn't do as much anymore, so move it back inline.
-rw-r--r--chat.c20
1 files changed, 8 insertions, 12 deletions
diff --git a/chat.c b/chat.c
index 9a276d5..4f3c233 100644
--- a/chat.c
+++ b/chat.c
@@ -127,7 +127,6 @@ static void parseHash(char *str) {
}
#ifdef __OpenBSD__
-
static void unveilData(const char *name) {
const char *dirs = NULL;
for (const char *path; NULL != (path = dataPath(&dirs, name));) {
@@ -135,16 +134,7 @@ static void unveilData(const char *name) {
if (error && errno != ENOENT) err(EX_CANTCREAT, "%s", path);
}
}
-
-static void unveilAll(void) {
- if (save || logEnable) {
- dataMkdir("");
- unveilData("");
- }
- if (save) unveilData(save);
-}
-
-#endif /* __OpenBSD__ */
+#endif
static volatile sig_atomic_t signals[NSIG];
static void signalHandler(int signal) {
@@ -288,7 +278,13 @@ int main(int argc, char *argv[]) {
uiInitEarly();
#ifdef __OpenBSD__
- if (self.restricted) unveilAll();
+ if (self.restricted) {
+ if (save || logEnable) {
+ dataMkdir("");
+ unveilData("");
+ }
+ if (save) unveilData(save);
+ }
char promises[64] = "stdio tty";
char *ptr = &promises[strlen(promises)], *end = &promises[sizeof(promises)];